webpack 5.96.0 → 5.97.0

package/lib/css/CssGenerator.js

@@ -5,37 +5,55 @@
 
 "use strict";
 
-const { ReplaceSource } = require("webpack-sources");
+const { ReplaceSource, RawSource, ConcatSource } = require("webpack-sources");
+const { UsageState } = require("../ExportsInfo");
 const Generator = require("../Generator");
 const InitFragment = require("../InitFragment");
-const { CSS_TYPES } = require("../ModuleSourceTypesConstants");
+const {
+	JS_AND_CSS_EXPORT_TYPES,
+	JS_AND_CSS_TYPES
+} = require("../ModuleSourceTypesConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
+const Template = require("../Template");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
-/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorLocalIdentName} CssGeneratorLocalIdentName */
+/** @typedef {import("../../declarations/WebpackOptions").CssAutoGeneratorOptions} CssAutoGeneratorOptions */
+/** @typedef {import("../../declarations/WebpackOptions").CssGlobalGeneratorOptions} CssGlobalGeneratorOptions */
+/** @typedef {import("../../declarations/WebpackOptions").CssModuleGeneratorOptions} CssModuleGeneratorOptions */
 /** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../DependencyTemplate").CssData} CssData */
 /** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../DependencyTemplate").CssExportsData} CssExportsData */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Generator").UpdateHashContext} UpdateHashContext */
