@utoo/pack 1.4.12-alpha.0 → 1.4.12-alpha.10

package/cjs/binding.d.ts

@@ -146,6 +146,8 @@ export declare function projectShutdown(project: { __napiType: "Project" }): Pro
 export interface NapiEntrypoints {
   apps?: Array<ExternalObject<ExternalEndpoint>>
   libraries?: Array<ExternalObject<ExternalEndpoint>>
+  appPaths?: Array<NapiWrittenEndpoint>
+  libraryPaths?: Array<NapiWrittenEndpoint>
 }
 export declare function projectWriteAllEntrypointsToDisk(project: { __napiType: "Project" }): Promise<TurbopackResult>
 export declare function projectEntrypointsSubscribe(project: { __napiType: "Project" }, func: (...args: any[]) => any): { __napiType: "RootTask" }
@@ -241,11 +243,6 @@ export interface NapiSourcePos {
   line: number
   column: number
 }
-export interface NapiDiagnostic {
-  category: string
-  name: string
-  payload: Record<string, string>
-}
 /**
  * Initialize tracing subscriber to emit traces. This configures subscribers
  * for Trace Event Format <https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview>.

package/cjs/commands/build.js

@@ -31,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, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     (0, common_1.blockStdout)();
     if (process.env.XCODE_PROFILE) {
         await (0, xcodeProfile_1.xcodeProfilingReady)();
@@ -39,6 +39,7 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
     const resolvedProjectPath = projectPath || process.cwd();
     const resolvedRootPath = rootPath || projectPath || process.cwd();
     const persistentCaching = (_a = bundleOptions.config.persistentCaching) !== null && _a !== void 0 ? _a : false;
+    const shouldCreateWebpackStats = Boolean(process.env.ANALYZE) || Boolean(bundleOptions.config.stats);
     (0, htmlEntry_1.processHtmlEntry)(bundleOptions.config, resolvedProjectPath);
     (0, validateEntry_1.validateEntryPaths)(bundleOptions.config, resolvedProjectPath);
     await (0, cleanOutput_1.cleanOutput)(bundleOptions.config, resolvedProjectPath);
@@ -56,9 +57,7 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
             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),
+                stats: shouldCreateWebpackStats,
                 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),
@@ -69,7 +68,6 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
             // 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);
@@ -84,21 +82,19 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
                 .map((e) => e.html),
         ];
         if (htmlConfigs.length > 0) {
-            const assets = { js: [], css: [] };
+            const assets = (0, getInitialAssets_1.getInitialAssetsFromEndpointPaths)([
+                ...((_g = entrypoints.appPaths) !== null && _g !== void 0 ? _g : []),
+                ...((_h = entrypoints.libraryPaths) !== null && _h !== void 0 ? _h : []),
+            ]);
             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;
+            const publicPath = (_j = bundleOptions.config.output) === null || _j === void 0 ? void 0 : _j.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");
+            await analyzeBundle(((_k = bundleOptions.config.output) === null || _k === void 0 ? void 0 : _k.path) || "dist");
         }
     }
     finally {

package/cjs/commands/dev.js

@@ -234,8 +234,19 @@ async function runDev(options, projectPath, rootPath, serverOptions) {
             : serveOptsBase.hostname;
         (0, printServerInfo_1.printServerInfo)(scheme, displayHost, serveOptsBase.port);
     }
-    const cleanup = () => {
-        hotReloader.close();
+    let cleanupStarted = false;
+    const cleanup = async () => {
+        if (cleanupStarted) {
+            return;
+        }
+        cleanupStarted = true;
+        try {
+            await hotReloader.close();
+        }
+        catch (err) {
+            console.error(err);
+            process.exit(1);
+        }
         // We always create HTTP/1.1 server (http or https), so closeAllConnections exists; Hono's
         // ServerType union includes HTTP/2, so TS does not narrow. Use runtime check to satisfy types.
         if ("closeAllConnections" in server &&

package/cjs/core/hmr.d.ts

@@ -38,7 +38,7 @@ export interface HotReloaderInterface {
     /** Handle a message from a client (JSON string). */
     handleClientMessage(ws: WSLike, data: string): void;
     buildFallbackError(): Promise<void>;
-    close(): void;
+    close(): Promise<void>;
 }
 export type ChangeSubscriptions = Map<string, Promise<AsyncIterableIterator<TurbopackResult>>>;
 export type ReadyIds = Set<string>;

