vite 6.3.0-beta.2 → 6.3.0

package/dist/client/client.mjs

@@ -56,13 +56,16 @@ class HMRContext {
   decline() {
   }
   invalidate(message) {
+    const firstInvalidatedBy = this.hmrClient.currentFirstInvalidatedBy ?? this.ownerPath;
     this.hmrClient.notifyListeners("vite:invalidate", {
       path: this.ownerPath,
-      message
+      message,
+      firstInvalidatedBy
     });
     this.send("vite:invalidate", {
       path: this.ownerPath,
-      message
+      message,
+      firstInvalidatedBy
     });
     this.hmrClient.logger.debug(
       `invalidate ${this.ownerPath}${message ? `: ${message}` : ""}`
@@ -184,7 +187,7 @@ class HMRClient {
     }
   }
   async fetchUpdate(update) {
-    const { path, acceptedPath } = update;
+    const { path, acceptedPath, firstInvalidatedBy } = update;
     const mod = this.hotModulesMap.get(path);
     if (!mod) {
       return;
@@ -204,13 +207,20 @@ class HMRClient {
       }
     }
     return () => {
-      for (const { deps, fn } of qualifiedCallbacks) {
-        fn(
-          deps.map((dep) => dep === acceptedPath ? fetchedModule : void 0)
-        );
+      try {
+        this.currentFirstInvalidatedBy = firstInvalidatedBy;
+        for (const { deps, fn } of qualifiedCallbacks) {
+          fn(
+            deps.map(
+              (dep) => dep === acceptedPath ? fetchedModule : void 0
+            )
+          );
+        }
+        const loggedPath = isSelfUpdate ? path : `${acceptedPath} via ${path}`;
+        this.logger.debug(`hot updated: ${loggedPath}`);
+      } finally {
+        this.currentFirstInvalidatedBy = void 0;
       }
-      const loggedPath = isSelfUpdate ? path : `${acceptedPath} via ${path}`;
-      this.logger.debug(`hot updated: ${loggedPath}`);
     };
   }
 }

package/dist/node/chunks/{dep-jcjTW_IO.js → dep-BuM4AdeL.js}

@@ -7510,6 +7510,15 @@ const teardownSIGTERMListener = (callback) => {
     }
   }
 };
