webpack 5.59.0 → 5.71.0

package/lib/container/ContainerEntryModule.js

@@ -10,6 +10,7 @@ const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const Module = require("../Module");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
+const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
 const makeSerializable = require("../util/makeSerializable");
 const ContainerExposedDependency = require("./ContainerExposedDependency");
 
@@ -78,12 +79,14 @@ class ContainerEntryModule extends Module {
 	 * @returns {string | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
-		return `webpack/container/entry/${this._name}`;
+		return `${this.layer ? `(${this.layer})/` : ""}webpack/container/entry/${
+			this._name
+		}`;
 	}
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function(WebpackError=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {
@@ -104,6 +107,7 @@ class ContainerEntryModule extends Module {
 			strict: true,
 			topLevelDeclarations: new Set(["moduleMap", "get", "init"])
 		};
+		this.buildMeta.exportsType = "namespace";
 
 		this.clearDependenciesAndBlocks();
 
@@ -127,6 +131,7 @@ class ContainerEntryModule extends Module {
 			}
 			this.addBlock(block);
 		}
+		this.addDependency(new StaticExportsDependency(["get", "init"], false));
 
 		callback();
 	}
@@ -217,10 +222,8 @@ class ContainerEntryModule extends Module {
 			])};`,
 			`var init = ${runtimeTemplate.basicFunction("shareScope, initScope", [
 				`if (!${RuntimeGlobals.shareScopeMap}) return;`,
-				`var oldScope = ${RuntimeGlobals.shareScopeMap}[${JSON.stringify(
-					this._shareScope
-				)}];`,
 				`var name = ${JSON.stringify(this._shareScope)}`,
+				`var oldScope = ${RuntimeGlobals.shareScopeMap}[name];`,
 				`if(oldScope && oldScope !== shareScope) throw new Error("Container initialization failed as it has already been initialized with a different share scope");`,
 				`${RuntimeGlobals.shareScopeMap}[name] = shareScope;`,
 				`return ${RuntimeGlobals.initializeSharing}(name, initScope);`

package/lib/container/FallbackModule.js

@@ -60,9 +60,9 @@ class FallbackModule extends Module {
 	 * @returns {string | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
-		return `webpack/container/fallback/${this.requests[0]}/and ${
-			this.requests.length - 1
-		} more`;
+		return `${this.layer ? `(${this.layer})/` : ""}webpack/container/fallback/${
+			this.requests[0]
+		}/and ${this.requests.length - 1} more`;
 	}
 
 	/**
@@ -76,7 +76,7 @@ class FallbackModule extends Module {
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function(WebpackError=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {

package/lib/container/RemoteModule.js

@@ -67,12 +67,14 @@ class RemoteModule extends Module {
 	 * @returns {string | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
-		return `webpack/container/remote/${this.request}`;
+		return `${this.layer ? `(${this.layer})/` : ""}webpack/container/remote/${
+			this.request
+		}`;
 	}
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function(WebpackError=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {

package/lib/css/CssExportsGenerator.js

@@ -0,0 +1,139 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sergey Melyukov @smelukov
+*/
+
+"use strict";
+
+const { ReplaceSource, RawSource, ConcatSource } = require("webpack-sources");
+const { UsageState } = require("../ExportsInfo");
+const Generator = require("../Generator");
+const RuntimeGlobals = require("../RuntimeGlobals");
+const Template = require("../Template");
+
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../Generator").GenerateContext} GenerateContext */
+/** @typedef {import("../Generator").UpdateHashContext} UpdateHashContext */
+/** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
+/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../util/Hash")} Hash */
+
+const TYPES = new Set(["javascript"]);
+
+class CssExportsGenerator extends Generator {
+	constructor() {
+		super();
+	}
+
+	// TODO add getConcatenationBailoutReason to allow concatenation
+	// but how to make it have a module id
+
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {GenerateContext} generateContext context for generate
+	 * @returns {Source} generated code
+	 */
+	generate(module, generateContext) {
+		const source = new ReplaceSource(new RawSource(""));
+		const initFragments = [];
+		const cssExports = new Map();
+
+		generateContext.runtimeRequirements.add(RuntimeGlobals.module);
+
+		const runtimeRequirements = new Set();
+
+		const templateContext = {
+			runtimeTemplate: generateContext.runtimeTemplate,
+			dependencyTemplates: generateContext.dependencyTemplates,
+			moduleGraph: generateContext.moduleGraph,
+			chunkGraph: generateContext.chunkGraph,
+			module,
+			runtime: generateContext.runtime,
+			runtimeRequirements: runtimeRequirements,
+			concatenationScope: generateContext.concatenationScope,
+			codeGenerationResults: generateContext.codeGenerationResults,
+			initFragments,
+			cssExports
+		};
+
+		const handleDependency = dependency => {
+			const constructor = /** @type {new (...args: any[]) => Dependency} */ (
+				dependency.constructor
+			);
+			const template = generateContext.dependencyTemplates.get(constructor);
+			if (!template) {
+				throw new Error(
+					"No template for dependency: " + dependency.constructor.name
+				);
+			}
+
+			template.apply(dependency, source, templateContext);
+		};
+		module.dependencies.forEach(handleDependency);
+
+		if (generateContext.concatenationScope) {
+			const source = new ConcatSource();
+			const usedIdentifiers = new Set();
+			for (const [k, v] of cssExports) {
+				let identifier = Template.toIdentifier(k);
+				let i = 0;
+				while (usedIdentifiers.has(identifier)) {
+					identifier = Template.toIdentifier(k + i);
+				}
+				usedIdentifiers.add(identifier);
+				generateContext.concatenationScope.registerExport(k, identifier);
+				source.add(
+					`${
+						generateContext.runtimeTemplate.supportsConst ? "const" : "var"
+					} ${identifier} = ${JSON.stringify(v)};\n`
+				);
+			}
+			return source;
+		} else {
+			const otherUsed =
+				generateContext.moduleGraph
+					.getExportsInfo(module)
+					.otherExportsInfo.getUsed(generateContext.runtime) !==
+				UsageState.Unused;
+			if (otherUsed) {
+				generateContext.runtimeRequirements.add(
+					RuntimeGlobals.makeNamespaceObject
+				);
+			}
+			return new RawSource(
+				`${otherUsed ? `${RuntimeGlobals.makeNamespaceObject}(` : ""}${
+					module.moduleArgument
+				}.exports = {\n${Array.from(
+					cssExports,
+					([k, v]) => `\t${JSON.stringify(k)}: ${JSON.stringify(v)}`
+				).join(",\n")}\n}${otherUsed ? ")" : ""};`
+			);
+		}
+	}
+
+	/**
+	 * @param {NormalModule} module fresh module
+	 * @returns {Set<string>} available types (do not mutate)
+	 */
+	getTypes(module) {
+		return TYPES;
+	}
+
+	/**
+	 * @param {NormalModule} module the module
+	 * @param {string=} type source type
+	 * @returns {number} estimate size of the module
+	 */
+	getSize(module, type) {
+		return 42;
+	}
+
+	/**
+	 * @param {Hash} hash hash that will be modified
+	 * @param {UpdateHashContext} updateHashContext context for updating hash
+	 */
+	updateHash(hash, { module }) {}
+}
+
+module.exports = CssExportsGenerator;

package/lib/css/CssGenerator.js

@@ -0,0 +1,109 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sergey Melyukov @smelukov
+*/
+
+"use strict";
+
+const { ReplaceSource } = require("webpack-sources");
+const Generator = require("../Generator");
+const InitFragment = require("../InitFragment");
+const RuntimeGlobals = require("../RuntimeGlobals");
+
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../Generator").GenerateContext} GenerateContext */
+/** @typedef {import("../Generator").UpdateHashContext} UpdateHashContext */
+/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../util/Hash")} Hash */
+
+const TYPES = new Set(["css"]);
+
+class CssGenerator extends Generator {
+	constructor() {
+		super();
+	}
+
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {GenerateContext} generateContext context for generate
+	 * @returns {Source} generated code
+	 */
+	generate(module, generateContext) {
+		const originalSource = module.originalSource();
+		const source = new ReplaceSource(originalSource);
+		const initFragments = [];
+		const cssExports = new Map();
+
+		generateContext.runtimeRequirements.add(RuntimeGlobals.hasCssModules);
+
+		const templateContext = {
+			runtimeTemplate: generateContext.runtimeTemplate,
+			dependencyTemplates: generateContext.dependencyTemplates,
+			moduleGraph: generateContext.moduleGraph,
+			chunkGraph: generateContext.chunkGraph,
+			module,
+			runtime: generateContext.runtime,
+			runtimeRequirements: generateContext.runtimeRequirements,
+			concatenationScope: generateContext.concatenationScope,
+			codeGenerationResults: generateContext.codeGenerationResults,
+			initFragments,
+			cssExports
+		};
+
+		const handleDependency = dependency => {
+			const constructor = /** @type {new (...args: any[]) => Dependency} */ (
+				dependency.constructor
+			);
+			const template = generateContext.dependencyTemplates.get(constructor);
+			if (!template) {
+				throw new Error(
+					"No template for dependency: " + dependency.constructor.name
+				);
+			}
+
+			template.apply(dependency, source, templateContext);
+		};
+		module.dependencies.forEach(handleDependency);
+		if (module.presentationalDependencies !== undefined)
+			module.presentationalDependencies.forEach(handleDependency);
+
+		if (cssExports.size > 0) {
+			const data = generateContext.getData();
+			data.set("css-exports", cssExports);
+		}
+
+		return InitFragment.addToSource(source, initFragments, generateContext);
+	}
+
+	/**
+	 * @param {NormalModule} module fresh module
+	 * @returns {Set<string>} available types (do not mutate)
+	 */
+	getTypes(module) {
+		return TYPES;
+	}
+
+	/**
+	 * @param {NormalModule} module the module
+	 * @param {string=} type source type
+	 * @returns {number} estimate size of the module
+	 */
+	getSize(module, type) {
+		const originalSource = module.originalSource();
+
+		if (!originalSource) {
+			return 0;
+		}
+
+		return originalSource.size();
+	}
+
+	/**
+	 * @param {Hash} hash hash that will be modified
+	 * @param {UpdateHashContext} updateHashContext context for updating hash
+	 */
+	updateHash(hash, { module }) {}
+}
+
+module.exports = CssGenerator;