webpack 5.97.1 → 5.104.1

package/lib/asset/AssetModulesPlugin.js

@@ -6,30 +6,31 @@
 "use strict";
 
 const {
-	ASSET_MODULE_TYPE_RESOURCE,
-	ASSET_MODULE_TYPE_INLINE,
 	ASSET_MODULE_TYPE,
+	ASSET_MODULE_TYPE_BYTES,
+	ASSET_MODULE_TYPE_INLINE,
+	ASSET_MODULE_TYPE_RESOURCE,
 	ASSET_MODULE_TYPE_SOURCE
 } = require("../ModuleTypeConstants");
-const { cleverMerge } = require("../util/cleverMerge");
-const { compareModulesByIdentifier } = require("../util/comparators");
+const { compareModulesByIdOrIdentifier } = require("../util/comparators");
 const createSchemaValidation = require("../util/create-schema-validation");
 const memoize = require("../util/memoize");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../../declarations/WebpackOptions").AssetParserOptions} AssetParserOptions */
-/** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("schema-utils").Schema} Schema */
+/** @typedef {import("../Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
+/** @typedef {import("../NormalModule")} NormalModule */
 
 /**
  * @param {string} name name of definitions
- * @returns {TODO} definition
+ * @returns {Schema} definition
  */
-const getSchema = name => {
+const getSchema = (name) => {
 	const { definitions } = require("../../schemas/WebpackOptions.json");
+
 	return {
 		definitions,
 		oneOf: [{ $ref: `#/definitions/${name}` }]
@@ -42,24 +43,24 @@ const generatorValidationOptions = {
 };
 const validateGeneratorOptions = {
 	asset: createSchemaValidation(
-		require("../../schemas/plugins/asset/AssetGeneratorOptions.check.js"),
+		require("../../schemas/plugins/asset/AssetGeneratorOptions.check"),
 		() => getSchema("AssetGeneratorOptions"),
 		generatorValidationOptions
 	),
 	"asset/resource": createSchemaValidation(
-		require("../../schemas/plugins/asset/AssetResourceGeneratorOptions.check.js"),
+		require("../../schemas/plugins/asset/AssetResourceGeneratorOptions.check"),
 		() => getSchema("AssetResourceGeneratorOptions"),
 		generatorValidationOptions
 	),
 	"asset/inline": createSchemaValidation(
-		require("../../schemas/plugins/asset/AssetInlineGeneratorOptions.check.js"),
+		require("../../schemas/plugins/asset/AssetInlineGeneratorOptions.check"),
 		() => getSchema("AssetInlineGeneratorOptions"),
 		generatorValidationOptions
 	)
 };
 
 const validateParserOptions = createSchemaValidation(
-	require("../../schemas/plugins/asset/AssetParserOptions.check.js"),
+	require("../../schemas/plugins/asset/AssetParserOptions.check"),
 	() => getSchema("AssetParserOptions"),
 	{
 		name: "Asset Modules Plugin",
@@ -70,12 +71,14 @@ const validateParserOptions = createSchemaValidation(
 const getAssetGenerator = memoize(() => require("./AssetGenerator"));
 const getAssetParser = memoize(() => require("./AssetParser"));
 const getAssetSourceParser = memoize(() => require("./AssetSourceParser"));
+const getAssetBytesParser = memoize(() => require("./AssetBytesParser"));
 const getAssetSourceGenerator = memoize(() =>
 	require("./AssetSourceGenerator")
 );
+const getAssetBytesGenerator = memoize(() => require("./AssetBytesGenerator"));
 
 const type = ASSET_MODULE_TYPE;
-const plugin = "AssetModulesPlugin";
+const PLUGIN_NAME = "AssetModulesPlugin";
 
 class AssetModulesPlugin {
 	/**
@@ -85,17 +88,12 @@ class AssetModulesPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			plugin,
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE)
-					.tap(plugin, parserOptions => {
+					.tap(PLUGIN_NAME, (parserOptions) => {
 						validateParserOptions(parserOptions);
-						parserOptions = cleverMerge(
-							/** @type {AssetParserOptions} */
-							(compiler.options.module.parser.asset),
-							parserOptions
-						);
 
 						let dataUrlCondition = parserOptions.dataUrlCondition;
 						if (!dataUrlCondition || typeof dataUrlCondition === "object") {
@@ -111,25 +109,32 @@ class AssetModulesPlugin {
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_INLINE)
-					.tap(plugin, _parserOptions => {
+					.tap(PLUGIN_NAME, (_parserOptions) => {
 						const AssetParser = getAssetParser();
 
 						return new AssetParser(true);
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_RESOURCE)
-					.tap(plugin, _parserOptions => {
+					.tap(PLUGIN_NAME, (_parserOptions) => {
 						const AssetParser = getAssetParser();
 
 						return new AssetParser(false);
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_SOURCE)
-					.tap(plugin, _parserOptions => {
+					.tap(PLUGIN_NAME, (_parserOptions) => {
 						const AssetSourceParser = getAssetSourceParser();
 
 						return new AssetSourceParser();
 					});
+				normalModuleFactory.hooks.createParser
+					.for(ASSET_MODULE_TYPE_BYTES)
+					.tap(PLUGIN_NAME, (_parserOptions) => {
+						const AssetBytesParser = getAssetBytesParser();
+
+						return new AssetBytesParser();
+					});
 
 				for (const type of [
 					ASSET_MODULE_TYPE,
@@ -138,7 +143,7 @@ class AssetModulesPlugin {
 				]) {
 					normalModuleFactory.hooks.createGenerator
 						.for(type)
-						.tap(plugin, generatorOptions => {
+						.tap(PLUGIN_NAME, (generatorOptions) => {
 							validateGeneratorOptions[type](generatorOptions);
 
 							let dataUrl;
@@ -176,20 +181,28 @@ class AssetModulesPlugin {
 				}
 				normalModuleFactory.hooks.createGenerator
 					.for(ASSET_MODULE_TYPE_SOURCE)
-					.tap(plugin, () => {
+					.tap(PLUGIN_NAME, () => {
 						const AssetSourceGenerator = getAssetSourceGenerator();
 
 						return new AssetSourceGenerator(compilation.moduleGraph);
 					});
 
-				compilation.hooks.renderManifest.tap(plugin, (result, options) => {
+				normalModuleFactory.hooks.createGenerator
+					.for(ASSET_MODULE_TYPE_BYTES)
+					.tap(PLUGIN_NAME, () => {
+						const AssetBytesGenerator = getAssetBytesGenerator();
+
+						return new AssetBytesGenerator(compilation.moduleGraph);
+					});
+
+				compilation.hooks.renderManifest.tap(PLUGIN_NAME, (result, options) => {
 					const { chunkGraph } = compilation;
-					const { chunk, codeGenerationResults } = options;
+					const { chunk, codeGenerationResults, runtimeTemplate } = options;
 
 					const modules = chunkGraph.getOrderedChunkModulesIterableBySourceType(
 						chunk,
 						ASSET_MODULE_TYPE,
-						compareModulesByIdentifier
+						compareModulesByIdOrIdentifier(chunkGraph)
 					);
 					if (modules) {
 						for (const module of modules) {
@@ -203,18 +216,63 @@ class AssetModulesPlugin {
 									/** @type {NonNullable<CodeGenerationResult["data"]>} */
 									(codeGenResult.data);
 								const errored = module.getNumberOfErrors() > 0;
+
+								/** @type {string} */
+								let entryFilename;
+								/** @type {AssetInfo} */
+								let entryInfo;
+								/** @type {string} */
+								let entryHash;
+
+								if (errored) {
+									const erroredModule = /** @type {NormalModule} */ (module);
+									const AssetGenerator = getAssetGenerator();
+									const [fullContentHash, contentHash] =
+										AssetGenerator.getFullContentHash(
+											erroredModule,
+											runtimeTemplate
+										);
+									const { filename, assetInfo } =
+										AssetGenerator.getFilenameWithInfo(
+											erroredModule,
+											{
+												filename:
+													erroredModule.generatorOptions &&
+													erroredModule.generatorOptions.filename,
+												outputPath:
+													erroredModule.generatorOptions &&
+													erroredModule.generatorOptions.outputPath
+											},
+											{
+												runtime: chunk.runtime,
+												runtimeTemplate,
+												chunkGraph
+											},
+											contentHash
+										);
+									entryFilename = filename;
+									entryInfo = assetInfo;
+									entryHash = fullContentHash;
+								} else {
+									entryFilename =
+										/** @type {string} */
+										(buildInfo.filename || data.get("filename"));
+									entryInfo =
+										/** @type {AssetInfo} */
+										(buildInfo.assetInfo || data.get("assetInfo"));
+									entryHash =
+										/** @type {string} */
+										(buildInfo.fullContentHash || data.get("fullContentHash"));
+								}
+
 								result.push({
 									render: () =>
 										/** @type {Source} */ (codeGenResult.sources.get(type)),
-									filename: errored
-										? module.nameForCondition()
-										: buildInfo.filename || data.get("filename"),
-									info: buildInfo.assetInfo || data.get("assetInfo"),
+									filename: entryFilename,
+									info: entryInfo,
 									auxiliary: true,
 									identifier: `assetModule${chunkGraph.getModuleId(module)}`,
-									hash: errored
-										? chunkGraph.getModuleHash(module, chunk.runtime)
-										: buildInfo.fullContentHash || data.get("fullContentHash")
+									hash: entryHash
 								});
 							} catch (err) {
 								/** @type {Error} */ (err).message +=
@@ -228,7 +286,7 @@ class AssetModulesPlugin {
 				});
 
 				compilation.hooks.prepareModuleExecution.tap(
-					"AssetModulesPlugin",
+					PLUGIN_NAME,
 					(options, context) => {
 						const { codeGenerationResult } = options;
 						const source = codeGenerationResult.sources.get(ASSET_MODULE_TYPE);
@@ -236,10 +294,14 @@ class AssetModulesPlugin {
 						const data =
 							/** @type {NonNullable<CodeGenerationResult["data"]>} */
 							(codeGenerationResult.data);
-						context.assets.set(data.get("filename"), {
-							source,
-							info: data.get("assetInfo")
-						});
+						context.assets.set(
+							/** @type {string} */
+							(data.get("filename")),
+							{
+								source,
+								info: data.get("assetInfo")
+							}
+						);
 					}
 				);
 			}

package/lib/asset/AssetParser.js

@@ -33,15 +33,19 @@ class AssetParser extends Parser {
 			throw new Error("AssetParser doesn't accept preparsed AST");
 		}
 
-		const buildInfo = /** @type {BuildInfo} */ (state.module.buildInfo);
+		const buildInfo =
+			/** @type {BuildInfo} */
+			(state.module.buildInfo);
 		buildInfo.strict = true;
-		const buildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);
+		const buildMeta =
+			/** @type {BuildMeta} */
+			(state.module.buildMeta);
 		buildMeta.exportsType = "default";
 		buildMeta.defaultObject = false;
 
 		if (typeof this.dataUrlCondition === "function") {
 			buildInfo.dataUrl = this.dataUrlCondition(source, {
-				filename: state.module.matchResource || state.module.resource,
+				filename: /** @type {string} */ (state.module.getResource()),
 				module: state.module
 			});
 		} else if (typeof this.dataUrlCondition === "boolean") {

package/lib/asset/AssetSourceGenerator.js

@@ -9,16 +9,20 @@ const { RawSource } = require("webpack-sources");
 const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const {
-	NO_TYPES,
+	CSS_TYPE,
+	CSS_URL_TYPE,
 	CSS_URL_TYPES,
-	JS_TYPES,
-	JS_AND_CSS_URL_TYPES
-} = require("../ModuleSourceTypesConstants");
+	JAVASCRIPT_AND_CSS_URL_TYPES,
+	JAVASCRIPT_TYPE,
+	JAVASCRIPT_TYPES,
+	NO_TYPES
+} = require("../ModuleSourceTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
+/** @typedef {import("../Module").SourceType} SourceType */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../NormalModule")} NormalModule */
@@ -46,39 +50,39 @@ class AssetSourceGenerator extends Generator {
 		const data = getData ? getData() : undefined;
 
 		switch (type) {
-			case "javascript": {
+			case JAVASCRIPT_TYPE: {
 				if (!originalSource) {
 					return new RawSource("");
 				}
 
 				const content = originalSource.source();
 				const encodedSource =
-					typeof content === "string" ? content : content.toString("utf-8");
+					typeof content === "string" ? content : content.toString("utf8");
 
 				let sourceContent;
 				if (concatenationScope) {
 					concatenationScope.registerNamespaceExport(
 						ConcatenationScope.NAMESPACE_OBJECT_EXPORT
 					);
-					sourceContent = `${runtimeTemplate.supportsConst() ? "const" : "var"} ${
+					sourceContent = `${runtimeTemplate.renderConst()} ${
 						ConcatenationScope.NAMESPACE_OBJECT_EXPORT
 					} = ${JSON.stringify(encodedSource)};`;
 				} else {
 					runtimeRequirements.add(RuntimeGlobals.module);
-					sourceContent = `${RuntimeGlobals.module}.exports = ${JSON.stringify(
+					sourceContent = `${module.moduleArgument}.exports = ${JSON.stringify(
 						encodedSource
 					)};`;
 				}
 				return new RawSource(sourceContent);
 			}
-			case "css-url": {
+			case CSS_URL_TYPE: {
 				if (!originalSource) {
 					return null;
 				}
 
 				const content = originalSource.source();
 				const encodedSource =
-					typeof content === "string" ? content : content.toString("utf-8");
+					typeof content === "string" ? content : content.toString("utf8");
 
 				if (data) {
 					data.set("url", { [type]: encodedSource });
@@ -90,6 +94,24 @@ class AssetSourceGenerator extends Generator {
 		}
 	}
 
+	/**
+	 * @param {Error} error the error
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {GenerateContext} generateContext context for generate
+	 * @returns {Source | null} generated code
+	 */
+	generateError(error, module, generateContext) {
+		switch (generateContext.type) {
+			case JAVASCRIPT_TYPE: {
+				return new RawSource(
+					`throw new Error(${JSON.stringify(error.message)});`
+				);
+			}
+			default:
+				return null;
+		}
+	}
+
 	/**
 	 * @param {NormalModule} module module for which the bailout reason should be determined
 	 * @param {ConcatenationBailoutReasonContext} context context
@@ -104,6 +126,7 @@ class AssetSourceGenerator extends Generator {
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
+		/** @type {Set<string>} */
 		const sourceTypes = new Set();
 		const connections = this._moduleGraph.getIncomingConnections(module);
 
@@ -115,12 +138,13 @@ class AssetSourceGenerator extends Generator {
 			sourceTypes.add(connection.originModule.type.split("/")[0]);
 		}
 
-		if (sourceTypes.has("javascript") && sourceTypes.has("css")) {
-			return JS_AND_CSS_URL_TYPES;
-		} else if (sourceTypes.has("javascript")) {
-			return JS_TYPES;
-		} else if (sourceTypes.has("css")) {
-			return CSS_URL_TYPES;
+		if (sourceTypes.size > 0) {
+			if (sourceTypes.has(JAVASCRIPT_TYPE) && sourceTypes.has(CSS_TYPE)) {
+				return JAVASCRIPT_AND_CSS_URL_TYPES;
+			} else if (sourceTypes.has(CSS_TYPE)) {
+				return CSS_URL_TYPES;
+			}
+			return JAVASCRIPT_TYPES;
 		}
 
 		return NO_TYPES;
@@ -128,7 +152,7 @@ class AssetSourceGenerator extends Generator {
 
 	/**
 	 * @param {NormalModule} module the module
-	 * @param {string=} type source type
+	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {

package/lib/asset/RawDataUrlModule.js

@@ -7,21 +7,26 @@
 
 const { RawSource } = require("webpack-sources");
 const Module = require("../Module");
-const { JS_TYPES } = require("../ModuleSourceTypesConstants");
+const {
+	JAVASCRIPT_TYPE,
+	JAVASCRIPT_TYPES
+} = require("../ModuleSourceTypeConstants");
 const { ASSET_MODULE_TYPE_RAW_DATA_URL } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("../../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
+/** @typedef {import("../config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
+/** @typedef {import("../Module").BuildCallback} BuildCallback */
+/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {import("../Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
+/** @typedef {import("../Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("../WebpackError")} WebpackError */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
@@ -45,7 +50,7 @@ class RawDataUrlModule extends Module {
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return JS_TYPES;
+		return JAVASCRIPT_TYPES;
 	}
 
 	/**
@@ -60,8 +65,9 @@ class RawDataUrlModule extends Module {
 	 * @returns {number} the estimated size of the module (must be non-zero)
 	 */
 	size(type) {
-		if (this.url === undefined)
+		if (this.url === undefined) {
 			this.url = /** @type {Buffer} */ (this.urlBuffer).toString();
+		}
 		return Math.max(1, this.url.length);
 	}
 
@@ -77,7 +83,7 @@ class RawDataUrlModule extends Module {
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {NeedBuildCallback} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {
@@ -89,7 +95,7 @@ class RawDataUrlModule extends Module {
 	 * @param {Compilation} compilation the compilation
 	 * @param {ResolverWithOptions} resolver the resolver
 	 * @param {InputFileSystem} fs the file system
-	 * @param {function(WebpackError=): void} callback callback function
+	 * @param {BuildCallback} callback callback function
 	 * @returns {void}
 	 */
 	build(options, compilation, resolver, fs, callback) {
@@ -105,17 +111,19 @@ class RawDataUrlModule extends Module {
 	 * @returns {CodeGenerationResult} result
 	 */
 	codeGeneration(context) {
-		if (this.url === undefined)
+		if (this.url === undefined) {
 			this.url = /** @type {Buffer} */ (this.urlBuffer).toString();
+		}
 		const sources = new Map();
 		sources.set(
-			"javascript",
+			JAVASCRIPT_TYPE,
 			new RawSource(`module.exports = ${JSON.stringify(this.url)};`)
 		);
 		const data = new Map();
 		data.set("url", {
 			javascript: this.url
 		});
+		/** @type {RuntimeRequirements} */
 		const runtimeRequirements = new Set();
 		runtimeRequirements.add(RuntimeGlobals.module);
 		return { sources, runtimeRequirements, data };

package/lib/async-modules/AsyncModuleHelpers.js

@@ -0,0 +1,52 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Haijie Xie @hai-x
+*/
+
+"use strict";
+
+const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
+
+/** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../Module")} Module */
+
+/** @typedef {Set<Module>} Modules */
+
+/**
+ * @param {ModuleGraph} moduleGraph module graph
+ * @param {Module} module module
+ * @returns {Modules} set of modules
+ */
+const getOutgoingAsyncModules = (moduleGraph, module) => {
+	/** @type {Modules} */
+	const set = new Set();
+	/** @type {Modules} */
+	const seen = new Set();
+	(function g(module) {
+		if (!moduleGraph.isAsync(module) || seen.has(module)) return;
+		seen.add(module);
+		if (module.buildMeta && module.buildMeta.async) {
+			set.add(module);
+		} else {
+			const outgoingConnectionMap =
+				moduleGraph.getOutgoingConnectionsByModule(module);
+			if (outgoingConnectionMap) {
+				for (const [module, connections] of outgoingConnectionMap) {
+					if (
+						connections.some(
+							(c) =>
+								c.dependency instanceof HarmonyImportDependency &&
+								c.isTargetActive(undefined)
+						) &&
+						module
+					) {
+						g(module);
+					}
+				}
+			}
+		}
+	})(module);
+	return set;
+};
+
+module.exports.getOutgoingAsyncModules = getOutgoingAsyncModules;

package/lib/async-modules/AwaitDependenciesInitFragment.js

@@ -17,16 +17,16 @@ const Template = require("../Template");
  */
 class AwaitDependenciesInitFragment extends InitFragment {
 	/**
-	 * @param {Set<string>} promises the promises that should be awaited
+	 * @param {Map<string, string>} dependencies maps an import var to an async module that needs to be awaited
 	 */
-	constructor(promises) {
+	constructor(dependencies) {
 		super(
 			undefined,
 			InitFragment.STAGE_ASYNC_DEPENDENCIES,
 			0,
 			"await-dependencies"
 		);
-		this.promises = promises;
+		this.dependencies = dependencies;
 	}
 
 	/**
@@ -34,38 +34,53 @@ class AwaitDependenciesInitFragment extends InitFragment {
 	 * @returns {AwaitDependenciesInitFragment} AwaitDependenciesInitFragment
 	 */
 	merge(other) {
-		const promises = new Set(other.promises);
-		for (const p of this.promises) {
-			promises.add(p);
+		const dependencies = new Map(other.dependencies);
+		for (const [key, value] of this.dependencies) {
+			dependencies.set(key, value);
 		}
-		return new AwaitDependenciesInitFragment(promises);
+		return new AwaitDependenciesInitFragment(dependencies);
 	}
 
 	/**
 	 * @param {GenerateContext} context context
 	 * @returns {string | Source | undefined} the source code that will be included as initialization code
 	 */
-	getContent({ runtimeRequirements }) {
+	getContent({ runtimeRequirements, runtimeTemplate }) {
 		runtimeRequirements.add(RuntimeGlobals.module);
-		const promises = this.promises;
-		if (promises.size === 0) {
+		if (this.dependencies.size === 0) {
 			return "";
 		}
-		if (promises.size === 1) {
-			const [p] = promises;
-			return Template.asString([
-				`var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([${p}]);`,
-				`${p} = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];`,
-				""
-			]);
+
+		const importVars = [...this.dependencies.keys()];
+		const asyncModuleValues = [...this.dependencies.values()].join(", ");
+
+		const templateInput = [
+			`var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([${asyncModuleValues}]);`
+		];
+
+		if (
+			this.dependencies.size === 1 ||
+			!runtimeTemplate.supportsDestructuring()
+		) {
+			templateInput.push(
+				"var __webpack_async_dependencies_result__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);"
+			);
+			for (const [index, importVar] of importVars.entries()) {
+				templateInput.push(
+					`${importVar} = __webpack_async_dependencies_result__[${index}];`
+				);
+			}
+		} else {
+			const importVarsStr = importVars.join(", ");
+
+			templateInput.push(
+				`([${importVarsStr}] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);`
+			);
 		}
-		const sepPromises = Array.from(promises).join(", ");
-		// TODO check if destructuring is supported
-		return Template.asString([
-			`var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([${sepPromises}]);`,
-			`([${sepPromises}] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);`,
-			""
-		]);
+
+		templateInput.push("");
+
+		return Template.asString(templateInput);
 	}
 }