Merge pull request webpack#4989 from restrry/issue-4980

sokra · web-flow · commit 120de91a1d0a · 2017-06-03T07:47:04.000+02:00
changing importing order for named and default exports affects common chunk chunkhash
diff --git a/lib/Module.js b/lib/Module.js
@@ -162,6 +162,9 @@ class Module extends DependenciesBlock {
 		super.sortItems();
 		this.chunks.sort(byId);
 		this.reasons.sort((a, b) => byId(a.module, b.module));
+		if(Array.isArray(this.usedExports)) {
+			this.usedExports.sort();
+		}
 	}
 
 	unbuild() {
diff --git a/test/statsCases/commons-plugin-issue-4980/constants.js b/test/statsCases/commons-plugin-issue-4980/constants.js
@@ -0,0 +1,5 @@
+export const a = "a";
+export const b = "b";
+export const c = "c";
+
+export default "d";
diff --git a/test/statsCases/commons-plugin-issue-4980/entry-1.js b/test/statsCases/commons-plugin-issue-4980/entry-1.js
@@ -0,0 +1,2 @@
+import subA from './submodule-a';
+import subB from './submodule-b'
diff --git a/test/statsCases/commons-plugin-issue-4980/entry-2.js b/test/statsCases/commons-plugin-issue-4980/entry-2.js
@@ -0,0 +1,2 @@
+import subB from './submodule-a'
+import subC from './submodule-c';
diff --git a/test/statsCases/commons-plugin-issue-4980/expected.txt b/test/statsCases/commons-plugin-issue-4980/expected.txt
@@ -0,0 +1,29 @@
+Hash: 7d3a56317b2e339b1d822897fe6052020598632c
+Child
+    Hash: 7d3a56317b2e339b1d82
+    Time: Xms
+                             Asset       Size  Chunks             Chunk Names
+                            app.js    1.27 kB       0  [emitted]  app
+    vendor.bd2b4219dfda1a951495.js  443 bytes       1  [emitted]  vendor
+                        runtime.js    5.94 kB       2  [emitted]  runtime
+    chunk    {0} app.js (app) 185 bytes {1} [initial] [rendered]
+     [./entry-1.js] (webpack)/test/statsCases/commons-plugin-issue-4980/entry-1.js 67 bytes {0} [built]
+     [./submodule-a.js] (webpack)/test/statsCases/commons-plugin-issue-4980/submodule-a.js 59 bytes {0} [built]
+     [./submodule-b.js] (webpack)/test/statsCases/commons-plugin-issue-4980/submodule-b.js 59 bytes {0} [built]
+    chunk    {1} vendor.bd2b4219dfda1a951495.js (vendor) 87 bytes {2} [initial] [rendered]
+     [./constants.js] (webpack)/test/statsCases/commons-plugin-issue-4980/constants.js 87 bytes {1} [built]
+    chunk    {2} runtime.js (runtime) 0 bytes [entry] [rendered]
+Child
+    Hash: 2897fe6052020598632c
+    Time: Xms
+                             Asset       Size  Chunks             Chunk Names
+                            app.js    1.32 kB       0  [emitted]  app
+    vendor.bd2b4219dfda1a951495.js  443 bytes       1  [emitted]  vendor
+                        runtime.js    5.94 kB       2  [emitted]  runtime
+    chunk    {0} app.js (app) 192 bytes {1} [initial] [rendered]
+     [./entry-2.js] (webpack)/test/statsCases/commons-plugin-issue-4980/entry-2.js 67 bytes {0} [built]
+     [./submodule-a.js] (webpack)/test/statsCases/commons-plugin-issue-4980/submodule-a.js 59 bytes {0} [built]
+     [./submodule-c.js] (webpack)/test/statsCases/commons-plugin-issue-4980/submodule-c.js 66 bytes {0} [built]
+    chunk    {1} vendor.bd2b4219dfda1a951495.js (vendor) 87 bytes {2} [initial] [rendered]
+     [./constants.js] (webpack)/test/statsCases/commons-plugin-issue-4980/constants.js 87 bytes {1} [built]
+    chunk    {2} runtime.js (runtime) 0 bytes [entry] [rendered]
diff --git a/test/statsCases/commons-plugin-issue-4980/submodule-a.js b/test/statsCases/commons-plugin-issue-4980/submodule-a.js
@@ -0,0 +1,3 @@
+import d, { a } from './constants';
+
+export default d + a;
diff --git a/test/statsCases/commons-plugin-issue-4980/submodule-b.js b/test/statsCases/commons-plugin-issue-4980/submodule-b.js
@@ -0,0 +1,3 @@
+import { b, c } from './constants';
+
+export default b + c;
diff --git a/test/statsCases/commons-plugin-issue-4980/submodule-c.js b/test/statsCases/commons-plugin-issue-4980/submodule-c.js
@@ -0,0 +1,3 @@
+import { a, b, c } from './constants';
+
+export default a + b + c;
diff --git a/test/statsCases/commons-plugin-issue-4980/webpack.config.js b/test/statsCases/commons-plugin-issue-4980/webpack.config.js
@@ -0,0 +1,35 @@
+var CommonsChunkPlugin = require("../../../lib/optimize/CommonsChunkPlugin");
+var NamedModulesPlugin = require("../../../lib/NamedModulesPlugin");
+
+// should generate vendor chunk with the same chunkhash for both entries
+module.exports = [{
+	entry: {
+		app: "./entry-1.js"
+	},
+	plugins: [
+		new NamedModulesPlugin(),
+		new CommonsChunkPlugin({
+			name: "vendor",
+			filename: "[name].[chunkhash].js",
+			minChunks: m => /constants/.test(m.resource)
+		}),
+		new CommonsChunkPlugin({
+			name: "runtime"
+		})
+	]
+},{
+	entry: {
+		app: "./entry-2.js"
+	},
+	plugins: [
+		new NamedModulesPlugin(),
+		new CommonsChunkPlugin({
+			name: "vendor",
+			filename: "[name].[chunkhash].js",
+			minChunks: m => /constants/.test(m.resource)
+		}),
+		new CommonsChunkPlugin({
+			name: "runtime"
+		})
+	]
+}];

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,9 @@ class Module extends DependenciesBlock {`
`162`	`162`	`super.sortItems();`
`163`	`163`	`this.chunks.sort(byId);`
`164`	`164`	`this.reasons.sort((a, b) => byId(a.module, b.module));`
	`165`	`+ if(Array.isArray(this.usedExports)) {`
	`166`	`+ this.usedExports.sort();`
	`167`	`+ }`
`165`	`168`	`}`
`166`	`169`
`167`	`170`	`unbuild() {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import subA from './submodule-a';`
	`2`	`+import subB from './submodule-b'`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import subB from './submodule-a'`
	`2`	`+import subC from './submodule-c';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import d, { a } from './constants';`
	`2`	`+`
	`3`	`+export default d + a;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { b, c } from './constants';`
	`2`	`+`
	`3`	`+export default b + c;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { a, b, c } from './constants';`
	`2`	`+`
	`3`	`+export default a + b + c;`