Merge branch 'next' into feature/vue

Author: piotr-oles

.travis.yml

@@ -4,7 +4,7 @@ deploy:
   email: [email protected]
   skip_cleanup: true
   api_key:
-    secure: RdoLwtLDz3PI8fhTg0wXeRuL9JAffNJSTJvNExk9Q+fcccBl8yaNU4AId5OcuDwO3pnb59nKv8fIidW9VzemZ8/eCqCBbCx4qzGFxN2uCB+aBwQ7Svu6GAJV0JIEgIXG+dkByRawd9hCIyvi6IvhIA/XbVbboV5ngjwSW317SA0lbznGHQmIT4o93+YpUuT+pkGC04eJGIH6cgAe61QGwN6WyGx8hfJ+K+OCksZ5A4RIeSkRHY4zRgmlGGtSwOutUPh3OMIdG40E0UXLn3MRdANzekMFSowMZ8aFliqhDsgk/zk8IC/X6OlPFSTAmO1IkKqZiJsr1rxmeJvC9GDxvRZ3Vyv3GncoteEQVjKFsYRlTvmEouECSxafl2aOqa1i2TqU8if5GjgB6mm+pTjDTzF4KB3QkEtRKgTuB47+EUc5zXIBrgIAb3sWu+QgaSFOreG49cGccCsU0viLe2WHbjzuNUP3IMO0x9tL/rm0RQmP3FjQSWlDg6VXYjJs5UcpiQLabgL3u4tso9aYprqTKihqfQkyfi0R5qH872ncGlASkzwbcZxiUeWau3yx46iZdckPNTAKw0afeodmr7aL6B+xEWHfZv9OBn0UE5I23jvIlI+wzyWHWUgeVikBx1ZZV4OqAHOTdEMHQivbir4eYGGAYtY6yxzLpyfD4g0xIzM=
+    secure: L1iiDkvSgk7uIhdeglWijy8GqSQ63Uu7F/3TB1LEJN2xQ0YgbrBBW2Y1WFzBuVncaLzGV7YtS4eSGT1tjTqEl/c2I4vMdlsusFMSRuA3vDOYc0Uqwn3cjT1X23Exv0foj/Ifltv0idn21TVFWKNy3RSpf1IZ1ZyX9PTBn1QCeUpmlPm5f9HRMOrV7jBPOxS3eS7eeuZvzMk+EsA1XwLhJIhasd0gGXDnItLnCGN+7hrrGEppOQCQhKFfv3cA5hScLSoYUtHwGxryddyhia+UyOfcliXtfb2lvuzJ6rJjRrW6Gce33m1MEXYpOAqkCoF5BXrCLhEfCN+MkfaF9hd8Ytj3DEbIwetcj4XH7rPaiIjN9yKBYkOWeUPUeQ9HRbJ3Nwvapn6od3bHfRr0qCGlltEOtBcMKkARBWd3CiMEJolgoZ1q+w25DZYi9D76jBf8m8MDf2rAt2RapSnBpn70wkPWrcw/+vj/Y5ZQJDj6hzyk/sGTVNOemwtBDa/ishJKVugEQgW+F3mdqoFAfMZrg40yPgj3X34RRUgtTPDGSRZ5+Q57Mt61vcSkNmJWS/oU2zJyHiZEsz0mKOyjko4bip/zkc7oP81GONQ/+EESWuBJusF2ypG/6FJChfgz3XS18jzSRvtihUqLbN30Mvt2mkCeh7GxChVNJVyclCM5HKE=
   on:
     tags: true
     branch: master

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.2.10
+ * Fix #80 "Cannot read property 'getLineAndCharacterOfPosition' of undefined"
+ * Fix #76 "TypeError: Cannot read property '0' of undefined"
+
 ## v0.2.9
  * Make errors formatting closer to `ts-loader` style
  * Handle tslint exclude option

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fork-ts-checker-webpack-plugin",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Runs typescript type checker and linter on separate process.",
   "main": "lib/index.js",
   "files": [

src/NormalizedMessage.ts

@@ -44,16 +44,24 @@ class NormalizedMessage {
   // message types
   static createFromDiagnostic(diagnostic: tsTypes.Diagnostic) {
     const ts: typeof tsTypes = require('typescript');
-    const position = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+    let file: string;
+    let line: number;
+    let character: number;
+    if (diagnostic.file) {
+      file = diagnostic.file.fileName;
+      const position = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+      line = position.line + 1;
+      character = position.character + 1;
+    }
 
     return new NormalizedMessage({
       type: NormalizedMessage.TYPE_DIAGNOSTIC,
       code: diagnostic.code,
       severity: ts.DiagnosticCategory[diagnostic.category].toLowerCase() as Severity,
       content: ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
-      file: diagnostic.file.fileName,
-      line: position.line + 1,
-      character: position.character + 1
+      file: file,
+      line: line,
+      character: character
     });
   }
 

src/index.ts

@@ -423,7 +423,7 @@ class ForkTsCheckerWebpackPlugin {
   }
 
   createEmitCallback(compilation: any, callback: () => void) {
-    const emitCallback = () => {
+    return function emitCallback (this: ForkTsCheckerWebpackPlugin) {
       const elapsed = Math.round(this.elapsed[0] * 1E9 + this.elapsed[1]);
 
       this.compiler.applyPlugins(
@@ -457,8 +457,6 @@ class ForkTsCheckerWebpackPlugin {
 
       callback();
     };
-
-    return emitCallback;
   }
 
   createNoopEmitCallback() {
@@ -467,7 +465,7 @@ class ForkTsCheckerWebpackPlugin {
   }
 
   createDoneCallback() {
-    const doneCallback = () => {
+    return function doneCallback (this: ForkTsCheckerWebpackPlugin) {
       const elapsed = Math.round(this.elapsed[0] * 1E9 + this.elapsed[1]);
 
       if (this.compiler) {
@@ -499,7 +497,6 @@ class ForkTsCheckerWebpackPlugin {
         this.logger.info('Time: ' + this.colors.bold(Math.round(elapsed / 1E6).toString()) + 'ms');
       }
     };
-    return doneCallback;
   }
 }