webpack 5.99.9 → 5.100.1

package/lib/dependencies/HarmonyModulesPlugin.js

@@ -5,34 +5,37 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_ESM
+} = require("../ModuleTypeConstants");
 const HarmonyAcceptDependency = require("./HarmonyAcceptDependency");
 const HarmonyAcceptImportDependency = require("./HarmonyAcceptImportDependency");
 const HarmonyCompatibilityDependency = require("./HarmonyCompatibilityDependency");
+const HarmonyDetectionParserPlugin = require("./HarmonyDetectionParserPlugin");
 const HarmonyEvaluatedImportSpecifierDependency = require("./HarmonyEvaluatedImportSpecifierDependency");
+const HarmonyExportDependencyParserPlugin = require("./HarmonyExportDependencyParserPlugin");
 const HarmonyExportExpressionDependency = require("./HarmonyExportExpressionDependency");
 const HarmonyExportHeaderDependency = require("./HarmonyExportHeaderDependency");
 const HarmonyExportImportedSpecifierDependency = require("./HarmonyExportImportedSpecifierDependency");
 const HarmonyExportSpecifierDependency = require("./HarmonyExportSpecifierDependency");
+const HarmonyImportDependencyParserPlugin = require("./HarmonyImportDependencyParserPlugin");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
 
-const {
-	JAVASCRIPT_MODULE_TYPE_AUTO,
-	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("../ModuleTypeConstants");
-const HarmonyDetectionParserPlugin = require("./HarmonyDetectionParserPlugin");
-const HarmonyExportDependencyParserPlugin = require("./HarmonyExportDependencyParserPlugin");
-const HarmonyImportDependencyParserPlugin = require("./HarmonyImportDependencyParserPlugin");
 const HarmonyTopLevelThisParserPlugin = require("./HarmonyTopLevelThisParserPlugin");
 
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../javascript/JavascriptParser")} Parser */
+/**
+ * @typedef HarmonyModulesPluginOptions
+ * @property {boolean=} topLevelAwait
+ * @property {boolean=} deferImport
+ */
 
 const PLUGIN_NAME = "HarmonyModulesPlugin";
 
-/** @typedef {{ topLevelAwait?: boolean }} HarmonyModulesPluginOptions */
-
 class HarmonyModulesPlugin {
 	/**
 	 * @param {HarmonyModulesPluginOptions} options options
@@ -127,12 +130,19 @@ class HarmonyModulesPlugin {
 				 */
 				const handler = (parser, parserOptions) => {
 					// TODO webpack 6: rename harmony to esm or module
-					if (parserOptions.harmony !== undefined && !parserOptions.harmony)
+					if (parserOptions.harmony !== undefined && !parserOptions.harmony) {
 						return;
+					}
 
 					new HarmonyDetectionParserPlugin(this.options).apply(parser);
-					new HarmonyImportDependencyParserPlugin(parserOptions).apply(parser);
-					new HarmonyExportDependencyParserPlugin(parserOptions).apply(parser);
+					new HarmonyImportDependencyParserPlugin(
+						parserOptions,
+						this.options.deferImport
+					).apply(parser);
+					new HarmonyExportDependencyParserPlugin(
+						parserOptions,
+						this.options.deferImport
+					).apply(parser);
 					new HarmonyTopLevelThisParserPlugin().apply(parser);
 				};
 
@@ -146,4 +156,5 @@ class HarmonyModulesPlugin {
 		);
 	}
 }
+
 module.exports = HarmonyModulesPlugin;

package/lib/dependencies/ImportMetaContextDependencyParserPlugin.js

