webpack 5.58.0 → 5.59.0

package/lib/config/defaults.js

@@ -19,6 +19,7 @@ const {
 /** @typedef {import("../../declarations/WebpackOptions").EntryDescription} EntryDescription */
 /** @typedef {import("../../declarations/WebpackOptions").EntryNormalized} Entry */
 /** @typedef {import("../../declarations/WebpackOptions").Experiments} Experiments */
+/** @typedef {import("../../declarations/WebpackOptions").ExperimentsNormalized} ExperimentsNormalized */
 /** @typedef {import("../../declarations/WebpackOptions").ExternalsPresets} ExternalsPresets */
 /** @typedef {import("../../declarations/WebpackOptions").ExternalsType} ExternalsType */
 /** @typedef {import("../../declarations/WebpackOptions").InfrastructureLogging} InfrastructureLogging */
@@ -161,6 +162,8 @@ const applyWebpackOptionsDefaults = options => {
 
 	applyExperimentsDefaults(options.experiments, { production, development });
 
+	const futureDefaults = options.experiments.futureDefaults;
+
 	F(options, "cache", () =>
 		development ? { type: /** @type {"memory"} */ ("memory") } : false
 	);
@@ -172,7 +175,10 @@ const applyWebpackOptionsDefaults = options => {
 	});
 	const cache = !!options.cache;
 
-	applySnapshotDefaults(options.snapshot, { production });
+	applySnapshotDefaults(options.snapshot, {
+		production,
+		futureDefaults
+	});
 
 	applyModuleDefaults(options.module, {
 		cache,
@@ -192,7 +198,7 @@ const applyWebpackOptionsDefaults = options => {
 		development,
 		entry: options.entry,
 		module: options.module,
-		futureDefaults: options.experiments.futureDefaults
+		futureDefaults
 	});
 
 	applyExternalsPresetsDefaults(options.externalsPresets, {
@@ -252,7 +258,7 @@ const applyWebpackOptionsDefaults = options => {
 };
 
 /**
- * @param {Experiments} experiments options
+ * @param {ExperimentsNormalized} experiments options
  * @param {Object} options options
  * @param {boolean} options.production is production
  * @param {boolean} options.development is development mode
@@ -265,14 +271,14 @@ const applyExperimentsDefaults = (experiments, { production, development }) => {
 	D(experiments, "outputModule", false);
 	D(experiments, "asset", false);
 	D(experiments, "layers", false);
-	D(experiments, "lazyCompilation", false);
-	D(experiments, "buildHttp", false);
+	D(experiments, "lazyCompilation", undefined);
+	D(experiments, "buildHttp", undefined);
 	D(experiments, "futureDefaults", false);
 	D(experiments, "cacheUnaffected", experiments.futureDefaults);
 
 	if (typeof experiments.buildHttp === "object") {
 		D(experiments.buildHttp, "frozen", production);
-		D(experiments.buildHttp, "upgrade", development);
+		D(experiments.buildHttp, "upgrade", false);
 	}
 };
 
@@ -348,49 +354,65 @@ const applyCacheDefaults = (
  * @param {SnapshotOptions} snapshot options
  * @param {Object} options options
  * @param {boolean} options.production is production
+ * @param {boolean} options.futureDefaults is future defaults enabled
  * @returns {void}
  */
-const applySnapshotDefaults = (snapshot, { production }) => {
-	A(snapshot, "managedPaths", () => {
-		if (process.versions.pnp === "3") {
-			const match =
-				/^(.+?)[\\/]cache[\\/]watchpack-npm-[^\\/]+\.zip[\\/]node_modules[\\/]/.exec(
-					require.resolve("watchpack")
-				);
-			if (match) {
-				return [path.resolve(match[1], "unplugged")];
-			}
-		} else {
-			const match = /^(.+?[\\/]node_modules)[\\/]/.exec(
-				// eslint-disable-next-line node/no-extraneous-require
-				require.resolve("watchpack")
-			);
-			if (match) {
-				return [match[1]];
-			}
-		}
-		return [];
-	});
-	A(snapshot, "immutablePaths", () => {
-		if (process.versions.pnp === "1") {
-			const match =
-				/^(.+?[\\/]v4)[\\/]npm-watchpack-[^\\/]+-[\da-f]{40}[\\/]node_modules[\\/]/.exec(
+const applySnapshotDefaults = (snapshot, { production, futureDefaults }) => {
+	if (futureDefaults) {
+		F(snapshot, "managedPaths", () =>
+			process.versions.pnp === "3"
+				? [
+						/^(.+?(?:[\\/]\.yarn[\\/]unplugged[\\/][^\\/]+)?[\\/]node_modules[\\/])/
+				  ]
+				: [/^(.+?[\\/]node_modules[\\/])/]
+		);
+		F(snapshot, "immutablePaths", () =>
+			process.versions.pnp === "3"
+				? [/^(.+?[\\/]cache[\\/][^\\/]+\.zip[\\/]node_modules[\\/])/]
+				: []
+		);
+	} else {
+		A(snapshot, "managedPaths", () => {
+			if (process.versions.pnp === "3") {
+				const match =
+					/^(.+?)[\\/]cache[\\/]watchpack-npm-[^\\/]+\.zip[\\/]node_modules[\\/]/.exec(
+						require.resolve("watchpack")
+					);
+				if (match) {
+					return [path.resolve(match[1], "unplugged")];
+				}
+			} else {
+				const match = /^(.+?[\\/]node_modules)[\\/]/.exec(
+					// eslint-disable-next-line node/no-extraneous-require
 					require.resolve("watchpack")
 				);
-			if (match) {
-				return [match[1]];
+				if (match) {
+					return [match[1]];
+				}
 			}
-		} else if (process.versions.pnp === "3") {
-			const match =
-				/^(.+?)[\\/]watchpack-npm-[^\\/]+\.zip[\\/]node_modules[\\/]/.exec(
-					require.resolve("watchpack")
-				);
-			if (match) {
-				return [match[1]];
+			return [];
+		});
+		A(snapshot, "immutablePaths", () => {
+			if (process.versions.pnp === "1") {
+				const match =
+					/^(.+?[\\/]v4)[\\/]npm-watchpack-[^\\/]+-[\da-f]{40}[\\/]node_modules[\\/]/.exec(
+						require.resolve("watchpack")
+					);
+				if (match) {
+					return [match[1]];
+				}
+			} else if (process.versions.pnp === "3") {
+				const match =
+					/^(.+?)[\\/]watchpack-npm-[^\\/]+\.zip[\\/]node_modules[\\/]/.exec(
+						require.resolve("watchpack")
+					);
+				if (match) {
+					return [match[1]];
+				}
 			}
-		}
-		return [];
-	});
+			return [];
+		});
+	}
 	F(snapshot, "resolveBuildDependencies", () => ({
 		timestamp: true,
 		hash: true

package/lib/config/normalization.js

@@ -174,7 +174,12 @@ const getNormalizedWebpackOptions = config => {
 		experiments: nestedConfig(config.experiments, experiments => ({
 			...experiments,
 			buildHttp: optionalNestedConfig(experiments.buildHttp, options =>
-				options === true ? {} : options
+				Array.isArray(options) ? { allowedUris: options } : options
+			),
+			lazyCompilation: optionalNestedConfig(
+				experiments.lazyCompilation,
+				options =>
+					options === true ? {} : options === false ? undefined : options
 			)
 		})),
 		externals: config.externals,

package/lib/optimize/ConcatenatedModule.js

@@ -564,7 +564,7 @@ const getFinalName = (
 				? `(0,${reference})`
 				: asiSafe === false
 				? `;(0,${reference})`
-				: `Object(${reference})`;
+				: `/*#__PURE__*/Object(${reference})`;
 		}
 		return reference;
 	}