webpack 5.66.0 → 5.69.1

package/lib/css/CssExportsGenerator.js

@@ -0,0 +1,139 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sergey Melyukov @smelukov
+*/
+
+"use strict";
+
+const { ReplaceSource, RawSource, ConcatSource } = require("webpack-sources");
+const { UsageState } = require("../ExportsInfo");
+const Generator = require("../Generator");
+const RuntimeGlobals = require("../RuntimeGlobals");
+const Template = require("../Template");
+
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../Generator").GenerateContext} GenerateContext */
+/** @typedef {import("../Generator").UpdateHashContext} UpdateHashContext */
+/** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
+/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../util/Hash")} Hash */
+
+const TYPES = new Set(["javascript"]);
+
+class CssExportsGenerator extends Generator {
+	constructor() {
+		super();
+	}
+
+	// TODO add getConcatenationBailoutReason to allow concatenation
+	// but how to make it have a module id
+
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {GenerateContext} generateContext context for generate
+	 * @returns {Source} generated code
+	 */
+	generate(module, generateContext) {
+		const source = new ReplaceSource(new RawSource(""));
+		const initFragments = [];
+		const cssExports = new Map();
+
+		generateContext.runtimeRequirements.add(RuntimeGlobals.module);
+
+		const runtimeRequirements = new Set();
+
+		const templateContext = {
+			runtimeTemplate: generateContext.runtimeTemplate,
+			dependencyTemplates: generateContext.dependencyTemplates,
+			moduleGraph: generateContext.moduleGraph,
+			chunkGraph: generateContext.chunkGraph,
+			module,
+			runtime: generateContext.runtime,
+			runtimeRequirements: runtimeRequirements,
+			concatenationScope: generateContext.concatenationScope,
+			codeGenerationResults: generateContext.codeGenerationResults,
+			initFragments,
+			cssExports
+		};
+
+		const handleDependency = dependency => {
+			const constructor = /** @type {new (...args: any[]) => Dependency} */ (
+				dependency.constructor
+			);
+			const template = generateContext.dependencyTemplates.get(constructor);
+			if (!template) {
+				throw new Error(
+					"No template for dependency: " + dependency.constructor.name
+				);
+			}
+
+			template.apply(dependency, source, templateContext);
+		};
+		module.dependencies.forEach(handleDependency);
+
+		if (generateContext.concatenationScope) {
+			const source = new ConcatSource();
+			const usedIdentifiers = new Set();
+			for (const [k, v] of cssExports) {
+				let identifier = Template.toIdentifier(k);
+				let i = 0;
+				while (usedIdentifiers.has(identifier)) {
+					identifier = Template.toIdentifier(k + i);
+				}
+				usedIdentifiers.add(identifier);
+				generateContext.concatenationScope.registerExport(k, identifier);
+				source.add(
+					`${
+						generateContext.runtimeTemplate.supportsConst ? "const" : "var"
+					} ${identifier} = ${JSON.stringify(v)};\n`
+				);
+			}
+			return source;
+		} else {
+			const otherUsed =
+				generateContext.moduleGraph
+					.getExportsInfo(module)
+					.otherExportsInfo.getUsed(generateContext.runtime) !==
+				UsageState.Unused;
+			if (otherUsed) {
+				generateContext.runtimeRequirements.add(
+					RuntimeGlobals.makeNamespaceObject
+				);
+			}
+			return new RawSource(
+				`${otherUsed ? `${RuntimeGlobals.makeNamespaceObject}(` : ""}${
+					module.moduleArgument
+				}.exports = {\n${Array.from(
+					cssExports,
+					([k, v]) => `\t${JSON.stringify(k)}: ${JSON.stringify(v)}`
+				).join(",\n")}\n}${otherUsed ? ")" : ""};`
+			);
+		}
+	}
+
+	/**
+	 * @param {NormalModule} module fresh module
+	 * @returns {Set<string>} available types (do not mutate)
+	 */
+	getTypes(module) {
+		return TYPES;
+	}
+
+	/**
+	 * @param {NormalModule} module the module
+	 * @param {string=} type source type
+	 * @returns {number} estimate size of the module
+	 */
+	getSize(module, type) {
+		return 42;
+	}
+
+	/**
+	 * @param {Hash} hash hash that will be modified
+	 * @param {UpdateHashContext} updateHashContext context for updating hash
+	 */
+	updateHash(hash, { module }) {}
+}
+
+module.exports = CssExportsGenerator;

package/lib/css/CssGenerator.js

@@ -8,6 +8,7 @@
 const { ReplaceSource } = require("webpack-sources");
 const Generator = require("../Generator");
 const InitFragment = require("../InitFragment");
+const RuntimeGlobals = require("../RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Dependency")} Dependency */
@@ -34,6 +35,8 @@ class CssGenerator extends Generator {
 		const initFragments = [];
 		const cssExports = new Map();
 
+		generateContext.runtimeRequirements.add(RuntimeGlobals.hasCssModules);
+
 		const templateContext = {
 			runtimeTemplate: generateContext.runtimeTemplate,
 			dependencyTemplates: generateContext.dependencyTemplates,

package/lib/css/CssLoadingRuntimeModule.js

@@ -79,14 +79,6 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 		const withHmr = _runtimeRequirements.has(
 			RuntimeGlobals.hmrDownloadUpdateHandlers
 		);
-
-		if (!withLoading && !withHmr) {
-			return null;
-		}
-
-		const { createStylesheet } =
-			CssLoadingRuntimeModule.getCompilationHooks(compilation);
-
 		const initialChunkIdsWithCss = new Set();
 		const initialChunkIdsWithoutCss = new Set();
 		for (const c of chunk.getAllInitialChunks()) {
@@ -96,6 +88,13 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 			).add(c.id);
 		}
 
+		if (!withLoading && !withHmr && initialChunkIdsWithCss.size === 0) {
+			return null;
+		}
+
+		const { createStylesheet } =
+			CssLoadingRuntimeModule.getCompilationHooks(compilation);
+
 		const stateExpression = withHmr
 			? `${RuntimeGlobals.hmrRuntimeStatePrefix}_css`
 			: undefined;
@@ -107,7 +106,6 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 				: "",
 			"link.setAttribute(loadingAttribute, 1);",
 			'link.rel = "stylesheet";',
-			withHmr ? 'if(hmr) link.media = "print and screen";' : "",
 			"link.href = url;",
 			crossOriginLoading
 				? Template.asString([
@@ -138,64 +136,74 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 						runtimeTemplate.outputOptions.uniqueName
 				  )};`
 				: "// data-webpack is not used as build has no uniqueName",
-			`var loadCssChunkData = ${runtimeTemplate.basicFunction("chunkId, link", [
-				'var data, token = "", token2, exports = {}, exportsWithId = [], exportsWithDashes = [], i = 0, cc = 1;',
-				"try { if(!link) link = loadStylesheet(chunkId); data = link.sheet.cssRules; data = data[data.length - 1].style; } catch(e) { data = getComputedStyle(document.head); }",
-				`data = data.getPropertyValue(${
-					uniqueName
-						? runtimeTemplate.concatenation(
-								"--webpack-",
-								{ expr: "uniqueName" },
-								"-",
-								{ expr: "chunkId" }
-						  )
-						: runtimeTemplate.concatenation("--webpack-", { expr: "chunkId" })
-				});`,
-				"if(!data) return;",
-				"for(; cc; i++) {",
-				Template.indent([
-					"cc = data.charCodeAt(i);",
-					`if(cc == ${cc("(")}) { token2 = token; token = ""; }`,
-					`else if(cc == ${cc(
-						")"
-					)}) { exports[token2.replace(/^_/, "")] = token.replace(/^_/, ""); token = ""; }`,
-					`else if(cc == ${cc("/")} || cc == ${cc(
-						"%"
-					)}) { token = token.replace(/^_/, ""); exports[token] = token; exportsWithId.push(token); if(cc == ${cc(
-						"%"
-					)}) exportsWithDashes.push(token); token = ""; }`,
-					`else if(!cc || cc == ${cc(
-						","
-					)}) { token = token.replace(/^_/, ""); exportsWithId.forEach(${runtimeTemplate.expressionFunction(
-						`exports[x] = ${
-							uniqueName
-								? runtimeTemplate.concatenation(
-										{ expr: "uniqueName" },
-										"-",
-										{ expr: "token" },
-										"-",
-										{ expr: "exports[x]" }
-								  )
-								: runtimeTemplate.concatenation({ expr: "token" }, "-", {
-										expr: "exports[x]"
-								  })
-						}`,
-						"x"
-					)}); exportsWithDashes.forEach(${runtimeTemplate.expressionFunction(
-						`exports[x] = "--" + exports[x]`,
-						"x"
-					)}); ${RuntimeGlobals.makeNamespaceObject}(exports); ${
-						RuntimeGlobals.moduleFactories
-					}[token] = (${runtimeTemplate.basicFunction(
-						"exports, module",
-						`module.exports = exports;`
-					)}).bind(null, exports); token = ""; exports = {}; exportsWithId.length = 0; }`,
-					`else if(cc == ${cc("\\")}) { token += data[++i] }`,
-					`else { token += data[i]; }`
-				]),
-				"}",
-				"installedChunks[chunkId] = 0;"
-			])}`,
+			`var loadCssChunkData = ${runtimeTemplate.basicFunction(
+				"target, link, chunkId",
+				[
+					`var data, token = "", token2, exports = {}, exportsWithId = [], exportsWithDashes = [], ${
+						withHmr ? "moduleIds = [], " : ""
+					}i = 0, cc = 1;`,
+					"try { if(!link) link = loadStylesheet(chunkId); data = link.sheet.cssRules; data = data[data.length - 1].style; } catch(e) { data = getComputedStyle(document.head); }",
+					`data = data.getPropertyValue(${
+						uniqueName
+							? runtimeTemplate.concatenation(
+									"--webpack-",
+									{ expr: "uniqueName" },
+									"-",
+									{ expr: "chunkId" }
+							  )
+							: runtimeTemplate.concatenation("--webpack-", { expr: "chunkId" })
+					});`,
+					"if(!data) return [];",
+					"for(; cc; i++) {",
+					Template.indent([
+						"cc = data.charCodeAt(i);",
+						`if(cc == ${cc("(")}) { token2 = token; token = ""; }`,
+						`else if(cc == ${cc(
+							")"
+						)}) { exports[token2.replace(/^_/, "")] = token.replace(/^_/, ""); token = ""; }`,
+						`else if(cc == ${cc("/")} || cc == ${cc(
+							"%"
+						)}) { token = token.replace(/^_/, ""); exports[token] = token; exportsWithId.push(token); if(cc == ${cc(
+							"%"
+						)}) exportsWithDashes.push(token); token = ""; }`,
+						`else if(!cc || cc == ${cc(
+							","
+						)}) { token = token.replace(/^_/, ""); exportsWithId.forEach(${runtimeTemplate.expressionFunction(
+							`exports[x] = ${
+								uniqueName
+									? runtimeTemplate.concatenation(
+											{ expr: "uniqueName" },
+											"-",
+											{ expr: "token" },
+											"-",
+											{ expr: "exports[x]" }
+									  )
+									: runtimeTemplate.concatenation({ expr: "token" }, "-", {
+											expr: "exports[x]"
+									  })
+							}`,
+							"x"
+						)}); exportsWithDashes.forEach(${runtimeTemplate.expressionFunction(
+							`exports[x] = "--" + exports[x]`,
+							"x"
+						)}); ${
+							RuntimeGlobals.makeNamespaceObject
+						}(exports); target[token] = (${runtimeTemplate.basicFunction(
+							"exports, module",
+							`module.exports = exports;`
+						)}).bind(null, exports); ${
+							withHmr ? "moduleIds.push(token); " : ""
+						}token = ""; exports = {}; exportsWithId.length = 0; }`,
+						`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" : ""),
@@ -206,14 +214,18 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 					"for(var i = 0; i < links.length; i++) {",
 					Template.indent([
 						"var l = links[i];",
-						`if(l.getAttribute("href") == url${
+						`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; }`
+						})) { link = l; break; }`
 					]),
 					"}",
-					"if(!url) return link;",
+					"if(!done) return link;",
 					withHmr ? "}" : "",
 					"if(!link) {",
 					Template.indent([
@@ -239,95 +251,94 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 						"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 > 5
+			initialChunkIdsWithCss.size > 2
 				? `${JSON.stringify(
 						Array.from(initialChunkIdsWithCss)
-				  )}.forEach(loadCssChunkData);`
+				  )}.forEach(loadCssChunkData.bind(null, ${
+						RuntimeGlobals.moduleFactories
+				  }, 0));`
 				: initialChunkIdsWithCss.size > 0
 				? `${Array.from(
 						initialChunkIdsWithCss,
-						id => `loadCssChunkData(${JSON.stringify(id)});`
+						id =>
+							`loadCssChunkData(${
+								RuntimeGlobals.moduleFactories
+							}, 0, ${JSON.stringify(id)});`
 				  ).join("")}`
 				: "// no initial css",
 			"",
 			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(chunkId, link);",
-																		"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",
 			"",
@@ -336,17 +347,41 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 						"var oldTags = [];",
 						"var newTags = [];",
 						`var applyHandler = ${runtimeTemplate.basicFunction("options", [
-							`return { dispose: ${runtimeTemplate.basicFunction("", [
+							`return { dispose: ${runtimeTemplate.basicFunction(
+								"",
+								[]
+							)}, apply: ${runtimeTemplate.basicFunction("", [
+								"var moduleIds = [];",
+								`newTags.forEach(${runtimeTemplate.expressionFunction(
+									"info[1].sheet.disabled = false",
+									"info"
+								)});`,
 								"while(oldTags.length) {",
 								Template.indent([
 									"var oldTag = oldTags.pop();",
 									"if(oldTag.parentNode) oldTag.parentNode.removeChild(oldTag);"
 								]),
-								"}"
-							])}, apply: ${runtimeTemplate.basicFunction("", [
-								'while(newTags.length) { var info = newTags.pop(); info[1].media = "all"; loadCssChunkData(info[0], info[1]); }'
+								"}",
+								"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"
+									)});`
+								]),
+								"}",
+								"return moduleIds;"
 							])} };`
 						])}`,
+						`var cssTextKey = ${runtimeTemplate.returningFunction(
+							`Array.from(link.sheet.cssRules, ${runtimeTemplate.returningFunction(
+								"r.cssText",
+								"r"
+							)}).join()`,
+							"link"
+						)}`,
 						`${
 							RuntimeGlobals.hmrDownloadUpdateHandlers
 						}.css = ${runtimeTemplate.basicFunction(
@@ -354,14 +389,14 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 							[
 								"applyHandlers.push(applyHandler);",
 								`chunkIds.forEach(${runtimeTemplate.basicFunction("chunkId", [
-									"var oldTag = loadStylesheet(chunkId);",
-									"if(!oldTag) return;",
 									`var filename = ${RuntimeGlobals.getChunkCssFilename}(chunkId);`,
 									`var url = ${RuntimeGlobals.publicPath} + filename;`,
+									"var oldTag = loadStylesheet(chunkId, url);",
+									"if(!oldTag) return;",
 									`promises.push(new Promise(${runtimeTemplate.basicFunction(
 										"resolve, reject",
 										[
-											`var link = loadStylesheet(chunkId, url, ${runtimeTemplate.basicFunction(
+											`var link = loadStylesheet(chunkId, url + (url.indexOf("?") < 0 ? "?" : "&") + "hmr=" + Date.now(), ${runtimeTemplate.basicFunction(
 												"event",
 												[
 													'if(event.type !== "load") {',
@@ -374,11 +409,23 @@ class CssLoadingRuntimeModule extends RuntimeModule {
 														"error.request = realSrc;",
 														"reject(error);"
 													]),
-													"} else resolve();"
+													"} 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]);",
+														"resolve();"
+													]),
+													"}"
 												]
-											)}, true);`,
-											"oldTags.push(oldTag);",
-											"newTags.push([chunkId, link]);"
+											)}, oldTag);`
 										]
 									)}));`
 								])});`