@depup/webpack 5.106.1-depup.0 → 5.109.2-depup.0

package/lib/url/URLParserPlugin.js

@@ -6,16 +6,20 @@
 "use strict";
 
 const { pathToFileURL } = require("url");
-const CommentCompilationWarning = require("../CommentCompilationWarning");
 const RuntimeGlobals = require("../RuntimeGlobals");
-const UnsupportedFeatureWarning = require("../UnsupportedFeatureWarning");
 const ConstDependency = require("../dependencies/ConstDependency");
 const ContextDependencyHelpers = require("../dependencies/ContextDependencyHelpers");
+const {
+	isImportMetaFieldEnabled
+} = require("../dependencies/ImportMetaPlugin");
 const URLContextDependency = require("../dependencies/URLContextDependency");
 const URLDependency = require("../dependencies/URLDependency");
+const CommentCompilationWarning = require("../errors/CommentCompilationWarning");
+const UnsupportedFeatureWarning = require("../errors/UnsupportedFeatureWarning");
 const BasicEvaluatedExpression = require("../javascript/BasicEvaluatedExpression");
 const { approve } = require("../javascript/JavascriptParserHelpers");
-const InnerGraph = require("../optimize/InnerGraph");
+const { getInnerGraphUtils } = require("../optimize/InnerGraph");
+const ResourceHintPlugin = require("../prefetch/ResourceHintPlugin");
 
 /** @typedef {import("estree").MemberExpression} MemberExpression */
 /** @typedef {import("estree").NewExpression} NewExpressionNode */
@@ -28,12 +32,14 @@ const InnerGraph = require("../optimize/InnerGraph");
 const PLUGIN_NAME = "URLParserPlugin";
 
 /**
+ * Returns file url.
  * @param {NormalModule} module module
  * @returns {URL} file url
  */
 const getUrl = (module) => pathToFileURL(module.resource);
 
 /**
+ * Checks whether this object is meta url.
  * @param {JavascriptParser} parser parser parser
  * @param {MemberExpression} arg arg
  * @returns {boolean} true when it is `meta.url`, otherwise false
@@ -54,19 +60,48 @@ const isMetaUrl = (parser, arg) => {
 	return true;
 };
 
+/**
+ * Whether the request points to a directory and thus can't be an asset.
+ * @param {string} request request
+ * @returns {boolean} true when the request is a directory reference
+ */
+const isDirectoryRequest = (request) =>
+	request === "." || request === ".." || request.endsWith("/");
+
+/**
+ * Replaces `import.meta.url` with the runtime base URI, leaving the
+ * `new URL(...)` construction untouched so it's evaluated at runtime.
+ * @param {JavascriptParser} parser parser
+ * @param {NewExpressionNode} expr expression
+ * @returns {void}
+ */
+const keepNewURL = (parser, expr) => {
+	const [, arg2] = expr.arguments;
+	const dep = new ConstDependency(
+		RuntimeGlobals.baseURI,
+		/** @type {Range} */ (arg2.range),
+		[RuntimeGlobals.baseURI]
+	);
+	dep.loc = parser.getLocation(expr);
+	parser.state.module.addPresentationalDependency(dep);
+};
+
 /** @type {WeakMap<NewExpressionNode, BasicEvaluatedExpression | undefined>} */
 const getEvaluatedExprCache = new WeakMap();
 
 /**
+ * Gets evaluated expr.
  * @param {NewExpressionNode} expr expression
  * @param {JavascriptParser} parser parser parser
+ * @param {boolean} importMetaUrlEnabled true when import.meta.url should be handled
  * @returns {BasicEvaluatedExpression | undefined} basic evaluated expression
  */
