webpack 5.68.0 → 5.69.1

package/lib/ChunkGraph.js

@@ -46,6 +46,7 @@ const compareModuleIterables = compareIterables(compareModulesByIdentifier);
 
 /** @typedef {(c: Chunk, chunkGraph: ChunkGraph) => boolean} ChunkFilterPredicate */
 /** @typedef {(m: Module) => boolean} ModuleFilterPredicate */
+/** @typedef {[Module, Entrypoint | undefined]} EntryModuleWithChunkGroup */
 
 /**
  * @typedef {Object} ChunkSizeOptions
@@ -1180,8 +1181,6 @@ class ChunkGraph {
 		return cgc.dependentHashModules;
 	}
 
-	/** @typedef {[Module, Entrypoint | undefined]} EntryModuleWithChunkGroup */
-
 	/**
 	 * @param {Chunk} chunk the chunk
 	 * @returns {Iterable<EntryModuleWithChunkGroup>} iterable of modules (do not modify)

package/lib/Compilation.js

@@ -182,6 +182,7 @@ const { isSourceEqual } = require("./util/source");
 
 /**
  * @typedef {Object} ChunkHashContext
+ * @property {CodeGenerationResults} codeGenerationResults results of code generation
  * @property {RuntimeTemplate} runtimeTemplate the runtime template
  * @property {ModuleGraph} moduleGraph the module graph
  * @property {ChunkGraph} chunkGraph the chunk graph
@@ -4137,6 +4138,7 @@ This prevents using hashes of each other and should be avoided.`);
 				chunk.updateHash(chunkHash, chunkGraph);
 				this.hooks.chunkHash.call(chunk, chunkHash, {
 					chunkGraph,
+					codeGenerationResults: this.codeGenerationResults,
 					moduleGraph: this.moduleGraph,
 					runtimeTemplate: this.runtimeTemplate
 				});

package/lib/ExportsInfo.js

@@ -291,15 +291,15 @@ class ExportsInfo {
 			}
 		}
 		for (const exportInfo of this._exports.values()) {
+			if (!canMangle && exportInfo.canMangleProvide !== false) {
+				exportInfo.canMangleProvide = false;
+				changed = true;
+			}
 			if (excludeExports && excludeExports.has(exportInfo.name)) continue;
 			if (exportInfo.provided !== true && exportInfo.provided !== null) {
 				exportInfo.provided = null;
 				changed = true;
 			}
-			if (!canMangle && exportInfo.canMangleProvide !== false) {
-				exportInfo.canMangleProvide = false;
-				changed = true;
-			}
 			if (targetKey) {
 				exportInfo.setTarget(targetKey, targetModule, [exportInfo.name], -1);
 			}

package/lib/NormalModuleFactory.js

@@ -28,7 +28,10 @@ const LazySet = require("./util/LazySet");
 const { getScheme } = require("./util/URLAbsoluteSpecifier");
 const { cachedCleverMerge, cachedSetProperty } = require("./util/cleverMerge");
 const { join } = require("./util/fs");
-const { parseResource } = require("./util/identifier");
+const {
+	parseResource,
+	parseResourceWithoutFragment
+} = require("./util/identifier");
 
 /** @typedef {import("../declarations/WebpackOptions").ModuleOptionsNormalized} ModuleOptions */
 /** @typedef {import("./Generator")} Generator */
@@ -66,6 +69,11 @@ const { parseResource } = require("./util/identifier");
 
 /** @typedef {ResourceData & { data: Record<string, any> }} ResourceDataWithData */
 
+/** @typedef {Object} ParsedLoaderRequest
+ * @property {string} loader loader
+ * @property {string|undefined} options options
+ */
+
 const EMPTY_RESOLVE_OPTIONS = {};
 const EMPTY_PARSER_OPTIONS = {};
 const EMPTY_GENERATOR_OPTIONS = {};
@@ -97,27 +105,6 @@ const stringifyLoadersAndResource = (loaders, resource) => {
 	return str + resource;
 };
 
