Skip to content

Commit

Permalink
0.62.1
Browse files Browse the repository at this point in the history
This closes #91
  • Loading branch information
coni2k committed Jul 11, 2016
1 parent 446cd8a commit 2becb94
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
### Changelog

**0.62.1**

* gulp doesn't display typescript error messages
https://github.com/forCrowd/WealthEconomy/issues/91

**0.62.0**

* Typescript
Expand Down
2 changes: 1 addition & 1 deletion SolutionItems/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@
//
// AssemblyFileVersion is not in use for the moment
//
[assembly: AssemblyVersion("0.62.0")]
[assembly: AssemblyVersion("0.62.1")]
[assembly: AssemblyFileVersion("1.0.0.0")]
23 changes: 17 additions & 6 deletions ngClient/gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
/// <binding ProjectOpened='default' />
'use strict';

var gulp = require('gulp'),
concat = require('gulp-concat'),
var concat = require('gulp-concat'),
cssmin = require('gulp-cssmin'),
fs = require('fs'),
gulp = require('gulp'),
gutil = require('gutil'),
jshint = require('gulp-jshint'), // Obsolete?
rename = require('gulp-rename'),
sourcemaps = require('gulp-sourcemaps'),
ts = require("gulp-typescript"),
typescript = require("gulp-typescript"),
uglify = require('gulp-uglify');

// Common
Expand Down Expand Up @@ -93,11 +94,11 @@ gulp.task('default', [appJs, appCss, appSettingsJs, libJs, libCss, 'watch']);
// app.js: jshhint + concat all into app.js + minify all into app.min.js
gulp.task(appJs, function () {

var tsProject = ts.createProject(appJsConfig, { outFile: appJs });
var project = typescript.createProject(appJsConfig, { outFile: appJs });

return tsProject.src()
return project.src()
.pipe(sourcemaps.init())
.pipe(ts(tsProject)).js
.pipe(typescript(project, undefined, visualStudioReporter())).js
.pipe(gulp.dest(appJsRoot))
.pipe(rename(appMinJs))
.pipe(uglify())
Expand Down Expand Up @@ -191,3 +192,13 @@ function errorHandler(error) {
console.log(error);
this.emit('end');
}

/* Visual Studio Reporter for gulp-typescript */
function visualStudioReporter() {
return {
error: function (error) {
gutil.log("Typescript: error", error.message);
},
finish: typescript.reporter.defaultReporter().finish
};
}
1 change: 1 addition & 0 deletions ngClient/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"gulp-tap": "^0.1.3",
"gulp-typescript": "^2.13.6",
"gulp-uglify": "^1.5.3",
"gutil": "^1.6.4",
"jshint": "^2.9.2",
"jshint-stylish": "^2.1.0",
"typescript": "^1.8.10",
Expand Down

0 comments on commit 2becb94

Please sign in to comment.