added more parameters to ContextReplacementPlugin

sokra · sokra · commit b7480d873457 · 2014-06-17T22:38:17.000+02:00
webpack#315
diff --git a/lib/ContextReplacementPlugin.js b/lib/ContextReplacementPlugin.js
@@ -2,26 +2,49 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-function ContextReplacementPlugin(resourceRegExp, newContentRegExp) {
+function ContextReplacementPlugin(resourceRegExp, newContentResource, newContentRecursive, newContentRegExp) {
 	this.resourceRegExp = resourceRegExp;
-	this.newContentRegExp = newContentRegExp
+	if(typeof newContentResource !== "string") {
+		newContentRegExp = newContentRecursive;
+		newContentRecursive = newContentResource;
+		newContentResource = undefined;
+	}
+	if(typeof newContentRecursive !== "boolean") {
+		newContentRegExp = newContentRecursive;
+		newContentRecursive = undefined;
+	}
+	this.newContentResource = newContentResource;
+	this.newContentRecursive = newContentRecursive;
+	this.newContentRegExp = newContentRegExp;
 }
 module.exports = ContextReplacementPlugin;
 ContextReplacementPlugin.prototype.apply = function(compiler) {
 	var resourceRegExp = this.resourceRegExp;
+	var newContentResource = this.newContentResource;
+	var newContentRecursive = this.newContentRecursive;
 	var newContentRegExp = this.newContentRegExp;
 	compiler.plugin("context-module-factory", function(cmf) {
 		cmf.plugin("before-resolve", function(result, callback) {
 			if(!result) return callback();
 			if(resourceRegExp.test(result.request)) {
-				result.regExp = newContentRegExp;
+				if(typeof newContentResource !== "undefined")
+					result.request = newContentResource;
+				if(typeof newContentRecursive !== "undefined")
+					result.recursive = newContentRecursive;
+				if(typeof newContentRegExp !== "undefined")
+					result.regExp = newContentRegExp;
 			}
 			return callback(null, result);
 		});
 		cmf.plugin("after-resolve", function(result, callback) {
 			if(!result) return callback();
 			if(resourceRegExp.test(result.resource)) {
-				result.regExp = newContentRegExp;
+				if(typeof newContentResource !== "undefined")
+					result.resource = newContentResource;
+				if(typeof newContentRecursive !== "undefined")
+					result.recursive = newContentRecursive;
+				if(typeof newContentRegExp !== "undefined")
+					result.regExp = newContentRegExp;
 			}
 			return callback(null, result);
 		});
diff --git a/test/configCases/context-replacement/a/index.js b/test/configCases/context-replacement/a/index.js
@@ -0,0 +1,11 @@
+it("should replace a context with a new resource and reqExp", function(done) {
+	function rqInContext(x, callback) {
+		require([x], function(x) {
+			callback(x);
+		});
+	}
+	rqInContext("replaced", function(r) {
+		r.should.be.eql("ok");
+		done();
+	});
+});
diff --git a/test/configCases/context-replacement/a/new-context/node_modules/error.js b/test/configCases/context-replacement/a/new-context/node_modules/error.js
diff --git a/test/configCases/context-replacement/a/new-context/node_modules/replaced.js b/test/configCases/context-replacement/a/new-context/node_modules/replaced.js
diff --git a/test/configCases/context-replacement/a/warnings.js b/test/configCases/context-replacement/a/warnings.js
@@ -0,0 +1,3 @@
+module.exports = [
+	[/Critical dependencies/, /a\/index\.js/]
+];
diff --git a/test/configCases/context-replacement/a/webpack.config.js b/test/configCases/context-replacement/a/webpack.config.js
@@ -0,0 +1,8 @@
+var path = require("path");
+var webpack = require("../../../../");
+
+module.exports = {
+	plugins: [
+		new webpack.ContextReplacementPlugin(/context-replacement.a$/, path.join(__dirname, "new-context"), true, /^replaced$/)
+	]
+};
diff --git a/test/configCases/context-replacement/b/error.js b/test/configCases/context-replacement/b/error.js
@@ -0,0 +1,7 @@
+This
+should
+result
+in
+an
+error
+}])
diff --git a/test/configCases/context-replacement/b/index.js b/test/configCases/context-replacement/b/index.js
@@ -0,0 +1,6 @@
+it("should replace a context with a new regExp", function() {
+	function rqInContext(x) {
+		return require(x);
+	}
+	rqInContext("./only-this").should.be.eql("ok");
+});
diff --git a/test/configCases/context-replacement/b/only-this.js b/test/configCases/context-replacement/b/only-this.js
@@ -0,0 +1 @@
+module.exports = "ok";
diff --git a/test/configCases/context-replacement/b/warnings.js b/test/configCases/context-replacement/b/warnings.js
@@ -0,0 +1,3 @@
+module.exports = [
+	[/Critical dependencies/, /b\/index\.js/]
+];
diff --git a/test/configCases/context-replacement/b/webpack.config.js b/test/configCases/context-replacement/b/webpack.config.js
@@ -0,0 +1,8 @@
+var path = require("path");
+var webpack = require("../../../../");
+
+module.exports = {
+	plugins: [
+		new webpack.ContextReplacementPlugin(/context-replacement.b$/, /^\.\/only/)
+	]
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = [`
	`2`	`+ [/Critical dependencies/, /a\/index\.js/]`
	`3`	`+];`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +This
 +should
 +result
 +in
 +an
 +error
 +}])
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = [`
	`2`	`+ [/Critical dependencies/, /b\/index\.js/]`
	`3`	`+];`