webpack 5.62.2 → 5.63.0

package/lib/FileSystemInfo.js

@@ -692,6 +692,11 @@ class SnapshotOptimization {
 	}
 }
 
+const parseString = str => {
+	if (str[0] === "'") str = `"${str.slice(1, -1).replace(/"/g, '\\"')}"`;
+	return JSON.parse(str);
+};
+
 /* istanbul ignore next */
 /**
  * @param {number} mtime mtime
@@ -1657,17 +1662,13 @@ class FileSystemInfo {
 												let dependency;
 												if (imp.d === -1) {
 													// import ... from "..."
-													dependency = JSON.parse(
+													dependency = parseString(
 														source.substring(imp.s - 1, imp.e + 1)
 													);
 												} else if (imp.d > -1) {
 													// import()
 													let expr = source.substring(imp.s, imp.e).trim();
-													if (expr[0] === "'")
-														expr = `"${expr
-															.slice(1, -1)
-															.replace(/"/g, '\\"')}"`;
-													dependency = JSON.parse(expr);
+													dependency = parseString(expr);
 												} else {
 													// e.g. import.meta
 													continue;

package/lib/buildChunkGraph.js

@@ -50,6 +50,7 @@ const { getEntryRuntime, mergeRuntime } = require("./util/runtime");
  * @property {Set<ChunkGroupInfo>} availableChildren set of chunk groups which depend on the this chunk group as availableSource
  * @property {number} preOrderIndex next pre order index
  * @property {number} postOrderIndex next post order index
+ * @property {boolean} asyncChunkLoading create async chunks
  */
 
 /**
@@ -304,7 +305,11 @@ const visitModules = (
 			availableSources: undefined,
 			availableChildren: undefined,
 			preOrderIndex: 0,
-			postOrderIndex: 0
+			postOrderIndex: 0,
+			asyncChunkLoading:
+				chunkGroup.options.chunkLoading === false
+					? false
+					: compilation.outputOptions.chunkLoading !== false
 		};
 		chunkGroup.index = nextChunkGroupIndex++;
 		if (chunkGroup.getNumberOfParents() > 0) {
@@ -418,7 +423,11 @@ const visitModules = (
 						availableSources: undefined,
 						availableChildren: undefined,
 						preOrderIndex: 0,
-						postOrderIndex: 0
+						postOrderIndex: 0,
+						asyncChunkLoading:
+							entryOptions.chunkLoading !== undefined
+								? entryOptions.chunkLoading !== false
+								: chunkGroupInfo.asyncChunkLoading
 					};
 					chunkGroupInfoMap.set(entrypoint, cgi);
 
@@ -442,8 +451,18 @@ const visitModules = (
 					chunkGroup: entrypoint,
 					chunkGroupInfo: cgi
 				});
+			} else if (!chunkGroupInfo.asyncChunkLoading) {
+				// Just queue the block into the current chunk group
+				queue.push({
+					action: PROCESS_BLOCK,
+					block: b,
+					module: module,
+					chunk,
+					chunkGroup,
+					chunkGroupInfo
+				});
 			} else {
-				cgi = namedChunkGroups.get(chunkName);
+				cgi = chunkName && namedChunkGroups.get(chunkName);
 				if (!cgi) {
 					c = compilation.addChunkInGroup(
 						b.groupOptions || b.chunkName,
@@ -464,7 +483,8 @@ const visitModules = (
 						availableSources: undefined,
 						availableChildren: undefined,
 						preOrderIndex: 0,
-						postOrderIndex: 0
+						postOrderIndex: 0,
+						asyncChunkLoading: chunkGroupInfo.asyncChunkLoading
 					};
 					allCreatedChunkGroups.add(c);
 					chunkGroupInfoMap.set(c, cgi);
@@ -518,7 +538,7 @@ const visitModules = (
 				chunkGroup: c,
 				chunkGroupInfo: cgi
 			});
-		} else {
+		} else if (entrypoint !== undefined) {
 			chunkGroupInfo.chunkGroup.addAsyncEntrypoint(entrypoint);
 		}
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.62.2",
+  "version": "5.63.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",