-/**
- * @param {string} resultString resultString
- * @returns {{loader: string, options: string|undefined}} parsed loader request
- */
-const identToLoaderRequest = resultString => {
-	const idx = resultString.indexOf("?");
-	if (idx >= 0) {
-		const loader = resultString.substr(0, idx);
-		const options = resultString.substr(idx + 1);
-		return {
-			loader,
-			options
-		};
-	} else {
-		return {
-			loader: resultString,
-			options: undefined
-		};
-	}
-};
-
 const needCalls = (times, callback) => {
 	return err => {
 		if (--times === 0) {
@@ -264,6 +251,9 @@ class NormalModuleFactory extends ModuleFactory {
 		const cacheParseResource = parseResource.bindCache(
 			associatedObjectForCache
 		);
+		const cachedParseResourceWithoutFragment =
+			parseResourceWithoutFragment.bindCache(associatedObjectForCache);
+		this._parseResourceWithoutFragment = cachedParseResourceWithoutFragment;
 
 		this.hooks.factorize.tapAsync(
 			{
@@ -351,7 +341,7 @@ class NormalModuleFactory extends ModuleFactory {
 				let matchResourceData = undefined;
 				/** @type {string} */
 				let unresolvedResource;
-				/** @type {{loader: string, options: string|undefined}[]} */
+				/** @type {ParsedLoaderRequest[]} */
 				let elements;
 				let noPreAutoLoaders = false;
 				let noAutoLoaders = false;
@@ -405,7 +395,13 @@ class NormalModuleFactory extends ModuleFactory {
 							)
 							.split(/!+/);
 						unresolvedResource = rawElements.pop();
-						elements = rawElements.map(identToLoaderRequest);
+						elements = rawElements.map(el => {
+							const { path, query } = cachedParseResourceWithoutFragment(el);
+							return {
+								loader: path,
+								options: query ? query.slice(1) : undefined
+							};
+						});
 						scheme = getScheme(unresolvedResource);
 					} else {
 						unresolvedResource = requestWithoutMatchResource;
@@ -1017,12 +1013,14 @@ If changing the source code is not an option there is also a resolve options cal
 						}
 						if (err) return callback(err);
 
-						const parsedResult = identToLoaderRequest(result);
+						const parsedResult = this._parseResourceWithoutFragment(result);
 						const resolved = {
-							loader: parsedResult.loader,
+							loader: parsedResult.path,
 							options:
 								item.options === undefined
-									? parsedResult.options
+									? parsedResult.query
+										? parsedResult.query.slice(1)
+										: undefined
 									: item.options,
 							ident: item.options === undefined ? undefined : item.ident
 						};

package/lib/ProgressPlugin.js

@@ -96,7 +96,7 @@ const createDefaultHandler = (profile, logger) => {
 /**
  * @callback ReportProgress
  * @param {number} p
- * @param {...string[]} [args]
+ * @param {...string} [args]
  * @returns {void}
  */
 

package/lib/TemplatedPathPlugin.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const mime = require("mime-types");
 const { basename, extname } = require("path");
 const util = require("util");
 const Chunk = require("./Chunk");
@@ -117,29 +118,53 @@ const replacePathVariables = (path, data, assetInfo) => {
 	// [name] - file
 	// [ext] - .js
 	if (typeof data.filename === "string") {
-		const { path: file, query, fragment } = parseResource(data.filename);
-
-		const ext = extname(file);
-		const base = basename(file);
-		const name = base.slice(0, base.length - ext.length);
-		const path = file.slice(0, file.length - base.length);
-
-		replacements.set("file", replacer(file));
-		replacements.set("query", replacer(query, true));
-		replacements.set("fragment", replacer(fragment, true));
-		replacements.set("path", replacer(path, true));
-		replacements.set("base", replacer(base));
-		replacements.set("name", replacer(name));
-		replacements.set("ext", replacer(ext, true));
-		// Legacy
-		replacements.set(
-			"filebase",
-			deprecated(
-				replacer(base),
-				"[filebase] is now [base]",
-				"DEP_WEBPACK_TEMPLATE_PATH_PLUGIN_REPLACE_PATH_VARIABLES_FILENAME"
-			)
-		);
+		// check that filename is data uri
+		let match = data.filename.match(/^data:([^;,]+)/);
+		if (match) {
+			const ext = mime.extension(match[1]);
+			const emptyReplacer = replacer("", true);
+
+			replacements.set("file", emptyReplacer);
+			replacements.set("query", emptyReplacer);
+			replacements.set("fragment", emptyReplacer);
+			replacements.set("path", emptyReplacer);
+			replacements.set("base", emptyReplacer);
+			replacements.set("name", emptyReplacer);
+			replacements.set("ext", replacer(ext ? `.${ext}` : "", true));
+			// Legacy
+			replacements.set(
+				"filebase",
+				deprecated(
+					emptyReplacer,
+					"[filebase] is now [base]",
+					"DEP_WEBPACK_TEMPLATE_PATH_PLUGIN_REPLACE_PATH_VARIABLES_FILENAME"
+				)
+			);
+		} else {
+			const { path: file, query, fragment } = parseResource(data.filename);
+
+			const ext = extname(file);
+			const base = basename(file);
+			const name = base.slice(0, base.length - ext.length);
+			const path = file.slice(0, file.length - base.length);
+
+			replacements.set("file", replacer(file));
+			replacements.set("query", replacer(query, true));
+			replacements.set("fragment", replacer(fragment, true));
+			replacements.set("path", replacer(path, true));
+			replacements.set("base", replacer(base));
+			replacements.set("name", replacer(name));
+			replacements.set("ext", replacer(ext, true));
+			// Legacy
+			replacements.set(
+				"filebase",
+				deprecated(
+					replacer(base),
+					"[filebase] is now [base]",
+					"DEP_WEBPACK_TEMPLATE_PATH_PLUGIN_REPLACE_PATH_VARIABLES_FILENAME"
+				)
+			);
+		}
 	}
 
 	// Compilation context

package/lib/asset/AssetGenerator.js

@@ -12,6 +12,7 @@ const Generator = require("../Generator");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const createHash = require("../util/createHash");
 const { makePathsRelative } = require("../util/identifier");
+const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../../declarations/WebpackOptions").AssetGeneratorOptions} AssetGeneratorOptions */
@@ -232,8 +233,8 @@ class AssetGenerator extends Generator {
 					const fullHash = /** @type {string} */ (
 						hash.digest(runtimeTemplate.outputOptions.hashDigest)
 					);
-					const contentHash = fullHash.slice(
-						0,
+					const contentHash = nonNumericOnlyHash(
+						fullHash,
 						runtimeTemplate.outputOptions.hashDigestLength
 					);
 					module.buildInfo.fullContentHash = fullHash;

package/lib/buildChunkGraph.js

@@ -905,7 +905,7 @@ const visitModules = (
 										const module = it.value;
 										if (
 											availableModules.has(module) ||
-											availableModules.plus.has(m)
+											availableModules.plus.has(module)
 										) {
 											cachedMinAvailableModules.add(module);
 										}

package/lib/config/defaults.js

@@ -907,6 +907,7 @@ const applyOutputDefaults = (
 	D(output, "strictModuleExceptionHandling", false);
 
 	const optimistic = v => v || v === undefined;
+	const conditionallyOptimistic = (v, c) => (v === undefined && c) || v;
 	F(
 		output.environment,
 		"arrowFunction",
@@ -920,8 +921,12 @@ const applyOutputDefaults = (
 	);
 	F(output.environment, "forOf", () => tp && optimistic(tp.forOf));
 	F(output.environment, "bigIntLiteral", () => tp && tp.bigIntLiteral);
-	F(output.environment, "dynamicImport", () => tp && tp.dynamicImport);
-	F(output.environment, "module", () => tp && tp.module);
+	F(output.environment, "dynamicImport", () =>
+		conditionallyOptimistic(tp && tp.dynamicImport, output.module)
+	);
+	F(output.environment, "module", () =>
+		conditionallyOptimistic(tp && tp.module, output.module)
+	);
 
 	const { trustedTypes } = output;
 	if (trustedTypes) {

package/lib/css/CssLoadingRuntimeModule.js

@@ -274,78 +274,71 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 			"",
 			withLoading
 				? Template.asString([
-						`${fn}.css = ${runtimeTemplate.basicFunction(
-							"chunkId, promises",
-							hasCssMatcher !== false
-								? [
-										"// css chunk loading",
-										`var installedChunkData = ${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;`,
-										'if(installedChunkData !== 0) { // 0 means "already installed".',
-										Template.indent([
-											"",
-											'// a Promise means "currently loading".',
-											"if(installedChunkData) {",
-											Template.indent([
-												"promises.push(installedChunkData[2]);"
-											]),
-											"} else {",
-											Template.indent([
-												hasCssMatcher === true
-													? "if(true) { // all chunks have CSS"
-													: `if(${hasCssMatcher("chunkId")}) {`,
+						`${fn}.css = ${runtimeTemplate.basicFunction("chunkId, promises", [
+							"// css chunk loading",
+							`var installedChunkData = ${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;`,
+							'if(installedChunkData !== 0) { // 0 means "already installed".',
+							Template.indent([
+								"",
+								'// a Promise means "currently loading".',
+								"if(installedChunkData) {",
+								Template.indent(["promises.push(installedChunkData[2]);"]),
+								"} else {",
+								Template.indent([
+									hasCssMatcher === true
+										? "if(true) { // all chunks have CSS"
+										: `if(${hasCssMatcher("chunkId")}) {`,
+									Template.indent([
+										"// setup Promise in chunk cache",
+										`var promise = new Promise(${runtimeTemplate.expressionFunction(
+											`installedChunkData = installedChunks[chunkId] = [resolve, reject]`,
+											"resolve, reject"
+										)});`,
+										"promises.push(installedChunkData[2] = promise);",
+										"",
+										"// start chunk loading",
+										`var url = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkCssFilename}(chunkId);`,
+										"// create error before stack unwound to get useful stacktrace later",
+										"var error = new Error();",
+										`var loadingEnded = ${runtimeTemplate.basicFunction(
+											"event",
+											[
+												`if(${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId)) {`,
 												Template.indent([
-													"// setup Promise in chunk cache",
-													`var promise = new Promise(${runtimeTemplate.expressionFunction(
-														`installedChunkData = installedChunks[chunkId] = [resolve, reject]`,
-														"resolve, reject"
-													)});`,
-													"promises.push(installedChunkData[2] = promise);",
-													"",
-													"// start chunk loading",
-													`var url = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkCssFilename}(chunkId);`,
-													"// create error before stack unwound to get useful stacktrace later",
-													"var error = new Error();",
-													`var loadingEnded = ${runtimeTemplate.basicFunction(
-														"event",
-														[
-															`if(${RuntimeGlobals.hasOwnProperty}(installedChunks, chunkId)) {`,
-															Template.indent([
-																"installedChunkData = installedChunks[chunkId];",
-																"if(installedChunkData !== 0) installedChunks[chunkId] = undefined;",
-																"if(installedChunkData) {",
-																Template.indent([
-																	'if(event.type !== "load") {',
-																	Template.indent([
-																		"var errorType = event && event.type;",
-																		"var realSrc = event && event.target && event.target.src;",
-																		"error.message = 'Loading css chunk ' + chunkId + ' failed.\\n(' + errorType + ': ' + realSrc + ')';",
-																		"error.name = 'ChunkLoadError';",
-																		"error.type = errorType;",
-																		"error.request = realSrc;",
-																		"installedChunkData[1](error);"
-																	]),
-																	"} else {",
-																	Template.indent([
-																		`loadCssChunkData(${RuntimeGlobals.moduleFactories}, link, chunkId);`,
-																		"installedChunkData[0]();"
-																	]),
-																	"}"
-																]),
-																"}"
-															]),
-															"}"
-														]
-													)};`,
-													"var link = loadStylesheet(chunkId, url, loadingEnded);"
+													"installedChunkData = installedChunks[chunkId];",
+													"if(installedChunkData !== 0) installedChunks[chunkId] = undefined;",
+													"if(installedChunkData) {",
+													Template.indent([
+														'if(event.type !== "load") {',
+														Template.indent([
+															"var errorType = event && event.type;",
+															"var realSrc = event && event.target && event.target.src;",
+															"error.message = 'Loading css chunk ' + chunkId + ' failed.\\n(' + errorType + ': ' + realSrc + ')';",
+															"error.name = 'ChunkLoadError';",
+															"error.type = errorType;",
+															"error.request = realSrc;",
+															"installedChunkData[1](error);"
+														]),
+														"} else {",
+														Template.indent([
+															`loadCssChunkData(${RuntimeGlobals.moduleFactories}, link, chunkId);`,
+															"installedChunkData[0]();"
+														]),
+														"}"
+													]),
+													"}"
 												]),
-												"} else installedChunks[chunkId] = 0;"
-											]),
-											"}"
-										]),
-										"}"
-								  ]
-								: "installedChunks[chunkId] = 0;"
-						)};`
+												"}"
+											]
+										)};`,
+										"var link = loadStylesheet(chunkId, url, loadingEnded);"
+									]),
+									"} else installedChunks[chunkId] = 0;"
+								]),
+								"}"
+							]),
+							"}"
+						])};`
 				  ])
 				: "// no chunk loading",
 			"",

package/lib/css/CssModulesPlugin.js

@@ -19,6 +19,7 @@ const { compareModulesByIdentifier } = require("../util/comparators");
 const createSchemaValidation = require("../util/create-schema-validation");
 const createHash = require("../util/createHash");
 const memoize = require("../util/memoize");
+const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 const CssExportsGenerator = require("./CssExportsGenerator");
 const CssGenerator = require("./CssGenerator");
 const CssParser = require("./CssParser");
@@ -201,7 +202,7 @@ class CssModulesPlugin {
 						hash.update(chunkGraph.getModuleHash(module, chunk.runtime));
 					}
 					const digest = /** @type {string} */ (hash.digest(hashDigest));
-					chunk.contentHash.css = digest.substr(0, hashDigestLength);
+					chunk.contentHash.css = nonNumericOnlyHash(digest, hashDigestLength);
 				});
 				compilation.hooks.renderManifest.tap(plugin, (result, options) => {
 					const { chunkGraph } = compilation;

package/lib/debug/ProfilingPlugin.js

@@ -343,7 +343,8 @@ const interceptAllJavascriptModulesPluginHooks = (compilation, tracer) => {
 };
 
 const makeInterceptorFor = (instance, tracer) => hookName => ({
-	register: ({ name, type, context, fn }) => {
+	register: tapInfo => {
+		const { name, type, fn } = tapInfo;
 		const newFn =
 			// Don't tap our own hooks to ensure stream can close cleanly
 			name === pluginName
@@ -354,9 +355,7 @@ const makeInterceptorFor = (instance, tracer) => hookName => ({
 						fn
 				  });
 		return {
-			name,
-			type,
-			context,
+			...tapInfo,
 			fn: newFn
 		};
 	}

package/lib/dependencies/ContextElementDependency.js

@@ -53,12 +53,18 @@ class ContextElementDependency extends ModuleDependency {
 	}
 
 	serialize(context) {
-		context.write(this.referencedExports);
+		const { write } = context;
+		write(this._typePrefix);
+		write(this._category);
+		write(this.referencedExports);
 		super.serialize(context);
 	}
 
 	deserialize(context) {
-		this.referencedExports = context.read();
+		const { read } = context;
+		this._typePrefix = read();
+		this._category = read();
+		this.referencedExports = read();
 		super.deserialize(context);
 	}
 }

package/lib/dependencies/ExportsInfoDependency.js

@@ -46,6 +46,12 @@ const getProperty = (moduleGraph, module, exportName, property, runtime) => {
 		}
 	}
 	switch (property) {
+		case "canMangle": {
+			const exportsInfo = moduleGraph.getExportsInfo(module);
+			const exportInfo = exportsInfo.getExportInfo(exportName);
+			if (exportInfo) return exportInfo.canMangle;
+			return exportsInfo.otherExportsInfo.canMangle;
+		}
 		case "used":
 			return (
 				moduleGraph.getExportsInfo(module).getUsed(exportName, runtime) !==

package/lib/index.js

@@ -11,6 +11,7 @@ const memoize = require("./util/memoize");
 /** @typedef {import("../declarations/WebpackOptions").Entry} Entry */
 /** @typedef {import("../declarations/WebpackOptions").EntryNormalized} EntryNormalized */
 /** @typedef {import("../declarations/WebpackOptions").EntryObject} EntryObject */
+/** @typedef {import("../declarations/WebpackOptions").FileCacheOptions} FileCacheOptions */
 /** @typedef {import("../declarations/WebpackOptions").LibraryOptions} LibraryOptions */
 /** @typedef {import("../declarations/WebpackOptions").ModuleOptions} ModuleOptions */
 /** @typedef {import("../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
@@ -26,11 +27,15 @@ const memoize = require("./util/memoize");
 /** @typedef {import("../declarations/WebpackOptions").WebpackPluginInstance} WebpackPluginInstance */
 /** @typedef {import("./Compilation").Asset} Asset */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
+/** @typedef {import("./Compilation").EntryOptions} EntryOptions */
+/** @typedef {import("./Compiler").AssetEmittedInfo} AssetEmittedInfo */
 /** @typedef {import("./MultiStats")} MultiStats */
 /** @typedef {import("./Parser").ParserState} ParserState */
 /** @typedef {import("./ResolverFactory").ResolvePluginInstance} ResolvePluginInstance */
 /** @typedef {import("./ResolverFactory").Resolver} Resolver */
 /** @typedef {import("./Watching")} Watching */
+/** @typedef {import("./cli").Argument} Argument */
+/** @typedef {import("./cli").Problem} Problem */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsAsset} StatsAsset */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsChunk} StatsChunk */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsChunkGroup} StatsChunkGroup */

package/lib/javascript/JavascriptModulesPlugin.js

@@ -24,6 +24,7 @@ const { last, someInIterable } = require("../util/IterableHelpers");
 const StringXor = require("../util/StringXor");
 const { compareModulesByIdentifier } = require("../util/comparators");
 const createHash = require("../util/createHash");
+const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 const { intersectRuntime } = require("../util/runtime");
 const JavascriptGenerator = require("./JavascriptGenerator");
 const JavascriptParser = require("./JavascriptParser");
@@ -102,6 +103,7 @@ const printGeneratedCodeForStack = (module, code) => {
 /**
  * @typedef {Object} RenderBootstrapContext
  * @property {Chunk} chunk the chunk
+ * @property {CodeGenerationResults} codeGenerationResults results of code generation
  * @property {RuntimeTemplate} runtimeTemplate the runtime template
  * @property {ModuleGraph} moduleGraph the module graph
  * @property {ChunkGraph} chunkGraph the chunk graph
@@ -331,6 +333,7 @@ class JavascriptModulesPlugin {
 								{
 									hash: "0000",
 									chunk,
+									codeGenerationResults: context.codeGenerationResults,
 									chunkGraph: context.chunkGraph,
 									moduleGraph: context.moduleGraph,
 									runtimeTemplate: context.runtimeTemplate
@@ -343,6 +346,7 @@ class JavascriptModulesPlugin {
 				compilation.hooks.contentHash.tap("JavascriptModulesPlugin", chunk => {
 					const {
 						chunkGraph,
+						codeGenerationResults,
 						moduleGraph,
 						runtimeTemplate,
 						outputOptions: {
@@ -360,6 +364,7 @@ class JavascriptModulesPlugin {
 							{
 								hash: "0000",
 								chunk,
+								codeGenerationResults,
 								chunkGraph: compilation.chunkGraph,
 								moduleGraph: compilation.moduleGraph,
 								runtimeTemplate: compilation.runtimeTemplate
@@ -372,6 +377,7 @@ class JavascriptModulesPlugin {
 					}
 					hooks.chunkHash.call(chunk, hash, {
 						chunkGraph,
+						codeGenerationResults,
 						moduleGraph,
 						runtimeTemplate
 					});
@@ -398,7 +404,10 @@ class JavascriptModulesPlugin {
 						xor.updateHash(hash);
 					}
 					const digest = /** @type {string} */ (hash.digest(hashDigest));
-					chunk.contentHash.javascript = digest.substr(0, hashDigestLength);
+					chunk.contentHash.javascript = nonNumericOnlyHash(
+						digest,
+						hashDigestLength
+					);
 				});
 				compilation.hooks.additionalTreeRuntimeRequirements.tap(
 					"JavascriptModulesPlugin",
@@ -974,7 +983,13 @@ class JavascriptModulesPlugin {
 	 * @returns {{ header: string[], beforeStartup: string[], startup: string[], afterStartup: string[], allowInlineStartup: boolean }} the generated source of the bootstrap code
 	 */
 	renderBootstrap(renderContext, hooks) {
-		const { chunkGraph, moduleGraph, chunk, runtimeTemplate } = renderContext;
+		const {
+			chunkGraph,
+			codeGenerationResults,
+			moduleGraph,
+			chunk,
+			runtimeTemplate
+		} = renderContext;
 
 		const runtimeRequirements = chunkGraph.getTreeRuntimeRequirements(chunk);
 
@@ -1098,8 +1113,18 @@ class JavascriptModulesPlugin {
 						);
 						result.allowInlineStartup = false;
 					}
+
+					let data;
+					if (codeGenerationResults.has(entryModule, chunk.runtime)) {
+						const result = codeGenerationResults.get(
+							entryModule,
+							chunk.runtime
+						);
+						data = result.data;
+					}
 					if (
 						result.allowInlineStartup &&
+						(!data || !data.get("topLevelDeclarations")) &&
 						(!entryModule.buildInfo ||
 							!entryModule.buildInfo.topLevelDeclarations)
 					) {