webpack-assets-manifest 6.4.0 → 6.5.0

package/dist/cjs/helpers.js

@@ -5,13 +5,7 @@ exports.getSRIHash = getSRIHash;
 exports.getSortedObject = getSortedObject;
 exports.findMapKeysByValue = findMapKeysByValue;
 exports.group = group;
-exports.getLockFilename = getLockFilename;
-exports.lock = lock;
-exports.unlock = unlock;
 const node_crypto_1 = require("node:crypto");
-const node_os_1 = require("node:os");
-const node_path_1 = require("node:path");
-const lockfile_1 = require("lockfile");
 const type_predicate_js_1 = require("./type-predicate.js");
 function asArray(data) {
     return Array.isArray(data) ? data : [data];
@@ -35,34 +29,3 @@ function group(data, getGroup, mapper) {
         return obj;
     }, Object.create(null));
 }
-function getLockFilename(filename) {
-    const name = filename.replace(/[^\w]+/g, '-');
-    return (0, node_path_1.join)((0, node_os_1.tmpdir)(), `${name}.lock`);
-}
-function lock(filename) {
-    return new Promise((resolve, reject) => {
-        (0, lockfile_1.lock)(getLockFilename(filename), {
-            wait: 10000,
-            stale: 20000,
-            retries: 100,
-            retryWait: 100,
-        }, (error) => {
-            if (error) {
-                reject(error);
-                return;
-            }
-            resolve();
-        });
-    });
-}
-function unlock(filename) {
-    return new Promise((resolve, reject) => {
-        (0, lockfile_1.unlock)(getLockFilename(filename), (error) => {
-            if (error) {
-                reject(error);
-                return;
-            }
-            resolve();
-        });
-    });
-}

package/dist/cjs/plugin.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebpackAssetsManifest = void 0;
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
+const proper_lockfile_1 = require("proper-lockfile");
 const schema_utils_1 = require("schema-utils");
 const tapable_1 = require("tapable");
 const helpers_js_1 = require("./helpers.js");
