From 36cf3039aad66919ceb5a3770eea5c88f84c40eb Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 17 Jul 2020 14:57:11 +0200 Subject: [PATCH] use content hashes for assets --- lib/Compilation.js | 25 +++++++++----- lib/HotModuleReplacementPlugin.js | 24 +++++++++---- lib/Template.js | 14 +++++++- lib/TemplatedPathPlugin.js | 22 ++++++------ lib/asset/AssetGenerator.js | 32 ++++++++++++++---- lib/asset/AssetModulesPlugin.js | 19 +++-------- .../__snapshots__/StatsTestCases.test.js.snap | 4 +-- .../asset-modules/_images/file_copy.png | Bin 0 -> 14910 bytes .../asset-modules/real-content-hash/index.js | 6 ++++ .../real-content-hash/webpack.config.js | 19 +++++++++++ types.d.ts | 19 +++++++++-- 11 files changed, 131 insertions(+), 53 deletions(-) create mode 100644 test/configCases/asset-modules/_images/file_copy.png create mode 100644 test/configCases/asset-modules/real-content-hash/index.js create mode 100644 test/configCases/asset-modules/real-content-hash/webpack.config.js diff --git a/lib/Compilation.js b/lib/Compilation.js index 93144f27f..f12484946 100644 --- a/lib/Compilation.js +++ b/lib/Compilation.js @@ -2710,12 +2710,16 @@ Make sure to select an appropriate stage from Compilation.PROCESS_ASSETS_STAGE_* let filenameTemplate; /** @type {string} */ let file; + /** @type {AssetInfo} */ + let assetInfo; let inTry = true; const errorAndCallback = err => { const filename = file || - (typeof filenameTemplate === "string" + (typeof file === "string" + ? file + : typeof filenameTemplate === "string" ? filenameTemplate : ""); @@ -2725,13 +2729,18 @@ Make sure to select an appropriate stage from Compilation.PROCESS_ASSETS_STAGE_* }; try { - filenameTemplate = fileManifest.filenameTemplate; - const pathAndInfo = this.getPathWithInfo( - filenameTemplate, - fileManifest.pathOptions - ); - file = pathAndInfo.path; - const assetInfo = pathAndInfo.info; + if ("filename" in fileManifest) { + file = fileManifest.filename; + assetInfo = fileManifest.info; + } else { + filenameTemplate = fileManifest.filenameTemplate; + const pathAndInfo = this.getPathWithInfo( + filenameTemplate, + fileManifest.pathOptions + ); + file = pathAndInfo.path; + assetInfo = pathAndInfo.info; + } if (err) { return errorAndCallback(err); diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js index 00afc0983..f82f3d870 100644 --- a/lib/HotModuleReplacementPlugin.js +++ b/lib/HotModuleReplacementPlugin.js @@ -28,6 +28,7 @@ const { find } = require("./util/SetHelpers"); const { compareModulesById } = require("./util/comparators"); /** @typedef {import("./Chunk")} Chunk */ +/** @typedef {import("./Compilation").AssetInfo} AssetInfo */ /** @typedef {import("./Compiler")} Compiler */ /** @typedef {import("./Module")} Module */ @@ -454,13 +455,22 @@ class HotModuleReplacementPlugin { chunkGraph }); for (const entry of renderManifest) { - const { - path: filename, - info: assetInfo - } = compilation.getPathWithInfo( - entry.filenameTemplate, - entry.pathOptions - ); + /** @type {string} */ + let filename; + /** @type {AssetInfo} */ + let assetInfo; + if ("filename" in entry) { + filename = entry.filename; + assetInfo = entry.info; + } else { + ({ + path: filename, + info: assetInfo + } = compilation.getPathWithInfo( + entry.filenameTemplate, + entry.pathOptions + )); + } const source = entry.render(); compilation.additionalChunkAssets.push(filename); compilation.emitAsset(filename, source, { diff --git a/lib/Template.js b/lib/Template.js index 4bd62d150..b446fa139 100644 --- a/lib/Template.js +++ b/lib/Template.js @@ -53,8 +53,10 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g; * @property {ChunkGraph} chunkGraph */ +/** @typedef {RenderManifestEntryTemplated | RenderManifestEntryStatic} RenderManifestEntry */ + /** - * @typedef {Object} RenderManifestEntry + * @typedef {Object} RenderManifestEntryTemplated * @property {function(): Source} render * @property {string | function(PathData, AssetInfo=): string} filenameTemplate * @property {PathData=} pathOptions @@ -63,6 +65,16 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g; * @property {boolean=} auxiliary */ +/** + * @typedef {Object} RenderManifestEntryStatic + * @property {function(): Source} render + * @property {string} filename + * @property {AssetInfo} info + * @property {string} identifier + * @property {string=} hash + * @property {boolean=} auxiliary + */ + /** * @typedef {Object} HasId * @property {number | string} id diff --git a/lib/TemplatedPathPlugin.js b/lib/TemplatedPathPlugin.js index 0e32fefd2..141a16c8d 100644 --- a/lib/TemplatedPathPlugin.js +++ b/lib/TemplatedPathPlugin.js @@ -225,7 +225,7 @@ const replacePathVariables = (path, data, assetInfo) => { module instanceof Module ? chunkGraph.getModuleId(module) : module.id ) ); - const hashReplacer = hashLength( + const moduleHashReplacer = hashLength( replacer( module instanceof Module ? chunkGraph.getRenderedModuleHash(module) @@ -234,9 +234,19 @@ const replacePathVariables = (path, data, assetInfo) => { "hashWithLength" in module ? module.hashWithLength : undefined, assetInfo ); + const contentHashReplacer = hashLength( + replacer(data.contentHash), + undefined, + assetInfo + ); replacements.set("id", idReplacer); - replacements.set("hash", hashReplacer); + replacements.set("modulehash", moduleHashReplacer); + replacements.set("contenthash", contentHashReplacer); + replacements.set( + "hash", + data.contentHash ? contentHashReplacer : moduleHashReplacer + ); // Legacy replacements.set( "moduleid", @@ -246,14 +256,6 @@ const replacePathVariables = (path, data, assetInfo) => { "DEP_WEBPACK_TEMPLATE_PATH_PLUGIN_REPLACE_PATH_VARIABLES_MODULE_ID" ) ); - replacements.set( - "modulehash", - deprecated( - hashReplacer, - "[modulehash] is now [hash]", - "DEP_WEBPACK_TEMPLATE_PATH_PLUGIN_REPLACE_PATH_VARIABLES_MODULE_HASH" - ) - ); } // Other things diff --git a/lib/asset/AssetGenerator.js b/lib/asset/AssetGenerator.js index 945ea0d00..35a2a72a9 100644 --- a/lib/asset/AssetGenerator.js +++ b/lib/asset/AssetGenerator.js @@ -10,6 +10,7 @@ const path = require("path"); const { RawSource } = require("webpack-sources"); const Generator = require("../Generator"); const RuntimeGlobals = require("../RuntimeGlobals"); +const createHash = require("../util/createHash"); /** @typedef {import("webpack-sources").Source} Source */ /** @typedef {import("../../declarations/plugins/AssetModulesPluginGenerator").AssetModulesPluginGeneratorOptions} AssetModulesPluginGeneratorOptions */ @@ -51,9 +52,8 @@ class AssetGenerator extends Generator { default: { runtimeRequirements.add(RuntimeGlobals.module); + const originalSource = module.originalSource(); if (module.buildInfo.dataUrl) { - const originalSource = module.originalSource(); - let encodedSource; if (typeof this.dataUrlOptions === "function") { encodedSource = this.dataUrlOptions.call( @@ -108,21 +108,39 @@ class AssetGenerator extends Generator { )};` ); } else { - const filename = module.nameForCondition(); const assetModuleFilename = this.filename || runtimeTemplate.outputOptions.assetModuleFilename; - const url = this.compilation.getAssetPath(assetModuleFilename, { + const hash = createHash(runtimeTemplate.outputOptions.hashFunction); + if (runtimeTemplate.outputOptions.hashSalt) { + hash.update(runtimeTemplate.outputOptions.hashSalt); + } + hash.update(originalSource.buffer()); + const fullHash = /** @type {string} */ (hash.digest( + runtimeTemplate.outputOptions.hashDigest + )); + const contentHash = fullHash.slice( + 0, + runtimeTemplate.outputOptions.hashDigestLength + ); + module.buildInfo.fullContentHash = fullHash; + const { + path: filename, + info + } = this.compilation.getAssetPathWithInfo(assetModuleFilename, { module, - filename, - chunkGraph + filename: module.nameForCondition(), + chunkGraph, + contentHash }); + module.buildInfo.filename = filename; + module.buildInfo.assetInfo = info; runtimeRequirements.add(RuntimeGlobals.publicPath); // add __webpack_require__.p return new RawSource( `${RuntimeGlobals.module}.exports = ${ RuntimeGlobals.publicPath - } + ${JSON.stringify(url)};` + } + ${JSON.stringify(filename)};` ); } } diff --git a/lib/asset/AssetModulesPlugin.js b/lib/asset/AssetModulesPlugin.js index d8e036402..ad43fd8a7 100644 --- a/lib/asset/AssetModulesPlugin.js +++ b/lib/asset/AssetModulesPlugin.js @@ -148,9 +148,7 @@ class AssetModulesPlugin { compilation.hooks.renderManifest.tap(plugin, (result, options) => { const { chunkGraph } = compilation; - const { chunk, runtimeTemplate, codeGenerationResults } = options; - - const { outputOptions } = runtimeTemplate; + const { chunk, codeGenerationResults } = options; const modules = chunkGraph.getOrderedChunkModulesIterableBySourceType( chunk, @@ -159,23 +157,14 @@ class AssetModulesPlugin { ); if (modules) { for (const module of modules) { - const filename = module.nameForCondition(); - const filenameTemplate = - module.buildInfo.assetFilename || - outputOptions.assetModuleFilename; - result.push({ render: () => codeGenerationResults.get(module).sources.get(type), - filenameTemplate, - pathOptions: { - module, - filename, - chunkGraph - }, + filename: module.buildInfo.filename, + info: module.buildInfo.assetInfo, auxiliary: true, identifier: `assetModule${chunkGraph.getModuleId(module)}`, - hash: chunkGraph.getModuleHash(module) + hash: module.buildInfo.fullContentHash }); } } diff --git a/test/__snapshots__/StatsTestCases.test.js.snap b/test/__snapshots__/StatsTestCases.test.js.snap index d4e7f4ba6..74908931c 100644 --- a/test/__snapshots__/StatsTestCases.test.js.snap +++ b/test/__snapshots__/StatsTestCases.test.js.snap @@ -135,10 +135,10 @@ exports[`StatsTestCases should print correct stats for asset 1`] = ` Time: X ms Built at: 1970-04-20 12:42:42 Asset Size +89a353e9c515885abd8e.png 14.6 KiB [emitted] [immutable] [name: (main)] bundle.js 10.9 KiB [emitted] [name: main] -d896afc62bcc5d86ee78.png 14.6 KiB [emitted] [immutable] [name: (main)] static/file.html 12 bytes [emitted] [name: (main)] -Entrypoint main = bundle.js (d896afc62bcc5d86ee78.png static/file.html) +Entrypoint main = bundle.js (89a353e9c515885abd8e.png static/file.html) ./index.js 150 bytes [built] ./images/file.png 42 bytes (javascript) 14.6 KiB (asset) [built] ./images/file.svg 915 bytes [built] diff --git a/test/configCases/asset-modules/_images/file_copy.png b/test/configCases/asset-modules/_images/file_copy.png new file mode 100644 index 0000000000000000000000000000000000000000..fb53b9dedd3b409ea93b7db98a2c34454bf95fee GIT binary patch literal 14910 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
ci;+pI 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 { + expect(a).toBe(b); +}); diff --git a/test/configCases/asset-modules/real-content-hash/webpack.config.js b/test/configCases/asset-modules/real-content-hash/webpack.config.js new file mode 100644 index 000000000..cf5511ab5 --- /dev/null +++ b/test/configCases/asset-modules/real-content-hash/webpack.config.js @@ -0,0 +1,19 @@ +/** @type {import("../../../../").Configuration} */ +module.exports = { + mode: "development", + output: { + publicPath: "assets/", + assetModuleFilename: "file[ext]" + }, + module: { + rules: [ + { + test: /\.png$/, + type: "asset/resource" + } + ] + }, + experiments: { + asset: true + } +}; diff --git a/types.d.ts b/types.d.ts index 47514ee69..e619dbd9c 100644 --- a/types.d.ts +++ b/types.d.ts @@ -1006,7 +1006,10 @@ declare class Compilation { needAdditionalSeal: SyncBailHook<[], boolean>; afterSeal: AsyncSeriesHook<[]>; renderManifest: SyncWaterfallHook< - [RenderManifestEntry[], RenderManifestOptions] + [ + (RenderManifestEntryTemplated | RenderManifestEntryStatic)[], + RenderManifestOptions + ] >; fullHash: SyncHook<[Hash], void>; chunkHash: SyncHook<[Chunk, Hash, ChunkHashContext], void>; @@ -1203,7 +1206,9 @@ declare class Compilation { getAsset(name: string): Readonly; clearAssets(): void; createModuleAssets(): void; - getRenderManifest(options: RenderManifestOptions): RenderManifestEntry[]; + getRenderManifest( + options: RenderManifestOptions + ): (RenderManifestEntryTemplated | RenderManifestEntryStatic)[]; createChunkAssets(callback: (err?: WebpackError) => void): void; getPath( filename: string | ((arg0: PathData, arg1: AssetInfo) => string), @@ -5844,7 +5849,15 @@ declare interface RenderContextObject { */ codeGenerationResults: Map; } -declare interface RenderManifestEntry { +declare interface RenderManifestEntryStatic { + render: () => Source; + filename: string; + info: AssetInfo; + identifier: string; + hash?: string; + auxiliary?: boolean; +} +declare interface RenderManifestEntryTemplated { render: () => Source; filenameTemplate: string | ((arg0: PathData, arg1: AssetInfo) => string); pathOptions?: PathData;