From 204caeee05662e86d2712ccfe9da6b3e12bade5c Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Fri, 16 Oct 2020 14:29:35 +0200 Subject: [PATCH] fix order of asset optimization to fix conflict between compression-plugin and real hash plugin --- lib/Compilation.js | 8 ++++---- types.d.ts | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Compilation.js b/lib/Compilation.js index 1dd47fe4d48..debbef4abbc 100644 --- a/lib/Compilation.js +++ b/lib/Compilation.js @@ -3443,14 +3443,14 @@ Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE = 1000; Compilation.PROCESS_ASSETS_STAGE_DEV_TOOLING = 2000; /** - * Optimize the transfer of existing assets, e. g. by preparing a compressed (gzip) file as separate asset. + * Optimize the hashes of the assets, e. g. by generating real hashes of the asset content. */ -Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER = 3000; +Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_HASH = 2500; /** - * Optimize the hashes of the assets, e. g. by generating real hashes of the asset content. + * Optimize the transfer of existing assets, e. g. by preparing a compressed (gzip) file as separate asset. */ -Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_HASH = 3500; +Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER = 3000; /** * Analyse existing assets. diff --git a/types.d.ts b/types.d.ts index ebe3e0a0417..acf01b3e997 100644 --- a/types.d.ts +++ b/types.d.ts @@ -1547,14 +1547,14 @@ declare class Compilation { static PROCESS_ASSETS_STAGE_DEV_TOOLING: number; /** - * Optimize the transfer of existing assets, e. g. by preparing a compressed (gzip) file as separate asset. + * Optimize the hashes of the assets, e. g. by generating real hashes of the asset content. */ - static PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER: number; + static PROCESS_ASSETS_STAGE_OPTIMIZE_HASH: number; /** - * Optimize the hashes of the assets, e. g. by generating real hashes of the asset content. + * Optimize the transfer of existing assets, e. g. by preparing a compressed (gzip) file as separate asset. */ - static PROCESS_ASSETS_STAGE_OPTIMIZE_HASH: number; + static PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER: number; /** * Analyse existing assets.