refactor chunk.chunks usage to check for chunk existance

timse · timse · commit 797285964060 · 2017-06-24T11:39:46.000+10:00
diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js
@@ -172,7 +172,7 @@ HotModuleReplacementPlugin.prototype.apply = function(compiler) {
 				.replace(/\$require\$/g, this.requireFn)
 				.replace(/\$hash\$/g, JSON.stringify(hash))
 				.replace(/\$requestTimeout\$/g, requestTimeout)
-				.replace(/\/\*foreachInstalledChunks\*\//g, chunk.chunks.length > 0 ? "for(var chunkId in installedChunks)" : "var chunkId = " + JSON.stringify(chunk.id) + ";")
+				.replace(/\/\*foreachInstalledChunks\*\//g, chunk.getChunks().size > 0 ? "for(var chunkId in installedChunks)" : "var chunkId = " + JSON.stringify(chunk.id) + ";")
 			]);
 		});
 
diff --git a/lib/JsonpMainTemplatePlugin.js b/lib/JsonpMainTemplatePlugin.js
@@ -10,7 +10,7 @@ class JsonpMainTemplatePlugin {
 
 	apply(mainTemplate) {
 		mainTemplate.plugin("local-vars", function(source, chunk) {
-			if(chunk.chunks.length > 0) {
+			if(chunk.getChunks().size > 0) {
 				return this.asString([
 					source,
 					"",
@@ -110,7 +110,7 @@ class JsonpMainTemplatePlugin {
 			]);
 		});
 		mainTemplate.plugin("require-extensions", function(source, chunk) {
-			if(chunk.chunks.length === 0) return source;
+			if(chunk.getChunks().size === 0) return source;
 
 			return this.asString([
 				source,
@@ -120,7 +120,7 @@ class JsonpMainTemplatePlugin {
 			]);
 		});
 		mainTemplate.plugin("bootstrap", function(source, chunk, hash) {
-			if(chunk.chunks.length > 0) {
+			if(chunk.getChunks().size > 0) {
 				var jsonpFunction = this.outputOptions.jsonpFunction;
 				return this.asString([
 					source,
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -99,7 +99,7 @@ module.exports = class MainTemplate extends Template {
 		});
 		this.plugin("require-extensions", (source, chunk, hash) => {
 			const buf = [];
-			if(chunk.chunks.length > 0) {
+			if(chunk.getChunks().size > 0) {
 				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/lib/node/NodeMainTemplatePlugin.js b/lib/node/NodeMainTemplatePlugin.js
@@ -14,7 +14,7 @@ module.exports = class NodeMainTemplatePlugin {
 	apply(mainTemplate) {
 		const asyncChunkLoading = this.asyncChunkLoading;
 		mainTemplate.plugin("local-vars", function(source, chunk) {
-			if(chunk.chunks.length > 0) {
+			if(chunk.getChunks().size > 0) {
 				return this.asString([
 					source,
 					"",
@@ -28,7 +28,7 @@ module.exports = class NodeMainTemplatePlugin {
 			return source;
 		});
 		mainTemplate.plugin("require-extensions", function(source, chunk) {
-			if(chunk.chunks.length > 0) {
+			if(chunk.getChunks().size > 0) {
 				return this.asString([
 					source,
 					"",
diff --git a/lib/webworker/WebWorkerMainTemplatePlugin.js b/lib/webworker/WebWorkerMainTemplatePlugin.js
@@ -9,7 +9,7 @@ const Template = require("../Template");
 class WebWorkerMainTemplatePlugin {
 	apply(mainTemplate) {
 		mainTemplate.plugin("local-vars", function(source, chunk) {
-			if(chunk.chunks.length > 0) {
+			if(chunk.getChunks().size > 0) {
 				return this.asString([
 					source,
 					"",
@@ -48,7 +48,7 @@ class WebWorkerMainTemplatePlugin {
 			]);
 		});
 		mainTemplate.plugin("bootstrap", function(source, chunk, hash) {
-			if(chunk.chunks.length > 0) {
+			if(chunk.getChunks().size > 0) {
 				const chunkCallbackName = this.outputOptions.chunkCallbackName || Template.toIdentifier("webpackChunk" + (this.outputOptions.library || ""));
 				return this.asString([
 					source,
