Merge pull request #193 from nycdotnet/master

Updates for 2.0.1

Author: nycdotnet

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next
 
+## v2.0.1
+ * FIX: Compatibility with TypeScript 1.3 exit codes (#189).
+ * FIX: Show issue count in red if failOnTypeError option is set and there are non-emit preventing errors  (#189).
+ * FIX: Fixed bad `failontypeerror` test. (Used incorrect location for parameter in Gruntfile.js).
+
 ## v2.0.0
 * DOCS: Major documentation overhaul (https://github.com/TypeStrong/grunt-ts/pull/185)
 * DOCS: More sample config for gruntfile (https://github.com/TypeStrong/grunt-ts/pull/166)

Gruntfile.js

@@ -321,6 +321,14 @@ module.exports = function (grunt) {
                     compiler: './customcompiler/tsc'
                 }
             },
+            continueIfTypeErrorAndNoFailOnTypeErrors: {
+                test: true,
+                src: ['test/failontypeerror/**/*.ts'],
+                outDir: 'test/failontypeerror/js',
+                options: {
+                    failOnTypeErrors: false
+                }
+            },
             fail: {
                 fail: true,                  // a designed to fail target
                 src: ['test/fail/**/*.ts'],
@@ -331,11 +339,13 @@ module.exports = function (grunt) {
                     sourcemap: false
                 }
             },
-            failontypeerror: {
+            failOnTypeErrors: {
                 fail: true,
-                failOnTypeError: true,
                 src: ['test/failontypeerror/**/*.ts'],
                 outDir: 'test/failontypeerror/js',
+                options: {
+                    failOnTypeErrors: true
+                }
             },
             files_testfailedcompilation: {
                 fail: true,                  // a designed to fail target

README.md

@@ -795,6 +795,7 @@ $ grunt upgrade
 
 ### Publishing Checklist
 
+ * Run `grunt release` and ensure it comes back clean (should finish but with warnings).
  * Update the version in package.json.
  * Update CHANGELOG.md.
  * Commit to master.

package.json

@@ -2,7 +2,7 @@
   "author": "basarat",
   "name": "grunt-ts",
   "description": "Compile and manage your TypeScript project",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "homepage": "https://github.com/grunt-ts/grunt-ts",
   "repository": {
     "type": "git",

tasks/ts.js

@@ -302,6 +302,9 @@ function pluginFn(grunt: IGrunt) {
                             return false;
                         }
 
+                        // In TypeScript 1.3 and above, the result code corresponds to the ExitCode enum in 
+                        //   TypeScript/src/compiler/sys.ts
+
                         var isError = (result.code !== 0);
 
                         // If the compilation errors contain only type errors, JS files are still
@@ -333,7 +336,7 @@ function pluginFn(grunt: IGrunt) {
 
                         // Log error summary
                         if (level1ErrorCount + level5ErrorCount + nonEmitPreventingWarningCount > 0) {
-                          if (level1ErrorCount + level5ErrorCount > 0) {
+                          if ((level1ErrorCount + level5ErrorCount > 0) || options.failOnTypeErrors) {
                             grunt.log.write(('>> ').red);
                           } else {
                             grunt.log.write(('>> ').green);
@@ -355,7 +358,7 @@ function pluginFn(grunt: IGrunt) {
 
                           grunt.log.writeln('');
 
-                          if (isOnlyTypeErrors) {
+                          if (isOnlyTypeErrors && !options.failOnTypeErrors) {
                             grunt.log.write(('>> ').green);
                             grunt.log.writeln('Type errors only.');
                           }