+/** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../util/Hash")} Hash */
 
 class CssGenerator extends Generator {
 	/**
-	 * @param {CssGeneratorExportsConvention} convention the convention of the exports name
-	 * @param {CssGeneratorLocalIdentName} localIdentName css export local ident name
-	 * @param {boolean} esModule whether to use ES modules syntax
+	 * @param {CssAutoGeneratorOptions | CssGlobalGeneratorOptions | CssModuleGeneratorOptions} options options
 	 */
-	constructor(convention, localIdentName, esModule) {
+	constructor(options) {
 		super();
-		this.convention = convention;
-		this.localIdentName = localIdentName;
-		/** @type {boolean} */
-		this.esModule = esModule;
+		this.convention = options.exportsConvention;
+		this.localIdentName = options.localIdentName;
+		this.exportsOnly = options.exportsOnly;
+		this.esModule = options.esModule;
+	}
+
+	/**
+	 * @param {NormalModule} module module for which the bailout reason should be determined
+	 * @param {ConcatenationBailoutReasonContext} context context
+	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
+	 */
+	getConcatenationBailoutReason(module, context) {
+		if (!this.esModule) {
+			return "Module is not an ECMAScript module";
+		}
+
+		return undefined;
 	}
 
 	/**
@@ -44,18 +62,19 @@ class CssGenerator extends Generator {
 	 * @returns {Source | null} generated code
 	 */
 	generate(module, generateContext) {
-		const originalSource = /** @type {Source} */ (module.originalSource());
-		const source = new ReplaceSource(originalSource);
+		const source =
+			generateContext.type === "javascript"
+				? new ReplaceSource(new RawSource(""))
+				: new ReplaceSource(/** @type {Source} */ (module.originalSource()));
+
 		/** @type {InitFragment<GenerateContext>[]} */
 		const initFragments = [];
-		/** @type {CssExportsData} */
-		const cssExportsData = {
+		/** @type {CssData} */
+		const cssData = {
 			esModule: this.esModule,
 			exports: new Map()
 		};
 
-		generateContext.runtimeRequirements.add(RuntimeGlobals.hasCssModules);
-
 		/** @type {InitFragment<GenerateContext>[] | undefined} */
 		let chunkInitFragments;
 		/** @type {DependencyTemplateContext} */
@@ -72,7 +91,7 @@ class CssGenerator extends Generator {
 				/** @type {CodeGenerationResults} */
 				(generateContext.codeGenerationResults),
 			initFragments,
-			cssExportsData,
+			cssData,
 			get chunkInitFragments() {
 				if (!chunkInitFragments) {
 					const data =
@@ -105,21 +124,86 @@ class CssGenerator extends Generator {
 
 			template.apply(dependency, source, templateContext);
 		};
+
 		for (const dependency of module.dependencies) {
 			handleDependency(dependency);
 		}
-		if (module.presentationalDependencies !== undefined) {
-			for (const dependency of module.presentationalDependencies) {
-				handleDependency(dependency);
+
+		switch (generateContext.type) {
+			case "javascript": {
+				module.buildInfo.cssData = cssData;
+
+				generateContext.runtimeRequirements.add(RuntimeGlobals.module);
+
+				if (generateContext.concatenationScope) {
+					const source = new ConcatSource();
+					const usedIdentifiers = new Set();
+					for (const [name, v] of cssData.exports) {
+						const usedName = generateContext.moduleGraph
+							.getExportInfo(module, name)
+							.getUsedName(name, generateContext.runtime);
+						if (!usedName) {
+							continue;
+						}
+						let identifier = Template.toIdentifier(usedName);
+						const { RESERVED_IDENTIFIER } = require("../util/propertyName");
+						if (RESERVED_IDENTIFIER.has(identifier)) {
+							identifier = `_${identifier}`;
+						}
+						const i = 0;
+						while (usedIdentifiers.has(identifier)) {
+							identifier = Template.toIdentifier(name + i);
+						}
+						usedIdentifiers.add(identifier);
+						generateContext.concatenationScope.registerExport(name, identifier);
+						source.add(
+							`${
+								generateContext.runtimeTemplate.supportsConst()
+									? "const"
+									: "var"
+							} ${identifier} = ${JSON.stringify(v)};\n`
+						);
+					}
+					return source;
+				}
+
+				const needNsObj =
+					this.esModule &&
+					generateContext.moduleGraph
+						.getExportsInfo(module)
+						.otherExportsInfo.getUsed(generateContext.runtime) !==
+						UsageState.Unused;
+
+				if (needNsObj) {
+					generateContext.runtimeRequirements.add(
+						RuntimeGlobals.makeNamespaceObject
+					);
+				}
+
+				const exports = [];
+
+				for (const [name, v] of cssData.exports) {
+					exports.push(`\t${JSON.stringify(name)}: ${JSON.stringify(v)}`);
+				}
+
+				return new RawSource(
+					`${needNsObj ? `${RuntimeGlobals.makeNamespaceObject}(` : ""}${
+						module.moduleArgument
+					}.exports = {\n${exports.join(",\n")}\n}${needNsObj ? ")" : ""};`
+				);
 			}
-		}
+			case "css": {
+				if (module.presentationalDependencies !== undefined) {
+					for (const dependency of module.presentationalDependencies) {
+						handleDependency(dependency);
+					}
+				}
 
-		const data =
-			/** @type {NonNullable<GenerateContext["getData"]>} */
-			(generateContext.getData)();
-		data.set("css-exports", cssExportsData);
+				generateContext.runtimeRequirements.add(RuntimeGlobals.hasCssModules);
 
-		return InitFragment.addToSource(source, initFragments, generateContext);
+				return InitFragment.addToSource(source, initFragments, generateContext);
+			}
+		}
 	}
 
 	/**
@@ -127,7 +211,8 @@ class CssGenerator extends Generator {
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
-		return CSS_TYPES;
+		// TODO, find a better way to prevent the original module from being removed after concatenation, maybe it is a bug
+		return this.exportsOnly ? JS_AND_CSS_EXPORT_TYPES : JS_AND_CSS_TYPES;
 	}
 
 	/**
@@ -136,13 +221,32 @@ class CssGenerator extends Generator {
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {
-		const originalSource = module.originalSource();
+		switch (type) {
+			case "javascript": {
+				if (!module.buildInfo.cssData) {
+					return 42;
+				}
 
-		if (!originalSource) {
-			return 0;
-		}
+				const exports = module.buildInfo.cssData.exports;
+				const stringifiedExports = JSON.stringify(
+					Array.from(exports).reduce((obj, [key, value]) => {
+						obj[key] = value;
+						return obj;
+					}, {})
+				);
+
+				return stringifiedExports.length + 42;
+			}
+			case "css": {
+				const originalSource = module.originalSource();
 
-		return originalSource.size();
+				if (!originalSource) {
+					return 0;
+				}
+
+				return originalSource.size();
+			}
+		}
 	}
 
 	/**

package/lib/css/CssLoadingRuntimeModule.js

@@ -13,6 +13,7 @@ const Template = require("../Template");
 const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 const { chunkHasCss } = require("./CssModulesPlugin");
 
+/** @typedef {import("../../declarations/WebpackOptions").Environment} Environment */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation").RuntimeRequirementsContext} RuntimeRequirementsContext */
@@ -73,8 +74,7 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 			outputOptions: {
 				crossOriginLoading,
 				uniqueName,
-				chunkLoadTimeout: loadTimeout,
-				cssHeadDataCompression: withCompression
+				chunkLoadTimeout: loadTimeout
 			}
 		} = compilation;
 		const fn = RuntimeGlobals.ensureChunkHandlers;
@@ -98,25 +98,28 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 			RuntimeGlobals.hmrDownloadUpdateHandlers
 		);
 		/** @type {Set<number | string | null>} */
-		const initialChunkIdsWithCss = new Set();
-		/** @type {Set<number | string | null>} */
-		const initialChunkIdsWithoutCss = new Set();
+		const initialChunkIds = new Set();
 		for (const c of /** @type {Chunk} */ (chunk).getAllInitialChunks()) {
-			(chunkHasCss(c, chunkGraph)
-				? initialChunkIdsWithCss
-				: initialChunkIdsWithoutCss
-			).add(c.id);
+			if (chunkHasCss(c, chunkGraph)) {
+				initialChunkIds.add(c.id);
+			}
 		}
 
-		if (!withLoading && !withHmr && initialChunkIdsWithCss.size === 0) {
+		if (!withLoading && !withHmr) {
 			return null;
 		}
 
+		const environment =
+			/** @type {Environment} */
+			(compilation.outputOptions.environment);
+		const isNeutralPlatform = runtimeTemplate.isNeutralPlatform();
 		const withPrefetch =
 			this._runtimeRequirements.has(RuntimeGlobals.prefetchChunkHandlers) &&
+			(environment.document || isNeutralPlatform) &&
 			chunk.hasChildByOrder(chunkGraph, "prefetch", true, chunkHasCss);
 		const withPreload =
 			this._runtimeRequirements.has(RuntimeGlobals.preloadChunkHandlers) &&
+			(environment.document || isNeutralPlatform) &&
 			chunk.hasChildByOrder(chunkGraph, "preload", true, chunkHasCss);
 
 		const { linkPreload, linkPrefetch } =
@@ -168,178 +171,86 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 				: ""
 		]);
 
-		/** @type {(str: string) => number} */
-		const cc = str => str.charCodeAt(0);
-		const name = uniqueName
-			? runtimeTemplate.concatenation(
-					"--webpack-",
-					{ expr: "uniqueName" },
-					"-",
-					{ expr: "chunkId" }
-				)
-			: runtimeTemplate.concatenation("--webpack-", { expr: "chunkId" });
-
 		return Template.asString([
 			"// object to store loaded and loading chunks",
 			"// undefined = chunk not loaded, null = chunk preloaded/prefetched",
 			"// [resolve, reject, Promise] = chunk loading, 0 = chunk loaded",
 			`var installedChunks = ${
 				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
-			}{${Array.from(
-				initialChunkIdsWithoutCss,
-				id => `${JSON.stringify(id)}:0`
-			).join(",")}};`,
+			}{`,
+			Template.indent(
+				Array.from(initialChunkIds, id => `${JSON.stringify(id)}: 0`).join(
+					",\n"
+				)
+			),
+			"};",
 			"",
 			uniqueName
 				? `var uniqueName = ${JSON.stringify(
 						runtimeTemplate.outputOptions.uniqueName
 					)};`
 				: "// data-webpack is not used as build has no uniqueName",
-			`var loadCssChunkData = ${runtimeTemplate.basicFunction(
-				"target, link, chunkId",
-				[
-					`var data, token = "", token2 = "", exports = {}, ${
-						withHmr ? "moduleIds = [], " : ""
-					}name = ${name}, i, cc = 1;`,
-					"try {",
-					Template.indent([
-						"if(!link) link = loadStylesheet(chunkId);",
-						// `link.sheet.rules` for legacy browsers
-						"var cssRules = link.sheet.cssRules || link.sheet.rules;",
-						"var j = cssRules.length - 1;",
-						"while(j > -1 && !data) {",
-						Template.indent([
-							"var style = cssRules[j--].style;",
-							"if(!style) continue;",
-							"data = style.getPropertyValue(name);"
-						]),
-						"}"
-					]),
-					"}catch(e){}",
-					"if(!data) {",
-					Template.indent([
-						"data = getComputedStyle(document.head).getPropertyValue(name);"
-					]),
-					"}",
-					"if(!data) return [];",
-					withCompression
-						? Template.asString([
-								// LZW decode
-								`var map = {}, char = data[0], oldPhrase = char, decoded = char, code = 256, maxCode = ${"\uFFFF".charCodeAt(
-									0
-								)}, phrase;`,
-								"for (i = 1; i < data.length; i++) {",
+			withLoading || withHmr
+				? Template.asString([
+						'var loadingAttribute = "data-webpack-loading";',
+						`var loadStylesheet = ${runtimeTemplate.basicFunction(
+							`chunkId, url, done${
+								withFetchPriority ? ", fetchPriority" : ""
+							}${withHmr ? ", hmr" : ""}`,
+							[
+								'var link, needAttach, key = "chunk-" + chunkId;',
+								withHmr ? "if(!hmr) {" : "",
+								'var links = document.getElementsByTagName("link");',
+								"for(var i = 0; i < links.length; i++) {",
 								Template.indent([
-									"cc = data[i].charCodeAt(0);",
-									"if (cc < 256) phrase = data[i]; else phrase = map[cc] ? map[cc] : (oldPhrase + char);",
-									"decoded += phrase;",
-									"char = phrase.charAt(0);",
-									"map[code] = oldPhrase + char;",
-									"if (++code > maxCode) { code = 256; map = {}; }",
-									"oldPhrase = phrase;"
+									"var l = links[i];",
+									`if(l.rel == "stylesheet" && (${
+										withHmr
+											? 'l.href.startsWith(url) || l.getAttribute("href").startsWith(url)'
+											: 'l.href == url || l.getAttribute("href") == url'
+									}${
+										uniqueName
+											? ' || l.getAttribute("data-webpack") == uniqueName + ":" + key'
+											: ""
+									})) { link = l; break; }`
 								]),
 								"}",
-								"data = decoded;"
-							])
-						: "// css head data compression is disabled",
-					"for(i = 0; cc; i++) {",
-					Template.indent([
-						"cc = data.charCodeAt(i);",
-						`if(cc == ${cc(":")}) { token2 = token; token = ""; }`,
-						`else if(cc == ${cc(
-							"/"
-						)}) { token = token.replace(/^_/, ""); token2 = token2.replace(/^_/, ""); exports[token2] = token; token = ""; token2 = ""; }`,
-						`else if(cc == ${cc("&")}) { ${
-							RuntimeGlobals.makeNamespaceObject
-						}(exports); }`,
-						`else if(!cc || cc == ${cc(
-							","
-						)}) { token = token.replace(/^_/, ""); target[token] = (${runtimeTemplate.basicFunction(
-							"exports, module",
-							"module.exports = exports;"
-						)}).bind(null, exports); ${
-							withHmr ? "moduleIds.push(token); " : ""
-						}token = ""; token2 = ""; exports = {};  }`,
-						`else if(cc == ${cc("\\")}) { token += data[++i] }`,
-						"else { token += data[i]; }"
-					]),
-					"}",
-					`${
-						withHmr ? `if(target == ${RuntimeGlobals.moduleFactories}) ` : ""
-					}installedChunks[chunkId] = 0;`,
-					withHmr ? "return moduleIds;" : ""
-				]
-			)}`,
-			'var loadingAttribute = "data-webpack-loading";',
-			`var loadStylesheet = ${runtimeTemplate.basicFunction(
-				`chunkId, url, done${withHmr ? ", hmr" : ""}${
-					withFetchPriority ? ", fetchPriority" : ""
-				}`,
-				[
-					'var link, needAttach, key = "chunk-" + chunkId;',
-					withHmr ? "if(!hmr) {" : "",
-					'var links = document.getElementsByTagName("link");',
-					"for(var i = 0; i < links.length; i++) {",
-					Template.indent([
-						"var l = links[i];",
-						`if(l.rel == "stylesheet" && (${
-							withHmr
-								? 'l.href.startsWith(url) || l.getAttribute("href").startsWith(url)'
-								: 'l.href == url || l.getAttribute("href") == url'
-						}${
-							uniqueName
-								? ' || l.getAttribute("data-webpack") == uniqueName + ":" + key'
-								: ""
-						})) { link = l; break; }`
-					]),
-					"}",
-					"if(!done) return link;",
-					withHmr ? "}" : "",
-					"if(!link) {",
-					Template.indent([
-						"needAttach = true;",
-						createStylesheet.call(code, /** @type {Chunk} */ (this.chunk))
-					]),
-					"}",
-					`var onLinkComplete = ${runtimeTemplate.basicFunction(
-						"prev, event",
-						Template.asString([
-							"link.onerror = link.onload = null;",
-							"link.removeAttribute(loadingAttribute);",
-							"clearTimeout(timeout);",
-							'if(event && event.type != "load") link.parentNode.removeChild(link)',
-							"done(event);",
-							"if(prev) return prev(event);"
-						])
-					)};`,
-					"if(link.getAttribute(loadingAttribute)) {",
-					Template.indent([
-						`var timeout = setTimeout(onLinkComplete.bind(null, undefined, { type: 'timeout', target: link }), ${loadTimeout});`,
-						"link.onerror = onLinkComplete.bind(null, link.onerror);",
-						"link.onload = onLinkComplete.bind(null, link.onload);"
-					]),
-					"} else onLinkComplete(undefined, { type: 'load', target: link });", // We assume any existing stylesheet is render blocking
-					withHmr ? "hmr ? document.head.insertBefore(link, hmr) :" : "",
-					"needAttach && document.head.appendChild(link);",
-					"return link;"
-				]
-			)};`,
-			initialChunkIdsWithCss.size > 2
-				? `${JSON.stringify(
-						Array.from(initialChunkIdsWithCss)
-					)}.forEach(loadCssChunkData.bind(null, ${
-						RuntimeGlobals.moduleFactories
-					}, 0));`
-				: initialChunkIdsWithCss.size > 0
-					? `${Array.from(
-							initialChunkIdsWithCss,
-							id =>
-								`loadCssChunkData(${
-									RuntimeGlobals.moduleFactories
-								}, 0, ${JSON.stringify(id)});`
-						).join("")}`
-					: "// no initial css",
-			"",
+								"if(!done) return link;",
+								withHmr ? "}" : "",
+								"if(!link) {",
+								Template.indent([
+									"needAttach = true;",
+									createStylesheet.call(code, /** @type {Chunk} */ (this.chunk))
+								]),
+								"}",
+								`var onLinkComplete = ${runtimeTemplate.basicFunction(
+									"prev, event",
+									Template.asString([
+										"link.onerror = link.onload = null;",
+										"link.removeAttribute(loadingAttribute);",
+										"clearTimeout(timeout);",
+										'if(event && event.type != "load") link.parentNode.removeChild(link)',
+										"done(event);",
+										"if(prev) return prev(event);"
+									])
+								)};`,
+								"if(link.getAttribute(loadingAttribute)) {",
+								Template.indent([
+									`var timeout = setTimeout(onLinkComplete.bind(null, undefined, { type: 'timeout', target: link }), ${loadTimeout});`,
+									"link.onerror = onLinkComplete.bind(null, link.onerror);",
+									"link.onload = onLinkComplete.bind(null, link.onload);"
+								]),
+								"} else onLinkComplete(undefined, { type: 'load', target: link });", // We assume any existing stylesheet is render blocking
+								withHmr && withFetchPriority
+									? 'if (hmr && hmr.getAttribute("fetchpriority")) link.setAttribute("fetchpriority", hmr.getAttribute("fetchpriority"));'
+									: "",
+								withHmr ? "hmr ? document.head.insertBefore(link, hmr) :" : "",
+								"needAttach && document.head.appendChild(link);",
+								"return link;"
+							]
+						)};`
+					])
+				: "",
 			withLoading
 				? Template.asString([
 						`${fn}.css = ${runtimeTemplate.basicFunction(
@@ -391,7 +302,7 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 															]),
 															"} else {",
 															Template.indent([
-																`loadCssChunkData(${RuntimeGlobals.moduleFactories}, link, chunkId);`,
+																"installedChunks[chunkId] = 0;",
 																"installedChunkData[0]();"
 															]),
 															"}"
@@ -401,9 +312,17 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 													"}"
 												]
 											)};`,
-											`var link = loadStylesheet(chunkId, url, loadingEnded${
-												withFetchPriority ? ", fetchPriority" : ""
-											});`
+											isNeutralPlatform
+												? "if (typeof document !== 'undefined') {"
+												: "",
+											Template.indent([
+												`loadStylesheet(chunkId, url, loadingEnded${
+													withFetchPriority ? ", fetchPriority" : ""
+												});`
+											]),
+											isNeutralPlatform
+												? "} else { loadingEnded({ type: 'load' }); }"
+												: ""
 										]),
 										"} else installedChunks[chunkId] = 0;"
 									]),
@@ -426,6 +345,9 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 						}) {`,
 						Template.indent([
 							"installedChunks[chunkId] = null;",
+							isNeutralPlatform
+								? "if (typeof document === 'undefined') return;"
+								: "",
 							linkPrefetch.call(
 								Template.asString([
 									"var link = document.createElement('link');",
@@ -462,6 +384,9 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 						}) {`,
 						Template.indent([
 							"installedChunks[chunkId] = null;",
+							isNeutralPlatform
+								? "if (typeof document === 'undefined') return;"
+								: "",
 							linkPreload.call(
 								Template.asString([
 									"var link = document.createElement('link');",
@@ -500,32 +425,20 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 						"var oldTags = [];",
 						"var newTags = [];",
 						`var applyHandler = ${runtimeTemplate.basicFunction("options", [
-							`return { dispose: ${runtimeTemplate.basicFunction(
-								"",
-								[]
-							)}, apply: ${runtimeTemplate.basicFunction("", [
-								"var moduleIds = [];",
-								`newTags.forEach(${runtimeTemplate.expressionFunction(
-									"info[1].sheet.disabled = false",
-									"info"
-								)});`,
+							`return { dispose: ${runtimeTemplate.basicFunction("", [
 								"while(oldTags.length) {",
 								Template.indent([
 									"var oldTag = oldTags.pop();",
 									"if(oldTag.parentNode) oldTag.parentNode.removeChild(oldTag);"
 								]),
-								"}",
+								"}"
+							])}, apply: ${runtimeTemplate.basicFunction("", [
 								"while(newTags.length) {",
 								Template.indent([
-									"var info = newTags.pop();",
-									`var chunkModuleIds = loadCssChunkData(${RuntimeGlobals.moduleFactories}, info[1], info[0]);`,
-									`chunkModuleIds.forEach(${runtimeTemplate.expressionFunction(
-										"moduleIds.push(id)",
-										"id"
-									)});`
+									"var newTag = newTags.pop();",
+									"newTag.sheet.disabled = false"
 								]),
-								"}",
-								"return moduleIds;"
+								"}"
 							])} };`
 						])}`,
 						`var cssTextKey = ${runtimeTemplate.returningFunction(
@@ -534,12 +447,15 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 								"r"
 							)}).join()`,
 							"link"
-						)}`,
+						)};`,
 						`${
 							RuntimeGlobals.hmrDownloadUpdateHandlers
 						}.css = ${runtimeTemplate.basicFunction(
 							"chunkIds, removedChunks, removedModules, promises, applyHandlers, updatedModulesList",
 							[
+								isNeutralPlatform
+									? "if (typeof document === 'undefined') return;"
+									: "",
 								"applyHandlers.push(applyHandler);",
 								`chunkIds.forEach(${runtimeTemplate.basicFunction("chunkId", [
 									`var filename = ${RuntimeGlobals.getChunkCssFilename}(chunkId);`,
@@ -565,20 +481,14 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 													"} else {",
 													Template.indent([
 														"try { if(cssTextKey(oldTag) == cssTextKey(link)) { if(link.parentNode) link.parentNode.removeChild(link); return resolve(); } } catch(e) {}",
-														"var factories = {};",
-														"loadCssChunkData(factories, link, chunkId);",
-														`Object.keys(factories).forEach(${runtimeTemplate.expressionFunction(
-															"updatedModulesList.push(id)",
-															"id"
-														)})`,
 														"link.sheet.disabled = true;",
 														"oldTags.push(oldTag);",
-														"newTags.push([chunkId, link]);",
+														"newTags.push(link);",
 														"resolve();"
 													]),
 													"}"
 												]
-											)}, oldTag);`
+											)}, ${withFetchPriority ? "undefined," : ""} oldTag);`
 										]
 									)}));`
 								])});`