@utoo/pack 1.4.5-alpha.1 → 1.4.5-alpha.3

package/cjs/binding.d.ts

@@ -9,6 +9,11 @@ export declare class ExternalObject<T> {
     [K: symbol]: T
   }
 }
+export type Lockfile = { __napiType: "Lockfile" }
+export declare function lockfileTryAcquireSync(path: string, content?: string | undefined | null): Lockfile | null
+export declare function lockfileTryAcquire(path: string, content?: string | undefined | null): Promise<Lockfile | null>
+export declare function lockfileUnlockSync(lockfile: Lockfile): void
+export declare function lockfileUnlock(lockfile: Lockfile): Promise<void>
 export declare function registerWorkerScheduler(creator: (arg: NapiWorkerCreation) => any, terminator: (arg: NapiWorkerTermination) => any): void
 export declare function workerCreated(workerId: number): void
 export interface NapiWorkerCreation {

package/cjs/binding.js

@@ -319,7 +319,11 @@ if (!nativeBinding) {
     }
     throw new Error(`Failed to load native binding`);
 }
-const { registerWorkerScheduler, workerCreated, recvTaskMessageInWorker, sendTaskMessage, endpointWriteToDisk, endpointServerChangedSubscribe, endpointClientChangedSubscribe, projectNew, projectUpdate, projectOnExit, projectShutdown, projectWriteAllEntrypointsToDisk, projectEntrypointsSubscribe, projectHmrEvents, projectHmrIdentifiersSubscribe, projectUpdateInfoSubscribe, projectTraceSource, projectGetSourceForAsset, projectGetSourceMap, projectGetSourceMapSync, rootTaskDispose, initCustomTraceSubscriber, teardownTraceSubscriber } = nativeBinding;
+const { lockfileTryAcquireSync, lockfileTryAcquire, lockfileUnlockSync, lockfileUnlock, registerWorkerScheduler, workerCreated, recvTaskMessageInWorker, sendTaskMessage, endpointWriteToDisk, endpointServerChangedSubscribe, endpointClientChangedSubscribe, projectNew, projectUpdate, projectOnExit, projectShutdown, projectWriteAllEntrypointsToDisk, projectEntrypointsSubscribe, projectHmrEvents, projectHmrIdentifiersSubscribe, projectUpdateInfoSubscribe, projectTraceSource, projectGetSourceForAsset, projectGetSourceMap, projectGetSourceMapSync, rootTaskDispose, initCustomTraceSubscriber, teardownTraceSubscriber } = nativeBinding;
+module.exports.lockfileTryAcquireSync = lockfileTryAcquireSync;
+module.exports.lockfileTryAcquire = lockfileTryAcquire;
+module.exports.lockfileUnlockSync = lockfileUnlockSync;
+module.exports.lockfileUnlock = lockfileUnlock;
 module.exports.registerWorkerScheduler = registerWorkerScheduler;
 module.exports.workerCreated = workerCreated;
 module.exports.recvTaskMessageInWorker = recvTaskMessageInWorker;

package/cjs/commands/build.js

@@ -17,6 +17,7 @@ const common_1 = require("../utils/common");
 const findRoot_1 = require("../utils/findRoot");
 const getInitialAssets_1 = require("../utils/getInitialAssets");
 const htmlEntry_1 = require("../utils/htmlEntry");
+const lockfile_1 = require("../utils/lockfile");
 const normalizePath_1 = require("../utils/normalizePath");
 const runtimePluginStratety_1 = require("../utils/runtimePluginStratety");
 const validateEntry_1 = require("../utils/validateEntry");