@@ -186,6 +186,7 @@ module.exports = class ImportMetaContextDependencyParserPlugin {
 										})
 									) {
 										exports = [];
+
 										for (const i1 of items) {
 											/** @type {string[]} */
 											const export_ = [];

package/lib/dependencies/ImportMetaContextPlugin.js

@@ -52,8 +52,9 @@ class ImportMetaContextPlugin {
 					if (
 						parserOptions.importMetaContext !== undefined &&
 						!parserOptions.importMetaContext
-					)
+					) {
 						return;
+					}
 
 					new ImportMetaContextDependencyParserPlugin().apply(parser);
 				};

package/lib/dependencies/ImportMetaPlugin.js

@@ -15,9 +15,9 @@ const Template = require("../Template");
 const BasicEvaluatedExpression = require("../javascript/BasicEvaluatedExpression");
 const {
 	evaluateToIdentifier,
-	toConstantDependency,
+	evaluateToNumber,
 	evaluateToString,
-	evaluateToNumber
+	toConstantDependency
 } = require("../javascript/JavascriptParserHelpers");
 const memoize = require("../util/memoize");
 const propertyAccess = require("../util/propertyAccess");

package/lib/dependencies/ImportParserPlugin.js

@@ -24,6 +24,8 @@ const ImportWeakDependency = require("./ImportWeakDependency");
 /** @typedef {import("../javascript/JavascriptParser").ImportExpression} ImportExpression */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
+const PLUGIN_NAME = "ImportParserPlugin";
+
 class ImportParserPlugin {
 	/**
 	 * @param {JavascriptParserOptions} options options
@@ -44,7 +46,7 @@ class ImportParserPlugin {
 		 */
 		const exportsFromEnumerable = enumerable =>
 			Array.from(enumerable, e => [e]);
-		parser.hooks.importCall.tap("ImportParserPlugin", expr => {
+		parser.hooks.importCall.tap(PLUGIN_NAME, expr => {
 			const param = parser.evaluateExpression(expr.source);
 
 			let chunkName = null;
@@ -61,20 +63,26 @@ class ImportParserPlugin {
 				dynamicImportPrefetch,
 				dynamicImportFetchPriority
 			} = this.options;
-			if (dynamicImportPreload !== undefined && dynamicImportPreload !== false)
+			if (
+				dynamicImportPreload !== undefined &&
+				dynamicImportPreload !== false
+			) {
 				groupOptions.preloadOrder =
 					dynamicImportPreload === true ? 0 : dynamicImportPreload;
+			}
 			if (
 				dynamicImportPrefetch !== undefined &&
 				dynamicImportPrefetch !== false
-			)
+			) {
 				groupOptions.prefetchOrder =
 					dynamicImportPrefetch === true ? 0 : dynamicImportPrefetch;
+			}
 			if (
 				dynamicImportFetchPriority !== undefined &&
 				dynamicImportFetchPriority !== false
-			)
+			) {
 				groupOptions.fetchPriority = dynamicImportFetchPriority;
+			}
 
 			const { options: importOptions, errors: commentErrors } =
 				parser.parseCommentOptions(/** @type {Range} */ (expr.range));
@@ -91,6 +99,28 @@ class ImportParserPlugin {
 				}
 			}
 
+			let phase = expr.phase;
+			if (!phase && importOptions && importOptions.webpackDefer !== undefined) {
+				if (typeof importOptions.webpackDefer !== "boolean") {
+					parser.state.module.addWarning(
+						new UnsupportedFeatureWarning(
+							`\`webpackDefer\` expected a boolean, but received: ${importOptions.webpackDefer}.`,
+							/** @type {DependencyLocation} */ (expr.loc)
+						)
+					);
+				} else if (importOptions.webpackDefer) {
+					phase = "defer";
+				}
+			}
+			if (phase === "defer") {
+				parser.state.module.addWarning(
+					new UnsupportedFeatureWarning(
+						"import.defer() is not implemented yet.",
+						/** @type {DependencyLocation} */ (expr.loc)
+					)
+				);
+			}
+
 			if (importOptions) {
 				if (importOptions.webpackIgnore !== undefined) {
 					if (typeof importOptions.webpackIgnore !== "boolean") {
@@ -254,6 +284,7 @@ class ImportParserPlugin {
 						)
 					);
 				}
+
 				exports = exportsFromEnumerable(
 					[...referencedPropertiesInDestructuring].map(({ id }) => id)
 				);
@@ -315,11 +346,11 @@ class ImportParserPlugin {
 					include,
 					exclude,
 					mode,
-					namespaceObject: /** @type {BuildMeta} */ (
-						parser.state.module.buildMeta
-					).strictHarmonyModule
-						? "strict"
-						: true,
+					namespaceObject:
+						/** @type {BuildMeta} */
+						(parser.state.module.buildMeta).strictHarmonyModule
+							? "strict"
+							: true,
 					typePrefix: "import()",
 					category: "esm",
 					referencedExports: exports,

package/lib/dependencies/ImportPlugin.js

@@ -74,8 +74,9 @@ class ImportPlugin {
 				 * @returns {void}
 				 */
 				const handler = (parser, parserOptions) => {
-					if (parserOptions.import !== undefined && !parserOptions.import)
+					if (parserOptions.import !== undefined && !parserOptions.import) {
 						return;
+					}
 
 					new ImportParserPlugin(parserOptions).apply(parser);
 				};
@@ -93,4 +94,5 @@ class ImportPlugin {
 		);
 	}
 }
+
 module.exports = ImportPlugin;

package/lib/dependencies/LoaderPlugin.js

@@ -281,4 +281,5 @@ class LoaderPlugin {
 		});
 	}
 }
+
 module.exports = LoaderPlugin;

package/lib/dependencies/ModuleDependency.js

@@ -61,11 +61,13 @@ class ModuleDependency extends Dependency {
 	 * @returns {Module} ignored module
 	 */
 	createIgnoredModule(context) {
-		return new RawModule(
+		const module = new RawModule(
 			"/* (ignored) */",
 			`ignored|${context}|${this.request}`,
 			`${this.request} (ignored)`
 		);
+		module.factoryMeta = { sideEffectFree: true };
+		return module;
 	}
 
 	/**

package/lib/dependencies/ModuleDependencyTemplateAsRequireId.js

@@ -35,4 +35,5 @@ class ModuleDependencyTemplateAsRequireId extends ModuleDependency.Template {
 		source.replace(dep.range[0], dep.range[1] - 1, content);
 	}
 }
+
 module.exports = ModuleDependencyTemplateAsRequireId;

package/lib/dependencies/RequireContextPlugin.js

@@ -57,8 +57,9 @@ class RequireContextPlugin {
 					if (
 						parserOptions.requireContext !== undefined &&
 						!parserOptions.requireContext
-					)
+					) {
 						return;
+					}
 
 					new RequireContextDependencyParserPlugin().apply(parser);
 				};
@@ -161,4 +162,5 @@ class RequireContextPlugin {
 		);
 	}
 }
+
 module.exports = RequireContextPlugin;

package/lib/dependencies/RequireEnsurePlugin.js

@@ -5,11 +5,6 @@
 
 "use strict";
 
-const RequireEnsureDependency = require("./RequireEnsureDependency");
-const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
-
-const RequireEnsureDependenciesBlockParserPlugin = require("./RequireEnsureDependenciesBlockParserPlugin");
-
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC
@@ -18,6 +13,9 @@ const {
 	evaluateToString,
 	toConstantDependency
 } = require("../javascript/JavascriptParserHelpers");
+const RequireEnsureDependenciesBlockParserPlugin = require("./RequireEnsureDependenciesBlockParserPlugin");
+const RequireEnsureDependency = require("./RequireEnsureDependency");
+const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
 
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Compiler")} Compiler */
@@ -58,8 +56,9 @@ class RequireEnsurePlugin {
 					if (
 						parserOptions.requireEnsure !== undefined &&
 						!parserOptions.requireEnsure
-					)
+					) {
 						return;
+					}
 
 					new RequireEnsureDependenciesBlockParserPlugin().apply(parser);
 					parser.hooks.evaluateTypeof
@@ -83,4 +82,5 @@ class RequireEnsurePlugin {
 		);
 	}
 }
+
 module.exports = RequireEnsurePlugin;

package/lib/dependencies/RequireIncludeDependencyParserPlugin.js

@@ -17,6 +17,8 @@ const RequireIncludeDependency = require("./RequireIncludeDependency");
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
+const PLUGIN_NAME = "RequireIncludeDependencyParserPlugin";
+
 module.exports = class RequireIncludeDependencyParserPlugin {
 	/**
 	 * @param {boolean} warn true: warn about deprecation, false: don't warn
@@ -31,32 +33,31 @@ module.exports = class RequireIncludeDependencyParserPlugin {
 	 */
 	apply(parser) {
 		const { warn } = this;
-		parser.hooks.call
-			.for("require.include")
-			.tap("RequireIncludeDependencyParserPlugin", expr => {
-				if (expr.arguments.length !== 1) return;
-				const param = parser.evaluateExpression(expr.arguments[0]);
-				if (!param.isString()) return;
+		parser.hooks.call.for("require.include").tap(PLUGIN_NAME, expr => {
+			if (expr.arguments.length !== 1) return;
+			const param = parser.evaluateExpression(expr.arguments[0]);
+			if (!param.isString()) return;
 
-				if (warn) {
-					parser.state.module.addWarning(
-						new RequireIncludeDeprecationWarning(
-							/** @type {DependencyLocation} */ (expr.loc)
-						)
-					);
-				}
-
-				const dep = new RequireIncludeDependency(
-					/** @type {string} */ (param.string),
-					/** @type {Range} */ (expr.range)
+			if (warn) {
+				parser.state.module.addWarning(
+					new RequireIncludeDeprecationWarning(
+						/** @type {DependencyLocation} */
+						(expr.loc)
+					)
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
-				parser.state.current.addDependency(dep);
-				return true;
-			});
+			}
+
+			const dep = new RequireIncludeDependency(
+				/** @type {string} */ (param.string),
+				/** @type {Range} */ (expr.range)
+			);
+			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			parser.state.current.addDependency(dep);
+			return true;
+		});
 		parser.hooks.evaluateTypeof
 			.for("require.include")
-			.tap("RequireIncludePlugin", expr => {
+			.tap(PLUGIN_NAME, expr => {
 				if (warn) {
 					parser.state.module.addWarning(
 						new RequireIncludeDeprecationWarning(
@@ -66,18 +67,16 @@ module.exports = class RequireIncludeDependencyParserPlugin {
 				}
 				return evaluateToString("function")(expr);
 			});
-		parser.hooks.typeof
-			.for("require.include")
-			.tap("RequireIncludePlugin", expr => {
-				if (warn) {
-					parser.state.module.addWarning(
-						new RequireIncludeDeprecationWarning(
-							/** @type {DependencyLocation} */ (expr.loc)
-						)
-					);
-				}
-				return toConstantDependency(parser, JSON.stringify("function"))(expr);
-			});
+		parser.hooks.typeof.for("require.include").tap(PLUGIN_NAME, expr => {
+			if (warn) {
+				parser.state.module.addWarning(
+					new RequireIncludeDeprecationWarning(
+						/** @type {DependencyLocation} */ (expr.loc)
+					)
+				);
+			}
+			return toConstantDependency(parser, JSON.stringify("function"))(expr);
+		});
 	}
 };
 

package/lib/dependencies/RequireIncludePlugin.js

@@ -59,4 +59,5 @@ class RequireIncludePlugin {
 		);
 	}
 }
+
 module.exports = RequireIncludePlugin;

package/lib/dependencies/RuntimeRequirementsDependency.js

@@ -36,7 +36,7 @@ class RuntimeRequirementsDependency extends NullDependency {
 	 */
 	updateHash(hash, context) {
 		if (this._hashUpdate === undefined) {
-			this._hashUpdate = `${Array.from(this.runtimeRequirements).join()}`;
+			this._hashUpdate = `${[...this.runtimeRequirements].join()}`;
 		}
 		hash.update(this._hashUpdate);
 	}

package/lib/dependencies/SystemPlugin.js

@@ -46,7 +46,7 @@ class SystemPlugin {
 
 				compilation.hooks.runtimeRequirementInTree
 					.for(RuntimeGlobals.system)
-					.tap(PLUGIN_NAME, (chunk, set) => {
+					.tap(PLUGIN_NAME, (chunk, _set) => {
 						compilation.addRuntimeModule(chunk, new SystemRuntimeModule());
 					});
 

package/lib/dependencies/URLContextDependency.js

@@ -0,0 +1,65 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Haijie Xie @hai-x
+*/
+
+"use strict";
+
+const makeSerializable = require("../util/makeSerializable");
+const ContextDependency = require("./ContextDependency");
+const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
+
+/** @typedef {import("../ContextModule").ContextOptions} ContextOptions */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+
+/** @typedef {ContextOptions & { request: string }} ContextDependencyOptions */
+
+class URLContextDependency extends ContextDependency {
+	/**
+	 * @param {ContextDependencyOptions} options options
+	 * @param {Range} range range
+	 * @param {Range} valueRange value range
+	 */
+	constructor(options, range, valueRange) {
+		super(options);
+		this.range = range;
+		this.valueRange = valueRange;
+	}
+
+	get type() {
+		return "new URL() context";
+	}
+
+	get category() {
+		return "url";
+	}
+
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
+	serialize(context) {
+		const { write } = context;
+		write(this.valueRange);
+		super.serialize(context);
+	}
+
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
+	deserialize(context) {
+		const { read } = context;
+		this.valueRange = read();
+		super.deserialize(context);
+	}
+}
+
+makeSerializable(
+	URLContextDependency,
+	"webpack/lib/dependencies/URLContextDependency"
+);
+
+URLContextDependency.Template = ContextDependencyTemplateAsRequireCall;
+
+module.exports = URLContextDependency;