webpack 5.46.0 → 5.49.0

package/lib/javascript/JavascriptParser.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const { Parser: AcornParser } = require("acorn");
+const { importAssertions } = require("acorn-import-assertions");
 const { SyncBailHook, HookMap } = require("tapable");
 const vm = require("vm");
 const Parser = require("../Parser");
@@ -42,6 +43,10 @@ const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 /** @typedef {import("estree").Node} AnyNode */
 /** @typedef {import("estree").Program} ProgramNode */
 /** @typedef {import("estree").Statement} StatementNode */
+/** @typedef {import("estree").ImportDeclaration} ImportDeclarationNode */
+/** @typedef {import("estree").ExportNamedDeclaration} ExportNamedDeclarationNode */
+/** @typedef {import("estree").ExportDefaultDeclaration} ExportDefaultDeclarationNode */
+/** @typedef {import("estree").ExportAllDeclaration} ExportAllDeclarationNode */
 /** @typedef {import("estree").Super} SuperNode */
 /** @typedef {import("estree").TaggedTemplateExpression} TaggedTemplateExpressionNode */
 /** @typedef {import("estree").TemplateLiteral} TemplateLiteralNode */
@@ -61,7 +66,7 @@ const ALLOWED_MEMBER_TYPES_ALL = 0b11;
 
 // Syntax: https://developer.mozilla.org/en/SpiderMonkey/Parser_API
 