package/cjs/core/hmr.js

@@ -74,9 +74,7 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
             .filter((e) => !!e.html)
             .map((e) => e.html),
     ];
-    const shouldCreateWebpackStats = Boolean(process.env.ANALYZE) ||
-        bundleOptions.config.stats ||
-        htmlConfigs.length > 0;
+    const shouldCreateWebpackStats = Boolean(process.env.ANALYZE) || Boolean(bundleOptions.config.stats);
     let project;
     try {
         project = await createProject({
@@ -157,7 +155,6 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
     const sendEnqueuedMessagesDebounce = (0, common_1.debounce)(sendEnqueuedMessages, 2);
     function sendTurbopackMessage(payload) {
         var _a;
-        payload.diagnostics = [];
         payload.issues = [];
         for (const client of clients) {
             (_a = clientStates.get(client)) === null || _a === void 0 ? void 0 : _a.turbopackUpdates.push(payload);
@@ -165,6 +162,18 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
         hmrEventHappened = true;
         sendEnqueuedMessagesDebounce();
     }
+    const writtenEndpointPaths = new Map();
+    function updateWrittenEndpointPaths(endpoints, paths) {
+        if (!endpoints || !paths) {
+            return;
+        }
+        endpoints.forEach((endpoint, index) => {
+            const written = paths[index];
+            if (written) {
+                writtenEndpointPaths.set(endpoint, written);
+            }
+        });
+    }
     async function regenerateHtml() {
         var _a;
         if (htmlConfigs.length === 0) {
@@ -172,7 +181,9 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
         }
         const outputDir = (0, cleanOutput_1.getOutputPath)(bundleOptions.config, resolvedProjectPath);
         const publicPath = (_a = bundleOptions.config.output) === null || _a === void 0 ? void 0 : _a.publicPath;
-        const assets = (0, getInitialAssets_1.getInitialAssetsFromStats)(outputDir);
+        const assets = (0, getInitialAssets_1.getInitialAssetsFromEndpointPaths)([
+            ...writtenEndpointPaths.values(),
+        ]);
         for (const config of htmlConfigs) {
             const plugin = new HtmlPlugin_1.HtmlPlugin(config);
             await plugin.generate(outputDir, assets, publicPath);
@@ -181,11 +192,14 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
     async function writeAllEntrypointsToDisk() {
         const result = await project.writeAllEntrypointsToDisk();
         (0, common_1.processIssues)(result, true, true);
+        updateWrittenEndpointPaths(result.apps, result.appPaths);
+        updateWrittenEndpointPaths(result.libraries, result.libraryPaths);
         await regenerateHtml();
     }
     async function writeEntrypointToDisk(entrypoint) {
         const result = await entrypoint.writeToDisk();
         (0, common_1.processIssues)(result, true, true);
+        writtenEndpointPaths.set(entrypoint, result);
         await regenerateHtml();
     }
     async function writeOutputToDisk(entrypoint) {
@@ -534,11 +548,12 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
         async buildFallbackError() {
             // Not implemented yet.
         },
-        close() {
+        async close() {
             closed = true;
-            void disposeBackgroundWatchSubscriptions();
-            closePromise !== null && closePromise !== void 0 ? closePromise : (closePromise = project
-                .onExit()
+            const disposePromise = disposeBackgroundWatchSubscriptions();
+            closePromise !== null && closePromise !== void 0 ? closePromise : (closePromise = (bundleOptions.config.persistentCaching
+                ? project.shutdown()
+                : project.onExit())
                 .catch((err) => {
                 console.error(err);
             })
@@ -549,6 +564,7 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 wsClient.close();
             }
             clients.clear();
+            await Promise.all([disposePromise, closePromise]);
         },
     };
     handleEntrypointsSubscription().catch((err) => {

package/cjs/core/project.d.ts

@@ -37,8 +37,9 @@ export declare function projectFactory(): (options: Required<ProjectOptions>, tu
             clientChanged(): Promise<AsyncIterableIterator<TurbopackResult<{}>>>;
             serverChanged(includeIssues: boolean): Promise<AsyncIterableIterator<TurbopackResult<{}>>>;
         }[];
+        appPaths: NapiWrittenEndpoint[] | undefined;
+        libraryPaths: NapiWrittenEndpoint[] | undefined;
         issues: binding.NapiIssue[];
-        diagnostics: binding.NapiDiagnostic[];
     }, void, unknown>;
     hmrEvents(identifier: string): AsyncIterableIterator<TurbopackResult<Update>>;
     hmrIdentifiersSubscribe(): AsyncIterableIterator<TurbopackResult<HmrIdentifiers>>;

package/cjs/core/project.js

@@ -102,7 +102,6 @@ const DEFAULT_OPTIMIZE_PACKAGE_IMPORTS = [
     "date-fns",
     "lodash-es",
     "ramda",
-    "antd",
     "react-bootstrap",
     "ahooks",
     "@ant-design/icons",
@@ -490,8 +489,9 @@ function projectFactory() {
         return {
             apps: (entrypoints.apps || []).map((e) => new EndpointImpl(e)),
             libraries: (entrypoints.libraries || []).map((e) => new EndpointImpl(e)),
+            appPaths: entrypoints.appPaths,
+            libraryPaths: entrypoints.libraryPaths,
             issues: entrypoints.issues,
-            diagnostics: entrypoints.diagnostics,
         };
     }
     return async function createProject(options, turboEngineOptions) {

package/cjs/core/types.d.ts

@@ -1,9 +1,8 @@
-import { HmrIdentifiers, NapiDiagnostic, NapiIssue, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame } from "../binding";
+import { HmrIdentifiers, NapiIssue, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame } from "../binding";
 import { BundleOptions } from "../config/types";
 declare global {
     export type TurbopackResult<T = {}> = T & {
         issues: NapiIssue[];
-        diagnostics: NapiDiagnostic[];
     };
     export type RefCell = {
         readonly __tag: unique symbol;
@@ -18,7 +17,6 @@ export interface BaseUpdate {
         headers: unknown;
         path: string;
     };
-    diagnostics: unknown[];
     issues: NapiIssue[];
 }
 export interface IssuesUpdate extends BaseUpdate {
@@ -75,6 +73,8 @@ export interface Project {
 export interface RawEntrypoints {
     apps?: Endpoint[];
     libraries?: Endpoint[];
+    appPaths?: NapiWrittenEndpoint[];
+    libraryPaths?: NapiWrittenEndpoint[];
 }
 export interface Endpoint {
     /** Write files for the endpoint to disk. */

package/cjs/utils/getInitialAssets.d.ts

@@ -1,5 +1,7 @@
+import type { NapiWrittenEndpoint } from "../binding";
 export interface Assets {
     js: string[];
     css: string[];
 }
 export declare function getInitialAssetsFromStats(outputDir: string): Assets;
+export declare function getInitialAssetsFromEndpointPaths(endpoints: NapiWrittenEndpoint[]): Assets;

package/cjs/utils/getInitialAssets.js

@@ -4,8 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInitialAssetsFromStats = getInitialAssetsFromStats;
+exports.getInitialAssetsFromEndpointPaths = getInitialAssetsFromEndpointPaths;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+function addUniqueAsset(assets, file) {
+    if (!assets.includes(file)) {
+        assets.push(file);
+    }
+}
+function isJavascriptAsset(file) {
+    return (file.endsWith(".js") &&
+        !file.endsWith(".LICENSE.txt") &&
+        !file.endsWith(".map"));
+}
 function getInitialAssetsFromStats(outputDir) {
     const assets = { js: [], css: [] };
     const statsPath = path_1.default.join(outputDir, "stats.json");
@@ -16,12 +27,11 @@ function getInitialAssetsFromStats(outputDir) {
                 Object.values(stats.entrypoints).forEach((entrypoint) => {
                     var _a;
                     (_a = entrypoint.assets) === null || _a === void 0 ? void 0 : _a.forEach((asset) => {
-                        if (asset.name.endsWith(".js") && !assets.js.includes(asset.name)) {
-                            assets.js.push(asset.name);
+                        if (asset.name.endsWith(".js")) {
+                            addUniqueAsset(assets.js, asset.name);
                         }
-                        if (asset.name.endsWith(".css") &&
-                            !assets.css.includes(asset.name)) {
-                            assets.css.push(asset.name);
+                        if (asset.name.endsWith(".css")) {
+                            addUniqueAsset(assets.css, asset.name);
                         }
                     });
                 });
@@ -33,3 +43,17 @@ function getInitialAssetsFromStats(outputDir) {
     }
     return assets;
 }
+function getInitialAssetsFromEndpointPaths(endpoints) {
+    const assets = { js: [], css: [] };
+    endpoints.forEach((endpoint) => {
+        endpoint.clientPaths.forEach((file) => {
+            if (isJavascriptAsset(file)) {
+                addUniqueAsset(assets.js, file);
+            }
+            if (file.endsWith(".css")) {
+                addUniqueAsset(assets.css, file);
+            }
+        });
+    });
+    return assets;
+}

package/cjs/utils/normalizePath.js

@@ -4,15 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizePath = normalizePath;
-const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 function normalizePath(file) {
-    if (!file)
-        return file;
-    let normalized = path_1.default.resolve(file);
-    try {
-        normalized = fs_1.default.realpathSync.native(normalized);
-    }
-    catch (_a) { }
-    return path_1.default.sep === "\\" ? normalized.replace(/\\/g, "/") : normalized;
+    return path_1.default.sep === "\\" ? file.replace(/\\/g, "/") : file;
 }

package/esm/binding.d.ts

@@ -146,6 +146,8 @@ export declare function projectShutdown(project: { __napiType: "Project" }): Pro
 export interface NapiEntrypoints {
   apps?: Array<ExternalObject<ExternalEndpoint>>
   libraries?: Array<ExternalObject<ExternalEndpoint>>
+  appPaths?: Array<NapiWrittenEndpoint>
+  libraryPaths?: Array<NapiWrittenEndpoint>
 }
 export declare function projectWriteAllEntrypointsToDisk(project: { __napiType: "Project" }): Promise<TurbopackResult>
 export declare function projectEntrypointsSubscribe(project: { __napiType: "Project" }, func: (...args: any[]) => any): { __napiType: "RootTask" }
@@ -241,11 +243,6 @@ export interface NapiSourcePos {
   line: number
   column: number
 }
-export interface NapiDiagnostic {
-  category: string
-  name: string
-  payload: Record<string, string>
-}
 /**
  * Initialize tracing subscriber to emit traces. This configures subscribers
  * for Trace Event Format <https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview>.

package/esm/commands/build.js

@@ -9,7 +9,7 @@ import { HtmlPlugin } from "../plugins/HtmlPlugin.js";
 import { cleanOutput, getOutputPath } from "../utils/cleanOutput.js";
 import { blockStdout, getPackPath } from "../utils/common.js";
 import { findRootDir } from "../utils/findRoot.js";
-import { getInitialAssetsFromStats } from "../utils/getInitialAssets.js";
+import { getInitialAssetsFromEndpointPaths } from "../utils/getInitialAssets.js";
 import { processHtmlEntry } from "../utils/htmlEntry.js";
 import { acquirePersistentCacheLock } from "../utils/lockfile.js";
 import { normalizePath } from "../utils/normalizePath.js";
@@ -25,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, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     blockStdout();
     if (process.env.XCODE_PROFILE) {
         await xcodeProfilingReady();
@@ -33,6 +33,7 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
     const resolvedProjectPath = projectPath || process.cwd();
     const resolvedRootPath = rootPath || projectPath || process.cwd();
     const persistentCaching = (_a = bundleOptions.config.persistentCaching) !== null && _a !== void 0 ? _a : false;
+    const shouldCreateWebpackStats = Boolean(process.env.ANALYZE) || Boolean(bundleOptions.config.stats);
     processHtmlEntry(bundleOptions.config, resolvedProjectPath);
     validateEntryPaths(bundleOptions.config, resolvedProjectPath);
     await cleanOutput(bundleOptions.config, resolvedProjectPath);
@@ -50,9 +51,7 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
             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),
+                stats: shouldCreateWebpackStats,
                 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),
@@ -63,7 +62,6 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
             // 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);
@@ -78,21 +76,19 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
                 .map((e) => e.html),
         ];
         if (htmlConfigs.length > 0) {
-            const assets = { js: [], css: [] };
+            const assets = getInitialAssetsFromEndpointPaths([
+                ...((_g = entrypoints.appPaths) !== null && _g !== void 0 ? _g : []),
+                ...((_h = entrypoints.libraryPaths) !== null && _h !== void 0 ? _h : []),
+            ]);
             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;
+            const publicPath = (_j = bundleOptions.config.output) === null || _j === void 0 ? void 0 : _j.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");
+            await analyzeBundle(((_k = bundleOptions.config.output) === null || _k === void 0 ? void 0 : _k.path) || "dist");
         }
     }
     finally {

package/esm/commands/dev.js

@@ -228,8 +228,19 @@ async function runDev(options, projectPath, rootPath, serverOptions) {
             : serveOptsBase.hostname;
         printServerInfo(scheme, displayHost, serveOptsBase.port);
     }
-    const cleanup = () => {
-        hotReloader.close();
+    let cleanupStarted = false;
+    const cleanup = async () => {
+        if (cleanupStarted) {
+            return;
+        }
+        cleanupStarted = true;
+        try {
+            await hotReloader.close();
+        }
+        catch (err) {
+            console.error(err);
+            process.exit(1);
+        }
         // We always create HTTP/1.1 server (http or https), so closeAllConnections exists; Hono's
         // ServerType union includes HTTP/2, so TS does not narrow. Use runtime check to satisfy types.
         if ("closeAllConnections" in server &&

package/esm/core/hmr.d.ts

@@ -38,7 +38,7 @@ export interface HotReloaderInterface {
     /** Handle a message from a client (JSON string). */
     handleClientMessage(ws: WSLike, data: string): void;
     buildFallbackError(): Promise<void>;
-    close(): void;
+    close(): Promise<void>;
 }
 export type ChangeSubscriptions = Map<string, Promise<AsyncIterableIterator<TurbopackResult>>>;
 export type ReadyIds = Set<string>;

package/esm/core/hmr.js

@@ -4,7 +4,7 @@ import { WebSocketServer } from "ws";
 import { HtmlPlugin } from "../plugins/HtmlPlugin.js";
 import { cleanOutput, getOutputPath } from "../utils/cleanOutput.js";
 import { debounce, getPackPath, processIssues } from "../utils/common.js";
-import { getInitialAssetsFromStats } from "../utils/getInitialAssets.js";
+import { getInitialAssetsFromEndpointPaths } from "../utils/getInitialAssets.js";
 import { processHtmlEntry } from "../utils/htmlEntry.js";
 import { acquirePersistentCacheLock } from "../utils/lockfile.js";
 import { normalizePath } from "../utils/normalizePath.js";
@@ -69,9 +69,7 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
             .filter((e) => !!e.html)
             .map((e) => e.html),
     ];
-    const shouldCreateWebpackStats = Boolean(process.env.ANALYZE) ||
-        bundleOptions.config.stats ||
-        htmlConfigs.length > 0;
+    const shouldCreateWebpackStats = Boolean(process.env.ANALYZE) || Boolean(bundleOptions.config.stats);
     let project;
     try {
         project = await createProject({
@@ -152,7 +150,6 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
     const sendEnqueuedMessagesDebounce = debounce(sendEnqueuedMessages, 2);
     function sendTurbopackMessage(payload) {
         var _a;
-        payload.diagnostics = [];
         payload.issues = [];
         for (const client of clients) {
             (_a = clientStates.get(client)) === null || _a === void 0 ? void 0 : _a.turbopackUpdates.push(payload);
@@ -160,6 +157,18 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
         hmrEventHappened = true;
         sendEnqueuedMessagesDebounce();
     }
+    const writtenEndpointPaths = new Map();
+    function updateWrittenEndpointPaths(endpoints, paths) {
+        if (!endpoints || !paths) {
+            return;
+        }
+        endpoints.forEach((endpoint, index) => {
+            const written = paths[index];
+            if (written) {
+                writtenEndpointPaths.set(endpoint, written);
+            }
+        });
+    }
     async function regenerateHtml() {
         var _a;
         if (htmlConfigs.length === 0) {
@@ -167,7 +176,9 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
         }
         const outputDir = getOutputPath(bundleOptions.config, resolvedProjectPath);
         const publicPath = (_a = bundleOptions.config.output) === null || _a === void 0 ? void 0 : _a.publicPath;
-        const assets = getInitialAssetsFromStats(outputDir);
+        const assets = getInitialAssetsFromEndpointPaths([
+            ...writtenEndpointPaths.values(),
+        ]);
         for (const config of htmlConfigs) {
             const plugin = new HtmlPlugin(config);
             await plugin.generate(outputDir, assets, publicPath);
@@ -176,11 +187,14 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
     async function writeAllEntrypointsToDisk() {
         const result = await project.writeAllEntrypointsToDisk();
         processIssues(result, true, true);
+        updateWrittenEndpointPaths(result.apps, result.appPaths);
+        updateWrittenEndpointPaths(result.libraries, result.libraryPaths);
         await regenerateHtml();
     }
     async function writeEntrypointToDisk(entrypoint) {
         const result = await entrypoint.writeToDisk();
         processIssues(result, true, true);
+        writtenEndpointPaths.set(entrypoint, result);
         await regenerateHtml();
     }
     async function writeOutputToDisk(entrypoint) {
@@ -529,11 +543,12 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
         async buildFallbackError() {
             // Not implemented yet.
         },
-        close() {
+        async close() {
             closed = true;
-            void disposeBackgroundWatchSubscriptions();
-            closePromise !== null && closePromise !== void 0 ? closePromise : (closePromise = project
-                .onExit()
+            const disposePromise = disposeBackgroundWatchSubscriptions();
+            closePromise !== null && closePromise !== void 0 ? closePromise : (closePromise = (bundleOptions.config.persistentCaching
+                ? project.shutdown()
+                : project.onExit())
                 .catch((err) => {
                 console.error(err);
             })
@@ -544,6 +559,7 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 wsClient.close();
             }
             clients.clear();
+            await Promise.all([disposePromise, closePromise]);
         },
     };
     handleEntrypointsSubscription().catch((err) => {

package/esm/core/project.d.ts

@@ -37,8 +37,9 @@ export declare function projectFactory(): (options: Required<ProjectOptions>, tu
             clientChanged(): Promise<AsyncIterableIterator<TurbopackResult<{}>>>;
             serverChanged(includeIssues: boolean): Promise<AsyncIterableIterator<TurbopackResult<{}>>>;
         }[];
+        appPaths: NapiWrittenEndpoint[] | undefined;
+        libraryPaths: NapiWrittenEndpoint[] | undefined;
         issues: binding.NapiIssue[];
-        diagnostics: binding.NapiDiagnostic[];
     }, void, unknown>;
     hmrEvents(identifier: string): AsyncIterableIterator<TurbopackResult<Update>>;
     hmrIdentifiersSubscribe(): AsyncIterableIterator<TurbopackResult<HmrIdentifiers>>;

package/esm/core/project.js

@@ -63,7 +63,6 @@ const DEFAULT_OPTIMIZE_PACKAGE_IMPORTS = [
     "date-fns",
     "lodash-es",
     "ramda",
-    "antd",
     "react-bootstrap",
     "ahooks",
     "@ant-design/icons",
@@ -451,8 +450,9 @@ export function projectFactory() {
         return {
             apps: (entrypoints.apps || []).map((e) => new EndpointImpl(e)),
             libraries: (entrypoints.libraries || []).map((e) => new EndpointImpl(e)),
+            appPaths: entrypoints.appPaths,
+            libraryPaths: entrypoints.libraryPaths,
             issues: entrypoints.issues,
-            diagnostics: entrypoints.diagnostics,
         };
     }
     return async function createProject(options, turboEngineOptions) {

package/esm/core/types.d.ts

@@ -1,9 +1,8 @@
-import { HmrIdentifiers, NapiDiagnostic, NapiIssue, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame } from "../binding";
+import { HmrIdentifiers, NapiIssue, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame } from "../binding";
 import { BundleOptions } from "../config/types";
 declare global {
     export type TurbopackResult<T = {}> = T & {
         issues: NapiIssue[];
-        diagnostics: NapiDiagnostic[];
     };
     export type RefCell = {
         readonly __tag: unique symbol;
@@ -18,7 +17,6 @@ export interface BaseUpdate {
         headers: unknown;
         path: string;
     };
-    diagnostics: unknown[];
     issues: NapiIssue[];
 }
 export interface IssuesUpdate extends BaseUpdate {
@@ -75,6 +73,8 @@ export interface Project {
 export interface RawEntrypoints {
     apps?: Endpoint[];
     libraries?: Endpoint[];
+    appPaths?: NapiWrittenEndpoint[];
+    libraryPaths?: NapiWrittenEndpoint[];
 }
 export interface Endpoint {
     /** Write files for the endpoint to disk. */

package/esm/utils/getInitialAssets.d.ts

@@ -1,5 +1,7 @@
+import type { NapiWrittenEndpoint } from "../binding";
 export interface Assets {
     js: string[];
     css: string[];
 }
 export declare function getInitialAssetsFromStats(outputDir: string): Assets;
+export declare function getInitialAssetsFromEndpointPaths(endpoints: NapiWrittenEndpoint[]): Assets;

package/esm/utils/getInitialAssets.js

@@ -1,5 +1,15 @@
 import fs from "fs";
 import path from "path";
+function addUniqueAsset(assets, file) {
+    if (!assets.includes(file)) {
+        assets.push(file);
+    }
+}
+function isJavascriptAsset(file) {
+    return (file.endsWith(".js") &&
+        !file.endsWith(".LICENSE.txt") &&
+        !file.endsWith(".map"));
+}
 export function getInitialAssetsFromStats(outputDir) {
     const assets = { js: [], css: [] };
     const statsPath = path.join(outputDir, "stats.json");
@@ -10,12 +20,11 @@ export function getInitialAssetsFromStats(outputDir) {
                 Object.values(stats.entrypoints).forEach((entrypoint) => {
                     var _a;
                     (_a = entrypoint.assets) === null || _a === void 0 ? void 0 : _a.forEach((asset) => {
-                        if (asset.name.endsWith(".js") && !assets.js.includes(asset.name)) {
-                            assets.js.push(asset.name);
+                        if (asset.name.endsWith(".js")) {
+                            addUniqueAsset(assets.js, asset.name);
                         }
-                        if (asset.name.endsWith(".css") &&
-                            !assets.css.includes(asset.name)) {
-                            assets.css.push(asset.name);
+                        if (asset.name.endsWith(".css")) {
+                            addUniqueAsset(assets.css, asset.name);
                         }
                     });
                 });
@@ -27,3 +36,17 @@ export function getInitialAssetsFromStats(outputDir) {
     }
     return assets;
 }
+export function getInitialAssetsFromEndpointPaths(endpoints) {
+    const assets = { js: [], css: [] };
+    endpoints.forEach((endpoint) => {
+        endpoint.clientPaths.forEach((file) => {
+            if (isJavascriptAsset(file)) {
+                addUniqueAsset(assets.js, file);
+            }
+            if (file.endsWith(".css")) {
+                addUniqueAsset(assets.css, file);
+            }
+        });
+    });
+    return assets;
+}

package/esm/utils/normalizePath.js

@@ -1,12 +1,4 @@
-import fs from "fs";
 import path from "path";
 export function normalizePath(file) {
-    if (!file)
-        return file;
-    let normalized = path.resolve(file);
-    try {
-        normalized = fs.realpathSync.native(normalized);
-    }
-    catch (_a) { }
-    return path.sep === "\\" ? normalized.replace(/\\/g, "/") : normalized;
+    return path.sep === "\\" ? file.replace(/\\/g, "/") : file;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "1.4.12-alpha.0",
+  "version": "1.4.12-alpha.10",
   "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.12-alpha.0",
+    "@utoo/pack-shared": "1.4.12-alpha.10",
     "domparser-rs": "^0.0.7",
     "find-up": "4.1.0",
     "get-port": "5.1.1",
@@ -96,12 +96,12 @@
     "directory": "packages/pack"
   },
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "1.4.12-alpha.0",
-    "@utoo/pack-darwin-x64": "1.4.12-alpha.0",
-    "@utoo/pack-linux-arm64-gnu": "1.4.12-alpha.0",
-    "@utoo/pack-linux-arm64-musl": "1.4.12-alpha.0",
-    "@utoo/pack-linux-x64-gnu": "1.4.12-alpha.0",
-    "@utoo/pack-linux-x64-musl": "1.4.12-alpha.0",
-    "@utoo/pack-win32-x64-msvc": "1.4.12-alpha.0"
+    "@utoo/pack-darwin-arm64": "1.4.12-alpha.10",
+    "@utoo/pack-darwin-x64": "1.4.12-alpha.10",
+    "@utoo/pack-linux-arm64-gnu": "1.4.12-alpha.10",
+    "@utoo/pack-linux-arm64-musl": "1.4.12-alpha.10",
+    "@utoo/pack-linux-x64-gnu": "1.4.12-alpha.10",
+    "@utoo/pack-linux-x64-musl": "1.4.12-alpha.10",
+    "@utoo/pack-win32-x64-msvc": "1.4.12-alpha.10"
   }
 }