webpack 5.100.2 → 5.101.1

package/lib/library/ModuleLibraryPlugin.js

@@ -8,6 +8,7 @@
 const { ConcatSource } = require("webpack-sources");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
+const CommonJsSelfReferenceDependency = require("../dependencies/CommonJsSelfReferenceDependency");
 const ConcatenatedModule = require("../optimize/ConcatenatedModule");
 const propertyAccess = require("../util/propertyAccess");
 const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
@@ -21,6 +22,7 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").StartupRenderContext} StartupRenderContext */
+/** @typedef {import("../javascript/JavascriptModulesPlugin").ModuleRenderContext} ModuleRenderContext */
 /** @typedef {import("../util/Hash")} Hash */
 
 /**
@@ -64,34 +66,10 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 	apply(compiler) {
 		super.apply(compiler);
 
-		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
-			const { exportsDefinitions } =
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+			const { onDemandExportsGeneration } =
 				ConcatenatedModule.getCompilationHooks(compilation);
-			exportsDefinitions.tap(PLUGIN_NAME, (definitions, module) => {
-				// If we have connections not all modules were concatenated, so we need the wrapper
-				const connections =
-					compilation.moduleGraph.getIncomingConnections(module);
-
-				for (const connection of connections) {
-					if (connection.originModule) {
-						return false;
-					}
-				}
-
-				// Runtime and splitting chunks now requires the wrapper too
-				for (const chunk of compilation.chunkGraph.getModuleChunksIterable(
-					module
-				)) {
-					if (
-						!chunk.hasRuntime() ||
-						compilation.chunkGraph.getNumberOfEntryModules(chunk) > 1
-					) {
-						return false;
-					}
-				}
-
-				return true;
-			});
+			onDemandExportsGeneration.tap(PLUGIN_NAME, (_module) => true);
 		});
 	}
 
@@ -123,10 +101,21 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 	renderStartup(
 		source,
 		module,
-		{ moduleGraph, chunk, codeGenerationResults },
+		{ moduleGraph, chunk, codeGenerationResults, inlined, inlinedInIIFE },
 		{ options, compilation }
 	) {
 		const result = new ConcatSource(source);
+
+		if (!module.buildMeta || !module.buildMeta.exportsType) {
+			for (const dependency of module.dependencies) {
+				if (dependency instanceof CommonJsSelfReferenceDependency) {
+					result.add(`export { ${RuntimeGlobals.exports} as default }`);
+					break;
+				}
+			}
+			return result;
+		}
+
 		const exportsInfo = options.export
 			? [
 					moduleGraph.getExportInfo(
@@ -136,8 +125,11 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 				]
 			: moduleGraph.getExportsInfo(module).orderedExports;
 		const definitions =
-			/** @type {BuildMeta} */
-			(module.buildMeta).exportsFinalName || {};
+			inlined && !inlinedInIIFE
+				? (module.buildMeta &&
+						/** @type {GenerationMeta} */ module.buildMeta.exportsFinalName) ||
+					{}
+				: {};
 		/** @type {string[]} */
 		const shortHandedExports = [];
 		/** @type {[string, string][]} */
@@ -159,7 +151,7 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 
 			let shouldContinue = false;
 
-			const reexport = exportInfo.findTarget(moduleGraph, _m => true);
+			const reexport = exportInfo.findTarget(moduleGraph, (_m) => true);
 
 			if (reexport) {
 				const exp = moduleGraph.getExportsInfo(reexport.module);
@@ -236,6 +228,32 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 
 		return result;
 	}
+
+	/**
+	 * @param {Source} source source
+	 * @param {Module} module module
+	 * @param {ModuleRenderContext} renderContext render context
+	 * @param {Omit<LibraryContext<T>, 'options'>} libraryContext context
+	 * @returns {Source} source with library export
+	 */
+	renderModuleContent(
+		source,
+		module,
+		{ factory, inlinedInIIFE },
+		libraryContext
+	) {
+		const result = new ConcatSource(source);
+		// Re-add `factoryExportsBinding` to the source
+		// when the module is rendered as a factory or treated as an inlined (startup) module but wrapped in an IIFE
+		if (
+			(inlinedInIIFE || factory) &&
+			module.buildMeta &&
+			module.buildMeta.factoryExportsBinding
+		) {
+			result.add(module.buildMeta.factoryExportsBinding);
+		}
+		return result;
+	}
 }
 
 module.exports = ModuleLibraryPlugin;

