webpack 5.59.0 → 5.94.0

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -8,6 +8,7 @@
 const { ConcatSource, RawSource } = require("webpack-sources");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
+const { getUndoPath } = require("../util/identifier");
 const {
 	getChunkFilenameTemplate,
 	getCompilationHooks
@@ -17,7 +18,9 @@ const {
 	updateHashForEntryStartup
 } = require("./StartupHelpers");
 
+/** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Entrypoint")} Entrypoint */
 
 class CommonJsChunkFormatPlugin {
 	/**
@@ -30,7 +33,7 @@ class CommonJsChunkFormatPlugin {
 			"CommonJsChunkFormatPlugin",
 			compilation => {
 				compilation.hooks.additionalChunkRuntimeRequirements.tap(
-					"CommonJsChunkLoadingPlugin",
+					"CommonJsChunkFormatPlugin",
 					(chunk, set, { chunkGraph }) => {
 						if (chunk.hasRuntime()) return;
 						if (chunkGraph.getNumberOfEntryModules(chunk) > 0) {
@@ -48,7 +51,7 @@ class CommonJsChunkFormatPlugin {
 						const source = new ConcatSource();
 						source.add(`exports.id = ${JSON.stringify(chunk.id)};\n`);
 						source.add(`exports.ids = ${JSON.stringify(chunk.ids)};\n`);
-						source.add(`exports.modules = `);
+						source.add("exports.modules = ");
 						source.add(modules);
 						source.add(";\n");
 						const runtimeModules =
@@ -66,7 +69,9 @@ class CommonJsChunkFormatPlugin {
 							chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
 						);
 						if (entries.length > 0) {
-							const runtimeChunk = entries[0][1].getRuntimeChunk();
+							const runtimeChunk =
+								/** @type {Entrypoint} */
+								(entries[0][1]).getRuntimeChunk();
 							const currentOutputName = compilation
 								.getPath(
 									getChunkFilenameTemplate(chunk, compilation.outputOptions),
@@ -75,38 +80,36 @@ class CommonJsChunkFormatPlugin {
 										contentHashType: "javascript"
 									}
 								)
+								.replace(/^\/+/g, "")
 								.split("/");
 							const runtimeOutputName = compilation
 								.getPath(
 									getChunkFilenameTemplate(
-										runtimeChunk,
+										/** @type {Chunk} */
+										(runtimeChunk),
 										compilation.outputOptions
 									),
 									{
-										chunk: runtimeChunk,
+										chunk: /** @type {Chunk} */ (runtimeChunk),
 										contentHashType: "javascript"
 									}
 								)
+								.replace(/^\/+/g, "")
 								.split("/");
 
-							// remove filename, we only need the directory
-							currentOutputName.pop();
-
 							// remove common parts
 							while (
-								currentOutputName.length > 0 &&
-								runtimeOutputName.length > 0 &&
+								currentOutputName.length > 1 &&
+								runtimeOutputName.length > 1 &&
 								currentOutputName[0] === runtimeOutputName[0]
 							) {
 								currentOutputName.shift();
 								runtimeOutputName.shift();
 							}
-
+							const last = runtimeOutputName.join("/");
 							// create final path
 							const runtimePath =
-								(currentOutputName.length > 0
-									? "../".repeat(currentOutputName.length)
-									: "./") + runtimeOutputName.join("/");
+								getUndoPath(currentOutputName.join("/"), last, true) + last;
 
 							const entrySource = new ConcatSource();
 							entrySource.add(
@@ -120,7 +123,7 @@ class CommonJsChunkFormatPlugin {
 							entrySource.add(source);
 							entrySource.add(";\n\n// load runtime\n");
 							entrySource.add(
-								`var __webpack_require__ = require(${JSON.stringify(
+								`var ${RuntimeGlobals.require} = require(${JSON.stringify(
 									runtimePath
 								)});\n`
 							);

package/lib/javascript/EnableChunkLoadingPlugin.js

@@ -11,6 +11,10 @@
 /** @type {WeakMap<Compiler, Set<ChunkLoadingType>>} */
 const enabledTypes = new WeakMap();
 
+/**
+ * @param {Compiler} compiler compiler
+ * @returns {Set<ChunkLoadingType>} enabled types
+ */
 const getEnabledTypes = compiler => {
 	let set = enabledTypes.get(compiler);
 	if (set === undefined) {
@@ -47,10 +51,11 @@ class EnableChunkLoadingPlugin {
 			throw new Error(
 				`Chunk loading type "${type}" is not enabled. ` +
 					"EnableChunkLoadingPlugin need to be used to enable this type of chunk loading. " +
-					'This usually happens through the "output.enabledChunkLoadingTypes" option. ' +
-					'If you are using a function as entry which sets "chunkLoading", you need to add all potential chunk loading types to "output.enabledChunkLoadingTypes". ' +
-					"These types are enabled: " +
-					Array.from(getEnabledTypes(compiler)).join(", ")
+					`This usually happens through the "output.enabledChunkLoadingTypes" option. ` +
+					`If you are using a function as entry which sets "chunkLoading", you need to add all potential chunk loading types to "output.enabledChunkLoadingTypes". ` +
+					`These types are enabled: ${Array.from(
+						getEnabledTypes(compiler)
+					).join(", ")}`
 			);
 		}
 	}
@@ -81,7 +86,7 @@ class EnableChunkLoadingPlugin {
 					break;
 				}
 				case "require": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const CommonJsChunkLoadingPlugin = require("../node/CommonJsChunkLoadingPlugin");
 					new CommonJsChunkLoadingPlugin({
 						asyncChunkLoading: false
@@ -89,7 +94,7 @@ class EnableChunkLoadingPlugin {
 					break;
 				}
 				case "async-node": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const CommonJsChunkLoadingPlugin = require("../node/CommonJsChunkLoadingPlugin");
 					new CommonJsChunkLoadingPlugin({
 						asyncChunkLoading: true

package/lib/javascript/JavascriptGenerator.js

@@ -14,6 +14,8 @@ const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibi
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../DependenciesBlock")} DependenciesBlock */
 /** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../DependencyTemplate")} DependencyTemplate */
+/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module")} Module */
@@ -25,8 +27,15 @@ const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibi
 // replace with newer constructs
 
 const deprecatedGetInitFragments = util.deprecate(
+	/**
+	 * @param {DependencyTemplate} template template
+	 * @param {Dependency} dependency dependency
+	 * @param {DependencyTemplateContext} templateContext template context
+	 * @returns {InitFragment<GenerateContext>[]} init fragments
+	 */
 	(template, dependency, templateContext) =>
-		template.getInitFragments(dependency, templateContext),
+		/** @type {DependencyTemplate & { getInitFragments: function(Dependency, DependencyTemplateContext): InitFragment<GenerateContext>[] }} */
+		(template).getInitFragments(dependency, templateContext),
 	"DependencyTemplate.getInitFragment is deprecated (use apply(dep, source, { initFragments }) instead)",
 	"DEP_WEBPACK_JAVASCRIPT_GENERATOR_GET_INIT_FRAGMENTS"
 );
@@ -93,6 +102,7 @@ class JavascriptGenerator extends Generator {
 		}
 
 		const source = new ReplaceSource(originalSource);
+		/** @type {InitFragment<GenerateContext>[]} */
 		const initFragments = [];
 
 		this.sourceModule(module, initFragments, source, generateContext);
@@ -102,7 +112,7 @@ class JavascriptGenerator extends Generator {
 
 	/**
 	 * @param {Module} module the module to generate
-	 * @param {InitFragment[]} initFragments mutable list of init fragments
+	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
 	 * @param {ReplaceSource} source the current replace source which can be modified
 	 * @param {GenerateContext} generateContext the generateContext
 	 * @returns {void}
@@ -144,7 +154,7 @@ class JavascriptGenerator extends Generator {
 	/**
 	 * @param {Module} module the module to generate
 	 * @param {DependenciesBlock} block the dependencies block which will be processed
-	 * @param {InitFragment[]} initFragments mutable list of init fragments
+	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
 	 * @param {ReplaceSource} source the current replace source which can be modified
 	 * @param {GenerateContext} generateContext the generateContext
 	 * @returns {void}
@@ -174,7 +184,7 @@ class JavascriptGenerator extends Generator {
 	/**
 	 * @param {Module} module the current module
 	 * @param {Dependency} dependency the dependency to generate
-	 * @param {InitFragment[]} initFragments mutable list of init fragments
+	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
 	 * @param {ReplaceSource} source the current replace source which can be modified
 	 * @param {GenerateContext} generateContext the render context
 	 * @returns {void}
@@ -186,10 +196,14 @@ class JavascriptGenerator extends Generator {
 		const template = generateContext.dependencyTemplates.get(constructor);
 		if (!template) {
 			throw new Error(
-				"No template for dependency: " + dependency.constructor.name
+				`No template for dependency: ${dependency.constructor.name}`
 			);
 		}
 
+		/** @type {InitFragment<GenerateContext>[] | undefined} */
+		let chunkInitFragments;
+
+		/** @type {DependencyTemplateContext} */
 		const templateContext = {
 			runtimeTemplate: generateContext.runtimeTemplate,
 			dependencyTemplates: generateContext.dependencyTemplates,
@@ -199,7 +213,24 @@ class JavascriptGenerator extends Generator {
 			runtime: generateContext.runtime,
 			runtimeRequirements: generateContext.runtimeRequirements,
 			concatenationScope: generateContext.concatenationScope,
-			initFragments
+			codeGenerationResults:
+				/** @type {NonNullable<GenerateContext["codeGenerationResults"]>} */
+				(generateContext.codeGenerationResults),
+			initFragments,
+			get chunkInitFragments() {
+				if (!chunkInitFragments) {
+					const data =
+						/** @type {NonNullable<GenerateContext["getData"]>} */
+						(generateContext.getData)();
+					chunkInitFragments = data.get("chunkInitFragments");
+					if (!chunkInitFragments) {
+						chunkInitFragments = [];
+						data.set("chunkInitFragments", chunkInitFragments);
+					}
+				}
+
+				return chunkInitFragments;
+			}
 		};
 
 		template.apply(dependency, source, templateContext);