-const parser = AcornParser;
+const parser = AcornParser.extend(importAssertions);
 
 class VariableInfo {
 	/**
@@ -190,31 +195,31 @@ class JavascriptParser extends Parser {
 			]),
 			/** @type {HookMap<SyncBailHook<[LabeledStatementNode], boolean | void>>} */
 			label: new HookMap(() => new SyncBailHook(["statement"])),
-			/** @type {SyncBailHook<[StatementNode, ImportSource], boolean | void>} */
+			/** @type {SyncBailHook<[ImportDeclarationNode, ImportSource], boolean | void>} */
 			import: new SyncBailHook(["statement", "source"]),
-			/** @type {SyncBailHook<[StatementNode, ImportSource, string, string], boolean | void>} */
+			/** @type {SyncBailHook<[ImportDeclarationNode, ImportSource, string, string], boolean | void>} */
 			importSpecifier: new SyncBailHook([
 				"statement",
 				"source",
 				"exportName",
 				"identifierName"
 			]),
-			/** @type {SyncBailHook<[StatementNode], boolean | void>} */
+			/** @type {SyncBailHook<[ExportNamedDeclarationNode | ExportAllDeclarationNode], boolean | void>} */
 			export: new SyncBailHook(["statement"]),
-			/** @type {SyncBailHook<[StatementNode, ImportSource], boolean | void>} */
+			/** @type {SyncBailHook<[ExportNamedDeclarationNode | ExportAllDeclarationNode, ImportSource], boolean | void>} */
 			exportImport: new SyncBailHook(["statement", "source"]),
-			/** @type {SyncBailHook<[StatementNode, DeclarationNode], boolean | void>} */
+			/** @type {SyncBailHook<[ExportNamedDeclarationNode | ExportAllDeclarationNode, DeclarationNode], boolean | void>} */
 			exportDeclaration: new SyncBailHook(["statement", "declaration"]),
-			/** @type {SyncBailHook<[StatementNode, DeclarationNode], boolean | void>} */
+			/** @type {SyncBailHook<[ExportDefaultDeclarationNode, DeclarationNode], boolean | void>} */
 			exportExpression: new SyncBailHook(["statement", "declaration"]),
-			/** @type {SyncBailHook<[StatementNode, string, string, number | undefined], boolean | void>} */
+			/** @type {SyncBailHook<[ExportNamedDeclarationNode | ExportAllDeclarationNode, string, string, number | undefined], boolean | void>} */
 			exportSpecifier: new SyncBailHook([
 				"statement",
 				"identifierName",
 				"exportName",
 				"index"
 			]),
-			/** @type {SyncBailHook<[StatementNode, ImportSource, string, string, number | undefined], boolean | void>} */
+			/** @type {SyncBailHook<[ExportNamedDeclarationNode | ExportAllDeclarationNode, ImportSource, string, string, number | undefined], boolean | void>} */
 			exportImportSpecifier: new SyncBailHook([
 				"statement",
 				"source",

package/lib/optimize/SplitChunksPlugin.js

@@ -17,7 +17,7 @@ const {
 } = require("../util/comparators");
 const createHash = require("../util/createHash");
 const deterministicGrouping = require("../util/deterministicGrouping");
-const contextify = require("../util/identifier").contextify;
+const { makePathsRelative } = require("../util/identifier");
 const memoize = require("../util/memoize");
 const MinMaxSizeWarning = require("./MinMaxSizeWarning");
 
@@ -748,7 +748,7 @@ module.exports = class SplitChunksPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const cachedContextify = contextify.bindContextCache(
+		const cachedMakePathsRelative = makePathsRelative.bindContextCache(
 			compiler.context,
 			compiler.root
 		);
@@ -1596,11 +1596,11 @@ module.exports = class SplitChunksPlugin {
 							getKey(module) {
 								const cache = getKeyCache.get(module);
 								if (cache !== undefined) return cache;
-								const ident = cachedContextify(module.identifier());
+								const ident = cachedMakePathsRelative(module.identifier());
 								const nameForCondition =
 									module.nameForCondition && module.nameForCondition();
 								const name = nameForCondition
-									? cachedContextify(nameForCondition)
+									? cachedMakePathsRelative(nameForCondition)
 									: ident.replace(/^.*!|\?[^?!]*$/g, "");
 								const fullKey =
 									name +

package/lib/rules/{DescriptionDataMatcherRulePlugin.js → ObjectMatcherRulePlugin.js}

@@ -8,28 +8,32 @@
 /** @typedef {import("./RuleSetCompiler")} RuleSetCompiler */
 /** @typedef {import("./RuleSetCompiler").RuleCondition} RuleCondition */
 
-const RULE_PROPERTY = "descriptionData";
+class ObjectMatcherRulePlugin {
+	constructor(ruleProperty, dataProperty) {
+		this.ruleProperty = ruleProperty;
+		this.dataProperty = dataProperty || ruleProperty;
+	}
 
-class DescriptionDataMatcherRulePlugin {
 	/**
 	 * @param {RuleSetCompiler} ruleSetCompiler the rule set compiler
 	 * @returns {void}
 	 */
 	apply(ruleSetCompiler) {
+		const { ruleProperty, dataProperty } = this;
 		ruleSetCompiler.hooks.rule.tap(
-			"DescriptionDataMatcherRulePlugin",
+			"ObjectMatcherRulePlugin",
 			(path, rule, unhandledProperties, result) => {
-				if (unhandledProperties.has(RULE_PROPERTY)) {
-					unhandledProperties.delete(RULE_PROPERTY);
-					const value = rule[RULE_PROPERTY];
+				if (unhandledProperties.has(ruleProperty)) {
+					unhandledProperties.delete(ruleProperty);
+					const value = rule[ruleProperty];
 					for (const property of Object.keys(value)) {
-						const dataProperty = property.split(".");
+						const nestedDataProperties = property.split(".");
 						const condition = ruleSetCompiler.compileCondition(
-							`${path}.${RULE_PROPERTY}.${property}`,
+							`${path}.${ruleProperty}.${property}`,
 							value[property]
 						);
 						result.conditions.push({
-							property: ["descriptionData", ...dataProperty],
+							property: [dataProperty, ...nestedDataProperties],
 							matchWhenEmpty: condition.matchWhenEmpty,
 							fn: condition.fn
 						});
@@ -40,4 +44,4 @@ class DescriptionDataMatcherRulePlugin {
 	}
 }
 
-module.exports = DescriptionDataMatcherRulePlugin;
+module.exports = ObjectMatcherRulePlugin;