@utoo/pack 1.4.7 → 1.4.8-alpha.0

package/cjs/core/hmr.d.ts

@@ -1,4 +1,4 @@
-import { type HMR_ACTION_TYPES } from "@utoo/pack-shared";
+import { type EntryIssuesMap, type HMR_ACTION_TYPES } from "@utoo/pack-shared";
 import { IncomingMessage } from "http";
 import { Duplex } from "stream";
 import { BundleOptions } from "../config/types";
@@ -47,6 +47,7 @@ export type ClientState = {
     hmrPayloads: Map<string, HMR_ACTION_TYPES>;
     turbopackUpdates: TurbopackUpdate[];
     subscriptions: Map<string, AsyncIterator<any>>;
+    clientIssues: EntryIssuesMap;
 };
 export type SendHmr = (id: string, payload: HMR_ACTION_TYPES) => void;
 export declare const FAST_REFRESH_RUNTIME_RELOAD = "Fast Refresh had to perform a full reload due to a runtime error.";

package/cjs/core/hmr.js

@@ -21,6 +21,39 @@ const sessionId = Math.floor(Number.MAX_SAFE_INTEGER * Math.random());
 var pack_shared_2 = require("@utoo/pack-shared");
 Object.defineProperty(exports, "HMR_ACTIONS_SENT_TO_BROWSER", { enumerable: true, get: function () { return pack_shared_2.HMR_ACTIONS_SENT_TO_BROWSER; } });
 exports.FAST_REFRESH_RUNTIME_RELOAD = "Fast Refresh had to perform a full reload due to a runtime error.";
