webpack 5.92.0 → 5.93.0

package/lib/sharing/ConsumeSharedRuntimeModule.js

@@ -95,63 +95,39 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 			versionLtRuntimeCode(runtimeTemplate),
 			rangeToStringRuntimeCode(runtimeTemplate),
 			satisfyRuntimeCode(runtimeTemplate),
-			`var ensureExistence = ${runtimeTemplate.basicFunction("scopeName, key", [
-				`var scope = ${RuntimeGlobals.shareScopeMap}[scopeName];`,
-				`if(!scope || !${RuntimeGlobals.hasOwnProperty}(scope, key)) throw new Error("Shared module " + key + " doesn't exist in shared scope " + scopeName);`,
-				"return scope;"
+			`var exists = ${runtimeTemplate.basicFunction("scope, key", [
+				`return scope && ${RuntimeGlobals.hasOwnProperty}(scope, key);`
+			])}`,
+			`var get = ${runtimeTemplate.basicFunction("entry", [
+				"entry.loaded = 1;",
+				"return entry.get()"
 			])};`,
-			`var findVersion = ${runtimeTemplate.basicFunction("scope, key", [
-				"var versions = scope[key];",
-				`var key = Object.keys(versions).reduce(${runtimeTemplate.basicFunction(
-					"a, b",
-					["return !a || versionLt(a, b) ? b : a;"]
-				)}, 0);`,
-				"return key && versions[key]"
+			`var eagerOnly = ${runtimeTemplate.basicFunction("versions", [
+				`return Object.keys(versions).reduce(${runtimeTemplate.basicFunction(
+					"filtered, version",
+					Template.indent([
+						"if (versions[version].eager) {",
+						Template.indent(["filtered[version] = versions[version];"]),
+						"}",
+						"return filtered;"
+					])
+				)}, {});`
 			])};`,
-			`var findSingletonVersionKey = ${runtimeTemplate.basicFunction(
-				"scope, key",
+			`var findLatestVersion = ${runtimeTemplate.basicFunction(
+				"scope, key, eager",
 				[
-					"var versions = scope[key];",
-					`return Object.keys(versions).reduce(${runtimeTemplate.basicFunction(
+					"var versions = eager ? eagerOnly(scope[key]) : scope[key];",
+					`var key = Object.keys(versions).reduce(${runtimeTemplate.basicFunction(
 						"a, b",
-						["return !a || (!versions[a].loaded && versionLt(a, b)) ? b : a;"]
-					)}, 0);`
-				]
-			)};`,
-			`var getInvalidSingletonVersionMessage = ${runtimeTemplate.basicFunction(
-				"scope, key, version, requiredVersion",
-				[
-					`return "Unsatisfied version " + version + " from " + (version && scope[key][version].from) + " of shared singleton module " + key + " (required " + rangeToString(requiredVersion) + ")"`
-				]
-			)};`,
-			`var getSingleton = ${runtimeTemplate.basicFunction(
-				"scope, scopeName, key, requiredVersion",
-				[
-					"var version = findSingletonVersionKey(scope, key);",
-					"return get(scope[key][version]);"
-				]
-			)};`,
-			`var getSingletonVersion = ${runtimeTemplate.basicFunction(
-				"scope, scopeName, key, requiredVersion",
-				[
-					"var version = findSingletonVersionKey(scope, key);",
-					"if (!satisfy(requiredVersion, version)) warn(getInvalidSingletonVersionMessage(scope, key, version, requiredVersion));",
-					"return get(scope[key][version]);"
-				]
-			)};`,
-			`var getStrictSingletonVersion = ${runtimeTemplate.basicFunction(
-				"scope, scopeName, key, requiredVersion",
-				[
-					"var version = findSingletonVersionKey(scope, key);",
-					"if (!satisfy(requiredVersion, version)) " +
-						"throw new Error(getInvalidSingletonVersionMessage(scope, key, version, requiredVersion));",
-					"return get(scope[key][version]);"
+						["return !a || versionLt(a, b) ? b : a;"]
+					)}, 0);`,
+					"return key && versions[key];"
 				]
 			)};`,
-			`var findValidVersion = ${runtimeTemplate.basicFunction(
-				"scope, key, requiredVersion",
+			`var findSatisfyingVersion = ${runtimeTemplate.basicFunction(
+				"scope, key, requiredVersion, eager",
 				[
-					"var versions = scope[key];",
+					"var versions = eager ? eagerOnly(scope[key]) : scope[key];",
 					`var key = Object.keys(versions).reduce(${runtimeTemplate.basicFunction(
 						"a, b",
 						[
@@ -162,136 +138,127 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 					"return key && versions[key]"
 				]
 			)};`,
+			`var findSingletonVersionKey = ${runtimeTemplate.basicFunction(
+				"scope, key, eager",
+				[
+					"var versions = eager ? eagerOnly(scope[key]) : scope[key];",
+					`return Object.keys(versions).reduce(${runtimeTemplate.basicFunction(
+						"a, b",
+						["return !a || (!versions[a].loaded && versionLt(a, b)) ? b : a;"]
+					)}, 0);`
+				]
+			)};`,
+			`var getInvalidSingletonVersionMessage = ${runtimeTemplate.basicFunction(
+				"scope, key, version, requiredVersion",
+				[
+					'return "Unsatisfied version " + version + " from " + (version && scope[key][version].from) + " of shared singleton module " + key + " (required " + rangeToString(requiredVersion) + ")"'
+				]
+			)};`,
 			`var getInvalidVersionMessage = ${runtimeTemplate.basicFunction(
-				"scope, scopeName, key, requiredVersion",
+				"scope, scopeName, key, requiredVersion, eager",
 				[
 					"var versions = scope[key];",
-					'return "No satisfying version (" + rangeToString(requiredVersion) + ") of shared module " + key + " found in shared scope " + scopeName + ".\\n" +',
+					'return "No satisfying version (" + rangeToString(requiredVersion) + ")" + (eager ? " for eager consumption" : "") + " of shared module " + key + " found in shared scope " + scopeName + ".\\n" +',
 					`\t"Available versions: " + Object.keys(versions).map(${runtimeTemplate.basicFunction(
 						"key",
 						['return key + " from " + versions[key].from;']
 					)}).join(", ");`
 				]
 			)};`,
-			`var getValidVersion = ${runtimeTemplate.basicFunction(
-				"scope, scopeName, key, requiredVersion",
-				[
-					"var entry = findValidVersion(scope, key, requiredVersion);",
-					"if(entry) return get(entry);",
-					"throw new Error(getInvalidVersionMessage(scope, scopeName, key, requiredVersion));"
-				]
-			)};`,
-			`var warn = ${
+			`var fail = ${runtimeTemplate.basicFunction("msg", [
+				"throw new Error(msg);"
+			])}`,
+			`var failAsNotExist = ${runtimeTemplate.basicFunction("scopeName, key", [
+				'return fail("Shared module " + key + " doesn\'t exist in shared scope " + scopeName);'
+			])}`,
+			`var warn = /*#__PURE__*/ ${
 				compilation.outputOptions.ignoreBrowserWarnings
 					? runtimeTemplate.basicFunction("", "")
 					: runtimeTemplate.basicFunction("msg", [
 							'if (typeof console !== "undefined" && console.warn) console.warn(msg);'
 						])
 			};`,
-			`var warnInvalidVersion = ${runtimeTemplate.basicFunction(
-				"scope, scopeName, key, requiredVersion",
-				[
-					"warn(getInvalidVersionMessage(scope, scopeName, key, requiredVersion));"
-				]
-			)};`,
-			`var get = ${runtimeTemplate.basicFunction("entry", [
-				"entry.loaded = 1;",
-				"return entry.get()"
-			])};`,
 			`var init = ${runtimeTemplate.returningFunction(
 				Template.asString([
-					"function(scopeName, a, b, c) {",
+					"function(scopeName, key, eager, c, d) {",
 					Template.indent([
 						`var promise = ${RuntimeGlobals.initializeSharing}(scopeName);`,
-						`if (promise && promise.then) return promise.then(fn.bind(fn, scopeName, ${RuntimeGlobals.shareScopeMap}[scopeName], a, b, c));`,
-						`return fn(scopeName, ${RuntimeGlobals.shareScopeMap}[scopeName], a, b, c);`
+						// if we require eager shared, we expect it to be already loaded before it requested, no need to wait the whole scope loaded.
+						"if (promise && promise.then && !eager) { ",
+						Template.indent([
+							`return promise.then(fn.bind(fn, scopeName, ${RuntimeGlobals.shareScopeMap}[scopeName], key, false, c, d));`
+						]),
+						"}",
+						`return fn(scopeName, ${RuntimeGlobals.shareScopeMap}[scopeName], key, eager, c, d);`
 					]),
 					"}"
 				]),
 				"fn"
 			)};`,
 			"",
+			`var useFallback = ${runtimeTemplate.basicFunction(
+				"scopeName, key, fallback",
+				["return fallback ? fallback() : failAsNotExist(scopeName, key);"]
+			)}`,
 			`var load = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key",
+				"scopeName, scope, key, eager, fallback",
 				[
-					"ensureExistence(scopeName, key);",
-					"return get(findVersion(scope, key));"
+					"if (!exists(scope, key)) return useFallback(scopeName, key, fallback);",
+					"return get(findLatestVersion(scope, key, eager));"
 				]
 			)});`,
-			`var loadFallback = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key, fallback",
+			`var loadVersion = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
+				"scopeName, scope, key, eager, requiredVersion, fallback",
 				[
-					`return scope && ${RuntimeGlobals.hasOwnProperty}(scope, key) ? get(findVersion(scope, key)) : fallback();`
+					"if (!exists(scope, key)) return useFallback(scopeName, key, fallback);",
+					"var satisfyingVersion = findSatisfyingVersion(scope, key, requiredVersion, eager);",
+					"if (satisfyingVersion) return get(satisfyingVersion);",
+					"warn(getInvalidVersionMessage(scope, scopeName, key, requiredVersion, eager))",
+					"return get(findLatestVersion(scope, key, eager));"
 				]
 			)});`,
-			`var loadVersionCheck = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key, version",
+			`var loadStrictVersion = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
+				"scopeName, scope, key, eager, requiredVersion, fallback",
 				[
-					"ensureExistence(scopeName, key);",
-					"return get(findValidVersion(scope, key, version) || warnInvalidVersion(scope, scopeName, key, version) || findVersion(scope, key));"
+					"if (!exists(scope, key)) return useFallback(scopeName, key, fallback);",
+					"var satisfyingVersion = findSatisfyingVersion(scope, key, requiredVersion, eager);",
+					"if (satisfyingVersion) return get(satisfyingVersion);",
+					"if (fallback) return fallback();",
+					"fail(getInvalidVersionMessage(scope, scopeName, key, requiredVersion, eager));"
 				]
 			)});`,
 			`var loadSingleton = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key",
-				[
-					"ensureExistence(scopeName, key);",
-					"return getSingleton(scope, scopeName, key);"
-				]
-			)});`,
-			`var loadSingletonVersionCheck = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key, version",
-				[
-					"ensureExistence(scopeName, key);",
-					"return getSingletonVersion(scope, scopeName, key, version);"
-				]
-			)});`,
-			`var loadStrictVersionCheck = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key, version",
+				"scopeName, scope, key, eager, fallback",
 				[
-					"ensureExistence(scopeName, key);",
-					"return getValidVersion(scope, scopeName, key, version);"
-				]
-			)});`,
-			`var loadStrictSingletonVersionCheck = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key, version",
-				[
-					"ensureExistence(scopeName, key);",
-					"return getStrictSingletonVersion(scope, scopeName, key, version);"
-				]
-			)});`,
-			`var loadVersionCheckFallback = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key, version, fallback",
-				[
-					`if(!scope || !${RuntimeGlobals.hasOwnProperty}(scope, key)) return fallback();`,
-					"return get(findValidVersion(scope, key, version) || warnInvalidVersion(scope, scopeName, key, version) || findVersion(scope, key));"
-				]
-			)});`,
-			`var loadSingletonFallback = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key, fallback",
-				[
-					`if(!scope || !${RuntimeGlobals.hasOwnProperty}(scope, key)) return fallback();`,
-					"return getSingleton(scope, scopeName, key);"
-				]
-			)});`,
-			`var loadSingletonVersionCheckFallback = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key, version, fallback",
-				[
-					`if(!scope || !${RuntimeGlobals.hasOwnProperty}(scope, key)) return fallback();`,
-					"return getSingletonVersion(scope, scopeName, key, version);"
+					"if (!exists(scope, key)) return useFallback(scopeName, key, fallback);",
+					"var version = findSingletonVersionKey(scope, key, eager);",
+					"return get(scope[key][version]);"
 				]
 			)});`,
-			`var loadStrictVersionCheckFallback = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key, version, fallback",
+			`var loadSingletonVersion = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
+				"scopeName, scope, key, eager, requiredVersion, fallback",
 				[
-					`var entry = scope && ${RuntimeGlobals.hasOwnProperty}(scope, key) && findValidVersion(scope, key, version);`,
-					`return entry ? get(entry) : fallback();`
+					"if (!exists(scope, key)) return useFallback(scopeName, key, fallback);",
+					"var version = findSingletonVersionKey(scope, key, eager);",
+					"if (!satisfy(requiredVersion, version)) {",
+					Template.indent([
+						"warn(getInvalidSingletonVersionMessage(scope, key, version, requiredVersion));"
+					]),
+					"}",
+					"return get(scope[key][version]);"
 				]
 			)});`,
-			`var loadStrictSingletonVersionCheckFallback = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
-				"scopeName, scope, key, version, fallback",
+			`var loadStrictSingletonVersion = /*#__PURE__*/ init(${runtimeTemplate.basicFunction(
+				"scopeName, scope, key, eager, requiredVersion, fallback",
 				[
-					`if(!scope || !${RuntimeGlobals.hasOwnProperty}(scope, key)) return fallback();`,
-					"return getStrictSingletonVersion(scope, scopeName, key, version);"
+					"if (!exists(scope, key)) return useFallback(scopeName, key, fallback);",
+					"var version = findSingletonVersionKey(scope, key, eager);",
+					"if (!satisfy(requiredVersion, version)) {",
+					Template.indent([
+						"fail(getInvalidSingletonVersionMessage(scope, key, version, requiredVersion));"
+					]),
+					"}",
+					"return get(scope[key][version]);"
 				]
 			)});`,
 			"var installedModules = {};",

package/lib/util/conventions.js

@@ -10,7 +10,7 @@
 /**
  * @param {string} input input
  * @param {CssGeneratorExportsConvention | undefined} convention convention
- * @returns {Set<string>} results
+ * @returns {string[]} results
  */
 exports.cssExportConvention = (input, convention) => {
 	const set = new Set();
@@ -42,7 +42,7 @@ exports.cssExportConvention = (input, convention) => {
 			}
 		}
 	}
-	return set;
+	return Array.from(set);
 };
 
 // Copy from css-loader

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.92.0",
+  "version": "5.93.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -38,7 +38,7 @@
   "devDependencies": {
     "@babel/core": "^7.24.7",
     "@babel/preset-react": "^7.24.7",
-    "@eslint/js": "^9.4.0",
+    "@eslint/js": "^9.5.0",
     "@types/glob-to-regexp": "^0.4.4",
     "@types/jest": "^29.5.11",
     "@types/mime-types": "^2.1.4",
@@ -56,7 +56,7 @@
     "date-fns": "^3.2.0",
     "es5-ext": "^0.10.53",
     "es6-promise-polyfill": "^1.2.0",
-    "eslint": "^9.4.0",
+    "eslint": "^9.5.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-jsdoc": "^48.2.9",