make CommonJsRequireContextDependency dedupable

@thomasboyt fixes https://gist.github.com/thomasboyt/d7e908184bd7da72a1c6
vjpr · Sep 26, 2014 · 7b97101 · 7b97101
1 parent 61e0212
commit 7b97101
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/lib/dependencies/ContextDependencyTemplateAsRequireCall.js b/lib/dependencies/ContextDependencyTemplateAsRequireCall.js
@@ -20,3 +20,12 @@ ContextDependencyTemplateAsRequireCall.prototype.apply = function(dep, source, o
 		source.replace(dep.range[0], dep.range[1]-1, content);
 	}
 };
+
+ContextDependencyTemplateAsRequireCall.prototype.applyAsTemplateArgument = function(name, dep, source, outputOptions, requestShortener) {
+	if(dep.valueRange) {
+		source.replace(dep.valueRange[1], dep.range[1]-1, ")");
+		source.replace(dep.range[0], dep.valueRange[0]-1, "__webpack_require__(" + name + ")(" + (typeof dep.prepend ===  "string" ? JSON.stringify(dep.prepend) : "") + "");
+	} else {
+		source.replace(dep.range[0], dep.range[1]-1, "__webpack_require__(" + name + ")");
+	}
+};
diff --git a/test/cases/compile/deduplication/dedupe1/index.js b/test/cases/compile/deduplication/dedupe1/index.js
@@ -1 +1,3 @@
-module.exports = require("../d") + require("./dupdep");
+module.exports = require("../d") + require("./dupdep");
+var ep = "ep";
+require("./dupd" + ep);
diff --git a/test/cases/compile/deduplication/dedupe2/index.js b/test/cases/compile/deduplication/dedupe2/index.js
@@ -1 +1,3 @@
-module.exports = require("../d") + require("./dupdep");
+module.exports = require("../d") + require("./dupdep");
+var ep = "ep";
+require("./dupd" + ep);