Add support for IgnoringWatchFileSystem-instance in watcher (#444)

* Add support for IgnoringWatchFileSystem-instance in watcher

* Add comparison test concerning #441

src/interfaces.ts

@@ -138,10 +138,15 @@ export interface WebpackModule {
     };
 }
 
+export interface Watcher {
+    mtimes: number; // a guess
+}
+
 export interface WebpackNodeWatchFileSystem {
-    watcher: {
-        mtimes: number; // a guess
-    };
+    watcher?: Watcher;
+    wfs?: {
+        watcher: Watcher;
+    }
 }
 
 export interface WebpackWatching {

src/watch-run.ts

@@ -10,12 +10,13 @@ function makeWatchRun(
     instance: interfaces.TSInstance
 ) {
     return (watching: interfaces.WebpackWatching, cb: () => void) => {
-        const mtimes = watching.compiler.watchFileSystem.watcher.mtimes;
+        const watcher = watching.compiler.watchFileSystem.watcher ||
+            watching.compiler.watchFileSystem.wfs.watcher;
         if (null === instance.modifiedFiles) {
             instance.modifiedFiles = {};
         }
 
-        Object.keys(mtimes)
+        Object.keys(watcher.mtimes)
             .filter(filePath => !!filePath.match(constants.tsTsxJsJsxRegex))
             .forEach(filePath => {
                 filePath = path.normalize(filePath);

test/comparison-tests/issue441/app.ts

@@ -0,0 +1,4 @@
+import {IFoo} from './foo'
+
+var foo: IFoo;
+foo.bar = 'foobar'

test/comparison-tests/issue441/expectedOutput-2.0/bundle.js

@@ -0,0 +1,53 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.loaded = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ function(module, exports) {
+
+	"use strict";
+	var foo;
+	foo.bar = 'foobar';
+
+
+/***/ }
+/******/ ]);

test/comparison-tests/issue441/expectedOutput-2.0/output.txt

@@ -0,0 +1,4 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  1.43 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 43 bytes [rendered]
+    [0] ./.test/issue441/app.ts 43 bytes {0} [built]

test/comparison-tests/issue441/expectedOutput-2.0/patch0/bundle.js

@@ -0,0 +1,53 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.loaded = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ function(module, exports) {
+
+	"use strict";
+	var foo;
+	foo.bar = 'foobar';
+
+
+/***/ }
+/******/ ]);

test/comparison-tests/issue441/expectedOutput-2.0/patch0/output.txt

@@ -0,0 +1,4 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  1.43 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 43 bytes [rendered]
+    [0] ./.test/issue441/app.ts 43 bytes {0} [built]

test/comparison-tests/issue441/expectedOutput-2.0/patch1/bundle.js

@@ -0,0 +1,53 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.loaded = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ function(module, exports) {
+
+	"use strict";
+	var foo;
+	foo.bar = 'foobar';
+
+
+/***/ }
+/******/ ]);

test/comparison-tests/issue441/expectedOutput-2.0/patch1/output.txt

@@ -0,0 +1,4 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  1.43 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 43 bytes [rendered]
+    [0] ./.test/issue441/app.ts 43 bytes {0} [built]

test/comparison-tests/issue441/expectedOutput-2.1/bundle.js

@@ -0,0 +1,80 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// identity function for calling harmony imports with the correct context
+/******/ 	__webpack_require__.i = function(value) { return value; };
+
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, {
+/******/ 				configurable: false,
+/******/ 				enumerable: true,
+/******/ 				get: getter
+/******/ 			});
+/******/ 		}
+/******/ 	};
+
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var foo;
+foo.bar = 'foobar';
+
+
+/***/ })
+/******/ ]);

test/comparison-tests/issue441/expectedOutput-2.1/output.txt

@@ -0,0 +1,4 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  2.57 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
+    [0] ./.test/issue441/app.ts 43 bytes {0} [built]

test/comparison-tests/issue441/expectedOutput-2.1/patch0/bundle.js

@@ -0,0 +1,80 @@
+/******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// identity function for calling harmony imports with the correct context
+/******/ 	__webpack_require__.i = function(value) { return value; };
+
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, {
+/******/ 				configurable: false,
+/******/ 				enumerable: true,
+/******/ 				get: getter
+/******/ 			});
+/******/ 		}
+/******/ 	};
+
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var foo;
+foo.bar = 'foobar';
+
+
+/***/ })
+/******/ ]);

test/comparison-tests/issue441/expectedOutput-2.1/patch0/output.txt

@@ -0,0 +1,4 @@
+    Asset     Size  Chunks             Chunk Names
+bundle.js  2.57 kB       0  [emitted]  main
+chunk    {0} bundle.js (main) 43 bytes [entry] [rendered]
+    [0] ./.test/issue441/app.ts 43 bytes {0} [built]