webpack · alexander-akait · Aug 6, 2024 · Jul 23, 2024 · Aug 2, 2024 · Aug 5, 2024
diff --git a/declarations/WebpackOptions.d.ts b/declarations/WebpackOptions.d.ts
@@ -219,6  219,7 @@ export type ExternalsType =
 	| "system"
 	| "promise"
 	| "import"
 	| "module-import"
 	| "script"
 	| "node-commonjs";
 /**

diff --git a/declarations/plugins/container/ContainerReferencePlugin.d.ts b/declarations/plugins/container/ContainerReferencePlugin.d.ts
@@ -27,6  27,7 @@ export type ExternalsType =
 	| "system"
 	| "promise"
 	| "import"
 	| "module-import"
 	| "script"
 	| "node-commonjs";
 /**

diff --git a/declarations/plugins/container/ModuleFederationPlugin.d.ts b/declarations/plugins/container/ModuleFederationPlugin.d.ts
@@ -84,6  84,7 @@ export type ExternalsType =
 	| "system"
 	| "promise"
 	| "import"
 	| "module-import"
 	| "script"
 	| "node-commonjs";
 /**

diff --git a/lib/ExternalModule.js b/lib/ExternalModule.js
@@ -53,7  53,7 @@ const { register } = require("./util/serialization");
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
-/** @typedef {{ attributes?: ImportAttributes }} ImportDependencyMeta */
 /** @typedef {{ attributes?: ImportAttributes, externalType: "import" | "module" | undefined }} ImportDependencyMeta */
 /** @typedef {{ layer?: string, supports?: string, media?: string }} CssImportDependencyMeta */
 
 /** @typedef {ImportDependencyMeta | CssImportDependencyMeta} DependencyMeta */
