Merge pull request #15222 from webpack/bugfix/serialization-warning

sokra · web-flow · commit 3014a3b8246f · 2022-01-21T17:42:08.000+01:00
store url as Buffer to avoid serialization warnings
diff --git a/lib/RuntimeTemplate.js b/lib/RuntimeTemplate.js
@@ -1031,7 +1031,7 @@ class RuntimeTemplate {
 		const codeGen = codeGenerationResults.get(module, runtime);
 		const { data } = codeGen;
 		const url = data.get("url");
-		if (url) return url;
+		if (url) return url.toString();
 		const filename = data.get("filename");
 		return publicPath + filename;
 	}
diff --git a/lib/asset/AssetGenerator.js b/lib/asset/AssetGenerator.js
@@ -215,7 +215,7 @@ class AssetGenerator extends Generator {
 						},${encodedContent}`;
 					}
 					const data = getData();
-					data.set("url", encodedSource);
+					data.set("url", Buffer.from(encodedSource));
 					return new RawSource(
 						`${RuntimeGlobals.module}.exports = ${JSON.stringify(
 							encodedSource
diff --git a/lib/asset/RawDataUrlModule.js b/lib/asset/RawDataUrlModule.js
@@ -33,6 +33,7 @@ class RawDataUrlModule extends Module {
 	constructor(url, identifier, readableIdentifier) {
 		super("asset/raw-data-url", null);
 		this.url = url;
+		this.urlBuffer = url ? Buffer.from(url) : undefined;
 		this.identifierStr = identifier || this.url;
 		this.readableIdentifierStr = readableIdentifier || this.identifierStr;
 	}
@@ -56,6 +57,7 @@ class RawDataUrlModule extends Module {
 	 * @returns {number} the estimated size of the module (must be non-zero)
 	 */
 	size(type) {
+		if (this.url === undefined) this.url = this.urlBuffer.toString();
 		return Math.max(1, this.url.length);
 	}
 
@@ -97,13 +99,14 @@ class RawDataUrlModule extends Module {
 	 * @returns {CodeGenerationResult} result
 	 */
 	codeGeneration(context) {
+		if (this.url === undefined) this.url = this.urlBuffer.toString();
 		const sources = new Map();
 		sources.set(
 			"javascript",
 			new RawSource(`module.exports = ${JSON.stringify(this.url)};`)
 		);
 		const data = new Map();
-		data.set("url", this.url);
+		data.set("url", this.urlBuffer);
 		const runtimeRequirements = new Set();
 		runtimeRequirements.add(RuntimeGlobals.module);
 		return { sources, runtimeRequirements, data };
@@ -115,14 +118,14 @@ class RawDataUrlModule extends Module {
 	 * @returns {void}
 	 */
 	updateHash(hash, context) {
-		hash.update(this.url);
+		hash.update(this.urlBuffer);
 		super.updateHash(hash, context);
 	}
 
 	serialize(context) {
 		const { write } = context;
 
-		write(this.url);
+		write(this.urlBuffer);
 		write(this.identifierStr);
 		write(this.readableIdentifierStr);
 
@@ -132,7 +135,7 @@ class RawDataUrlModule extends Module {
 	deserialize(context) {
 		const { read } = context;
 
-		this.url = read();
+		this.urlBuffer = read();
 		this.identifierStr = read();
 		this.readableIdentifierStr = read();
 

Original file line number	Diff line number	Diff line change
`@@ -1031,7 +1031,7 @@ class RuntimeTemplate {`
`1031`	`1031`	`const codeGen = codeGenerationResults.get(module, runtime);`
`1032`	`1032`	`const { data } = codeGen;`
`1033`	`1033`	`const url = data.get("url");`
`1034`		`- if (url) return url;`
	`1034`	`+ if (url) return url.toString();`
`1035`	`1035`	`const filename = data.get("filename");`
`1036`	`1036`	`return publicPath + filename;`
`1037`	`1037`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ class AssetGenerator extends Generator {`
`215`	`215`	},${encodedContent}`;
`216`	`216`	`}`
`217`	`217`	`const data = getData();`
`218`		`- data.set("url", encodedSource);`
	`218`	`+ data.set("url", Buffer.from(encodedSource));`
`219`	`219`	`return new RawSource(`
`220`	`220`	`${RuntimeGlobals.module}.exports = ${JSON.stringify(
`221`	`221`	`encodedSource`