allow to set runtime chunk in Entrypoint

sokra · sokra · commit c71dabcc0c04 · 2018-01-10T18:58:28.000+01:00
split keeps runtime chunk in entrypoint

default runtime chunk back to first chunk to keep CCP working
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -500,6 +500,8 @@ class Chunk {
 			newChunk._parents.add(parentChunk);
 		}
 		for(const entrypoint of this._entrypoints) {
+			if(entrypoint.getRuntimeChunk() === this)
+				entrypoint.setRuntimeChunk(this);
 			entrypoint.insertChunk(newChunk, this);
 		}
 	}
diff --git a/lib/Entrypoint.js b/lib/Entrypoint.js
@@ -8,6 +8,7 @@ class Entrypoint {
 	constructor(name) {
 		this.name = name;
 		this.chunks = [];
+		this.runtimeChunk = undefined;
 	}
 
 	unshiftChunk(chunk) {
@@ -54,8 +55,12 @@ class Entrypoint {
 		return Array.from(files);
 	}
 
+	setRuntimeChunk(chunk) {
+		this.runtimeChunk = chunk;
+	}
+
 	getRuntimeChunk() {
-		return this.chunks[this.chunks.length - 1];
+		return this.runtimeChunk || this.chunks[0];
 	}
 }
 
diff --git a/test/statsCases/commons-chunk-min-size-0/expected.txt b/test/statsCases/commons-chunk-min-size-0/expected.txt
@@ -1,7 +1,7 @@
-Hash: 8eb81b6ba5271547f2b2
+Hash: 96561e55e52ce5dd05d9
 Time: Xms
       Asset      Size  Chunks             Chunk Names
- entry-1.js  4.02 KiB       0  [emitted]  entry-1
+ entry-1.js  81 bytes       0  [emitted]  entry-1
 vendor-1.js  5.62 KiB       1  [emitted]  vendor-1
 Entrypoint entry-1 = vendor-1.js entry-1.js
 Entrypoint vendor-1 = vendor-1.js
diff --git a/test/statsCases/commons-plugin-issue-4980/expected.txt b/test/statsCases/commons-plugin-issue-4980/expected.txt
@@ -1,23 +1,25 @@
-Hash: b692b715dca4d224ed46b48b74f73a93511804ad
+Hash: 0a7af1bf41c44dc4f3d62339087294aa36ac8856
 Child
-    Hash: b692b715dca4d224ed46
+    Hash: 0a7af1bf41c44dc4f3d6
     Time: Xms
                              Asset       Size  Chunks             Chunk Names
-                            app.js   4.59 KiB       0  [emitted]  app
+                            app.js  656 bytes       0  [emitted]  app
     vendor.1c0346d33a16fbee0579.js  619 bytes       1  [emitted]  vendor
-    Entrypoint app = vendor.1c0346d33a16fbee0579.js app.js
+                        runtime.js   4.65 KiB       2  [emitted]  runtime
+    Entrypoint app = runtime.js vendor.1c0346d33a16fbee0579.js app.js
     [./constants.js] 87 bytes {1} [built]
     [./entry-1.js] ./entry-1.js + 2 modules 190 bytes {0} [built]
            | ./entry-1.js 67 bytes [built]
            | ./submodule-a.js 59 bytes [built]
            | ./submodule-b.js 59 bytes [built]
 Child
-    Hash: b48b74f73a93511804ad
+    Hash: 2339087294aa36ac8856
     Time: Xms
                              Asset       Size  Chunks             Chunk Names
-                            app.js    4.6 KiB       0  [emitted]  app
+                            app.js  673 bytes       0  [emitted]  app
     vendor.1c0346d33a16fbee0579.js  619 bytes       1  [emitted]  vendor
-    Entrypoint app = vendor.1c0346d33a16fbee0579.js app.js
+                        runtime.js   4.65 KiB       2  [emitted]  runtime
+    Entrypoint app = runtime.js vendor.1c0346d33a16fbee0579.js app.js
     [./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
@@ -1,12 +1,13 @@
-Hash: 1d3d6178be52f9ccfe79
+Hash: f4f2142b60f3f055cbd9
 Time: Xms
-    Asset      Size  Chunks             Chunk Names
- entry.js  4.53 KiB   entry  [emitted]  entry
-vendor.js  5.15 KiB  vendor  [emitted]  vendor
-Entrypoint entry = vendor.js entry.js
-Entrypoint vendor = vendor.js
+      Asset       Size    Chunks             Chunk Names
+   entry.js  425 bytes     entry  [emitted]  entry
+manifest.js   4.66 KiB  manifest  [emitted]  manifest
+  vendor.js  469 bytes    vendor  [emitted]  vendor
+Entrypoint entry = manifest.js vendor.js entry.js
+Entrypoint vendor = manifest.js vendor.js
    [0] multi ./modules/a ./modules/b 40 bytes {vendor} [built]
 [./entry.js] 72 bytes {entry} [built]
-[./modules/a.js] 22 bytes {vendor} {entry} [built]
-[./modules/b.js] 22 bytes {vendor} {entry} [built]
+[./modules/a.js] 22 bytes {vendor} [built]
+[./modules/b.js] 22 bytes {vendor} [built]
 [./modules/c.js] 22 bytes {entry} [built]
diff --git a/test/statsCases/scope-hoisting-multi/expected.txt b/test/statsCases/scope-hoisting-multi/expected.txt
@@ -1,6 +1,6 @@
-Hash: 87881f27c149dbb06ab313fe918f27661d9dca90
+Hash: 618d094d926d88426c4d89db4754cf89b4c9fcd6
 Child
-    Hash: 87881f27c149dbb06ab3
+    Hash: 618d094d926d88426c4d
     Time: Xms
     Entrypoint vendor = vendor.js
     Entrypoint first = vendor.js first.js
@@ -17,7 +17,7 @@ Child
        [9] ./module_first.js 31 bytes {3} [built]
       [10] ./second.js 177 bytes {4} [built]
 Child
-    Hash: 13fe918f27661d9dca90
+    Hash: 89db4754cf89b4c9fcd6
     Time: Xms
     Entrypoint vendor = vendor.js
     Entrypoint first = vendor.js first.js

Original file line number	Diff line number	Diff line change
`@@ -500,6 +500,8 @@ class Chunk {`
`500`	`500`	`newChunk._parents.add(parentChunk);`
`501`	`501`	`}`
`502`	`502`	`for(const entrypoint of this._entrypoints) {`
	`503`	`+ if(entrypoint.getRuntimeChunk() === this)`
	`504`	`+ entrypoint.setRuntimeChunk(this);`
`503`	`505`	`entrypoint.insertChunk(newChunk, this);`
`504`	`506`	`}`
`505`	`507`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ class Entrypoint {`
`8`	`8`	`constructor(name) {`
`9`	`9`	`this.name = name;`
`10`	`10`	`this.chunks = [];`
	`11`	`+ this.runtimeChunk = undefined;`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`unshiftChunk(chunk) {`
`@@ -54,8 +55,12 @@ class Entrypoint {`
`54`	`55`	`return Array.from(files);`
`55`	`56`	`}`
`56`	`57`
	`58`	`+ setRuntimeChunk(chunk) {`
	`59`	`+ this.runtimeChunk = chunk;`
	`60`	`+ }`
	`61`	`+`
`57`	`62`	`getRuntimeChunk() {`
`58`		`- return this.chunks[this.chunks.length - 1];`
	`63`	`+ return this.runtimeChunk \|\| this.chunks[0];`
`59`	`64`	`}`
`60`	`65`	`}`
`61`	`66`