webpack 5.99.9 → 5.100.0

package/lib/dependencies/URLPlugin.js

@@ -5,29 +5,19 @@
 
 "use strict";
 
-const { pathToFileURL } = require("url");
-const CommentCompilationWarning = require("../CommentCompilationWarning");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_ESM
 } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const UnsupportedFeatureWarning = require("../UnsupportedFeatureWarning");
-const BasicEvaluatedExpression = require("../javascript/BasicEvaluatedExpression");
-const { approve } = require("../javascript/JavascriptParserHelpers");
-const InnerGraph = require("../optimize/InnerGraph");
-const ConstDependency = require("./ConstDependency");
-const URLDependency = require("./URLDependency");
 
-/** @typedef {import("estree").MemberExpression} MemberExpression */
-/** @typedef {import("estree").NewExpression} NewExpressionNode */
+const URLContextDependency = require("../dependencies/URLContextDependency");
+const URLDependency = require("../dependencies/URLDependency");
+const URLParserPlugin = require("../url/URLParserPlugin");
+
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser")} Parser */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 const PLUGIN_NAME = "URLPlugin";
 
@@ -38,168 +28,38 @@ class URLPlugin {
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
-			(compilation, { normalModuleFactory }) => {
+			(compilation, { normalModuleFactory, contextModuleFactory }) => {
 				compilation.dependencyFactories.set(URLDependency, normalModuleFactory);
 				compilation.dependencyTemplates.set(
 					URLDependency,
 					new URLDependency.Template()
 				);
-
-				/**
-				 * @param {NormalModule} module module
-				 * @returns {URL} file url
-				 */
-				const getUrl = module => pathToFileURL(module.resource);
-
-				/**
-				 * @param {Parser} parser parser parser
-				 * @param {MemberExpression} arg arg
-				 * @returns {boolean} true when it is `meta.url`, otherwise false
-				 */
-				const isMetaUrl = (parser, arg) => {
-					const chain = parser.extractMemberExpressionChain(arg);
-
-					if (
-						chain.members.length !== 1 ||
-						chain.object.type !== "MetaProperty" ||
-						chain.object.meta.name !== "import" ||
-						chain.object.property.name !== "meta" ||
-						chain.members[0] !== "url"
-					)
-						return false;
-
-					return true;
-				};
+				compilation.dependencyFactories.set(
+					URLContextDependency,
+					contextModuleFactory
+				);
+				compilation.dependencyTemplates.set(
+					URLContextDependency,
+					new URLContextDependency.Template()
+				);
 
 				/**
 				 * @param {Parser} parser parser parser
 				 * @param {JavascriptParserOptions} parserOptions parserOptions
 				 * @returns {void}
 				 */
-				const parserCallback = (parser, parserOptions) => {
+				const handler = (parser, parserOptions) => {
 					if (parserOptions.url === false) return;
-					const relative = parserOptions.url === "relative";
-
-					/**
-					 * @param {NewExpressionNode} expr expression
-					 * @returns {undefined | string} request
-					 */
-					const getUrlRequest = expr => {
-						if (expr.arguments.length !== 2) return;
-
-						const [arg1, arg2] = expr.arguments;
-
-						if (
-							arg2.type !== "MemberExpression" ||
-							arg1.type === "SpreadElement"
-						)
-							return;
-
-						if (!isMetaUrl(parser, arg2)) return;
-
-						return parser.evaluateExpression(arg1).asString();
-					};
-
-					parser.hooks.canRename.for("URL").tap(PLUGIN_NAME, approve);
-					parser.hooks.evaluateNewExpression
-						.for("URL")
-						.tap(PLUGIN_NAME, expr => {
-							const request = getUrlRequest(expr);
-							if (!request) return;
-							const url = new URL(request, getUrl(parser.state.module));
-
-							return new BasicEvaluatedExpression()
-								.setString(url.toString())
-								.setRange(/** @type {Range} */ (expr.range));
-						});
-					parser.hooks.new.for("URL").tap(PLUGIN_NAME, _expr => {
-						const expr = /** @type {NewExpressionNode} */ (_expr);
-						const { options: importOptions, errors: commentErrors } =
-							parser.parseCommentOptions(/** @type {Range} */ (expr.range));
-
-						if (commentErrors) {
-							for (const e of commentErrors) {
-								const { comment } = e;
-								parser.state.module.addWarning(
-									new CommentCompilationWarning(
-										`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
-										/** @type {DependencyLocation} */ (comment.loc)
-									)
-								);
-							}
-						}
-
-						if (importOptions && importOptions.webpackIgnore !== undefined) {
-							if (typeof importOptions.webpackIgnore !== "boolean") {
-								parser.state.module.addWarning(
-									new UnsupportedFeatureWarning(
-										`\`webpackIgnore\` expected a boolean, but received: ${importOptions.webpackIgnore}.`,
-										/** @type {DependencyLocation} */ (expr.loc)
-									)
-								);
-								return;
-							} else if (importOptions.webpackIgnore) {
-								if (expr.arguments.length !== 2) return;
-
-								const [, arg2] = expr.arguments;
-
-								if (
-									arg2.type !== "MemberExpression" ||
-									!isMetaUrl(parser, arg2)
-								)
-									return;
-
-								const dep = new ConstDependency(
-									RuntimeGlobals.baseURI,
-									/** @type {Range} */ (arg2.range),
-									[RuntimeGlobals.baseURI]
-								);
-								dep.loc = /** @type {DependencyLocation} */ (expr.loc);
-								parser.state.module.addPresentationalDependency(dep);
-
-								return true;
-							}
-						}
-
-						const request = getUrlRequest(expr);
-
-						if (!request) return;
-
-						const [arg1, arg2] = expr.arguments;
-						const dep = new URLDependency(
-							request,
-							[
-								/** @type {Range} */ (arg1.range)[0],
-								/** @type {Range} */ (arg2.range)[1]
-							],
-							/** @type {Range} */ (expr.range),
-							relative
-						);
-						dep.loc = /** @type {DependencyLocation} */ (expr.loc);
-						parser.state.current.addDependency(dep);
-						InnerGraph.onUsage(parser.state, e => (dep.usedByExports = e));
-						return true;
-					});
-					parser.hooks.isPure.for("NewExpression").tap(PLUGIN_NAME, _expr => {
-						const expr = /** @type {NewExpressionNode} */ (_expr);
-						const { callee } = expr;
-						if (callee.type !== "Identifier") return;
-						const calleeInfo = parser.getFreeInfoFromVariable(callee.name);
-						if (!calleeInfo || calleeInfo.name !== "URL") return;
-
-						const request = getUrlRequest(expr);
-
-						if (request) return true;
-					});
+					new URLParserPlugin(parserOptions).apply(parser);
 				};
 
 				normalModuleFactory.hooks.parser
 					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
-					.tap(PLUGIN_NAME, parserCallback);
+					.tap(PLUGIN_NAME, handler);
 
 				normalModuleFactory.hooks.parser
 					.for(JAVASCRIPT_MODULE_TYPE_ESM)
-					.tap(PLUGIN_NAME, parserCallback);
+					.tap(PLUGIN_NAME, handler);
 			}
 		);
 	}

package/lib/dependencies/WorkerPlugin.js

@@ -122,8 +122,9 @@ class WorkerPlugin {
 				 * @returns {[string, Range] | void} parsed
 				 */
 				const parseModuleUrl = (parser, expr) => {
-					if (expr.type !== "NewExpression" || expr.callee.type === "Super")
+					if (expr.type !== "NewExpression" || expr.callee.type === "Super") {
 						return;
+					}
 					if (
 						expr.arguments.length === 1 &&
 						expr.arguments[0].type === "MemberExpression" &&
@@ -179,8 +180,9 @@ class WorkerPlugin {
 						chain.object.meta.name !== "import" ||
 						chain.object.property.name !== "meta" ||
 						chain.members[0] !== "url"
-					)
+					) {
 						return false;
+					}
 
 					return true;
 				};
@@ -215,8 +217,9 @@ class WorkerPlugin {
 									/** @type {Expression} */
 									(prop.value)
 								);
-								if (value.isCompileTimeValue())
+								if (value.isCompileTimeValue()) {
 									values[prop.key.name] = value.asCompileTimeValue();
+								}
 							}
 						} else {
 							otherElements.push(prop);
@@ -251,8 +254,9 @@ class WorkerPlugin {
 					 * @returns {boolean | void} true when handled
 					 */
 					const handleNewWorker = expr => {
-						if (expr.arguments.length === 0 || expr.arguments.length > 2)
+						if (expr.arguments.length === 0 || expr.arguments.length > 2) {
 							return;
+						}
 						const [arg1, arg2] = expr.arguments;
 						if (arg1.type === "SpreadElement") return;
 						if (arg2 && arg2.type === "SpreadElement") return;
@@ -489,12 +493,18 @@ class WorkerPlugin {
 							const pattern = item.slice(1, firstDot);
 							const itemMembers = item.slice(firstDot + 1, -2);
 
-							parser.hooks.preDeclarator.tap(PLUGIN_NAME, (decl, statement) => {
-								if (decl.id.type === "Identifier" && decl.id.name === pattern) {
-									parser.tagVariable(decl.id.name, WorkerSpecifierTag);
-									return true;
+							parser.hooks.preDeclarator.tap(
+								PLUGIN_NAME,
+								(decl, _statement) => {
+									if (
+										decl.id.type === "Identifier" &&
+										decl.id.name === pattern
+									) {
+										parser.tagVariable(decl.id.name, WorkerSpecifierTag);
+										return true;
+									}
 								}
-							});
+							);
 							parser.hooks.pattern.for(pattern).tap(PLUGIN_NAME, pattern => {
 								parser.tagVariable(pattern.name, WorkerSpecifierTag);
 								return true;
@@ -543,7 +553,9 @@ class WorkerPlugin {
 							for (const itemFromDefault of DEFAULT_SYNTAX) {
 								processItem(itemFromDefault);
 							}
-						} else processItem(item);
+						} else {
+							processItem(item);
+						}
 					}
 				};
 				normalModuleFactory.hooks.parser
@@ -556,4 +568,5 @@ class WorkerPlugin {
 		);
 	}
 }
+
 module.exports = WorkerPlugin;

package/lib/dependencies/processExportInfo.js

@@ -56,7 +56,7 @@ const processExportInfo = (
 			referencedExports,
 			defaultPointsToSelf && exportInfo.name === "default"
 				? prefix
-				: prefix.concat(exportInfo.name),
+				: [...prefix, exportInfo.name],
 			exportInfo,
 			false,
 			alreadyVisited
@@ -64,4 +64,5 @@ const processExportInfo = (
 	}
 	alreadyVisited.delete(exportInfo);
 };
+
 module.exports = processExportInfo;