Use compiler.fileTimestamps cause watcher may be null (#587)

* Use compiler.fileTimestamps cause watcher may be null * Update CHANGELOG.md
TypeStrong · Jul 19, 2017 · ac17f1f · ac17f1f
1 parent c0e8477
commit ac17f1f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.3.1 - NOT RELEASED YET
+
+- [Fix undefined watcher in watch-run causes error](https://github.com/TypeStrong/ts-loader/pull/587) (#585) - thanks @zinserjan and @sokra! 
+
 ## v2.3.0
 
 - [add appendTsxSuffixTo option to support using tsx with Vue](https://github.com/TypeStrong/ts-loader/pull/581) - lots of discussion went into this PR. Thanks to @vhqtvn (author) and @HerringtonDarkholme, @johnnyreilly, @jbrantly, @octref, @rhyek and others for helping us land on our final implementation.

diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -127,6 +127,7 @@ export interface WebpackCompiler {
     isChild(): boolean;
     context: string; // a guess
     watchFileSystem: WebpackNodeWatchFileSystem;
+    fileTimestamps: {[key: string]: number};
 }
 
 export interface WebpackModule {

diff --git a/src/watch-run.ts b/src/watch-run.ts
@@ -12,13 +12,11 @@ function makeWatchRun(
     const lastTimes = {};
     let startTime : number = null;
     return (watching: interfaces.WebpackWatching, cb: () => void) => {
-        const watcher = watching.compiler.watchFileSystem.watcher ||
-            watching.compiler.watchFileSystem.wfs.watcher;
         if (null === instance.modifiedFiles) {
             instance.modifiedFiles = {};
         }
         startTime = startTime || watching.startTime;
-        const times = watcher.getTimes();
+        const times = watching.compiler.fileTimestamps;
         Object.keys(times)
             .filter(filePath =>
                 times[filePath] > (lastTimes[filePath] || startTime)