@@ -30,7 +31,7 @@ function build(options, projectPath, rootPath) {
     return buildInternal(bundleOptions, projectPath, rootPath);
 }
 async function buildInternal(bundleOptions, projectPath, rootPath) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     (0, common_1.blockStdout)();
     if (process.env.XCODE_PROFILE) {
         await (0, xcodeProfile_1.xcodeProfilingReady)();
@@ -42,61 +43,68 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
     (0, validateEntry_1.validateEntryPaths)(bundleOptions.config, resolvedProjectPath);
     await (0, cleanOutput_1.cleanOutput)(bundleOptions.config, resolvedProjectPath);
     const createProject = (0, project_1.projectFactory)();
-    const project = await createProject({
-        processEnv: (_b = bundleOptions.processEnv) !== null && _b !== void 0 ? _b : {},
-        watch: {
-            enable: false,
-        },
-        dev: (_c = bundleOptions.dev) !== null && _c !== void 0 ? _c : false,
-        buildId: bundleOptions.buildId || (0, nanoid_1.nanoid)(),
-        tracing: (_d = bundleOptions.tracing) !== null && _d !== void 0 ? _d : true,
-        config: {
-            ...bundleOptions.config,
-            stats: Boolean(process.env.ANALYZE) ||
-                bundleOptions.config.stats ||
-                bundleOptions.config.entry.some((e) => !!e.html),
-            pluginRuntimeStrategy: (_f = (_e = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _e === void 0 ? void 0 : _e.pluginRuntimeStrategy) !== null && _f !== void 0 ? _f : ((0, runtimePluginStratety_1.useWorkerThreads)() ? "workerThreads" : "childProcesses"),
-        },
-        projectPath: (0, normalizePath_1.normalizePath)(resolvedProjectPath),
-        rootPath: resolvedRootPath,
-        packPath: (0, common_1.getPackPath)(),
-    }, {
-        persistentCaching,
-        // Build mode is a short-lived, one-shot compilation, so avoid paying
-        // dependency graph bookkeeping cost unless the persistent cache needs it.
-        dependencyTracking: persistentCaching,
-        isShortSession: true,
-    });
-    const entrypoints = await project.writeAllEntrypointsToDisk();
-    (0, pack_shared_1.handleIssues)(entrypoints.issues);
-    const htmlConfigs = [
-        ...(Array.isArray(bundleOptions.config.html)
-            ? bundleOptions.config.html
-            : bundleOptions.config.html
-                ? [bundleOptions.config.html]
-                : []),
-        ...bundleOptions.config.entry
-            .filter((e) => !!e.html)
-            .map((e) => e.html),
-    ];
-    if (htmlConfigs.length > 0) {
-        const assets = { js: [], css: [] };
-        const outputDir = (0, cleanOutput_1.getOutputPath)(bundleOptions.config, resolvedProjectPath);
-        if (assets.js.length === 0 && assets.css.length === 0) {
-            const discovered = (0, getInitialAssets_1.getInitialAssetsFromStats)(outputDir);
-            assets.js.push(...discovered.js);
-            assets.css.push(...discovered.css);
+    const persistentCacheLock = await (0, lockfile_1.acquirePersistentCacheLock)(resolvedProjectPath, "utoo pack build", persistentCaching);
+    let project;
+    try {
+        project = await createProject({
+            processEnv: (_b = bundleOptions.processEnv) !== null && _b !== void 0 ? _b : {},
+            watch: {
+                enable: false,
+            },
+            dev: (_c = bundleOptions.dev) !== null && _c !== void 0 ? _c : false,
+            buildId: bundleOptions.buildId || (0, nanoid_1.nanoid)(),
+            tracing: (_d = bundleOptions.tracing) !== null && _d !== void 0 ? _d : true,
+            config: {
+                ...bundleOptions.config,
+                stats: Boolean(process.env.ANALYZE) ||
+                    bundleOptions.config.stats ||
+                    bundleOptions.config.entry.some((e) => !!e.html),
+                pluginRuntimeStrategy: (_f = (_e = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _e === void 0 ? void 0 : _e.pluginRuntimeStrategy) !== null && _f !== void 0 ? _f : ((0, runtimePluginStratety_1.useWorkerThreads)() ? "workerThreads" : "childProcesses"),
+            },
+            projectPath: (0, normalizePath_1.normalizePath)(resolvedProjectPath),
+            rootPath: resolvedRootPath,
+            packPath: (0, common_1.getPackPath)(),
+        }, {
+            persistentCaching,
+            // Build mode is a short-lived, one-shot compilation, so avoid paying
+            // dependency graph bookkeeping cost unless the persistent cache needs it.
+            dependencyTracking: persistentCaching,
+            isShortSession: true,
+        });
+        const entrypoints = await project.writeAllEntrypointsToDisk();
+        (0, pack_shared_1.handleIssues)(entrypoints.issues);
+        const htmlConfigs = [
+            ...(Array.isArray(bundleOptions.config.html)
+                ? bundleOptions.config.html
+                : bundleOptions.config.html
+                    ? [bundleOptions.config.html]
+                    : []),
+            ...bundleOptions.config.entry
+                .filter((e) => !!e.html)
+                .map((e) => e.html),
+        ];
+        if (htmlConfigs.length > 0) {
+            const assets = { js: [], css: [] };
+            const outputDir = (0, cleanOutput_1.getOutputPath)(bundleOptions.config, resolvedProjectPath);
+            if (assets.js.length === 0 && assets.css.length === 0) {
+                const discovered = (0, getInitialAssets_1.getInitialAssetsFromStats)(outputDir);
+                assets.js.push(...discovered.js);
+                assets.css.push(...discovered.css);
+            }
+            const publicPath = (_g = bundleOptions.config.output) === null || _g === void 0 ? void 0 : _g.publicPath;
+            for (const config of htmlConfigs) {
+                const plugin = new HtmlPlugin_1.HtmlPlugin(config);
+                await plugin.generate(outputDir, assets, publicPath);
+            }
         }
-        const publicPath = (_g = bundleOptions.config.output) === null || _g === void 0 ? void 0 : _g.publicPath;
-        for (const config of htmlConfigs) {
-            const plugin = new HtmlPlugin_1.HtmlPlugin(config);
-            await plugin.generate(outputDir, assets, publicPath);
+        if (process.env.ANALYZE) {
+            await analyzeBundle(((_h = bundleOptions.config.output) === null || _h === void 0 ? void 0 : _h.path) || "dist");
         }
     }
-    if (process.env.ANALYZE) {
-        await analyzeBundle((0, cleanOutput_1.getOutputPath)(bundleOptions.config, resolvedProjectPath));
+    finally {
+        await (project === null || project === void 0 ? void 0 : project.shutdown());
+        persistentCacheLock === null || persistentCacheLock === void 0 ? void 0 : persistentCacheLock.unlockSync();
     }
-    await project.shutdown();
     // TODO: Maybe run tasks in worker is a better way, see
     // https://github.com/vercel/next.js/blob/512d8283054407ab92b2583ecce3b253c3be7b85/packages/next/src/lib/worker.ts
 }

package/cjs/core/hmr.js

@@ -10,6 +10,7 @@ const cleanOutput_1 = require("../utils/cleanOutput");
 const common_1 = require("../utils/common");
 const getInitialAssets_1 = require("../utils/getInitialAssets");
 const htmlEntry_1 = require("../utils/htmlEntry");
+const lockfile_1 = require("../utils/lockfile");
 const normalizePath_1 = require("../utils/normalizePath");
 const runtimePluginStratety_1 = require("../utils/runtimePluginStratety");
 const validateEntry_1 = require("../utils/validateEntry");
@@ -28,34 +29,43 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
     (0, validateEntry_1.validateEntryPaths)(bundleOptions.config, resolvedProjectPath);
     await (0, cleanOutput_1.cleanOutput)(bundleOptions.config, resolvedProjectPath);
     const createProject = (0, project_1.projectFactory)();
-    const project = await createProject({
-        processEnv: (_a = bundleOptions.processEnv) !== null && _a !== void 0 ? _a : {},
-        watch: {
-            enable: true,
-        },
-        dev: true,
-        buildId: bundleOptions.buildId || (0, nanoid_1.nanoid)(),
-        tracing: (_b = bundleOptions.tracing) !== null && _b !== void 0 ? _b : true,
-        config: {
-            ...bundleOptions.config,
-            mode: "development",
-            stats: Boolean(process.env.ANALYZE) ||
-                bundleOptions.config.stats ||
-                bundleOptions.config.entry.some((e) => !!e.html),
-            optimization: {
-                ...bundleOptions.config.optimization,
-                minify: false,
-                moduleIds: "named",
+    const persistentCaching = (_a = bundleOptions.config.persistentCaching) !== null && _a !== void 0 ? _a : false;
+    const persistentCacheLock = await (0, lockfile_1.acquirePersistentCacheLock)(resolvedProjectPath, "utoo pack dev", persistentCaching);
+    let project;
+    try {
+        project = await createProject({
+            processEnv: (_b = bundleOptions.processEnv) !== null && _b !== void 0 ? _b : {},
+            watch: {
+                enable: true,
             },
-            persistentCaching: (_d = (_c = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _c === void 0 ? void 0 : _c.persistentCaching) !== null && _d !== void 0 ? _d : true,
-            pluginRuntimeStrategy: (_f = (_e = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _e === void 0 ? void 0 : _e.pluginRuntimeStrategy) !== null && _f !== void 0 ? _f : ((0, runtimePluginStratety_1.useWorkerThreads)() ? "workerThreads" : "childProcesses"),
-        },
-        projectPath: (0, normalizePath_1.normalizePath)(resolvedProjectPath),
-        rootPath: resolvedRootPath,
-        packPath: (0, common_1.getPackPath)(),
-    }, {
-        persistentCaching: (_g = bundleOptions.config.persistentCaching) !== null && _g !== void 0 ? _g : false,
-    });
+            dev: true,
+            buildId: bundleOptions.buildId || (0, nanoid_1.nanoid)(),
+            tracing: (_c = bundleOptions.tracing) !== null && _c !== void 0 ? _c : true,
+            config: {
+                ...bundleOptions.config,
+                mode: "development",
+                stats: Boolean(process.env.ANALYZE) ||
+                    bundleOptions.config.stats ||
+                    bundleOptions.config.entry.some((e) => !!e.html),
+                optimization: {
+                    ...bundleOptions.config.optimization,
+                    minify: false,
+                    moduleIds: "named",
+                },
+                persistentCaching: (_e = (_d = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _d === void 0 ? void 0 : _d.persistentCaching) !== null && _e !== void 0 ? _e : true,
+                pluginRuntimeStrategy: (_g = (_f = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _f === void 0 ? void 0 : _f.pluginRuntimeStrategy) !== null && _g !== void 0 ? _g : ((0, runtimePluginStratety_1.useWorkerThreads)() ? "workerThreads" : "childProcesses"),
+            },
+            projectPath: (0, normalizePath_1.normalizePath)(resolvedProjectPath),
+            rootPath: resolvedRootPath,
+            packPath: (0, common_1.getPackPath)(),
+        }, {
+            persistentCaching,
+        });
+    }
+    catch (error) {
+        persistentCacheLock === null || persistentCacheLock === void 0 ? void 0 : persistentCacheLock.unlockSync();
+        throw error;
+    }
     const entrypointsSubscription = project.entrypointsSubscribe();
     let currentEntriesHandlingResolve;
     let currentEntriesHandling = new Promise((resolve) => (currentEntriesHandlingResolve = resolve));
@@ -79,6 +89,7 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
     let backgroundWatchGeneration = 0;
     const backgroundWriteTasks = new Map();
     let closed = false;
+    let closePromise;
     function sendToClient(client, payload) {
         client.send(JSON.stringify(payload));
     }
@@ -250,6 +261,7 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
         subscription === null || subscription === void 0 ? void 0 : subscription.return();
     }
     async function handleEntrypointsSubscription() {
+        var _a, _b;
         for await (const entrypoints of entrypointsSubscription) {
             if (!currentEntriesHandlingResolve) {
                 currentEntriesHandling = new Promise(
@@ -257,8 +269,8 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 (resolve) => (currentEntriesHandlingResolve = resolve));
             }
             currentWatchedEntrypoints = [
-                ...entrypoints.apps,
-                ...entrypoints.libraries,
+                ...((_a = entrypoints.apps) !== null && _a !== void 0 ? _a : []),
+                ...((_b = entrypoints.libraries) !== null && _b !== void 0 ? _b : []),
             ];
             await writeEntrypointsToDisk(currentWatchedEntrypoints);
             if (backgroundWatchersStarted) {
@@ -443,6 +455,14 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
         close() {
             closed = true;
             void disposeBackgroundWatchSubscriptions();
+            closePromise !== null && closePromise !== void 0 ? closePromise : (closePromise = project
+                .onExit()
+                .catch((err) => {
+                console.error(err);
+            })
+                .finally(() => {
+                persistentCacheLock === null || persistentCacheLock === void 0 ? void 0 : persistentCacheLock.unlockSync();
+            }));
             for (const wsClient of clients) {
                 wsClient.close();
             }

package/cjs/utils/lockfile.d.ts

@@ -0,0 +1,10 @@
+export declare class PersistentCacheLock {
+    private listener;
+    private nativeLockfile;
+    private constructor();
+    static tryAcquire(lockPath: string, content?: string): PersistentCacheLock | undefined;
+    static acquireWithRetries(lockPath: string, processName: string): Promise<PersistentCacheLock>;
+    unlock(): Promise<void>;
+    unlockSync(): void;
+}
+export declare function acquirePersistentCacheLock(projectPath: string, processName: string, persistentCaching: boolean): Promise<PersistentCacheLock | undefined>;

package/cjs/utils/lockfile.js

@@ -0,0 +1,121 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PersistentCacheLock = void 0;
+exports.acquirePersistentCacheLock = acquirePersistentCacheLock;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const picocolors_1 = __importDefault(require("picocolors"));
+const binding = __importStar(require("../binding"));
+const RETRY_DELAY_MS = 10;
+const MAX_RETRY_MS = 1000;
+class PersistentCacheLock {
+    constructor(nativeLockfile) {
+        this.nativeLockfile = nativeLockfile;
+        this.listener = () => this.unlockSync();
+        process.on("exit", this.listener);
+    }
+    static tryAcquire(lockPath, content) {
+        const nativeLockfile = binding.lockfileTryAcquireSync(lockPath, content);
+        return nativeLockfile ? new PersistentCacheLock(nativeLockfile) : undefined;
+    }
+    static async acquireWithRetries(lockPath, processName) {
+        const content = JSON.stringify({
+            pid: process.pid,
+            processName,
+            startedAt: Date.now(),
+        });
+        const startMs = Date.now();
+        let lockfile;
+        while (Date.now() - startMs < MAX_RETRY_MS) {
+            lockfile = PersistentCacheLock.tryAcquire(lockPath, content);
+            if (lockfile) {
+                return lockfile;
+            }
+            await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY_MS));
+        }
+        throw new Error(formatLockError(lockPath, processName));
+    }
+    async unlock() {
+        const lockfile = this.nativeLockfile;
+        this.nativeLockfile = undefined;
+        if (this.listener) {
+            process.off("exit", this.listener);
+            this.listener = undefined;
+        }
+        if (lockfile) {
+            await binding.lockfileUnlock(lockfile);
+        }
+    }
+    unlockSync() {
+        const lockfile = this.nativeLockfile;
+        this.nativeLockfile = undefined;
+        if (this.listener) {
+            process.off("exit", this.listener);
+            this.listener = undefined;
+        }
+        if (lockfile) {
+            binding.lockfileUnlockSync(lockfile);
+        }
+    }
+}
+exports.PersistentCacheLock = PersistentCacheLock;
+async function acquirePersistentCacheLock(projectPath, processName, persistentCaching) {
+    if (!persistentCaching) {
+        return undefined;
+    }
+    const internalDir = path_1.default.join(path_1.default.resolve(projectPath), ".turbopack");
+    fs_1.default.mkdirSync(internalDir, { recursive: true });
+    return PersistentCacheLock.acquireWithRetries(path_1.default.join(internalDir, "lock"), processName);
+}
+function formatLockError(lockPath, processName) {
+    let owner = "";
+    try {
+        const data = JSON.parse(fs_1.default.readFileSync(lockPath, "utf-8"));
+        if (data.pid) {
+            const killCommand = process.platform === "win32"
+                ? `taskkill /PID ${data.pid} /F`
+                : `kill ${data.pid}`;
+            owner = `\nExisting process: ${data.processName || "unknown"} (PID ${data.pid}).\nStop it with ${picocolors_1.default.cyan(killCommand)} if it is stale.`;
+        }
+    }
+    catch (_a) {
+        // The lock holder might be a version that did not write metadata.
+    }
+    return `Unable to acquire ${processName} persistent cache lock at ${picocolors_1.default.cyan(lockPath)}. Another utoo pack process may be using the same .turbopack cache.${owner}`;
+}

package/esm/binding.d.ts

@@ -9,6 +9,11 @@ export declare class ExternalObject<T> {
     [K: symbol]: T
   }
 }
+export type Lockfile = { __napiType: "Lockfile" }
+export declare function lockfileTryAcquireSync(path: string, content?: string | undefined | null): Lockfile | null
+export declare function lockfileTryAcquire(path: string, content?: string | undefined | null): Promise<Lockfile | null>
+export declare function lockfileUnlockSync(lockfile: Lockfile): void
+export declare function lockfileUnlock(lockfile: Lockfile): Promise<void>
 export declare function registerWorkerScheduler(creator: (arg: NapiWorkerCreation) => any, terminator: (arg: NapiWorkerTermination) => any): void
 export declare function workerCreated(workerId: number): void
 export interface NapiWorkerCreation {

package/esm/binding.js

@@ -319,7 +319,11 @@ if (!nativeBinding) {
     }
     throw new Error(`Failed to load native binding`);
 }
-const { registerWorkerScheduler, workerCreated, recvTaskMessageInWorker, sendTaskMessage, endpointWriteToDisk, endpointServerChangedSubscribe, endpointClientChangedSubscribe, projectNew, projectUpdate, projectOnExit, projectShutdown, projectWriteAllEntrypointsToDisk, projectEntrypointsSubscribe, projectHmrEvents, projectHmrIdentifiersSubscribe, projectUpdateInfoSubscribe, projectTraceSource, projectGetSourceForAsset, projectGetSourceMap, projectGetSourceMapSync, rootTaskDispose, initCustomTraceSubscriber, teardownTraceSubscriber } = nativeBinding;
+const { lockfileTryAcquireSync, lockfileTryAcquire, lockfileUnlockSync, lockfileUnlock, registerWorkerScheduler, workerCreated, recvTaskMessageInWorker, sendTaskMessage, endpointWriteToDisk, endpointServerChangedSubscribe, endpointClientChangedSubscribe, projectNew, projectUpdate, projectOnExit, projectShutdown, projectWriteAllEntrypointsToDisk, projectEntrypointsSubscribe, projectHmrEvents, projectHmrIdentifiersSubscribe, projectUpdateInfoSubscribe, projectTraceSource, projectGetSourceForAsset, projectGetSourceMap, projectGetSourceMapSync, rootTaskDispose, initCustomTraceSubscriber, teardownTraceSubscriber } = nativeBinding;
+module.exports.lockfileTryAcquireSync = lockfileTryAcquireSync;
+module.exports.lockfileTryAcquire = lockfileTryAcquire;
+module.exports.lockfileUnlockSync = lockfileUnlockSync;
+module.exports.lockfileUnlock = lockfileUnlock;
 module.exports.registerWorkerScheduler = registerWorkerScheduler;
 module.exports.workerCreated = workerCreated;
 module.exports.recvTaskMessageInWorker = recvTaskMessageInWorker;

package/esm/commands/build.js

@@ -11,6 +11,7 @@ import { blockStdout, getPackPath } from "../utils/common.js";
 import { findRootDir } from "../utils/findRoot.js";
 import { getInitialAssetsFromStats } from "../utils/getInitialAssets.js";
 import { processHtmlEntry } from "../utils/htmlEntry.js";
+import { acquirePersistentCacheLock } from "../utils/lockfile.js";
 import { normalizePath } from "../utils/normalizePath.js";
 import { useWorkerThreads } from "../utils/runtimePluginStratety.js";
 import { validateEntryPaths } from "../utils/validateEntry.js";
@@ -24,7 +25,7 @@ export function build(options, projectPath, rootPath) {
     return buildInternal(bundleOptions, projectPath, rootPath);
 }
 async function buildInternal(bundleOptions, projectPath, rootPath) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     blockStdout();
     if (process.env.XCODE_PROFILE) {
         await xcodeProfilingReady();
@@ -36,61 +37,68 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
     validateEntryPaths(bundleOptions.config, resolvedProjectPath);
     await cleanOutput(bundleOptions.config, resolvedProjectPath);
     const createProject = projectFactory();
-    const project = await createProject({
-        processEnv: (_b = bundleOptions.processEnv) !== null && _b !== void 0 ? _b : {},
-        watch: {
-            enable: false,
-        },
-        dev: (_c = bundleOptions.dev) !== null && _c !== void 0 ? _c : false,
-        buildId: bundleOptions.buildId || nanoid(),
-        tracing: (_d = bundleOptions.tracing) !== null && _d !== void 0 ? _d : true,
-        config: {
-            ...bundleOptions.config,
-            stats: Boolean(process.env.ANALYZE) ||
-                bundleOptions.config.stats ||
-                bundleOptions.config.entry.some((e) => !!e.html),
-            pluginRuntimeStrategy: (_f = (_e = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _e === void 0 ? void 0 : _e.pluginRuntimeStrategy) !== null && _f !== void 0 ? _f : (useWorkerThreads() ? "workerThreads" : "childProcesses"),
-        },
-        projectPath: normalizePath(resolvedProjectPath),
-        rootPath: resolvedRootPath,
-        packPath: getPackPath(),
-    }, {
-        persistentCaching,
-        // Build mode is a short-lived, one-shot compilation, so avoid paying
-        // dependency graph bookkeeping cost unless the persistent cache needs it.
-        dependencyTracking: persistentCaching,
-        isShortSession: true,
-    });
-    const entrypoints = await project.writeAllEntrypointsToDisk();
-    handleIssues(entrypoints.issues);
-    const htmlConfigs = [
-        ...(Array.isArray(bundleOptions.config.html)
-            ? bundleOptions.config.html
-            : bundleOptions.config.html
-                ? [bundleOptions.config.html]
-                : []),
-        ...bundleOptions.config.entry
-            .filter((e) => !!e.html)
-            .map((e) => e.html),
-    ];
-    if (htmlConfigs.length > 0) {
-        const assets = { js: [], css: [] };
-        const outputDir = getOutputPath(bundleOptions.config, resolvedProjectPath);
-        if (assets.js.length === 0 && assets.css.length === 0) {
-            const discovered = getInitialAssetsFromStats(outputDir);
-            assets.js.push(...discovered.js);
-            assets.css.push(...discovered.css);
+    const persistentCacheLock = await acquirePersistentCacheLock(resolvedProjectPath, "utoo pack build", persistentCaching);
+    let project;
+    try {
+        project = await createProject({
+            processEnv: (_b = bundleOptions.processEnv) !== null && _b !== void 0 ? _b : {},
+            watch: {
+                enable: false,
+            },
+            dev: (_c = bundleOptions.dev) !== null && _c !== void 0 ? _c : false,
+            buildId: bundleOptions.buildId || nanoid(),
+            tracing: (_d = bundleOptions.tracing) !== null && _d !== void 0 ? _d : true,
+            config: {
+                ...bundleOptions.config,
+                stats: Boolean(process.env.ANALYZE) ||
+                    bundleOptions.config.stats ||
+                    bundleOptions.config.entry.some((e) => !!e.html),
+                pluginRuntimeStrategy: (_f = (_e = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _e === void 0 ? void 0 : _e.pluginRuntimeStrategy) !== null && _f !== void 0 ? _f : (useWorkerThreads() ? "workerThreads" : "childProcesses"),
+            },
+            projectPath: normalizePath(resolvedProjectPath),
+            rootPath: resolvedRootPath,
+            packPath: getPackPath(),
+        }, {
+            persistentCaching,
+            // Build mode is a short-lived, one-shot compilation, so avoid paying
+            // dependency graph bookkeeping cost unless the persistent cache needs it.
+            dependencyTracking: persistentCaching,
+            isShortSession: true,
+        });
+        const entrypoints = await project.writeAllEntrypointsToDisk();
+        handleIssues(entrypoints.issues);
+        const htmlConfigs = [
+            ...(Array.isArray(bundleOptions.config.html)
+                ? bundleOptions.config.html
+                : bundleOptions.config.html
+                    ? [bundleOptions.config.html]
+                    : []),
+            ...bundleOptions.config.entry
+                .filter((e) => !!e.html)
+                .map((e) => e.html),
+        ];
+        if (htmlConfigs.length > 0) {
+            const assets = { js: [], css: [] };
+            const outputDir = getOutputPath(bundleOptions.config, resolvedProjectPath);
+            if (assets.js.length === 0 && assets.css.length === 0) {
+                const discovered = getInitialAssetsFromStats(outputDir);
+                assets.js.push(...discovered.js);
+                assets.css.push(...discovered.css);
+            }
+            const publicPath = (_g = bundleOptions.config.output) === null || _g === void 0 ? void 0 : _g.publicPath;
+            for (const config of htmlConfigs) {
+                const plugin = new HtmlPlugin(config);
+                await plugin.generate(outputDir, assets, publicPath);
+            }
         }
-        const publicPath = (_g = bundleOptions.config.output) === null || _g === void 0 ? void 0 : _g.publicPath;
-        for (const config of htmlConfigs) {
-            const plugin = new HtmlPlugin(config);
-            await plugin.generate(outputDir, assets, publicPath);
+        if (process.env.ANALYZE) {
+            await analyzeBundle(((_h = bundleOptions.config.output) === null || _h === void 0 ? void 0 : _h.path) || "dist");
         }
     }
-    if (process.env.ANALYZE) {
-        await analyzeBundle(getOutputPath(bundleOptions.config, resolvedProjectPath));
+    finally {
+        await (project === null || project === void 0 ? void 0 : project.shutdown());
+        persistentCacheLock === null || persistentCacheLock === void 0 ? void 0 : persistentCacheLock.unlockSync();
     }
-    await project.shutdown();
     // TODO: Maybe run tasks in worker is a better way, see
     // https://github.com/vercel/next.js/blob/512d8283054407ab92b2583ecce3b253c3be7b85/packages/next/src/lib/worker.ts
 }

package/esm/core/hmr.js

@@ -6,6 +6,7 @@ import { cleanOutput, getOutputPath } from "../utils/cleanOutput.js";
 import { debounce, getPackPath, processIssues } from "../utils/common.js";
 import { getInitialAssetsFromStats } from "../utils/getInitialAssets.js";
 import { processHtmlEntry } from "../utils/htmlEntry.js";
+import { acquirePersistentCacheLock } from "../utils/lockfile.js";
 import { normalizePath } from "../utils/normalizePath.js";
 import { useWorkerThreads } from "../utils/runtimePluginStratety.js";
 import { validateEntryPaths } from "../utils/validateEntry.js";
@@ -23,34 +24,43 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
     validateEntryPaths(bundleOptions.config, resolvedProjectPath);
     await cleanOutput(bundleOptions.config, resolvedProjectPath);
     const createProject = projectFactory();
-    const project = await createProject({
-        processEnv: (_a = bundleOptions.processEnv) !== null && _a !== void 0 ? _a : {},
-        watch: {
-            enable: true,
-        },
-        dev: true,
-        buildId: bundleOptions.buildId || nanoid(),
-        tracing: (_b = bundleOptions.tracing) !== null && _b !== void 0 ? _b : true,
-        config: {
-            ...bundleOptions.config,
-            mode: "development",
-            stats: Boolean(process.env.ANALYZE) ||
-                bundleOptions.config.stats ||
-                bundleOptions.config.entry.some((e) => !!e.html),
-            optimization: {
-                ...bundleOptions.config.optimization,
-                minify: false,
-                moduleIds: "named",
+    const persistentCaching = (_a = bundleOptions.config.persistentCaching) !== null && _a !== void 0 ? _a : false;
+    const persistentCacheLock = await acquirePersistentCacheLock(resolvedProjectPath, "utoo pack dev", persistentCaching);
+    let project;
+    try {
+        project = await createProject({
+            processEnv: (_b = bundleOptions.processEnv) !== null && _b !== void 0 ? _b : {},
+            watch: {
+                enable: true,
             },
-            persistentCaching: (_d = (_c = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _c === void 0 ? void 0 : _c.persistentCaching) !== null && _d !== void 0 ? _d : true,
-            pluginRuntimeStrategy: (_f = (_e = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _e === void 0 ? void 0 : _e.pluginRuntimeStrategy) !== null && _f !== void 0 ? _f : (useWorkerThreads() ? "workerThreads" : "childProcesses"),
-        },
-        projectPath: normalizePath(resolvedProjectPath),
-        rootPath: resolvedRootPath,
-        packPath: getPackPath(),
-    }, {
-        persistentCaching: (_g = bundleOptions.config.persistentCaching) !== null && _g !== void 0 ? _g : false,
-    });
+            dev: true,
+            buildId: bundleOptions.buildId || nanoid(),
+            tracing: (_c = bundleOptions.tracing) !== null && _c !== void 0 ? _c : true,
+            config: {
+                ...bundleOptions.config,
+                mode: "development",
+                stats: Boolean(process.env.ANALYZE) ||
+                    bundleOptions.config.stats ||
+                    bundleOptions.config.entry.some((e) => !!e.html),
+                optimization: {
+                    ...bundleOptions.config.optimization,
+                    minify: false,
+                    moduleIds: "named",
+                },
+                persistentCaching: (_e = (_d = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _d === void 0 ? void 0 : _d.persistentCaching) !== null && _e !== void 0 ? _e : true,
+                pluginRuntimeStrategy: (_g = (_f = bundleOptions === null || bundleOptions === void 0 ? void 0 : bundleOptions.config) === null || _f === void 0 ? void 0 : _f.pluginRuntimeStrategy) !== null && _g !== void 0 ? _g : (useWorkerThreads() ? "workerThreads" : "childProcesses"),
+            },
+            projectPath: normalizePath(resolvedProjectPath),
+            rootPath: resolvedRootPath,
+            packPath: getPackPath(),
+        }, {
+            persistentCaching,
+        });
+    }
+    catch (error) {
+        persistentCacheLock === null || persistentCacheLock === void 0 ? void 0 : persistentCacheLock.unlockSync();
+        throw error;
+    }
     const entrypointsSubscription = project.entrypointsSubscribe();
     let currentEntriesHandlingResolve;
     let currentEntriesHandling = new Promise((resolve) => (currentEntriesHandlingResolve = resolve));
@@ -74,6 +84,7 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
     let backgroundWatchGeneration = 0;
     const backgroundWriteTasks = new Map();
     let closed = false;
+    let closePromise;
     function sendToClient(client, payload) {
         client.send(JSON.stringify(payload));
     }
@@ -245,6 +256,7 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
         subscription === null || subscription === void 0 ? void 0 : subscription.return();
     }
     async function handleEntrypointsSubscription() {
+        var _a, _b;
         for await (const entrypoints of entrypointsSubscription) {
             if (!currentEntriesHandlingResolve) {
                 currentEntriesHandling = new Promise(
@@ -252,8 +264,8 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 (resolve) => (currentEntriesHandlingResolve = resolve));
             }
             currentWatchedEntrypoints = [
-                ...entrypoints.apps,
-                ...entrypoints.libraries,
+                ...((_a = entrypoints.apps) !== null && _a !== void 0 ? _a : []),
+                ...((_b = entrypoints.libraries) !== null && _b !== void 0 ? _b : []),
             ];
             await writeEntrypointsToDisk(currentWatchedEntrypoints);
             if (backgroundWatchersStarted) {
@@ -438,6 +450,14 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
         close() {
             closed = true;
             void disposeBackgroundWatchSubscriptions();
+            closePromise !== null && closePromise !== void 0 ? closePromise : (closePromise = project
+                .onExit()
+                .catch((err) => {
+                console.error(err);
+            })
+                .finally(() => {
+                persistentCacheLock === null || persistentCacheLock === void 0 ? void 0 : persistentCacheLock.unlockSync();
+            }));
             for (const wsClient of clients) {
                 wsClient.close();
             }

package/esm/utils/lockfile.d.ts

@@ -0,0 +1,10 @@
+export declare class PersistentCacheLock {
+    private listener;
+    private nativeLockfile;
+    private constructor();
+    static tryAcquire(lockPath: string, content?: string): PersistentCacheLock | undefined;
+    static acquireWithRetries(lockPath: string, processName: string): Promise<PersistentCacheLock>;
+    unlock(): Promise<void>;
+    unlockSync(): void;
+}
+export declare function acquirePersistentCacheLock(projectPath: string, processName: string, persistentCaching: boolean): Promise<PersistentCacheLock | undefined>;

package/esm/utils/lockfile.js

@@ -0,0 +1,80 @@
+import fs from "fs";
+import path from "path";
+import pc from "picocolors";
+import * as binding from "../binding.js";
+const RETRY_DELAY_MS = 10;
+const MAX_RETRY_MS = 1000;
+export class PersistentCacheLock {
+    constructor(nativeLockfile) {
+        this.nativeLockfile = nativeLockfile;
+        this.listener = () => this.unlockSync();
+        process.on("exit", this.listener);
+    }
+    static tryAcquire(lockPath, content) {
+        const nativeLockfile = binding.lockfileTryAcquireSync(lockPath, content);
+        return nativeLockfile ? new PersistentCacheLock(nativeLockfile) : undefined;
+    }
+    static async acquireWithRetries(lockPath, processName) {
+        const content = JSON.stringify({
+            pid: process.pid,
+            processName,
+            startedAt: Date.now(),
+        });
+        const startMs = Date.now();
+        let lockfile;
+        while (Date.now() - startMs < MAX_RETRY_MS) {
+            lockfile = PersistentCacheLock.tryAcquire(lockPath, content);
+            if (lockfile) {
+                return lockfile;
+            }
+            await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY_MS));
+        }
+        throw new Error(formatLockError(lockPath, processName));
+    }
+    async unlock() {
+        const lockfile = this.nativeLockfile;
+        this.nativeLockfile = undefined;
+        if (this.listener) {
+            process.off("exit", this.listener);
+            this.listener = undefined;
+        }
+        if (lockfile) {
+            await binding.lockfileUnlock(lockfile);
+        }
+    }
+    unlockSync() {
+        const lockfile = this.nativeLockfile;
+        this.nativeLockfile = undefined;
+        if (this.listener) {
+            process.off("exit", this.listener);
+            this.listener = undefined;
+        }
+        if (lockfile) {
+            binding.lockfileUnlockSync(lockfile);
+        }
+    }
+}
+export async function acquirePersistentCacheLock(projectPath, processName, persistentCaching) {
+    if (!persistentCaching) {
+        return undefined;
+    }
+    const internalDir = path.join(path.resolve(projectPath), ".turbopack");
+    fs.mkdirSync(internalDir, { recursive: true });
+    return PersistentCacheLock.acquireWithRetries(path.join(internalDir, "lock"), processName);
+}
+function formatLockError(lockPath, processName) {
+    let owner = "";
+    try {
+        const data = JSON.parse(fs.readFileSync(lockPath, "utf-8"));
+        if (data.pid) {
+            const killCommand = process.platform === "win32"
+                ? `taskkill /PID ${data.pid} /F`
+                : `kill ${data.pid}`;
+            owner = `\nExisting process: ${data.processName || "unknown"} (PID ${data.pid}).\nStop it with ${pc.cyan(killCommand)} if it is stale.`;
+        }
+    }
+    catch (_a) {
+        // The lock holder might be a version that did not write metadata.
+    }
+    return `Unable to acquire ${processName} persistent cache lock at ${pc.cyan(lockPath)}. Another utoo pack process may be using the same .turbopack cache.${owner}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "1.4.5-alpha.1",
+  "version": "1.4.5-alpha.3",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
@@ -41,7 +41,7 @@
     "@hono/node-server": "^1.19.11",
     "@hono/node-ws": "^1.3.0",
     "@swc/helpers": "0.5.15",
-    "@utoo/pack-shared": "1.4.5-alpha.1",
+    "@utoo/pack-shared": "1.4.5-alpha.3",
     "domparser-rs": "^0.0.7",
     "find-up": "4.1.0",
     "get-port": "5.1.1",
@@ -92,12 +92,12 @@
   },
   "repository": "git@github.com:utooland/utoo.git",
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "1.4.5-alpha.1",
-    "@utoo/pack-darwin-x64": "1.4.5-alpha.1",
-    "@utoo/pack-linux-arm64-gnu": "1.4.5-alpha.1",
-    "@utoo/pack-linux-arm64-musl": "1.4.5-alpha.1",
-    "@utoo/pack-linux-x64-gnu": "1.4.5-alpha.1",
-    "@utoo/pack-linux-x64-musl": "1.4.5-alpha.1",
-    "@utoo/pack-win32-x64-msvc": "1.4.5-alpha.1"
+    "@utoo/pack-darwin-arm64": "1.4.5-alpha.3",
+    "@utoo/pack-darwin-x64": "1.4.5-alpha.3",
+    "@utoo/pack-linux-arm64-gnu": "1.4.5-alpha.3",
+    "@utoo/pack-linux-arm64-musl": "1.4.5-alpha.3",
+    "@utoo/pack-linux-x64-gnu": "1.4.5-alpha.3",
+    "@utoo/pack-linux-x64-musl": "1.4.5-alpha.3",
+    "@utoo/pack-win32-x64-msvc": "1.4.5-alpha.3"
   }
 }