+function getServerUrlByHost(server, host) {
+  if (typeof host !== "string") {
+    return server.resolvedUrls?.local[0] ?? server.resolvedUrls?.network[0];
+  }
+  return [
+    ...server.resolvedUrls?.local ?? [],
+    ...server.resolvedUrls?.network ?? []
+  ].find((url) => url.includes(host));
+}
 
 const LogLevels = {
   silent: 0,
@@ -38416,15 +38425,7 @@ async function _createServer(inlineConfig = {}, options) {
     },
     openBrowser() {
       const options2 = server.config.server;
-      const host = options2.host;
-      let url;
-      if (typeof host === "string") {
-        url = [
-          ...server.resolvedUrls?.local ?? [],
-          ...server.resolvedUrls?.network ?? []
-        ].find((url2) => url2.includes(host));
-      }
-      url ??= server.resolvedUrls?.local[0] ?? server.resolvedUrls?.network[0];
+      const url = getServerUrlByHost(server, options2.host);
       if (url) {
         const path2 = typeof options2.open === "string" ? new URL(options2.open, url).href : url;
         if (server.config.server.preTransformRequests) {
@@ -39222,7 +39223,7 @@ async function handleHMRUpdate(type, file, server) {
   });
   await hotUpdateEnvironments(server, hmr);
 }
-function updateModules(environment, file, modules, timestamp, afterInvalidation) {
+function updateModules(environment, file, modules, timestamp, firstInvalidatedBy) {
   const { hot } = environment;
   const updates = [];
   const invalidatedModules = /* @__PURE__ */ new Set();
@@ -39244,6 +39245,12 @@ function updateModules(environment, file, modules, timestamp, afterInvalidation)
       needFullReload = hasDeadEnd;
       continue;
     }
+    if (firstInvalidatedBy && boundaries.some(
+      ({ acceptedVia }) => normalizeHmrUrl(acceptedVia.url) === firstInvalidatedBy
+    )) {
+      needFullReload = "circular import invalidate";
+      continue;
+    }
     updates.push(
       ...boundaries.map(
         ({ boundary, acceptedVia, isWithinCircularImport }) => ({
@@ -39252,7 +39259,8 @@ function updateModules(environment, file, modules, timestamp, afterInvalidation)
           path: normalizeHmrUrl(boundary.url),
           acceptedPath: normalizeHmrUrl(acceptedVia.url),
           explicitImportRequired: boundary.type === "js" ? isExplicitImportRequired(acceptedVia.url) : false,
-          isWithinCircularImport
+          isWithinCircularImport,
+          firstInvalidatedBy
         })
       )
     );
@@ -39261,7 +39269,7 @@ function updateModules(environment, file, modules, timestamp, afterInvalidation)
     const reason = typeof needFullReload === "string" ? colors$1.dim(` (${needFullReload})`) : "";
     environment.logger.info(
       colors$1.green(`page reload `) + colors$1.dim(file) + reason,
-      { clear: !afterInvalidation, timestamp: true }
+      { clear: !firstInvalidatedBy, timestamp: true }
     );
     hot.send({
       type: "full-reload",
@@ -39275,7 +39283,7 @@ function updateModules(environment, file, modules, timestamp, afterInvalidation)
   }
   environment.logger.info(
     colors$1.green(`hmr update `) + colors$1.dim([...new Set(updates.map((u) => u.path))].join(", ")),
-    { clear: !afterInvalidation, timestamp: true }
+    { clear: !firstInvalidatedBy, timestamp: true }
   );
   hot.send({
     type: "update",
@@ -43818,8 +43826,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-BVYvZuv7.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-B8BdvHtp.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-KUFMcaC7.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-CQ6IcQaf.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -47754,12 +47762,16 @@ class DevEnvironment extends BaseEnvironment {
         return this.fetchModule(id, importer, options2);
       }
     });
-    this.hot.on("vite:invalidate", async ({ path, message }) => {
-      invalidateModule(this, {
-        path,
-        message
-      });
-    });
+    this.hot.on(
+      "vite:invalidate",
+      async ({ path, message, firstInvalidatedBy }) => {
+        invalidateModule(this, {
+          path,
+          message,
+          firstInvalidatedBy
+        });
+      }
+    );
     const { optimizeDeps } = this.config;
     if (context.depsOptimizer) {
       this.depsOptimizer = context.depsOptimizer;
@@ -47873,7 +47885,7 @@ function invalidateModule(environment, m) {
       file,
       [...mod.importers],
       mod.lastHMRTimestamp,
-      true
+      m.firstInvalidatedBy
     );
   }
 }
@@ -48214,7 +48226,7 @@ async function preview(inlineConfig = {}) {
     config
   );
   if (options.open) {
-    const url = server.resolvedUrls.local[0] ?? server.resolvedUrls.network[0];
+    const url = getServerUrlByHost(server, options.host);
     if (url) {
       const path2 = typeof options.open === "string" ? new URL(options.open, url).href : url;
       openBrowser(path2, true, logger);

package/dist/node/chunks/{dep-B8BdvHtp.js → dep-CQ6IcQaf.js}

@@ -1,4 +1,4 @@
-import { Q as commonjsGlobal, P as getDefaultExportFromCjs } from './dep-jcjTW_IO.js';
+import { Q as commonjsGlobal, P as getDefaultExportFromCjs } from './dep-BuM4AdeL.js';
 import require$$0$2 from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/chunks/{dep-BVYvZuv7.js → dep-KUFMcaC7.js}

@@ -1,4 +1,4 @@
-import { P as getDefaultExportFromCjs } from './dep-jcjTW_IO.js';
+import { P as getDefaultExportFromCjs } from './dep-BuM4AdeL.js';
 import require$$0 from 'path';
 import { l as lib } from './dep-3RmXg9uo.js';
 

package/dist/node/cli.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs__default from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { O as colors, I as createLogger, r as resolveConfig } from './chunks/dep-jcjTW_IO.js';
+import { O as colors, I as createLogger, r as resolveConfig } from './chunks/dep-BuM4AdeL.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -748,7 +748,7 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--
   `[boolean] force the optimizer to ignore the cache and re-bundle`
 ).action(async (root, options) => {
   filterDuplicateOptions(options);
-  const { createServer } = await import('./chunks/dep-jcjTW_IO.js').then(function (n) { return n.S; });
+  const { createServer } = await import('./chunks/dep-BuM4AdeL.js').then(function (n) { return n.S; });
   try {
     const server = await createServer({
       root,
@@ -843,7 +843,7 @@ cli.command("build [root]", "build for production").option("--target <target>",
 ).option("-w, --watch", `[boolean] rebuilds when modules have changed on disk`).option("--app", `[boolean] same as \`builder: {}\``).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { createBuilder } = await import('./chunks/dep-jcjTW_IO.js').then(function (n) { return n.T; });
+    const { createBuilder } = await import('./chunks/dep-BuM4AdeL.js').then(function (n) { return n.T; });
     const buildOptions = cleanGlobalCLIOptions(
       cleanBuilderCLIOptions(options)
     );
@@ -882,7 +882,7 @@ cli.command(
 ).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { optimizeDeps } = await import('./chunks/dep-jcjTW_IO.js').then(function (n) { return n.R; });
+    const { optimizeDeps } = await import('./chunks/dep-BuM4AdeL.js').then(function (n) { return n.R; });
     try {
       const config = await resolveConfig(
         {
@@ -909,7 +909,7 @@ ${e.stack}`),
 cli.command("preview [root]", "locally preview production build").option("--host [host]", `[string] specify hostname`, { type: [convertHost] }).option("--port <port>", `[number] specify port`).option("--strictPort", `[boolean] exit if specified port is already in use`).option("--open [path]", `[boolean | string] open browser on startup`).option("--outDir <dir>", `[string] output directory (default: dist)`).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-jcjTW_IO.js').then(function (n) { return n.U; });
+    const { preview } = await import('./chunks/dep-BuM4AdeL.js').then(function (n) { return n.U; });
     try {
       const server = await preview({
         root,

package/dist/node/index.js

@@ -1,6 +1,6 @@
 export { parseAst, parseAstAsync } from 'rollup/parseAst';
-import { a as arraify, i as isInNodeModules, D as DevEnvironment } from './chunks/dep-jcjTW_IO.js';
-export { B as BuildEnvironment, f as build, m as buildErrorMessage, g as createBuilder, F as createFilter, h as createIdResolver, I as createLogger, n as createRunnableDevEnvironment, c as createServer, y as createServerHotChannel, w as createServerModuleRunner, x as createServerModuleRunnerTransport, d as defineConfig, v as fetchModule, j as formatPostcssSourceMap, L as isFileLoadingAllowed, K as isFileServingAllowed, q as isRunnableDevEnvironment, l as loadConfigFromFile, M as loadEnv, E as mergeAlias, C as mergeConfig, z as moduleRunnerTransform, A as normalizePath, o as optimizeDeps, p as perEnvironmentPlugin, b as perEnvironmentState, k as preprocessCSS, e as preview, r as resolveConfig, N as resolveEnvPrefix, G as rollupVersion, u as runnerImport, J as searchForWorkspaceRoot, H as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-jcjTW_IO.js';
+import { a as arraify, i as isInNodeModules, D as DevEnvironment } from './chunks/dep-BuM4AdeL.js';
+export { B as BuildEnvironment, f as build, m as buildErrorMessage, g as createBuilder, F as createFilter, h as createIdResolver, I as createLogger, n as createRunnableDevEnvironment, c as createServer, y as createServerHotChannel, w as createServerModuleRunner, x as createServerModuleRunnerTransport, d as defineConfig, v as fetchModule, j as formatPostcssSourceMap, L as isFileLoadingAllowed, K as isFileServingAllowed, q as isRunnableDevEnvironment, l as loadConfigFromFile, M as loadEnv, E as mergeAlias, C as mergeConfig, z as moduleRunnerTransform, A as normalizePath, o as optimizeDeps, p as perEnvironmentPlugin, b as perEnvironmentState, k as preprocessCSS, e as preview, r as resolveConfig, N as resolveEnvPrefix, G as rollupVersion, u as runnerImport, J as searchForWorkspaceRoot, H as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-BuM4AdeL.js';
 export { defaultAllowedOrigins, DEFAULT_CLIENT_CONDITIONS as defaultClientConditions, DEFAULT_CLIENT_MAIN_FIELDS as defaultClientMainFields, DEFAULT_SERVER_CONDITIONS as defaultServerConditions, DEFAULT_SERVER_MAIN_FIELDS as defaultServerMainFields, VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import 'node:fs';

package/dist/node/module-runner.d.ts

@@ -51,6 +51,7 @@ declare class HMRClient {
     dataMap: Map<string, any>;
     customListenersMap: CustomListenersMap;
     ctxToListenersMap: Map<string, CustomListenersMap>;
+    currentFirstInvalidatedBy: string | undefined;
     constructor(logger: HMRLogger, transport: NormalizedModuleRunnerTransport, importUpdatedModule: (update: Update) => Promise<ModuleNamespace>);
     notifyListeners<T extends string>(event: T, data: InferCustomEventPayload<T>): Promise<void>;
     send(payload: HotPayload): void;

package/dist/node/module-runner.js

@@ -383,12 +383,15 @@ class HMRContext {
   decline() {
   }
   invalidate(message) {
+    const firstInvalidatedBy = this.hmrClient.currentFirstInvalidatedBy ?? this.ownerPath;
     this.hmrClient.notifyListeners("vite:invalidate", {
       path: this.ownerPath,
-      message
+      message,
+      firstInvalidatedBy
     }), this.send("vite:invalidate", {
       path: this.ownerPath,
-      message
+      message,
+      firstInvalidatedBy
     }), this.hmrClient.logger.debug(
       `invalidate ${this.ownerPath}${message ? `: ${message}` : ""}`
     );
@@ -439,6 +442,7 @@ class HMRClient {
   dataMap = /* @__PURE__ */ new Map();
   customListenersMap = /* @__PURE__ */ new Map();
   ctxToListenersMap = /* @__PURE__ */ new Map();
+  currentFirstInvalidatedBy;
   async notifyListeners(event, data) {
     const cbs = this.customListenersMap.get(event);
     cbs && await Promise.allSettled(cbs.map((cb) => cb(data)));
@@ -485,7 +489,7 @@ class HMRClient {
     }
   }
   async fetchUpdate(update) {
-    const { path, acceptedPath } = update, mod = this.hotModulesMap.get(path);
+    const { path, acceptedPath, firstInvalidatedBy } = update, mod = this.hotModulesMap.get(path);
     if (!mod)
       return;
     let fetchedModule;
@@ -502,12 +506,19 @@ class HMRClient {
       }
     }
     return () => {
-      for (const { deps, fn } of qualifiedCallbacks)
-        fn(
-          deps.map((dep) => dep === acceptedPath ? fetchedModule : void 0)
-        );
-      const loggedPath = isSelfUpdate ? path : `${acceptedPath} via ${path}`;
-      this.logger.debug(`hot updated: ${loggedPath}`);
+      try {
+        this.currentFirstInvalidatedBy = firstInvalidatedBy;
+        for (const { deps, fn } of qualifiedCallbacks)
+          fn(
+            deps.map(
+              (dep) => dep === acceptedPath ? fetchedModule : void 0
+            )
+          );
+        const loggedPath = isSelfUpdate ? path : `${acceptedPath} via ${path}`;
+        this.logger.debug(`hot updated: ${loggedPath}`);
+      } finally {
+        this.currentFirstInvalidatedBy = void 0;
+      }
     };
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "6.3.0-beta.2",
+  "version": "6.3.0",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",

package/types/customEvent.d.ts

@@ -30,6 +30,7 @@ export interface WebSocketConnectionPayload {
 export interface InvalidatePayload {
   path: string
   message: string | undefined
+  firstInvalidatedBy: string
 }
 
 /**

package/types/hmrPayload.d.ts

@@ -32,6 +32,8 @@ export interface Update {
   /** @internal */
   isWithinCircularImport?: boolean
   /** @internal */
+  firstInvalidatedBy?: string
+  /** @internal */
   invalidates?: string[]
 }