+function hasBlockingIssues(issues) {
+    for (const issueMap of issues.values()) {
+        for (const issue of issueMap.values()) {
+            if (issue.severity !== "warning") {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+function hasBlockingResultIssues(result) {
+    return result.issues.some((issue) => issue.severity === "error" || issue.severity === "fatal");
+}
+function addIssuesToErrors(errors, issues) {
+    for (const issueMap of issues.values()) {
+        for (const [key, issue] of issueMap) {
+            if (issue.severity === "warning") {
+                continue;
+            }
+            errors.set(key, {
+                message: (0, pack_shared_1.formatIssue)(issue, false),
+            });
+        }
+    }
+}
+function getCompilationErrors(issues) {
+    const errors = new Map();
+    addIssuesToErrors(errors, issues);
+    return [...errors.values()];
+}
+function getClientIssueKey(id) {
+    return `client:${id}`;
+}
 async function createHotReloader(bundleOptions, projectPath, rootPath) {
     var _a, _b, _c, _d, _e, _f, _g;
     const resolvedProjectPath = projectPath || process.cwd();
@@ -84,6 +117,7 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
     let hmrHash = 0;
     const clients = new Set();
     const clientStates = new WeakMap();
+    const currentEntryIssues = new Map();
     const backgroundWatchSubscriptions = new Set();
     let currentWatchedEntrypoints = [];
     let backgroundWatchersStarted = false;
@@ -96,11 +130,17 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
         client.send(JSON.stringify(payload));
     }
     function sendEnqueuedMessages() {
+        if (hasBlockingIssues(currentEntryIssues)) {
+            return;
+        }
         for (const client of clients) {
             const state = clientStates.get(client);
             if (!state) {
                 continue;
             }
+            if (hasBlockingIssues(state.clientIssues)) {
+                return;
+            }
             for (const payload of state.hmrPayloads.values()) {
                 sendToClient(client, payload);
             }
@@ -159,6 +199,7 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
     async function disposeBackgroundWatchSubscriptions() {
         const subscriptions = [...backgroundWatchSubscriptions];
         backgroundWatchSubscriptions.clear();
+        currentEntryIssues.clear();
         backgroundEndpointWriteTasks.clear();
         backgroundProjectWriteTask = undefined;
         await Promise.all(subscriptions.map((subscription) => { var _a; return (_a = subscription.return) === null || _a === void 0 ? void 0 : _a.call(subscription); }));
@@ -221,13 +262,18 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
             }
             backgroundWatchSubscriptions.add(clientChanges);
             backgroundWatchSubscriptions.add(serverChanges);
-            const watchChanges = async (subscription) => {
+            const watchChanges = async (subscription, issueKey) => {
                 try {
                     for await (const data of subscription) {
                         if (closed || generation !== backgroundWatchGeneration) {
                             return;
                         }
-                        (0, common_1.processIssues)(data, true, true);
+                        (0, common_1.processIssues)(currentEntryIssues, issueKey, data, false, true);
+                        if (hasBlockingResultIssues(data)) {
+                            hmrEventHappened = true;
+                            sendEnqueuedMessagesDebounce();
+                            continue;
+                        }
                         scheduleOutputWrite(entrypoint, generation);
                     }
                 }
@@ -239,10 +285,12 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 }
                 finally {
                     backgroundWatchSubscriptions.delete(subscription);
+                    currentEntryIssues.delete(issueKey);
                 }
             };
-            void watchChanges(clientChanges);
-            void watchChanges(serverChanges);
+            const entrypointIndex = currentWatchedEntrypoints.indexOf(entrypoint);
+            void watchChanges(clientChanges, `entrypoint:${entrypointIndex}:client`);
+            void watchChanges(serverChanges, `entrypoint:${entrypointIndex}:server`);
         }));
     }
     async function subscribeToHmrEvents(client, id) {
@@ -252,12 +300,13 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
         }
         const subscription = project.hmrEvents(id);
         state.subscriptions.set(id, subscription);
+        const issueKey = getClientIssueKey(id);
         // The subscription will always emit once, which is the initial
         // computation. This is not a change, so swallow it.
         try {
             await subscription.next();
             for await (const data of subscription) {
-                (0, common_1.processIssues)(data, true, true);
+                (0, common_1.processIssues)(state.clientIssues, issueKey, data, false, true);
                 if (data.type !== "issues") {
                     sendTurbopackMessage(data);
                 }
@@ -284,6 +333,7 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
         }
         const subscription = state.subscriptions.get(id);
         subscription === null || subscription === void 0 ? void 0 : subscription.return();
+        state.clientIssues.delete(getClientIssueKey(id));
     }
     async function handleEntrypointsSubscription() {
         var _a, _b;
@@ -322,6 +372,7 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
                     hmrPayloads: new Map(),
                     turbopackUpdates: [],
                     subscriptions,
+                    clientIssues: new Map(),
                 });
                 client.on("close", () => {
                     var _a;
@@ -377,7 +428,7 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
                     data: { sessionId },
                 };
                 sendToClient(client, turbopackConnected);
-                const errors = [];
+                const errors = getCompilationErrors(currentEntryIssues);
                 (async function () {
                     const sync = {
                         action: pack_shared_1.HMR_ACTIONS_SENT_TO_BROWSER.SYNC,
@@ -396,13 +447,14 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 hmrPayloads: new Map(),
                 turbopackUpdates: [],
                 subscriptions,
+                clientIssues: new Map(),
             });
             const turbopackConnected = {
                 action: pack_shared_1.HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_CONNECTED,
                 data: { sessionId },
             };
             sendToClient(ws, turbopackConnected);
-            const errors = [];
+            const errors = getCompilationErrors(currentEntryIssues);
             const sync = {
                 action: pack_shared_1.HMR_ACTIONS_SENT_TO_BROWSER.SYNC,
                 errors,
@@ -515,12 +567,14 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 case "end": {
                     sendEnqueuedMessages();
                     const errors = new Map();
+                    addIssuesToErrors(errors, currentEntryIssues);
                     for (const client of clients) {
                         const state = clientStates.get(client);
                         if (!state) {
                             continue;
                         }
                         const clientErrors = new Map(errors);
+                        addIssuesToErrors(clientErrors, state.clientIssues);
                         sendToClient(client, {
                             action: pack_shared_1.HMR_ACTIONS_SENT_TO_BROWSER.BUILT,
                             hash: String(++hmrHash),

package/esm/core/hmr.d.ts

@@ -1,4 +1,4 @@
-import { type HMR_ACTION_TYPES } from "@utoo/pack-shared";
+import { type EntryIssuesMap, type HMR_ACTION_TYPES } from "@utoo/pack-shared";
 import { IncomingMessage } from "http";
 import { Duplex } from "stream";
 import { BundleOptions } from "../config/types";
@@ -47,6 +47,7 @@ export type ClientState = {
     hmrPayloads: Map<string, HMR_ACTION_TYPES>;
     turbopackUpdates: TurbopackUpdate[];
     subscriptions: Map<string, AsyncIterator<any>>;
+    clientIssues: EntryIssuesMap;
 };
 export type SendHmr = (id: string, payload: HMR_ACTION_TYPES) => void;
 export declare const FAST_REFRESH_RUNTIME_RELOAD = "Fast Refresh had to perform a full reload due to a runtime error.";

package/esm/core/hmr.js

@@ -1,4 +1,4 @@
-import { HMR_ACTIONS_SENT_TO_BROWSER, } from "@utoo/pack-shared";
+import { formatIssue, HMR_ACTIONS_SENT_TO_BROWSER, } from "@utoo/pack-shared";
 import { nanoid } from "nanoid";
 import { WebSocketServer } from "ws";
 import { HtmlPlugin } from "../plugins/HtmlPlugin.js";
@@ -16,6 +16,39 @@ const sessionId = Math.floor(Number.MAX_SAFE_INTEGER * Math.random());
 // Re-export HMR types from pack-shared for backward compatibility
 export { HMR_ACTIONS_SENT_TO_BROWSER, } from "@utoo/pack-shared";
 export const FAST_REFRESH_RUNTIME_RELOAD = "Fast Refresh had to perform a full reload due to a runtime error.";
+function hasBlockingIssues(issues) {
+    for (const issueMap of issues.values()) {
+        for (const issue of issueMap.values()) {
+            if (issue.severity !== "warning") {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+function hasBlockingResultIssues(result) {
+    return result.issues.some((issue) => issue.severity === "error" || issue.severity === "fatal");
+}
+function addIssuesToErrors(errors, issues) {
+    for (const issueMap of issues.values()) {
+        for (const [key, issue] of issueMap) {
+            if (issue.severity === "warning") {
+                continue;
+            }
+            errors.set(key, {
+                message: formatIssue(issue, false),
+            });
+        }
+    }
+}
+function getCompilationErrors(issues) {
+    const errors = new Map();
+    addIssuesToErrors(errors, issues);
+    return [...errors.values()];
+}
+function getClientIssueKey(id) {
+    return `client:${id}`;
+}
 export async function createHotReloader(bundleOptions, projectPath, rootPath) {
     var _a, _b, _c, _d, _e, _f, _g;
     const resolvedProjectPath = projectPath || process.cwd();
@@ -79,6 +112,7 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
     let hmrHash = 0;
     const clients = new Set();
     const clientStates = new WeakMap();
+    const currentEntryIssues = new Map();
     const backgroundWatchSubscriptions = new Set();
     let currentWatchedEntrypoints = [];
     let backgroundWatchersStarted = false;
@@ -91,11 +125,17 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
         client.send(JSON.stringify(payload));
     }
     function sendEnqueuedMessages() {
+        if (hasBlockingIssues(currentEntryIssues)) {
+            return;
+        }
         for (const client of clients) {
             const state = clientStates.get(client);
             if (!state) {
                 continue;
             }
+            if (hasBlockingIssues(state.clientIssues)) {
+                return;
+            }
             for (const payload of state.hmrPayloads.values()) {
                 sendToClient(client, payload);
             }
@@ -154,6 +194,7 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
     async function disposeBackgroundWatchSubscriptions() {
         const subscriptions = [...backgroundWatchSubscriptions];
         backgroundWatchSubscriptions.clear();
+        currentEntryIssues.clear();
         backgroundEndpointWriteTasks.clear();
         backgroundProjectWriteTask = undefined;
         await Promise.all(subscriptions.map((subscription) => { var _a; return (_a = subscription.return) === null || _a === void 0 ? void 0 : _a.call(subscription); }));
@@ -216,13 +257,18 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
             }
             backgroundWatchSubscriptions.add(clientChanges);
             backgroundWatchSubscriptions.add(serverChanges);
-            const watchChanges = async (subscription) => {
+            const watchChanges = async (subscription, issueKey) => {
                 try {
                     for await (const data of subscription) {
                         if (closed || generation !== backgroundWatchGeneration) {
                             return;
                         }
-                        processIssues(data, true, true);
+                        processIssues(currentEntryIssues, issueKey, data, false, true);
+                        if (hasBlockingResultIssues(data)) {
+                            hmrEventHappened = true;
+                            sendEnqueuedMessagesDebounce();
+                            continue;
+                        }
                         scheduleOutputWrite(entrypoint, generation);
                     }
                 }
@@ -234,10 +280,12 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 }
                 finally {
                     backgroundWatchSubscriptions.delete(subscription);
+                    currentEntryIssues.delete(issueKey);
                 }
             };
-            void watchChanges(clientChanges);
-            void watchChanges(serverChanges);
+            const entrypointIndex = currentWatchedEntrypoints.indexOf(entrypoint);
+            void watchChanges(clientChanges, `entrypoint:${entrypointIndex}:client`);
+            void watchChanges(serverChanges, `entrypoint:${entrypointIndex}:server`);
         }));
     }
     async function subscribeToHmrEvents(client, id) {
@@ -247,12 +295,13 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
         }
         const subscription = project.hmrEvents(id);
         state.subscriptions.set(id, subscription);
+        const issueKey = getClientIssueKey(id);
         // The subscription will always emit once, which is the initial
         // computation. This is not a change, so swallow it.
         try {
             await subscription.next();
             for await (const data of subscription) {
-                processIssues(data, true, true);
+                processIssues(state.clientIssues, issueKey, data, false, true);
                 if (data.type !== "issues") {
                     sendTurbopackMessage(data);
                 }
@@ -279,6 +328,7 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
         }
         const subscription = state.subscriptions.get(id);
         subscription === null || subscription === void 0 ? void 0 : subscription.return();
+        state.clientIssues.delete(getClientIssueKey(id));
     }
     async function handleEntrypointsSubscription() {
         var _a, _b;
@@ -317,6 +367,7 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
                     hmrPayloads: new Map(),
                     turbopackUpdates: [],
                     subscriptions,
+                    clientIssues: new Map(),
                 });
                 client.on("close", () => {
                     var _a;
@@ -372,7 +423,7 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
                     data: { sessionId },
                 };
                 sendToClient(client, turbopackConnected);
-                const errors = [];
+                const errors = getCompilationErrors(currentEntryIssues);
                 (async function () {
                     const sync = {
                         action: HMR_ACTIONS_SENT_TO_BROWSER.SYNC,
@@ -391,13 +442,14 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 hmrPayloads: new Map(),
                 turbopackUpdates: [],
                 subscriptions,
+                clientIssues: new Map(),
             });
             const turbopackConnected = {
                 action: HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_CONNECTED,
                 data: { sessionId },
             };
             sendToClient(ws, turbopackConnected);
-            const errors = [];
+            const errors = getCompilationErrors(currentEntryIssues);
             const sync = {
                 action: HMR_ACTIONS_SENT_TO_BROWSER.SYNC,
                 errors,
@@ -510,12 +562,14 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
                 case "end": {
                     sendEnqueuedMessages();
                     const errors = new Map();
+                    addIssuesToErrors(errors, currentEntryIssues);
                     for (const client of clients) {
                         const state = clientStates.get(client);
                         if (!state) {
                             continue;
                         }
                         const clientErrors = new Map(errors);
+                        addIssuesToErrors(clientErrors, state.clientIssues);
                         sendToClient(client, {
                             action: HMR_ACTIONS_SENT_TO_BROWSER.BUILT,
                             hash: String(++hmrHash),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "1.4.7",
+  "version": "1.4.8-alpha.0",
   "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.7",
+    "@utoo/pack-shared": "1.4.8-alpha.0",
     "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.7",
-    "@utoo/pack-darwin-x64": "1.4.7",
-    "@utoo/pack-linux-arm64-gnu": "1.4.7",
-    "@utoo/pack-linux-arm64-musl": "1.4.7",
-    "@utoo/pack-linux-x64-gnu": "1.4.7",
-    "@utoo/pack-linux-x64-musl": "1.4.7",
-    "@utoo/pack-win32-x64-msvc": "1.4.7"
+    "@utoo/pack-darwin-arm64": "1.4.8-alpha.0",
+    "@utoo/pack-darwin-x64": "1.4.8-alpha.0",
+    "@utoo/pack-linux-arm64-gnu": "1.4.8-alpha.0",
+    "@utoo/pack-linux-arm64-musl": "1.4.8-alpha.0",
+    "@utoo/pack-linux-x64-gnu": "1.4.8-alpha.0",
+    "@utoo/pack-linux-x64-musl": "1.4.8-alpha.0",
+    "@utoo/pack-win32-x64-msvc": "1.4.8-alpha.0"
   }
 }