webpack 5.44.0 → 5.45.0

package/lib/Compilation.js

@@ -855,10 +855,13 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 			logger: this.getLogger("webpack.FileSystemInfo")
 		});
 		if (compiler.fileTimestamps) {
-			this.fileSystemInfo.addFileTimestamps(compiler.fileTimestamps);
+			this.fileSystemInfo.addFileTimestamps(compiler.fileTimestamps, true);
 		}
 		if (compiler.contextTimestamps) {
-			this.fileSystemInfo.addContextTimestamps(compiler.contextTimestamps);
+			this.fileSystemInfo.addContextTimestamps(
+				compiler.contextTimestamps,
+				true
+			);
 		}
 		/** @type {Map<string, string | Set<string>>} */
 		this.valueCacheVersions = new Map();

package/lib/Compiler.js

@@ -222,13 +222,13 @@ class Compiler {
 		/** @type {Set<string>} */
 		this.immutablePaths = new Set();
 
-		/** @type {Set<string>} */
+		/** @type {ReadonlySet<string>} */
 		this.modifiedFiles = undefined;
-		/** @type {Set<string>} */
+		/** @type {ReadonlySet<string>} */
 		this.removedFiles = undefined;
-		/** @type {Map<string, FileSystemInfoEntry | "ignore" | null>} */
+		/** @type {ReadonlyMap<string, FileSystemInfoEntry | "ignore" | null>} */
 		this.fileTimestamps = undefined;
-		/** @type {Map<string, FileSystemInfoEntry | "ignore" | null>} */
+		/** @type {ReadonlyMap<string, FileSystemInfoEntry | "ignore" | null>} */
 		this.contextTimestamps = undefined;
 		/** @type {number} */
 		this.fsStartTime = undefined;

package/lib/FileSystemInfo.js

@@ -8,6 +8,7 @@
 const { create: createResolver } = require("enhanced-resolve");
 const asyncLib = require("neo-async");
 const AsyncQueue = require("./util/AsyncQueue");
+const StackedCacheMap = require("./util/StackedCacheMap");
 const createHash = require("./util/createHash");
 const { join, dirname, relative } = require("./util/fs");
 const makeSerializable = require("./util/makeSerializable");
@@ -365,7 +366,7 @@ class Snapshot {
 	}
 
 	/**
-	 * @param {function(Snapshot): (Map<string, any> | Set<string>)[]} getMaps first
+	 * @param {function(Snapshot): (ReadonlyMap<string, any> | ReadonlySet<string>)[]} getMaps first
 	 * @returns {Iterable<string>} iterable
 	 */
 	_createIterable(getMaps) {
@@ -853,14 +854,14 @@ class FileSystemInfo {
 			(s, v) => s.setManagedMissing(v),
 			true
 		);
-		/** @type {Map<string, FileSystemInfoEntry | "ignore" | null>} */
-		this._fileTimestamps = new Map();
+		/** @type {StackedCacheMap<string, FileSystemInfoEntry | "ignore" | null>} */
+		this._fileTimestamps = new StackedCacheMap();
 		/** @type {Map<string, string>} */
 		this._fileHashes = new Map();
 		/** @type {Map<string, TimestampAndHash | string>} */
 		this._fileTshs = new Map();
-		/** @type {Map<string, FileSystemInfoEntry | "ignore" | null>} */
-		this._contextTimestamps = new Map();
+		/** @type {StackedCacheMap<string, FileSystemInfoEntry | "ignore" | null>} */
+		this._contextTimestamps = new StackedCacheMap();
 		/** @type {Map<string, string>} */
 		this._contextHashes = new Map();
 		/** @type {Map<string, TimestampAndHash | string>} */
@@ -1060,24 +1061,22 @@ class FileSystemInfo {
 	}
 
 	/**
-	 * @param {Map<string, FileSystemInfoEntry | "ignore" | null>} map timestamps
+	 * @param {ReadonlyMap<string, FileSystemInfoEntry | "ignore" | null>} map timestamps
+	 * @param {boolean=} immutable if 'map' is immutable and FileSystemInfo can keep referencing it
 	 * @returns {void}
 	 */
-	addFileTimestamps(map) {
-		for (const [path, ts] of map) {
-			this._fileTimestamps.set(path, ts);
-		}
+	addFileTimestamps(map, immutable) {
+		this._fileTimestamps.addAll(map, immutable);
 		this._cachedDeprecatedFileTimestamps = undefined;
 	}
 
 	/**
-	 * @param {Map<string, FileSystemInfoEntry | "ignore" | null>} map timestamps
+	 * @param {ReadonlyMap<string, FileSystemInfoEntry | "ignore" | null>} map timestamps
+	 * @param {boolean=} immutable if 'map' is immutable and FileSystemInfo can keep referencing it
 	 * @returns {void}
 	 */
-	addContextTimestamps(map) {
-		for (const [path, ts] of map) {
-			this._contextTimestamps.set(path, ts);
-		}
+	addContextTimestamps(map, immutable) {
+		this._contextTimestamps.addAll(map, immutable);
 		this._cachedDeprecatedContextTimestamps = undefined;
 	}
 

package/lib/MultiCompiler.js

@@ -313,12 +313,12 @@ module.exports = class MultiCompiler {
 	/**
 	 * @template SetupResult
 	 * @param {function(Compiler, number, Callback<Stats>, function(): boolean, function(): void, function(): void): SetupResult} setup setup a single compiler
-	 * @param {function(Compiler, Callback<Stats>): void} run run/continue a single compiler
+	 * @param {function(Compiler, SetupResult, Callback<Stats>): void} run run/continue a single compiler
 	 * @param {Callback<MultiStats>} callback callback when all compilers are done, result includes Stats of all changed compilers
 	 * @returns {SetupResult[]} result of setup
 	 */
 	_runGraph(setup, run, callback) {
-		/** @typedef {{ compiler: Compiler, result: Stats, state: "pending" | "blocked" | "queued" | "starting" | "running" | "running-outdated" | "done", children: Node[], parents: Node[] }} Node */
+		/** @typedef {{ compiler: Compiler, setupResult: SetupResult, result: Stats, state: "pending" | "blocked" | "queued" | "starting" | "running" | "running-outdated" | "done", children: Node[], parents: Node[] }} Node */
 
 		// State transitions for nodes:
 		// -> blocked (initial)
@@ -335,6 +335,7 @@ module.exports = class MultiCompiler {
 		/** @type {Node[]} */
 		const nodes = this.compilers.map(compiler => ({
 			compiler,
+			setupResult: undefined,
 			result: undefined,
 			state: "blocked",
 			children: [],
@@ -444,14 +445,14 @@ module.exports = class MultiCompiler {
 		const setupResults = [];
 		nodes.forEach((node, i) => {
 			setupResults.push(
-				setup(
+				(node.setupResult = setup(
 					node.compiler,
 					i,
 					nodeDone.bind(null, node),
 					() => node.state !== "starting" && node.state !== "running",
 					() => nodeChange(node),
 					() => nodeInvalid(node)
-				)
+				))
 			);
 		});
 		let processing = true;
@@ -470,7 +471,7 @@ module.exports = class MultiCompiler {
 				) {
 					running++;
 					node.state = "starting";
-					run(node.compiler, nodeDone.bind(null, node));
+					run(node.compiler, node.setupResult, nodeDone.bind(null, node));
 					node.state = "running";
 				}
 			}
@@ -522,8 +523,9 @@ module.exports = class MultiCompiler {
 					}
 					return watching;
 				},
-				(compiler, initial, callback) => {
-					if (!compiler.watching.running) compiler.watching.invalidate();
+				(compiler, watching, callback) => {
+					if (compiler.watching !== watching) return;
+					if (!watching.running) watching.invalidate();
 				},
 				handler
 			);
@@ -546,7 +548,7 @@ module.exports = class MultiCompiler {
 		if (this.validateDependencies(callback)) {
 			this._runGraph(
 				() => {},
-				(compiler, callback) => compiler.run(callback),
+				(compiler, setupResult, callback) => compiler.run(callback),
 				(err, stats) => {
 					this.running = false;
 

package/lib/NormalModule.js

@@ -293,9 +293,13 @@ class NormalModule extends Module {
 	 */
 	identifier() {
 		if (this.layer === null) {
-			return this.request;
+			if (this.type === "javascript/auto") {
+				return this.request;
+			} else {
+				return `${this.type}|${this.request}`;
+			}
 		} else {
-			return `${this.request}|${this.layer}`;
+			return `${this.type}|${this.request}|${this.layer}`;
 		}
 	}
 

package/lib/NormalModuleFactory.js

@@ -20,7 +20,7 @@ const ModuleGraph = require("./ModuleGraph");
 const NormalModule = require("./NormalModule");
 const BasicEffectRulePlugin = require("./rules/BasicEffectRulePlugin");
 const BasicMatcherRulePlugin = require("./rules/BasicMatcherRulePlugin");
-const DescriptionDataMatcherRulePlugin = require("./rules/DescriptionDataMatcherRulePlugin");
+const ObjectMatcherRulePlugin = require("./rules/ObjectMatcherRulePlugin");
 const RuleSetCompiler = require("./rules/RuleSetCompiler");
 const UseEffectRulePlugin = require("./rules/UseEffectRulePlugin");
 const LazySet = require("./util/LazySet");
@@ -44,6 +44,7 @@ const { parseResource } = require("./util/identifier");
  * @property {ModuleFactoryCreateData["resolveOptions"]} resolveOptions
  * @property {string} context
  * @property {string} request
+ * @property {Record<string, any> | undefined} assertions
  * @property {ModuleDependency[]} dependencies
  * @property {Object} createData
  * @property {LazySet<string>} fileDependencies
@@ -182,7 +183,8 @@ const ruleSetCompiler = new RuleSetCompiler([
 	new BasicMatcherRulePlugin("issuer"),
 	new BasicMatcherRulePlugin("compiler"),
 	new BasicMatcherRulePlugin("issuerLayer"),
-	new DescriptionDataMatcherRulePlugin(),
+	new ObjectMatcherRulePlugin("assert", "assertions"),
+	new ObjectMatcherRulePlugin("descriptionData"),
 	new BasicEffectRulePlugin("type"),
 	new BasicEffectRulePlugin("sideEffects"),
 	new BasicEffectRulePlugin("parser"),
@@ -339,6 +341,7 @@ class NormalModuleFactory extends ModuleFactory {
 					context,
 					dependencies,
 					request,
+					assertions,
 					resolveOptions,
 					fileDependencies,
 					missingDependencies,
@@ -447,6 +450,7 @@ class NormalModuleFactory extends ModuleFactory {
 						resourceQuery: resourceDataForRules.query,
 						resourceFragment: resourceDataForRules.fragment,
 						scheme,
+						assertions,
 						mimetype: matchResourceData ? "" : resourceData.data.mimetype || "",
 						dependency: dependencyType,
 						descriptionData: matchResourceData
@@ -694,6 +698,7 @@ class NormalModuleFactory extends ModuleFactory {
 		const resolveOptions = data.resolveOptions || EMPTY_RESOLVE_OPTIONS;
 		const dependency = dependencies[0];
 		const request = dependency.request;
+		const assertions = dependency.assertions;
 		const contextInfo = data.contextInfo;
 		const fileDependencies = new LazySet();
 		const missingDependencies = new LazySet();
@@ -704,6 +709,7 @@ class NormalModuleFactory extends ModuleFactory {
 			resolveOptions,
 			context,
 			request,
+			assertions,
 			dependencies,
 			fileDependencies,
 			missingDependencies,

package/lib/SourceMapDevToolPlugin.js

@@ -152,7 +152,7 @@ class SourceMapDevToolPlugin {
 		const fallbackModuleFilenameTemplate = this.fallbackModuleFilenameTemplate;
 		const requestShortener = compiler.requestShortener;
 		const options = this.options;
-		options.test = options.test || /\.(m?js|css)($|\?)/i;
+		options.test = options.test || /\.((c|m)?js|css)($|\?)/i;
 
 		const matchObject = ModuleFilenameHelpers.matchObject.bind(
 			undefined,

package/lib/Watching.js

@@ -10,6 +10,7 @@ const Stats = require("./Stats");
 /** @typedef {import("../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./FileSystemInfo").FileSystemInfoEntry} FileSystemInfoEntry */
 
 /**
  * @template T
@@ -67,6 +68,10 @@ class Watching {
 		});
 	}
 
+	/**
+	 * @param {ReadonlySet<string>} changedFiles changed files
+	 * @param {ReadonlySet<string>} removedFiles removed files
+	 */
 	_mergeWithCollected(changedFiles, removedFiles) {
 		if (!changedFiles) return;
 		if (!this._collectedChangedFiles) {
@@ -84,6 +89,13 @@ class Watching {
 		}
 	}
 
+	/**
+	 * @param {ReadonlyMap<string, FileSystemInfoEntry | "ignore">=} fileTimeInfoEntries info for files
+	 * @param {ReadonlyMap<string, FileSystemInfoEntry | "ignore">=} contextTimeInfoEntries info for directories
+	 * @param {ReadonlySet<string>=} changedFiles changed files
+	 * @param {ReadonlySet<string>=} removedFiles removed files
+	 * @returns {void}
+	 */
 	_go(fileTimeInfoEntries, contextTimeInfoEntries, changedFiles, removedFiles) {
 		this._initial = false;
 		if (this.startTime === null) this.startTime = Date.now();

package/lib/config/defaults.js

@@ -482,18 +482,6 @@ const applyModuleDefaults = (
 					or: ["text/javascript", "application/javascript"]
 				},
 				...esm
-			},
-			{
-				dependency: "url",
-				oneOf: [
-					{
-						scheme: /^data$/,
-						type: "asset/inline"
-					},
-					{
-						type: "asset/resource"
-					}
-				]
 			}
 		];
 		if (asyncWebAssembly) {
@@ -541,6 +529,24 @@ const applyModuleDefaults = (
 				...wasm
 			});
 		}
+		rules.push(
+			{
+				dependency: "url",
+				oneOf: [
+					{
+						scheme: /^data$/,
+						type: "asset/inline"
+					},
+					{
+						type: "asset/resource"
+					}
+				]
+			},
+			{
+				assert: { type: "json" },
+				type: "json"
+			}
+		);
 		return rules;
 	});
 };

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -12,7 +12,8 @@ const HarmonyExportHeaderDependency = require("./HarmonyExportHeaderDependency")
 const HarmonyExportImportedSpecifierDependency = require("./HarmonyExportImportedSpecifierDependency");
 const HarmonyExportSpecifierDependency = require("./HarmonyExportSpecifierDependency");
 const {
-	harmonySpecifierTag
+	harmonySpecifierTag,
+	getAssertions
 } = require("./HarmonyImportDependencyParserPlugin");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 
@@ -48,7 +49,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 				parser.state.module.addPresentationalDependency(clearDep);
 				const sideEffectDep = new HarmonyImportSideEffectDependency(
 					source,
-					parser.state.lastHarmonyImportOrder
+					parser.state.lastHarmonyImportOrder,
+					getAssertions(statement)
 				);
 				sideEffectDep.loc = Object.create(statement.loc);
 				sideEffectDep.loc.index = -1;
@@ -127,7 +129,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 						harmonyNamedExports,
 						null,
 						this.strictExportPresence,
-						null
+						null,
+						settings.assertions
 					);
 				} else {
 					dep = new HarmonyExportSpecifierDependency(id, name);

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -159,6 +159,7 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency> | Iterable<HarmonyExportImportedSpecifierDependency>} otherStarExports other star exports in the module before this import
 	 * @param {boolean} strictExportPresence when true, missing exports in the imported module lead to errors instead of warnings
 	 * @param {HarmonyStarExportsList} allStarExports all star exports in the module
+	 * @param {Record<string, any>=} assertions import assertions
 	 */
 	constructor(
 		request,
@@ -168,9 +169,10 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		activeExports,
 		otherStarExports,
 		strictExportPresence,
-		allStarExports
+		allStarExports,
+		assertions
 	) {
-		super(request, sourceOrder);
+		super(request, sourceOrder, assertions);
 
 		this.ids = ids;
 		this.name = name;

package/lib/dependencies/HarmonyImportDependency.js

@@ -32,10 +32,12 @@ class HarmonyImportDependency extends ModuleDependency {
 	 *
 	 * @param {string} request request string
 	 * @param {number} sourceOrder source order
+	 * @param {Record<string, any>=} assertions import assertions
 	 */
-	constructor(request, sourceOrder) {
+	constructor(request, sourceOrder, assertions) {
 		super(request);
 		this.sourceOrder = sourceOrder;
+		this.assertions = assertions;
 	}
 
 	get category() {
@@ -201,12 +203,14 @@ class HarmonyImportDependency extends ModuleDependency {
 	serialize(context) {
 		const { write } = context;
 		write(this.sourceOrder);
+		write(this.assertions);
 		super.serialize(context);
 	}
 
 	deserialize(context) {
 		const { read } = context;
 		this.sourceOrder = read();
+		this.assertions = read();
 		super.deserialize(context);
 	}
 }

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/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/library/SystemLibraryPlugin.js

@@ -72,7 +72,7 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 	render(source, { chunkGraph, moduleGraph, chunk }, { options, compilation }) {
 		const modules = chunkGraph
 			.getChunkModules(chunk)
-			.filter(m => m instanceof ExternalModule);
+			.filter(m => m instanceof ExternalModule && m.externalType === "system");
 		const externals = /** @type {ExternalModule[]} */ (modules);
 
 		// The name this bundle should be registered as with System