Merge pull request webpack#7152 from MhMadHamster/handle-module-name-conflicts

sokra · web-flow · commit 14cee2ea9b78 · 2018-05-01T14:22:08.000+02:00
fix module name conflicts
diff --git a/lib/NamedModulesPlugin.js b/lib/NamedModulesPlugin.js
@@ -4,6 +4,15 @@
 */
 "use strict";
 
+const createHash = require("./util/createHash");
+const RequestShortener = require("./RequestShortener");
+
+const getHash = str => {
+	const hash = createHash("md4");
+	hash.update(str);
+	return hash.digest("hex").substr(0, 4);
+};
+
 class NamedModulesPlugin {
 	constructor(options) {
 		this.options = options || {};
@@ -12,11 +21,32 @@ class NamedModulesPlugin {
 	apply(compiler) {
 		compiler.hooks.compilation.tap("NamedModulesPlugin", compilation => {
 			compilation.hooks.beforeModuleIds.tap("NamedModulesPlugin", modules => {
+				const namedModules = new Map();
+				const context = this.options.context || compiler.options.context;
+
 				for (const module of modules) {
 					if (module.id === null && module.libIdent) {
-						module.id = module.libIdent({
-							context: this.options.context || compiler.options.context
-						});
+						module.id = module.libIdent({ context });
+					}
+
+					if (module.id !== null) {
+						const namedModule = namedModules.get(module.id);
+						if (namedModule !== undefined) {
+							namedModule.push(module);
+						} else {
+							namedModules.set(module.id, [module]);
+						}
+					}
+				}
+
+				for (const namedModule of namedModules.values()) {
+					if (namedModule.length > 1) {
+						for (const module of namedModule) {
+							const requestShortener = new RequestShortener(context);
+							module.id = `${module.id}?${getHash(
+								requestShortener.shorten(module.identifier())
+							)}`;
+						}
 					}
 				}
 			});
diff --git a/test/configCases/module-name/different-issuers-for-same-module/a.js b/test/configCases/module-name/different-issuers-for-same-module/a.js
@@ -0,0 +1 @@
+module.exports = require("./c");
diff --git a/test/configCases/module-name/different-issuers-for-same-module/b.js b/test/configCases/module-name/different-issuers-for-same-module/b.js
@@ -0,0 +1 @@
+module.exports = require("./c");
diff --git a/test/configCases/module-name/different-issuers-for-same-module/c.js b/test/configCases/module-name/different-issuers-for-same-module/c.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/module-name/different-issuers-for-same-module/loader-a.js b/test/configCases/module-name/different-issuers-for-same-module/loader-a.js
@@ -0,0 +1,3 @@
+module.exports = function(src) {
+	return `module.exports = "loader-a" + module.id`;
+};
diff --git a/test/configCases/module-name/different-issuers-for-same-module/loader-b.js b/test/configCases/module-name/different-issuers-for-same-module/loader-b.js
@@ -0,0 +1,3 @@
+module.exports = function(src) {
+	return `module.exports = "loader-b" + module.id`;
+};
diff --git a/test/configCases/module-name/different-issuers-for-same-module/test.js b/test/configCases/module-name/different-issuers-for-same-module/test.js
@@ -0,0 +1,6 @@
+it("should assign different names to the same module with different issuers ", function() {
+	var regex = "\\./c\\.js\\?\\w{4}";
+	expect(require("./c")).toMatch(new RegExp(regex));
+	expect(require("./a")).toMatch(new RegExp("loader-a" + regex));
+	expect(require("./b")).toMatch(new RegExp("loader-b" + regex));
+});
diff --git a/test/configCases/module-name/different-issuers-for-same-module/webpack.config.js b/test/configCases/module-name/different-issuers-for-same-module/webpack.config.js
@@ -0,0 +1,18 @@
+module.exports = {
+	mode: "development",
+	entry: ["./a", "./b", "./test"],
+	module: {
+		rules: [
+			{
+				test: /c\.js/,
+				issuer: /a\.js/,
+				loader: "./loader-a"
+			},
+			{
+				test: /c\.js/,
+				issuer: /b\.js/,
+				loader: "./loader-b"
+			}
+		]
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = function(src) {`
	`2`	+ return `module.exports = "loader-a" + module.id`;
	`3`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = function(src) {`
	`2`	+ return `module.exports = "loader-b" + module.id`;
	`3`	`+};`