Fix merge

waysact · Jan 12, 2023 · 08a6e98 · 08a6e98
1 parent bb32769
commit 08a6e98
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/webpack-subresource-integrity/src/plugin.ts b/webpack-subresource-integrity/src/plugin.ts
@@ -28,7 +28,7 @@ import {
   getTagSrc,
   notNil,
   sriHashVariableReference,
-  updateAssetHash,
+  updateAsset,
   tryGetSource,
   replaceInSource,
   usesAnyHash,
@@ -128,12 +128,12 @@ export class Plugin {
   ): sources.Source => {
     const asset = assets[chunkFile];
     assert(asset, `Missing asset for file ${chunkFile}`);
-    return (assets[chunkFile] = replaceInSource(
+    return replaceInSource(
       compiler,
       asset,
       chunkFile,
       hashByPlaceholder
-    ));
+    );
   };
 
   private warnAboutLongTermCaching = (assetInfo: AssetInfo) => {
@@ -186,7 +186,7 @@ export class Plugin {
           );
         }
 
-        updateAssetHash(
+        updateAsset(
           this.compilation,
           sourcePath,
           newAsset,

diff --git a/webpack-subresource-integrity/src/util.ts b/webpack-subresource-integrity/src/util.ts
@@ -214,7 +214,7 @@ export function* allChunksInPrimaryChunkIterable(
   }
 }
 
-export function updateAssetHash(
+export function updateAsset(
   compilation: Compilation,
   assetPath: string,
   source: sources.Source,