@@ -243,17 +244,22 @@ class WebpackAssetsManifest {
     async emitAssetsManifest(compilation) {
         const outputPath = this.getOutputPath();
         const output = this.getManifestPath(compilation, this.inDevServer() ? (0, node_path_1.basename)(this.options.output) : (0, node_path_1.relative)(compilation.compiler.outputPath, outputPath));
-        if (this.options.merge) {
-            await (0, helpers_js_1.lock)(outputPath);
+        let release;
+        try {
+            if (this.options.merge) {
+                const outputDir = (0, node_path_1.dirname)(outputPath);
+                await (0, promises_1.mkdir)(outputDir, { recursive: true });
+                release = await (0, proper_lockfile_1.lock)(outputDir, { lockfilePath: (0, node_path_1.join)(outputDir, `${PLUGIN_NAME}.lock`) });
+            }
+            await this.maybeMerge();
+            compilation.emitAsset(output, new compilation.compiler.webpack.sources.RawSource(this.toString(), false), {
+                assetsManifest: true,
+                generated: true,
+                generatedBy: [PLUGIN_NAME],
+            });
         }
-        await this.maybeMerge();
-        compilation.emitAsset(output, new compilation.compiler.webpack.sources.RawSource(this.toString(), false), {
-            assetsManifest: true,
-            generated: true,
-            generatedBy: [PLUGIN_NAME],
-        });
-        if (this.options.merge) {
-            await (0, helpers_js_1.unlock)(outputPath);
+        finally {
+            await release?.();
         }
     }
     handleProcessAssetsAnalyse(compilation) {
@@ -387,10 +393,16 @@ class WebpackAssetsManifest {
         });
     }
     async writeTo(destination) {
-        await (0, helpers_js_1.lock)(destination);
-        await (0, promises_1.mkdir)((0, node_path_1.dirname)(destination), { recursive: true });
-        await (0, promises_1.writeFile)(destination, this.toString());
-        await (0, helpers_js_1.unlock)(destination);
+        const destinationDir = (0, node_path_1.dirname)(destination);
+        let release;
+        try {
+            await (0, promises_1.mkdir)(destinationDir, { recursive: true });
+            release = await (0, proper_lockfile_1.lock)(destinationDir, { lockfilePath: (0, node_path_1.join)(destinationDir, `${PLUGIN_NAME}.lock`) });
+            await (0, promises_1.writeFile)(destination, this.toString());
+        }
+        finally {
+            await release?.();
+        }
     }
     clear() {
         Object.keys(this.assets).forEach((key) => {

package/dist/mjs/helpers.js

@@ -1,7 +1,4 @@
 import { createHash } from 'node:crypto';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { lock as lockfileLock, unlock as lockfileUnlock } from 'lockfile';
 import { isPropertyKey } from './type-predicate.js';
 export function asArray(data) {
     return Array.isArray(data) ? data : [data];
@@ -25,34 +22,3 @@ export function group(data, getGroup, mapper) {
         return obj;
     }, Object.create(null));
 }
-export function getLockFilename(filename) {
-    const name = filename.replace(/[^\w]+/g, '-');
-    return join(tmpdir(), `${name}.lock`);
-}
-export function lock(filename) {
-    return new Promise((resolve, reject) => {
-        lockfileLock(getLockFilename(filename), {
-            wait: 10000,
-            stale: 20000,
-            retries: 100,
-            retryWait: 100,
-        }, (error) => {
-            if (error) {
-                reject(error);
-                return;
-            }
-            resolve();
-        });
-    });
-}
-export function unlock(filename) {
-    return new Promise((resolve, reject) => {
-        lockfileUnlock(getLockFilename(filename), (error) => {
-            if (error) {
-                reject(error);
-                return;
-            }
-            resolve();
-        });
-    });
-}

package/dist/mjs/plugin.js

@@ -1,8 +1,9 @@
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { basename, dirname, extname, isAbsolute, join, normalize, relative, resolve } from 'node:path';
+import { lock } from 'proper-lockfile';
 import { validate } from 'schema-utils';
 import { AsyncSeriesHook, SyncHook, SyncWaterfallHook } from 'tapable';
-import { asArray, findMapKeysByValue, getSortedObject, getSRIHash, group, lock, unlock } from './helpers.js';
+import { asArray, findMapKeysByValue, getSortedObject, getSRIHash, group } from './helpers.js';
 import { optionsSchema } from './options-schema.js';
 import { isKeyValuePair, isObject } from './type-predicate.js';
 const PLUGIN_NAME = 'WebpackAssetsManifest';
@@ -207,17 +208,22 @@ export class WebpackAssetsManifest {
     async emitAssetsManifest(compilation) {
         const outputPath = this.getOutputPath();
         const output = this.getManifestPath(compilation, this.inDevServer() ? basename(this.options.output) : relative(compilation.compiler.outputPath, outputPath));
-        if (this.options.merge) {
-            await lock(outputPath);
+        let release;
+        try {
+            if (this.options.merge) {
+                const outputDir = dirname(outputPath);
+                await mkdir(outputDir, { recursive: true });
+                release = await lock(outputDir, { lockfilePath: join(outputDir, `${PLUGIN_NAME}.lock`) });
+            }
+            await this.maybeMerge();
+            compilation.emitAsset(output, new compilation.compiler.webpack.sources.RawSource(this.toString(), false), {
+                assetsManifest: true,
+                generated: true,
+                generatedBy: [PLUGIN_NAME],
+            });
         }
-        await this.maybeMerge();
-        compilation.emitAsset(output, new compilation.compiler.webpack.sources.RawSource(this.toString(), false), {
-            assetsManifest: true,
-            generated: true,
-            generatedBy: [PLUGIN_NAME],
-        });
-        if (this.options.merge) {
-            await unlock(outputPath);
+        finally {
+            await release?.();
         }
     }
     handleProcessAssetsAnalyse(compilation) {
@@ -351,10 +357,16 @@ export class WebpackAssetsManifest {
         });
     }
     async writeTo(destination) {
-        await lock(destination);
-        await mkdir(dirname(destination), { recursive: true });
-        await writeFile(destination, this.toString());
-        await unlock(destination);
+        const destinationDir = dirname(destination);
+        let release;
+        try {
+            await mkdir(destinationDir, { recursive: true });
+            release = await lock(destinationDir, { lockfilePath: join(destinationDir, `${PLUGIN_NAME}.lock`) });
+            await writeFile(destination, this.toString());
+        }
+        finally {
+            await release?.();
+        }
     }
     clear() {
         Object.keys(this.assets).forEach((key) => {

package/dist/types/helpers.d.ts

@@ -4,6 +4,3 @@ export declare function getSRIHash(algorithm: string, content: string | BinaryLi
 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[]>;
-export declare function getLockFilename(filename: string): string;
-export declare function lock(filename: string): Promise<void>;
-export declare function unlock(filename: string): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-assets-manifest",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "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.20.0+sha512.cf9998222162dd85864d0a8102e7892e7ba4ceadebbf5a31f9c2fce48dfce317a9c53b9f6464d1ef9042cba2e02ae02a9f7c143a2b438cd93c91840f0192b9dd",
+  "packageManager": "pnpm@10.24.0+sha512.01ff8ae71b4419903b65c60fb2dc9d34cf8bb6e06d03bde112ef38f7a34d6904c424ba66bea5cdcf12890230bf39f9580473140ed9c946fef328b6e5238a345a",
   "scripts": {
     "clean": "rimraf ./coverage/ ./dist/ ./cache/",
     "prebuild": "pnpm clean",
@@ -85,7 +85,7 @@
   "prettier": "@webdeveric/prettier-config",
   "dependencies": {
     "deepmerge": "^4.3.1",
-    "lockfile": "^1.0.4",
+    "proper-lockfile": "^4.1.2",
     "schema-utils": "^4.3.3",
     "tapable": "^2.3.0"
   },
@@ -93,21 +93,21 @@
     "webpack": "^5.61.0"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^20.0.0",
-    "@commitlint/types": "^20.0.0",
-    "@types/lockfile": "^1.0.4",
-    "@types/node": "^20.19.24",
+    "@commitlint/config-conventional": "^20.2.0",
+    "@commitlint/types": "^20.2.0",
+    "@types/node": "^20.19.25",
+    "@types/proper-lockfile": "^4.1.4",
     "@types/tapable": "^2.3.0",
     "@types/webpack-sources": "^3.2.3",
-    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/coverage-v8": "^4.0.15",
     "@webdeveric/eslint-config-ts": "^0.11.0",
     "@webdeveric/prettier-config": "^0.3.0",
-    "commitlint": "^20.1.0",
+    "commitlint": "^20.2.0",
     "commitlint-plugin-cspell": "^0.3.0",
     "compression-webpack-plugin": "^11.1.0",
     "conventional-changelog-conventionalcommits": "^9.1.0",
     "copy-webpack-plugin": "^13.0.1",
-    "cspell": "^9.3.0",
+    "cspell": "^9.4.0",
     "css-loader": "^7.1.2",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^10.1.8",
@@ -116,17 +116,17 @@
     "file-loader": "^6.2.0",
     "fs-extra": "^11.3.2",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.6",
-    "memfs": "^4.50.0",
+    "lint-staged": "^16.2.7",
+    "memfs": "^4.51.1",
     "mini-css-extract-plugin": "^2.9.4",
-    "prettier": "^3.6.2",
-    "rimraf": "^6.1.0",
+    "prettier": "^3.7.4",
+    "rimraf": "^6.1.2",
     "sass-loader": "^16.0.6",
     "semantic-release": "^24.2.9",
     "typescript": "^5.9.3",
     "validate-package-exports": "^0.14.0",
-    "vitest": "^3.2.4",
-    "webpack": "^5.102.1",
+    "vitest": "^4.0.15",
+    "webpack": "^5.103.0",
     "webpack-dev-server": "^5.2.2",
     "webpack-subresource-integrity": "^5.1.0"
   },