webpack-assets-manifest 6.0.1 → 6.0.2

package/dist/cjs/helpers.js

@@ -17,7 +17,7 @@ function asArray(data) {
     return Array.isArray(data) ? data : [data];
 }
 function getSRIHash(algorithm, content) {
-    return `${algorithm}-${(0, node_crypto_1.createHash)(algorithm).update(content, 'utf8').digest('base64')}`;
+    return `${algorithm}-${(0, node_crypto_1.createHash)(algorithm).update(content).digest('base64')}`;
 }
 function getSortedObject(object, compareFunction) {
     return Object.fromEntries(Object.entries(object).sort(compareFunction ? (left, right) => compareFunction(left[0], right[0]) : undefined));

package/dist/cjs/plugin.js

@@ -257,19 +257,26 @@ class WebpackAssetsManifest {
             const modules = chunkGraph.getChunkModulesIterableBySourceType(chunk, 'asset');
             if (modules) {
                 const { NormalModule } = compilation.compiler.webpack;
+                const infraLogger = compilation.compiler.getInfrastructureLogger(PLUGIN_NAME);
                 for (const module of modules) {
                     if (module instanceof NormalModule) {
                         const codeGenData = codeGenerationResults.get(module, chunk.runtime).data;
-                        const { assetInfo = codeGenData?.get('assetInfo'), filename = codeGenData?.get('filename') } = module.buildInfo ?? {};
-                        const info = Object.assign({
+                        const filename = module.buildInfo?.['filename'] ?? codeGenData?.get('filename');
+                        if (!filename) {
+                            infraLogger.warn(`Unable to get filename from module: "${module.rawRequest}"`);
+                            continue;
+                        }
+                        const assetInfo = module.buildInfo?.['assetInfo'] ?? codeGenData?.get('assetInfo');
+                        const info = {
                             rawRequest: module.rawRequest,
                             sourceFilename: (0, node_path_1.relative)(compiler.context, module.userRequest),
-                        }, assetInfo);
+                            ...assetInfo,
+                        };
                         assetsInfo.set(filename, info);
                         this.assetNames.set(contextRelativeKeys ? info.sourceFilename : (0, node_path_1.join)((0, node_path_1.dirname)(filename), (0, node_path_1.basename)(module.userRequest)), filename);
                     }
                     else {
-                        compilation.getLogger(PLUGIN_NAME).warn(`Unhandled module: ${module.constructor.name}`);
+                        infraLogger.warn(`Unhandled module: ${module.constructor.name}`);
                     }
                 }
             }
@@ -433,10 +440,11 @@ class WebpackAssetsManifest {
                 const sriHashes = new Map(integrityHashes.map((algorithm) => [algorithm, undefined]));
                 if (asset.info.contenthash) {
                     (0, helpers_js_1.asArray)(asset.info.contenthash)
+                        .flatMap((contentHash) => contentHash.split(' '))
                         .filter((contentHash) => integrityHashes.some((algorithm) => contentHash.startsWith(`${algorithm}-`)))
                         .forEach((sriHash) => sriHashes.set(sriHash.substring(0, sriHash.indexOf('-')), sriHash));
                 }
-                const assetContent = asset.source.source().toString();
+                const assetContent = asset.source.source();
                 sriHashes.forEach((value, key, map) => {
                     if (typeof value === 'undefined') {
                         map.set(key, (0, helpers_js_1.getSRIHash)(key, assetContent));

package/dist/mjs/helpers.js

@@ -7,7 +7,7 @@ export function asArray(data) {
     return Array.isArray(data) ? data : [data];
 }
 export function getSRIHash(algorithm, content) {
-    return `${algorithm}-${createHash(algorithm).update(content, 'utf8').digest('base64')}`;
+    return `${algorithm}-${createHash(algorithm).update(content).digest('base64')}`;
 }
 export function getSortedObject(object, compareFunction) {
     return Object.fromEntries(Object.entries(object).sort(compareFunction ? (left, right) => compareFunction(left[0], right[0]) : undefined));

package/dist/mjs/plugin.js

@@ -221,19 +221,26 @@ export class WebpackAssetsManifest {
             const modules = chunkGraph.getChunkModulesIterableBySourceType(chunk, 'asset');
             if (modules) {
                 const { NormalModule } = compilation.compiler.webpack;
+                const infraLogger = compilation.compiler.getInfrastructureLogger(PLUGIN_NAME);
                 for (const module of modules) {
                     if (module instanceof NormalModule) {
                         const codeGenData = codeGenerationResults.get(module, chunk.runtime).data;
-                        const { assetInfo = codeGenData?.get('assetInfo'), filename = codeGenData?.get('filename') } = module.buildInfo ?? {};
-                        const info = Object.assign({
+                        const filename = module.buildInfo?.['filename'] ?? codeGenData?.get('filename');
+                        if (!filename) {
+                            infraLogger.warn(`Unable to get filename from module: "${module.rawRequest}"`);
+                            continue;
+                        }
+                        const assetInfo = module.buildInfo?.['assetInfo'] ?? codeGenData?.get('assetInfo');
+                        const info = {
                             rawRequest: module.rawRequest,
                             sourceFilename: relative(compiler.context, module.userRequest),
-                        }, assetInfo);
+                            ...assetInfo,
+                        };
                         assetsInfo.set(filename, info);
                         this.assetNames.set(contextRelativeKeys ? info.sourceFilename : join(dirname(filename), basename(module.userRequest)), filename);
                     }
                     else {
-                        compilation.getLogger(PLUGIN_NAME).warn(`Unhandled module: ${module.constructor.name}`);
+                        infraLogger.warn(`Unhandled module: ${module.constructor.name}`);
                     }
                 }
             }
@@ -397,10 +404,11 @@ export class WebpackAssetsManifest {
                 const sriHashes = new Map(integrityHashes.map((algorithm) => [algorithm, undefined]));
                 if (asset.info.contenthash) {
                     asArray(asset.info.contenthash)
+                        .flatMap((contentHash) => contentHash.split(' '))
                         .filter((contentHash) => integrityHashes.some((algorithm) => contentHash.startsWith(`${algorithm}-`)))
                         .forEach((sriHash) => sriHashes.set(sriHash.substring(0, sriHash.indexOf('-')), sriHash));
                 }
-                const assetContent = asset.source.source().toString();
+                const assetContent = asset.source.source();
                 sriHashes.forEach((value, key, map) => {
                     if (typeof value === 'undefined') {
                         map.set(key, getSRIHash(key, assetContent));

package/dist/types/helpers.d.ts

@@ -1,5 +1,6 @@
+import { type BinaryLike } from 'node:crypto';
 export declare function asArray<T>(data: T | T[]): T[];
-export declare function getSRIHash(algorithm: string, content: string): string;
+export declare function getSRIHash(algorithm: string, content: string | BinaryLike): string;
 export declare function getSortedObject(object: Record<string, unknown>, compareFunction?: (left: string, right: string) => number): typeof object;
 export declare function findMapKeysByValue<K = string, V = string>(map: Map<K, V>): (searchValue: V) => K[];
 export declare function group<T>(data: readonly T[], getGroup: (item: T) => PropertyKey | undefined, mapper?: (item: T, group: PropertyKey) => T): Record<PropertyKey, T[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-assets-manifest",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "This Webpack plugin will generate a JSON file that matches the original filename with the hashed version.",
   "license": "MIT",
   "repository": {
@@ -65,7 +65,7 @@
   "files": [
     "dist"
   ],
-  "packageManager": "pnpm@10.7.1+sha512.2d92c86b7928dc8284f53494fb4201f983da65f0fb4f0d40baafa5cf628fa31dae3e5968f12466f17df7e97310e30f343a648baea1b9b350685dafafffdf5808",
+  "packageManager": "pnpm@10.8.1+sha512.c50088ba998c67b8ca8c99df8a5e02fd2ae2e2b29aaf238feaa9e124248d3f48f9fb6db2424949ff901cffbb5e0f0cc1ad6aedb602cd29450751d11c35023677",
   "scripts": {
     "clean": "rimraf ./coverage/ ./dist/ ./cache/",
     "prebuild": "pnpm clean",
@@ -74,7 +74,7 @@
     "postbuild": "echo '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json && echo '{\"type\":\"module\"}' > ./dist/mjs/package.json && pnpm validate",
     "lint": "eslint ./*{js,cjs,mjs,mts} ./src ./test ./examples",
     "typecheck": "tsc --build --verbose",
-    "spellcheck": "cspell --no-progress './{.github,src,test}/**/*.{ts,js,json}' './*.{md,js}' './package.json'",
+    "spellcheck": "cspell --no-progress './{.github,src,examples,test}/**/*.{ts,js,json}' './*.{md,js,mjs,mts}' './package.json'",
     "format": "prettier --write ./*.{mts,mjs,json,md} ./src/ ./test/ --no-error-on-unmatched-pattern",
     "test": "vitest",
     "coverage": "vitest run --coverage",
@@ -107,25 +107,26 @@
     "compression-webpack-plugin": "^11.1.0",
     "conventional-changelog-conventionalcommits": "^8.0.0",
     "copy-webpack-plugin": "^13.0.0",
-    "cspell": "^8.18.1",
+    "cspell": "^8.19.0",
     "css-loader": "^7.1.2",
     "eslint": "^8.57.1",
-    "eslint-config-prettier": "^10.1.1",
-    "eslint-import-resolver-typescript": "^4.3.1",
+    "eslint-config-prettier": "^10.1.2",
+    "eslint-import-resolver-typescript": "^4.3.2",
     "eslint-plugin-import": "^2.31.0",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.3.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.5.0",
+    "lint-staged": "^15.5.1",
     "memfs": "^4.17.0",
     "mini-css-extract-plugin": "^2.9.2",
     "prettier": "^3.5.3",
     "rimraf": "^6.0.1",
+    "sass-loader": "^16.0.5",
     "semantic-release": "^24.2.3",
     "typescript": "^5.8.3",
     "validate-package-exports": "^0.9.0",
     "vitest": "^3.1.1",
-    "webpack": "^5.98.0",
+    "webpack": "^5.99.5",
     "webpack-dev-server": "^5.2.1",
     "webpack-subresource-integrity": "^5.1.0"
   },