one 1.26.0 → 1.26.1

package/dist/cjs/router/getNormalizedStatePath.cjs

@@ -26,11 +26,12 @@ __export(getNormalizedStatePath_exports, {
 });
 module.exports = __toCommonJS(getNormalizedStatePath_exports);
 var import_getStateFromPath_mods = require("../fork/getStateFromPath-mods.cjs");
+var import_path = require("./path.cjs");
 function getNormalizedStatePath({
   path: statePath,
   params
 }, baseUrl) {
-  const [pathname] = statePath.split("?");
+  const pathname = (0, import_path.stripPathSuffix)(statePath);
   return {
     // Strip empty path at the start
     segments: (0, import_getStateFromPath_mods.stripBaseUrl)(pathname, baseUrl).split("/").filter(Boolean).map(decodeURIComponent),

package/dist/cjs/router/getNormalizedStatePath.native.js

@@ -28,12 +28,13 @@ __export(getNormalizedStatePath_exports, {
 });
 module.exports = __toCommonJS(getNormalizedStatePath_exports);
 var import_getStateFromPath_mods = require("../fork/getStateFromPath-mods.native.js");
+var import_path = require("./path.native.js");
 function getNormalizedStatePath(param, baseUrl) {
   var {
     path: statePath,
     params
   } = param;
-  var [pathname] = statePath.split("?");
+  var pathname = (0, import_path.stripPathSuffix)(statePath);
   return {
     // Strip empty path at the start
     segments: (0, import_getStateFromPath_mods.stripBaseUrl)(pathname, baseUrl).split("/").filter(Boolean).map(decodeURIComponent),

package/dist/cjs/router/getNormalizedStatePath.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getNormalizedStatePath_exports","__export","getNormalizedStatePath","module","exports","import_getStateFromPath_mods","require","param","baseUrl","path","statePath","params","pathname","split","segments","stripBaseUrl","filter","Boolean","map","decodeURIComponent","Object","entries","reduce","prev","param2","key","Array","isArray","v","unused"],"sources":["../../../src/router/getNormalizedStatePath.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,8BAAA;AAAAC,QAAA,CAAAD,8BAAA;EAAAE,sBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAA,CAAAK,8BAA6B;AAatB,IAAAK,4BACL,GAAAC,OAAA;AAAA,SACQJ,uBAAAK,KAAA,EAAAC,OAAA;EACN;IAAAC,IAAA,EAAAC,SAAA;IAAAC;EAAA,IAAAJ,KAAA;EACF,IAIA,CAAAK,QACwC,IAAAF,SAAA,CAAAG,KAAA;EACxC,OAAO;IACP;IAAOC,QAAA,MAAAT,4BAAA,CAAAU,YAAA,EAAAH,QAAA,EAAAJ,OAAA,EAAAK,KAAA,MAAAG,MAAA,CAAAC,OAAA,EAAAC,GAAA,CAAAC,kBAAA;IAEL;IAGyB;IAAAR,MAAA,EAAAS,MAAA,CAAAC,OAAA,CAAAV,MAAA,EAAAW,MAAA,WAAAC,IAAA,EAAAC,MAAA;MAGzB,KAAAC,GAAQ,EAAA1B,KAAO,IAAAyB,MAAQ;MACrB,IAAIE,KAAA,CAAMC,OAAA,CAAQ5B,KAAK,GAAG;QACxBwB,IAAA,CAAKE,GAAG,IAAI1B,KAAA,CAAMmB,GAAA,CAAI,UAAeU,CAAA;UACnC,IAAI;YACF,OAAOT,kBAAA,CAAmBS,CAAC;UAC7B,SAAQC,MAAA;YACN,OAAOD,CAAA;UACT;QACF,CAAC;MACH,OAAO;QACL,IAAI;UACFL,IAAA,CAAKE,GAAG,IAAIN,kBAAA,CAAmBpB,KAAe;QAChD,SAAQ8B,MAAA;UACNN,IAAA,CAAKE,GAAG,IAAI1B,KAAA;QACd;MACF;MACA,OAAOwB,IAAA;IACT,GAAG,CAAC,CAAiB;EACvB;AACF","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getNormalizedStatePath_exports","__export","getNormalizedStatePath","module","exports","import_getStateFromPath_mods","require","import_path","param","baseUrl","path","statePath","params","pathname","stripPathSuffix","segments","stripBaseUrl","split","filter","Boolean","map","decodeURIComponent","Object","entries","reduce","prev","param2","key","Array","isArray","v","unused"],"sources":["../../../src/router/getNormalizedStatePath.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,8BAAA;AAAAC,QAAA,CAAAD,8BAAA;EAAAE,sBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAA,CAAAK,8BAA6B;AAC7B,IAAAK,4BAAgC,GAAAC,OAAA;AAazB,IAAAC,WAAS,GAAAD,OAAA,mBACd;AAAA,SACQJ,uBAAAM,KAAA,EAAAC,OAAA;EACN;IAAAC,IAAA,EAAAC,SAAA;IAAAC;EAAA,IAAAJ,KAAA;EACF,IAIAK,QACwC,OAAAN,WAAA,CAAAO,eAAA,EAAAH,SAAA;EACxC,OAAM;IACN;IAAOI,QAAA,MAAAV,4BAAA,CAAAW,YAAA,EAAAH,QAAA,EAAAJ,OAAA,EAAAQ,KAAA,MAAAC,MAAA,CAAAC,OAAA,EAAAC,GAAA,CAAAC,kBAAA;IAEL;IAGyB;IAAAT,MAAA,EAAAU,MAAA,CAAAC,OAAA,CAAAX,MAAA,EAAAY,MAAA,WAAAC,IAAA,EAAAC,MAAA;MAGzB,KAAAC,GAAQ,EAAA5B,KAAO,IAAA2B,MAAQ;MACrB,IAAIE,KAAA,CAAMC,OAAA,CAAQ9B,KAAK,GAAG;QACxB0B,IAAA,CAAKE,GAAG,IAAI5B,KAAA,CAAMqB,GAAA,CAAI,UAAeU,CAAA;UACnC,IAAI;YACF,OAAOT,kBAAA,CAAmBS,CAAC;UAC7B,SAAQC,MAAA;YACN,OAAOD,CAAA;UACT;QACF,CAAC;MACH,OAAO;QACL,IAAI;UACFL,IAAA,CAAKE,GAAG,IAAIN,kBAAA,CAAmBtB,KAAe;QAChD,SAAQgC,MAAA;UACNN,IAAA,CAAKE,GAAG,IAAI5B,KAAA;QACd;MACF;MACA,OAAO0B,IAAA;IACT,GAAG,CAAC,CAAiB;EACvB;AACF","ignoreList":[]}

package/dist/cjs/router/getRouteInfo.cjs

@@ -22,7 +22,8 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var getRouteInfo_exports = {};
 __export(getRouteInfo_exports, {
-  getRouteInfo: () => getRouteInfo
+  getRouteInfo: () => getRouteInfo,
+  getRouteInfoFromState: () => getRouteInfoFromState
 });
 module.exports = __toCommonJS(getRouteInfo_exports);
 var import_getPathFromState = require("../fork/getPathFromState.cjs");
@@ -30,6 +31,7 @@ var import_getStateFromPath_mods = require("../fork/getStateFromPath-mods.cjs");
 var import_getNormalizedStatePath = require("./getNormalizedStatePath.cjs");
 var import_isIndexPath = require("./isIndexPath.cjs");
 var import_linkingConfig = require("./linkingConfig.cjs");
+var import_path = require("./path.cjs");
 function getRouteInfo(state) {
   return getRouteInfoFromState((state2, asPath) => {
     return (0, import_getPathFromState.getPathDataFromState)(state2, {
@@ -47,7 +49,9 @@ function getRouteInfoFromState(getPathFromState, state, baseUrl) {
   const qualified = getPathFromState(state, true);
   return {
     unstable_globalHref: path,
-    pathname: (0, import_getStateFromPath_mods.stripBaseUrl)(path, baseUrl).split("?")[0],
+    // a hash href serializes as /page#section; the pathname the router compares
+    // against pending navigation and the URL must drop the hash as well as the query
+    pathname: (0, import_path.stripPathSuffix)((0, import_getStateFromPath_mods.stripBaseUrl)(path, baseUrl)),
     isIndex: (0, import_isIndexPath.isIndexPath)(state),
     ...(0, import_getNormalizedStatePath.getNormalizedStatePath)(qualified, baseUrl)
   };

package/dist/cjs/router/getRouteInfo.native.js

@@ -24,7 +24,8 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 }), mod);
 var getRouteInfo_exports = {};
 __export(getRouteInfo_exports, {
-  getRouteInfo: () => getRouteInfo
+  getRouteInfo: () => getRouteInfo,
+  getRouteInfoFromState: () => getRouteInfoFromState
 });
 module.exports = __toCommonJS(getRouteInfo_exports);
 var import_getPathFromState = require("../fork/getPathFromState.native.js");
@@ -32,6 +33,7 @@ var import_getStateFromPath_mods = require("../fork/getStateFromPath-mods.native
 var import_getNormalizedStatePath = require("./getNormalizedStatePath.native.js");
 var import_isIndexPath = require("./isIndexPath.native.js");
 var import_linkingConfig = require("./linkingConfig.native.js");
+var import_path = require("./path.native.js");
 function getRouteInfo(state) {
   return getRouteInfoFromState(function (state2, asPath) {
     var _getResolvedLinking;
@@ -50,7 +52,9 @@ function getRouteInfoFromState(getPathFromState, state, baseUrl) {
   var qualified = getPathFromState(state, true);
   return {
     unstable_globalHref: path,
-    pathname: (0, import_getStateFromPath_mods.stripBaseUrl)(path, baseUrl).split("?")[0],
+    // a hash href serializes as /page#section; the pathname the router compares
+    // against pending navigation and the URL must drop the hash as well as the query
+    pathname: (0, import_path.stripPathSuffix)((0, import_getStateFromPath_mods.stripBaseUrl)(path, baseUrl)),
     isIndex: (0, import_isIndexPath.isIndexPath)(state),
     ...(0, import_getNormalizedStatePath.getNormalizedStatePath)(qualified, baseUrl)
   };

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getRouteInfo_exports","__export","getRouteInfo","module","exports","import_getPathFromState","require","import_getStateFromPath_mods","import_getNormalizedStatePath","import_isIndexPath","import_linkingConfig","state","getRouteInfoFromState","state2","asPath","_getResolvedLinking","getPathDataFromState","screens","getResolvedLinking","config","preserveDynamicRoutes","preserveGroups","getPathFromState","baseUrl","path","qualified","unstable_globalHref","pathname","stripBaseUrl","split","isIndex","isIndexPath","getNormalizedStatePath"],"sources":["../../../src/router/getRouteInfo.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,oBAAA;AAAAC,QAAA,CAAAD,oBAAA;EAAAE,YAAA,EAAAA,CAAA,KAAAA;AAAA;AACAC,MAAA,CAAAC,OAAA,GAAAT,YAAA,CAAiDK,oBAAA;AACjD,IAAAK,uBAAA,GAAAC,OAA6B;AAE7B,IAAAC,4BAAA,GAAAD,OAAuD;AACvD,IAAAE,6BAA4B,GAAAF,OAAA;AAC5B,IAAAG,kBAAA,GAAAH,OAAmC;AAE5B,IAAAI,oBAAsB,GAAAJ,OAA8B;AACzD,SAAOJ,aAAAS,KAAA;EAAA,OACJC,qBAA2E,WAAAC,MAAA,EAAAC,MAAA;IAC1E,IAAAC,mBAAO;IAA4B,OACjC,IAAAV,uBAAU,CAAAW,oBAAA,EAAAH,MAAA;MAAAI,OACV,EAAG;MAAsB,IACzB,CAAAF,mBAAA,GAAuB,IAAAL,oBAAA,CAAAQ,kBAAA,iBAAAH,mBAAA,uBAAAA,mBAAA,CAAAI,MAAA;MAAAC,qBACP,EAAAN,MAAA;MAClBO,cAAC,EAAAP;IACH;EAAA,GACAH,KAAA;AAAA;AAEJ,SAAAC,sBAAAU,gBAAA,EAAAX,KAAA,EAAAY,OAAA;EAEA;IAAAC;EAAS,IAAAF,gBACP,CAAAX,KAAA;EAIA,IAAAc,SAAa,GAAAH,gBAAI,CAAAX,KAAiB,MAAO;EACzC,OAAM;IAENe,mBAAO,EAAAF,IAAA;IACLG,QAAA,MAAApB,4BAAqB,CAAAqB,YAAA,EAAAJ,IAAA,EAAAD,OAAA,EAAAM,KAAA;IACrBC,OAAA,MAAArB,kBAAU,CAAAsB,WAAA,EAAApB,KAAA;IACV,OAAAH,6BAAS,CAAAwB,sBAAiB,EAAAP,SAAA,EAAAF,OAAA;EAAA;AACkB","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getRouteInfo_exports","__export","getRouteInfo","getRouteInfoFromState","module","exports","import_getPathFromState","require","import_getStateFromPath_mods","import_getNormalizedStatePath","import_isIndexPath","import_linkingConfig","import_path","state","state2","asPath","_getResolvedLinking","getPathDataFromState","screens","getResolvedLinking","config","preserveDynamicRoutes","preserveGroups","getPathFromState","baseUrl","path","qualified","unstable_globalHref","pathname","stripPathSuffix","stripBaseUrl","isIndex","isIndexPath","getNormalizedStatePath"],"sources":["../../../src/router/getRouteInfo.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,oBAAA;AAAAC,QAAA,CAAAD,oBAAA;EAAAE,YAAA,EAAAA,CAAA,KAAAA,YAAA;EAAAC,qBAAA,EAAAA,CAAA,KAAAA;AAAA;AACAC,MAAA,CAAAC,OAAA,GAAAV,YAAA,CAAiDK,oBAAA;AACjD,IAAAM,uBAAA,GAAAC,OAA6B;AAE7B,IAAAC,4BAAA,GAAAD,OAAuD;AACvD,IAAAE,6BAA4B,GAAAF,OAAA;AAC5B,IAAAG,kBAAA,GAAAH,OAAmC;AACnC,IAAAI,oBAAgC,GAAAJ,OAAA;AAEzB,IAAAK,WAAS,GAAAL,OAAa,mBAA8B;AACzD,SAAOL,aAAAW,KAAA;EAAA,OACJV,qBAA2E,WAAAW,MAAA,EAAAC,MAAA;IAC1E,IAAAC,mBAAO;IAA4B,OACjC,IAAAV,uBAAU,CAAAW,oBAAA,EAAAH,MAAA;MAAAI,OACV,EAAG;MAAsB,IACzB,CAAAF,mBAAA,GAAuB,IAAAL,oBAAA,CAAAQ,kBAAA,iBAAAH,mBAAA,uBAAAA,mBAAA,CAAAI,MAAA;MAAAC,qBACP,EAAAN,MAAA;MAClBO,cAAC,EAAAP;IACH;EAAA,GACAF,KAAA;AAAA;AAEJ,SAAAV,sBAAAoB,gBAAA,EAAAV,KAAA,EAAAW,OAAA;EAEO;IAAAC;EAAS,IAAAF,gBACd,CAAAV,KAAA;EAIA,IAAAa,SAAa,GAAAH,gBAAI,CAAAV,KAAiB,MAAO;EACzC,OAAM;IAENc,mBAAO,EAAAF,IAAA;IACL;IAAqB;IAAAG,QAAA,MAAAhB,WAAA,CAAAiB,eAAA,MAAArB,4BAAA,CAAAsB,YAAA,EAAAL,IAAA,EAAAD,OAAA;IAGrBO,OAAA,MAAArB,kBAAU,CAAAsB,WAAA,EAAAnB,KAAgB;IAC1B,OAAAJ,6BAAS,CAAAwB,sBAAiB,EAAAP,SAAA,EAAAF,OAAA;EAAA;AACkB","ignoreList":[]}

package/dist/cjs/router/getRouteInfo.test.cjs

@@ -0,0 +1,35 @@
+var import_vitest = require("vitest");
+var import_getRouteInfo = require("./getRouteInfo.cjs");
+(0, import_vitest.describe)("getRouteInfoFromState", () => {
+  const state = {
+    routes: [{
+      name: "dev",
+      path: "/dev#stack",
+      params: {
+        "#": "stack"
+      }
+    }]
+  };
+  (0, import_vitest.it)("drops the hash from pathname and segments", () => {
+    const info = (0, import_getRouteInfo.getRouteInfoFromState)((_state, asPath) => ({
+      path: asPath ? "/(site)/dev#stack" : "/dev#stack",
+      params: {
+        "#": "stack"
+      }
+    }), state);
+    (0, import_vitest.expect)(info.pathname).toBe("/dev");
+    (0, import_vitest.expect)(info.segments).toEqual(["(site)", "dev"]);
+    (0, import_vitest.expect)(info.unstable_globalHref).toBe("/dev#stack");
+  });
+  (0, import_vitest.it)("drops the query and the hash together", () => {
+    const info = (0, import_getRouteInfo.getRouteInfoFromState)(() => ({
+      path: "/dev?x=1#stack",
+      params: {
+        x: "1",
+        "#": "stack"
+      }
+    }), state);
+    (0, import_vitest.expect)(info.pathname).toBe("/dev");
+    (0, import_vitest.expect)(info.segments).toEqual(["dev"]);
+  });
+});

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

@@ -0,0 +1,42 @@
+"use strict";
+
+var import_vitest = require("vitest");
+var import_getRouteInfo = require("./getRouteInfo.native.js");
+(0, import_vitest.describe)("getRouteInfoFromState", function () {
+  var state = {
+    routes: [{
+      name: "dev",
+      path: "/dev#stack",
+      params: {
+        "#": "stack"
+      }
+    }]
+  };
+  (0, import_vitest.it)("drops the hash from pathname and segments", function () {
+    var info = (0, import_getRouteInfo.getRouteInfoFromState)(function (_state, asPath) {
+      return {
+        path: asPath ? "/(site)/dev#stack" : "/dev#stack",
+        params: {
+          "#": "stack"
+        }
+      };
+    }, state);
+    (0, import_vitest.expect)(info.pathname).toBe("/dev");
+    (0, import_vitest.expect)(info.segments).toEqual(["(site)", "dev"]);
+    (0, import_vitest.expect)(info.unstable_globalHref).toBe("/dev#stack");
+  });
+  (0, import_vitest.it)("drops the query and the hash together", function () {
+    var info = (0, import_getRouteInfo.getRouteInfoFromState)(function () {
+      return {
+        path: "/dev?x=1#stack",
+        params: {
+          x: "1",
+          "#": "stack"
+        }
+      };
+    }, state);
+    (0, import_vitest.expect)(info.pathname).toBe("/dev");
+    (0, import_vitest.expect)(info.segments).toEqual(["dev"]);
+  });
+});
+//# sourceMappingURL=getRouteInfo.test.native.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["import_vitest","require","import_getRouteInfo","describe","state","routes","name","path","params","it","info","getRouteInfoFromState","_state","asPath","expect","pathname","toBe","segments","toEqual"],"sources":["../../../src/router/getRouteInfo.test.ts"],"sourcesContent":[null],"mappings":"AAAA;;AACA,IAAAA,aAAA,GAAAC,OAAsC;AAAA,IAKtCC,mBAAA,GAAAD,OAAS;AACP,IAAAD,aAAc,CAAAG,QAAA;EAAA,IACZC,KAAA,GAAS;IACXC,MAAA,GAEA;MACEC,IAAM;MACHC,IAAA,cAAQ;MACPC,MAAM;QACN;MACF;IACA;EAEF;EACA,IAAAR,aAAA,CAAAS,EAAA,6CAAyC,EAAK,YAAC;IAC/C,IAAAC,IAAA,OAAAR,mBAAY,CAAAS,qBAAqB,EAAK,UAAAC,MAAY,EAAAC,MAAA;MACnD;QAEDN,IAAA,EAAAM,MAAA,sBAAG;QACDL,MAAM;UACJ,GAAO,EAAE;QACT;MACF;IACA,GAAAJ,KAAA;IACA,IAAAJ,aAAA,CAAAc,MAAA,EAAOJ,IAAA,CAAKK,QAAQ,EAAEC,IAAA,OAAS;IAChC,IAAAhB,aAAA,CAAAc,MAAA,EAAAJ,IAAA,CAAAO,QAAA,EAAAC,OAAA,EACF,U","ignoreList":[]}

package/dist/cjs/router/path.cjs

@@ -28,6 +28,7 @@ __export(path_exports, {
   getSafeWindowPathname: () => getSafeWindowPathname,
   hasLostDynamicSegment: () => hasLostDynamicSegment,
   normalizeRoutePathname: () => normalizeRoutePathname,
+  stripPathSuffix: () => stripPathSuffix,
   stripTrailingSlash: () => stripTrailingSlash
 });
 module.exports = __toCommonJS(path_exports);

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

@@ -30,6 +30,7 @@ __export(path_exports, {
   getSafeWindowPathname: () => getSafeWindowPathname,
   hasLostDynamicSegment: () => hasLostDynamicSegment,
   normalizeRoutePathname: () => normalizeRoutePathname,
+  stripPathSuffix: () => stripPathSuffix,
   stripTrailingSlash: () => stripTrailingSlash
 });
 module.exports = __toCommonJS(path_exports);

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","path_exports","__export","getPathWithRecoveredDynamicSegment","getPathnameWithRecoveredDynamicSegment","getSafeWindowPath","getSafeWindowPathname","hasLostDynamicSegment","normalizeRoutePathname","stripTrailingSlash","module","exports","import_getStateFromPath_mods","require","stripPathSuffix","path","queryIndex","indexOf","hashIndex","end","length","Math","min","slice","pathname","endsWith","stripBaseUrl","split","includes","window","location","search","paths","fallbackPath","arguments","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","err"],"sources":["../../../src/router/path.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,YAAA;AAAAC,QAAA,CAAAD,YAAA;EAAAE,kCAAA,EAAAA,CAAA,KAAAA,kCAAA;EAAAC,sCAAA,EAAAA,CAAA,KAAAA,sCAAA;EAAAC,iBAAA,EAAAA,CAAA,KAAAA,iBAAA;EAAAC,qBAAA,EAAAA,CAAA,KAAAA,qBAAA;EAAAC,qBAAA,EAAAA,CAAA,KAAAA,qBAAA;EAAAC,sBAAA,EAAAA,CAAA,KAAAA,sBAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAf,YAAA,CAAAK,YAA6B;AAE7B,IAAAW,4BAA+C,GAAAC,OAAA;AAC7C,SAAMC,eAAaA,CAAAC,IAAK;EACxB,IAAAC,UAAM,GAAAD,IAAY,CAAAE,OAAK,IAAQ,CAAG;EAClC,IAAIC,SAAM,GAAKH,IAAA,CAAAE,OAAA;EAEf,IAAIE,GAAA,GAAAJ,IAAA,CAAAK,MAAiB;EACrB,IAAIJ,UAAA,IAAa,CAAG,EAAAG,GAAA,GAAME,IAAK,CAAAC,GAAI,CAAAH,GAAA,EAAKH,UAAS;EAEjD,IAAAE,SAAY,KAAM,EAAAC,GAAG,GAAGE,IAAA,CAAAC,GAAA,CAAAH,GAAA,EAAAD,SAAA;EAC1B,OAAAH,IAAA,CAAAQ,KAAA,IAAAJ,GAAA;AAEO;AACL,SAAOV,kBAAkBA,CAAAe,QAAK;EAChC,OAAAA,QAAA,CAAAJ,MAAA,QAAAI,QAAA,CAAAC,QAAA,QAAAD,QAAA,CAAAD,KAAA,UAAAC,QAAA;AAEO;AACL,SAAOhB,uBAAmBgB,QAAA;EAC5B,OAAAf,kBAAA,KAAAG,4BAAA,CAAAc,YAAA,EAAAZ,eAAA,CAAAU,QAAA;AAGO;AACL,SAAOjB,qBAAoBA,CAAEQ,IAAA,EAAM;EACrC,OAAAD,eAAA,CAAAC,IAAA,EAAAY,KAAA,MAAAC,QAAA;AAKO;AACL,SACEtB,qBAAkBA,CAAA;EAIlB,WAAOuB,MAAA,qBAAAA,MAAA,CAAAC,QAAA,WAAAD,MAAA,CAAAC,QAAA,CAAAN,QAAA;IACT;EACA;EACF,OAAAK,MAAA,CAAAC,QAAA,CAAAN,QAAA;AAEO;AACL,SAAMnB,iBAAWA,CAAA;EACjB,IAAImB,QAAA,GAAAlB,qBAA+B;EACnC,IAAAkB,QAAO,UAAY,UAAO,KAAS;EACrC,OAAAA,QAAA,IAAAK,MAAA,CAAAC,QAAA,CAAAC,MAAA;AAEO;AAML,SAAA5B,kCAA0BA,CAAA6B,KAAA;EACxB,IAAAC,YAAa,GAAAC,SAAc,CAAAd,MAAA,QAAAc,SAA0B,GAAG,cAAAA,SAAA,MAAA7B,iBAAA;EACtD,IAAA8B,yBAAO;IAAAC,iBAAA;IAAAC,cAAA;EAAA,IACT;IACF,SAAAC,SAAA,GAAAN,KAAA,CAAAO,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;MAEA,IAAOpB,IAAA,GAAA0B,KAAA,CAAAzC,KAAA;MACT,IAAAe,IAAA,gBAAAR,qBAAA,CAAAQ,IAAA;QAEO,OAASA,IAAA;MAId;IACE;EACF,SAAA6B,GAAA;IACFR,iBAAA","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","path_exports","__export","getPathWithRecoveredDynamicSegment","getPathnameWithRecoveredDynamicSegment","getSafeWindowPath","getSafeWindowPathname","hasLostDynamicSegment","normalizeRoutePathname","stripPathSuffix","stripTrailingSlash","module","exports","import_getStateFromPath_mods","require","path","queryIndex","indexOf","hashIndex","end","length","Math","min","slice","pathname","endsWith","stripBaseUrl","split","includes","window","location","search","paths","fallbackPath","arguments","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","err"],"sources":["../../../src/router/path.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,YAAA;AAAAC,QAAA,CAAAD,YAAA;EAAAE,kCAAA,EAAAA,CAAA,KAAAA,kCAAA;EAAAC,sCAAA,EAAAA,CAAA,KAAAA,sCAAA;EAAAC,iBAAA,EAAAA,CAAA,KAAAA,iBAAA;EAAAC,qBAAA,EAAAA,CAAA,KAAAA,qBAAA;EAAAC,qBAAA,EAAAA,CAAA,KAAAA,qBAAA;EAAAC,sBAAA,EAAAA,CAAA,KAAAA,sBAAA;EAAAC,eAAA,EAAAA,CAAA,KAAAA,eAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAhB,YAAA,CAAAK,YAA6B;AAEtB,IAAAY,4BAA+C,GAAAC,OAAA;AACpD,SAAML,eAAaA,CAAAM,IAAK;EACxB,IAAAC,UAAM,GAAAD,IAAY,CAAAE,OAAK,IAAQ,CAAG;EAClC,IAAIC,SAAM,GAAKH,IAAA,CAAAE,OAAA;EAEf,IAAIE,GAAA,GAAAJ,IAAA,CAAAK,MAAiB;EACrB,IAAIJ,UAAA,IAAa,CAAG,EAAAG,GAAA,GAAME,IAAK,CAAAC,GAAI,CAAAH,GAAA,EAAKH,UAAS;EAEjD,IAAAE,SAAY,KAAM,EAAAC,GAAG,GAAGE,IAAA,CAAAC,GAAA,CAAAH,GAAA,EAAAD,SAAA;EAC1B,OAAAH,IAAA,CAAAQ,KAAA,IAAAJ,GAAA;AAEO;AACL,SAAOT,kBAAkBA,CAAAc,QAAK;EAChC,OAAAA,QAAA,CAAAJ,MAAA,QAAAI,QAAA,CAAAC,QAAA,QAAAD,QAAA,CAAAD,KAAA,UAAAC,QAAA;AAEO;AACL,SAAOhB,uBAAmBgB,QAAA;EAC5B,OAAAd,kBAAA,KAAAG,4BAAA,CAAAa,YAAA,EAAAjB,eAAA,CAAAe,QAAA;AAGO;AACL,SAAOjB,qBAAoBA,CAAEQ,IAAA,EAAM;EACrC,OAAAN,eAAA,CAAAM,IAAA,EAAAY,KAAA,MAAAC,QAAA;AAKO;AACL,SACEtB,qBAAkBA,CAAA;EAIlB,WAAOuB,MAAA,qBAAAA,MAAA,CAAAC,QAAA,WAAAD,MAAA,CAAAC,QAAA,CAAAN,QAAA;IACT;EACA;EACF,OAAAK,MAAA,CAAAC,QAAA,CAAAN,QAAA;AAEO;AACL,SAAMnB,iBAAWA,CAAA;EACjB,IAAImB,QAAA,GAAAlB,qBAA+B;EACnC,IAAAkB,QAAO,UAAY,UAAO,KAAS;EACrC,OAAAA,QAAA,IAAAK,MAAA,CAAAC,QAAA,CAAAC,MAAA;AAEO;AAML,SAAA5B,kCAA0BA,CAAA6B,KAAA;EACxB,IAAAC,YAAa,GAAAC,SAAc,CAAAd,MAAA,QAAAc,SAA0B,GAAG,cAAAA,SAAA,MAAA7B,iBAAA;EACtD,IAAA8B,yBAAO;IAAAC,iBAAA;IAAAC,cAAA;EAAA,IACT;IACF,SAAAC,SAAA,GAAAN,KAAA,CAAAO,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;MAEA,IAAOpB,IAAA,GAAA0B,KAAA,CAAAzC,KAAA;MACT,IAAAe,IAAA,gBAAAR,qBAAA,CAAAQ,IAAA;QAEO,OAASA,IAAA;MAId;IACE;EACF,SAAA6B,GAAA;IACFR,iBAAA","ignoreList":[]}

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

@@ -46,11 +46,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/cjs/router/routeHmr.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["routeHmr_native_exports","__export","getRouteHmrEpoch","subscribeRouteHmr","module","exports","__toCommonJS","routeHmrEpoch","routeHmrListeners","Set","onStoreChange","add","delete","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":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,uBAAA;AAAAC,QAAA,CAAAD,uBAAA;EAAAE,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,iBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAN,uBAAA;AAMA,IAAIO,aAAA,GAAgB;AACpB,IAAIC,iBAAA,GAAoB,mBAAIC,GAAA,CAAI;AACzB,IAAIN,iBAAA,GAAoB,SAAAA,CAASO,aAAA,EAAe;EACnDF,iBAAA,CAAkBG,GAAA,CAAID,aAAa;EACnC,OAAO,YAAW;IACdF,iBAAA,CAAkBI,MAAA,CAAOF,aAAa;EAC1C;AACJ;AACO,IAAIR,gBAAA,GAAmB,SAAAA,CAAA,EAAW;EACrC,OAAOK,aAAA;AACX;AACA,IAAIM,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;MACEX,aAAA;MACAC,iBAAA,CAAkBe,OAAA,CAAQ,UAASC,QAAA,EAAU;QACzC,OAAOA,QAAA,CAAS;MACpB,CAAC;IACL;EACJ;AACJ","ignoreList":[]}
+{"version":3,"names":["routeHmr_native_exports","__export","getRouteHmrEpoch","subscribeRouteHmr","module","exports","__toCommonJS","routeHmrEpoch","routeHmrListeners","Set","onStoreChange","add","delete","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":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,uBAAA;AAAAC,QAAA,CAAAD,uBAAA;EAAAE,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,iBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAN,uBAAA;AASA,IAAIO,aAAA,GAAgB;AACpB,IAAIC,iBAAA,GAAoB,mBAAIC,GAAA,CAAI;AACzB,IAAIN,iBAAA,GAAoB,SAAAA,CAASO,aAAA,EAAe;EACnDF,iBAAA,CAAkBG,GAAA,CAAID,aAAa;EACnC,OAAO,YAAW;IACdF,iBAAA,CAAkBI,MAAA,CAAOF,aAAa;EAC1C;AACJ;AACO,IAAIR,gBAAA,GAAmB,SAAAA,CAAA,EAAW;EACrC,OAAOK,aAAA;AACX;AACA,IAAIM,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/cjs/router/routeHmr.native.test.cjs

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

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

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

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

@@ -1 +1 @@
-{"version":3,"names":["import_vitest","require","_type_of","obj","Symbol","constructor","describe","routeHmr","realWindow","globalThis","window","realModuleUpdatedHook","__VXRN_ON_MODULE_UPDATED__","beforeEach","vi","stubEnv","resetModules","afterEach","unstubAllEnvs","it","expect","toBe","before","getRouteHmrEpoch","listener","fn","unsubscribe","subscribeRouteHmr","toHaveBeenCalledTimes","clearFile","__oneRouteCache","toHaveBeenCalledWith","not","toThrow"],"sources":["../../../src/router/routeHmr.native.test.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;gBAAA;AAAgE,IAIhEA,aAAA,GAAAC,OAAA,CAAS;AACP,SAAIC,SAAAC,GAAA;EACJ,uBAAoB;;EACpB,OAAMA,GAAA,WAAAC,MAAA,KAAwB,WAAW,IAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAEzC;AAGE,IAAAH,aAAA,CAAAM,QAAG,mBAAoB,cAAa;EACpC,IAAAC,QAAA;EACA,IAAAC,UAAW,GAAAC,UAAa,CAAAC,MAAA;EAC1B,IAACC,qBAAA,GAAAF,UAAA,CAAAG,0BAAA;EAED,IAAAZ,aAAA,CAAAa,UAAA,EAAU,kBAAM;IACdb,aAAA,CAAAc,EAAA,CAAGC,OAAA,WAAc;IACjBf,aAAW,CAAAc,EAAA,CAAAE,YAAA;IACTT,QAAA,GAAmB,YAAS;EAChC,CAAC;EAED,IAAAP,aAAA,CAAAiB,SAAG;IACDjB,aAAA,CAAAc,EAAA,CAAAI,aAAO;IACRT,UAAA,CAAAG,0BAAA,GAAAD,qBAAA;IAEDF,UAAA,CAAAC,MAAA,GAAGF,UAAA;EACD;EACA,IAAAR,aAAM,CAAAmB,EAAW,kEAAM;IACvB,IAAAnB,aAAM,CAAAoB,MAAc,EAAAlB,QAAS,CAAAO,UAAA,CAAAG,0BAA0B,GAAAS,IAAA;EAEvD;EACA,IAAArB,aAAA,CAAAmB,EAAA,yEAAmD;IACnD,IAAAG,MAAA,GAAAf,QAAA,CAAAgB,gBAAiB;IAEjB,IAAAC,QAAY,GAAAxB,aAAA,CAAAc,EAAA,CAAAW,EAAA;IACZ,IAAAC,WAAW,GAAAnB,QAAA,CAAAoB,iBAA4B,CAAAH,QAAe;IACtDf,UAAA,CAAAG,0BAAiB;IAClB,IAAAZ,aAAA,CAAAoB,MAAA,EAAAb,QAAA,CAAAgB,gBAAA,IAAAF,IAAA,CAAAC,MAAA;IAED,IAAAtB,aAAA,CAAAoB,MAAG,EAAAI,QAAA,EAAAI,qBAAA;IACDF,WAAM;IACJjB,UAAA,CAAmBG,0BAAW,gBAA+B;IAC/D,IAAAZ,aAAW,CAAAoB,MAAA,EAAAI,QAAA,EAAAI,qBAA6C;EACxD;EACF,CAAC,GAAA5B,aAAA,CAAAmB,EAAA;IAED,IAAAU,SAAA,GAAA7B,aAAG,CAAAc,EAAA,CAAAW,EAAA;IACDhB,UAAA,CAAAC,MAAA;MAAEoB,eAAmB;QACrBD;MACD;IAED;IACEpB,UAAM,CAAAG,0BAAiB;IACvB,IAAAZ,aAAM,CAAAoB,MAAc,EAAAS,SAAS,EAAAE,oBAA0B;EACtD,EAAC;EAA4B,IAC5B/B,aAAA,CAAAmB,EAAA,EAAiB;IAAA;IAEbV,UAAA,CAAAC,MAAU,QAAM;IAAuB,IACzCV,aAAA,CAAAoB,MAAA;MACF,OAAAX,UAAA,CAAAG,0BAAA;IACF,GAAAoB,GAAA,CAAAC,OAAA;EAEA;EAAsE,IACpEjC,aAAA,CAAAmB,EAAA;IACF,IAAAK,QAAA,GAAAxB,aAAA,CAAAc,EAAA,CAAAW,EAAA;IACA,IAAAC,WAAA,GAAAnB,QAAO,CAAAoB,iBAAU,CAAAH,QAAA;IACjBf,UAAA,CAAAC,MAAY;MACboB,eAAA;QACFD,UAAA","ignoreList":[]}
+{"version":3,"names":["import_vitest","require","_type_of","obj","Symbol","constructor","describe","routeHmr","realWindow","globalThis","window","realModuleUpdatedHook","__VXRN_ON_MODULE_UPDATED__","beforeEach","vi","stubEnv","resetModules","afterEach","unstubAllEnvs","it","expect","toBe","before","getRouteHmrEpoch","listener","fn","unsubscribe","subscribeRouteHmr","not","toHaveBeenCalled","clearFile","__oneRouteCache","toHaveBeenCalledWith","toThrow"],"sources":["../../../src/router/routeHmr.native.test.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;gBAAA;AAAgE,IAIhEA,aAAA,GAAAC,OAAA,CAAS;AACP,SAAIC,SAAAC,GAAA;EACJ,uBAAoB;;EACpB,OAAMA,GAAA,WAAAC,MAAA,KAAwB,WAAW,IAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAEzC;AAGE,IAAAH,aAAA,CAAAM,QAAG,mBAAoB,cAAa;EACpC,IAAAC,QAAA;EACA,IAAAC,UAAW,GAAAC,UAAa,CAAAC,MAAA;EAC1B,IAACC,qBAAA,GAAAF,UAAA,CAAAG,0BAAA;EAED,IAAAZ,aAAA,CAAAa,UAAA,EAAU,kBAAM;IACdb,aAAA,CAAAc,EAAA,CAAGC,OAAA,WAAc;IACjBf,aAAW,CAAAc,EAAA,CAAAE,YAAA;IACTT,QAAA,GAAmB,YAAS;EAChC,CAAC;EAED,IAAAP,aAAA,CAAAiB,SAAG;IACDjB,aAAA,CAAAc,EAAA,CAAAI,aAAO;IACRT,UAAA,CAAAG,0BAAA,GAAAD,qBAAA;IAEDF,UAAA,CAAAC,MAAA,GAAGF,UAAA;EACD;EACA,IAAAR,aAAM,CAAAmB,EAAW,kEAAM;IACvB,IAAAnB,aAAM,CAAAoB,MAAc,EAAAlB,QAAS,CAAAO,UAAA,CAAAG,0BAA0B,GAAAS,IAAA;EAEvD;EACA,IAAArB,aAAA,CAAAmB,EAAA,uEAA+C;IAC/C,IAAAG,MAAA,GAAAf,QAAA,CAAAgB,gBAAiB,EAAI;IAErB,IAAAC,QAAY,GAAAxB,aAAA,CAAAc,EAAA,CAAAW,EAAA;IACb,IAAAC,WAAA,GAAAnB,QAAA,CAAAoB,iBAAA,CAAAH,QAAA;IAEDf,UAAA,CAAAG,0BAAG;IACD,IAAAZ,aAAM,CAAYoB,MAAA,EAAAb,QAAA,CAAGgB,gBAAa,IAAAF,IAAA,CAAAC,MAAA;IAChC,IAAAtB,aAAmB,CAAAoB,MAAW,EAAAI,QAAA,EAAAI,GAAiB,CAAAC,gBAAc;IAC/DH,WAAW;EACX;EACF,CAAC,GAAA1B,aAAA,CAAAmB,EAAA;IAED,IAAAW,SAAA,GAAA9B,aAAG,CAAAc,EAAA,CAAAW,EAAA;MACD,OAAM;IACN;IACAhB,UAAM,CAAAC,MAAA,GAAc;MAClBqB,eAAmB;QACnBD;MACF;IAEA;IACArB,UAAA,CAAAG,0BAAgB,kBAAoB;IACpC,IAAAZ,aAAA,CAAAoB,MAAA,EAAOU,SAAQ,CAAE,CAAAE,oBAAqB;EACtC;EACF,CAAC,GAAAhC,aAAA,CAAAmB,EAAA;IAED,IAAAG,MAAA,GAAAf,QAAG,CAAAgB,gBAAA;IACD,IAAAC,QAAA,GAAAxB,aAAA,CAAAc,EAAA,CAAAW,EAAA;IAAE,IAAAC,WAAmB,GAAAnB,QAAS,CAAAoB,iBAAA,CAAAH,QAAA;IAC9Bf,UAAA,CAAAC,MAAA;MACDqB,eAAA;QAEDD,SAAA,WAAAA,CAAA,EAAG;UACK,YAAW;QACjB;MACA;IACE;IAA4BrB,UAC5B,CAAAG,0BAAiB;IAAA,IACfZ,aAAY,CAAAoB,MAAA,EAAAb,QAAA,CAAAgB,gBAAA,IAAAF,IAAA,CAAAC,MAAA;IACV,IAAAtB,aAAU,CAAAoB,MAAM,EAAAI,QAAA,EAAAI,GAAA,CAAAC,gBAAuB;IAAAH,WACzC;EAAA;EACF,EACF,EAAA1B,aAAA,CAAAmB,EAAA;IAEA;IACAV,UAAA,CAAAC,MAAA,SAAO;IACP,IAAAV,aAAA,CAAAoB,MAAA,EAAO,YAAU;MACjB,OAAAX,UAAY,CAAAG,0BAAA;IACb,GAAAgB,GAAA,CAAAK,OAAA;EACF","ignoreList":[]}

package/dist/cjs/router/useScreens.cjs

@@ -242,28 +242,17 @@ function fromImport({
   SuspenseFallback,
   ...component
 }) {
-  if (ErrorBoundary) return {
-    default: import_react.default.forwardRef((props, ref) => {
-      const children = import_react.default.createElement((0, import_getPageExport.getPageExport)(component) || import_EmptyRoute.EmptyRoute, {
-        ...props,
-        ref
-      });
-      return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Try.Try, {
-        catch: ErrorBoundary,
-        children
-      });
-    }),
-    SuspenseFallback
-  };
   if (process.env.NODE_ENV !== "production") {
     const exported = (0, import_getPageExport.getPageExport)(component);
     if (exported && typeof exported === "object" && Object.keys(exported).length === 0) return {
       default: import_EmptyRoute.EmptyRoute,
+      ErrorBoundary,
       SuspenseFallback
     };
   }
   return {
     default: (0, import_getPageExport.getPageExport)(component),
+    ErrorBoundary,
     SuspenseFallback
   };
 }
@@ -305,7 +294,8 @@ function getQualifiedRouteComponent(value) {
       });
     }
     const res = fromImport(value.loadRoute());
-    const Component = (0, import_getPageExport.getPageExport)(res);
+    const Component = res.default || import_EmptyRoute.EmptyRoute;
+    const CatchBoundary = res.ErrorBoundary;
     const LayoutSuspenseFallback = value.type === "layout" ? res.SuspenseFallback : void 0;
     const match = matches.find(match2 => match2.routeId === value.contextKey) || (!value.children?.length ? matches[matches.length - 1] : void 0);
     const loaderDataProps = match && "loaderData" in match ? {
@@ -331,15 +321,21 @@ function getQualifiedRouteComponent(value) {
         ...loaderDataProps
       },
       forwardedRef: ref
-    });else rendered = /* @__PURE__ */(0, import_jsx_runtime.jsx)(RouteErrorBoundary, {
-      routeName: value.route,
-      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(Component, {
+    });else {
+      const page = /* @__PURE__ */(0, import_jsx_runtime.jsx)(Component, {
         ...props,
         ...slotProps,
         ...loaderDataProps,
         ref
-      })
-    });
+      });
+      rendered = /* @__PURE__ */(0, import_jsx_runtime.jsx)(RouteErrorBoundary, {
+        routeName: value.route,
+        children: CatchBoundary ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Try.Try, {
+          catch: CatchBoundary,
+          children: page
+        }) : page
+      });
+    }
     if (value.type !== "layout") return rendered;
     const providedSuspenseFallback = LayoutSuspenseFallback ?? InheritedSuspenseFallback;
     return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Route.SuspenseFallbackContext.Provider, {

package/dist/cjs/router/useScreens.native.js

@@ -273,28 +273,17 @@ function fromImport(param) {
     SuspenseFallback,
     ...component
   } = param;
-  if (ErrorBoundary) return {
-    default: /* @__PURE__ */import_react2.default.forwardRef(function (props, ref) {
-      var children = /* @__PURE__ */import_react2.default.createElement((0, import_getPageExport.getPageExport)(component) || import_EmptyRoute.EmptyRoute, {
-        ...props,
-        ref
-      });
-      return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Try.Try, {
-        catch: ErrorBoundary,
-        children
-      });
-    }),
-    SuspenseFallback
-  };
   if (process.env.NODE_ENV !== "production") {
     var exported = (0, import_getPageExport.getPageExport)(component);
     if (exported && (typeof exported === "undefined" ? "undefined" : _type_of(exported)) === "object" && Object.keys(exported).length === 0) return {
       default: import_EmptyRoute.EmptyRoute,
+      ErrorBoundary,
       SuspenseFallback
     };
   }
   return {
     default: (0, import_getPageExport.getPageExport)(component),
+    ErrorBoundary,
     SuspenseFallback
   };
 }
@@ -334,7 +323,8 @@ function getQualifiedRouteComponent(value) {
       });
     }
     var res = fromImport(value.loadRoute());
-    var Component = (0, import_getPageExport.getPageExport)(res);
+    var Component = res.default || import_EmptyRoute.EmptyRoute;
+    var CatchBoundary = res.ErrorBoundary;
     var LayoutSuspenseFallback = value.type === "layout" ? res.SuspenseFallback : void 0;
     var match = matches.find(function (match2) {
       return match2.routeId === value.contextKey;
@@ -381,15 +371,21 @@ function getQualifiedRouteComponent(value) {
         ...loaderDataProps
       },
       forwardedRef: ref
-    });else rendered = /* @__PURE__ */(0, import_jsx_runtime.jsx)(RouteErrorBoundary, {
-      routeName: value.route,
-      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(Component, {
+    });else {
+      var page = /* @__PURE__ */(0, import_jsx_runtime.jsx)(Component, {
         ...props,
         ...slotProps,
         ...loaderDataProps,
         ref
-      })
-    });
+      });
+      rendered = /* @__PURE__ */(0, import_jsx_runtime.jsx)(RouteErrorBoundary, {
+        routeName: value.route,
+        children: CatchBoundary ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Try.Try, {
+          catch: CatchBoundary,
+          children: page
+        }) : page
+      });
+    }
     if (value.type !== "layout") return rendered;
     var providedSuspenseFallback = LayoutSuspenseFallback !== null && LayoutSuspenseFallback !== void 0 ? LayoutSuspenseFallback : InheritedSuspenseFallback;
     return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_Route.SuspenseFallbackContext.Provider, {