Merge branch 'master' into next

sokra · sokra · commit ca1c91c576c4 · 2018-01-04T21:47:33.000+01:00
# Conflicts:
#	lib/Chunk.js
#	lib/MainTemplate.js
#	test/statsCases/commons-chunk-min-size-0/expected.txt
#	test/statsCases/commons-plugin-issue-4980/expected.txt
#	test/statsCases/named-chunks-plugin/expected.txt
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -535,7 +535,7 @@ class Chunk {
 		return this.addMultiplierAndOverhead(integratedModulesSize, options);
 	}
 
-	getChunkMaps(includeEntries, realHash) {
+	getChunkMaps(includeInitial, realHash) {
 		const chunkHashMap = Object.create(null);
 		const chunkNameMap = Object.create(null);
 
@@ -544,7 +544,7 @@ class Chunk {
 
 		while(queue.length > 0) {
 			const chunk = queue.pop();
-			if(!chunk.hasRuntime() || includeEntries) {
+			if(!chunk.isInitial() || includeInitial) {
 				chunkHashMap[chunk.id] = realHash ? chunk.hash : chunk.renderedHash;
 				if(chunk.name)
 					chunkNameMap[chunk.id] = chunk.name;
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -130,7 +130,9 @@ module.exports = class MainTemplate extends Tapable {
 		});
 		this.hooks.requireExtensions.tap("MainTemplate", (source, chunk, hash) => {
 			const buf = [];
-			if(chunk.getNumberOfChunks() > 0) {
+			const chunkMaps = chunk.getChunkMaps();
+			// Check if there are non initial chunks which need to be imported using require-ensure
+			if(Object.keys(chunkMaps.hash).length) {
 				buf.push("// This file contains only the entry chunk.");
 				buf.push("// The chunk loading function for additional chunks");
 				buf.push(`${this.requireFn}.e = function requireEnsure(chunkId) {`);
diff --git a/test/statsCases/commons-chunk-min-size-0/expected.txt b/test/statsCases/commons-chunk-min-size-0/expected.txt
@@ -2,7 +2,7 @@ Hash: 96561e55e52ce5dd05d9
 Time: Xms
       Asset      Size  Chunks             Chunk Names
  entry-1.js  81 bytes       0  [emitted]  entry-1
-vendor-1.js  8.01 KiB       1  [emitted]  vendor-1
+vendor-1.js  5.62 KiB       1  [emitted]  vendor-1
    [0] ./modules/a.js 22 bytes {1} [built]
    [1] ./modules/b.js 22 bytes {1} [built]
    [2] ./modules/c.js 22 bytes {1} [built]
diff --git a/test/statsCases/commons-plugin-issue-4980/expected.txt b/test/statsCases/commons-plugin-issue-4980/expected.txt
@@ -5,7 +5,7 @@ Child
                              Asset       Size  Chunks             Chunk Names
                             app.js  656 bytes       0  [emitted]  app
     vendor.1c0346d33a16fbee0579.js  619 bytes       1  [emitted]  vendor
-                        runtime.js   7.04 KiB       2  [emitted]  runtime
+                        runtime.js   4.65 KiB       2  [emitted]  runtime
     [./constants.js] 87 bytes {1} [built]
     [./entry-1.js] ./entry-1.js + 2 modules 190 bytes {0} [built]
            | ./entry-1.js 67 bytes [built]
@@ -17,7 +17,7 @@ Child
                              Asset       Size  Chunks             Chunk Names
                             app.js  673 bytes       0  [emitted]  app
     vendor.1c0346d33a16fbee0579.js  619 bytes       1  [emitted]  vendor
-                        runtime.js   7.04 KiB       2  [emitted]  runtime
+                        runtime.js   4.65 KiB       2  [emitted]  runtime
     [./constants.js] 87 bytes {1} [built]
     [./entry-2.js] ./entry-2.js + 2 modules 197 bytes {0} [built]
            | ./entry-2.js 67 bytes [built]
diff --git a/test/statsCases/named-chunks-plugin/expected.txt b/test/statsCases/named-chunks-plugin/expected.txt
@@ -2,7 +2,7 @@ Hash: f4f2142b60f3f055cbd9
 Time: Xms
       Asset       Size    Chunks             Chunk Names
    entry.js  425 bytes     entry  [emitted]  entry
-manifest.js   7.05 KiB  manifest  [emitted]  manifest
+manifest.js   4.66 KiB  manifest  [emitted]  manifest
   vendor.js  469 bytes    vendor  [emitted]  vendor
    [0] multi ./modules/a ./modules/b 40 bytes {vendor} [built]
 [./entry.js] 72 bytes {entry} [built]
