webpack 5.73.0 → 5.75.0

package/lib/optimize/ConcatenatedModule.js

@@ -21,7 +21,7 @@ const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency
 const JavascriptParser = require("../javascript/JavascriptParser");
 const { equals } = require("../util/ArrayHelpers");
 const LazySet = require("../util/LazySet");
-const { concatComparators, keepOriginalOrder } = require("../util/comparators");
+const { concatComparators } = require("../util/comparators");
 const createHash = require("../util/createHash");
 const { makePathsRelative } = require("../util/identifier");
 const makeSerializable = require("../util/makeSerializable");
@@ -185,23 +185,25 @@ const RESERVED_NAMES = new Set(
 		.split(",")
 );
 
-const bySourceOrder = (a, b) => {
-	const aOrder = a.sourceOrder;
-	const bOrder = b.sourceOrder;
-	if (isNaN(aOrder)) {
-		if (!isNaN(bOrder)) {
+const createComparator = (property, comparator) => (a, b) =>
+	comparator(a[property], b[property]);
+const compareNumbers = (a, b) => {
+	if (isNaN(a)) {
+		if (!isNaN(b)) {
 			return 1;
 		}
 	} else {
-		if (isNaN(bOrder)) {
+		if (isNaN(b)) {
 			return -1;
 		}
-		if (aOrder !== bOrder) {
-			return aOrder < bOrder ? -1 : 1;
+		if (a !== b) {
+			return a < b ? -1 : 1;
 		}
 	}
 	return 0;
 };
+const bySourceOrder = createComparator("sourceOrder", compareNumbers);
+const byRangeStart = createComparator("rangeStart", compareNumbers);
 
 const joinIterableWithComma = iterable => {
 	// This is more performant than Array.from().join(", ")
@@ -885,6 +887,9 @@ class ConcatenatedModule extends Module {
 				for (const c of moduleGraph.getOutgoingConnections(this))
 					connections.push(c);
 			}
+			/**
+			 * @type {Array<{ connection: ModuleGraphConnection, sourceOrder: number, rangeStart: number }>}
+			 */
 			const references = connections
 				.filter(connection => {
 					if (!(connection.dependency instanceof HarmonyImportDependency))
@@ -896,15 +901,33 @@ class ConcatenatedModule extends Module {
 						connection.isTargetActive(runtime)
 					);
 				})
-				.map(connection => ({
-					connection,
-					sourceOrder: /** @type {HarmonyImportDependency} */ (
+				.map(connection => {
+					const dep = /** @type {HarmonyImportDependency} */ (
 						connection.dependency
-					).sourceOrder
-				}));
-			references.sort(
-				concatComparators(bySourceOrder, keepOriginalOrder(references))
-			);
+					);
+					return {
+						connection,
+						sourceOrder: dep.sourceOrder,
+						rangeStart: dep.range && dep.range[0]
+					};
+				});
+			/**
+			 * bySourceOrder
+			 * @example
+			 * import a from "a"; // sourceOrder=1
+			 * import b from "b"; // sourceOrder=2
+			 *
+			 * byRangeStart
+			 * @example
+			 * import {a, b} from "a"; // sourceOrder=1
+			 * a.a(); // first range
+			 * b.b(); // second range
+			 *
+			 * If there is no reexport, we have the same source.
+			 * If there is reexport, but module has side effects, this will lead to reexport module only.
+			 * If there is side-effects-free reexport, we can get simple deterministic result with range start comparison.
+			 */
+			references.sort(concatComparators(bySourceOrder, byRangeStart));
 			/** @type {Map<Module, { connection: ModuleGraphConnection, runtimeCondition: RuntimeSpec | true }>} */
 			const referencesMap = new Map();
 			for (const { connection } of references) {

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -74,7 +74,6 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 			`${fn} = ${runtimeTemplate.basicFunction("module, body, hasAwait", [
 				"var queue;",
 				"hasAwait && ((queue = []).d = 1);",
-				"if(queue) queue.moduleId = module.id;",
 				"var depQueues = new Set();",
 				"var exports = module.exports;",
 				"var currentDeps;",
@@ -89,7 +88,6 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 					`queue && fn(queue), depQueues.forEach(fn), promise["catch"](${runtimeTemplate.emptyFunction()})`,
 					"fn"
 				)};`,
-				"promise.moduleId = module.id;",
 				"module.exports = promise;",
 				`body(${runtimeTemplate.basicFunction("deps", [
 					"currentDeps = wrapDeps(deps);",

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -87,13 +87,15 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 					: "url"
 			};`,
 			crossOriginLoading
-				? Template.asString([
-						"if (script.src.indexOf(window.location.origin + '/') !== 0) {",
-						Template.indent(
-							`script.crossOrigin = ${JSON.stringify(crossOriginLoading)};`
-						),
-						"}"
-				  ])
+				? crossOriginLoading === "use-credentials"
+					? 'script.crossOrigin = "use-credentials";'
+					: Template.asString([
+							"if (script.src.indexOf(window.location.origin + '/') !== 0) {",
+							Template.indent(
+								`script.crossOrigin = ${JSON.stringify(crossOriginLoading)};`
+							),
+							"}"
+					  ])
 				: ""
 		]);
 
@@ -144,8 +146,8 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 							)});`,
 							"if(prev) return prev(event);"
 						])
-					),
-				";",
+					) +
+					";",
 				`var timeout = setTimeout(onScriptComplete.bind(null, undefined, { type: 'timeout', target: script }), ${loadTimeout});`,
 				"script.onerror = onScriptComplete.bind(null, script.onerror);",
 				"script.onload = onScriptComplete.bind(null, script.onload);",

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -1153,7 +1153,7 @@ const SIMPLE_ELEMENT_JOINERS = {
 	chunkOrigin: items => "> " + joinOneLine(items),
 	"errors[].error": joinError(true),
 	"warnings[].error": joinError(false),
-	loggingGroup: items => joinExplicitNewLine(items, "").trimRight(),
+	loggingGroup: items => joinExplicitNewLine(items, "").trimEnd(),
 	moduleTraceItem: items => " @ " + joinOneLine(items),
 	moduleTraceDependency: joinOneLine
 };

package/lib/wasm-sync/WebAssemblyParser.js

@@ -17,7 +17,7 @@ const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDe
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
 
-const JS_COMPAT_TYPES = new Set(["i32", "f32", "f64"]);
+const JS_COMPAT_TYPES = new Set(["i32", "i64", "f32", "f64"]);
 
 /**
  * @param {t.Signature} signature the func signature

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -263,15 +263,17 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 									'link.as = "script";',
 									`link.href = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId);`,
 									crossOriginLoading
-										? Template.asString([
-												"if (link.href.indexOf(window.location.origin + '/') !== 0) {",
-												Template.indent(
-													`link.crossOrigin = ${JSON.stringify(
-														crossOriginLoading
-													)};`
-												),
-												"}"
-										  ])
+										? crossOriginLoading === "use-credentials"
+											? 'link.crossOrigin = "use-credentials";'
+											: Template.asString([
+													"if (link.href.indexOf(window.location.origin + '/') !== 0) {",
+													Template.indent(
+														`link.crossOrigin = ${JSON.stringify(
+															crossOriginLoading
+														)};`
+													),
+													"}"
+											  ])
 										: ""
 								]),
 								chunk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.73.0",
+  "version": "5.75.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",
@@ -10,11 +10,11 @@
     "@webassemblyjs/ast": "1.11.1",
     "@webassemblyjs/wasm-edit": "1.11.1",
     "@webassemblyjs/wasm-parser": "1.11.1",
-    "acorn": "^8.4.1",
+    "acorn": "^8.7.1",
     "acorn-import-assertions": "^1.7.6",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.9.3",
+    "enhanced-resolve": "^5.10.0",
     "es-module-lexer": "^0.9.0",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
@@ -27,7 +27,7 @@
     "schema-utils": "^3.1.0",
     "tapable": "^2.1.1",
     "terser-webpack-plugin": "^5.1.3",
-    "watchpack": "^2.3.1",
+    "watchpack": "^2.4.0",
     "webpack-sources": "^3.2.3"
   },
   "peerDependenciesMeta": {
@@ -84,7 +84,7 @@
     "mini-svg-data-uri": "^1.2.3",
     "nyc": "^15.1.0",
     "open-cli": "^6.0.1",
-    "prettier": "^2.2.0",
+    "prettier": "^2.7.1",
     "pretty-format": "^27.0.2",
     "pug": "^3.0.0",
     "pug-loader": "^2.4.0",
@@ -98,9 +98,9 @@
     "style-loader": "^2.0.0",
     "terser": "^5.7.0",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.21.0",
+    "tooling": "webpack/tooling#v1.22.0",
     "ts-loader": "^8.0.2",
-    "typescript": "^4.5.5",
+    "typescript": "^4.8.4",
     "url-loader": "^4.1.0",
     "wast-loader": "^1.11.0",
     "webassembly-feature": "1.3.0",
@@ -121,6 +121,7 @@
     "url": "https://opencollective.com/webpack"
   },
   "homepage": "https://github.com/webpack/webpack",
+  "bugs": "https://github.com/webpack/webpack/issues",
   "main": "lib/index.js",
   "bin": {
     "webpack": "bin/webpack.js"