Upgrade WatchIgnorePlugin to es6 (webpack#3693)

jtmthf · TheLarkInn · commit ce4ce3e7cf46 · 2017-01-04T00:20:51.000-06:00
* Upgrade WatchIgnorePlugin to es6

* Improved test coverage for WatchIgnorePlugin
Now tests ignoring of dirs
diff --git a/lib/WatchIgnorePlugin.js b/lib/WatchIgnorePlugin.js
@@ -2,48 +2,48 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-function WatchIgnorePlugin(paths) {
-	this.paths = paths;
+"use strict"
+
+class WatchIgnorePlugin {
+	constructor(paths) {
+		this.paths = paths;
+	}
+
+	apply(compiler) {
+		compiler.plugin("after-environment", () => {
+			compiler.watchFileSystem = new IgnoringWatchFileSystem(compiler.watchFileSystem, this.paths);
+		});
+	}
 }
 
 module.exports = WatchIgnorePlugin;
 
-WatchIgnorePlugin.prototype.apply = function(compiler) {
-	compiler.plugin("after-environment", function() {
-		compiler.watchFileSystem = new IgnoringWatchFileSystem(compiler.watchFileSystem, this.paths);
-	}.bind(this));
-};
+class IgnoringWatchFileSystem {
+	constructor(wfs, paths) {
+		this.wfs = wfs;
+		this.paths = paths;
+	}
 
-function IgnoringWatchFileSystem(wfs, paths) {
-	this.wfs = wfs;
-	this.paths = paths;
-}
+	watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
+		const ignored = path => this.paths.some(p => p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0);
 
-IgnoringWatchFileSystem.prototype.watch = function(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
-	var ignored = function(path) {
-		return this.paths.some(function(p) {
-			return p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0;
-		});
-	}.bind(this);
+		const notIgnored = path => !ignored(path);
 
-	var notIgnored = function(path) {
-		return !ignored(path);
-	};
+		const ignoredFiles = files.filter(ignored);
+		const ignoredDirs = dirs.filter(ignored);
 
-	var ignoredFiles = files.filter(ignored);
-	var ignoredDirs = dirs.filter(ignored);
+		this.wfs.watch(files.filter(notIgnored), dirs.filter(notIgnored), missing, startTime, options, (err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps) => {
+			if(err) return callback(err);
 
-	this.wfs.watch(files.filter(notIgnored), dirs.filter(notIgnored), missing, startTime, options, function(err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps) {
-		if(err) return callback(err);
+			ignoredFiles.forEach(path => {
+				fileTimestamps[path] = 1;
+			});
 
-		ignoredFiles.forEach(function(path) {
-			fileTimestamps[path] = 1;
-		});
-
-		ignoredDirs.forEach(function(path) {
-			dirTimestamps[path] = 1;
-		});
+			ignoredDirs.forEach(path => {
+				dirTimestamps[path] = 1;
+			});
 
-		callback(err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps);
-	}, callbackUndelayed);
-};
+			callback(err, filesModified, dirsModified, missingModified, fileTimestamps, dirTimestamps);
+		}, callbackUndelayed);
+	}
+}
diff --git a/test/watchCases/plugins/watch-ignore-plugin/0/foo/0.js b/test/watchCases/plugins/watch-ignore-plugin/0/foo/0.js
@@ -0,0 +1 @@
+export default 0;
diff --git a/test/watchCases/plugins/watch-ignore-plugin/0/index.js b/test/watchCases/plugins/watch-ignore-plugin/0/index.js
@@ -1,6 +1,8 @@
 import value from "./file"
 import a from "./a"
-it("should ignore change to file", function() {
+const req = require.context("./foo", false, /^.*\.js$/);
+it("should ignore change to file and directory", function() {
 	a.should.be.eql(+WATCH_STEP);
+	req.keys().should.be.deepEqual(["./0.js"])
 	value.should.be.eql(1);
 });
diff --git a/test/watchCases/plugins/watch-ignore-plugin/1/foo/1.js b/test/watchCases/plugins/watch-ignore-plugin/1/foo/1.js
@@ -0,0 +1 @@
+export default 1;
diff --git a/test/watchCases/plugins/watch-ignore-plugin/2/foo/2.js b/test/watchCases/plugins/watch-ignore-plugin/2/foo/2.js
@@ -0,0 +1 @@
+export default 2;
diff --git a/test/watchCases/plugins/watch-ignore-plugin/webpack.config.js b/test/watchCases/plugins/watch-ignore-plugin/webpack.config.js
@@ -1,7 +1,8 @@
 var webpack = require("../../../../");
+var path = require("path");
 
 module.exports = {
 	plugins: [
-		new webpack.WatchIgnorePlugin([/file\.js$/])
+		new webpack.WatchIgnorePlugin([/file\.js$/, /foo$/])
 	]
 };

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`var webpack = require("../../../../");`
	`2`	`+var path = require("path");`
`2`	`3`
`3`	`4`	`module.exports = {`
`4`	`5`	`plugins: [`
`5`		`- new webpack.WatchIgnorePlugin([/file\.js$/])`
	`6`	`+ new webpack.WatchIgnorePlugin([/file\.js$/, /foo$/])`
`6`	`7`	`]`
`7`	`8`	`};`