webpack 5.102.1 → 5.104.0

package/lib/dependencies/HarmonyAcceptImportDependency.js

@@ -7,6 +7,7 @@
 
 const makeSerializable = require("../util/makeSerializable");
 const HarmonyImportDependency = require("./HarmonyImportDependency");
+const { ImportPhase } = require("./ImportPhase");
 const NullDependency = require("./NullDependency");
 
 class HarmonyAcceptImportDependency extends HarmonyImportDependency {
@@ -14,7 +15,7 @@ class HarmonyAcceptImportDependency extends HarmonyImportDependency {
 	 * @param {string} request the request string
 	 */
 	constructor(request) {
-		super(request, Number.NaN);
+		super(request, Infinity, ImportPhase.Evaluation);
 		this.weak = true;
 	}
 

package/lib/dependencies/HarmonyEvaluatedImportSpecifierDependency.js

@@ -7,6 +7,7 @@
 
 const makeSerializable = require("../util/makeSerializable");
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
+const { ImportPhase } = require("./ImportPhase");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
@@ -37,7 +38,17 @@ class HarmonyEvaluatedImportSpecifierDependency extends HarmonyImportSpecifierDe
 	 * @param {string} operator operator
 	 */
 	constructor(request, sourceOrder, ids, name, range, attributes, operator) {
-		super(request, sourceOrder, ids, name, range, false, attributes, []);
+		super(
+			request,
+			sourceOrder,
+			ids,
+			name,
+			range,
+			false,
+			ImportPhase.Evaluation,
+			attributes,
+			[]
+		);
 		this.operator = operator;
 	}
 

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const CompatibilityPlugin = require("../CompatibilityPlugin");
 const WebpackError = require("../WebpackError");
 const { getImportAttributes } = require("../javascript/JavascriptParser");
 const InnerGraph = require("../optimize/InnerGraph");
@@ -15,10 +16,10 @@ const HarmonyExportImportedSpecifierDependency = require("./HarmonyExportImporte
 const HarmonyExportSpecifierDependency = require("./HarmonyExportSpecifierDependency");
 const { ExportPresenceModes } = require("./HarmonyImportDependency");
 const {
-	getImportMode,
 	harmonySpecifierTag
 } = require("./HarmonyImportDependencyParserPlugin");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
+const { ImportPhaseUtils, createGetImportPhase } = require("./ImportPhase");
 
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
@@ -26,6 +27,7 @@ const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDepe
 /** @typedef {import("../javascript/JavascriptParser").FunctionDeclaration} FunctionDeclaration */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("./HarmonyImportDependencyParserPlugin").HarmonySettings} HarmonySettings */
+/** @typedef {import("../CompatibilityPlugin").CompatibilitySettings} CompatibilitySettings */
 
 const { HarmonyStarExportsList } = HarmonyExportImportedSpecifierDependency;
 
@@ -36,6 +38,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 	 * @param {import("../../declarations/WebpackOptions").JavascriptParserOptions} options options
 	 */
 	constructor(options) {
+		this.options = options;
 		this.exportPresenceMode =
 			options.reexportExportsPresence !== undefined
 				? ExportPresenceModes.fromUserOption(options.reexportExportsPresence)
@@ -44,7 +47,6 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					: options.strictExportPresence
 						? ExportPresenceModes.ERROR
 						: ExportPresenceModes.AUTO;
-		this.deferImport = options.deferImport;
 	}
 
 	/**
@@ -53,6 +55,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 	 */
 	apply(parser) {
 		const { exportPresenceMode } = this;
+		const getImportPhase = createGetImportPhase(this.options.deferImport);
+
 		parser.hooks.export.tap(PLUGIN_NAME, (statement) => {
 			const dep = new HarmonyExportHeaderDependency(
 				/** @type {Range | false} */ (
@@ -77,22 +81,20 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 			clearDep.loc = /** @type {DependencyLocation} */ (statement.loc);
 			clearDep.loc.index = -1;
 			parser.state.module.addPresentationalDependency(clearDep);
-			let defer = false;
-			if (this.deferImport) {
-				({ defer } = getImportMode(parser, statement));
-				if (defer) {
-					const error = new WebpackError(
-						"Deferred re-export (`export defer * as namespace from '...'`) is not a part of the Import Defer proposal.\nUse the following code instead:\n    import defer * as namespace from '...';\n    export { namespace };"
-					);
-					error.loc = statement.loc || undefined;
-					parser.state.current.addError(error);
-				}
+
+			const phase = getImportPhase(parser, statement);
+			if (phase && ImportPhaseUtils.isDefer(phase)) {
+				const error = new WebpackError(
+					"Deferred re-export (`export defer * as namespace from '...'`) is not a part of the Import Defer proposal.\nUse the following code instead:\n    import defer * as namespace from '...';\n    export { namespace };"
+				);
+				error.loc = statement.loc || undefined;
+				parser.state.current.addError(error);
 			}
 			const sideEffectDep = new HarmonyImportSideEffectDependency(
 				/** @type {string} */ (source),
 				parser.state.lastHarmonyImportOrder,
-				getImportAttributes(statement),
-				defer
+				phase,
+				getImportAttributes(statement)
 			);
 			sideEffectDep.loc = Object.create(
 				/** @type {DependencyLocation} */ (statement.loc)
@@ -121,7 +123,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					})
 					.join(""),
 				node.type.endsWith("Declaration") &&
-				/** @type {FunctionDeclaration | ClassDeclaration} */ (node).id
+					/** @type {FunctionDeclaration | ClassDeclaration} */ (node).id
 					? /** @type {FunctionDeclaration | ClassDeclaration} */
 						(node).id.name
 					: isFunctionDeclaration
@@ -157,6 +159,18 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 		parser.hooks.exportSpecifier.tap(
 			PLUGIN_NAME,
 			(statement, id, name, idx) => {
+				// CompatibilityPlugin may change exports name
+				// not handle re-export or import then export situation as current CompatibilityPlugin only
+				// rename symbol in declaration module, not change exported symbol
+				const variable = parser.getTagData(
+					id,
+					CompatibilityPlugin.nestedWebpackIdentifierTag
+				);
+				if (variable && /** @type {CompatibilitySettings} */ (variable).name) {
+					// CompatibilityPlugin changes exports to a new name, should updates exports name
+					id = /** @type {CompatibilitySettings} */ (variable).name;
+				}
+
 				const settings =
 					/** @type {HarmonySettings} */
 					(parser.getTagData(id, harmonySpecifierTag));
@@ -174,8 +188,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 							null,
 							exportPresenceMode,
 							null,
-							settings.attributes,
-							settings.defer
+							settings.phase,
+							settings.attributes
 						)
 					: new HarmonyExportSpecifierDependency(id, name);
 				dep.loc = Object.create(
@@ -207,13 +221,11 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 						parser.state.harmonyStarExports || new HarmonyStarExportsList();
 				}
 				const attributes = getImportAttributes(statement);
-				const defer = this.deferImport
-					? getImportMode(parser, statement).defer
-					: false;
 				const dep = new HarmonyExportImportedSpecifierDependency(
 					/** @type {string} */
 					(source),
-					parser.state.lastHarmonyImportOrder,
+					/** @type {number} */
+					(parser.state.lastHarmonyImportOrder),
 					id ? [id] : [],
 					name,
 					harmonyNamedExports,
@@ -221,8 +233,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					harmonyStarExports && harmonyStarExports.slice(),
 					exportPresenceMode,
 					harmonyStarExports,
-					attributes,
-					defer
+					getImportPhase(parser, statement),
+					attributes
 				);
 				if (harmonyStarExports) {
 					harmonyStarExports.push(dep);

package/lib/dependencies/HarmonyExportImportedSpecifierDependency.js

@@ -27,6 +27,7 @@ const {
 } = require("../util/runtime");
 const HarmonyExportInitFragment = require("./HarmonyExportInitFragment");
 const HarmonyImportDependency = require("./HarmonyImportDependency");
+const { ImportPhaseUtils } = require("./ImportPhase");
 const processExportInfo = require("./processExportInfo");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
@@ -57,8 +58,9 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 /** @typedef {import("./HarmonyImportDependency").Ids} Ids */
 /** @typedef {import("./HarmonyImportDependency").ExportPresenceMode} ExportPresenceMode */
+/** @typedef {import("../dependencies/ImportPhase").ImportPhaseType} ImportPhaseType */
 
-/** @typedef {"missing"|"unused"|"empty-star"|"reexport-dynamic-default"|"reexport-named-default"|"reexport-namespace-object"|"reexport-fake-namespace-object"|"reexport-undefined"|"normal-reexport"|"dynamic-reexport"} ExportModeType */
+/** @typedef {"missing" | "unused" | "empty-star" | "reexport-dynamic-default" | "reexport-named-default" | "reexport-namespace-object" | "reexport-fake-namespace-object" | "reexport-undefined" | "normal-reexport" | "dynamic-reexport"} ExportModeType */
 
 const { ExportPresenceModes } = HarmonyImportDependency;
 
@@ -376,8 +378,8 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 	 * @param {ReadonlyArray<HarmonyExportImportedSpecifierDependency> | null} otherStarExports other star exports in the module before this import
 	 * @param {ExportPresenceMode} exportPresenceMode mode of checking export names
 	 * @param {HarmonyStarExportsList | null} allStarExports all star exports in the module
+	 * @param {ImportPhaseType} phase import phase
 	 * @param {ImportAttributes=} attributes import attributes
-	 * @param {boolean=} defer is defer phase
 	 */
 	constructor(
 		request,
@@ -388,10 +390,10 @@ class HarmonyExportImportedSpecifierDependency extends HarmonyImportDependency {
 		otherStarExports,
 		exportPresenceMode,
 		allStarExports,
-		attributes,
-		defer
+		phase,
+		attributes
 	) {
-		super(request, sourceOrder, attributes, defer);
+		super(request, sourceOrder, phase, attributes);
 
 		this.ids = ids;
 		this.name = name;
@@ -1050,12 +1052,14 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 	) {
 		const importedModule = /** @type {Module} */ (moduleGraph.getModule(dep));
 		const importVar = dep.getImportVar(moduleGraph);
+		const isDeferred =
+			ImportPhaseUtils.isDefer(dep.phase) &&
+			!(/** @type {BuildMeta} */ (importedModule.buildMeta).async);
 
 		if (
 			(mode.type === "reexport-namespace-object" ||
 				mode.type === "reexport-fake-namespace-object") &&
-			dep.defer &&
-			!moduleGraph.isAsync(importedModule)
+			isDeferred
 		) {
 			initFragments.push(
 				...this.getReexportDeferredNamespaceObjectFragments(
@@ -1200,7 +1204,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 								moduleGraph.isAsync(importedModule)
 									? InitFragment.STAGE_ASYNC_HARMONY_IMPORTS
 									: InitFragment.STAGE_HARMONY_IMPORTS,
-								dep.sourceOrder,
+								/** @type {number} */ (dep.sourceOrder),
 								key,
 								runtimeCondition
 							)
@@ -1261,7 +1265,7 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
 						moduleGraph.isAsync(importedModule)
 							? InitFragment.STAGE_ASYNC_HARMONY_IMPORTS
 							: InitFragment.STAGE_HARMONY_IMPORTS,
-						dep.sourceOrder
+						/** @type {number} */ (dep.sourceOrder)
 					)
 				);
 				break;

package/lib/dependencies/HarmonyExports.js

@@ -9,13 +9,13 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../Parser").ParserState} ParserState */
+/** @typedef {import("../javascript/JavascriptParser").JavascriptParserState} JavascriptParserState */
 
-/** @type {WeakMap<ParserState, boolean>} */
+/** @type {WeakMap<JavascriptParserState, boolean>} */
 const parserStateExportsState = new WeakMap();
 
 /**
- * @param {ParserState} parserState parser state
+ * @param {JavascriptParserState} parserState parser state
  * @param {boolean} isStrictHarmony strict harmony mode should be enabled
  * @returns {void}
  */
@@ -37,7 +37,7 @@ module.exports.enable = (parserState, isStrictHarmony) => {
 };
 
 /**
- * @param {ParserState} parserState parser state
+ * @param {JavascriptParserState} parserState parser state
  * @returns {boolean} true, when enabled
  */
 module.exports.isEnabled = (parserState) => {

package/lib/dependencies/HarmonyImportDependency.js

@@ -12,6 +12,7 @@ const InitFragment = require("../InitFragment");
 const Template = require("../Template");
 const AwaitDependenciesInitFragment = require("../async-modules/AwaitDependenciesInitFragment");
 const { filterRuntime, mergeRuntime } = require("../util/runtime");
+const { ImportPhase, ImportPhaseUtils } = require("./ImportPhase");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
@@ -23,6 +24,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../WebpackError")} WebpackError */
 /** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
+/** @typedef {import("./ImportPhase").ImportPhaseType} ImportPhaseType */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
@@ -60,14 +62,18 @@ class HarmonyImportDependency extends ModuleDependency {
 	/**
 	 * @param {string} request request string
 	 * @param {number} sourceOrder source order
+	 * @param {ImportPhaseType=} phase import phase
 	 * @param {ImportAttributes=} attributes import attributes
-	 * @param {boolean=} defer import attributes
 	 */
-	constructor(request, sourceOrder, attributes, defer) {
-		super(request);
-		this.sourceOrder = sourceOrder;
+	constructor(
+		request,
+		sourceOrder,
+		phase = ImportPhase.Evaluation,
+		attributes = undefined
+	) {
+		super(request, sourceOrder);
+		this.phase = phase;
 		this.attributes = attributes;
-		this.defer = defer;
 	}
 
 	get category() {
@@ -79,7 +85,7 @@ class HarmonyImportDependency extends ModuleDependency {
 	 */
 	getResourceIdentifier() {
 		let str = super.getResourceIdentifier();
-		if (this.defer) {
+		if (ImportPhaseUtils.isDefer(this.phase)) {
 			str += "|defer";
 		}
 		if (this.attributes) {
@@ -104,10 +110,14 @@ class HarmonyImportDependency extends ModuleDependency {
 	 */
 	getImportVar(moduleGraph) {
 		const module = /** @type {Module} */ (moduleGraph.getParentModule(this));
+		const importedModule = /** @type {Module} */ (moduleGraph.getModule(this));
 		const meta = moduleGraph.getMeta(module);
-		const defer = this.defer;
 
-		const metaKey = defer ? "deferredImportVarMap" : "importVarMap";
+		const isDeferred =
+			ImportPhaseUtils.isDefer(this.phase) &&
+			!(/** @type {BuildMeta} */ (importedModule.buildMeta).async);
+
+		const metaKey = isDeferred ? "deferredImportVarMap" : "importVarMap";
 		let importVarMap = meta[metaKey];
 		if (!importVarMap) {
 			meta[metaKey] = importVarMap =
@@ -115,19 +125,12 @@ class HarmonyImportDependency extends ModuleDependency {
 				(new Map());
 		}
 
-		let importVar = importVarMap.get(
-			/** @type {Module} */
-			(moduleGraph.getModule(this))
-		);
+		let importVar = importVarMap.get(importedModule);
 		if (importVar) return importVar;
 		importVar = `${Template.toIdentifier(
 			`${this.userRequest}`
-		)}__WEBPACK_${this.defer ? "DEFERRED_" : ""}IMPORTED_MODULE_${importVarMap.size}__`;
-		importVarMap.set(
-			/** @type {Module} */
-			(moduleGraph.getModule(this)),
-			importVar
-		);
+		)}__WEBPACK_${isDeferred ? "DEFERRED_" : ""}IMPORTED_MODULE_${importVarMap.size}__`;
+		importVarMap.set(importedModule, importVar);
 		return importVar;
 	}
 
@@ -167,7 +170,7 @@ class HarmonyImportDependency extends ModuleDependency {
 			request: this.request,
 			originModule: module,
 			runtimeRequirements,
-			defer: this.defer
+			dependency: this
 		});
 	}
 
@@ -289,9 +292,8 @@ class HarmonyImportDependency extends ModuleDependency {
 	 */
 	serialize(context) {
 		const { write } = context;
-		write(this.sourceOrder);
 		write(this.attributes);
-		write(this.defer);
+		write(this.phase);
 		super.serialize(context);
 	}
 
@@ -300,9 +302,8 @@ class HarmonyImportDependency extends ModuleDependency {
 	 */
 	deserialize(context) {
 		const { read } = context;
-		this.sourceOrder = read();
 		this.attributes = read();
-		this.defer = read();
+		this.phase = read();
 		super.deserialize(context);
 	}
 }
@@ -344,7 +345,7 @@ HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate extends
 		const moduleKey = referencedModule
 			? referencedModule.identifier()
 			: dep.request;
-		const key = `${dep.defer ? "deferred " : ""}harmony import ${moduleKey}`;
+		const key = `${ImportPhaseUtils.isDefer(dep.phase) ? "deferred " : ""}harmony import ${moduleKey}`;
 
 		const runtimeCondition = dep.weak
 			? false
@@ -382,7 +383,7 @@ HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate extends
 				new ConditionalInitFragment(
 					importStatement[0],
 					InitFragment.STAGE_HARMONY_IMPORTS,
-					dep.sourceOrder,
+					/** @type {number} */ (dep.sourceOrder),
 					key,
 					runtimeCondition
 				)
@@ -395,7 +396,7 @@ HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate extends
 				new ConditionalInitFragment(
 					importStatement[1],
 					InitFragment.STAGE_ASYNC_HARMONY_IMPORTS,
-					dep.sourceOrder,
+					/** @type {number} */ (dep.sourceOrder),
 					`${key} compat`,
 					runtimeCondition
 				)
@@ -405,7 +406,7 @@ HarmonyImportDependency.Template = class HarmonyImportDependencyTemplate extends
 				new ConditionalInitFragment(
 					importStatement[0] + importStatement[1],
 					InitFragment.STAGE_HARMONY_IMPORTS,
-					dep.sourceOrder,
+					/** @type {number} */ (dep.sourceOrder),
 					key,
 					runtimeCondition
 				)

package/lib/dependencies/HarmonyImportDependencyParserPlugin.js

@@ -5,7 +5,6 @@
 
 "use strict";
 
-const CommentCompilationWarning = require("../CommentCompilationWarning");
 const HotModuleReplacementPlugin = require("../HotModuleReplacementPlugin");
 const WebpackError = require("../WebpackError");
 const {
@@ -21,6 +20,7 @@ const HarmonyExports = require("./HarmonyExports");
 const { ExportPresenceModes } = require("./HarmonyImportDependency");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
+const { ImportPhaseUtils, createGetImportPhase } = require("./ImportPhase");
 
 /** @typedef {import("estree").Expression} Expression */
 /** @typedef {import("estree").Identifier} Identifier */
@@ -36,6 +36,7 @@ const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDepend
 /** @typedef {import("../javascript/JavascriptParser").Members} Members */
 /** @typedef {import("../javascript/JavascriptParser").MembersOptionals} MembersOptionals */
 /** @typedef {import("./HarmonyImportDependency").Ids} Ids */
+/** @typedef {import("./ImportPhase").ImportPhaseType} ImportPhaseType */
 
 const harmonySpecifierTag = Symbol("harmony import");
 
@@ -47,7 +48,7 @@ const harmonySpecifierTag = Symbol("harmony import");
  * @property {string} name
  * @property {boolean} await
  * @property {ImportAttributes=} attributes
- * @property {boolean | undefined} defer
+ * @property {ImportPhaseType} phase
  */
 
 const PLUGIN_NAME = "HarmonyImportDependencyParserPlugin";
@@ -57,6 +58,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 	 * @param {JavascriptParserOptions} options options
 	 */
 	constructor(options) {
+		this.options = options;
 		this.exportPresenceMode =
 			options.importExportsPresence !== undefined
 				? ExportPresenceModes.fromUserOption(options.importExportsPresence)
@@ -66,7 +68,6 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						? ExportPresenceModes.ERROR
 						: ExportPresenceModes.AUTO;
 		this.strictThisContextOnImports = options.strictThisContextOnImports;
-		this.deferImport = options.deferImport;
 	}
 
 	/**
@@ -76,6 +77,8 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 	apply(parser) {
 		const { exportPresenceMode } = this;
 
+		const getImportPhase = createGetImportPhase(this.options.deferImport);
+
 		/**
 		 * @param {Members} members members
 		 * @param {MembersOptionals} membersOptionals members Optionals
@@ -119,26 +122,24 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			parser.state.module.addPresentationalDependency(clearDep);
 			parser.unsetAsiPosition(/** @type {Range} */ (statement.range)[1]);
 			const attributes = getImportAttributes(statement);
-			let defer = false;
-			if (this.deferImport) {
-				({ defer } = getImportMode(parser, statement));
-				if (
-					defer &&
-					(statement.specifiers.length !== 1 ||
-						statement.specifiers[0].type !== "ImportNamespaceSpecifier")
-				) {
-					const error = new WebpackError(
-						"Deferred import can only be used with `import * as namespace from '...'` syntax."
-					);
-					error.loc = statement.loc || undefined;
-					parser.state.current.addError(error);
-				}
+			const phase = getImportPhase(parser, statement);
+			if (
+				ImportPhaseUtils.isDefer(phase) &&
+				(statement.specifiers.length !== 1 ||
+					statement.specifiers[0].type !== "ImportNamespaceSpecifier")
+			) {
+				const error = new WebpackError(
+					"Deferred import can only be used with `import * as namespace from '...'` syntax."
+				);
+				error.loc = statement.loc || undefined;
+				parser.state.current.addError(error);
 			}
+
 			const sideEffectDep = new HarmonyImportSideEffectDependency(
 				/** @type {string} */ (source),
 				parser.state.lastHarmonyImportOrder,
-				attributes,
-				defer
+				phase,
+				attributes
 			);
 			sideEffectDep.loc = /** @type {DependencyLocation} */ (statement.loc);
 			parser.state.module.addDependency(sideEffectDep);
@@ -148,9 +149,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 			PLUGIN_NAME,
 			(statement, source, id, name) => {
 				const ids = id === null ? [] : [id];
-				const defer = this.deferImport
-					? getImportMode(parser, statement).defer
-					: false;
+				const phase = getImportPhase(parser, statement);
 				parser.tagVariable(
 					name,
 					harmonySpecifierTag,
@@ -160,7 +159,7 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						ids,
 						sourceOrder: parser.state.lastHarmonyImportOrder,
 						attributes: getImportAttributes(statement),
-						defer
+						phase
 					})
 				);
 				return true;
@@ -237,9 +236,9 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 					/** @type {Range} */
 					(expr.range),
 					exportPresenceMode,
+					settings.phase,
 					settings.attributes,
-					[],
-					settings.defer
+					[]
 				);
 				dep.referencedPropertiesInDestructuring =
 					parser.destructuringAssignmentPropertiesFor(expr);
@@ -287,9 +286,9 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						/** @type {Range} */
 						(expr.range),
 						exportPresenceMode,
+						settings.phase,
 						settings.attributes,
-						ranges,
-						settings.defer
+						ranges
 					);
 					dep.referencedPropertiesInDestructuring =
 						parser.destructuringAssignmentPropertiesFor(expr);
@@ -337,9 +336,9 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 						settings.name,
 						/** @type {Range} */ (expr.range),
 						exportPresenceMode,
+						settings.phase,
 						settings.attributes,
-						ranges,
-						settings.defer
+						ranges
 					);
 					dep.directImport = members.length === 0;
 					dep.call = true;
@@ -406,44 +405,4 @@ module.exports = class HarmonyImportDependencyParserPlugin {
 	}
 };
 
-/**
- * @param {JavascriptParser} parser parser
- * @param {ExportNamedDeclaration | ExportAllDeclaration | ImportDeclaration} node node
- * @returns {{ defer: boolean }} import attributes
- */
-function getImportMode(parser, node) {
-	const result = { defer: "phase" in node && node.phase === "defer" };
-	if (!node.range) {
-		return result;
-	}
-	const { options, errors } = parser.parseCommentOptions(node.range);
-	if (errors) {
-		for (const e of errors) {
-			const { comment } = e;
-			if (!comment.loc) continue;
-			parser.state.module.addWarning(
-				new CommentCompilationWarning(
-					`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
-					comment.loc
-				)
-			);
-		}
-	}
-	if (!options) return result;
-	if (options.webpackDefer) {
-		if (typeof options.webpackDefer === "boolean") {
-			result.defer = options.webpackDefer;
-		} else if (node.loc) {
-			parser.state.module.addWarning(
-				new CommentCompilationWarning(
-					"webpackDefer magic comment expected a boolean value.",
-					node.loc
-				)
-			);
-		}
-	}
-	return result;
-}
-
-module.exports.getImportMode = getImportMode;
 module.exports.harmonySpecifierTag = harmonySpecifierTag;

package/lib/dependencies/HarmonyImportSideEffectDependency.js

@@ -16,16 +16,17 @@ const HarmonyImportDependency = require("./HarmonyImportDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
 /** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
+/** @typedef {import("./ImportPhase").ImportPhaseType} ImportPhaseType */
 
 class HarmonyImportSideEffectDependency extends HarmonyImportDependency {
 	/**
 	 * @param {string} request the request string
 	 * @param {number} sourceOrder source order
+	 * @param {ImportPhaseType} phase import phase
 	 * @param {ImportAttributes=} attributes import attributes
-	 * @param {boolean=} defer is defer phase
 	 */
-	constructor(request, sourceOrder, attributes, defer) {
-		super(request, sourceOrder, attributes, defer);
+	constructor(request, sourceOrder, phase, attributes) {
+		super(request, sourceOrder, phase, attributes);
 	}
 
 	get type() {