add allowNumericOnlyHash option for asset/resource

makaria · makaria · commit 8c3814bd4b83 · 2023-12-28T15:30:53.000+08:00
diff --git a/declarations/WebpackOptions.d.ts b/declarations/WebpackOptions.d.ts
@@ -2802,6 +2802,12 @@ export interface AssetResourceGeneratorOptions {
 	 * The 'publicPath' specifies the public URL address of the output files when referenced in a browser.
 	 */
 	publicPath?: RawPublicPath;
+	/**
+	 * when false, if hash has only numeric char, the returned hash will be prefixed with character `a` to make it has at least one non numeric char.
+	 * when true, the returned hash may not contain any non-numeric characters.
+	 * default false.
+	 */
+	allowNumericOnlyHash?: boolean;
 }
 /**
  * Options for css handling.
diff --git a/lib/asset/AssetGenerator.js b/lib/asset/AssetGenerator.js
@@ -138,14 +138,23 @@ class AssetGenerator extends Generator {
 	 * @param {RawPublicPath=} publicPath override for output.assetModulePublicPath
 	 * @param {AssetModuleOutputPath=} outputPath the output path for the emitted file which is not included in the runtime import
 	 * @param {boolean=} emit generate output asset
+	 * @param {boolean=} allowNumericOnlyHash allow numeric only hash, disable nonNumericOnlyHash
 	 */
-	constructor(dataUrlOptions, filename, publicPath, outputPath, emit) {
+	constructor(
+		dataUrlOptions,
+		filename,
+		publicPath,
+		outputPath,
+		emit,
+		allowNumericOnlyHash
+	) {
 		super();
 		this.dataUrlOptions = dataUrlOptions;
 		this.filename = filename;
 		this.publicPath = publicPath;
 		this.outputPath = outputPath;
 		this.emit = emit;
+		this.allowNumericOnlyHash = allowNumericOnlyHash;
 	}
 
 	/**
@@ -300,10 +309,18 @@ class AssetGenerator extends Generator {
 					const fullHash = /** @type {string} */ (
 						hash.digest(runtimeTemplate.outputOptions.hashDigest)
 					);
-					const contentHash = nonNumericOnlyHash(
-						fullHash,
-						runtimeTemplate.outputOptions.hashDigestLength
-					);
+					let contentHash = fullHash;
+					if (this.allowNumericOnlyHash) {
+						contentHash = fullHash.slice(
+							0,
+							runtimeTemplate.outputOptions.hashDigestLength
+						);
+					} else {
+						contentHash = nonNumericOnlyHash(
+							fullHash,
+							runtimeTemplate.outputOptions.hashDigestLength
+						);
+					}
 					module.buildInfo.fullContentHash = fullHash;
 					const sourceFilename = this.getSourceFileName(
 						module,
diff --git a/lib/asset/AssetModulesPlugin.js b/lib/asset/AssetModulesPlugin.js
@@ -165,7 +165,8 @@ class AssetModulesPlugin {
 								filename,
 								publicPath,
 								outputPath,
-								generatorOptions.emit !== false
+								generatorOptions.emit !== false,
+								generatorOptions.allowNumericOnlyHash === true
 							);
 						});
 				}
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -208,6 +208,10 @@
         },
         "publicPath": {
           "$ref": "#/definitions/RawPublicPath"
+        },
+        "allowNumericOnlyHash": {
+          "description": "Hash may not contain any non-numeric characters when true. Hash may prefixed with character 'a' when false.",
+          "type": "boolean"
         }
       }
     },
diff --git a/types.d.ts b/types.d.ts
@@ -348,6 +348,13 @@ declare interface AssetResourceGeneratorOptions {
 	 * The 'publicPath' specifies the public URL address of the output files when referenced in a browser.
 	 */
 	publicPath?: string | ((pathData: PathData, assetInfo?: AssetInfo) => string);
+
+	/**
+	 * when false, if hash has only numeric char, the returned hash will be prefixed with character `a` to make it has at least one non numeric char.
+	 * when true, the returned hash may not contain any non-numeric characters.
+	 * default false.
+	 */
+	allowNumericOnlyHash?: boolean;
 }
 declare class AsyncDependenciesBlock extends DependenciesBlock {
 	constructor(

Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,10 @@`
`208`	`208`	`},`
`209`	`209`	`"publicPath": {`
`210`	`210`	`"$ref": "#/definitions/RawPublicPath"`
	`211`	`+ },`
	`212`	`+ "allowNumericOnlyHash": {`
	`213`	`+ "description": "Hash may not contain any non-numeric characters when true. Hash may prefixed with character 'a' when false.",`
	`214`	`+ "type": "boolean"`
`211`	`215`	`}`
`212`	`216`	`}`
`213`	`217`	`},`