@@ -164,7  164,10 @@ const getSourceForImportExternal = (
 	dependencyMeta
 ) => {
 	const importName = runtimeTemplate.outputOptions.importFunctionName;
-	if (!runtimeTemplate.supportsDynamicImport() && importName === "import") {
 	if (
 		!runtimeTemplate.supportsDynamicImport() &&
 		(importName === "import" || importName !== "module-import")
 	) {
 		throw new Error(
 			"The target environment doesn't support 'import()' so it's not possible to use external type 'import'"
 		);
@@ -575,25  578,6 @@ class ExternalModule extends Module {
 					canMangle = true;
 				}
 				break;
-			case "module":
-				if (this.buildInfo.module) {
-					if (!Array.isArray(request) || request.length === 1) {
-						this.buildMeta.exportsType = "namespace";
-						canMangle = true;
-					}
-				} else {
-					this.buildMeta.async = true;
-					EnvironmentNotSupportAsyncWarning.check(
-						this,
-						compilation.runtimeTemplate,
-						"external module"
-					);
-					if (!Array.isArray(request) || request.length === 1) {
-						this.buildMeta.exportsType = "namespace";
-						canMangle = false;
-					}
-				}
-				break;
 			case "script":
 				this.buildMeta.async = true;
 				EnvironmentNotSupportAsyncWarning.check(
@@ -610,18  863,52 @@ class ExternalModule extends Module {
 					"external promise"
 				);
 				break;
 			case "module":
 			case "import":
-				this.buildMeta.async = true;
-				EnvironmentNotSupportAsyncWarning.check(
-					this,
-					compilation.runtimeTemplate,
-					"external import"
-				);
-				if (!Array.isArray(request) || request.length === 1) {
-					this.buildMeta.exportsType = "namespace";
-					canMangle = false;
 			case "module-import": {
 				const type =
 					externalType === "module-import" &&
 					this.dependencyMeta &&
 					/** @type {ImportDependencyMeta} */ (this.dependencyMeta).externalType
 						? /** @type {ImportDependencyMeta} */ (this.dependencyMeta)
 								.externalType
 						: externalType;
 
 				if (type === "module") {
 					if (this.buildInfo.module) {
 						if (!Array.isArray(request) || request.length === 1) {
 							this.buildMeta.exportsType = "namespace";
 							canMangle = true;
 						}
 					} else {
 						this.buildMeta.async = true;
 						EnvironmentNotSupportAsyncWarning.check(
 							this,
 							compilation.runtimeTemplate,
 							"external module"
 						);
 						if (!Array.isArray(request) || request.length === 1) {
 							this.buildMeta.exportsType = "namespace";
 							canMangle = false;
 						}
 					}
 				}
 
 				if (type === "import") {
 					this.buildMeta.async = true;
 					EnvironmentNotSupportAsyncWarning.check(
 						this,
 						compilation.runtimeTemplate,
 						"external import"
 					);
 					if (!Array.isArray(request) || request.length === 1) {
 						this.buildMeta.exportsType = "namespace";
 						canMangle = false;
 					}
 				}
 
 				break;
 			}
 		}
 		this.addDependency(new StaticExportsDependency(true, canMangle));
 		callback();
@@ -718,43  736,58 @@ class ExternalModule extends Module {
 					runtimeTemplate
 				);
 			}
-			case "import":
-				return getSourceForImportExternal(
-					request,
-					runtimeTemplate,
-					/** @type {ImportDependencyMeta} */ (dependencyMeta)
-				);
 			case "script":
 				return getSourceForScriptExternal(request, runtimeTemplate);
-			case "module": {
-				if (!(/** @type {BuildInfo} */ (this.buildInfo).module)) {
-					if (!runtimeTemplate.supportsDynamicImport()) {
-						throw new Error(
-							`The target environment doesn't support dynamic import() syntax so it's not possible to use external type 'module' within a script${
-								runtimeTemplate.supportsEcmaScriptModuleSyntax()
-									? "\nDid you mean to build a EcmaScript Module ('output.module: true')?"
-									: ""
-							}`
-						);
-					}
 			case "module":
 			case "import":
 			case "module-import": {
 				const type =
 					externalType === "module-import" &&
 					dependencyMeta &&
 					/** @type {ImportDependencyMeta} */ (dependencyMeta).externalType
 						? /** @type {ImportDependencyMeta} */ (dependencyMeta).externalType
 						: externalType;
 
 				if (type === "import") {
 					return getSourceForImportExternal(
 						request,
 						runtimeTemplate,
 						/** @type {ImportDependencyMeta} */ (dependencyMeta)
 					);
 				}
-				if (!runtimeTemplate.supportsEcmaScriptModuleSyntax()) {
-					throw new Error(
-						"The target environment doesn't support EcmaScriptModule syntax so it's not possible to use external type 'module'"
 
 				if (type === "module") {
 					if (!(/** @type {BuildInfo} */ (this.buildInfo).module)) {
 						if (!runtimeTemplate.supportsDynamicImport()) {
 							throw new Error(
 								`The target environment doesn't support dynamic import() syntax so it's not possible to use external type 'module' within a script${
 									runtimeTemplate.supportsEcmaScriptModuleSyntax()
 										? "\nDid you mean to build a EcmaScript Module ('output.module: true')?"
 										: ""
 								}`
 							);
 						}
 						return getSourceForImportExternal(
 							request,
 							runtimeTemplate,
 							/** @type {ImportDependencyMeta} */ (dependencyMeta)
 						);
 					}
 					if (!runtimeTemplate.supportsEcmaScriptModuleSyntax()) {
 						throw new Error(
 							"The target environment doesn't support EcmaScriptModule syntax so it's not possible to use external type 'module'"
 						);
 					}
 					return getSourceForModuleExternal(
 						request,
 						moduleGraph.getExportsInfo(this),
 						runtime,
 						runtimeTemplate,
 						/** @type {ImportDependencyMeta} */ (dependencyMeta)
 					);
 				}
-				return getSourceForModuleExternal(
-					request,
-					moduleGraph.getExportsInfo(this),
-					runtime,
-					runtimeTemplate,
-					/** @type {ImportDependencyMeta} */ (dependencyMeta)
-				);
 
 				break;
 			}
 			case "var":
 			case "promise":

diff --git a/lib/ExternalModuleFactoryPlugin.js b/lib/ExternalModuleFactoryPlugin.js
@@ -118,8  118,16 @@ class ExternalModuleFactoryPlugin {
 						dependency instanceof ImportDependency ||
 						dependency instanceof ContextElementDependency
 					) {
 						const externalType =
 							dependency instanceof HarmonyImportDependency
 								? "module"
 								: dependency instanceof ImportDependency
 									? "import"
 									: undefined;
 
 						dependencyMeta = {
-							attributes: dependency.assertions
 							attributes: dependency.assertions,
 							externalType
 						};
 					} else if (dependency instanceof CssImportDependency) {
 						dependencyMeta = {

diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -286,7  286,10 @@ class WebpackOptionsApply extends OptionsApply {
 					"library type \"modern-module\" is only allowed when 'experiments.outputModule' is enabled"
 				);
 			}
-			if (options.externalsType === "module") {
 			if (
 				options.externalsType === "module" ||
 				options.externalsType === "module-import"
 			) {
 				throw new Error(
 					"'externalsType: \"module\"' is only allowed when 'experiments.outputModule' is enabled"
 				);

diff --git a/lib/config/defaults.js b/lib/config/defaults.js
@@ -275,7  275,7 @@ const applyWebpackOptionsDefaults = (options, compilerIndex) => {
 			validExternalTypes.includes(options.output.library.type)
 			? /** @type {ExternalsType} */ (options.output.library.type)
 			: options.output.module
-				? "module"
 				? "module-import"
 				: "var";
 	});
 

diff --git a/schemas/WebpackOptions.check.js b/schemas/WebpackOptions.check.js
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -1285,6  1285,7 @@
         "system",
         "promise",
         "import",
         "module-import",
         "script",
         "node-commonjs"
       ]

diff --git a/schemas/plugins/container/ContainerReferencePlugin.check.js b/schemas/plugins/container/ContainerReferencePlugin.check.js
diff --git a/schemas/plugins/container/ContainerReferencePlugin.json b/schemas/plugins/container/ContainerReferencePlugin.json
@@ -22,6  22,7 @@
         "system",
         "promise",
         "import",
         "module-import",
         "script",
         "node-commonjs"
       ]

diff --git a/schemas/plugins/container/ExternalsType.check.js b/schemas/plugins/container/ExternalsType.check.js
@@ -3,4  3,4 @@
  * DO NOT MODIFY BY HAND.
  * Run `yarn special-lint-fix` to update
  */
-"use strict";function o(r,{instancePath:s="",parentData:m,parentDataProperty:t,rootData:e=r}={}){return"var"!==r&&"module"!==r&&"assign"!==r&&"this"!==r&&"window"!==r&&"self"!==r&&"global"!==r&&"commonjs"!==r&&"commonjs2"!==r&&"commonjs-module"!==r&&"commonjs-static"!==r&&"amd"!==r&&"amd-require"!==r&&"umd"!==r&&"umd2"!==r&&"jsonp"!==r&&"system"!==r&&"promise"!==r&&"import"!==r&&"script"!==r&&"node-commonjs"!==r?(o.errors=[{params:{}}],!1):(o.errors=null,!0)}module.exports=o,module.exports.default=o;
 "use strict";function o(m,{instancePath:r="",parentData:s,parentDataProperty:t,rootData:e=m}={}){return"var"!==m&&"module"!==m&&"assign"!==m&&"this"!==m&&"window"!==m&&"self"!==m&&"global"!==m&&"commonjs"!==m&&"commonjs2"!==m&&"commonjs-module"!==m&&"commonjs-static"!==m&&"amd"!==m&&"amd-require"!==m&&"umd"!==m&&"umd2"!==m&&"jsonp"!==m&&"system"!==m&&"promise"!==m&&"import"!==m&&"module-import"!==m&&"script"!==m&&"node-commonjs"!==m?(o.errors=[{params:{}}],!1):(o.errors=null,!0)}module.exports=o,module.exports.default=o;