webpack 5.27.2 → 5.28.0

package/lib/NormalModule.js

@@ -367,6 +367,7 @@ class NormalModule extends Module {
 	 * @param {NormalModuleFactory} normalModuleFactory the normal module factory handling the unsafe caching
 	 */
 	_restoreFromUnsafeCache(unsafeCacheData, normalModuleFactory) {
+		super._restoreFromUnsafeCache(unsafeCacheData, normalModuleFactory);
 		this.parserOptions = unsafeCacheData.parserOptions;
 		this.parser = normalModuleFactory.getParser(this.type, this.parserOptions);
 		this.generatorOptions = unsafeCacheData.generatorOptions;

package/lib/asset/AssetGenerator.js

@@ -15,6 +15,7 @@ const { makePathsRelative } = require("../util/identifier");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../../declarations/WebpackOptions").AssetGeneratorOptions} AssetGeneratorOptions */
+/** @typedef {import("../../declarations/WebpackOptions").RawPublicPath} RawPublicPath */
 /** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
@@ -24,6 +25,55 @@ const { makePathsRelative } = require("../util/identifier");
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../util/Hash")} Hash */
 
+const mergeMaybeArrays = (a, b) => {
+	const set = new Set();
+	if (Array.isArray(a)) for (const item of a) set.add(item);
+	else set.add(a);
+	if (Array.isArray(b)) for (const item of b) set.add(item);
+	else set.add(b);
+	return Array.from(set);
+};
+
+const mergeAssetInfo = (a, b) => {
+	const result = { ...a, ...b };
+	for (const key of Object.keys(a)) {
+		if (key in b) {
+			if (a[key] === b[key]) continue;
+			switch (key) {
+				case "fullhash":
+				case "chunkhash":
+				case "modulehash":
+				case "contenthash":
+					result[key] = mergeMaybeArrays(a[key], b[key]);
+					break;
+				case "immutable":
+				case "development":
+				case "hotModuleReplacement":
+				case "javascriptModule	":
+					result[key] = a[key] || b[key];
+					break;
+				case "related":
+					result[key] = mergeRelatedInfo(a[key], b[key]);
+					break;
+				default:
+					throw new Error(`Can't handle conflicting asset info for ${key}`);
+			}
+		}
+	}
+	return result;
+};
+
+const mergeRelatedInfo = (a, b) => {
+	const result = { ...a, ...b };
+	for (const key of Object.keys(a)) {
+		if (key in b) {
+			if (a[key] === b[key]) continue;
+			result[key] = mergeMaybeArrays(a[key], b[key]);
+		}
+	}
+	return result;
+};
+
 const JS_TYPES = new Set(["javascript"]);
 const JS_AND_ASSET_TYPES = new Set(["javascript", "asset"]);
 
@@ -31,12 +81,14 @@ class AssetGenerator extends Generator {
 	/**
 	 * @param {AssetGeneratorOptions["dataUrl"]=} dataUrlOptions the options for the data url
 	 * @param {string=} filename override for output.assetModuleFilename
+	 * @param {RawPublicPath=} publicPath override for output.assetModulePublicPath
 	 * @param {boolean=} emit generate output asset
 	 */
-	constructor(dataUrlOptions, filename, emit) {
+	constructor(dataUrlOptions, filename, publicPath, emit) {
 		super();
 		this.dataUrlOptions = dataUrlOptions;
 		this.filename = filename;
+		this.publicPath = publicPath;
 		this.emit = emit;
 	}
 
@@ -131,9 +183,9 @@ class AssetGenerator extends Generator {
 						module.matchResource || module.resource,
 						runtimeTemplate.compilation.compiler.root
 					).replace(/^\.\//, "");
-					const {
+					let {
 						path: filename,
-						info
+						info: assetInfo
 					} = runtimeTemplate.compilation.getAssetPathWithInfo(
 						assetModuleFilename,
 						{
@@ -144,11 +196,33 @@ class AssetGenerator extends Generator {
 							contentHash
 						}
 					);
-					module.buildInfo.filename = filename;
-					module.buildInfo.assetInfo = {
+					let publicPath;
+					if (this.publicPath) {
+						const {
+							path,
+							info
+						} = runtimeTemplate.compilation.getAssetPathWithInfo(
+							this.publicPath,
+							{
+								module,
+								runtime,
+								filename: sourceFilename,
+								chunkGraph,
+								contentHash
+							}
+						);
+						publicPath = JSON.stringify(path);
+						assetInfo = mergeAssetInfo(assetInfo, info);
+					} else {
+						publicPath = RuntimeGlobals.publicPath;
+						runtimeRequirements.add(RuntimeGlobals.publicPath); // add __webpack_require__.p
+					}
+					assetInfo = {
 						sourceFilename,
-						...info
+						...assetInfo
 					};
+					module.buildInfo.filename = filename;
+					module.buildInfo.assetInfo = assetInfo;
 					if (getData) {
 						// Due to code generation caching module.buildInfo.XXX can't used to store such information
 						// It need to be stored in the code generation results instead, where it's cached too
@@ -156,15 +230,13 @@ class AssetGenerator extends Generator {
 						const data = getData();
 						data.set("fullContentHash", fullHash);
 						data.set("filename", filename);
-						data.set("assetInfo", info);
+						data.set("assetInfo", assetInfo);
 					}
 
-					runtimeRequirements.add(RuntimeGlobals.publicPath); // add __webpack_require__.p
-
 					return new RawSource(
-						`${RuntimeGlobals.module}.exports = ${
-							RuntimeGlobals.publicPath
-						} + ${JSON.stringify(filename)};`
+						`${
+							RuntimeGlobals.module
+						}.exports = ${publicPath} + ${JSON.stringify(filename)};`
 					);
 				}
 			}

package/lib/asset/AssetModulesPlugin.js

@@ -118,8 +118,10 @@ class AssetModulesPlugin {
 							}
 
 							let filename = undefined;
+							let publicPath = undefined;
 							if (type !== "asset/inline") {
 								filename = generatorOptions.filename;
+								publicPath = generatorOptions.publicPath;
 							}
 
 							const AssetGenerator = getAssetGenerator();
@@ -127,6 +129,7 @@ class AssetModulesPlugin {
 							return new AssetGenerator(
 								dataUrl,
 								filename,
+								publicPath,
 								generatorOptions.emit !== false
 							);
 						});

package/lib/serialization/ObjectMiddleware.js

@@ -408,16 +408,13 @@ class ObjectMiddleware extends SerializerMiddleware {
 		};
 		this.extendContext(ctx);
 		const process = item => {
-			// check if we can emit a reference
-			const ref = referenceable.get(item);
-
-			if (ref !== undefined) {
-				result.push(ESCAPE, ref - currentPos);
-
-				return;
-			}
-
 			if (Buffer.isBuffer(item)) {
+				// check if we can emit a reference
+				const ref = referenceable.get(item);
+				if (ref !== undefined) {
+					result.push(ESCAPE, ref - currentPos);
+					return;
+				}
 				const alreadyUsedBuffer = dedupeBuffer(item);
 				if (alreadyUsedBuffer !== item) {
 					const ref = referenceable.get(alreadyUsedBuffer);
@@ -431,7 +428,19 @@ class ObjectMiddleware extends SerializerMiddleware {
 				addReferenceable(item);
 
 				result.push(item);
-			} else if (typeof item === "object" && item !== null) {
+			} else if (item === ESCAPE) {
+				result.push(ESCAPE, ESCAPE_ESCAPE_VALUE);
+			} else if (
+				typeof item === "object"
+				// We don't have to check for null as ESCAPE is null and this has been checked before
+			) {
+				// check if we can emit a reference
+				const ref = referenceable.get(item);
+				if (ref !== undefined) {
+					result.push(ESCAPE, ref - currentPos);
+					return;
+				}
+
 				if (cycleStack.has(item)) {
 					throw new Error(`Circular references can't be serialized`);
 				}
@@ -464,6 +473,12 @@ class ObjectMiddleware extends SerializerMiddleware {
 			} else if (typeof item === "string") {
 				if (item.length > 1) {
 					// short strings are shorter when not emitting a reference (this saves 1 byte per empty string)
+					// check if we can emit a reference
+					const ref = referenceable.get(item);
+					if (ref !== undefined) {
+						result.push(ESCAPE, ref - currentPos);
+						return;
+					}
 					addReferenceable(item);
 				}
 
@@ -476,8 +491,6 @@ class ObjectMiddleware extends SerializerMiddleware {
 				}
 
 				result.push(item);
-			} else if (item === ESCAPE) {
-				result.push(ESCAPE, ESCAPE_ESCAPE_VALUE);
 			} else if (typeof item === "function") {
 				if (!SerializerMiddleware.isLazy(item))
 					throw new Error("Unexpected function " + item);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.27.2",
+  "version": "5.28.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",

package/schemas/WebpackOptions.json

@@ -107,6 +107,9 @@
         },
         "filename": {
           "$ref": "#/definitions/FilenameTemplate"
+        },
+        "publicPath": {
+          "$ref": "#/definitions/RawPublicPath"
         }
       }
     },
@@ -178,6 +181,9 @@
         },
         "filename": {
           "$ref": "#/definitions/FilenameTemplate"
+        },
+        "publicPath": {
+          "$ref": "#/definitions/RawPublicPath"
         }
       }
     },
@@ -2912,11 +2918,19 @@
       "type": "boolean"
     },
     "PublicPath": {
-      "description": "The `publicPath` specifies the public URL address of the output files when referenced in a browser.",
+      "description": "The 'publicPath' specifies the public URL address of the output files when referenced in a browser.",
       "anyOf": [
         {
           "enum": ["auto"]
         },
+        {
+          "$ref": "#/definitions/RawPublicPath"
+        }
+      ]
+    },
+    "RawPublicPath": {
+      "description": "The 'publicPath' specifies the public URL address of the output files when referenced in a browser.",
+      "anyOf": [
         {
           "type": "string"
         },

package/types.d.ts

@@ -312,6 +312,11 @@ declare interface AssetResourceGeneratorOptions {
 	 * Specifies the filename template of output files on disk. You must **not** specify an absolute path here, but the path may contain folders separated by '/'! The specified path is joined with the value of the 'output.path' option to determine the location on disk.
 	 */
 	filename?: string | ((pathData: PathData, assetInfo?: AssetInfo) => string);
+
+	/**
+	 * The 'publicPath' specifies the public URL address of the output files when referenced in a browser.
+	 */
+	publicPath?: string | ((pathData: PathData, assetInfo?: AssetInfo) => string);
 }
 declare abstract class AsyncDependenciesBlock extends DependenciesBlock {
 	groupOptions: RawChunkGroupOptions & { name?: string } & {
@@ -7388,7 +7393,7 @@ declare interface Output {
 	pathinfo?: boolean | "verbose";
 
 	/**
-	 * The `publicPath` specifies the public URL address of the output files when referenced in a browser.
+	 * The 'publicPath' specifies the public URL address of the output files when referenced in a browser.
 	 */
 	publicPath?: string | ((pathData: PathData, assetInfo?: AssetInfo) => string);
 
@@ -7650,7 +7655,7 @@ declare interface OutputNormalized {
 	pathinfo?: boolean | "verbose";
 
 	/**
-	 * The `publicPath` specifies the public URL address of the output files when referenced in a browser.
+	 * The 'publicPath' specifies the public URL address of the output files when referenced in a browser.
 	 */
 	publicPath?: string | ((pathData: PathData, assetInfo?: AssetInfo) => string);