resolve resource in ContextReplacementPlugin

sokra · sokra · commit af0be8de0795 · 2014-06-17T22:46:24.000+02:00
diff --git a/lib/ContextReplacementPlugin.js b/lib/ContextReplacementPlugin.js
@@ -2,6 +2,8 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
+var path = require("path");
+
 function ContextReplacementPlugin(resourceRegExp, newContentResource, newContentRecursive, newContentRegExp) {
 	this.resourceRegExp = resourceRegExp;
 	if(typeof newContentResource !== "string") {
@@ -40,7 +42,7 @@ ContextReplacementPlugin.prototype.apply = function(compiler) {
 			if(!result) return callback();
 			if(resourceRegExp.test(result.resource)) {
 				if(typeof newContentResource !== "undefined")
-					result.resource = newContentResource;
+					result.resource = path.resolve(result.resource, newContentResource);
 				if(typeof newContentRecursive !== "undefined")
 					result.recursive = newContentRecursive;
 				if(typeof newContentRegExp !== "undefined")
diff --git a/test/configCases/context-replacement/a/webpack.config.js b/test/configCases/context-replacement/a/webpack.config.js
@@ -3,6 +3,6 @@ var webpack = require("../../../../");
 
 module.exports = {
 	plugins: [
-		new webpack.ContextReplacementPlugin(/context-replacement.a$/, path.join(__dirname, "new-context"), true, /^replaced$/)
+		new webpack.ContextReplacementPlugin(/context-replacement.a$/, "new-context", true, /^replaced$/)
 	]
 };

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ var webpack = require("../../../../");`
`3`	`3`
`4`	`4`	`module.exports = {`
`5`	`5`	`plugins: [`
`6`		`- new webpack.ContextReplacementPlugin(/context-replacement.a$/, path.join(__dirname, "new-context"), true, /^replaced$/)`
	`6`	`+ new webpack.ContextReplacementPlugin(/context-replacement.a$/, "new-context", true, /^replaced$/)`
`7`	`7`	`]`
`8`	`8`	`};`