Skip to content

Commit 7b97101

Browse files
sokrasokra
committed
make CommonJsRequireContextDependency dedupable
@thomasboyt fixes https://gist.github.com/thomasboyt/d7e908184bd7da72a1c6
1 parent 61e0212 commit 7b97101

3 files changed

Lines changed: 15 additions & 2 deletions

File tree

‎lib/dependencies/ContextDependencyTemplateAsRequireCall.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,12 @@ ContextDependencyTemplateAsRequireCall.prototype.apply = function(dep, source, o
2020
source.replace(dep.range[0], dep.range[1]-1, content);
2121
}
2222
};
23+
24+
ContextDependencyTemplateAsRequireCall.prototype.applyAsTemplateArgument = function(name, dep, source, outputOptions, requestShortener) {
25+
if(dep.valueRange) {
26+
source.replace(dep.valueRange[1], dep.range[1]-1, ")");
27+
source.replace(dep.range[0], dep.valueRange[0]-1, "__webpack_require__(" + name + ")(" + (typeof dep.prepend === "string" ? JSON.stringify(dep.prepend) : "") + "");
28+
} else {
29+
source.replace(dep.range[0], dep.range[1]-1, "__webpack_require__(" + name + ")");
30+
}
31+
};

‎test/cases/compile/deduplication/dedupe1/index.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
module.exports = require("../d") + require("./dupdep");
1+
module.exports = require("../d") + require("./dupdep");
2+
var ep = "ep";
3+
require("./dupd" + ep);

‎test/cases/compile/deduplication/dedupe2/index.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
module.exports = require("../d") + require("./dupdep");
1+
module.exports = require("../d") + require("./dupdep");
2+
var ep = "ep";
3+
require("./dupd" + ep);

0 commit comments

Comments
 (0)