one 1.26.0 → 2.0.0-beta.33.1

package/dist/esm/router/getRouteInfo.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["getPathDataFromState","stripBaseUrl","getNormalizedStatePath","isIndexPath","getResolvedLinking","getRouteInfo","state","getRouteInfoFromState","state2","asPath","_getResolvedLinking","screens","config","preserveDynamicRoutes","preserveGroups","getPathFromState","baseUrl","path","qualified","unstable_globalHref","pathname","split","isIndex"],"sources":["../../../src/router/getRouteInfo.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,oBAAA,QAAwC;AACjD,SAASC,YAAA,QAAoB;AAE7B,SAASC,sBAAA,QAA8C;AACvD,SAASC,WAAA,QAAmB;AAC5B,SAASC,kBAAA,QAA0B;AAE5B,SAASC,aAAaC,KAAA,EAA8B;EACzD,OAAOC,qBAAA,WAAAC,MAAA,EAAAC,MAAA;IACL,IAACC,mBAA2E;IAC1E,OAAAV,oBAAO,CAAAQ,MAAqB;MAAOG,OACjC,IAAS;MAAC,IACV,CAAAD,mBAAG,GAAmBN,kBAAG,gBAAAM,mBAAA,uBAAAA,mBAAA,CAAAE,MAAA;MAAAC,qBACzB,EAAAJ,MAAuB;MAAAK,cACvB,EAAAL;IAAgB,EAClB;EAAC,GACHH,KAAA;AAAA;AACA,SACFC,sBAAAQ,gBAAA,EAAAT,KAAA,EAAAU,OAAA;EACF;IAAAC;EAAA,IAAAF,gBAAA,CAAAT,KAAA;EAEA,IAAAY,SAAS,GAAAH,gBACP,CAAAT,KAAA;EAIA,OAAM;IACNa,mBAAkB,EAAAF,IAAA;IAElBG,QAAO,EAAAnB,YAAA,CAAAgB,IAAA,EAAAD,OAAA,EAAAK,KAAA;IACLC,OAAA,EAAAnB,WAAA,CAAqBG,KAAA;IACrB,GAAAJ,sBAAuB,CAAAgB,SAAM,EAAOF,OAAQ;EAAM;AACxB;AACkB,SAEhDX,YAAA","ignoreList":[]}
+{"version":3,"names":["getPathDataFromState","stripBaseUrl","getNormalizedStatePath","isIndexPath","getResolvedLinking","stripPathSuffix","getRouteInfo","state","getRouteInfoFromState","state2","asPath","_getResolvedLinking","screens","config","preserveDynamicRoutes","preserveGroups","getPathFromState","baseUrl","path","qualified","unstable_globalHref","pathname","isIndex"],"sources":["../../../src/router/getRouteInfo.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,oBAAA,QAAwC;AACjD,SAASC,YAAA,QAAoB;AAE7B,SAASC,sBAAA,QAA8C;AACvD,SAASC,WAAA,QAAmB;AAC5B,SAASC,kBAAA,QAA0B;AACnC,SAASC,eAAA,QAAuB;AAEzB,SAASC,aAAaC,KAAA,EAA8B;EACzD,OAAOC,qBAAA,WAAAC,MAAA,EAAAC,MAAA;IACL,IAACC,mBAA2E;IAC1E,OAAAX,oBAAO,CAAAS,MAAqB;MAAOG,OACjC,IAAS;MAAC,IACV,CAAAD,mBAAG,GAAmBP,kBAAG,gBAAAO,mBAAA,uBAAAA,mBAAA,CAAAE,MAAA;MAAAC,qBACzB,EAAAJ,MAAuB;MAAAK,cACvB,EAAAL;IAAgB,EAClB;EAAC,GACHH,KAAA;AAAA;AACA,SACFC,sBAAAQ,gBAAA,EAAAT,KAAA,EAAAU,OAAA;EACF;IAAAC;EAAA,IAAAF,gBAAA,CAAAT,KAAA;EAEO,IAAAY,SAAS,GAAAH,gBACd,CAAAT,KAAA;EAIA,OAAM;IACNa,mBAAkB,EAAAF,IAAA;IAElB;IACE;IAAqBG,QAAA,EAAAhB,eAAA,CAAAJ,YAAA,CAAAiB,IAAA,EAAAD,OAAA;IAAAK,OAAA,EAAAnB,WAAA,CAAAI,KAAA;IAGrB,GAAAL,sBAAU,CAAgBiB,SAAA,EAAAF,OAAa;EAAc;AAC3B;AACkB,SAEhDX,YAAA,E","ignoreList":[]}

package/dist/esm/router/getRouteInfo.test.mjs

@@ -0,0 +1,57 @@
+import { describe, expect, it } from "vitest";
+import { getRouteInfoFromState } from "./getRouteInfo.mjs";
+describe("getRouteInfoFromState", () => {
+  const state = {
+    routes: [{
+      name: "dev",
+      path: "/dev#stack",
+      params: {
+        "#": "stack"
+      }
+    }]
+  };
+  it("drops the hash from pathname and segments", () => {
+    const info = getRouteInfoFromState((_state, asPath) => ({
+      path: asPath ? "/(site)/dev#stack" : "/dev#stack",
+      params: {
+        "#": "stack"
+      }
+    }), state);
+    expect(info.pathname).toBe("/dev");
+    expect(info.segments).toEqual(["(site)", "dev"]);
+    expect(info.unstable_globalHref).toBe("/dev#stack");
+  });
+  it("drops the query and the hash together", () => {
+    const info = getRouteInfoFromState(() => ({
+      path: "/dev?x=1#stack",
+      params: {
+        x: "1",
+        "#": "stack"
+      }
+    }), state);
+    expect(info.pathname).toBe("/dev");
+    expect(info.segments).toEqual(["dev"]);
+  });
+  it("uses the focused nested route when later routes are preloaded", () => {
+    const stateWithPreload = {
+      index: 0,
+      routes: [{
+        name: "(site)",
+        state: {
+          index: 0,
+          routes: [{
+            name: "index"
+          }, {
+            name: "detail"
+          }]
+        }
+      }]
+    };
+    const info = getRouteInfoFromState((_state, asPath) => ({
+      path: asPath ? "/(site)" : "/",
+      params: {}
+    }), stateWithPreload);
+    expect(info.isIndex).toBe(true);
+  });
+});
+//# sourceMappingURL=getRouteInfo.test.mjs.map

package/dist/esm/router/getRouteInfo.test.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["describe","expect","it","getRouteInfoFromState","state","routes","name","path","params","info","_state","asPath","pathname","toBe","segments","toEqual","unstable_globalHref","x","stateWithPreload","index","isIndex"],"sources":["../../../src/router/getRouteInfo.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,qBAAA,QAA6B;AAKtCH,QAAA,CAAS,yBAAyB,MAAM;EACtC,MAAMI,KAAA,GAAQ;IACZC,MAAA,EAAQ,CAAC;MAAEC,IAAA,EAAM;MAAOC,IAAA,EAAM;MAAcC,MAAA,EAAQ;QAAE,KAAK;MAAQ;IAAE,CAAC;EACxE;EAEAN,EAAA,CAAG,6CAA6C,MAAM;IACpD,MAAMO,IAAA,GAAON,qBAAA,CACX,CAACO,MAAA,EAAQC,MAAA,MAAY;MACnBJ,IAAA,EAAMI,MAAA,GAAS,sBAAsB;MACrCH,MAAA,EAAQ;QAAE,KAAK;MAAQ;IACzB,IACAJ,KACF;IACAH,MAAA,CAAOQ,IAAA,CAAKG,QAAQ,EAAEC,IAAA,CAAK,MAAM;IACjCZ,MAAA,CAAOQ,IAAA,CAAKK,QAAQ,EAAEC,OAAA,CAAQ,CAAC,UAAU,KAAK,CAAC;IAC/Cd,MAAA,CAAOQ,IAAA,CAAKO,mBAAmB,EAAEH,IAAA,CAAK,YAAY;EACpD,CAAC;EAEDX,EAAA,CAAG,yCAAyC,MAAM;IAChD,MAAMO,IAAA,GAAON,qBAAA,CACX,OAAO;MAAEI,IAAA,EAAM;MAAkBC,MAAA,EAAQ;QAAES,CAAA,EAAG;QAAK,KAAK;MAAQ;IAAE,IAClEb,KACF;IACAH,MAAA,CAAOQ,IAAA,CAAKG,QAAQ,EAAEC,IAAA,CAAK,MAAM;IACjCZ,MAAA,CAAOQ,IAAA,CAAKK,QAAQ,EAAEC,OAAA,CAAQ,CAAC,KAAK,CAAC;EACvC,CAAC;EAEDb,EAAA,CAAG,iEAAiE,MAAM;IACxE,MAAMgB,gBAAA,GAAmB;MACvBC,KAAA,EAAO;MACPd,MAAA,EAAQ,CACN;QACEC,IAAA,EAAM;QACNF,KAAA,EAAO;UACLe,KAAA,EAAO;UACPd,MAAA,EAAQ,CAAC;YAAEC,IAAA,EAAM;UAAQ,GAAG;YAAEA,IAAA,EAAM;UAAS,CAAC;QAChD;MACF;IAEJ;IACA,MAAMG,IAAA,GAAON,qBAAA,CACX,CAACO,MAAA,EAAQC,MAAA,MAAY;MAAEJ,IAAA,EAAMI,MAAA,GAAS,YAAY;MAAKH,MAAA,EAAQ,CAAC;IAAE,IAClEU,gBACF;IAEAjB,MAAA,CAAOQ,IAAA,CAAKW,OAAO,EAAEP,IAAA,CAAK,IAAI;EAChC,CAAC;AACH,CAAC","ignoreList":[]}

package/dist/esm/router/getRouteInfo.test.native.js

@@ -0,0 +1,63 @@
+import { describe, expect, it } from "vitest";
+import { getRouteInfoFromState } from "./getRouteInfo.native.js";
+describe("getRouteInfoFromState", function () {
+  var state = {
+    routes: [{
+      name: "dev",
+      path: "/dev#stack",
+      params: {
+        "#": "stack"
+      }
+    }]
+  };
+  it("drops the hash from pathname and segments", function () {
+    var info = getRouteInfoFromState(function (_state, asPath) {
+      return {
+        path: asPath ? "/(site)/dev#stack" : "/dev#stack",
+        params: {
+          "#": "stack"
+        }
+      };
+    }, state);
+    expect(info.pathname).toBe("/dev");
+    expect(info.segments).toEqual(["(site)", "dev"]);
+    expect(info.unstable_globalHref).toBe("/dev#stack");
+  });
+  it("drops the query and the hash together", function () {
+    var info = getRouteInfoFromState(function () {
+      return {
+        path: "/dev?x=1#stack",
+        params: {
+          x: "1",
+          "#": "stack"
+        }
+      };
+    }, state);
+    expect(info.pathname).toBe("/dev");
+    expect(info.segments).toEqual(["dev"]);
+  });
+  it("uses the focused nested route when later routes are preloaded", function () {
+    var stateWithPreload = {
+      index: 0,
+      routes: [{
+        name: "(site)",
+        state: {
+          index: 0,
+          routes: [{
+            name: "index"
+          }, {
+            name: "detail"
+          }]
+        }
+      }]
+    };
+    var info = getRouteInfoFromState(function (_state, asPath) {
+      return {
+        path: asPath ? "/(site)" : "/",
+        params: {}
+      };
+    }, stateWithPreload);
+    expect(info.isIndex).toBe(true);
+  });
+});
+//# sourceMappingURL=getRouteInfo.test.native.js.map

package/dist/esm/router/getRouteInfo.test.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["describe","expect","it","getRouteInfoFromState","state","routes","name","path","params","info","_state","asPath","pathname","toBe","segments","toEqual","unstable_globalHref","x"],"sources":["../../../src/router/getRouteInfo.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,qBAAA,QAA6B;AAKtCH,QAAA,CAAS,yBAAyB,YAAM;EACtC,IAAAI,KAAM;IACJC,MAAA,EAAQ,CACV;MAEGC,IAAA;MACDC,IAAM,cAAO;MACVC,MAAA,EAAQ;QACP,KAAM;MACN;IACF;EACA;EAEFN,EAAA,4CAAiC;IACjC,IAAAO,IAAO,GAAAN,qBAAwB,WAAUO,MAAM,EAAAC,MAAA;MAC/C,OAAO;QACRJ,IAAA,EAAAI,MAAA;QAEEH,MAAA;UACK;QACJ;MACA;IACF,GAAAJ,KAAA;IACAH,MAAA,CAAOQ,IAAA,CAAKG,QAAQ,EAAEC,IAAA,CAAK,MAAM;IACjCZ,MAAA,CAAOQ,IAAA,CAAKK,QAAQ,EAAEC,OAAA,CAAQ,CAC/B,UAEE,MACD;IAAyBd,MACvB,CAAAQ,IAAO,CAAAO,mBAAA,EAAAH,IAAA;EAAA;EACCX,EAAA,wCACN;IAAA,IAAAO,IACE,GAAAN,qBAAM;MAAA,OACN;QAAOI,IACL,kBAAO;QAAAC,MACP;UACFS,CAAA;UACF;QACF;MACF;IACA,GAAAb,KAAM;IAAOH,MACV,CAAAQ,IAAQ,CAAAG,QAAA,EAAAC,IAAc,OAAM;IAAqCZ,MAClE,CAAAQ,IAAA,CAAAK,QAAA,EAAAC,OAAA,EACF,MAEA;EACF,CAAC;EACFb,EAAA","ignoreList":[]}

package/dist/esm/router/hmrImport.native.test.mjs

@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { hmrImport } from "./hmrImport.native.mjs";
+import { hmrImport } from "./hmrImport.native";
 const realRuntime = globalThis.__rolldown_runtime__;
 afterEach(() => {
   ;

package/dist/esm/router/isIndexPath.mjs

@@ -20,7 +20,7 @@ function isIndexPath(state) {
 function getActualLastRoute(routeLike) {
   if (routeLike.name[0] === "(" && routeLike.state?.routes) {
     const routes = routeLike.state.routes;
-    return getActualLastRoute(routes[routes.length - 1]);
+    return getActualLastRoute(routes[routeLike.state.index ?? routes.length - 1]);
   }
   return routeLike;
 }

package/dist/esm/router/isIndexPath.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["isIndexPath","state","routes","route","getActualLastRoute","index","length","name","params","screen","match","routeLike"],"sources":["../../../src/router/isIndexPath.ts"],"sourcesContent":[null],"mappings":"AAIO,SAASA,YAAYC,KAAA,EAAc;EACxC,IAAI,CAACA,KAAA,CAAMC,MAAA,EAAQ;IACjB,OAAO;EACT;EAEA,MAAMC,KAAA,GAAQC,kBAAA,CAAmBH,KAAA,CAAMC,MAAA,CAAOD,KAAA,CAAMI,KAAA,IAASJ,KAAA,CAAMC,MAAA,CAAOI,MAAA,GAAS,CAAC,CAAC;EAErF,IAAIH,KAAA,CAAMF,KAAA,EAAO;IACf,OAAOD,WAAA,CAAYG,KAAA,CAAMF,KAAK;EAChC;EAEA,IAAIE,KAAA,CAAMI,IAAA,KAAS,SAAS;IAC1B,OAAO;EACT;EAEA,IAAIJ,KAAA,CAAMK,MAAA,IAAU,YAAYL,KAAA,CAAMK,MAAA,EAAQ;IAC5C,OAAOL,KAAA,CAAMK,MAAA,CAAOC,MAAA,KAAW;EACjC;EAEA,IAAIN,KAAA,CAAMI,IAAA,CAAKG,KAAA,CAAM,YAAY,GAAG;IAClC,OAAO;EACT;EAEA,OAAO;AACT;AAEA,SAASN,mBAA4CO,SAAA,EAAiB;EACpE,IAAIA,SAAA,CAAUJ,IAAA,CAAK,CAAC,MAAM,OAAOI,SAAA,CAAUV,KAAA,EAAOC,MAAA,EAAQ;IACxD,MAAMA,MAAA,GAASS,SAAA,CAAUV,KAAA,CAAMC,MAAA;IAC/B,OAAOE,kBAAA,CAAmBF,MAAA,CAAOA,MAAA,CAAOI,MAAA,GAAS,CAAC,CAAC;EACrD;EACA,OAAOK,SAAA;AACT","ignoreList":[]}
+{"version":3,"names":["isIndexPath","state","routes","route","getActualLastRoute","index","length","name","params","screen","match","routeLike"],"sources":["../../../src/router/isIndexPath.ts"],"sourcesContent":[null],"mappings":"AAOO,SAASA,YAAYC,KAAA,EAAc;EACxC,IAAI,CAACA,KAAA,CAAMC,MAAA,EAAQ;IACjB,OAAO;EACT;EAEA,MAAMC,KAAA,GAAQC,kBAAA,CAAmBH,KAAA,CAAMC,MAAA,CAAOD,KAAA,CAAMI,KAAA,IAASJ,KAAA,CAAMC,MAAA,CAAOI,MAAA,GAAS,CAAC,CAAC;EAErF,IAAIH,KAAA,CAAMF,KAAA,EAAO;IACf,OAAOD,WAAA,CAAYG,KAAA,CAAMF,KAAK;EAChC;EAEA,IAAIE,KAAA,CAAMI,IAAA,KAAS,SAAS;IAC1B,OAAO;EACT;EAEA,IAAIJ,KAAA,CAAMK,MAAA,IAAU,YAAYL,KAAA,CAAMK,MAAA,EAAQ;IAC5C,OAAOL,KAAA,CAAMK,MAAA,CAAOC,MAAA,KAAW;EACjC;EAEA,IAAIN,KAAA,CAAMI,IAAA,CAAKG,KAAA,CAAM,YAAY,GAAG;IAClC,OAAO;EACT;EAEA,OAAO;AACT;AAEA,SAASN,mBAA4CO,SAAA,EAAiB;EACpE,IAAIA,SAAA,CAAUJ,IAAA,CAAK,CAAC,MAAM,OAAOI,SAAA,CAAUV,KAAA,EAAOC,MAAA,EAAQ;IACxD,MAAMA,MAAA,GAASS,SAAA,CAAUV,KAAA,CAAMC,MAAA;IAC/B,OAAOE,kBAAA,CAAmBF,MAAA,CAAOS,SAAA,CAAUV,KAAA,CAAMI,KAAA,IAASH,MAAA,CAAOI,MAAA,GAAS,CAAC,CAAC;EAC9E;EACA,OAAOK,SAAA;AACT","ignoreList":[]}

package/dist/esm/router/isIndexPath.native.js

@@ -21,8 +21,9 @@ function isIndexPath(state) {
 function getActualLastRoute(routeLike) {
   var _routeLike_state;
   if (routeLike.name[0] === "(" && ((_routeLike_state = routeLike.state) === null || _routeLike_state === void 0 ? void 0 : _routeLike_state.routes)) {
+    var _routeLike_state_index;
     var routes = routeLike.state.routes;
-    return getActualLastRoute(routes[routes.length - 1]);
+    return getActualLastRoute(routes[(_routeLike_state_index = routeLike.state.index) !== null && _routeLike_state_index !== void 0 ? _routeLike_state_index : routes.length - 1]);
   }
   return routeLike;
 }

package/dist/esm/router/isIndexPath.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["isIndexPath","state","_state_index","routes","route","getActualLastRoute","index","length","name","params","screen","match","routeLike","_routeLike_state"],"sources":["../../../src/router/isIndexPath.ts"],"sourcesContent":[null],"mappings":"AAIO,SAASA,YAAYC,KAAA,EAAc;EACxC,IAAIC,YAAO;EACT,KAAAD,KAAO,CAAAE,MAAA;IACT;EAEA;EAEA,IAAIC,KAAA,GAAMC,kBAAO,CAAAJ,KAAA,CAAAE,MAAA,EAAAD,YAAA,GAAAD,KAAA,CAAAK,KAAA,cAAAJ,YAAA,cAAAA,YAAA,GAAAD,KAAA,CAAAE,MAAA,CAAAI,MAAA;EACf,IAAAH,KAAO,CAAAH,KAAA;IACT,OAAAD,WAAA,CAAAI,KAAA,CAAAH,KAAA;EAEA;EACE,IAAAG,KAAO,CAAAI,IAAA;IACT;EAEA;EACE,IAAAJ,KAAO,CAAAK,MAAM,YAAO,IAAAL,KAAW,CAAAK,MAAA;IACjC,OAAAL,KAAA,CAAAK,MAAA,CAAAC,MAAA;EAEA;EACE,IAAAN,KAAO,CAAAI,IAAA,CAAAG,KAAA;IACT;EAEA;EACF;AAEA;AACE,SAAIN,kBAAgBA,CAAMO,SAAO;EAC/B,IAAAC,gBAAe;EACf,IAAAD,SAAO,CAAAJ,IAAA,WAAmB,MAAOK,gBAAgB,GAAED,SAAA,CAAAX,KAAA,cAAAY,gBAAA,uBAAAA,gBAAA,CAAAV,MAAA;IACrD,IAAAA,MAAA,GAAAS,SAAA,CAAAX,KAAA,CAAAE,MAAA;IACA,OAAOE,kBAAA,CAAAF,MAAA,CAAAA,MAAA,CAAAI,MAAA;EACT","ignoreList":[]}
+{"version":3,"names":["isIndexPath","state","_state_index","routes","route","getActualLastRoute","index","length","name","params","screen","match","routeLike","_routeLike_state","_routeLike_state_index"],"sources":["../../../src/router/isIndexPath.ts"],"sourcesContent":[null],"mappings":"AAOO,SAASA,YAAYC,KAAA,EAAc;EACxC,IAAIC,YAAO;EACT,KAAAD,KAAO,CAAAE,MAAA;IACT;EAEA;EAEA,IAAIC,KAAA,GAAMC,kBAAO,CAAAJ,KAAA,CAAAE,MAAA,EAAAD,YAAA,GAAAD,KAAA,CAAAK,KAAA,cAAAJ,YAAA,cAAAA,YAAA,GAAAD,KAAA,CAAAE,MAAA,CAAAI,MAAA;EACf,IAAAH,KAAO,CAAAH,KAAA;IACT,OAAAD,WAAA,CAAAI,KAAA,CAAAH,KAAA;EAEA;EACE,IAAAG,KAAO,CAAAI,IAAA;IACT;EAEA;EACE,IAAAJ,KAAO,CAAAK,MAAM,YAAO,IAAAL,KAAW,CAAAK,MAAA;IACjC,OAAAL,KAAA,CAAAK,MAAA,CAAAC,MAAA;EAEA;EACE,IAAAN,KAAO,CAAAI,IAAA,CAAAG,KAAA;IACT;EAEA;EACF;AAEA;AACE,SAAIN,kBAAgBA,CAAMO,SAAO;EAC/B,IAAAC,gBAAe;EACf,IAAAD,SAAO,CAAAJ,IAAA,WAAmB,MAAOK,gBAAgB,GAAAD,SAAS,CAAAX,KAAO,UAAW,IAAAY,gBAAA,uBAAAA,gBAAA,CAAAV,MAAA;IAC9E,IAAAW,sBAAA;IACA,IAAAX,MAAO,GAAAS,SAAA,CAAAX,KAAA,CAAAE,MAAA;IACT,OAAAE,kBAAA,CAAAF,MAAA,EAAAW,sBAAA,GAAAF,SAAA,CAAAX,KAAA,CAAAK,KAAA,cAAAQ,sBAAA,cAAAA,sBAAA,GAAAX,MAAA,CAAAI,MAAA","ignoreList":[]}

package/dist/esm/router/isStateAwaitingNavigatorMount.mjs

@@ -1,3 +1,4 @@
+import { getReactNavigationRouteName } from "../getReactNavigationConfig.mjs";
 function focusedRouteOf(state) {
   return typeof state.index === "number" ? state.routes[state.index] : state.routes[state.routes.length - 1];
 }
@@ -8,7 +9,7 @@ function isStateAwaitingNavigatorMount(state, rootNode) {
   while (current?.routes?.length) {
     const route = focusedRouteOf(current);
     if (!route) return false;
-    const child = node.children.find(candidate => candidate.route === route.name);
+    const child = node.children.find(candidate => getReactNavigationRouteName(candidate) === route.name);
     if (!child) return false;
     if (route.state) {
       node = child;

package/dist/esm/router/isStateAwaitingNavigatorMount.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["focusedRouteOf","state","index","routes","length","isStateAwaitingNavigatorMount","rootNode","node","current","route","child","children","find","candidate","name","some","grandchild","internal"],"sources":["../../../src/router/isStateAwaitingNavigatorMount.ts"],"sourcesContent":[null],"mappings":"AAUA,SAASA,eAAeC,KAAA,EAAqB;EAC3C,OAAO,OAAOA,KAAA,CAAMC,KAAA,KAAU,WAC1BD,KAAA,CAAME,MAAA,CAAOF,KAAA,CAAMC,KAAK,IACxBD,KAAA,CAAME,MAAA,CAAOF,KAAA,CAAME,MAAA,CAAOC,MAAA,GAAS,CAAC;AAC1C;AAkBO,SAASC,8BACdJ,KAAA,EACAK,QAAA,EACS;EACT,IAAI,CAACA,QAAA,EAAU,OAAO;EAEtB,IAAIC,IAAA,GAAOD,QAAA;EACX,IAAIE,OAAA,GAAUP,KAAA;EAEd,OAAOO,OAAA,EAASL,MAAA,EAAQC,MAAA,EAAQ;IAC9B,MAAMK,KAAA,GAAQT,cAAA,CAAeQ,OAAO;IACpC,IAAI,CAACC,KAAA,EAAO,OAAO;IAKnB,MAAMC,KAAA,GAAQH,IAAA,CAAKI,QAAA,CAASC,IAAA,CAAMC,SAAA,IAAcA,SAAA,CAAUJ,KAAA,KAAUA,KAAA,CAAMK,IAAI;IAC9E,IAAI,CAACJ,KAAA,EAAO,OAAO;IAEnB,IAAID,KAAA,CAAMR,KAAA,EAAO;MACfM,IAAA,GAAOG,KAAA;MACPF,OAAA,GAAUC,KAAA,CAAMR,KAAA;MAChB;IACF;IAIA,OAAOS,KAAA,CAAMC,QAAA,CAASI,IAAA,CAAMC,UAAA,IAAe,CAACA,UAAA,CAAWC,QAAQ;EACjE;EAEA,OAAO;AACT","ignoreList":[]}
+{"version":3,"names":["getReactNavigationRouteName","focusedRouteOf","state","index","routes","length","isStateAwaitingNavigatorMount","rootNode","node","current","route","child","children","find","candidate","name","some","grandchild","internal"],"sources":["../../../src/router/isStateAwaitingNavigatorMount.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,2BAAA,QAAmC;AAU5C,SAASC,eAAeC,KAAA,EAAqB;EAC3C,OAAO,OAAOA,KAAA,CAAMC,KAAA,KAAU,WAC1BD,KAAA,CAAME,MAAA,CAAOF,KAAA,CAAMC,KAAK,IACxBD,KAAA,CAAME,MAAA,CAAOF,KAAA,CAAME,MAAA,CAAOC,MAAA,GAAS,CAAC;AAC1C;AAkBO,SAASC,8BACdJ,KAAA,EACAK,QAAA,EACS;EACT,IAAI,CAACA,QAAA,EAAU,OAAO;EAEtB,IAAIC,IAAA,GAAOD,QAAA;EACX,IAAIE,OAAA,GAAUP,KAAA;EAEd,OAAOO,OAAA,EAASL,MAAA,EAAQC,MAAA,EAAQ;IAC9B,MAAMK,KAAA,GAAQT,cAAA,CAAeQ,OAAO;IACpC,IAAI,CAACC,KAAA,EAAO,OAAO;IAKnB,MAAMC,KAAA,GAAQH,IAAA,CAAKI,QAAA,CAASC,IAAA,CACzBC,SAAA,IAAcd,2BAAA,CAA4Bc,SAAS,MAAMJ,KAAA,CAAMK,IAClE;IACA,IAAI,CAACJ,KAAA,EAAO,OAAO;IAEnB,IAAID,KAAA,CAAMR,KAAA,EAAO;MACfM,IAAA,GAAOG,KAAA;MACPF,OAAA,GAAUC,KAAA,CAAMR,KAAA;MAChB;IACF;IAIA,OAAOS,KAAA,CAAMC,QAAA,CAASI,IAAA,CAAMC,UAAA,IAAe,CAACA,UAAA,CAAWC,QAAQ;EACjE;EAEA,OAAO;AACT","ignoreList":[]}

package/dist/esm/router/isStateAwaitingNavigatorMount.native.js

@@ -1,3 +1,4 @@
+import { getReactNavigationRouteName } from "../getReactNavigationConfig.native.js";
 function _type_of(obj) {
   "@swc/helpers - typeof";
 
@@ -13,7 +14,7 @@ function isStateAwaitingNavigatorMount(state, rootNode) {
       v: false
     };
     var child = node.children.find(function (candidate) {
-      return candidate.route === route.name;
+      return getReactNavigationRouteName(candidate) === route.name;
     });
     if (!child) return {
       v: false

package/dist/esm/router/isStateAwaitingNavigatorMount.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["_type_of","obj","Symbol","constructor","focusedRouteOf","state","index","routes","length","isStateAwaitingNavigatorMount","rootNode","_loop","route","current","v","child","node","children","find","candidate","name"],"sources":["../../../src/router/isStateAwaitingNavigatorMount.ts"],"sourcesContent":[null],"mappings":"AAUA,SAASA,SAAAC,GAAA;EACP,uBAAoB;;EAGtB,OAAAA,GAAA,WAAAC,MAAA,oBAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAkBO;AAIL,SAAKG,cAAUA,CAAOC,KAAA;EAEtB,OAAI,OAAOA,KAAA,CAAAC,KAAA,gBAAAD,KAAA,CAAAE,MAAA,CAAAF,KAAA,CAAAC,KAAA,IAAAD,KAAA,CAAAE,MAAA,CAAAF,KAAA,CAAAE,MAAA,CAAAC,MAAA;AACX;AAEA,SAAOC,6BAAyBA,CAAAJ,KAAA,EAAAK,QAAA;EAC9B,IAAAC,KAAM,YAAAA,CAAA,EAAQ;IACd,IAAIC,KAAC,GAAOR,cAAO,CAAAS,OAAA;IAKnB,KAAAD,KAAM,SAAa;MACnBE,CAAA,EAAK;IAEL;IACE,IAAAC,KAAO,GAAAC,IAAA,CAAAC,QAAA,CAAAC,IAAA,WAAAC,SAAA;MACP,OAAAA,SAAgB,CAAAP,KAAA,KAAAA,KAAA,CAAAQ,IAAA;IAChB;IACF,KAAAL,KAAA;MAIAD,CAAA;IACF;IAEA,IAAAF,KAAO,CAAAP,KAAA;MACTW,IAAA,GAAAD,KAAA","ignoreList":[]}
+{"version":3,"names":["getReactNavigationRouteName","_type_of","obj","Symbol","constructor","focusedRouteOf","state","index","routes","length","isStateAwaitingNavigatorMount","rootNode","_loop","route","current","v","child","node","children","find","candidate","name"],"sources":["../../../src/router/isStateAwaitingNavigatorMount.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,2BAAA,QAAmC;AAU5C,SAASC,SAAAC,GAAA;EACP,uBAAoB;;EAGtB,OAAAA,GAAA,WAAAC,MAAA,oBAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAkBO;AAIL,SAAKG,cAAUA,CAAOC,KAAA;EAEtB,OAAI,OAAOA,KAAA,CAAAC,KAAA,gBAAAD,KAAA,CAAAE,MAAA,CAAAF,KAAA,CAAAC,KAAA,IAAAD,KAAA,CAAAE,MAAA,CAAAF,KAAA,CAAAE,MAAA,CAAAC,MAAA;AACX;AAEA,SAAOC,6BAAyBA,CAAAJ,KAAA,EAAAK,QAAA;EAC9B,IAAAC,KAAM,YAAAA,CAAA,EAAQ;IACd,IAAIC,KAAC,GAAOR,cAAO,CAAAS,OAAA;IAKnB,KAAAD,KAAM,SAAa;MACjBE,CAAC;IACH;IACA,IAAIC,KAAC,GAAOC,IAAA,CAAAC,QAAO,CAAAC,IAAA,WAAAC,SAAA;MAEnB,OAAIpB,2BAAa,CAAAoB,SAAA,MAAAP,KAAA,CAAAQ,IAAA;IACf;IACA,KAAAL,KAAA,EAAU,OAAM;MAChBD,CAAA;IACF;IAIA,IAAAF,KAAO,CAAAP,KAAM;MACfW,IAAA,GAAAD,KAAA;MAEAF,OAAO,GAAAD,KAAA,CAAAP,KAAA;MACT","ignoreList":[]}

package/dist/esm/router/path.mjs

@@ -38,5 +38,5 @@ function getPathWithRecoveredDynamicSegment(paths, fallbackPath = getSafeWindowP
 function getPathnameWithRecoveredDynamicSegment(pathname, fallbackPath = getSafeWindowPath()) {
   return normalizeRoutePathname(getPathWithRecoveredDynamicSegment([pathname], fallbackPath) ?? pathname);
 }
-export { getPathWithRecoveredDynamicSegment, getPathnameWithRecoveredDynamicSegment, getSafeWindowPath, getSafeWindowPathname, hasLostDynamicSegment, normalizeRoutePathname, stripTrailingSlash };
+export { getPathWithRecoveredDynamicSegment, getPathnameWithRecoveredDynamicSegment, getSafeWindowPath, getSafeWindowPathname, hasLostDynamicSegment, normalizeRoutePathname, stripPathSuffix, stripTrailingSlash };
 //# sourceMappingURL=path.mjs.map

package/dist/esm/router/path.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["stripBaseUrl","stripPathSuffix","path","queryIndex","indexOf","hashIndex","end","length","Math","min","slice","stripTrailingSlash","pathname","endsWith","normalizeRoutePathname","hasLostDynamicSegment","split","includes","getSafeWindowPathname","window","location","getSafeWindowPath","search","getPathWithRecoveredDynamicSegment","paths","fallbackPath","getPathnameWithRecoveredDynamicSegment"],"sources":["../../../src/router/path.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAE7B,SAASC,gBAAgBC,IAAA,EAAsB;EAC7C,MAAMC,UAAA,GAAaD,IAAA,CAAKE,OAAA,CAAQ,GAAG;EACnC,MAAMC,SAAA,GAAYH,IAAA,CAAKE,OAAA,CAAQ,GAAG;EAClC,IAAIE,GAAA,GAAMJ,IAAA,CAAKK,MAAA;EAEf,IAAIJ,UAAA,IAAc,GAAGG,GAAA,GAAME,IAAA,CAAKC,GAAA,CAAIH,GAAA,EAAKH,UAAU;EACnD,IAAIE,SAAA,IAAa,GAAGC,GAAA,GAAME,IAAA,CAAKC,GAAA,CAAIH,GAAA,EAAKD,SAAS;EAEjD,OAAOH,IAAA,CAAKQ,KAAA,CAAM,GAAGJ,GAAG;AAC1B;AAEO,SAASK,mBAAmBC,QAAA,EAA0B;EAC3D,OAAOA,QAAA,CAASL,MAAA,GAAS,KAAKK,QAAA,CAASC,QAAA,CAAS,GAAG,IAAID,QAAA,CAASF,KAAA,CAAM,GAAG,EAAE,IAAIE,QAAA;AACjF;AAEO,SAASE,uBAAuBF,QAAA,EAA0B;EAC/D,OAAOD,kBAAA,CAAmBX,YAAA,CAAaC,eAAA,CAAgBW,QAAQ,CAAC,CAAC;AACnE;AAGO,SAASG,sBAAsBb,IAAA,EAAuB;EAC3D,OAAOD,eAAA,CAAgBC,IAAI,EAAEc,KAAA,CAAM,GAAG,EAAEC,QAAA,CAAS,WAAW;AAC9D;AAKO,SAASC,sBAAA,EAA4C;EAC1D,IACE,OAAOC,MAAA,KAAW,eAClB,CAACA,MAAA,CAAOC,QAAA,IACR,OAAOD,MAAA,CAAOC,QAAA,CAASR,QAAA,KAAa,UACpC;IACA,OAAO;EACT;EACA,OAAOO,MAAA,CAAOC,QAAA,CAASR,QAAA;AACzB;AAEO,SAASS,kBAAA,EAAwC;EACtD,MAAMT,QAAA,GAAWM,qBAAA,CAAsB;EACvC,IAAIN,QAAA,KAAa,QAAW,OAAO;EACnC,OAAOA,QAAA,IAAYO,MAAA,CAAOC,QAAA,CAASE,MAAA,IAAU;AAC/C;AAEO,SAASC,mCACdC,KAAA,EACAC,YAAA,GAAeJ,iBAAA,CAAkB,GACb;EAGpB,WAAWnB,IAAA,IAAQsB,KAAA,EAAO;IACxB,IAAItB,IAAA,KAAS,UAAa,CAACa,qBAAA,CAAsBb,IAAI,GAAG;MACtD,OAAOA,IAAA;IACT;EACF;EAEA,OAAOuB,YAAA;AACT;AAEO,SAASC,uCACdd,QAAA,EACAa,YAAA,GAAeJ,iBAAA,CAAkB,GACzB;EACR,OAAOP,sBAAA,CACLS,kCAAA,CAAmC,CAACX,QAAQ,GAAGa,YAAY,KAAKb,QAClE;AACF","ignoreList":[]}
+{"version":3,"names":["stripBaseUrl","stripPathSuffix","path","queryIndex","indexOf","hashIndex","end","length","Math","min","slice","stripTrailingSlash","pathname","endsWith","normalizeRoutePathname","hasLostDynamicSegment","split","includes","getSafeWindowPathname","window","location","getSafeWindowPath","search","getPathWithRecoveredDynamicSegment","paths","fallbackPath","getPathnameWithRecoveredDynamicSegment"],"sources":["../../../src/router/path.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAEtB,SAASC,gBAAgBC,IAAA,EAAsB;EACpD,MAAMC,UAAA,GAAaD,IAAA,CAAKE,OAAA,CAAQ,GAAG;EACnC,MAAMC,SAAA,GAAYH,IAAA,CAAKE,OAAA,CAAQ,GAAG;EAClC,IAAIE,GAAA,GAAMJ,IAAA,CAAKK,MAAA;EAEf,IAAIJ,UAAA,IAAc,GAAGG,GAAA,GAAME,IAAA,CAAKC,GAAA,CAAIH,GAAA,EAAKH,UAAU;EACnD,IAAIE,SAAA,IAAa,GAAGC,GAAA,GAAME,IAAA,CAAKC,GAAA,CAAIH,GAAA,EAAKD,SAAS;EAEjD,OAAOH,IAAA,CAAKQ,KAAA,CAAM,GAAGJ,GAAG;AAC1B;AAEO,SAASK,mBAAmBC,QAAA,EAA0B;EAC3D,OAAOA,QAAA,CAASL,MAAA,GAAS,KAAKK,QAAA,CAASC,QAAA,CAAS,GAAG,IAAID,QAAA,CAASF,KAAA,CAAM,GAAG,EAAE,IAAIE,QAAA;AACjF;AAEO,SAASE,uBAAuBF,QAAA,EAA0B;EAC/D,OAAOD,kBAAA,CAAmBX,YAAA,CAAaC,eAAA,CAAgBW,QAAQ,CAAC,CAAC;AACnE;AAGO,SAASG,sBAAsBb,IAAA,EAAuB;EAC3D,OAAOD,eAAA,CAAgBC,IAAI,EAAEc,KAAA,CAAM,GAAG,EAAEC,QAAA,CAAS,WAAW;AAC9D;AAKO,SAASC,sBAAA,EAA4C;EAC1D,IACE,OAAOC,MAAA,KAAW,eAClB,CAACA,MAAA,CAAOC,QAAA,IACR,OAAOD,MAAA,CAAOC,QAAA,CAASR,QAAA,KAAa,UACpC;IACA,OAAO;EACT;EACA,OAAOO,MAAA,CAAOC,QAAA,CAASR,QAAA;AACzB;AAEO,SAASS,kBAAA,EAAwC;EACtD,MAAMT,QAAA,GAAWM,qBAAA,CAAsB;EACvC,IAAIN,QAAA,KAAa,QAAW,OAAO;EACnC,OAAOA,QAAA,IAAYO,MAAA,CAAOC,QAAA,CAASE,MAAA,IAAU;AAC/C;AAEO,SAASC,mCACdC,KAAA,EACAC,YAAA,GAAeJ,iBAAA,CAAkB,GACb;EAGpB,WAAWnB,IAAA,IAAQsB,KAAA,EAAO;IACxB,IAAItB,IAAA,KAAS,UAAa,CAACa,qBAAA,CAAsBb,IAAI,GAAG;MACtD,OAAOA,IAAA;IACT;EACF;EAEA,OAAOuB,YAAA;AACT;AAEO,SAASC,uCACdd,QAAA,EACAa,YAAA,GAAeJ,iBAAA,CAAkB,GACzB;EACR,OAAOP,sBAAA,CACLS,kCAAA,CAAmC,CAACX,QAAQ,GAAGa,YAAY,KAAKb,QAClE;AACF","ignoreList":[]}

package/dist/esm/router/path.native.js

@@ -60,5 +60,5 @@ function getPathnameWithRecoveredDynamicSegment(pathname) {
   var _getPathWithRecoveredDynamicSegment;
   return normalizeRoutePathname((_getPathWithRecoveredDynamicSegment = getPathWithRecoveredDynamicSegment([pathname], fallbackPath)) !== null && _getPathWithRecoveredDynamicSegment !== void 0 ? _getPathWithRecoveredDynamicSegment : pathname);
 }
-export { getPathWithRecoveredDynamicSegment, getPathnameWithRecoveredDynamicSegment, getSafeWindowPath, getSafeWindowPathname, hasLostDynamicSegment, normalizeRoutePathname, stripTrailingSlash };
+export { getPathWithRecoveredDynamicSegment, getPathnameWithRecoveredDynamicSegment, getSafeWindowPath, getSafeWindowPathname, hasLostDynamicSegment, normalizeRoutePathname, stripPathSuffix, stripTrailingSlash };
 //# sourceMappingURL=path.native.js.map

package/dist/esm/router/path.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["stripBaseUrl","stripPathSuffix","path","queryIndex","indexOf","hashIndex","end","length","Math","min","slice","stripTrailingSlash","pathname","endsWith","normalizeRoutePathname","hasLostDynamicSegment","split","includes","getSafeWindowPathname","window","location","getSafeWindowPath","search","getPathWithRecoveredDynamicSegment","paths","fallbackPath","arguments","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","value","err"],"sources":["../../../src/router/path.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAE7B,SAASC,gBAAgBC,IAAA,EAAsB;EAC7C,IAAAC,UAAM,GAAAD,IAAa,CAAAE,OAAK,IAAQ;EAChC,IAAAC,SAAM,GAAAH,IAAY,CAAAE,OAAK,IAAQ;EAC/B,IAAIE,GAAA,GAAMJ,IAAA,CAAKK,MAAA;EAEf,IAAIJ,UAAA,IAAc,GAAGG,GAAA,GAAME,IAAA,CAAKC,GAAA,CAAIH,GAAA,EAAKH,UAAU;EACnD,IAAIE,SAAA,IAAa,GAAGC,GAAA,GAAME,IAAA,CAAKC,GAAA,CAAIH,GAAA,EAAKD,SAAS;EAEjD,OAAOH,IAAA,CAAKQ,KAAA,CAAM,GAAGJ,GAAG;AAC1B;AAEO,SAASK,mBAAmBC,QAAA,EAA0B;EAC3D,OAAOA,QAAA,CAASL,MAAA,GAAS,KAAKK,QAAA,CAASC,QAAA,CAAS,GAAG,IAAID,QAAA,CAASF,KAAA,CAAM,GAAG,EAAE,IAAIE,QAAA;AACjF;AAEO,SAASE,uBAAuBF,QAAA,EAA0B;EAC/D,OAAOD,kBAAA,CAAmBX,YAAA,CAAaC,eAAA,CAAgBW,QAAQ,CAAC,CAAC;AACnE;AAGO,SAASG,sBAAsBb,IAAA,EAAuB;EAC3D,OAAOD,eAAA,CAAgBC,IAAI,EAAEc,KAAA,CAAM,GAAG,EAAEC,QAAA,CAAS,WAAW;AAC9D;AAKO,SAASC,sBAAA,EAA4C;EAC1D,IACE,OAAOC,MAAA,KAAW,eAClB,CAACA,MAAA,CAAOC,QAAA,IACR,OAAOD,MAAA,CAAOC,QAAA,CAASR,QAAA,KAAa,UACpC;IACA,OAAO;EACT;EACA,OAAOO,MAAA,CAAOC,QAAA,CAASR,QAAA;AACzB;AAEO,SAASS,kBAAA,EAAwC;EACtD,IAAAT,QAAM,GAAAM,qBAAW;EACjB,IAAIN,QAAA,KAAa,QAAW,OAAO;EACnC,OAAOA,QAAA,IAAYO,MAAA,CAAOC,QAAA,CAASE,MAAA,IAAU;AAC/C;AAEO,SAASC,mCACdC,KAAA,EACA;EAIA,IAAAC,YAAW,GAAQC,SAAO,CAAAnB,MAAA,QAAAmB,SAAA,iBAAAA,SAAA,MAAAL,iBAAA;EACxB,IAAAM,yBAA2B;IAAAC,iBAA6B;IAAAC,cAAA;EACtD;IACF,SAAAC,SAAA,GAAAN,KAAA,CAAAO,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;MACF,IAAAzB,IAAA,GAAA+B,KAAA,CAAAG,KAAA;MAEA,IAAOlC,IAAA,gBAAAa,qBAAA,CAAAb,IAAA;QACT,OAAAA,IAAA;MAEO;IAIL;EAAO,EACL,OAAAmC,GAAA;IACFT,iBAAA;IACFC,cAAA,GAAAQ,GAAA","ignoreList":[]}
+{"version":3,"names":["stripBaseUrl","stripPathSuffix","path","queryIndex","indexOf","hashIndex","end","length","Math","min","slice","stripTrailingSlash","pathname","endsWith","normalizeRoutePathname","hasLostDynamicSegment","split","includes","getSafeWindowPathname","window","location","getSafeWindowPath","search","getPathWithRecoveredDynamicSegment","paths","fallbackPath","arguments","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","value","err"],"sources":["../../../src/router/path.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAEtB,SAASC,gBAAgBC,IAAA,EAAsB;EACpD,IAAAC,UAAM,GAAAD,IAAa,CAAAE,OAAK,IAAQ;EAChC,IAAAC,SAAM,GAAAH,IAAY,CAAAE,OAAK,IAAQ;EAC/B,IAAIE,GAAA,GAAMJ,IAAA,CAAKK,MAAA;EAEf,IAAIJ,UAAA,IAAc,GAAGG,GAAA,GAAME,IAAA,CAAKC,GAAA,CAAIH,GAAA,EAAKH,UAAU;EACnD,IAAIE,SAAA,IAAa,GAAGC,GAAA,GAAME,IAAA,CAAKC,GAAA,CAAIH,GAAA,EAAKD,SAAS;EAEjD,OAAOH,IAAA,CAAKQ,KAAA,CAAM,GAAGJ,GAAG;AAC1B;AAEO,SAASK,mBAAmBC,QAAA,EAA0B;EAC3D,OAAOA,QAAA,CAASL,MAAA,GAAS,KAAKK,QAAA,CAASC,QAAA,CAAS,GAAG,IAAID,QAAA,CAASF,KAAA,CAAM,GAAG,EAAE,IAAIE,QAAA;AACjF;AAEO,SAASE,uBAAuBF,QAAA,EAA0B;EAC/D,OAAOD,kBAAA,CAAmBX,YAAA,CAAaC,eAAA,CAAgBW,QAAQ,CAAC,CAAC;AACnE;AAGO,SAASG,sBAAsBb,IAAA,EAAuB;EAC3D,OAAOD,eAAA,CAAgBC,IAAI,EAAEc,KAAA,CAAM,GAAG,EAAEC,QAAA,CAAS,WAAW;AAC9D;AAKO,SAASC,sBAAA,EAA4C;EAC1D,IACE,OAAOC,MAAA,KAAW,eAClB,CAACA,MAAA,CAAOC,QAAA,IACR,OAAOD,MAAA,CAAOC,QAAA,CAASR,QAAA,KAAa,UACpC;IACA,OAAO;EACT;EACA,OAAOO,MAAA,CAAOC,QAAA,CAASR,QAAA;AACzB;AAEO,SAASS,kBAAA,EAAwC;EACtD,IAAAT,QAAM,GAAAM,qBAAW;EACjB,IAAIN,QAAA,KAAa,QAAW,OAAO;EACnC,OAAOA,QAAA,IAAYO,MAAA,CAAOC,QAAA,CAASE,MAAA,IAAU;AAC/C;AAEO,SAASC,mCACdC,KAAA,EACA;EAIA,IAAAC,YAAW,GAAQC,SAAO,CAAAnB,MAAA,QAAAmB,SAAA,iBAAAA,SAAA,MAAAL,iBAAA;EACxB,IAAAM,yBAA2B;IAAAC,iBAA6B;IAAAC,cAAA;EACtD;IACF,SAAAC,SAAA,GAAAN,KAAA,CAAAO,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;MACF,IAAAzB,IAAA,GAAA+B,KAAA,CAAAG,KAAA;MAEA,IAAOlC,IAAA,gBAAAa,qBAAA,CAAAb,IAAA;QACT,OAAAA,IAAA;MAEO;IAIL;EAAO,EACL,OAAAmC,GAAA;IACFT,iBAAA;IACFC,cAAA,GAAAQ,GAAA","ignoreList":[]}

package/dist/esm/router/routeHmr.native.js

@@ -16,11 +16,8 @@ if (process.env.NODE_ENV === "development") {
       if (typeof (routeCache === null || routeCache === void 0 ? void 0 : routeCache.clearFile) === "function") {
         routeCache.clearFile(id);
       }
-    } finally {
-      routeHmrEpoch++;
-      routeHmrListeners.forEach(function (listener) {
-        return listener();
-      });
+    } catch (error) {
+      console.error("[one] route cache eviction failed", error);
     }
   };
 }

package/dist/esm/router/routeHmr.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["routeHmrEpoch","routeHmrListeners","Set","subscribeRouteHmr","onStoreChange","add","delete","getRouteHmrEpoch","process","env","NODE_ENV","globalThis","__VXRN_ON_MODULE_UPDATED__","id","routeCache","window","__oneRouteCache","clearFile","forEach","listener"],"sources":["../../../src/router/routeHmr.native.ts"],"sourcesContent":[null],"mappings":"AAMA,IAAIA,aAAA,GAAgB;AACpB,IAAIC,iBAAA,GAAoB,mBAAIC,GAAA,CAAI;AACzB,IAAIC,iBAAA,GAAoB,SAAAA,CAASC,aAAA,EAAe;EACnDH,iBAAA,CAAkBI,GAAA,CAAID,aAAa;EACnC,OAAO,YAAW;IACdH,iBAAA,CAAkBK,MAAA,CAAOF,aAAa;EAC1C;AACJ;AACO,IAAIG,gBAAA,GAAmB,SAAAA,CAAA,EAAW;EACrC,OAAOP,aAAA;AACX;AACA,IAAIQ,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,eAAe;EACxCC,UAAA,CAAWC,0BAAA,GAA6B,UAASC,EAAA,EAAI;IACjD,IAAI;MACA,IAAIC,UAAA,GAAa,OAAOC,MAAA,KAAW,cAAc,SAAYA,MAAA,CAAOC,eAAA;MACpE,IAAI,QAAQF,UAAA,KAAe,QAAQA,UAAA,KAAe,SAAS,SAASA,UAAA,CAAWG,SAAA,MAAe,YAAY;QACtGH,UAAA,CAAWG,SAAA,CAAUJ,EAAE;MAC3B;IACJ,UAAE;MACEb,aAAA;MACAC,iBAAA,CAAkBiB,OAAA,CAAQ,UAASC,QAAA,EAAU;QACzC,OAAOA,QAAA,CAAS;MACpB,CAAC;IACL;EACJ;AACJ","ignoreList":[]}
+{"version":3,"names":["routeHmrEpoch","routeHmrListeners","Set","subscribeRouteHmr","onStoreChange","add","delete","getRouteHmrEpoch","process","env","NODE_ENV","globalThis","__VXRN_ON_MODULE_UPDATED__","id","routeCache","window","__oneRouteCache","clearFile","error","console"],"sources":["../../../src/router/routeHmr.native.ts"],"sourcesContent":[null],"mappings":"AASA,IAAIA,aAAA,GAAgB;AACpB,IAAIC,iBAAA,GAAoB,mBAAIC,GAAA,CAAI;AACzB,IAAIC,iBAAA,GAAoB,SAAAA,CAASC,aAAA,EAAe;EACnDH,iBAAA,CAAkBI,GAAA,CAAID,aAAa;EACnC,OAAO,YAAW;IACdH,iBAAA,CAAkBK,MAAA,CAAOF,aAAa;EAC1C;AACJ;AACO,IAAIG,gBAAA,GAAmB,SAAAA,CAAA,EAAW;EACrC,OAAOP,aAAA;AACX;AACA,IAAIQ,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,eAAe;EACxCC,UAAA,CAAWC,0BAAA,GAA6B,UAASC,EAAA,EAAI;IACjD,IAAI;MACA,IAAIC,UAAA,GAAa,OAAOC,MAAA,KAAW,cAAc,SAAYA,MAAA,CAAOC,eAAA;MACpE,IAAI,QAAQF,UAAA,KAAe,QAAQA,UAAA,KAAe,SAAS,SAASA,UAAA,CAAWG,SAAA,MAAe,YAAY;QACtGH,UAAA,CAAWG,SAAA,CAAUJ,EAAE;MAC3B;IACJ,SAASK,KAAA,EAAO;MACZC,OAAA,CAAQD,KAAA,CAAM,qCAAqCA,KAAK;IAC5D;EACJ;AACJ","ignoreList":[]}

package/dist/esm/router/routeHmr.native.test.js

@@ -16,31 +16,42 @@ describe("routeHmr.native", () => {
   it("registers globalThis.__VXRN_ON_MODULE_UPDATED__ in development", () => {
     expect(typeof globalThis.__VXRN_ON_MODULE_UPDATED__).toBe("function");
   });
-  it("bumps the epoch and notifies subscribers, and stops after unsubscribe", () => {
+  it("does not bump the epoch, so Fast Refresh can keep the mounted route", () => {
     const before = routeHmr.getRouteHmrEpoch();
     const listener = vi.fn();
     const unsubscribe = routeHmr.subscribeRouteHmr(listener);
     globalThis.__VXRN_ON_MODULE_UPDATED__("app/index.tsx");
-    expect(routeHmr.getRouteHmrEpoch()).toBe(before + 1);
-    expect(listener).toHaveBeenCalledTimes(1);
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before);
+    expect(listener).not.toHaveBeenCalled();
     unsubscribe();
-    globalThis.__VXRN_ON_MODULE_UPDATED__("app/index.tsx");
-    expect(listener).toHaveBeenCalledTimes(1);
   });
   it("evicts the route cache for the updated file when window.__oneRouteCache is present", () => {
-    const clearFile = vi.fn();
+    const clearFile = vi.fn(() => true);
     globalThis.window = { __oneRouteCache: { clearFile } };
     globalThis.__VXRN_ON_MODULE_UPDATED__("app/_layout.tsx");
     expect(clearFile).toHaveBeenCalledWith("app/_layout.tsx");
   });
+  it("does not bump the epoch for a non-route module either", () => {
+    const before = routeHmr.getRouteHmrEpoch();
+    const listener = vi.fn();
+    const unsubscribe = routeHmr.subscribeRouteHmr(listener);
+    globalThis.window = {
+      __oneRouteCache: { clearFile: () => false }
+    };
+    globalThis.__VXRN_ON_MODULE_UPDATED__("features/onboarding/HmrProbeChild.tsx");
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before);
+    expect(listener).not.toHaveBeenCalled();
+    unsubscribe();
+  });
   it("does not throw when window / route cache is absent", () => {
     ;
     globalThis.window = void 0;
     expect(() => globalThis.__VXRN_ON_MODULE_UPDATED__("x.tsx")).not.toThrow();
   });
-  it("still notifies subscribers when route-cache eviction throws", () => {
+  it("does not throw or bump the epoch when route-cache eviction throws", () => {
     const listener = vi.fn();
     const unsubscribe = routeHmr.subscribeRouteHmr(listener);
+    const before = routeHmr.getRouteHmrEpoch();
     globalThis.window = {
       __oneRouteCache: {
         clearFile() {
@@ -48,10 +59,9 @@ describe("routeHmr.native", () => {
         }
       }
     };
-    expect(() => globalThis.__VXRN_ON_MODULE_UPDATED__("app/index.tsx")).toThrow(
-      "cache eviction failed"
-    );
-    expect(listener).toHaveBeenCalledOnce();
+    expect(() => globalThis.__VXRN_ON_MODULE_UPDATED__("app/index.tsx")).not.toThrow();
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before);
+    expect(listener).not.toHaveBeenCalled();
     unsubscribe();
   });
 });

package/dist/esm/router/routeHmr.native.test.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/router/routeHmr.native.test.ts"],
-  "mappings": "AAAA,SAAS,WAAW,YAAY,UAAU,QAAQ,IAAI,UAAU;AAIhE,SAAS,mBAAmB,MAAM;AAChC,MAAI;AACJ,QAAM,aAAc,WAAmB;AACvC,QAAM,wBAAwB,WAAW;AAEzC,aAAW,YAAY;AAGrB,OAAG,QAAQ,YAAY,aAAa;AACpC,OAAG,aAAa;AAChB,eAAW,MAAM,OAAO,mBAAmB;AAAA,EAC7C,CAAC;AAED,YAAU,MAAM;AACd,OAAG,cAAc;AACjB,eAAW,6BAA6B;AACvC,IAAC,WAAmB,SAAS;AAAA,EAChC,CAAC;AAED,KAAG,kEAAkE,MAAM;AACzE,WAAO,OAAO,WAAW,0BAA0B,EAAE,KAAK,UAAU;AAAA,EACtE,CAAC;AAED,KAAG,yEAAyE,MAAM;AAChF,UAAM,SAAS,SAAS,iBAAiB;AACzC,UAAM,WAAW,GAAG,GAAG;AACvB,UAAM,cAAc,SAAS,kBAAkB,QAAQ;AAEvD,eAAW,2BAA4B,eAAe;AACtD,WAAO,SAAS,iBAAiB,CAAC,EAAE,KAAK,SAAS,CAAC;AACnD,WAAO,QAAQ,EAAE,sBAAsB,CAAC;AAExC,gBAAY;AACZ,eAAW,2BAA4B,eAAe;AACtD,WAAO,QAAQ,EAAE,sBAAsB,CAAC;AAAA,EAC1C,CAAC;AAED,KAAG,sFAAsF,MAAM;AAC7F,UAAM,YAAY,GAAG,GAAG;AACvB,IAAC,WAAmB,SAAS,EAAE,iBAAiB,EAAE,UAAU,EAAE;AAC/D,eAAW,2BAA4B,iBAAiB;AACxD,WAAO,SAAS,EAAE,qBAAqB,iBAAiB;AAAA,EAC1D,CAAC;AAED,KAAG,sDAAsD,MAAM;AAC7D;AAAC,IAAC,WAAmB,SAAS;AAC9B,WAAO,MAAM,WAAW,2BAA4B,OAAO,CAAC,EAAE,IAAI,QAAQ;AAAA,EAC5E,CAAC;AAED,KAAG,+DAA+D,MAAM;AACtE,UAAM,WAAW,GAAG,GAAG;AACvB,UAAM,cAAc,SAAS,kBAAkB,QAAQ;AACtD,IAAC,WAAmB,SAAS;AAAA,MAC5B,iBAAiB;AAAA,QACf,YAAY;AACV,gBAAM,IAAI,MAAM,uBAAuB;AAAA,QACzC;AAAA,MACF;AAAA,IACF;AAEA,WAAO,MAAM,WAAW,2BAA4B,eAAe,CAAC,EAAE;AAAA,MACpE;AAAA,IACF;AACA,WAAO,QAAQ,EAAE,qBAAqB;AACtC,gBAAY;AAAA,EACd,CAAC;AACH,CAAC;",
+  "mappings": "AAAA,SAAS,WAAW,YAAY,UAAU,QAAQ,IAAI,UAAU;AAIhE,SAAS,mBAAmB,MAAM;AAChC,MAAI;AACJ,QAAM,aAAc,WAAmB;AACvC,QAAM,wBAAwB,WAAW;AAEzC,aAAW,YAAY;AAGrB,OAAG,QAAQ,YAAY,aAAa;AACpC,OAAG,aAAa;AAChB,eAAW,MAAM,OAAO,mBAAmB;AAAA,EAC7C,CAAC;AAED,YAAU,MAAM;AACd,OAAG,cAAc;AACjB,eAAW,6BAA6B;AACvC,IAAC,WAAmB,SAAS;AAAA,EAChC,CAAC;AAED,KAAG,kEAAkE,MAAM;AACzE,WAAO,OAAO,WAAW,0BAA0B,EAAE,KAAK,UAAU;AAAA,EACtE,CAAC;AAED,KAAG,uEAAuE,MAAM;AAC9E,UAAM,SAAS,SAAS,iBAAiB;AACzC,UAAM,WAAW,GAAG,GAAG;AACvB,UAAM,cAAc,SAAS,kBAAkB,QAAQ;AAEvD,eAAW,2BAA4B,eAAe;AACtD,WAAO,SAAS,iBAAiB,CAAC,EAAE,KAAK,MAAM;AAC/C,WAAO,QAAQ,EAAE,IAAI,iBAAiB;AAEtC,gBAAY;AAAA,EACd,CAAC;AAED,KAAG,sFAAsF,MAAM;AAC7F,UAAM,YAAY,GAAG,GAAG,MAAM,IAAI;AACjC,IAAC,WAAmB,SAAS,EAAE,iBAAiB,EAAE,UAAU,EAAE;AAC/D,eAAW,2BAA4B,iBAAiB;AACxD,WAAO,SAAS,EAAE,qBAAqB,iBAAiB;AAAA,EAC1D,CAAC;AAED,KAAG,yDAAyD,MAAM;AAChE,UAAM,SAAS,SAAS,iBAAiB;AACzC,UAAM,WAAW,GAAG,GAAG;AACvB,UAAM,cAAc,SAAS,kBAAkB,QAAQ;AACtD,IAAC,WAAmB,SAAS;AAAA,MAC5B,iBAAiB,EAAE,WAAW,MAAM,MAAM;AAAA,IAC5C;AAEA,eAAW,2BAA4B,uCAAuC;AAC9E,WAAO,SAAS,iBAAiB,CAAC,EAAE,KAAK,MAAM;AAC/C,WAAO,QAAQ,EAAE,IAAI,iBAAiB;AACtC,gBAAY;AAAA,EACd,CAAC;AAED,KAAG,sDAAsD,MAAM;AAC7D;AAAC,IAAC,WAAmB,SAAS;AAC9B,WAAO,MAAM,WAAW,2BAA4B,OAAO,CAAC,EAAE,IAAI,QAAQ;AAAA,EAC5E,CAAC;AAED,KAAG,qEAAqE,MAAM;AAC5E,UAAM,WAAW,GAAG,GAAG;AACvB,UAAM,cAAc,SAAS,kBAAkB,QAAQ;AACvD,UAAM,SAAS,SAAS,iBAAiB;AACxC,IAAC,WAAmB,SAAS;AAAA,MAC5B,iBAAiB;AAAA,QACf,YAAY;AACV,gBAAM,IAAI,MAAM,uBAAuB;AAAA,QACzC;AAAA,MACF;AAAA,IACF;AAEA,WAAO,MAAM,WAAW,2BAA4B,eAAe,CAAC,EAAE,IAAI,QAAQ;AAClF,WAAO,SAAS,iBAAiB,CAAC,EAAE,KAAK,MAAM;AAC/C,WAAO,QAAQ,EAAE,IAAI,iBAAiB;AACtC,gBAAY;AAAA,EACd,CAAC;AACH,CAAC;",
   "names": []
 }

package/dist/esm/router/routeHmr.native.test.mjs

@@ -6,7 +6,7 @@ describe("routeHmr.native", () => {
   beforeEach(async () => {
     vi.stubEnv("NODE_ENV", "development");
     vi.resetModules();
-    routeHmr = await import("./routeHmr.native.mjs");
+    routeHmr = await import("./routeHmr.native");
   });
   afterEach(() => {
     vi.unstubAllEnvs();
@@ -16,19 +16,17 @@ describe("routeHmr.native", () => {
   it("registers globalThis.__VXRN_ON_MODULE_UPDATED__ in development", () => {
     expect(typeof globalThis.__VXRN_ON_MODULE_UPDATED__).toBe("function");
   });
-  it("bumps the epoch and notifies subscribers, and stops after unsubscribe", () => {
+  it("does not bump the epoch, so Fast Refresh can keep the mounted route", () => {
     const before = routeHmr.getRouteHmrEpoch();
     const listener = vi.fn();
     const unsubscribe = routeHmr.subscribeRouteHmr(listener);
     globalThis.__VXRN_ON_MODULE_UPDATED__("app/index.tsx");
-    expect(routeHmr.getRouteHmrEpoch()).toBe(before + 1);
-    expect(listener).toHaveBeenCalledTimes(1);
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before);
+    expect(listener).not.toHaveBeenCalled();
     unsubscribe();
-    globalThis.__VXRN_ON_MODULE_UPDATED__("app/index.tsx");
-    expect(listener).toHaveBeenCalledTimes(1);
   });
   it("evicts the route cache for the updated file when window.__oneRouteCache is present", () => {
-    const clearFile = vi.fn();
+    const clearFile = vi.fn(() => true);
     globalThis.window = {
       __oneRouteCache: {
         clearFile
@@ -37,14 +35,29 @@ describe("routeHmr.native", () => {
     globalThis.__VXRN_ON_MODULE_UPDATED__("app/_layout.tsx");
     expect(clearFile).toHaveBeenCalledWith("app/_layout.tsx");
   });
+  it("does not bump the epoch for a non-route module either", () => {
+    const before = routeHmr.getRouteHmrEpoch();
+    const listener = vi.fn();
+    const unsubscribe = routeHmr.subscribeRouteHmr(listener);
+    globalThis.window = {
+      __oneRouteCache: {
+        clearFile: () => false
+      }
+    };
+    globalThis.__VXRN_ON_MODULE_UPDATED__("features/onboarding/HmrProbeChild.tsx");
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before);
+    expect(listener).not.toHaveBeenCalled();
+    unsubscribe();
+  });
   it("does not throw when window / route cache is absent", () => {
     ;
     globalThis.window = void 0;
     expect(() => globalThis.__VXRN_ON_MODULE_UPDATED__("x.tsx")).not.toThrow();
   });
-  it("still notifies subscribers when route-cache eviction throws", () => {
+  it("does not throw or bump the epoch when route-cache eviction throws", () => {
     const listener = vi.fn();
     const unsubscribe = routeHmr.subscribeRouteHmr(listener);
+    const before = routeHmr.getRouteHmrEpoch();
     globalThis.window = {
       __oneRouteCache: {
         clearFile() {
@@ -52,8 +65,9 @@ describe("routeHmr.native", () => {
         }
       }
     };
-    expect(() => globalThis.__VXRN_ON_MODULE_UPDATED__("app/index.tsx")).toThrow("cache eviction failed");
-    expect(listener).toHaveBeenCalledOnce();
+    expect(() => globalThis.__VXRN_ON_MODULE_UPDATED__("app/index.tsx")).not.toThrow();
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before);
+    expect(listener).not.toHaveBeenCalled();
     unsubscribe();
   });
 });

package/dist/esm/router/routeHmr.native.test.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["afterEach","beforeEach","describe","expect","it","vi","routeHmr","realWindow","globalThis","window","realModuleUpdatedHook","__VXRN_ON_MODULE_UPDATED__","stubEnv","resetModules","unstubAllEnvs","toBe","before","getRouteHmrEpoch","listener","fn","unsubscribe","subscribeRouteHmr","toHaveBeenCalledTimes","clearFile","__oneRouteCache","toHaveBeenCalledWith","not","toThrow","Error","toHaveBeenCalledOnce"],"sources":["../../../src/router/routeHmr.native.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,EAAWC,UAAA,EAAYC,QAAA,EAAUC,MAAA,EAAQC,EAAA,EAAIC,EAAA,QAAU;AAIhEH,QAAA,CAAS,mBAAmB,MAAM;EAChC,IAAII,QAAA;EACJ,MAAMC,UAAA,GAAcC,UAAA,CAAmBC,MAAA;EACvC,MAAMC,qBAAA,GAAwBF,UAAA,CAAWG,0BAAA;EAEzCV,UAAA,CAAW,YAAY;IAGrBI,EAAA,CAAGO,OAAA,CAAQ,YAAY,aAAa;IACpCP,EAAA,CAAGQ,YAAA,CAAa;IAChBP,QAAA,GAAW,MAAM,OAAO,uBAAmB;EAC7C,CAAC;EAEDN,SAAA,CAAU,MAAM;IACdK,EAAA,CAAGS,aAAA,CAAc;IACjBN,UAAA,CAAWG,0BAAA,GAA6BD,qBAAA;IACtCF,UAAA,CAAmBC,MAAA,GAASF,UAAA;EAChC,CAAC;EAEDH,EAAA,CAAG,kEAAkE,MAAM;IACzED,MAAA,CAAO,OAAOK,UAAA,CAAWG,0BAA0B,EAAEI,IAAA,CAAK,UAAU;EACtE,CAAC;EAEDX,EAAA,CAAG,yEAAyE,MAAM;IAChF,MAAMY,MAAA,GAASV,QAAA,CAASW,gBAAA,CAAiB;IACzC,MAAMC,QAAA,GAAWb,EAAA,CAAGc,EAAA,CAAG;IACvB,MAAMC,WAAA,GAAcd,QAAA,CAASe,iBAAA,CAAkBH,QAAQ;IAEvDV,UAAA,CAAWG,0BAAA,CAA4B,eAAe;IACtDR,MAAA,CAAOG,QAAA,CAASW,gBAAA,CAAiB,CAAC,EAAEF,IAAA,CAAKC,MAAA,GAAS,CAAC;IACnDb,MAAA,CAAOe,QAAQ,EAAEI,qBAAA,CAAsB,CAAC;IAExCF,WAAA,CAAY;IACZZ,UAAA,CAAWG,0BAAA,CAA4B,eAAe;IACtDR,MAAA,CAAOe,QAAQ,EAAEI,qBAAA,CAAsB,CAAC;EAC1C,CAAC;EAEDlB,EAAA,CAAG,sFAAsF,MAAM;IAC7F,MAAMmB,SAAA,GAAYlB,EAAA,CAAGc,EAAA,CAAG;IACtBX,UAAA,CAAmBC,MAAA,GAAS;MAAEe,eAAA,EAAiB;QAAED;MAAU;IAAE;IAC/Df,UAAA,CAAWG,0BAAA,CAA4B,iBAAiB;IACxDR,MAAA,CAAOoB,SAAS,EAAEE,oBAAA,CAAqB,iBAAiB;EAC1D,CAAC;EAEDrB,EAAA,CAAG,sDAAsD,MAAM;IAC7D;IAAEI,UAAA,CAAmBC,MAAA,GAAS;IAC9BN,MAAA,CAAO,MAAMK,UAAA,CAAWG,0BAAA,CAA4B,OAAO,CAAC,EAAEe,GAAA,CAAIC,OAAA,CAAQ;EAC5E,CAAC;EAEDvB,EAAA,CAAG,+DAA+D,MAAM;IACtE,MAAMc,QAAA,GAAWb,EAAA,CAAGc,EAAA,CAAG;IACvB,MAAMC,WAAA,GAAcd,QAAA,CAASe,iBAAA,CAAkBH,QAAQ;IACrDV,UAAA,CAAmBC,MAAA,GAAS;MAC5Be,eAAA,EAAiB;QACfD,UAAA,EAAY;UACV,MAAM,IAAIK,KAAA,CAAM,uBAAuB;QACzC;MACF;IACF;IAEAzB,MAAA,CAAO,MAAMK,UAAA,CAAWG,0BAAA,CAA4B,eAAe,CAAC,EAAEgB,OAAA,CACpE,uBACF;IACAxB,MAAA,CAAOe,QAAQ,EAAEW,oBAAA,CAAqB;IACtCT,WAAA,CAAY;EACd,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["afterEach","beforeEach","describe","expect","it","vi","routeHmr","realWindow","globalThis","window","realModuleUpdatedHook","__VXRN_ON_MODULE_UPDATED__","stubEnv","resetModules","unstubAllEnvs","toBe","before","getRouteHmrEpoch","listener","fn","unsubscribe","subscribeRouteHmr","not","toHaveBeenCalled","clearFile","__oneRouteCache","toHaveBeenCalledWith","toThrow","Error"],"sources":["../../../src/router/routeHmr.native.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,EAAWC,UAAA,EAAYC,QAAA,EAAUC,MAAA,EAAQC,EAAA,EAAIC,EAAA,QAAU;AAIhEH,QAAA,CAAS,mBAAmB,MAAM;EAChC,IAAII,QAAA;EACJ,MAAMC,UAAA,GAAcC,UAAA,CAAmBC,MAAA;EACvC,MAAMC,qBAAA,GAAwBF,UAAA,CAAWG,0BAAA;EAEzCV,UAAA,CAAW,YAAY;IAGrBI,EAAA,CAAGO,OAAA,CAAQ,YAAY,aAAa;IACpCP,EAAA,CAAGQ,YAAA,CAAa;IAChBP,QAAA,GAAW,MAAM,OAAO,mBAAmB;EAC7C,CAAC;EAEDN,SAAA,CAAU,MAAM;IACdK,EAAA,CAAGS,aAAA,CAAc;IACjBN,UAAA,CAAWG,0BAAA,GAA6BD,qBAAA;IACtCF,UAAA,CAAmBC,MAAA,GAASF,UAAA;EAChC,CAAC;EAEDH,EAAA,CAAG,kEAAkE,MAAM;IACzED,MAAA,CAAO,OAAOK,UAAA,CAAWG,0BAA0B,EAAEI,IAAA,CAAK,UAAU;EACtE,CAAC;EAEDX,EAAA,CAAG,uEAAuE,MAAM;IAC9E,MAAMY,MAAA,GAASV,QAAA,CAASW,gBAAA,CAAiB;IACzC,MAAMC,QAAA,GAAWb,EAAA,CAAGc,EAAA,CAAG;IACvB,MAAMC,WAAA,GAAcd,QAAA,CAASe,iBAAA,CAAkBH,QAAQ;IAEvDV,UAAA,CAAWG,0BAAA,CAA4B,eAAe;IACtDR,MAAA,CAAOG,QAAA,CAASW,gBAAA,CAAiB,CAAC,EAAEF,IAAA,CAAKC,MAAM;IAC/Cb,MAAA,CAAOe,QAAQ,EAAEI,GAAA,CAAIC,gBAAA,CAAiB;IAEtCH,WAAA,CAAY;EACd,CAAC;EAEDhB,EAAA,CAAG,sFAAsF,MAAM;IAC7F,MAAMoB,SAAA,GAAYnB,EAAA,CAAGc,EAAA,CAAG,MAAM,IAAI;IAChCX,UAAA,CAAmBC,MAAA,GAAS;MAAEgB,eAAA,EAAiB;QAAED;MAAU;IAAE;IAC/DhB,UAAA,CAAWG,0BAAA,CAA4B,iBAAiB;IACxDR,MAAA,CAAOqB,SAAS,EAAEE,oBAAA,CAAqB,iBAAiB;EAC1D,CAAC;EAEDtB,EAAA,CAAG,yDAAyD,MAAM;IAChE,MAAMY,MAAA,GAASV,QAAA,CAASW,gBAAA,CAAiB;IACzC,MAAMC,QAAA,GAAWb,EAAA,CAAGc,EAAA,CAAG;IACvB,MAAMC,WAAA,GAAcd,QAAA,CAASe,iBAAA,CAAkBH,QAAQ;IACrDV,UAAA,CAAmBC,MAAA,GAAS;MAC5BgB,eAAA,EAAiB;QAAED,SAAA,EAAWA,CAAA,KAAM;MAAM;IAC5C;IAEAhB,UAAA,CAAWG,0BAAA,CAA4B,uCAAuC;IAC9ER,MAAA,CAAOG,QAAA,CAASW,gBAAA,CAAiB,CAAC,EAAEF,IAAA,CAAKC,MAAM;IAC/Cb,MAAA,CAAOe,QAAQ,EAAEI,GAAA,CAAIC,gBAAA,CAAiB;IACtCH,WAAA,CAAY;EACd,CAAC;EAEDhB,EAAA,CAAG,sDAAsD,MAAM;IAC7D;IAAEI,UAAA,CAAmBC,MAAA,GAAS;IAC9BN,MAAA,CAAO,MAAMK,UAAA,CAAWG,0BAAA,CAA4B,OAAO,CAAC,EAAEW,GAAA,CAAIK,OAAA,CAAQ;EAC5E,CAAC;EAEDvB,EAAA,CAAG,qEAAqE,MAAM;IAC5E,MAAMc,QAAA,GAAWb,EAAA,CAAGc,EAAA,CAAG;IACvB,MAAMC,WAAA,GAAcd,QAAA,CAASe,iBAAA,CAAkBH,QAAQ;IACvD,MAAMF,MAAA,GAASV,QAAA,CAASW,gBAAA,CAAiB;IACvCT,UAAA,CAAmBC,MAAA,GAAS;MAC5BgB,eAAA,EAAiB;QACfD,UAAA,EAAY;UACV,MAAM,IAAII,KAAA,CAAM,uBAAuB;QACzC;MACF;IACF;IAEAzB,MAAA,CAAO,MAAMK,UAAA,CAAWG,0BAAA,CAA4B,eAAe,CAAC,EAAEW,GAAA,CAAIK,OAAA,CAAQ;IAClFxB,MAAA,CAAOG,QAAA,CAASW,gBAAA,CAAiB,CAAC,EAAEF,IAAA,CAAKC,MAAM;IAC/Cb,MAAA,CAAOe,QAAQ,EAAEI,GAAA,CAAIC,gBAAA,CAAiB;IACtCH,WAAA,CAAY;EACd,CAAC;AACH,CAAC","ignoreList":[]}

package/dist/esm/router/routeHmr.native.test.native.js

@@ -21,19 +21,19 @@ describe("routeHmr.native", function () {
   it("registers globalThis.__VXRN_ON_MODULE_UPDATED__ in development", function () {
     expect(_type_of(globalThis.__VXRN_ON_MODULE_UPDATED__)).toBe("function");
   });
-  it("bumps the epoch and notifies subscribers, and stops after unsubscribe", function () {
+  it("does not bump the epoch, so Fast Refresh can keep the mounted route", function () {
     var before = routeHmr.getRouteHmrEpoch();
     var listener = vi.fn();
     var unsubscribe = routeHmr.subscribeRouteHmr(listener);
     globalThis.__VXRN_ON_MODULE_UPDATED__("app/index.tsx");
-    expect(routeHmr.getRouteHmrEpoch()).toBe(before + 1);
-    expect(listener).toHaveBeenCalledTimes(1);
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before);
+    expect(listener).not.toHaveBeenCalled();
     unsubscribe();
-    globalThis.__VXRN_ON_MODULE_UPDATED__("app/index.tsx");
-    expect(listener).toHaveBeenCalledTimes(1);
   });
   it("evicts the route cache for the updated file when window.__oneRouteCache is present", function () {
-    var clearFile = vi.fn();
+    var clearFile = vi.fn(function () {
+      return true;
+    });
     globalThis.window = {
       __oneRouteCache: {
         clearFile
@@ -42,6 +42,22 @@ describe("routeHmr.native", function () {
     globalThis.__VXRN_ON_MODULE_UPDATED__("app/_layout.tsx");
     expect(clearFile).toHaveBeenCalledWith("app/_layout.tsx");
   });
+  it("does not bump the epoch for a non-route module either", function () {
+    var before = routeHmr.getRouteHmrEpoch();
+    var listener = vi.fn();
+    var unsubscribe = routeHmr.subscribeRouteHmr(listener);
+    globalThis.window = {
+      __oneRouteCache: {
+        clearFile: function () {
+          return false;
+        }
+      }
+    };
+    globalThis.__VXRN_ON_MODULE_UPDATED__("features/onboarding/HmrProbeChild.tsx");
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before);
+    expect(listener).not.toHaveBeenCalled();
+    unsubscribe();
+  });
   it("does not throw when window / route cache is absent", function () {
     ;
     globalThis.window = void 0;
@@ -49,9 +65,10 @@ describe("routeHmr.native", function () {
       return globalThis.__VXRN_ON_MODULE_UPDATED__("x.tsx");
     }).not.toThrow();
   });
-  it("still notifies subscribers when route-cache eviction throws", function () {
+  it("does not throw or bump the epoch when route-cache eviction throws", function () {
     var listener = vi.fn();
     var unsubscribe = routeHmr.subscribeRouteHmr(listener);
+    var before = routeHmr.getRouteHmrEpoch();
     globalThis.window = {
       __oneRouteCache: {
         clearFile() {
@@ -61,8 +78,9 @@ describe("routeHmr.native", function () {
     };
     expect(function () {
       return globalThis.__VXRN_ON_MODULE_UPDATED__("app/index.tsx");
-    }).toThrow("cache eviction failed");
-    expect(listener).toHaveBeenCalledOnce();
+    }).not.toThrow();
+    expect(routeHmr.getRouteHmrEpoch()).toBe(before);
+    expect(listener).not.toHaveBeenCalled();
     unsubscribe();
   });
 });

package/dist/esm/router/routeHmr.native.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["afterEach","beforeEach","describe","expect","it","vi","_type_of","obj","Symbol","constructor","routeHmr","realWindow","globalThis","window","realModuleUpdatedHook","__VXRN_ON_MODULE_UPDATED__","stubEnv","resetModules","unstubAllEnvs","toBe","before","getRouteHmrEpoch","listener","fn","unsubscribe","subscribeRouteHmr","toHaveBeenCalledTimes","clearFile","__oneRouteCache","toHaveBeenCalledWith","not","toThrow","Error"],"sources":["../../../src/router/routeHmr.native.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,EAAWC,UAAA,EAAYC,QAAA,EAAUC,MAAA,EAAQC,EAAA,EAAIC,EAAA,QAAU;AAIhE,SAASC,SAAAC,GAAA;EACP,uBAAI;;EACJ,OAAMA,GAAA,WAAcC,MAAA,KAAmB,eAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AACvC;AAEAL,QAAA,kBAAuB;EAGrB,IAAAQ,QAAG;EACH,IAAAC,UAAG,GAAAC,UAAa,CAAAC,MAAA;EAChB,IAAAC,qBAAiB,GAAOF,UAAA,CAAAG,0BAAmB;EAC7Cd,UAAC;IAEDI,EAAA,CAAAW,OAAU,WAAM;IACdX,EAAA,CAAGY,YAAA,EAAc;IACjBP,QAAA,GAAW,0CAA6B;EACvC,EAAC;EACJV,SAAC;IAEDK,EAAG,CAAAa,aAAA;IACDN,UAAO,CAAAG,0BAAkB,GAAAD,qBAAiC;IAC3DF,UAAA,CAAAC,MAAA,GAAAF,UAAA;EAED;EACEP,EAAA,iEAAyC;IACzCD,MAAM,CAAAG,QAAA,CAAAM,UAAiB,CAAAG,0BAAA,GAAAI,IAAA;EACvB;EAEAf,EAAA,wEAAsD;IACtD,IAAAgB,MAAO,GAAAV,QAAS,CAAAW,gBAAoB;IACpC,IAAAC,QAAO,GAAQjB,EAAE,CAAAkB,EAAA;IAEjB,IAAAC,WAAY,GAAAd,QAAA,CAAAe,iBAAA,CAAAH,QAAA;IACZV,UAAA,CAAWG,0BAAA,CAA4B,eAAe;IACtDZ,MAAA,CAAOO,QAAQ,CAAAW,gBAAE,IAAAF,IAAuB,CAAAC,MAAA;IACzCjB,MAAA,CAAAmB,QAAA,EAAAI,qBAAA;IAEDF,WAAG;IACDZ,UAAM,CAAAG,0BAAkB;IACtBZ,MAAA,CAAAmB,QAAmB,EAAAI,qBAAW,CAAiB,EAAE;EACnD;EACAtB,EAAA,qFAAwD;IACzD,IAAAuB,SAAA,GAAAtB,EAAA,CAAAkB,EAAA;IAEDX,UAAG,CAAAC,MAAA;MACDe,eAAA;QAAED;MACF;IACD;IAEDf,UAAG,CAAAG,0BAAA;IACDZ,MAAM,CAAAwB,SAAA,CAAW,CAAAE,oBAAM;EACvB;EACCzB,EAAC,qDAA4B;IAAA;IACXQ,UACf,CAAAC,MAAY;IACVV,MAAA,aAAU;MAA6B,OACzCS,UAAA,CAAAG,0BAAA;IAAA,EACF,CAAAe,GAAA,CAAAC,OAAA;EAAA,EACF;EAEA3B,EAAA,8DAAoD,cAAkB;IAAA,IACpEkB,QAAA,GAAAjB,EAAA,CAAAkB,EAAA;IACF,IAAAC,WAAA,GAAAd,QAAA,CAAAe,iBAAA,CAAAH,QAAA;IACAV,UAAO,CAAAC,MAAU;MACjBe,eAAY;QACbD,UAAA;UACF,UAAAK,KAAA","ignoreList":[]}
+{"version":3,"names":["afterEach","beforeEach","describe","expect","it","vi","_type_of","obj","Symbol","constructor","routeHmr","realWindow","globalThis","window","realModuleUpdatedHook","__VXRN_ON_MODULE_UPDATED__","stubEnv","resetModules","unstubAllEnvs","toBe","before","getRouteHmrEpoch","listener","fn","unsubscribe","subscribeRouteHmr","not","toHaveBeenCalled","clearFile","__oneRouteCache","toHaveBeenCalledWith","toThrow"],"sources":["../../../src/router/routeHmr.native.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,EAAWC,UAAA,EAAYC,QAAA,EAAUC,MAAA,EAAQC,EAAA,EAAIC,EAAA,QAAU;AAIhE,SAASC,SAAAC,GAAA;EACP,uBAAI;;EACJ,OAAMA,GAAA,WAAcC,MAAA,KAAmB,eAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AACvC;AAEAL,QAAA,kBAAuB;EAGrB,IAAAQ,QAAG;EACH,IAAAC,UAAG,GAAAC,UAAa,CAAAC,MAAA;EAChB,IAAAC,qBAAiB,GAAOF,UAAA,CAAAG,0BAAmB;EAC7Cd,UAAC;IAEDI,EAAA,CAAAW,OAAU,WAAM;IACdX,EAAA,CAAGY,YAAA,EAAc;IACjBP,QAAA,GAAW,0CAA6B;EACvC,EAAC;EACJV,SAAC;IAEDK,EAAG,CAAAa,aAAA;IACDN,UAAO,CAAAG,0BAAkB,GAAAD,qBAAiC;IAC3DF,UAAA,CAAAC,MAAA,GAAAF,UAAA;EAED;EACEP,EAAA,iEAAyC;IACzCD,MAAM,CAAAG,QAAA,CAAAM,UAAiB,CAAAG,0BAAA,GAAAI,IAAA;EACvB;EAEAf,EAAA,sEAAsD;IACtD,IAAAgB,MAAO,GAAAV,QAAS,CAAAW,gBAAoB;IACpC,IAAAC,QAAO,GAAQjB,EAAE,CAAAkB,EAAA,CAAI;IAErB,IAAAC,WAAY,GAAAd,QAAA,CAAAe,iBAAA,CAAAH,QAAA;IACbV,UAAA,CAAAG,0BAAA;IAEDZ,MAAG,CAAAO,QAAA,CAAAW,gBAAA,IAAAF,IAAA,CAAAC,MAAA;IACDjB,MAAM,CAAAmB,QAAA,EAAAI,GAAY,CAAGC,gBAAa;IAChCH,WAAmB;EACrB;EACApB,EAAA,qFAAwD;IACzD,IAAAwB,SAAA,GAAAvB,EAAA,CAAAkB,EAAA;MAEE;IACD;IACAX,UAAM,CAAAC,MAAW,GAAG;MACpBgB,eAAM;QACJD;MACA;IACF;IAEAhB,UAAA,CAAWG,0BAAA,CAA4B;IACvCZ,MAAA,CAAOyB,SAAS,EAAAE,oBAAoB,kBAAW;EAC/C;EACA1B,EAAA,wDAAY;IACb,IAAAgB,MAAA,GAAAV,QAAA,CAAAW,gBAAA;IAED,IAAGC,QAAA,GAAAjB,EAAA,CAAAkB,EAAA;IACD,IAAAC,WAAA,GAAAd,QAAA,CAAAe,iBAAA,CAAAH,QAAA;IAAEV,UAAA,CAAmBC,MAAA,GAAS;MAC9BgB,eAAa;QACdD,SAAA,WAAAA,CAAA;UAEE;QACD;MACA;IACA;IACEhB,UAAA,CAAmBG,0BAAS;IAAAZ,MAC5B,CAAAO,QAAA,CAAAW,gBAAiB,IAAAF,IAAA,CAAAC,MAAA;IAAAjB,MACf,CAAAmB,QAAA,CAAY,CAAAI,GAAA,CAAAC,gBAAA;IACVH,WAAA,CAAM;EAAiC;EACzCpB,EAAA,qDACF;IACF;IAEAQ,UAAO,CAAAC,MAAM,QAAW;IACxBV,MAAA,CAAO,YAAS;MAChB,OAAOS,UAAU,CAAAG,0BAAqB;IACtC,GAAAW,GAAA,CAAAK,OAAY;EACd,CAAC;EACF3B,EAAA","ignoreList":[]}

package/dist/esm/router/router.mjs

@@ -739,24 +739,22 @@ async function linkTo(href, event, options) {
   }
   const currentRootState = navigationRef.getRootState();
   const hash = href.indexOf("#");
-  if (currentRootState.key && hash > 0) hashes[currentRootState.key] = href.slice(hash);
+  if (currentRootState?.key && hash > 0) hashes[currentRootState.key] = href.slice(hash);
   nextOptions = options ?? null;
   pendingNavigationPathname = stripTrailingSlash(extractPathnameFromHref(href));
   pendingNavigationAction = event === "PUSH" || event === "REPLACE" || event === "NAVIGATE" ? event : void 0;
   lastIntendedPathname = pendingNavigationPathname;
   const freshRootState = navigationRef.getRootState();
   const currentRouteBeforeDispatch = navigationRef.getCurrentRoute();
-  if (event === "REPLACE") {
-    const targetPathname = pendingNavigationPathname;
-    const optimisticState = nextOptions ? {
-      ...state,
-      linkOptions: nextOptions
-    } : state;
-    updateState(optimisticState);
-    pendingNavigationPathname = targetPathname;
-    notifyRootStateSubscribers(optimisticState);
-    navigationRef.resetRoot(state);
-  } else {
+  const targetPathname = pendingNavigationPathname;
+  const optimisticState = nextOptions ? {
+    ...state,
+    linkOptions: nextOptions
+  } : state;
+  updateState(optimisticState);
+  pendingNavigationPathname = targetPathname;
+  notifyRootStateSubscribers(optimisticState);
+  if (event === "REPLACE") navigationRef.resetRoot(state);else {
     const action = getNavigateAction(state, freshRootState, event);
     const targetName = action.payload?.name;
     const isGroupTarget = typeof targetName === "string" && targetName.startsWith("(") && targetName.endsWith(")");
@@ -765,7 +763,7 @@ async function linkTo(href, event, options) {
     const currentFocusedRoute = freshRootState.routes[freshRootState.index];
     const currentFocusedName = currentFocusedRoute?.name;
     if (isRootTarget && isGroupTarget && hasFreshRootState) {
-      const targetRoute = state.routes[state.routes.length - 1];
+      const targetRoute = state.routes[state.index ?? state.routes.length - 1];
       const targetRootName = targetRoute.name;
       if (currentFocusedName === targetRootName) {
         const routes = [...freshRootState.routes];