package/lib/library/SystemLibraryPlugin.js

@@ -73,7 +73,9 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 	render(source, { chunkGraph, moduleGraph, chunk }, { options, compilation }) {
 		const modules = chunkGraph
 			.getChunkModules(chunk)
-			.filter(m => m instanceof ExternalModule && m.externalType === "system");
+			.filter(
+				(m) => m instanceof ExternalModule && m.externalType === "system"
+			);
 		const externals = /** @type {ExternalModule[]} */ (modules);
 
 		// The name this bundle should be registered as with System
@@ -83,7 +85,7 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 
 		// The array of dependencies that are external to webpack and will be provided by System
 		const systemDependencies = JSON.stringify(
-			externals.map(m =>
+			externals.map((m) =>
 				typeof m.request === "object" && !Array.isArray(m.request)
 					? m.request.amd
 					: m.request
@@ -95,7 +97,7 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 
 		// An array of the internal variable names for the webpack externals
 		const externalWebpackNames = externals.map(
-			m =>
+			(m) =>
 				`__WEBPACK_EXTERNAL_MODULE_${Template.toIdentifier(
 					`${chunkGraph.getModuleId(m)}`
 				)}__`
@@ -103,7 +105,7 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 
 		// Declaring variables for the internal variable names for the webpack externals
 		const externalVarDeclarations = externalWebpackNames
-			.map(name => `var ${name} = {};`)
+			.map((name) => `var ${name} = {};`)
 			.join("\n");
 
 		// Define __esModule flag on all internal variables and helpers

package/lib/library/UmdLibraryPlugin.js

@@ -30,8 +30,8 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
  * @param {string[]} accessor the accessor to convert to path
  * @returns {string} the path
  */
-const accessorToObjectAccess = accessor =>
-	accessor.map(a => `[${JSON.stringify(a)}]`).join("");
+const accessorToObjectAccess = (accessor) =>
+	accessor.map((a) => `[${JSON.stringify(a)}]`).join("");
 
 /**
  * @param {string|undefined} base the path prefix
@@ -131,7 +131,7 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 		const modules = chunkGraph
 			.getChunkModules(chunk)
 			.filter(
-				m =>
+				(m) =>
 					m instanceof ExternalModule &&
 					(m.externalType === "umd" || m.externalType === "umd2")
 			);
@@ -157,7 +157,7 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 		 * @param {string} str the string to replace
 		 * @returns {string} the replaced keys
 		 */
-		const replaceKeys = str =>
+		const replaceKeys = (str) =>
 			compilation.getPath(str, {
 				chunk
 			});
@@ -166,10 +166,10 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 		 * @param {ExternalModule[]} modules external modules
 		 * @returns {string} result
 		 */
-		const externalsDepsArray = modules =>
+		const externalsDepsArray = (modules) =>
 			`[${replaceKeys(
 				modules
-					.map(m =>
+					.map((m) =>
 						JSON.stringify(
 							typeof m.request === "object"
 								? /** @type {RequestRecord} */
@@ -184,10 +184,10 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 		 * @param {ExternalModule[]} modules external modules
 		 * @returns {string} result
 		 */
-		const externalsRootArray = modules =>
+		const externalsRootArray = (modules) =>
 			replaceKeys(
 				modules
-					.map(m => {
+					.map((m) => {
 						let request = m.request;
 						if (typeof request === "object") {
 							request =
@@ -206,10 +206,10 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 		 * @param {string} type the type
 		 * @returns {string} external require array
 		 */
-		const externalsRequireArray = type =>
+		const externalsRequireArray = (type) =>
 			replaceKeys(
 				externals
-					.map(m => {
+					.map((m) => {
 						let expr;
 						let request = m.request;
 						if (typeof request === "object") {
@@ -239,10 +239,10 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 		 * @param {ExternalModule[]} modules external modules
 		 * @returns {string} arguments
 		 */
-		const externalsArguments = modules =>
+		const externalsArguments = (modules) =>
 			modules
 				.map(
-					m =>
+					(m) =>
 						`__WEBPACK_EXTERNAL_MODULE_${Template.toIdentifier(
 							`${chunkGraph.getModuleId(m)}`
 						)}__`
@@ -253,7 +253,7 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 		 * @param {string| string[]} library library name
 		 * @returns {string} stringified library name
 		 */
-		const libraryName = library =>
+		const libraryName = (library) =>
 			JSON.stringify(
 				replaceKeys(
 					/** @type {string} */
@@ -287,7 +287,7 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 		 * @param {keyof LibraryCustomUmdCommentObject} type type
 		 * @returns {string} comment
 		 */
-		const getAuxiliaryComment = type => {
+		const getAuxiliaryComment = (type) => {
 			if (auxiliaryComment) {
 				if (typeof auxiliaryComment === "string") {
 					return `\t//${auxiliaryComment}\n`;

package/lib/logging/createConsoleLogger.js

@@ -43,15 +43,15 @@ const { LogType } = require("./Logger");
  * @param {FilterItemTypes} item an input item
  * @returns {FilterFunction | undefined} filter function
  */
-const filterToFunction = item => {
+const filterToFunction = (item) => {
 	if (typeof item === "string") {
 		const regExp = new RegExp(
 			`[\\\\/]${item.replace(/[-[\]{}()*+?.\\^$|]/g, "\\$&")}([\\\\/]|$|!|\\?)`
 		);
-		return ident => regExp.test(ident);
+		return (ident) => regExp.test(ident);
 	}
 	if (item && typeof item === "object" && typeof item.test === "function") {
-		return ident => item.test(ident);
+		return (ident) => item.test(ident);
 	}
 	if (typeof item === "function") {
 		return item;
@@ -107,7 +107,7 @@ module.exports = ({ level = "info", debug = false, console }) => {
 			}
 			return [];
 		};
-		const debug = debugFilters.some(f => f(name));
+		const debug = debugFilters.some((f) => f(name));
 		switch (type) {
 			case LogType.debug:
 				if (!debug) return;

package/lib/logging/runtime.js

@@ -21,7 +21,7 @@ let currentDefaultLogger = createConsoleLogger(currentDefaultLoggerOptions);
  * @param {createConsoleLogger.LoggerOptions} options new options, merge with old options
  * @returns {void}
  */
-module.exports.configureDefaultLogger = options => {
+module.exports.configureDefaultLogger = (options) => {
 	Object.assign(currentDefaultLoggerOptions, options);
 	currentDefaultLogger = createConsoleLogger(currentDefaultLoggerOptions);
 };
@@ -30,14 +30,14 @@ module.exports.configureDefaultLogger = options => {
  * @param {string} name name of the logger
  * @returns {Logger} a logger
  */
-module.exports.getLogger = name =>
+module.exports.getLogger = (name) =>
 	new Logger(
 		(type, args) => {
 			if (module.exports.hooks.log.call(name, type, args) === undefined) {
 				currentDefaultLogger(name, type, args);
 			}
 		},
-		childName => module.exports.getLogger(`${name}/${childName}`)
+		(childName) => module.exports.getLogger(`${name}/${childName}`)
 	);
 
 module.exports.hooks = {

package/lib/logging/truncateArgs.js

@@ -9,7 +9,7 @@
  * @param {Array<number>} array array of numbers
  * @returns {number} sum of all numbers in array
  */
-const arraySum = array => {
+const arraySum = (array) => {
 	let sum = 0;
 	for (const item of array) sum += item;
 	return sum;
@@ -21,7 +21,7 @@ const arraySum = array => {
  * @returns {string[]} truncated args
  */
 const truncateArgs = (args, maxLength) => {
-	const lengths = args.map(a => `${a}`.length);
+	const lengths = args.map((a) => `${a}`.length);
 	const availableLength = maxLength - lengths.length + 1;
 
 	if (availableLength > 0 && args.length === 1) {
@@ -34,7 +34,7 @@ const truncateArgs = (args, maxLength) => {
 	}
 
 	// Check if there is space for at least 4 chars per arg
-	if (availableLength < arraySum(lengths.map(i => Math.min(i, 6)))) {
+	if (availableLength < arraySum(lengths.map((i) => Math.min(i, 6)))) {
 		// remove args
 		if (args.length > 1) return truncateArgs(args.slice(0, -1), maxLength);
 		return [];
@@ -48,7 +48,7 @@ const truncateArgs = (args, maxLength) => {
 	// Try to remove chars from the longest items until it fits
 	while (currentLength > availableLength) {
 		const maxLength = Math.max(...lengths);
-		const shorterItems = lengths.filter(l => l !== maxLength);
+		const shorterItems = lengths.filter((l) => l !== maxLength);
 		const nextToMaxLength =
 			shorterItems.length > 0 ? Math.max(...shorterItems) : 0;
 		const maxReduce = maxLength - nextToMaxLength;

package/lib/node/CommonJsChunkLoadingPlugin.js

@@ -42,13 +42,13 @@ class CommonJsChunkLoadingPlugin {
 			chunkLoading: chunkLoadingValue,
 			asyncChunkLoading: this._asyncChunkLoading
 		}).apply(compiler);
-		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			const globalChunkLoading = compilation.outputOptions.chunkLoading;
 			/**
 			 * @param {Chunk} chunk chunk
 			 * @returns {boolean} true, if wasm loading is enabled for the chunk
 			 */
-			const isEnabledForChunk = chunk => {
+			const isEnabledForChunk = (chunk) => {
 				const options = chunk.getEntryOptions();
 				const chunkLoading =
 					options && options.chunkLoading !== undefined

package/lib/node/NodeEnvironmentPlugin.js

@@ -57,7 +57,7 @@ class NodeEnvironmentPlugin {
 		compiler.outputFileSystem = fs;
 		compiler.intermediateFileSystem = fs;
 		compiler.watchFileSystem = new NodeWatchFileSystem(inputFileSystem);
-		compiler.hooks.beforeRun.tap(PLUGIN_NAME, compiler => {
+		compiler.hooks.beforeRun.tap(PLUGIN_NAME, (compiler) => {
 			if (
 				compiler.inputFileSystem === inputFileSystem &&
 				inputFileSystem.purge

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -21,6 +21,7 @@ const { getUndoPath } = require("../util/identifier");
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 
 class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
@@ -36,15 +37,16 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 	 * @private
 	 * @param {Chunk} chunk chunk
 	 * @param {string} rootOutputDir root output directory
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
 	 * @returns {string} generated code
 	 */
-	_generateBaseUri(chunk, rootOutputDir) {
+	_generateBaseUri(chunk, rootOutputDir, runtimeTemplate) {
 		const options = chunk.getEntryOptions();
 		if (options && options.baseUri) {
 			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
 		}
 
-		return `${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
+		return `${RuntimeGlobals.baseURI} = require(${runtimeTemplate.renderNodePrefixForCoreModule("url")}).pathToFileURL(${
 			rootOutputDir
 				? `__dirname + ${JSON.stringify(`/${rootOutputDir}`)}`
 				: "__filename"
@@ -99,7 +101,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 
 		return Template.asString([
 			withBaseURI
-				? this._generateBaseUri(chunk, rootOutputDir)
+				? this._generateBaseUri(chunk, rootOutputDir, runtimeTemplate)
 				: "// no baseURI",
 			"",
 			"// object to store loaded chunks",
@@ -108,7 +110,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
 			}{`,
 			Template.indent(
-				Array.from(initialChunkIds, id => `${JSON.stringify(id)}: 0`).join(
+				Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 0`).join(
 					",\n"
 				)
 			),
@@ -171,17 +173,17 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 												"var promise = new Promise(function(resolve, reject) {",
 												Template.indent([
 													"installedChunkData = installedChunks[chunkId] = [resolve, reject];",
-													`var filename = require('path').join(__dirname, ${JSON.stringify(
+													`var filename = require(${runtimeTemplate.renderNodePrefixForCoreModule("path")}).join(__dirname, ${JSON.stringify(
 														rootOutputDir
 													)} + ${
 														RuntimeGlobals.getChunkScriptFilename
 													}(chunkId));`,
-													"require('fs').readFile(filename, 'utf-8', function(err, content) {",
+													`require(${runtimeTemplate.renderNodePrefixForCoreModule("fs")}).readFile(filename, 'utf-8', function(err, content) {`,
 													Template.indent([
 														"if(err) return reject(err);",
 														"var chunk = {};",
-														"require('vm').runInThisContext('(function(exports, require, __dirname, __filename) {' + content + '\\n})', filename)" +
-															"(chunk, require, require('path').dirname(filename), filename);",
+														`require(${runtimeTemplate.renderNodePrefixForCoreModule("vm")}).runInThisContext('(function(exports, require, __dirname, __filename) {' + content + '\\n})', filename)` +
+															`(chunk, require, require(${runtimeTemplate.renderNodePrefixForCoreModule("path")}).dirname(filename), filename);`,
 														"installChunk(chunk);"
 													]),
 													"});"
@@ -215,15 +217,15 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 						Template.indent([
 							"return new Promise(function(resolve, reject) {",
 							Template.indent([
-								`var filename = require('path').join(__dirname, ${JSON.stringify(
+								`var filename = require(${runtimeTemplate.renderNodePrefixForCoreModule("path")}).join(__dirname, ${JSON.stringify(
 									rootOutputDir
 								)} + ${RuntimeGlobals.getChunkUpdateScriptFilename}(chunkId));`,
-								"require('fs').readFile(filename, 'utf-8', function(err, content) {",
+								`require(${runtimeTemplate.renderNodePrefixForCoreModule("fs")}).readFile(filename, 'utf-8', function(err, content) {`,
 								Template.indent([
 									"if(err) return reject(err);",
 									"var update = {};",
-									"require('vm').runInThisContext('(function(exports, require, __dirname, __filename) {' + content + '\\n})', filename)" +
-										"(update, require, require('path').dirname(filename), filename);",
+									`require(${runtimeTemplate.renderNodePrefixForCoreModule("vm")}).runInThisContext('(function(exports, require, __dirname, __filename) {' + content + '\\n})', filename)` +
+										`(update, require, require(${runtimeTemplate.renderNodePrefixForCoreModule("path")}).dirname(filename), filename);`,
 									"var updatedModules = update.modules;",
 									"var runtime = update.runtime;",
 									"for(var moduleId in updatedModules) {",
@@ -255,10 +257,10 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 						Template.indent([
 							"return new Promise(function(resolve, reject) {",
 							Template.indent([
-								`var filename = require('path').join(__dirname, ${JSON.stringify(
+								`var filename = require(${runtimeTemplate.renderNodePrefixForCoreModule("path")}).join(__dirname, ${JSON.stringify(
 									rootOutputDir
 								)} + ${RuntimeGlobals.getUpdateManifestFilename}());`,
-								"require('fs').readFile(filename, 'utf-8', function(err, content) {",
+								`require(${runtimeTemplate.renderNodePrefixForCoreModule("fs")}).readFile(filename, 'utf-8', function(err, content) {`,
 								Template.indent([
 									"if(err) {",
 									Template.indent([

package/lib/node/ReadFileCompileAsyncWasmPlugin.js

@@ -34,13 +34,13 @@ class ReadFileCompileAsyncWasmPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			const globalWasmLoading = compilation.outputOptions.wasmLoading;
 			/**
 			 * @param {Chunk} chunk chunk
 			 * @returns {boolean} true, if wasm loading is enabled for the chunk
 			 */
-			const isEnabledForChunk = chunk => {
+			const isEnabledForChunk = (chunk) => {
 				const options = chunk.getEntryOptions();
 				const wasmLoading =
 					options && options.wasmLoading !== undefined
@@ -53,7 +53,7 @@ class ReadFileCompileAsyncWasmPlugin {
 			 * @type {(path: string) => string} callback to generate code to load the wasm file
 			 */
 			const generateLoadBinaryCode = this._import
-				? path =>
+				? (path) =>
 						Template.asString([
 							"Promise.all([import('fs'), import('url')]).then(([{ readFile }, { URL }]) => new Promise((resolve, reject) => {",
 							Template.indent([
@@ -70,14 +70,14 @@ class ReadFileCompileAsyncWasmPlugin {
 							]),
 							"}))"
 						])
-				: path =>
+				: (path) =>
 						Template.asString([
 							"new Promise(function (resolve, reject) {",
 							Template.indent([
 								"try {",
 								Template.indent([
-									"var { readFile } = require('fs');",
-									"var { join } = require('path');",
+									`var { readFile } = require(${compilation.runtimeTemplate.renderNodePrefixForCoreModule("fs")});`,
+									`var { join } = require(${compilation.runtimeTemplate.renderNodePrefixForCoreModule("path")});`,
 									"",
 									`readFile(join(__dirname, ${path}), function(err, buffer){`,
 									Template.indent([
@@ -102,7 +102,7 @@ class ReadFileCompileAsyncWasmPlugin {
 					if (
 						!chunkGraph.hasModuleInGraph(
 							chunk,
-							m => m.type === WEBASSEMBLY_MODULE_TYPE_ASYNC
+							(m) => m.type === WEBASSEMBLY_MODULE_TYPE_ASYNC
 						)
 					) {
 						return;

package/lib/node/ReadFileCompileWasmPlugin.js

@@ -37,13 +37,13 @@ class ReadFileCompileWasmPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			const globalWasmLoading = compilation.outputOptions.wasmLoading;
 			/**
 			 * @param {Chunk} chunk chunk
 			 * @returns {boolean} true, when wasm loading is enabled for the chunk
 			 */
-			const isEnabledForChunk = chunk => {
+			const isEnabledForChunk = (chunk) => {
 				const options = chunk.getEntryOptions();
 				const wasmLoading =
 					options && options.wasmLoading !== undefined
@@ -56,7 +56,7 @@ class ReadFileCompileWasmPlugin {
 			 * @type {(path: string) => string} callback to generate code to load the wasm file
 			 */
 			const generateLoadBinaryCode = this.options.import
-				? path =>
+				? (path) =>
 						Template.asString([
 							"Promise.all([import('fs'), import('url')]).then(([{ readFile }, { URL }]) => new Promise((resolve, reject) => {",
 							Template.indent([
@@ -73,12 +73,12 @@ class ReadFileCompileWasmPlugin {
 							]),
 							"}))"
 						])
-				: path =>
+				: (path) =>
 						Template.asString([
 							"new Promise(function (resolve, reject) {",
 							Template.indent([
-								"var { readFile } = require('fs');",
-								"var { join } = require('path');",
+								`var { readFile } = require(${compilation.runtimeTemplate.renderNodePrefixForCoreModule("fs")});`,
+								`var { join } = require(${compilation.runtimeTemplate.renderNodePrefixForCoreModule("path")});`,
 								"",
 								"try {",
 								Template.indent([
@@ -105,7 +105,7 @@ class ReadFileCompileWasmPlugin {
 					if (
 						!chunkGraph.hasModuleInGraph(
 							chunk,
-							m => m.type === WEBASSEMBLY_MODULE_TYPE_SYNC
+							(m) => m.type === WEBASSEMBLY_MODULE_TYPE_SYNC
 						)
 					) {
 						return;

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -21,6 +21,7 @@ const { getUndoPath } = require("../util/identifier");
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 
 class RequireChunkLoadingRuntimeModule extends RuntimeModule {
@@ -36,15 +37,16 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 	 * @private
 	 * @param {Chunk} chunk chunk
 	 * @param {string} rootOutputDir root output directory
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
 	 * @returns {string} generated code
 	 */
-	_generateBaseUri(chunk, rootOutputDir) {
+	_generateBaseUri(chunk, rootOutputDir, runtimeTemplate) {
 		const options = chunk.getEntryOptions();
 		if (options && options.baseUri) {
 			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
 		}
 
-		return `${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
+		return `${RuntimeGlobals.baseURI} = require(${runtimeTemplate.renderNodePrefixForCoreModule("url")}).pathToFileURL(${
 			rootOutputDir !== "./"
 				? `__dirname + ${JSON.stringify(`/${rootOutputDir}`)}`
 				: "__filename"
@@ -99,7 +101,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 
 		return Template.asString([
 			withBaseURI
-				? this._generateBaseUri(chunk, rootOutputDir)
+				? this._generateBaseUri(chunk, rootOutputDir, runtimeTemplate)
 				: "// no baseURI",
 			"",
 			"// object to store loaded chunks",
@@ -108,7 +110,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
 			}{`,
 			Template.indent(
-				Array.from(initialChunkIds, id => `${JSON.stringify(id)}: 1`).join(
+				Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 1`).join(
 					",\n"
 				)
 			),
@@ -156,11 +158,16 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 												? "if(true) { // all chunks have JS"
 												: `if(${hasJsMatcher("chunkId")}) {`,
 											Template.indent([
-												`installChunk(require(${JSON.stringify(
+												// The require function loads and runs a chunk. When the chunk is being run,
+												// it can call __webpack_require__.C to directly complete installed.
+												`var installedChunk = require(${JSON.stringify(
 													rootOutputDir
 												)} + ${
 													RuntimeGlobals.getChunkScriptFilename
-												}(chunkId)));`
+												}(chunkId));`,
+												"if (!installedChunks[chunkId]) {",
+												Template.indent(["installChunk(installedChunk);"]),
+												"}"
 											]),
 											"} else installedChunks[chunkId] = 1;",
 											""

package/lib/node/nodeConsole.js

@@ -130,8 +130,8 @@ module.exports = ({ colors, appendOnly, stream }) => {
 				currentIndent = currentIndent.slice(0, -2);
 			}
 		},
-		profile: console.profile && (name => console.profile(name)),
-		profileEnd: console.profileEnd && (name => console.profileEnd(name)),
+		profile: console.profile && ((name) => console.profile(name)),
+		profileEnd: console.profileEnd && ((name) => console.profileEnd(name)),
 		clear:
 			/** @type {() => void} */
 			(