@tanstack/router-plugin 1.167.21 → 1.167.23

package/src/rspack.ts

@@ -1,12 +1,42 @@
 import { createRspackPlugin } from 'unplugin'
 
 import { configSchema } from './core/config'
-import { withHmrHotExpression } from './core/hmr-hot-expression'
 import { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin'
 import { unpluginRouterGeneratorFactory } from './core/router-generator-plugin'
 import { unpluginRouterComposedFactory } from './core/router-composed-plugin'
 import type { CodeSplittingOptions, Config } from './core/config'
 
+type RspackRouterPluginOptions = Partial<Config> | (() => Partial<Config>)
+
+/**
+ * Rspack uses webpack-compatible `module.hot` / `import.meta.webpackHot` HMR.
+ * Force `plugin.hmr.style = 'webpack'` so the router HMR adapter emits
+ * `module.hot`-style accept/dispose code instead of Vite's callback-receive
+ * variant, regardless of what the user passes (or doesn't pass).
+ */
+function withWebpackHmrStyle(
+  options: RspackRouterPluginOptions | undefined,
+): RspackRouterPluginOptions {
+  const mergeHmrStyle = (
+    config: Partial<Config> | undefined,
+  ): Partial<Config> => ({
+    ...config,
+    plugin: {
+      ...config?.plugin,
+      hmr: {
+        ...config?.plugin?.hmr,
+        style: 'webpack',
+      },
+    },
+  })
+
+  if (typeof options === 'function') {
+    return () => mergeHmrStyle(options())
+  }
+
+  return mergeHmrStyle(options)
+}
+
 /**
  * @example
  * ```ts
@@ -40,10 +70,9 @@ const TanStackRouterGeneratorRspack = /* #__PURE__ */ createRspackPlugin(
 const TanStackRouterCodeSplitterRspack = /* #__PURE__ */ createRspackPlugin(
   (options, meta) =>
     unpluginRouterCodeSplitterFactory(
-      withHmrHotExpression(
-        options as Partial<Config> | undefined,
-        'import.meta.webpackHot',
-      ),
+      withWebpackHmrStyle(
+        options as RspackRouterPluginOptions | undefined,
+      ) as Partial<Config | (() => Config)>,
       meta,
     ),
 )
@@ -64,10 +93,9 @@ const TanStackRouterCodeSplitterRspack = /* #__PURE__ */ createRspackPlugin(
 const TanStackRouterRspack = /* #__PURE__ */ createRspackPlugin(
   (options, meta) =>
     unpluginRouterComposedFactory(
-      withHmrHotExpression(
-        options as Partial<Config> | undefined,
-        'import.meta.webpackHot',
-      ),
+      withWebpackHmrStyle(
+        options as RspackRouterPluginOptions | undefined,
+      ) as Partial<Config | (() => Config)>,
       meta,
     ),
 )

package/src/webpack.ts

@@ -1,12 +1,31 @@
 import { createWebpackPlugin } from 'unplugin'
 
 import { configSchema } from './core/config'
-import { withHmrHotExpression } from './core/hmr-hot-expression'
 import { unpluginRouterCodeSplitterFactory } from './core/router-code-splitter-plugin'
 import { unpluginRouterGeneratorFactory } from './core/router-generator-plugin'
 import { unpluginRouterComposedFactory } from './core/router-composed-plugin'
 import type { CodeSplittingOptions, Config } from './core/config'
 
+/**
+ * Webpack uses `module.hot` / `import.meta.webpackHot` HMR. Force
+ * `plugin.hmr.style = 'webpack'` so the router HMR adapter emits the correct
+ * accept/dispose shape regardless of user config.
+ */
+function withWebpackHmrStyle(
+  options: Partial<Config> | undefined,
+): Partial<Config> {
+  return {
+    ...options,
+    plugin: {
+      ...options?.plugin,
+      hmr: {
+        ...options?.plugin?.hmr,
+        style: 'webpack',
+      },
+    },
+  }
+}
+
 /**
  * @example
  * ```ts
@@ -32,10 +51,7 @@ const TanStackRouterGeneratorWebpack = /* #__PURE__ */ createWebpackPlugin(
 const TanStackRouterCodeSplitterWebpack = /* #__PURE__ */ createWebpackPlugin(
   (options, meta) =>
     unpluginRouterCodeSplitterFactory(
-      withHmrHotExpression(
-        options as Partial<Config> | undefined,
-        'import.meta.webpackHot',
-      ),
+      withWebpackHmrStyle(options as Partial<Config> | undefined),
       meta,
     ),
 )
@@ -52,10 +68,7 @@ const TanStackRouterCodeSplitterWebpack = /* #__PURE__ */ createWebpackPlugin(
 const TanStackRouterWebpack = /* #__PURE__ */ createWebpackPlugin(
   (options, meta) =>
     unpluginRouterComposedFactory(
-      withHmrHotExpression(
-        options as Partial<Config> | undefined,
-        'import.meta.webpackHot',
-      ),
+      withWebpackHmrStyle(options as Partial<Config> | undefined),
       meta,
     ),
 )

package/dist/cjs/core/hmr-hot-expression.cjs

@@ -1,27 +0,0 @@
-const require_runtime = require("../_virtual/_rolldown/runtime.cjs");
-let _babel_template = require("@babel/template");
-_babel_template = require_runtime.__toESM(_babel_template);
-function resolveHmrHotExpression(hotExpression) {
-	return hotExpression ?? "import.meta.hot";
-}
-function createHmrHotExpressionAst(hotExpression) {
-	return _babel_template.expression.ast(resolveHmrHotExpression(hotExpression));
-}
-function withHmrHotExpression(config, hotExpression) {
-	return {
-		...config,
-		plugin: {
-			...config?.plugin,
-			hmr: {
-				...config?.plugin?.hmr,
-				hotExpression: config?.plugin?.hmr?.hotExpression ?? hotExpression
-			}
-		}
-	};
-}
-//#endregion
-exports.createHmrHotExpressionAst = createHmrHotExpressionAst;
-exports.resolveHmrHotExpression = resolveHmrHotExpression;
-exports.withHmrHotExpression = withHmrHotExpression;
-
-//# sourceMappingURL=hmr-hot-expression.cjs.map

package/dist/cjs/core/hmr-hot-expression.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"hmr-hot-expression.cjs","names":[],"sources":["../../../src/core/hmr-hot-expression.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport type * as t from '@babel/types'\nimport type { Config } from './config'\n\nexport const DEFAULT_HMR_HOT_EXPRESSION = 'import.meta.hot'\n\nexport function resolveHmrHotExpression(hotExpression?: string): string {\n  return hotExpression ?? DEFAULT_HMR_HOT_EXPRESSION\n}\n\nexport function createHmrHotExpressionAst(\n  hotExpression?: string,\n): t.Expression {\n  return template.expression.ast(resolveHmrHotExpression(hotExpression))\n}\n\nexport function withHmrHotExpression(\n  config: Partial<Config> | undefined,\n  hotExpression: string,\n): Partial<Config> {\n  return {\n    ...config,\n    plugin: {\n      ...config?.plugin,\n      hmr: {\n        ...config?.plugin?.hmr,\n        hotExpression: config?.plugin?.hmr?.hotExpression ?? hotExpression,\n      },\n    },\n  }\n}\n"],"mappings":";;;AAMA,SAAgB,wBAAwB,eAAgC;AACtE,QAAO,iBAAA;;AAGT,SAAgB,0BACd,eACc;AACd,QAAO,gBAAS,WAAW,IAAI,wBAAwB,cAAc,CAAC;;AAGxE,SAAgB,qBACd,QACA,eACiB;AACjB,QAAO;EACL,GAAG;EACH,QAAQ;GACN,GAAG,QAAQ;GACX,KAAK;IACH,GAAG,QAAQ,QAAQ;IACnB,eAAe,QAAQ,QAAQ,KAAK,iBAAiB;IACtD;GACF;EACF"}

package/dist/cjs/core/hmr-hot-expression.d.cts

@@ -1,6 +0,0 @@
-import { Config } from './config.cjs';
-import type * as t from '@babel/types';
-export declare const DEFAULT_HMR_HOT_EXPRESSION = "import.meta.hot";
-export declare function resolveHmrHotExpression(hotExpression?: string): string;
-export declare function createHmrHotExpressionAst(hotExpression?: string): t.Expression;
-export declare function withHmrHotExpression(config: Partial<Config> | undefined, hotExpression: string): Partial<Config>;

package/dist/cjs/core/route-hmr-statement.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"route-hmr-statement.cjs","names":[],"sources":["../../../src/core/route-hmr-statement.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport { createHmrHotExpressionAst } from './hmr-hot-expression'\nimport type * as t from '@babel/types'\nimport type {\n  AnyRoute,\n  AnyRouteMatch,\n  AnyRouter,\n  RouterWritableStore,\n} from '@tanstack/router-core'\n\ntype AnyRouteWithPrivateProps = AnyRoute & {\n  options: Record<string, unknown>\n  _componentsPromise?: Promise<void>\n  _lazyPromise?: Promise<void>\n  update: (options: Record<string, unknown>) => unknown\n  _path: string\n  _id: string\n  _fullPath: string\n  _to: string\n}\n\ntype AnyRouterWithPrivateMaps = AnyRouter & {\n  routesById: Record<string, AnyRoute>\n  routesByPath: Record<string, AnyRoute>\n  stores: AnyRouter['stores'] & {\n    cachedMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'set'>\n    >\n    pendingMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'set'>\n    >\n    matchStores: Map<string, Pick<RouterWritableStore<AnyRouteMatch>, 'set'>>\n  }\n}\n\ntype AnyRouteMatchWithPrivateProps = AnyRouteMatch & {\n  __beforeLoadContext?: unknown\n}\n\nfunction handleRouteUpdate(\n  routeId: string,\n  newRoute: AnyRouteWithPrivateProps,\n) {\n  const router = window.__TSR_ROUTER__ as AnyRouterWithPrivateMaps\n  const oldRoute = router.routesById[routeId] as\n    | AnyRouteWithPrivateProps\n    | undefined\n\n  if (!oldRoute) {\n    return\n  }\n\n  // Keys whose identity must remain stable to prevent React from\n  // unmounting/remounting the component tree.  React Fast Refresh already\n  // handles hot-updating the function bodies of these components — our job\n  // is only to update non-component route options (loader, head, etc.).\n  // For code-split (splittable) routes, the lazyRouteComponent wrapper is\n  // already cached in the bundler hot data so its identity is stable.\n  // For unsplittable routes (e.g. root routes), the component is a plain\n  // function reference that gets recreated on every module re-execution,\n  // so we must explicitly preserve the old reference.\n  const removedKeys = new Set<string>()\n  Object.keys(oldRoute.options).forEach((key) => {\n    if (!(key in newRoute.options)) {\n      removedKeys.add(key)\n      delete oldRoute.options[key]\n    }\n  })\n\n  // Preserve component identity so React doesn't remount.\n  // React Fast Refresh patches the function bodies in-place.\n  const componentKeys = '__TSR_COMPONENT_TYPES__' as unknown as Array<string>\n  componentKeys.forEach((key) => {\n    if (key in oldRoute.options && key in newRoute.options) {\n      newRoute.options[key] = oldRoute.options[key]\n    }\n  })\n\n  oldRoute.options = newRoute.options\n  oldRoute.update(newRoute.options)\n  oldRoute._componentsPromise = undefined\n  oldRoute._lazyPromise = undefined\n\n  router.routesById[oldRoute.id] = oldRoute\n  router.routesByPath[oldRoute.fullPath] = oldRoute\n\n  router.processedTree.matchCache.clear()\n  router.processedTree.flatCache?.clear()\n  router.processedTree.singleCache.clear()\n  router.resolvePathCache.clear()\n  walkReplaceSegmentTree(oldRoute, router.processedTree.segmentTree)\n\n  const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id\n  const activeMatch = router.stores.matches.get().find(filter)\n  const pendingMatch = router.stores.pendingMatches.get().find(filter)\n  const cachedMatches = router.stores.cachedMatches.get().filter(filter)\n\n  if (activeMatch || pendingMatch || cachedMatches.length > 0) {\n    // Clear stale match data for removed route options BEFORE invalidating.\n    // Without this, router.invalidate() -> matchRoutes() reuses the existing\n    // match from the store (via ...existingMatch spread) and the stale\n    // loaderData / __beforeLoadContext survives the reload cycle.\n    //\n    // We must update the store directly (not via router.updateMatch) because\n    // updateMatch wraps in startTransition which may defer the state update,\n    // and we need the clear to be visible before invalidate reads the store.\n    if (removedKeys.has('loader') || removedKeys.has('beforeLoad')) {\n      const matchIds = [\n        activeMatch?.id,\n        pendingMatch?.id,\n        ...cachedMatches.map((match) => match.id),\n      ].filter(Boolean) as Array<string>\n      router.batch(() => {\n        for (const matchId of matchIds) {\n          const store =\n            router.stores.pendingMatchStores.get(matchId) ||\n            router.stores.matchStores.get(matchId) ||\n            router.stores.cachedMatchStores.get(matchId)\n          if (store) {\n            store.set((prev) => {\n              const next: AnyRouteMatchWithPrivateProps = { ...prev }\n\n              if (removedKeys.has('loader')) {\n                next.loaderData = undefined\n              }\n              if (removedKeys.has('beforeLoad')) {\n                next.__beforeLoadContext = undefined\n              }\n\n              return next\n            })\n          }\n        }\n      })\n    }\n\n    router.invalidate({ filter, sync: true })\n  }\n\n  function walkReplaceSegmentTree(\n    route: AnyRouteWithPrivateProps,\n    node: AnyRouter['processedTree']['segmentTree'],\n  ) {\n    if (node.route?.id === route.id) node.route = route\n    if (node.index) walkReplaceSegmentTree(route, node.index)\n    node.static?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.staticInsensitive?.forEach((child) =>\n      walkReplaceSegmentTree(route, child),\n    )\n    node.dynamic?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.optional?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.wildcard?.forEach((child) => walkReplaceSegmentTree(route, child))\n  }\n}\n\nconst handleRouteUpdateStr = handleRouteUpdate.toString()\n\nexport function createRouteHmrStatement(\n  stableRouteOptionKeys: Array<string>,\n  opts?: { hotExpression?: string },\n): t.Statement {\n  return template.statement(\n    `\nif (%%hotExpression%%) {\n  const hot = %%hotExpression%%\n  const hotData = hot.data ??= {}\n  hot.accept((newModule) => {\n    if (Route && newModule && newModule.Route) {\n      const routeId = hotData['tsr-route-id'] ?? Route.id\n      if (routeId) {\n        hotData['tsr-route-id'] = routeId\n      }\n      (${handleRouteUpdateStr.replace(\n        /['\"]__TSR_COMPONENT_TYPES__['\"]/,\n        JSON.stringify(stableRouteOptionKeys),\n      )})(routeId, newModule.Route)\n    }\n    })\n}\n`,\n    {\n      syntacticPlaceholders: true,\n    },\n  )({\n    hotExpression: createHmrHotExpressionAst(opts?.hotExpression),\n  })\n}\n"],"mappings":";;;;;AAyCA,SAAS,kBACP,SACA,UACA;CACA,MAAM,SAAS,OAAO;CACtB,MAAM,WAAW,OAAO,WAAW;AAInC,KAAI,CAAC,SACH;CAYF,MAAM,8BAAc,IAAI,KAAa;AACrC,QAAO,KAAK,SAAS,QAAQ,CAAC,SAAS,QAAQ;AAC7C,MAAI,EAAE,OAAO,SAAS,UAAU;AAC9B,eAAY,IAAI,IAAI;AACpB,UAAO,SAAS,QAAQ;;GAE1B;AAIoB,2BACR,SAAS,QAAQ;AAC7B,MAAI,OAAO,SAAS,WAAW,OAAO,SAAS,QAC7C,UAAS,QAAQ,OAAO,SAAS,QAAQ;GAE3C;AAEF,UAAS,UAAU,SAAS;AAC5B,UAAS,OAAO,SAAS,QAAQ;AACjC,UAAS,qBAAqB,KAAA;AAC9B,UAAS,eAAe,KAAA;AAExB,QAAO,WAAW,SAAS,MAAM;AACjC,QAAO,aAAa,SAAS,YAAY;AAEzC,QAAO,cAAc,WAAW,OAAO;AACvC,QAAO,cAAc,WAAW,OAAO;AACvC,QAAO,cAAc,YAAY,OAAO;AACxC,QAAO,iBAAiB,OAAO;AAC/B,wBAAuB,UAAU,OAAO,cAAc,YAAY;CAElE,MAAM,UAAU,MAAqB,EAAE,YAAY,SAAS;CAC5D,MAAM,cAAc,OAAO,OAAO,QAAQ,KAAK,CAAC,KAAK,OAAO;CAC5D,MAAM,eAAe,OAAO,OAAO,eAAe,KAAK,CAAC,KAAK,OAAO;CACpE,MAAM,gBAAgB,OAAO,OAAO,cAAc,KAAK,CAAC,OAAO,OAAO;AAEtE,KAAI,eAAe,gBAAgB,cAAc,SAAS,GAAG;AAS3D,MAAI,YAAY,IAAI,SAAS,IAAI,YAAY,IAAI,aAAa,EAAE;GAC9D,MAAM,WAAW;IACf,aAAa;IACb,cAAc;IACd,GAAG,cAAc,KAAK,UAAU,MAAM,GAAG;IAC1C,CAAC,OAAO,QAAQ;AACjB,UAAO,YAAY;AACjB,SAAK,MAAM,WAAW,UAAU;KAC9B,MAAM,QACJ,OAAO,OAAO,mBAAmB,IAAI,QAAQ,IAC7C,OAAO,OAAO,YAAY,IAAI,QAAQ,IACtC,OAAO,OAAO,kBAAkB,IAAI,QAAQ;AAC9C,SAAI,MACF,OAAM,KAAK,SAAS;MAClB,MAAM,OAAsC,EAAE,GAAG,MAAM;AAEvD,UAAI,YAAY,IAAI,SAAS,CAC3B,MAAK,aAAa,KAAA;AAEpB,UAAI,YAAY,IAAI,aAAa,CAC/B,MAAK,sBAAsB,KAAA;AAG7B,aAAO;OACP;;KAGN;;AAGJ,SAAO,WAAW;GAAE;GAAQ,MAAM;GAAM,CAAC;;CAG3C,SAAS,uBACP,OACA,MACA;AACA,MAAI,KAAK,OAAO,OAAO,MAAM,GAAI,MAAK,QAAQ;AAC9C,MAAI,KAAK,MAAO,wBAAuB,OAAO,KAAK,MAAM;AACzD,OAAK,QAAQ,SAAS,UAAU,uBAAuB,OAAO,MAAM,CAAC;AACrE,OAAK,mBAAmB,SAAS,UAC/B,uBAAuB,OAAO,MAAM,CACrC;AACD,OAAK,SAAS,SAAS,UAAU,uBAAuB,OAAO,MAAM,CAAC;AACtE,OAAK,UAAU,SAAS,UAAU,uBAAuB,OAAO,MAAM,CAAC;AACvE,OAAK,UAAU,SAAS,UAAU,uBAAuB,OAAO,MAAM,CAAC;;;AAI3E,IAAM,uBAAuB,kBAAkB,UAAU;AAEzD,SAAgB,wBACd,uBACA,MACa;AACb,QAAO,gBAAS,UACd;;;;;;;;;;SAUK,qBAAqB,QACtB,mCACA,KAAK,UAAU,sBAAsB,CACtC,CAAC;;;;GAKJ,EACE,uBAAuB,MACxB,CACF,CAAC,EACA,eAAe,2BAAA,0BAA0B,MAAM,cAAc,EAC9D,CAAC"}

package/dist/cjs/core/route-hmr-statement.d.cts

@@ -1,4 +0,0 @@
-import type * as t from '@babel/types';
-export declare function createRouteHmrStatement(stableRouteOptionKeys: Array<string>, opts?: {
-    hotExpression?: string;
-}): t.Statement;

package/dist/esm/core/hmr-hot-expression.d.ts

@@ -1,6 +0,0 @@
-import { Config } from './config.js';
-import type * as t from '@babel/types';
-export declare const DEFAULT_HMR_HOT_EXPRESSION = "import.meta.hot";
-export declare function resolveHmrHotExpression(hotExpression?: string): string;
-export declare function createHmrHotExpressionAst(hotExpression?: string): t.Expression;
-export declare function withHmrHotExpression(config: Partial<Config> | undefined, hotExpression: string): Partial<Config>;

package/dist/esm/core/hmr-hot-expression.js

@@ -1,23 +0,0 @@
-import * as template from "@babel/template";
-function resolveHmrHotExpression(hotExpression) {
-	return hotExpression ?? "import.meta.hot";
-}
-function createHmrHotExpressionAst(hotExpression) {
-	return template.expression.ast(resolveHmrHotExpression(hotExpression));
-}
-function withHmrHotExpression(config, hotExpression) {
-	return {
-		...config,
-		plugin: {
-			...config?.plugin,
-			hmr: {
-				...config?.plugin?.hmr,
-				hotExpression: config?.plugin?.hmr?.hotExpression ?? hotExpression
-			}
-		}
-	};
-}
-//#endregion
-export { createHmrHotExpressionAst, resolveHmrHotExpression, withHmrHotExpression };
-
-//# sourceMappingURL=hmr-hot-expression.js.map

package/dist/esm/core/hmr-hot-expression.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"hmr-hot-expression.js","names":[],"sources":["../../../src/core/hmr-hot-expression.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport type * as t from '@babel/types'\nimport type { Config } from './config'\n\nexport const DEFAULT_HMR_HOT_EXPRESSION = 'import.meta.hot'\n\nexport function resolveHmrHotExpression(hotExpression?: string): string {\n  return hotExpression ?? DEFAULT_HMR_HOT_EXPRESSION\n}\n\nexport function createHmrHotExpressionAst(\n  hotExpression?: string,\n): t.Expression {\n  return template.expression.ast(resolveHmrHotExpression(hotExpression))\n}\n\nexport function withHmrHotExpression(\n  config: Partial<Config> | undefined,\n  hotExpression: string,\n): Partial<Config> {\n  return {\n    ...config,\n    plugin: {\n      ...config?.plugin,\n      hmr: {\n        ...config?.plugin?.hmr,\n        hotExpression: config?.plugin?.hmr?.hotExpression ?? hotExpression,\n      },\n    },\n  }\n}\n"],"mappings":";AAMA,SAAgB,wBAAwB,eAAgC;AACtE,QAAO,iBAAA;;AAGT,SAAgB,0BACd,eACc;AACd,QAAO,SAAS,WAAW,IAAI,wBAAwB,cAAc,CAAC;;AAGxE,SAAgB,qBACd,QACA,eACiB;AACjB,QAAO;EACL,GAAG;EACH,QAAQ;GACN,GAAG,QAAQ;GACX,KAAK;IACH,GAAG,QAAQ,QAAQ;IACnB,eAAe,QAAQ,QAAQ,KAAK,iBAAiB;IACtD;GACF;EACF"}

package/dist/esm/core/route-hmr-statement.d.ts

@@ -1,4 +0,0 @@
-import type * as t from '@babel/types';
-export declare function createRouteHmrStatement(stableRouteOptionKeys: Array<string>, opts?: {
-    hotExpression?: string;
-}): t.Statement;

package/dist/esm/core/route-hmr-statement.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"route-hmr-statement.js","names":[],"sources":["../../../src/core/route-hmr-statement.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport { createHmrHotExpressionAst } from './hmr-hot-expression'\nimport type * as t from '@babel/types'\nimport type {\n  AnyRoute,\n  AnyRouteMatch,\n  AnyRouter,\n  RouterWritableStore,\n} from '@tanstack/router-core'\n\ntype AnyRouteWithPrivateProps = AnyRoute & {\n  options: Record<string, unknown>\n  _componentsPromise?: Promise<void>\n  _lazyPromise?: Promise<void>\n  update: (options: Record<string, unknown>) => unknown\n  _path: string\n  _id: string\n  _fullPath: string\n  _to: string\n}\n\ntype AnyRouterWithPrivateMaps = AnyRouter & {\n  routesById: Record<string, AnyRoute>\n  routesByPath: Record<string, AnyRoute>\n  stores: AnyRouter['stores'] & {\n    cachedMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'set'>\n    >\n    pendingMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'set'>\n    >\n    matchStores: Map<string, Pick<RouterWritableStore<AnyRouteMatch>, 'set'>>\n  }\n}\n\ntype AnyRouteMatchWithPrivateProps = AnyRouteMatch & {\n  __beforeLoadContext?: unknown\n}\n\nfunction handleRouteUpdate(\n  routeId: string,\n  newRoute: AnyRouteWithPrivateProps,\n) {\n  const router = window.__TSR_ROUTER__ as AnyRouterWithPrivateMaps\n  const oldRoute = router.routesById[routeId] as\n    | AnyRouteWithPrivateProps\n    | undefined\n\n  if (!oldRoute) {\n    return\n  }\n\n  // Keys whose identity must remain stable to prevent React from\n  // unmounting/remounting the component tree.  React Fast Refresh already\n  // handles hot-updating the function bodies of these components — our job\n  // is only to update non-component route options (loader, head, etc.).\n  // For code-split (splittable) routes, the lazyRouteComponent wrapper is\n  // already cached in the bundler hot data so its identity is stable.\n  // For unsplittable routes (e.g. root routes), the component is a plain\n  // function reference that gets recreated on every module re-execution,\n  // so we must explicitly preserve the old reference.\n  const removedKeys = new Set<string>()\n  Object.keys(oldRoute.options).forEach((key) => {\n    if (!(key in newRoute.options)) {\n      removedKeys.add(key)\n      delete oldRoute.options[key]\n    }\n  })\n\n  // Preserve component identity so React doesn't remount.\n  // React Fast Refresh patches the function bodies in-place.\n  const componentKeys = '__TSR_COMPONENT_TYPES__' as unknown as Array<string>\n  componentKeys.forEach((key) => {\n    if (key in oldRoute.options && key in newRoute.options) {\n      newRoute.options[key] = oldRoute.options[key]\n    }\n  })\n\n  oldRoute.options = newRoute.options\n  oldRoute.update(newRoute.options)\n  oldRoute._componentsPromise = undefined\n  oldRoute._lazyPromise = undefined\n\n  router.routesById[oldRoute.id] = oldRoute\n  router.routesByPath[oldRoute.fullPath] = oldRoute\n\n  router.processedTree.matchCache.clear()\n  router.processedTree.flatCache?.clear()\n  router.processedTree.singleCache.clear()\n  router.resolvePathCache.clear()\n  walkReplaceSegmentTree(oldRoute, router.processedTree.segmentTree)\n\n  const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id\n  const activeMatch = router.stores.matches.get().find(filter)\n  const pendingMatch = router.stores.pendingMatches.get().find(filter)\n  const cachedMatches = router.stores.cachedMatches.get().filter(filter)\n\n  if (activeMatch || pendingMatch || cachedMatches.length > 0) {\n    // Clear stale match data for removed route options BEFORE invalidating.\n    // Without this, router.invalidate() -> matchRoutes() reuses the existing\n    // match from the store (via ...existingMatch spread) and the stale\n    // loaderData / __beforeLoadContext survives the reload cycle.\n    //\n    // We must update the store directly (not via router.updateMatch) because\n    // updateMatch wraps in startTransition which may defer the state update,\n    // and we need the clear to be visible before invalidate reads the store.\n    if (removedKeys.has('loader') || removedKeys.has('beforeLoad')) {\n      const matchIds = [\n        activeMatch?.id,\n        pendingMatch?.id,\n        ...cachedMatches.map((match) => match.id),\n      ].filter(Boolean) as Array<string>\n      router.batch(() => {\n        for (const matchId of matchIds) {\n          const store =\n            router.stores.pendingMatchStores.get(matchId) ||\n            router.stores.matchStores.get(matchId) ||\n            router.stores.cachedMatchStores.get(matchId)\n          if (store) {\n            store.set((prev) => {\n              const next: AnyRouteMatchWithPrivateProps = { ...prev }\n\n              if (removedKeys.has('loader')) {\n                next.loaderData = undefined\n              }\n              if (removedKeys.has('beforeLoad')) {\n                next.__beforeLoadContext = undefined\n              }\n\n              return next\n            })\n          }\n        }\n      })\n    }\n\n    router.invalidate({ filter, sync: true })\n  }\n\n  function walkReplaceSegmentTree(\n    route: AnyRouteWithPrivateProps,\n    node: AnyRouter['processedTree']['segmentTree'],\n  ) {\n    if (node.route?.id === route.id) node.route = route\n    if (node.index) walkReplaceSegmentTree(route, node.index)\n    node.static?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.staticInsensitive?.forEach((child) =>\n      walkReplaceSegmentTree(route, child),\n    )\n    node.dynamic?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.optional?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.wildcard?.forEach((child) => walkReplaceSegmentTree(route, child))\n  }\n}\n\nconst handleRouteUpdateStr = handleRouteUpdate.toString()\n\nexport function createRouteHmrStatement(\n  stableRouteOptionKeys: Array<string>,\n  opts?: { hotExpression?: string },\n): t.Statement {\n  return template.statement(\n    `\nif (%%hotExpression%%) {\n  const hot = %%hotExpression%%\n  const hotData = hot.data ??= {}\n  hot.accept((newModule) => {\n    if (Route && newModule && newModule.Route) {\n      const routeId = hotData['tsr-route-id'] ?? Route.id\n      if (routeId) {\n        hotData['tsr-route-id'] = routeId\n      }\n      (${handleRouteUpdateStr.replace(\n        /['\"]__TSR_COMPONENT_TYPES__['\"]/,\n        JSON.stringify(stableRouteOptionKeys),\n      )})(routeId, newModule.Route)\n    }\n    })\n}\n`,\n    {\n      syntacticPlaceholders: true,\n    },\n  )({\n    hotExpression: createHmrHotExpressionAst(opts?.hotExpression),\n  })\n}\n"],"mappings":";;;AAyCA,SAAS,kBACP,SACA,UACA;CACA,MAAM,SAAS,OAAO;CACtB,MAAM,WAAW,OAAO,WAAW;AAInC,KAAI,CAAC,SACH;CAYF,MAAM,8BAAc,IAAI,KAAa;AACrC,QAAO,KAAK,SAAS,QAAQ,CAAC,SAAS,QAAQ;AAC7C,MAAI,EAAE,OAAO,SAAS,UAAU;AAC9B,eAAY,IAAI,IAAI;AACpB,UAAO,SAAS,QAAQ;;GAE1B;AAIoB,2BACR,SAAS,QAAQ;AAC7B,MAAI,OAAO,SAAS,WAAW,OAAO,SAAS,QAC7C,UAAS,QAAQ,OAAO,SAAS,QAAQ;GAE3C;AAEF,UAAS,UAAU,SAAS;AAC5B,UAAS,OAAO,SAAS,QAAQ;AACjC,UAAS,qBAAqB,KAAA;AAC9B,UAAS,eAAe,KAAA;AAExB,QAAO,WAAW,SAAS,MAAM;AACjC,QAAO,aAAa,SAAS,YAAY;AAEzC,QAAO,cAAc,WAAW,OAAO;AACvC,QAAO,cAAc,WAAW,OAAO;AACvC,QAAO,cAAc,YAAY,OAAO;AACxC,QAAO,iBAAiB,OAAO;AAC/B,wBAAuB,UAAU,OAAO,cAAc,YAAY;CAElE,MAAM,UAAU,MAAqB,EAAE,YAAY,SAAS;CAC5D,MAAM,cAAc,OAAO,OAAO,QAAQ,KAAK,CAAC,KAAK,OAAO;CAC5D,MAAM,eAAe,OAAO,OAAO,eAAe,KAAK,CAAC,KAAK,OAAO;CACpE,MAAM,gBAAgB,OAAO,OAAO,cAAc,KAAK,CAAC,OAAO,OAAO;AAEtE,KAAI,eAAe,gBAAgB,cAAc,SAAS,GAAG;AAS3D,MAAI,YAAY,IAAI,SAAS,IAAI,YAAY,IAAI,aAAa,EAAE;GAC9D,MAAM,WAAW;IACf,aAAa;IACb,cAAc;IACd,GAAG,cAAc,KAAK,UAAU,MAAM,GAAG;IAC1C,CAAC,OAAO,QAAQ;AACjB,UAAO,YAAY;AACjB,SAAK,MAAM,WAAW,UAAU;KAC9B,MAAM,QACJ,OAAO,OAAO,mBAAmB,IAAI,QAAQ,IAC7C,OAAO,OAAO,YAAY,IAAI,QAAQ,IACtC,OAAO,OAAO,kBAAkB,IAAI,QAAQ;AAC9C,SAAI,MACF,OAAM,KAAK,SAAS;MAClB,MAAM,OAAsC,EAAE,GAAG,MAAM;AAEvD,UAAI,YAAY,IAAI,SAAS,CAC3B,MAAK,aAAa,KAAA;AAEpB,UAAI,YAAY,IAAI,aAAa,CAC/B,MAAK,sBAAsB,KAAA;AAG7B,aAAO;OACP;;KAGN;;AAGJ,SAAO,WAAW;GAAE;GAAQ,MAAM;GAAM,CAAC;;CAG3C,SAAS,uBACP,OACA,MACA;AACA,MAAI,KAAK,OAAO,OAAO,MAAM,GAAI,MAAK,QAAQ;AAC9C,MAAI,KAAK,MAAO,wBAAuB,OAAO,KAAK,MAAM;AACzD,OAAK,QAAQ,SAAS,UAAU,uBAAuB,OAAO,MAAM,CAAC;AACrE,OAAK,mBAAmB,SAAS,UAC/B,uBAAuB,OAAO,MAAM,CACrC;AACD,OAAK,SAAS,SAAS,UAAU,uBAAuB,OAAO,MAAM,CAAC;AACtE,OAAK,UAAU,SAAS,UAAU,uBAAuB,OAAO,MAAM,CAAC;AACvE,OAAK,UAAU,SAAS,UAAU,uBAAuB,OAAO,MAAM,CAAC;;;AAI3E,IAAM,uBAAuB,kBAAkB,UAAU;AAEzD,SAAgB,wBACd,uBACA,MACa;AACb,QAAO,SAAS,UACd;;;;;;;;;;SAUK,qBAAqB,QACtB,mCACA,KAAK,UAAU,sBAAsB,CACtC,CAAC;;;;GAKJ,EACE,uBAAuB,MACxB,CACF,CAAC,EACA,eAAe,0BAA0B,MAAM,cAAc,EAC9D,CAAC"}

package/src/core/hmr-hot-expression.ts

@@ -1,31 +0,0 @@
-import * as template from '@babel/template'
-import type * as t from '@babel/types'
-import type { Config } from './config'
-
-export const DEFAULT_HMR_HOT_EXPRESSION = 'import.meta.hot'
-
-export function resolveHmrHotExpression(hotExpression?: string): string {
-  return hotExpression ?? DEFAULT_HMR_HOT_EXPRESSION
-}
-
-export function createHmrHotExpressionAst(
-  hotExpression?: string,
-): t.Expression {
-  return template.expression.ast(resolveHmrHotExpression(hotExpression))
-}
-
-export function withHmrHotExpression(
-  config: Partial<Config> | undefined,
-  hotExpression: string,
-): Partial<Config> {
-  return {
-    ...config,
-    plugin: {
-      ...config?.plugin,
-      hmr: {
-        ...config?.plugin?.hmr,
-        hotExpression: config?.plugin?.hmr?.hotExpression ?? hotExpression,
-      },
-    },
-  }
-}