-const getEvaluatedExpr = (expr, parser) => {
+const getEvaluatedExpr = (expr, parser, importMetaUrlEnabled) => {
 	let result = getEvaluatedExprCache.get(expr);
 	if (result !== undefined) return result;
 
 	/**
+	 * Returns basic evaluated expression.
 	 * @returns {BasicEvaluatedExpression | undefined} basic evaluated expression
 	 */
 	const evaluate = () => {
@@ -77,7 +112,9 @@ const getEvaluatedExpr = (expr, parser) => {
 		if (arg2.type !== "MemberExpression" || arg1.type === "SpreadElement") {
 			return;
 		}
-		if (!isMetaUrl(parser, arg2)) return;
+		if (!importMetaUrlEnabled || !isMetaUrl(parser, arg2)) {
+			return;
+		}
 
 		return parser.evaluateExpression(arg1);
 	};
@@ -88,8 +125,16 @@ const getEvaluatedExpr = (expr, parser) => {
 	return result;
 };
 
+/**
+ * @typedef {object} ResolvedResourceHints
+ * @property {boolean=} prefetch project-wide prefetch default
+ * @property {boolean=} preload project-wide preload default
+ * @property {("low" | "high" | "auto" | false)=} fetchPriority project-wide fetchPriority default
+ */
+
 class URLParserPlugin {
 	/**
+	 * Creates an instance of URLParserPlugin.
 	 * @param {JavascriptParserOptions} options options
 	 */
 	constructor(options) {
@@ -98,15 +143,24 @@ class URLParserPlugin {
 	}
 
 	/**
+	 * Applies the plugin by registering its hooks on the compiler.
 	 * @param {JavascriptParser} parser the parser
 	 * @returns {void}
 	 */
 	apply(parser) {
 		const relative = this.options.url === "relative";
+		const importMetaUrlEnabled = isImportMetaFieldEnabled(
+			this.options.importMeta,
+			"url"
+		);
 
 		parser.hooks.canRename.for("URL").tap(PLUGIN_NAME, approve);
 		parser.hooks.evaluateNewExpression.for("URL").tap(PLUGIN_NAME, (expr) => {
-			const evaluatedExpr = getEvaluatedExpr(expr, parser);
+			const evaluatedExpr = getEvaluatedExpr(
+				expr,
+				parser,
+				importMetaUrlEnabled
+			);
 			const request = evaluatedExpr && evaluatedExpr.asString();
 
 			if (!request) return;
@@ -127,7 +181,7 @@ class URLParserPlugin {
 					parser.state.module.addWarning(
 						new CommentCompilationWarning(
 							`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
-							/** @type {DependencyLocation} */ (comment.loc)
+							parser.getLocation(comment)
 						)
 					);
 				}
@@ -138,7 +192,7 @@ class URLParserPlugin {
 					parser.state.module.addWarning(
 						new UnsupportedFeatureWarning(
 							`\`webpackIgnore\` expected a boolean, but received: ${importOptions.webpackIgnore}.`,
-							/** @type {DependencyLocation} */ (expr.loc)
+							parser.getLocation(expr)
 						)
 					);
 					return;
@@ -147,23 +201,25 @@ class URLParserPlugin {
 
 					const [, arg2] = expr.arguments;
 
-					if (arg2.type !== "MemberExpression" || !isMetaUrl(parser, arg2)) {
+					if (
+						arg2.type !== "MemberExpression" ||
+						!importMetaUrlEnabled ||
+						!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);
+					keepNewURL(parser, expr);
 
 					return true;
 				}
 			}
 
-			const evaluatedExpr = getEvaluatedExpr(expr, parser);
+			const evaluatedExpr = getEvaluatedExpr(
+				expr,
+				parser,
+				importMetaUrlEnabled
+			);
 			if (!evaluatedExpr) return;
 
 			/** @type {string | undefined} */
@@ -171,6 +227,12 @@ class URLParserPlugin {
 
 			// static URL
 			if ((request = evaluatedExpr.asString())) {
+				// A directory is not an asset; keep `new URL(...)` as-is, matching Node/browsers.
+				if (isDirectoryRequest(request)) {
+					keepNewURL(parser, expr);
+					return true;
+				}
+
 				const [arg1, arg2] = expr.arguments;
 				const dep = new URLDependency(
 					request,
@@ -181,9 +243,31 @@ class URLParserPlugin {
 					/** @type {Range} */ (expr.range),
 					relative
 				);
-				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+				dep.loc = parser.getLocation(expr);
+				// `parser.javascript.urlHints` provides project-wide defaults
+				// (resolved per-request, with `test` / `include` / `exclude`
+				// matching); a per-URL magic comment for the same hint wins
+				// when both are set.
+				ResourceHintPlugin.applyResourceHints(
+					dep,
+					this.options.urlHints,
+					request,
+					importOptions,
+					parser.state.module,
+					parser.getLocation(expr)
+				);
 				parser.state.current.addDependency(dep);
-				InnerGraph.onUsage(parser.state, (e) => (dep.usedByExports = e));
+				// For ESM module output the template embeds the asset's resolved
+				// filename, so the asset must be code-generated first. Only added in
+				// that mode — a code-gen dependency on an asset that a later watch
+				// rebuild leaves unaffected can otherwise deadlock the scheduler.
+				if (parser.state.compilation.options.output.module) {
+					parser.state.module.addCodeGenerationDependency(dep);
+				}
+				getInnerGraphUtils(parser.state.compilation).onUsage(
+					parser.state,
+					(e) => (dep.usedByExports = e)
+				);
 				return true;
 			}
 
@@ -204,7 +288,7 @@ class URLParserPlugin {
 						parser.state.module.addWarning(
 							new UnsupportedFeatureWarning(
 								`\`webpackInclude\` expected a regular expression, but received: ${importOptions.webpackInclude}.`,
-								/** @type {DependencyLocation} */ (expr.loc)
+								parser.getLocation(expr)
 							)
 						);
 					} else {
@@ -219,7 +303,7 @@ class URLParserPlugin {
 						parser.state.module.addWarning(
 							new UnsupportedFeatureWarning(
 								`\`webpackExclude\` expected a regular expression, but received: ${importOptions.webpackExclude}.`,
-								/** @type {DependencyLocation} */ (expr.loc)
+								parser.getLocation(expr)
 							)
 						);
 					} else {
@@ -243,7 +327,7 @@ class URLParserPlugin {
 				parser
 			);
 			if (!dep) return;
-			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+			dep.loc = parser.getLocation(expr);
 			dep.optional = Boolean(parser.scope.inTry);
 			parser.state.current.addDependency(dep);
 			return true;
@@ -255,7 +339,11 @@ class URLParserPlugin {
 			const calleeInfo = parser.getFreeInfoFromVariable(callee.name);
 			if (!calleeInfo || calleeInfo.name !== "URL") return;
 
-			const evaluatedExpr = getEvaluatedExpr(expr, parser);
+			const evaluatedExpr = getEvaluatedExpr(
+				expr,
+				parser,
+				importMetaUrlEnabled
+			);
 			const request = evaluatedExpr && evaluatedExpr.asString();
 
 			if (request) return true;

package/lib/util/ArrayHelpers.js

@@ -34,6 +34,7 @@ module.exports.groupBy = (
 ) =>
 	arr.reduce(
 		/**
+		 * Handles the callback logic for this hook.
 		 * @param {[T[], T[]]} groups An accumulator storing already partitioned values returned from previous call.
 		 * @param {T} value The value of the current element
 		 * @returns {[T[], T[]]} returns an array of partitioned groups accumulator resulting from calling a predicate on the current value.

package/lib/util/ArrayQueue.js

@@ -6,10 +6,13 @@
 "use strict";
 
 /**
+ * FIFO queue backed by arrays with a reversed dequeue buffer to avoid the cost
+ * of repeated `Array#shift` operations.
  * @template T
  */
 class ArrayQueue {
 	/**
+	 * Seeds the queue with an optional iterable of items in dequeue order.
 	 * @param {Iterable<T>=} items The initial elements.
 	 */
 	constructor(items) {
@@ -26,7 +29,7 @@ class ArrayQueue {
 	}
 
 	/**
-	 * Returns the number of elements in this queue.
+	 * Returns the current number of items waiting in either internal buffer.
 	 * @returns {number} The number of elements in this queue.
 	 */
 	get length() {
@@ -34,7 +37,7 @@ class ArrayQueue {
 	}
 
 	/**
-	 * Empties the queue.
+	 * Removes all pending items from both internal buffers.
 	 */
 	clear() {
 		this._list.length = 0;
@@ -42,7 +45,7 @@ class ArrayQueue {
 	}
 
 	/**
-	 * Appends the specified element to this queue.
+	 * Appends an item to the tail of the queue.
 	 * @param {T} item The element to add.
 	 * @returns {void}
 	 */
@@ -51,7 +54,8 @@ class ArrayQueue {
 	}
 
 	/**
-	 * Retrieves and removes the head of this queue.
+	 * Removes and returns the next item in FIFO order, switching to a reversed
+	 * buffer when that is cheaper than shifting from the front of the array.
 	 * @returns {T | undefined} The head of the queue of `undefined` if this queue is empty.
 	 */
 	dequeue() {
@@ -68,7 +72,8 @@ class ArrayQueue {
 	}
 
 	/**
-	 * Finds and removes an item
+	 * Removes the first matching item from whichever internal buffer currently
+	 * contains it.
 	 * @param {T} item the item
 	 * @returns {void}
 	 */