cr fixes

MhMadHamster · MhMadHamster · commit 87dd7a2ed40f · 2018-05-01T14:26:12.000+03:00
diff --git a/lib/NamedModulesPlugin.js b/lib/NamedModulesPlugin.js
@@ -22,35 +22,33 @@ class NamedModulesPlugin {
 		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) {
-						if (namedModules.has(module.id)) {
-							namedModules.get(module.id).push(module);
+						const namedModule = namedModules.get(module.id);
+						if (namedModule !== undefined) {
+							namedModule.push(module);
 						} else {
 							namedModules.set(module.id, [module]);
 						}
 					}
 				}
 
-				namedModules.forEach(namedModule => {
+				for (const namedModule of namedModules.values()) {
 					if (namedModule.length > 1) {
-						namedModule.forEach(module => {
-							if (module.issuer && module.issuer.id) {
-								const requestShortener = new RequestShortener(module.context);
-								module.id = `${module.id}?${getHash(
-									requestShortener.shorten(module.identifier())
-								)}`;
-							}
-						});
+						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/c.js b/test/configCases/module-name/different-issuers-for-same-module/c.js
@@ -1 +1 @@
-module.exports = "c";
+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
@@ -1,3 +1,3 @@
 module.exports = function(src) {
-	return `module.exports = "loader-a"`;
+	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
@@ -1,3 +1,3 @@
 module.exports = function(src) {
-	return `module.exports = "loader-b"`;
+	return `module.exports = "loader-b" + module.id`;
 };
diff --git a/test/configCases/module-name/different-issuers-for-same-module/test.config.js b/test/configCases/module-name/different-issuers-for-same-module/test.config.js
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
@@ -1,8 +1,6 @@
 it("should assign different names to the same module with different issuers ", function() {
-	var fs = require("fs");
-	var path = require("path");
-	var bundle = fs.readFileSync(path.join(__dirname, "main.js"), "utf-8");
-	expect(bundle.match(/"\.\/c\.js\?\w{4}":/g)).toHaveLength(2);
-	expect(require("./a")).toEqual("loader-a");
-	expect(require("./b")).toEqual("loader-b");
+	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
@@ -1,11 +1,6 @@
 module.exports = {
 	mode: "development",
-	output: {
-		filename: "main.js"
-	},
-	entry: {
-		main: ["./a", "./b", "./test"]
-	},
+	entry: ["./a", "./b", "./test"],
 	module: {
 		rules: [
 			{
@@ -19,8 +14,5 @@ module.exports = {
 				loader: "./loader-b"
 			}
 		]
-	},
-	node: {
-		__dirname: false
 	}
 };

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-module.exports = "c";`
	`1`	`+module.exports = module.id;`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,6 @@`
`1`	`1`	`module.exports = {`
`2`	`2`	`mode: "development",`
`3`		`- output: {`
`4`		`- filename: "main.js"`
`5`		`- },`
`6`		`- entry: {`
`7`		`- main: ["./a", "./b", "./test"]`
`8`		`- },`
	`3`	`+ entry: ["./a", "./b", "./test"],`
`9`	`4`	`module: {`
`10`	`5`	`rules: [`
`11`	`6`	`{`
`@@ -19,8 +14,5 @@ module.exports = {`
`19`	`14`	`loader: "./loader-b"`
`20`	`15`	`}`
`21`	`16`	`]`
`22`		`- },`
`23`		`- node: {`
`24`		`- __dirname: false`
`25`	`17`	`}`
`26`	`18`	`};`