webpack 5.59.0 → 5.94.0

package/lib/SelfModuleFactory.js

@@ -5,11 +5,23 @@
 
 "use strict";
 
+/** @typedef {import("./ModuleFactory").ModuleFactoryCreateData} ModuleFactoryCreateData */
+/** @typedef {import("./ModuleFactory").ModuleFactoryResult} ModuleFactoryResult */
+/** @typedef {import("./ModuleGraph")} ModuleGraph */
+
 class SelfModuleFactory {
+	/**
+	 * @param {ModuleGraph} moduleGraph module graph
+	 */
 	constructor(moduleGraph) {
 		this.moduleGraph = moduleGraph;
 	}
 
+	/**
+	 * @param {ModuleFactoryCreateData} data data object
+	 * @param {function((Error | null)=, ModuleFactoryResult=): void} callback callback
+	 * @returns {void}
+	 */
 	create(data, callback) {
 		const module = this.moduleGraph.getParentModule(data.dependencies[0]);
 		callback(null, {

package/lib/SizeFormatHelpers.js

@@ -9,7 +9,7 @@
  * @param {number} size the size in bytes
  * @returns {string} the formatted size
  */
-exports.formatSize = size => {
+module.exports.formatSize = size => {
 	if (typeof size !== "number" || Number.isNaN(size) === true) {
 		return "unknown size";
 	}
@@ -21,7 +21,5 @@ exports.formatSize = size => {
 	const abbreviations = ["bytes", "KiB", "MiB", "GiB"];
 	const index = Math.floor(Math.log(size) / Math.log(1024));
 
-	return `${+(size / Math.pow(1024, index)).toPrecision(3)} ${
-		abbreviations[index]
-	}`;
+	return `${Number((size / 1024 ** index).toPrecision(3))} ${abbreviations[index]}`;
 };

package/lib/SourceMapDevToolModuleOptionsPlugin.js

@@ -7,9 +7,13 @@
 
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 
+/** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
 /** @typedef {import("./Compilation")} Compilation */
 
 class SourceMapDevToolModuleOptionsPlugin {
+	/**
+	 * @param {SourceMapDevToolPluginOptions} options options
+	 */
 	constructor(options) {
 		this.options = options;
 	}

package/lib/SourceMapDevToolPlugin.js

@@ -22,11 +22,15 @@ const { makePathsAbsolute } = require("./util/identifier");
 /** @typedef {import("./Cache").Etag} Etag */
 /** @typedef {import("./CacheFacade").ItemCacheFacade} ItemCacheFacade */
 /** @typedef {import("./Chunk")} Chunk */
+/** @typedef {import("./Compilation").Asset} Asset */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./NormalModule").SourceMap} SourceMap */
+/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
 /** @typedef {import("./util/Hash")} Hash */
+/** @typedef {import("./util/createHash").Algorithm} Algorithm */
+/** @typedef {import("./util/fs").OutputFileSystem} OutputFileSystem */
 
 const validate = createSchemaValidation(
 	require("../schemas/plugins/SourceMapDevToolPlugin.check.js"),
@@ -47,14 +51,30 @@ const validate = createSchemaValidation(
  * @property {ItemCacheFacade} cacheItem cache item
  */
 
+const METACHARACTERS_REGEXP = /[-[\]\\/{}()*+?.^$|]/g;
+const CONTENT_HASH_DETECT_REGEXP = /\[contenthash(:\w+)?\]/;
+const CSS_AND_JS_MODULE_EXTENSIONS_REGEXP = /\.((c|m)?js|css)($|\?)/i;
+const CSS_EXTENSION_DETECT_REGEXP = /\.css($|\?)/i;
+const MAP_URL_COMMENT_REGEXP = /\[map\]/g;
+const URL_COMMENT_REGEXP = /\[url\]/g;
+const URL_FORMATTING_REGEXP = /^\n\/\/(.*)$/;
+
+/**
+ * Reset's .lastIndex of stateful Regular Expressions
+ * For when `test` or `exec` is called on them
+ * @param {RegExp} regexp Stateful Regular Expression to be reset
+ * @returns {void}
+ */
+const resetRegexpState = regexp => {
+	regexp.lastIndex = -1;
+};
+
 /**
  * Escapes regular expression metacharacters
  * @param {string} str String to quote
  * @returns {string} Escaped string
  */
-const quoteMeta = str => {
-	return str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
-};
+const quoteMeta = str => str.replace(METACHARACTERS_REGEXP, "\\$&");
 
 /**
  * Creating {@link SourceMapTask} for given file
@@ -89,7 +109,7 @@ const getTaskForFile = (
 		source = asset.source();
 	}
 	if (!sourceMap || typeof source !== "string") return;
-	const context = compilation.options.context;
+	const context = /** @type {string} */ (compilation.options.context);
 	const root = compilation.compiler.root;
 	const cachedAbsolutify = makePathsAbsolute.bindContextCache(context, root);
 	const modules = sourceMap.sources.map(source => {
@@ -118,13 +138,13 @@ class SourceMapDevToolPlugin {
 	constructor(options = {}) {
 		validate(options);
 
-		/** @type {string | false} */
-		this.sourceMapFilename = options.filename;
-		/** @type {string | false} */
+		this.sourceMapFilename = /** @type {string | false} */ (options.filename);
+		/** @type {false | TemplatePath}} */
 		this.sourceMappingURLComment =
 			options.append === false
 				? false
-				: options.append || "\n//# source" + "MappingURL=[url]";
+				: // eslint-disable-next-line no-useless-concat
+					options.append || "\n//# source" + "MappingURL=[url]";
 		/** @type {string | Function} */
 		this.moduleFilenameTemplate =
 			options.moduleFilenameTemplate || "webpack://[namespace]/[resourcePath]";
@@ -144,7 +164,9 @@ class SourceMapDevToolPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const outputFs = compiler.outputFileSystem;
+		const outputFs = /** @type {OutputFileSystem} */ (
+			compiler.outputFileSystem
+		);
 		const sourceMapFilename = this.sourceMapFilename;
 		const sourceMappingURLComment = this.sourceMappingURLComment;
 		const moduleFilenameTemplate = this.moduleFilenameTemplate;
@@ -152,7 +174,7 @@ class SourceMapDevToolPlugin {
 		const fallbackModuleFilenameTemplate = this.fallbackModuleFilenameTemplate;
 		const requestShortener = compiler.requestShortener;
 		const options = this.options;
-		options.test = options.test || /\.((c|m)?js|css)($|\?)/i;
+		options.test = options.test || CSS_AND_JS_MODULE_EXTENSIONS_REGEXP;
 
 		const matchObject = ModuleFilenameHelpers.matchObject.bind(
 			undefined,
@@ -199,7 +221,7 @@ class SourceMapDevToolPlugin {
 						}
 					}
 
-					reportProgress(0.0);
+					reportProgress(0);
 					/** @type {SourceMapTask[]} */
 					const tasks = [];
 					let fileIndex = 0;
@@ -207,7 +229,9 @@ class SourceMapDevToolPlugin {
 					asyncLib.each(
 						files,
 						(file, callback) => {
-							const asset = compilation.getAsset(file);
+							const asset =
+								/** @type {Readonly<Asset>} */
+								(compilation.getAsset(file));
 							if (asset.info.related && asset.info.related.sourceMap) {
 								fileIndex++;
 								return callback();
@@ -286,14 +310,23 @@ class SourceMapDevToolPlugin {
 
 									for (let idx = 0; idx < modules.length; idx++) {
 										const module = modules[idx];
+
+										if (
+											typeof module === "string" &&
+											/^(data|https?):/.test(module)
+										) {
+											moduleToSourceNameMapping.set(module, module);
+											continue;
+										}
+
 										if (!moduleToSourceNameMapping.get(module)) {
 											moduleToSourceNameMapping.set(
 												module,
 												ModuleFilenameHelpers.createFilename(
 													module,
 													{
-														moduleFilenameTemplate: moduleFilenameTemplate,
-														namespace: namespace
+														moduleFilenameTemplate,
+														namespace
 													},
 													{
 														requestShortener,
@@ -343,7 +376,9 @@ class SourceMapDevToolPlugin {
 							// find modules with conflicting source names
 							for (let idx = 0; idx < allModules.length; idx++) {
 								const module = allModules[idx];
-								let sourceName = moduleToSourceNameMapping.get(module);
+								let sourceName =
+									/** @type {string} */
+									(moduleToSourceNameMapping.get(module));
 								let hasName = conflictDetectionSet.has(sourceName);
 								if (!hasName) {
 									conflictDetectionSet.add(sourceName);
@@ -355,7 +390,7 @@ class SourceMapDevToolPlugin {
 									module,
 									{
 										moduleFilenameTemplate: fallbackModuleFilenameTemplate,
-										namespace: namespace
+										namespace
 									},
 									{
 										requestShortener,
@@ -401,7 +436,7 @@ class SourceMapDevToolPlugin {
 									const moduleFilenames = modules.map(m =>
 										moduleToSourceNameMapping.get(m)
 									);
-									sourceMap.sources = moduleFilenames;
+									sourceMap.sources = /** @type {string[]} */ (moduleFilenames);
 									if (options.noSources) {
 										sourceMap.sourcesContent = undefined;
 									}
@@ -409,44 +444,51 @@ class SourceMapDevToolPlugin {
 									sourceMap.file = file;
 									const usesContentHash =
 										sourceMapFilename &&
-										/\[contenthash(:\w+)?\]/.test(sourceMapFilename);
+										CONTENT_HASH_DETECT_REGEXP.test(sourceMapFilename);
+
+									resetRegexpState(CONTENT_HASH_DETECT_REGEXP);
 
 									// If SourceMap and asset uses contenthash, avoid a circular dependency by hiding hash in `file`
 									if (usesContentHash && task.assetInfo.contenthash) {
 										const contenthash = task.assetInfo.contenthash;
-										let pattern;
-										if (Array.isArray(contenthash)) {
-											pattern = contenthash.map(quoteMeta).join("|");
-										} else {
-											pattern = quoteMeta(contenthash);
-										}
+										const pattern = Array.isArray(contenthash)
+											? contenthash.map(quoteMeta).join("|")
+											: quoteMeta(contenthash);
 										sourceMap.file = sourceMap.file.replace(
 											new RegExp(pattern, "g"),
 											m => "x".repeat(m.length)
 										);
 									}
 
-									/** @type {string | false} */
+									/** @type {false | TemplatePath} */
 									let currentSourceMappingURLComment = sourceMappingURLComment;
+									const cssExtensionDetected =
+										CSS_EXTENSION_DETECT_REGEXP.test(file);
+									resetRegexpState(CSS_EXTENSION_DETECT_REGEXP);
 									if (
 										currentSourceMappingURLComment !== false &&
-										/\.css($|\?)/i.test(file)
+										typeof currentSourceMappingURLComment !== "function" &&
+										cssExtensionDetected
 									) {
 										currentSourceMappingURLComment =
 											currentSourceMappingURLComment.replace(
-												/^\n\/\/(.*)$/,
+												URL_FORMATTING_REGEXP,
 												"\n/*$1*/"
 											);
 									}
 									const sourceMapString = JSON.stringify(sourceMap);
 									if (sourceMapFilename) {
-										let filename = file;
+										const filename = file;
 										const sourceMapContentHash =
-											usesContentHash &&
-											/** @type {string} */ (
-												createHash(compilation.outputOptions.hashFunction)
-													.update(sourceMapString)
-													.digest("hex")
+											/** @type {string} */
+											(
+												usesContentHash &&
+													createHash(
+														/** @type {Algorithm} */
+														(compilation.outputOptions.hashFunction)
+													)
+														.update(sourceMapString)
+														.digest("hex")
 											);
 										const pathParams = {
 											chunk,
@@ -455,7 +497,7 @@ class SourceMapDevToolPlugin {
 														outputFs,
 														`/${options.fileContext}`,
 														`/${filename}`
-												  )
+													)
 												: filename,
 											contentHash: sourceMapContentHash
 										};
@@ -470,17 +512,17 @@ class SourceMapDevToolPlugin {
 													outputFs,
 													dirname(outputFs, `/${file}`),
 													`/${sourceMapFile}`
-											  );
+												);
 										/** @type {Source} */
 										let asset = new RawSource(source);
 										if (currentSourceMappingURLComment !== false) {
 											// Add source map url to compilation asset, if currentSourceMappingURLComment is set
 											asset = new ConcatSource(
 												asset,
-												compilation.getPath(
-													currentSourceMappingURLComment,
-													Object.assign({ url: sourceMapUrl }, pathParams)
-												)
+												compilation.getPath(currentSourceMappingURLComment, {
+													url: sourceMapUrl,
+													...pathParams
+												})
 											);
 										}
 										const assetInfo = {
@@ -510,15 +552,20 @@ class SourceMapDevToolPlugin {
 												"SourceMapDevToolPlugin: append can't be false when no filename is provided"
 											);
 										}
+										if (typeof currentSourceMappingURLComment === "function") {
+											throw new Error(
+												"SourceMapDevToolPlugin: append can't be a function when no filename is provided"
+											);
+										}
 										/**
 										 * Add source map as data url to asset
 										 */
 										const asset = new ConcatSource(
 											new RawSource(source),
 											currentSourceMappingURLComment
-												.replace(/\[map\]/g, () => sourceMapString)
+												.replace(MAP_URL_COMMENT_REGEXP, () => sourceMapString)
 												.replace(
-													/\[url\]/g,
+													URL_COMMENT_REGEXP,
 													() =>
 														`data:application/json;charset=utf-8;base64,${Buffer.from(
 															sourceMapString,
@@ -545,7 +592,7 @@ class SourceMapDevToolPlugin {
 									});
 								},
 								err => {
-									reportProgress(1.0);
+									reportProgress(1);
 									callback(err);
 								}
 							);

package/lib/Stats.js

@@ -7,6 +7,7 @@
 
 /** @typedef {import("../declarations/WebpackOptions").StatsOptions} StatsOptions */
 /** @typedef {import("./Compilation")} Compilation */
+/** @typedef {import("./Compilation").NormalizedStatsOptions} NormalizedStatsOptions */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
 
 class Stats {
@@ -34,7 +35,7 @@ class Stats {
 	 */
 	hasWarnings() {
 		return (
-			this.compilation.warnings.length > 0 ||
+			this.compilation.getWarnings().length > 0 ||
 			this.compilation.children.some(child => child.getStats().hasWarnings())
 		);
 	}
@@ -50,28 +51,32 @@ class Stats {
 	}
 
 	/**
-	 * @param {(string|StatsOptions)=} options stats options
+	 * @param {(string | boolean | StatsOptions)=} options stats options
 	 * @returns {StatsCompilation} json output
 	 */
 	toJson(options) {
-		options = this.compilation.createStatsOptions(options, {
+		const normalizedOptions = this.compilation.createStatsOptions(options, {
 			forToString: false
 		});
 
-		const statsFactory = this.compilation.createStatsFactory(options);
+		const statsFactory = this.compilation.createStatsFactory(normalizedOptions);
 
 		return statsFactory.create("compilation", this.compilation, {
 			compilation: this.compilation
 		});
 	}
 
+	/**
+	 * @param {(string | boolean | StatsOptions)=} options stats options
+	 * @returns {string} string output
+	 */
 	toString(options) {
-		options = this.compilation.createStatsOptions(options, {
+		const normalizedOptions = this.compilation.createStatsOptions(options, {
 			forToString: true
 		});
 
-		const statsFactory = this.compilation.createStatsFactory(options);
-		const statsPrinter = this.compilation.createStatsPrinter(options);
+		const statsFactory = this.compilation.createStatsFactory(normalizedOptions);
+		const statsPrinter = this.compilation.createStatsPrinter(normalizedOptions);
 
 		const data = statsFactory.create("compilation", this.compilation, {
 			compilation: this.compilation

package/lib/Template.js

@@ -6,11 +6,14 @@
 "use strict";
 
 const { ConcatSource, PrefixSource } = require("webpack-sources");
+const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").Output} OutputOptions */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
+/** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./Compilation").PathData} PathData */
@@ -20,6 +23,7 @@ const { ConcatSource, PrefixSource } = require("webpack-sources");
 /** @typedef {import("./ModuleTemplate")} ModuleTemplate */
 /** @typedef {import("./RuntimeModule")} RuntimeModule */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
 /** @typedef {import("./javascript/JavascriptModulesPlugin").ChunkRenderContext} ChunkRenderContext */
 /** @typedef {import("./javascript/JavascriptModulesPlugin").RenderContext} RenderContext */
 
@@ -39,7 +43,7 @@ const PATH_NAME_NORMALIZE_REPLACE_REGEX = /[^a-zA-Z0-9_!§$()=\-^°]+/g;
 const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
 /**
- * @typedef {Object} RenderManifestOptions
+ * @typedef {object} RenderManifestOptions
  * @property {Chunk} chunk the chunk used to render
  * @property {string} hash
  * @property {string} fullHash
@@ -55,9 +59,9 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 /** @typedef {RenderManifestEntryTemplated | RenderManifestEntryStatic} RenderManifestEntry */
 
 /**
- * @typedef {Object} RenderManifestEntryTemplated
+ * @typedef {object} RenderManifestEntryTemplated
  * @property {function(): Source} render
- * @property {string | function(PathData, AssetInfo=): string} filenameTemplate
+ * @property {TemplatePath} filenameTemplate
  * @property {PathData=} pathOptions
  * @property {AssetInfo=} info
  * @property {string} identifier
@@ -66,7 +70,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  */
 
 /**
- * @typedef {Object} RenderManifestEntryStatic
+ * @typedef {object} RenderManifestEntryStatic
  * @property {function(): Source} render
  * @property {string} filename
  * @property {AssetInfo} info
@@ -76,7 +80,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  */
 
 /**
- * @typedef {Object} HasId
+ * @typedef {object} HasId
  * @property {number | string} id
  */
 
@@ -86,7 +90,6 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
 class Template {
 	/**
-	 *
 	 * @param {Function} fn a runtime function (.runtime.js) "template"
 	 * @returns {string} the updated and normalized function string
 	 */
@@ -108,8 +111,8 @@ class Template {
 			.replace(IDENTIFIER_NAME_REPLACE_REGEX, "_$1")
 			.replace(IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX, "_");
 	}
+
 	/**
-	 *
 	 * @param {string} str string to be converted to commented in bundle code
 	 * @returns {string} returns a commented version of string
 	 */
@@ -119,7 +122,6 @@ class Template {
 	}
 
 	/**
-	 *
 	 * @param {string} str string to be converted to "normal comment"
 	 * @returns {string} returns a commented version of string
 	 */
@@ -209,23 +211,20 @@ class Template {
 	}
 
 	/**
-	 *
 	 * @param {string | string[]} s string to convert to identity
 	 * @returns {string} converted identity
 	 */
 	static indent(s) {
 		if (Array.isArray(s)) {
 			return s.map(Template.indent).join("\n");
-		} else {
-			const str = s.trimRight();
-			if (!str) return "";
-			const ind = str[0] === "\n" ? "" : "\t";
-			return ind + str.replace(/\n([^\n])/g, "\n\t$1");
 		}
+		const str = s.trimEnd();
+		if (!str) return "";
+		const ind = str[0] === "\n" ? "" : "\t";
+		return ind + str.replace(/\n([^\n])/g, "\n\t$1");
 	}
 
 	/**
-	 *
 	 * @param {string|string[]} s string to create prefix for
 	 * @param {string} prefix prefix to compose
 	 * @returns {string} returns new prefix string
@@ -234,11 +233,10 @@ class Template {
 		const str = Template.asString(s).trim();
 		if (!str) return "";
 		const ind = str[0] === "\n" ? "" : prefix;
-		return ind + str.replace(/\n([^\n])/g, "\n" + prefix + "$1");
+		return ind + str.replace(/\n([^\n])/g, `\n${prefix}$1`);
 	}
 
 	/**
-	 *
 	 * @param {string|string[]} str string or string collection
 	 * @returns {string} returns a single string from array
 	 */
@@ -250,7 +248,7 @@ class Template {
 	}
 
 	/**
-	 * @typedef {Object} WithId
+	 * @typedef {object} WithId
 	 * @property {string|number} id
 	 */
 
@@ -268,7 +266,7 @@ class Template {
 			if (maxId < moduleId) maxId = moduleId;
 			if (minId > moduleId) minId = moduleId;
 		}
-		if (minId < 16 + ("" + minId).length) {
+		if (minId < 16 + String(minId).length) {
 			// add minId x ',' instead of 'Array(minId).concat(…)'
 			minId = 0;
 		}
@@ -286,23 +284,21 @@ class Template {
 	/**
 	 * @param {ChunkRenderContext} renderContext render context
 	 * @param {Module[]} modules modules to render (should be ordered by identifier)
-	 * @param {function(Module): Source} renderModule function to render a module
+	 * @param {function(Module): Source | null} renderModule function to render a module
 	 * @param {string=} prefix applying prefix strings
-	 * @returns {Source} rendered chunk modules in a Source object
+	 * @returns {Source | null} rendered chunk modules in a Source object or null if no modules
 	 */
 	static renderChunkModules(renderContext, modules, renderModule, prefix = "") {
 		const { chunkGraph } = renderContext;
-		var source = new ConcatSource();
+		const source = new ConcatSource();
 		if (modules.length === 0) {
 			return null;
 		}
 		/** @type {{id: string|number, source: Source|string}[]} */
-		const allModules = modules.map(module => {
-			return {
-				id: chunkGraph.getModuleId(module),
-				source: renderModule(module) || "false"
-			};
-		});
+		const allModules = modules.map(module => ({
+			id: /** @type {ModuleId} */ (chunkGraph.getModuleId(module)),
+			source: renderModule(module) || "false"
+		}));
 		const bounds = Template.getModulesArrayBounds(allModules);
 		if (bounds) {
 			// Render a spare array
@@ -328,7 +324,7 @@ class Template {
 					source.add(module.source);
 				}
 			}
-			source.add("\n" + prefix + "]");
+			source.add(`\n${prefix}]`);
 			if (minId !== 0) {
 				source.add(")");
 			}
@@ -362,7 +358,7 @@ class Template {
 				runtimeSource = codeGenerationResults.getSource(
 					module,
 					renderContext.chunk.runtime,
-					"runtime"
+					WEBPACK_MODULE_TYPE_RUNTIME
 				);
 			} else {
 				const codeGenResult = module.codeGeneration({
@@ -370,13 +366,14 @@ class Template {
 					dependencyTemplates: renderContext.dependencyTemplates,
 					moduleGraph: renderContext.moduleGraph,
 					runtimeTemplate: renderContext.runtimeTemplate,
-					runtime: renderContext.chunk.runtime
+					runtime: renderContext.chunk.runtime,
+					codeGenerationResults
 				});
 				if (!codeGenResult) continue;
 				runtimeSource = codeGenResult.sources.get("runtime");
 			}
 			if (runtimeSource) {
-				source.add(Template.toNormalComment(module.identifier()) + "\n");
+				source.add(`${Template.toNormalComment(module.identifier())}\n`);
 				if (!module.shouldIsolate()) {
 					source.add(runtimeSource);
 					source.add("\n\n");
@@ -403,7 +400,7 @@ class Template {
 		return new PrefixSource(
 			"/******/ ",
 			new ConcatSource(
-				"function(__webpack_require__) { // webpackRuntimeModules\n",
+				`function(${RuntimeGlobals.require}) { // webpackRuntimeModules\n`,
 				this.renderRuntimeModules(runtimeModules, renderContext),
 				"}\n"
 			)