add asset modules concatenation

lib/asset/AssetGenerator.js

@@ -8,6 +8,7 @@
 const mimeTypes = require("mime-types");
 const path = require("path");
 const { RawSource } = require("webpack-sources");
+const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const createHash = require("../util/createHash");
@@ -23,6 +24,7 @@ const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Generator").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../util/Hash")} Hash */
@@ -145,6 +147,15 @@ class AssetGenerator extends Generator {
 		).replace(/^\.\//, "");
 	}
 
+	/**
+	 * @param {NormalModule} module module for which the bailout reason should be determined
+	 * @param {ConcatenationBailoutReasonContext} context context
+	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
+	 */
+	getConcatenationBailoutReason(module, context) {
+		return undefined;
+	}
+
 	/**
 	 * @param {NormalModule} module module
 	 * @returns {string} mime type
@@ -198,14 +209,21 @@ class AssetGenerator extends Generator {
 	 */
 	generate(
 		module,
-		{ runtime, chunkGraph, runtimeTemplate, runtimeRequirements, type, getData }
+		{
+			runtime,
+			concatenationScope,
+			chunkGraph,
+			runtimeTemplate,
+			runtimeRequirements,
+			type,
+			getData
+		}
 	) {
 		switch (type) {
 			case "asset":
 				return module.originalSource();
 			default: {
-				runtimeRequirements.add(RuntimeGlobals.module);
-
+				let content;
 				const originalSource = module.originalSource();
 				if (module.buildInfo.dataUrl) {
 					let encodedSource;
@@ -255,11 +273,7 @@ class AssetGenerator extends Generator {
 					}
 					const data = getData();
 					data.set("url", Buffer.from(encodedSource));
-					return new RawSource(
-						`${RuntimeGlobals.module}.exports = ${JSON.stringify(
-							encodedSource
-						)};`
-					);
+					content = JSON.stringify(encodedSource);
 				} else {
 					const assetModuleFilename =
 						this.filename || runtimeTemplate.outputOptions.assetModuleFilename;
@@ -343,9 +357,22 @@ class AssetGenerator extends Generator {
 						data.set("filename", filename);
 						data.set("assetInfo", assetInfo);
 					}
+					content = assetPath;
+				}
 
+				if (concatenationScope) {
+					concatenationScope.registerNamespaceExport(
+						ConcatenationScope.NAMESPACE_OBJECT_EXPORT
+					);
+					return new RawSource(
+						`${runtimeTemplate.supportsConst() ? "const" : "var"} ${
+							ConcatenationScope.NAMESPACE_OBJECT_EXPORT
+						} = ${content};`
+					);
+				} else {
+					runtimeRequirements.add(RuntimeGlobals.module);
 					return new RawSource(
-						`${RuntimeGlobals.module}.exports = ${assetPath};`
+						`${RuntimeGlobals.module}.exports = ${content};`
 					);
 				}
 			}

lib/asset/AssetParser.js

@@ -31,6 +31,7 @@ class AssetParser extends Parser {
 		}
 		state.module.buildInfo.strict = true;
 		state.module.buildMeta.exportsType = "default";
+		state.module.buildMeta.defaultObject = false;
 
 		if (typeof this.dataUrlCondition === "function") {
 			state.module.buildInfo.dataUrl = this.dataUrlCondition(source, {

lib/asset/AssetSourceGenerator.js

@@ -6,11 +6,13 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
+const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const RuntimeGlobals = require("../RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
+/** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
 /** @typedef {import("../NormalModule")} NormalModule */
 
 const TYPES = new Set(["javascript"]);
@@ -21,9 +23,10 @@ class AssetSourceGenerator extends Generator {
 	 * @param {GenerateContext} generateContext context for generate
 	 * @returns {Source} generated code
 	 */
-	generate(module, { chunkGraph, runtimeTemplate, runtimeRequirements }) {
-		runtimeRequirements.add(RuntimeGlobals.module);
-
+	generate(
+		module,
+		{ concatenationScope, chunkGraph, runtimeTemplate, runtimeRequirements }
+	) {
 		const originalSource = module.originalSource();
 
 		if (!originalSource) {
@@ -38,9 +41,31 @@ class AssetSourceGenerator extends Generator {
 		} else {
 			encodedSource = content.toString("utf-8");
 		}
-		return new RawSource(
-			`${RuntimeGlobals.module}.exports = ${JSON.stringify(encodedSource)};`
-		);
+
+		let sourceContent;
+		if (concatenationScope) {
+			concatenationScope.registerNamespaceExport(
+				ConcatenationScope.NAMESPACE_OBJECT_EXPORT
+			);
+			sourceContent = `${runtimeTemplate.supportsConst() ? "const" : "var"} ${
+				ConcatenationScope.NAMESPACE_OBJECT_EXPORT
+			} = ${JSON.stringify(encodedSource)};`;
+		} else {
+			runtimeRequirements.add(RuntimeGlobals.module);
+			sourceContent = `${RuntimeGlobals.module}.exports = ${JSON.stringify(
+				encodedSource
+			)};`;
+		}
+		return new RawSource(sourceContent);
+	}
+
+	/**
+	 * @param {NormalModule} module module for which the bailout reason should be determined
+	 * @param {ConcatenationBailoutReasonContext} context context
+	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
+	 */
+	getConcatenationBailoutReason(module, context) {
+		return undefined;
 	}
 
 	/**

lib/asset/AssetSourceParser.js

@@ -23,6 +23,7 @@ class AssetSourceParser extends Parser {
 		const { module } = state;
 		module.buildInfo.strict = true;
 		module.buildMeta.exportsType = "default";
+		state.module.buildMeta.defaultObject = false;
 
 		return state;
 	}