webpack 5.47.0 → 5.50.0

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -14,7 +14,11 @@ const HarmonyExports = require("./HarmonyExports");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
 
+/** @typedef {import("estree").ExportAllDeclaration} ExportAllDeclaration */
+/** @typedef {import("estree").ExportNamedDeclaration} ExportNamedDeclaration */
 /** @typedef {import("estree").Identifier} Identifier */
+/** @typedef {import("estree").ImportDeclaration} ImportDeclaration */
+/** @typedef {import("estree").ImportExpression} ImportExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../optimize/InnerGraph").InnerGraph} InnerGraph */
 /** @typedef {import("../optimize/InnerGraph").TopLevelSymbol} TopLevelSymbol */
@@ -29,8 +33,32 @@ const harmonySpecifierTag = Symbol("harmony import");
  * @property {number} sourceOrder
  * @property {string} name
  * @property {boolean} await
+ * @property {Record<string, any> | undefined} assertions
  */
 
+/**
+ * @param {ImportDeclaration | ExportNamedDeclaration | ExportAllDeclaration | ImportExpression} node node with assertions
+ * @returns {Record<string, any> | undefined} assertions
+ */
+function getAssertions(node) {
+	// TODO remove cast when @types/estree has been updated to import assertions
+	const assertions = /** @type {{ assertions?: ImportAttributeNode[] }} */ (
+		node
+	).assertions;
+	if (assertions === undefined) {
+		return undefined;
+	}
+	const result = {};
+	for (const assertion of assertions) {
+		const key =
+			assertion.key.type === "Identifier"
+				? assertion.key.name
+				: assertion.key.value;
+		result[key] = assertion.value.value;
+	}
+	return result;
+}
+
 module.exports = class HarmonyImportDependencyParserPlugin {
 	constructor(options) {
 		this.strictExportPresence = options.strictExportPresence;
@@ -65,9 +93,11 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 				clearDep.loc = statement.loc;
 				parser.state.module.addPresentationalDependency(clearDep);
 				parser.unsetAsiPosition(statement.range[1]);
+				const assertions = getAssertions(statement);
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
 					source,
-					parser.state.lastHarmonyImportOrder
+					parser.state.lastHarmonyImportOrder,
+					assertions
 				);
 				sideEffectDep.loc = statement.loc;
 				parser.state.module.addDependency(sideEffectDep);
@@ -82,7 +112,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					name,
 					source,
 					ids,
-					sourceOrder: parser.state.lastHarmonyImportOrder
+					sourceOrder: parser.state.lastHarmonyImportOrder,
+					assertions: getAssertions(statement)
 				});
 				return true;
 			}
@@ -97,7 +128,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					settings.ids,
 					settings.name,
 					expr.range,
-					this.strictExportPresence
+					this.strictExportPresence,
+					settings.assertions
 				);
 				dep.shorthand = parser.scope.inShorthand;
 				dep.directImport = true;
@@ -118,7 +150,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					ids,
 					settings.name,
 					expr.range,
-					this.strictExportPresence
+					this.strictExportPresence,
+					settings.assertions
 				);
 				dep.asiSafe = !parser.isAsiPosition(expr.range[0]);
 				dep.loc = expr.loc;
@@ -138,7 +171,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					ids,
 					settings.name,
 					callee.range,
-					this.strictExportPresence
+					this.strictExportPresence,
+					settings.assertions
 				);
 				dep.directImport = members.length === 0;
 				dep.call = true;
@@ -206,3 +240,4 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 };
 
 module.exports.harmonySpecifierTag = harmonySpecifierTag;
+module.exports.getAssertions = getAssertions;

package/lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -20,8 +20,8 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
-	constructor(request, sourceOrder) {
-		super(request, sourceOrder);
+	constructor(request, sourceOrder, assertions) {
+		super(request, sourceOrder, assertions);
 	}
 
 	get type() {

package/lib/dependencies/HarmonyImportSpecifierDependency.js

@@ -29,8 +29,16 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 const idsSymbol = Symbol("HarmonyImportSpecifierDependency.ids");
 
 class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
-	constructor(request, sourceOrder, ids, name, range, strictExportPresence) {
-		super(request, sourceOrder);
+	constructor(
+		request,
+		sourceOrder,
+		ids,
+		name,
+		range,
+		strictExportPresence,
+		assertions
+	) {
+		super(request, sourceOrder, assertions);
 		this.ids = ids;
 		this.name = name;
 		this.range = range;

package/lib/dependencies/ModuleDependency.js

@@ -22,13 +22,20 @@ class ModuleDependency extends Dependency {
 		this.request = request;
 		this.userRequest = request;
 		this.range = undefined;
+		// assertions must be serialized by subclasses that use it
+		/** @type {Record<string, any> | undefined} */
+		this.assertions = undefined;
 	}
 
 	/**
 	 * @returns {string | null} an identifier to merge equal requests
 	 */
 	getResourceIdentifier() {
-		return `module${this.request}`;
+		let str = `module${this.request}`;
+		if (this.assertions !== undefined) {
+			str += JSON.stringify(this.assertions);
+		}
+		return str;
 	}
 
 	/**

package/lib/hmr/HotModuleReplacement.runtime.js

@@ -252,7 +252,11 @@ module.exports = function () {
 			.then($hmrDownloadManifest$)
 			.then(function (update) {
 				if (!update) {
-					return setStatus(applyInvalidatedModules() ? "ready" : "idle");
+					return setStatus(applyInvalidatedModules() ? "ready" : "idle").then(
+						function () {
+							return null;
+						}
+					);
 				}
 
 				return setStatus("prepare").then(function () {

package/lib/index.js

@@ -554,9 +554,6 @@ module.exports = mergeExports(fn, {
 		schemes: {
 			get HttpUriPlugin() {
 				return require("./schemes/HttpUriPlugin");
-			},
-			get HttpsUriPlugin() {
-				return require("./schemes/HttpsUriPlugin");
 			}
 		}
 	}

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 {
 	/**
@@ -130,6 +135,8 @@ const defaultParserOptions = {
 	locations: true,
 	ecmaVersion: "latest",
 	sourceType: "module",
+	// https://github.com/tc39/proposal-hashbang
+	allowHashBang: true,
 	onComment: null
 };
 
@@ -190,31 +197,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;