one 1.14.5 → 1.15.1

package/dist/cjs/createApp.cjs

@@ -63,10 +63,11 @@ function createApp(options) {
       options,
       render: async props => {
         const renderMode = props.mode === "spa-shell" ? "spa" : props.mode;
+        const shouldRunSetup = props.mode !== "ssg" && props.mode !== "spa-shell";
         if (process.env.ONE_RENDER_MODE !== renderMode) {
           process.env.ONE_RENDER_MODE = renderMode;
         }
-        if (!setupDone && options.getSetupPromise) {
+        if (shouldRunSetup && !setupDone && options.getSetupPromise) {
           await options.getSetupPromise();
           setupDone = true;
         }
@@ -159,10 +160,11 @@ function createApp(options) {
       // streaming SSR - returns ReadableStream, no post-processing
       renderStream: async props => {
         const renderMode = props.mode === "spa-shell" ? "spa" : props.mode;
+        const shouldRunSetup = props.mode !== "ssg" && props.mode !== "spa-shell";
         if (process.env.ONE_RENDER_MODE !== renderMode) {
           process.env.ONE_RENDER_MODE = renderMode;
         }
-        if (!setupDone && options.getSetupPromise) {
+        if (shouldRunSetup && !setupDone && options.getSetupPromise) {
           await options.getSetupPromise();
           setupDone = true;
         }

package/dist/cjs/router/interceptRoutes.cjs

@@ -68,27 +68,8 @@ function getLayoutPath(node) {
   return "/" + path;
 }
 function isLayoutAncestorOfPath(layoutPath, currentPath) {
-  const normalizedLayout = layoutPath.replace(/\/+$/, "") || "/";
-  const normalizedCurrent = currentPath.replace(/\/+$/, "") || "/";
-  if (normalizedLayout === "/") return true;
-  const layoutParts = normalizedLayout.split("/").filter(Boolean);
-  const currentParts = normalizedCurrent.split("/").filter(Boolean);
-  if (layoutParts.length > currentParts.length) return false;
-  for (let i = 0; i < layoutParts.length; i++) {
-    const layoutPart = layoutParts[i];
-    const currentPart = currentParts[i];
-    const dynamicMatch = (0, import_matchers.matchDynamicName)(layoutPart);
-    if (dynamicMatch) {
-      if (dynamicMatch.deep) {
-        return true;
-      }
-      continue;
-    }
-    if (layoutPart !== currentPart) {
-      return false;
-    }
-  }
-  return true;
+  if (!layoutPath.replace(/\/+$/, "")) return true;
+  return (0, import_matchers.matchRoutePattern)(layoutPath, currentPath) !== null;
 }
 function findLayoutsWithSlotsAlongPath(rootNode, currentPath) {
   if (!rootNode) return [];

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

@@ -90,27 +90,8 @@ function getLayoutPath(node) {
   return "/" + path;
 }
 function isLayoutAncestorOfPath(layoutPath, currentPath) {
-  var normalizedLayout = layoutPath.replace(/\/+$/, "") || "/";
-  var normalizedCurrent = currentPath.replace(/\/+$/, "") || "/";
-  if (normalizedLayout === "/") return true;
-  var layoutParts = normalizedLayout.split("/").filter(Boolean);
-  var currentParts = normalizedCurrent.split("/").filter(Boolean);
-  if (layoutParts.length > currentParts.length) return false;
-  for (var i = 0; i < layoutParts.length; i++) {
-    var layoutPart = layoutParts[i];
-    var currentPart = currentParts[i];
-    var dynamicMatch = (0, import_matchers.matchDynamicName)(layoutPart);
-    if (dynamicMatch) {
-      if (dynamicMatch.deep) {
-        return true;
-      }
-      continue;
-    }
-    if (layoutPart !== currentPart) {
-      return false;
-    }
-  }
-  return true;
+  if (!layoutPath.replace(/\/+$/, "")) return true;
+  return (0, import_matchers.matchRoutePattern)(layoutPath, currentPath) !== null;
 }
 function findLayoutsWithSlotsAlongPath(rootNode, currentPath) {
   if (!rootNode) return [];

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","interceptRoutes_exports","__export","closeIntercept","findInterceptRoute","getInterceptedActualPath","getNavigationType","getPreInterceptUrl","isHardNavigation","isInterceptedNavigation","isReturningFromIntercept","registerClearSlotStates","registerSetSlotState","restoreInterceptFromHistory","setNavigationType","setReturningFromIntercept","storeInterceptState","updateURLWithoutNavigation","module","exports","import_matchers","require","import_constants","navigationMode","type","collectAllLayoutsWithSlots","node","collected","arguments","length","slots","size","push","children","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","child","err","return","getLayoutPath","path","contextKey","replace","stripGroupSegmentsFromPath","isLayoutAncestorOfPath","layoutPath","currentPath","normalizedLayout","normalizedCurrent","layoutParts","split","filter","Boolean","currentParts","i","layoutPart","currentPart","dynamicMatch","matchDynamicName","deep","findLayoutsWithSlotsAlongPath","rootNode","allLayoutsWithSlots","ancestorLayouts","layout","sort","a","b","depthA","depthB","targetPath","isNative","layoutsWithSlots","layoutNode","slotName","slotConfig","result","findMatchingInterceptInSlot","interceptRoutes","interceptRoute","intercept","levels","interceptTargetPath","resolvedTargetPath","resolveInterceptTargetPath","params","matchPath","layoutContextKey","fullLayoutPath","slice","Infinity","basePath","pathParts","parentParts","parentPath","join","pattern","normalizedPath","normalizedPattern","patternParts","pathIndex","patternPart","remaining","name","preInterceptUrl","href","window","location","pathname","search","history","pushState","__intercepted","__actualPath","__preInterceptUrl","clearSlotStatesCallback","callback","state","returningFromIntercept","back","_window_history_state","_ref"],"sources":["../../../src/router/interceptRoutes.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","interceptRoutes_exports","__export","closeIntercept","findInterceptRoute","getInterceptedActualPath","getNavigationType","getPreInterceptUrl","isHardNavigation","isInterceptedNavigation","isReturningFromIntercept","registerClearSlotStates","registerSetSlotState","restoreInterceptFromHistory","setNavigationType","setReturningFromIntercept","storeInterceptState","updateURLWithoutNavigation","module","exports","import_matchers","require","import_constants","navigationMode","type","collectAllLayoutsWithSlots","node","collected","arguments","length","slots","size","push","children","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","child","err","return","getLayoutPath","path","contextKey","replace","stripGroupSegmentsFromPath","isLayoutAncestorOfPath","layoutPath","currentPath","matchRoutePattern","findLayoutsWithSlotsAlongPath","rootNode","allLayoutsWithSlots","ancestorLayouts","filter","layout","sort","a","b","depthA","split","Boolean","depthB","targetPath","isNative","layoutsWithSlots","i","layoutNode","slotName","slotConfig","result","findMatchingInterceptInSlot","interceptRoutes","interceptRoute","intercept","levels","interceptTargetPath","resolvedTargetPath","resolveInterceptTargetPath","params","matchPath","layoutContextKey","fullLayoutPath","slice","Infinity","basePath","pathParts","parentParts","parentPath","join","pattern","normalizedPath","normalizedPattern","patternParts","pathIndex","patternPart","dynamicMatch","matchDynamicName","deep","remaining","name","preInterceptUrl","href","window","location","pathname","search","history","pushState","__intercepted","__actualPath","__preInterceptUrl","clearSlotStatesCallback","callback","state","returningFromIntercept","back","_window_history_state","_ref"],"sources":["../../../src/router/interceptRoutes.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/router/matchers.cjs

@@ -33,6 +33,7 @@ __export(matchers_exports, {
   matchDynamicName: () => matchDynamicName,
   matchGroupName: () => matchGroupName,
   matchInterceptPrefix: () => matchInterceptPrefix,
+  matchRoutePattern: () => matchRoutePattern,
   matchSlotName: () => matchSlotName,
   removeFileSystemDots: () => removeFileSystemDots,
   removeSupportedExtensions: () => removeSupportedExtensions,
@@ -60,6 +61,36 @@ function matchDynamicName(name) {
     };
   }
 }
+function matchRoutePattern(pattern, path) {
+  const patternSegments = pattern.split("/").filter(Boolean);
+  if (patternSegments[patternSegments.length - 1] === "index") {
+    patternSegments.pop();
+  }
+  const pathSegments = path.split("/").filter(Boolean);
+  let specificity = 0;
+  let pi = 0;
+  for (let ui = 0; ui < patternSegments.length; ui++) {
+    const seg = patternSegments[ui];
+    if (seg.startsWith("(") && seg.endsWith(")")) continue;
+    if (seg.startsWith("[...") && seg.endsWith("]")) {
+      return {
+        specificity: specificity + (pathSegments.length - pi)
+      };
+    }
+    if (pi >= pathSegments.length) return null;
+    if (seg.startsWith("[") && seg.endsWith("]")) {
+      specificity += 1;
+      pi += 1;
+      continue;
+    }
+    if (seg !== pathSegments[pi]) return null;
+    specificity += 2;
+    pi += 1;
+  }
+  return {
+    specificity
+  };
+}
 function matchDeepDynamicRouteName(name) {
   return name.match(/^\[\.\.\.([^/]+?)\]$/)?.[1];
 }

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

@@ -35,6 +35,7 @@ __export(matchers_exports, {
   matchDynamicName: () => matchDynamicName,
   matchGroupName: () => matchGroupName,
   matchInterceptPrefix: () => matchInterceptPrefix,
+  matchRoutePattern: () => matchRoutePattern,
   matchSlotName: () => matchSlotName,
   removeFileSystemDots: () => removeFileSystemDots,
   removeSupportedExtensions: () => removeSupportedExtensions,
@@ -63,6 +64,36 @@ function matchDynamicName(name) {
     };
   }
 }
+function matchRoutePattern(pattern, path) {
+  var patternSegments = pattern.split("/").filter(Boolean);
+  if (patternSegments[patternSegments.length - 1] === "index") {
+    patternSegments.pop();
+  }
+  var pathSegments = path.split("/").filter(Boolean);
+  var specificity = 0;
+  var pi = 0;
+  for (var ui = 0; ui < patternSegments.length; ui++) {
+    var seg = patternSegments[ui];
+    if (seg.startsWith("(") && seg.endsWith(")")) continue;
+    if (seg.startsWith("[...") && seg.endsWith("]")) {
+      return {
+        specificity: specificity + (pathSegments.length - pi)
+      };
+    }
+    if (pi >= pathSegments.length) return null;
+    if (seg.startsWith("[") && seg.endsWith("]")) {
+      specificity += 1;
+      pi += 1;
+      continue;
+    }
+    if (seg !== pathSegments[pi]) return null;
+    specificity += 2;
+    pi += 1;
+  }
+  return {
+    specificity
+  };
+}
 function matchDeepDynamicRouteName(name) {
   var _name_match;
   return (_name_match = name.match(/^\[\.\.\.([^/]+?)\]$/)) === null || _name_match === void 0 ? void 0 : _name_match[1];

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","matchers_exports","__export","getContextKey","getNameFromFilePath","hasInterceptPrefix","isSlotDirectory","isTypedRoute","matchArrayGroupName","matchDeepDynamicRouteName","matchDirectoryRenderMode","matchDynamicName","matchGroupName","matchInterceptPrefix","matchSlotName","removeFileSystemDots","removeSupportedExtensions","stripGroupSegmentsFromPath","stripInterceptPrefix","stripInvisibleSegmentsFromPath","stripSlotSegmentsFromPath","testNotFound","module","exports","dynamicNameRe","name","_name_match","paramName","match","startsWith","slice","deep","endsWith","normal","replace","filePath","path","split","reduce","acc","v","push","join","directoryRenderModeRe","renderMode","slotPrefixRe","test","segment","prefixes","targetPath","includes","levels","Infinity","originalSegment"],"sources":["../../../src/router/matchers.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","matchers_exports","__export","getContextKey","getNameFromFilePath","hasInterceptPrefix","isSlotDirectory","isTypedRoute","matchArrayGroupName","matchDeepDynamicRouteName","matchDirectoryRenderMode","matchDynamicName","matchGroupName","matchInterceptPrefix","matchRoutePattern","matchSlotName","removeFileSystemDots","removeSupportedExtensions","stripGroupSegmentsFromPath","stripInterceptPrefix","stripInvisibleSegmentsFromPath","stripSlotSegmentsFromPath","testNotFound","module","exports","dynamicNameRe","name","_name_match","paramName","match","startsWith","slice","deep","pattern","path","patternSegments","split","filter","Boolean","length","pop","pathSegments","specificity","pi","ui","seg","endsWith","normal","replace","filePath","reduce","acc","v","push","join","directoryRenderModeRe","renderMode","slotPrefixRe","test","segment","prefixes","targetPath","includes"],"sources":["../../../src/router/matchers.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/views/Navigator.cjs

@@ -54,6 +54,7 @@ var import_react_native_safe_area_context = require("react-native-safe-area-cont
 var import_withLayoutContext = require("../layouts/withLayoutContext.cjs");
 var import_notFoundState = require("../notFoundState.cjs");
 var import_Route = require("../router/Route.cjs");
+var import_matchers = require("../router/matchers.cjs");
 var import_router = require("../router/router.cjs");
 var import_router2 = require("../router/router.cjs");
 var import_useScreens = require("../router/useScreens.cjs");
@@ -143,19 +144,26 @@ function QualifiedNavigator({
     if (initialRouteName) return initialRouteName;
     const browserPath = import_router.initialPathname ?? (typeof window !== "undefined" ? window.location.pathname : void 0);
     if (!browserPath) return void 0;
-    const screenNames = [];
-    for (const screen of screens) {
-      const props = screen?.props;
-      if (props?.name) screenNames.push(props.name);
+    const layoutUrlPrefix = (0, import_matchers.stripGroupSegmentsFromPath)(contextKey).replace(/\/+$/, "");
+    let relativePath = browserPath;
+    if (layoutUrlPrefix && browserPath.startsWith(layoutUrlPrefix)) {
+      relativePath = browserPath.slice(layoutUrlPrefix.length) || "/";
     }
-    for (const name of screenNames) {
-      const base = name.replace(/\/index$/, "");
-      if (browserPath.endsWith("/" + base) || browserPath.includes("/" + base + "/")) {
-        return name;
+    let best;
+    for (const screen of screens) {
+      const name = screen?.props?.name;
+      if (!name) continue;
+      const match = (0, import_matchers.matchRoutePattern)(name, relativePath);
+      if (!match) continue;
+      if (!best || match.specificity > best.specificity) {
+        best = {
+          name,
+          specificity: match.specificity
+        };
       }
     }
-    return void 0;
-  }, [initialRouteName, screens]);
+    return best?.name;
+  }, [initialRouteName, screens, contextKey]);
   const {
     state,
     navigation,

package/dist/cjs/views/Navigator.native.js

@@ -57,6 +57,7 @@ var import_react_native_safe_area_context = require("react-native-safe-area-cont
 var import_withLayoutContext = require("../layouts/withLayoutContext.native.js");
 var import_notFoundState = require("../notFoundState.native.js");
 var import_Route = require("../router/Route.native.js");
+var import_matchers = require("../router/matchers.native.js");
 var import_router = require("../router/router.native.js");
 var import_router2 = require("../router/router.native.js");
 var import_useScreens = require("../router/useScreens.native.js");
@@ -153,15 +154,29 @@ function QualifiedNavigator(param) {
     if (initialRouteName) return initialRouteName;
     var browserPath = import_router.initialPathname !== null && import_router.initialPathname !== void 0 ? import_router.initialPathname : typeof window !== "undefined" ? window.location.pathname : void 0;
     if (!browserPath) return void 0;
-    var screenNames = [];
+    var layoutUrlPrefix = (0, import_matchers.stripGroupSegmentsFromPath)(contextKey).replace(/\/+$/, "");
+    var relativePath = browserPath;
+    if (layoutUrlPrefix && browserPath.startsWith(layoutUrlPrefix)) {
+      relativePath = browserPath.slice(layoutUrlPrefix.length) || "/";
+    }
+    var best;
     var _iteratorNormalCompletion = true,
       _didIteratorError = false,
       _iteratorError = void 0;
     try {
       for (var _iterator = screens[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
         var screen = _step.value;
-        var props = screen === null || screen === void 0 ? void 0 : screen.props;
-        if (props === null || props === void 0 ? void 0 : props.name) screenNames.push(props.name);
+        var _screen_props;
+        var name = screen === null || screen === void 0 ? void 0 : (_screen_props = screen.props) === null || _screen_props === void 0 ? void 0 : _screen_props.name;
+        if (!name) continue;
+        var match = (0, import_matchers.matchRoutePattern)(name, relativePath);
+        if (!match) continue;
+        if (!best || match.specificity > best.specificity) {
+          best = {
+            name,
+            specificity: match.specificity
+          };
+        }
       }
     } catch (err) {
       _didIteratorError = true;
@@ -177,33 +192,8 @@ function QualifiedNavigator(param) {
         }
       }
     }
-    var _iteratorNormalCompletion1 = true,
-      _didIteratorError1 = false,
-      _iteratorError1 = void 0;
-    try {
-      for (var _iterator1 = screenNames[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
-        var name = _step1.value;
-        var base = name.replace(/\/index$/, "");
-        if (browserPath.endsWith("/" + base) || browserPath.includes("/" + base + "/")) {
-          return name;
-        }
-      }
-    } catch (err) {
-      _didIteratorError1 = true;
-      _iteratorError1 = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-          _iterator1.return();
-        }
-      } finally {
-        if (_didIteratorError1) {
-          throw _iteratorError1;
-        }
-      }
-    }
-    return void 0;
-  }, [initialRouteName, screens]);
+    return best === null || best === void 0 ? void 0 : best.name;
+  }, [initialRouteName, screens, contextKey]);
   var {
     state,
     navigation,

package/dist/cjs/views/Navigator.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Navigator_exports","__export","DefaultNavigator","NamedSlot","Navigator","NavigatorContext","QualifiedSlot","Slot","clearAllSlotStates","getScopedSlotKey","getSlotState","setSlotState","useNamedSlot","useNavigatorContext","useSlot","module","exports","import_jsx_runtime","require","import_native","React","__toESM","import_react_native_safe_area_context","import_withLayoutContext","import_notFoundState","import_Route","import_router","import_router2","import_useScreens","import_Screen","import_interceptRoutes","SLOT_STATIC_KEY","globalSlotState","Map","slotStateListeners","Set","slotName","get","state","delete","set","forEach","listener","clear","registerClearSlotStates","registerSetSlotState","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","createContext","process","env","NODE_ENV","displayName","param","initialRouteName","screenOptions","children","router","contextKey","useContextKey","screens","otherSlot","protectedScreens","useFilterScreenChildren","isCustomNavigator","registerProtectedRoutes","unregisterProtectedRoutes","sorted","useSortedScreens","length","console","warn","jsx","QualifiedNavigator","StackRouter","resolvedInitialRouteName","useMemo","browserPath","initialPathname","window","location","pathname","screenNames","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","screen","props","name","push","err","return","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","base","replace","endsWith","includes","navigation","descriptors","NavigationContent","useNavigationBuilder","id","descriptorsRef","useRef","current","Provider","context","useContext","Error","_ref","_descriptorsRef_current_current_key","notFoundState","useNotFoundState","notFoundRouteNode","findRouteNodeByPath","notFoundPath","routeNode","findNearestNotFoundRoute","originalPath","NotFoundComponent","getQualifiedRouteComponent","route","params","routes","index","renderedElement","key","render","cloneElement","memo","Slot2"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","Navigator_exports","__export","DefaultNavigator","NamedSlot","Navigator","NavigatorContext","QualifiedSlot","Slot","clearAllSlotStates","getScopedSlotKey","getSlotState","setSlotState","useNamedSlot","useNavigatorContext","useSlot","module","exports","import_jsx_runtime","require","import_native","React","__toESM","import_react_native_safe_area_context","import_withLayoutContext","import_notFoundState","import_Route","import_matchers","import_router","import_router2","import_useScreens","import_Screen","import_interceptRoutes","SLOT_STATIC_KEY","globalSlotState","Map","slotStateListeners","Set","slotName","get","state","delete","set","forEach","listener","clear","registerClearSlotStates","registerSetSlotState","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","createContext","process","env","NODE_ENV","displayName","param","initialRouteName","screenOptions","children","router","contextKey","useContextKey","screens","otherSlot","protectedScreens","useFilterScreenChildren","isCustomNavigator","registerProtectedRoutes","unregisterProtectedRoutes","sorted","useSortedScreens","length","console","warn","jsx","QualifiedNavigator","StackRouter","resolvedInitialRouteName","useMemo","browserPath","initialPathname","window","location","pathname","layoutUrlPrefix","stripGroupSegmentsFromPath","replace","relativePath","startsWith","slice","best","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","screen","_screen_props","name","props","match","matchRoutePattern","specificity","err","return","navigation","descriptors","NavigationContent","useNavigationBuilder","id","descriptorsRef","useRef","current","Provider","context","useContext","Error","_ref","_descriptorsRef_current_current_key","notFoundState","useNotFoundState","notFoundRouteNode","findRouteNodeByPath","notFoundPath","routeNode","findNearestNotFoundRoute","originalPath","NotFoundComponent","getQualifiedRouteComponent","route","params","routes","index","renderedElement","key","render","cloneElement","memo","Slot2","SafeAreaView","style","flex"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,iBAAA;AAAAC,QAAA,CAAAD,iBAAA;EAAAE,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,SAAA,EAAAA,CAAA,KAAAA,SAAA;EAAAC,SAAA,EAAAA,CAAA,KAAAA,SAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,aAAA,EAAAA,CAAA,KAAAA,aAAA;EAAAC,IAAA,EAAAA,CAAA,KAAAA,IAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAA,kBAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,YAAA,EAAAA,CAAA,KAAAA,YAAA;EAAAC,YAAA,EAAAA,CAAA,KAAAA,YAAA;EAAAC,YAAA,EAAAA,CAAA,KAAAA,YAAA;EAAAC,mBAAA,EAAAA,CAAA,KAAAA,mBAAA;EAAAC,OAAA,EAAAA,CAAA,KAAAA;AAAA;AACAC,MAAA,CAAAC,OAAA,GAAArB,YAIO,CAAAK,iBAAA;AACP,IAAAiB,kBAAuB,GAAAC,OAAA;AACvB,IAAAC,aAAA,GAAAD,OAAA,2BAA6B;AAC7B,IAAAE,KAAA,GAAAC,OAAA,CAAAH,OAAA,QAAwC;AACxC,IAAAI,qCAIO,GAAAJ,OAAA;AACP,IAAAK,wBAA8B,GAAAL,OAAA;AAC9B,IAAAM,oBAA8D,GAAAN,OAAA;AAC9D,IAAAO,YAAA,GAAAP,OAA8D;AAC9D,IAAAQ,eAAA,GAAmER,OAAA;AACnE,IAAAS,aAAA,GAAAT,OAA6D;AAC7D,IAAAU,cAAA,GAAuBV,OAAA;AAWvB,IAAAW,iBAAA,GAAAX,OAA8D;AA4H1D,IAAAY,aAAA,GAAAZ,OAAA;AAlIJ,IAAAa,sBAAwB,GAAAb,OAAA;AAqBxB,IAAAc,eAAM,wBAAkB;AACxB,IAAAC,eAAM,kBAAqB,IAAAC,GAAA,EAAI;AAExB,IAAAC,kBAAsB,kBAAyC,IAAAC,GAAA;AACpE,SAAO1B,aAAA2B,QAAoB;EAC7B,OAAAJ,eAAA,CAAAK,GAAA,CAAAD,QAAA;AAEO;AACL,SAAI1B,YAAUA,CAAM0B,QAAA,EAAAE,KAAA;EAClB,IAAAA,KAAA,SAAgB;IAClBN,eAAO,CAAAO,MAAA,CAAAH,QAAA;EACL;IACFJ,eAAA,CAAAQ,GAAA,CAAAJ,QAAA,EAAAE,KAAA;EAEA;EACFJ,kBAAA,CAAAO,OAAA,WAAAC,QAAA;IAEO,OAASA,QAAA;EACd;AACA;AACF,SAAAnC,mBAAA;EAAAyB,eAGA,CAAAW,KAAA;EAA0CT,kBAC1C,CAAAO,OAAA,WAAAC,QAAA;IAEA,OAASA,QAAA;EACP;AAEA;AACE,IAAAZ,sBAAmB,CAAIc,uBAAW,EAAArC,kBAAA;AAClC,IAAAuB,sBAAa,CAAAe,oBAAA,EAAAnC,YAAA;AACX,SAAAoC,wBAA0BA,CAAA;EAAW,IACvC,GAAAC,WAAA,IAAA5B,KAAA,CAAA6B,UAAA,WAAAC,CAAA;IACF,OAAKA,CAAA;EACP;EAGO9B,KAAM,CAAA+B,SAAA,aAAmB;IAQ5BhB,kBAAY,CAAAiB,GAAA,CAAAJ,WAAa;IAC3B,mBAAiB;MACnBb,kBAAA,CAAAK,MAAA,CAAAQ,WAAA;IAwBO;EACL;AAAA;AACA,IACA3C,gBAAA,kBAAAe,KAAA,CAAAiC,aAAA;AAAA,IACAC,OAAA,CAAAC,GAAA,CAAAC,QAAA;EACFnD,gBAAmB,CAAAoD,WAAA;AACjB;AAGA,SAAMrD,UAAAsD,KAAA;EAAA,IACJ;IAAAC,gBAAA;IAAAC,aAAA;IAAAC,QAAA;IAAAC;EAAA,IAAAJ,KAAA;EAAA,IACAK,UAAU,OAAAtC,YAAA,CAAAuC,aAAA;EAAA,IACV;IAAAC,OAAA;IAAAJ,QAAA,EAAAK,SAAA;IAAAC;EAAA,QAAA5C,wBAAA,CAAA6C,uBAAA,EAAAP,QAAA;IACFQ,iBAAI;IACFN;EAAmB,EACnB;EACF,CAAC,GAAAnC,cAAA,CAAA0C,uBAAA,EAAAP,UAAA,EAAAI,gBAAA;EAID/C,KAAA,CAAA+B,SAAA;IAEA,IAAMvB,cAAU,CAAA0C,uBAAM,EAAAP,UAAA,EAAAI,gBAAA;IACpB;MACA,IAAAvC,cAAa,CAAA2C,yBAAA,EAAAR,UAAA;IACX;EAAoC,GACtC,CACFA,UAAI,EAEJI,gBAAM,CAEN;EACE,IAAAK,MAAQ,KAAK,EAAA3C,iBAAiB,CAAA4C,gBAAU,EAAAR,OAAA,KAAoB,QAAAA,OAAA,cAAAA,OAAA;IAC5DE;EACF;EAEA,KAAAK,MACE,CAAAE,MAAA;IAACC,OAAA,CAAAC,IAAA,kBAAAb,UAAA;IAAA;EAAA;EACC,OACA,mBAAA9C,kBAAA,CAAA4D,GAAA,EAAAC,kBAAA;IAAAnB,gBACS;IAAAC,aACT;IAAAK,OACA,EAAAO,MAAA;IAAAT,UAEC;IAAAD,MAAA;IACHD,QAAA,EAAAK;EAEJ;AAEA;AAA4B,SAC1BY,mBAAApB,KAAA;EACA;IAAAC,gBAAA;IAAAC,aAAA;IAAAC,QAAA;IAAAI,OAAA;IAAAF,UAAA;IAAAD,MAAA,GAAA3C,aAAA,CAAA4D;EAAA,IAAArB,KAAA;EACA,IAAAsB,wBAAA,GAAA5D,KAAA,CAAA6D,OAAA;IACA,IAAAtB,gBAAA,SAAAA,gBAAA;IACA,IAAAuB,WAAA,GAAAvD,aAAA,CAAAwD,eAAA,aAAAxD,aAAA,CAAAwD,eAAA,cAAAxD,aAAA,CAAAwD,eAAA,UAAAC,MAAA,mBAAAA,MAAA,CAAAC,QAAA,CAAAC,QAAA;IACA,KAAAJ,WAAS;IAC6D,IAAAK,eAAA,OAAA7D,eAAA,CAAA8D,0BAAA,EAAAzB,UAAA,EAAA0B,OAAA;IAmBtE,IAAMC,YAAA,GAAAR,WAAA;IACJ,IAAIK,eAAA,IAAkBL,WAAO,CAAAS,UAAA,CAAAJ,eAAA;MAE7BG,YAAM,GAAAR,WACJ,CAAAU,KAAA,CAAAL,eAAA,CAAAb,MACC,KAAO;IACV;IAOA,IAAAmB,IAAM;IACN,IAAIC,yBAAe;MAAAC,iBAAA;MAAAC,cAAA;IACnB,IAAI;MACF,SAAAC,SAAe,GAAAhC,OAAY,CAAAiC,MAAM,CAAAC,QAAA,KAAgBC,KAAA,EAAM,EAAAN,yBAAK,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;QAC9D,IAAAS,MAAA,GAAAH,KAAA,CAAArG,KAAA;QAOI,IAAAyG,aAAA;QACJ,IAAAC,IAAW,GAAAF,MAAU,SAAS,IAAAA,MAAA,wBAAAC,aAAA,GAAAD,MAAA,CAAAG,KAAA,cAAAF,aAAA,uBAAAA,aAAA,CAAAC,IAAA;QAC5B,IAAM,CAAAA,IAAA,EAAQ;QACd,IAAKE,KAAM,OAAAjF,eAAA,CAAAkF,iBAAA,EAAAH,IAAA,EAAAf,YAAA;QACX,IAAM,CAAAiB,KAAA;QACN,IAAK,CAAAd,IAAO,IAAAc,KAAA,CAAAE,WAAA,GAAAhB,IAAA,CAAAgB,WAAA;UACRhB,IAAC;YACHY,IAAO;YACTI,WAAA,EAAAF,KAAA,CAAAE;UACF;QAEA;MACE;IAEJ,SAAQC,GAAA,EAAO;MACbf,iBAAA;MACAC,cAAA,GAAAc,GAAA;IAAA;MAEE,IAAI;QACJ,KAAAhB,yBAAU,IAAAG,SAAA,CAAAc,MAAA;UACVd,SAAA,CAAAc,MAAA;QACA;MACF;QACF,IAAAhB,iBAAA;UAMM,MAAAC,cAAiB;QACvB;MAEA;IACE;IAAO,OACLH,IAAA,aAAAA,IAAA,uBAAAA,IAAA,CAAAY,IAAA;EAAA,IACA9C,gBACA,EAAAM,OACA,EAAAF,UACA,EACF;EACF,IAAI;IAAAxB,KAAA;IAAAyE,UAAmB;IAAAC,WAAY;IAAAC;EAAO,QAAA/F,aAAA,CAAAgG,oBAAA,EAAArD,MAAA;IAE1C;IAKFsD,EAAA,EAAArD,UAAA;IAEOF,QAAS,EAAAI,OAAA;IACdL,aAAM;IACND,gBAAc,EAAAqB;EACZ;EACF,IAAAqC,cAAA,GAAAjG,KAAA,CAAAkG,MAAA,CAAAL,WAAA;EACAI,cAAO,CAAAE,OAAA,GAAAN,WAAA;EACT,IAAAlH,KAAA,GAAAqB,KAAA,CAAA6D,OAAA;IAEO,OAAS;MACdlB,UAAM;MACNxB,KAAQ;MACRyE,UAAM;MAGFK,cAAA;MAKFvD;IAKA;EACE,IACAC,UAAO,EACTxB,KAAA,EAIAyE,UAAO,EACTlD,MAAA,CAEA;EACE,sBAAO,IAAA7C,kBAAA,CAAA4D,GAAA,EAAAxE,gBAAA,CAAAmH,QAAA;IACTzH,KAAA;IAEA8D,QAAM,iBAAgB,CAAO,GAAA5C,kBAAW,CAAA4D,GAAA,EAAAqC,iBAAA;MAEpCrD;IACF;EACF;AAEA;AAKA,SAAIhD,mBAAoBA,CAAA;EACtB,IAAA4G,OAAO,GAAArG,KAAM,CAAAsG,UAAa,CAAArH,gBAAiB;EAAA,IACzC,CAAAoH,OAAQ;IACV,MAAC,IAAAE,KAAA;EACH;EAEA,OAAOF,OAAA;AACT;AAGO,SAAM3G,OAAOA,CAAA,EAAM;EACxB,IAAA8G,IAAM;EACN,IAAAC,mCAAiC;EAGjC,IAAIJ,OAAA,GAAS5G,mBAAe;EAE1B;IAAA0B,KACE;IAAA8E;EAAA,IAAAI,OAAA;EAIJ,IAAAK,aAAA,OAAAtG,oBAAA,CAAAuG,gBAAA;EAEA,IAAAD,aAAO;IACR,IAAAE,iBAAA,GAAAF,aAAA,CAAAE,iBAAA,QAAAxG,oBAAA,CAAAyG,mBAAA,EAAAH,aAAA,CAAAI,YAAA,EAAAvG,aAAA,CAAAwG,SAAA,SAAA3G,oBAAA,CAAA4G,wBAAA,EAAAN,aAAA,CAAAO,YAAA,EAAA1G,aAAA,CAAAwG,SAAA;IAEM,IAAAH,iBAAyB;MAC9B,IAAOM,iBAAQ,OAAAzG,iBAAA,CAAA0G,0BAAA,EAAAP,iBAAA;MACjB,0BAAA/G,kBAAA,CAAA4D,GAAA,EAAAyD,iBAAA;QAEOE,KAAS;UAEZC,MAAA;QAMJ;MAEA,yBAAiB;IACjB;IAGA,OAAU;EAUH;EACL,IAAI,CAAClG,KAAA,CAAAmG,MAAA;IACL,OAAO,IAAG;EACZ;EASO,IAAAnB,OAAS,GAAAhF,KAAA,CACdmG,MAAA,CAAAnG,KACA,CAAAoG,KAAA;EAGA,KAAApB,OAAA;IAEA,OAAM;EACN;EAEA,IAAIqB,eAAY,IAAAhB,IAAA,IAAAC,mCAA4C,GAAAR,cAAA,CAAAE,OAAA,CAAAA,OAAA,CAAAsB,GAAA,eAAAhB,mCAAA,uBAAAA,mCAAA,CAAAiB,MAAA,gBAAAlB,IAAA,cAAAA,IAAA;EAE1D,IAAAgB,eAAO;IACT,sBAAAxH,KAAA,CAAA2H,YAAA,CAAAH,eAAA;MAGIC,GAAA,KAAA7G,eAAU,IAAiBuF,OAAA,CAAAd,IAAA;IAC7B;EAEA;EACE,OAACmC,eAAA;AAAA;AAAA,IAAArI,IAEC,kBAAiBa,KAAA,CAAA4H,IAAU,UAAWC,KAAEA,CAAAvC,KAAA;EAAA,IAAA3C,UAAA,OAAAtC,YAAA,CAAAuC,aAAA;EAAA,IADnCyD,OAAA,GAAUrG,KAAA,CAAAsG,UAAA,CAAArH,gBAAA;EAAA,IAEjB,CAAAoH,OAAA,aAAAA,OAAA,uBAAAA,OAAA,CAAA1D,UAAA,MAAAA,UAAA;IAEJ,0BAAA9C,kBAAA,CAAA4D,GAAA,EAAAzE,SAAA;MAEA,GAAOsG,KAAA;MACT7C,QAAA,qBAAA5C,kBAAA,CAAA4D,GAAA,EAAAvE,aAAA;IAmBO;EACL;EACA,0BAAAW,kBAAA,CAAA4D,GAAA,EAAAvE,aAAA;AAAA,EACA;AACF,SAOGA,cAAA;EACD,OAAMQ,OAAA;AAEN;AACE,SAAAZ,gBAAOA,CAAA;EACT,0BAAAe,kBAAA,CAAA4D,GAAA,EAAAvD,qCAAA,CAAA4H,YAAA;IAGAC,KAAO;MACTC,IAAA","ignoreList":[]}

package/dist/esm/createApp.mjs

@@ -23,10 +23,11 @@ function createApp(options) {
       options,
       render: async props => {
         const renderMode = props.mode === "spa-shell" ? "spa" : props.mode;
+        const shouldRunSetup = props.mode !== "ssg" && props.mode !== "spa-shell";
         if (process.env.ONE_RENDER_MODE !== renderMode) {
           process.env.ONE_RENDER_MODE = renderMode;
         }
-        if (!setupDone && options.getSetupPromise) {
+        if (shouldRunSetup && !setupDone && options.getSetupPromise) {
           await options.getSetupPromise();
           setupDone = true;
         }
@@ -119,10 +120,11 @@ function createApp(options) {
       // streaming SSR - returns ReadableStream, no post-processing
       renderStream: async props => {
         const renderMode = props.mode === "spa-shell" ? "spa" : props.mode;
+        const shouldRunSetup = props.mode !== "ssg" && props.mode !== "spa-shell";
         if (process.env.ONE_RENDER_MODE !== renderMode) {
           process.env.ONE_RENDER_MODE = renderMode;
         }
-        if (!setupDone && options.getSetupPromise) {
+        if (shouldRunSetup && !setupDone && options.getSetupPromise) {
           await options.getSetupPromise();
           setupDone = true;
         }

package/dist/esm/createApp.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["cloneElement","AppRegistry","resolveClientLoader","Root","render","initClientMatches","registerPreloadedRoute","setupSkewProtection","findRootLayout","getServerHeadInsertions","SERVER_CONTEXT_POST_RENDER_STRING","safeJsonStringify","getServerContext","setServerContext","Fragment","jsx","createApp","options","import","meta","env","SSR","cachedReactDOMServer","cachedServerRender","cachedRenderToStaticMarkup","cachedRenderToString","setupDone","props","renderMode","mode","process","ONE_RENDER_MODE","getSetupPromise","rds","sr","Promise","all","renderToStaticMarkup","default","renderToString","loaderData","loaderProps","css","cssContents","loaderServerData","routePreloads","routePreloads2","matches","postRenderData","renderId","rootElement","flags","onRenderId","id","routes","routerRoot","html","preloads","extraHeadElements","registerComponent","app","getApplication","styleTag","getStyleElement","nonce","ONE_NONCE","push","insertions","insertion","out","length","extraHeadHTML","children","map","x","i","key","replace","err","includes","renderStream","renderToStream","window","ONE_SKEW_PROTECTION","addEventListener","e","preventDefault","last","sessionStorage","getItem","Date","now","Number","setItem","String","location","reload","serverContext","restoredMatches","m","setupComplete","resolve","preloadPromises","Object","entries","routeKey","bundlePath","mod","one404Marker","__one404","notFoundPath","currentState","history","state","replaceState","__tempLocation","pathname","search","then","isClient","path","href","catch","console","error"],"sources":["../../src/createApp.tsx"],"sourcesContent":[null],"mappings":"AAEA,SAASA,YAAA,QAAoB;AAC7B,SAASC,WAAA,QAAmB;AAC5B,SAASC,mBAAA,QAA2B;AACpC,SAASC,IAAA,QAAY;AACrB,SAASC,MAAA,QAAc;AACvB,SAASC,iBAAA,QAAyB;AAClC,SAASC,sBAAA,QAA8B;AACvC,SAASC,mBAAA,QAA2B;AACpC,SAASC,cAAA,QAAsB;AAE/B,SAASC,uBAAA,QAA+B;AAExC,SAASC,iCAAA,QAAyC;AAClD,SAASC,iBAAA,QAAyB;AAClC,SAASC,gBAAA,EAAkBC,gBAAA,QAAwB;AAgFzC,SAgDIC,QAAA,EAhDJC,GAAA;AAlEH,SAASC,UAAUC,OAAA,EAAyB;EACjD,IAAIC,MAAA,CAAAC,IAAA,CAAYC,GAAA,CAAIC,GAAA,EAAK;IAEvB,IAAIC,oBAAA;IACJ,IAAIC,kBAAA;IACJ,IAAIC,0BAAA;IACJ,IAAIC,oBAAA;IACJ,IAAIC,SAAA,GAAY;IAEhB,OAAO;MACLT,OAAA;MACAb,MAAA,EAAQ,MAAOuB,KAAA,IAA0B;QAEvC,MAAMC,UAAA,GAAaD,KAAA,CAAME,IAAA,KAAS,cAAc,QAAQF,KAAA,CAAME,IAAA;QAE9D,IAAIC,OAAA,CAAQV,GAAA,CAAIW,eAAA,KAAoBH,UAAA,EAAY;UAC9CE,OAAA,CAAQV,GAAA,CAAIW,eAAA,GAAkBH,UAAA;QAChC;QAEA,IAAI,CAACF,SAAA,IAAaT,OAAA,CAAQe,eAAA,EAAiB;UACzC,MAAMf,OAAA,CAAQe,eAAA,CAAgB;UAC9BN,SAAA,GAAY;QACd;QAGA,IAAI,CAACJ,oBAAA,EAAsB;UACzB,MAAM,CAACW,GAAA,EAAKC,EAAE,IAAI,MAAMC,OAAA,CAAQC,GAAA,CAAI,CAClC,OAAO,0BAA0B,GACjC,OAAO,qBAAiB,EACzB;UACDd,oBAAA,GAAuBW,GAAA;UACvBV,kBAAA,GAAqBW,EAAA;UACrBV,0BAAA,GACES,GAAA,CAAII,oBAAA,IAAwBJ,GAAA,CAAIK,OAAA,EAASD,oBAAA;UAC3CZ,oBAAA,GAAuBS,EAAA,CAAGK,cAAA;QAC5B;QAEA,MAAMF,oBAAA,GAAuBb,0BAAA;QAC7B,MAAMe,cAAA,GAAiBd,oBAAA;QAEvB,MAAM;UACJe,UAAA;UACAC,WAAA;UACAC,GAAA;UACAC,WAAA;UACAd,IAAA;UACAe,gBAAA;UACAC,aAAA,EAAAC,cAAA;UACAC;QACF,IAAIpB,KAAA;QAEJd,gBAAA,CAAiB;UACfmC,cAAA,EAAgBJ,gBAAA;UAChBJ,UAAA;UACAC,WAAA;UACAZ,IAAA;UACAa,GAAA;UACAC,WAAA;UACAE,aAAA,EAAAC,cAAA;UACAC;QACF,CAAC;QAED,IAAIE,QAAA;QAGJ,MAAMC,WAAA,GACJ,eAAAnC,GAAA,CAACZ,IAAA;UACCgD,KAAA,EAAOlC,OAAA,CAAQkC,KAAA;UACfC,UAAA,EAAaC,EAAA,IAAO;YAClBJ,QAAA,GAAWI,EAAA;UACb;UACAC,MAAA,EAAQrC,OAAA,CAAQqC,MAAA;UAChBC,UAAA,EAAYtC,OAAA,CAAQsC,UAAA;UACnB,GAAG5B;QAAA,CACN;QAGF,IAAI6B,IAAA,GAAO,MAAMjB,cAAA,CAAeW,WAAA,EAAa;UAC3CO,QAAA,EAAU9B,KAAA,CAAM8B;QAClB,CAAC;QAGD,IAAI;UACF,MAAMC,iBAAA,GAA0C,EAAC;UAGjD,IAAI;YACFzD,WAAA,CAAY0D,iBAAA,CAAkB,eAAe,MAAM,MAAM,IAAI;YAE7D,MAAMC,GAAA,GAAM3D,WAAA,CAAY4D,cAAA,CAAe,eAAe,CAAC,CAAC;YACxD,MAAMC,QAAA,GAAWF,GAAA,CAAIG,eAAA,CAAgB;cACnCC,KAAA,EAAOlC,OAAA,CAAQV,GAAA,CAAI6C;YACrB,CAAC;YACD,IAAIH,QAAA,EAAU;cACZJ,iBAAA,CAAkBQ,IAAA,CAAKJ,QAAQ;YACjC;UACF,QAAQ,CAER;UAEA,IAAIb,QAAA,EAAU;YACZ,MAAMkB,UAAA,GAAa1D,uBAAA,CAAwBwC,QAAQ;YACnD,IAAIkB,UAAA,EAAY;cACd,WAAWC,SAAA,IAAaD,UAAA,EAAY;gBAClC,MAAME,GAAA,GAAMD,SAAA,CAAU;gBACtB,IAAIC,GAAA,EAAK;kBACPX,iBAAA,CAAkBQ,IAAA,CAAKG,GAAG;gBAC5B;cACF;YACF;UACF;UAEA,IAAIX,iBAAA,CAAkBY,MAAA,EAAQ;YAC5B,MAAMC,aAAA,GAAgBlC,oBAAA,CACpB,eAAAtB,GAAA,CAAAD,QAAA;cAAG0D,QAAA,EAAAd,iBAAA,CAAkBe,GAAA,CAAI,CAACC,CAAA,EAAGC,CAAA,KAAM3E,YAAA,CAAa0E,CAAA,EAAG;gBAAEE,GAAA,EAAKD;cAAE,CAAC,CAAC;YAAA,CAAE,CAClE;YACA,IAAIJ,aAAA,EAAe;cACjBf,IAAA,GAAOA,IAAA,CAAKqB,OAAA,CAAQ,WAAW,GAAGN,aAAa,SAAS;YAC1D;UACF;QACF,SAASO,GAAA,EAAK;UACZ,IAAI,CAAC,GAAGA,GAAG,GAAGC,QAAA,CAAS,sBAAsB,GAAG;YAC9C,MAAMD,GAAA;UACR;QACF;QAGA,MAAM9B,cAAA,GAAiBpC,gBAAA,CAAiB,GAAGoC,cAAA;QAC3C,IAAIA,cAAA,EAAgB;UAClBQ,IAAA,GAAOA,IAAA,CAAKqB,OAAA,CACVlE,iBAAA,CAAkBD,iCAAiC,GACnDC,iBAAA,CAAkBqC,cAAc,CAClC;QACF;QAEA,OAAOQ,IAAA;MACT;MAAA;MAGAwB,YAAA,EAAc,MAAOrD,KAAA,IAAmD;QACtE,MAAMC,UAAA,GAAaD,KAAA,CAAME,IAAA,KAAS,cAAc,QAAQF,KAAA,CAAME,IAAA;QAE9D,IAAIC,OAAA,CAAQV,GAAA,CAAIW,eAAA,KAAoBH,UAAA,EAAY;UAC9CE,OAAA,CAAQV,GAAA,CAAIW,eAAA,GAAkBH,UAAA;QAChC;QAEA,IAAI,CAACF,SAAA,IAAaT,OAAA,CAAQe,eAAA,EAAiB;UACzC,MAAMf,OAAA,CAAQe,eAAA,CAAgB;UAC9BN,SAAA,GAAY;QACd;QAEA,IAAI,CAACH,kBAAA,EAAoB;UACvB,MAAM,CAACU,GAAA,EAAKC,EAAE,IAAI,MAAMC,OAAA,CAAQC,GAAA,CAAI,CAClC,OAAO,0BAA0B,GACjC,OAAO,qBAAiB,EACzB;UACDd,oBAAA,GAAuBW,GAAA;UACvBV,kBAAA,GAAqBW,EAAA;UACrBV,0BAAA,GACES,GAAA,CAAII,oBAAA,IAAwBJ,GAAA,CAAIK,OAAA,EAASD,oBAAA;UAC3CZ,oBAAA,GAAuBS,EAAA,CAAGK,cAAA;QAC5B;QAEA,MAAM;UACJC,UAAA;UACAC,WAAA;UACAC,GAAA;UACAC,WAAA;UACAd,IAAA;UACAe,gBAAA;UACAC,aAAA,EAAAC,cAAA;UACAC;QACF,IAAIpB,KAAA;QAEJd,gBAAA,CAAiB;UACfmC,cAAA,EAAgBJ,gBAAA;UAChBJ,UAAA;UACAC,WAAA;UACAZ,IAAA;UACAa,GAAA;UACAC,WAAA;UACAE,aAAA,EAAAC,cAAA;UACAC;QACF,CAAC;QAED,MAAMG,WAAA,GACJ,eAAAnC,GAAA,CAACZ,IAAA;UACCgD,KAAA,EAAOlC,OAAA,CAAQkC,KAAA;UACfG,MAAA,EAAQrC,OAAA,CAAQqC,MAAA;UAChBC,UAAA,EAAYtC,OAAA,CAAQsC,UAAA;UACnB,GAAG5B;QAAA,CACN;QAGF,OAAOJ,kBAAA,CAAmB0D,cAAA,CAAe/B,WAAA,EAAa;UACpDO,QAAA,EAAU9B,KAAA,CAAM8B;QAClB,CAAC;MACH;IACF;EACF;EAGA,IAAI,OAAOyB,MAAA,KAAW,eAAepD,OAAA,CAAQV,GAAA,CAAI+D,mBAAA,KAAwB,SAAS;IAChFD,MAAA,CAAOE,gBAAA,CAAiB,qBAAsBC,CAAA,IAAM;MAClDA,CAAA,CAAEC,cAAA,CAAe;MACjB,MAAMV,GAAA,GAAM;MACZ,MAAMW,IAAA,GAAOC,cAAA,CAAeC,OAAA,CAAQb,GAAG;MACvC,IAAI,CAACW,IAAA,IAAQG,IAAA,CAAKC,GAAA,CAAI,IAAIC,MAAA,CAAOL,IAAI,IAAI,KAAQ;QAC/CC,cAAA,CAAeK,OAAA,CAAQjB,GAAA,EAAKkB,MAAA,CAAOJ,IAAA,CAAKC,GAAA,CAAI,CAAC,CAAC;QAC9CT,MAAA,CAAOa,QAAA,CAASC,MAAA,CAAO;MACzB;IACF,CAAC;EACH;EAGAzF,mBAAA,CAAoB;EAEpB,MAAM0F,aAAA,GAAgBrF,gBAAA,CAAiB,KAAK,CAAC;EAC7C,MAAMiC,aAAA,GAAgBoD,aAAA,CAAcpD,aAAA;EAIpC,IAAIoD,aAAA,CAAclD,OAAA,EAAS;IACzB,MAAMmD,eAAA,GAAkBD,aAAA,CAAclD,OAAA,CAAQ0B,GAAA,CAAK0B,CAAA,IAAW;MAC5D,IAAI,CAACA,CAAA,CAAE3D,UAAA,IAAcyD,aAAA,CAAczD,UAAA,EAAY;QAC7C,OAAO;UAAE,GAAG2D,CAAA;UAAG3D,UAAA,EAAYyD,aAAA,CAAczD;QAAW;MACtD;MACA,OAAO2D,CAAA;IACT,CAAC;IACD9F,iBAAA,CAAkB6F,eAAe;EACnC;EAWA,MAAME,aAAA,GAAgBnF,OAAA,CAAQe,eAAA,GAC1Bf,OAAA,CAAQe,eAAA,CAAgB,IACxBG,OAAA,CAAQkE,OAAA,CAAQ;EAIpB,MAAMC,eAAA,GAAkBzD,aAAA,GACpB0D,MAAA,CAAOC,OAAA,CAAQ3D,aAAa,EAAE4B,GAAA,CAAI,OAAO,CAACgC,QAAA,EAAUC,UAAU,MAAM;IAClE,MAAMC,GAAA,GAAM,MAAM;IAA0BD,UAAA;IAC5CpG,sBAAA,CAAuBmG,QAAA,EAAUE,GAAG;IACpC,OAAOA,GAAA;EACT,CAAC,IACD,CAACnG,cAAA,CAAeS,OAAA,CAAQqC,MAAA,EAAQrC,OAAA,CAAQsC,UAAU,CAAC;EAMvD,MAAMqD,YAAA,GAAgB1B,MAAA,CAAe2B,QAAA;EACrC,IAAID,YAAA,EAAcE,YAAA,EAAc;IAC9B,MAAMC,YAAA,GAAe7B,MAAA,CAAO8B,OAAA,CAAQC,KAAA,IAAS,CAAC;IAC9C/B,MAAA,CAAO8B,OAAA,CAAQE,YAAA,CACb;MACE,GAAGH,YAAA;MACHI,cAAA,EAAgB;QAAEC,QAAA,EAAUR,YAAA,CAAaE,YAAA;QAAcO,MAAA,EAAQ;MAAG;IACpE,GACA,EACF;EACF;EAEA,OAAOjB,aAAA,CACJkB,IAAA,CAAK,MAAMnF,OAAA,CAAQC,GAAA,CAAIkE,eAAe,CAAC,EACvCgB,IAAA,CAAK,MAAM;IACV,OAAOpH,mBAAA,CAAoB+F,aAAa;EAC1C,CAAC,EACAqB,IAAA,CAAK,MAAM;IACVlH,MAAA,CACE,eAAAW,GAAA,CAACZ,IAAA;MACCoH,QAAA,EAAQ;MACRpE,KAAA,EAAOlC,OAAA,CAAQkC,KAAA;MACfG,MAAA,EAAQrC,OAAA,CAAQqC,MAAA;MAChBC,UAAA,EAAYtC,OAAA,CAAQsC,UAAA;MACpBiE,IAAA,EAAMtC,MAAA,CAAOa,QAAA,CAAS0B;IAAA,CACxB,CACF;EACF,CAAC,EACAC,KAAA,CAAO5C,GAAA,IAAQ;IACd6C,OAAA,CAAQC,KAAA,CAAM,uCAAuC9C,GAAG;EAC1D,CAAC;AACL","ignoreList":[]}
+{"version":3,"names":["cloneElement","AppRegistry","resolveClientLoader","Root","render","initClientMatches","registerPreloadedRoute","setupSkewProtection","findRootLayout","getServerHeadInsertions","SERVER_CONTEXT_POST_RENDER_STRING","safeJsonStringify","getServerContext","setServerContext","Fragment","jsx","createApp","options","import","meta","env","SSR","cachedReactDOMServer","cachedServerRender","cachedRenderToStaticMarkup","cachedRenderToString","setupDone","props","renderMode","mode","shouldRunSetup","process","ONE_RENDER_MODE","getSetupPromise","rds","sr","Promise","all","renderToStaticMarkup","default","renderToString","loaderData","loaderProps","css","cssContents","loaderServerData","routePreloads","routePreloads2","matches","postRenderData","renderId","rootElement","flags","onRenderId","id","routes","routerRoot","html","preloads","extraHeadElements","registerComponent","app","getApplication","styleTag","getStyleElement","nonce","ONE_NONCE","push","insertions","insertion","out","length","extraHeadHTML","children","map","x","i","key","replace","err","includes","renderStream","renderToStream","window","ONE_SKEW_PROTECTION","addEventListener","e","preventDefault","last","sessionStorage","getItem","Date","now","Number","setItem","String","location","reload","serverContext","restoredMatches","m","setupComplete","resolve","preloadPromises","Object","entries","routeKey","bundlePath","mod","one404Marker","__one404","notFoundPath","currentState","history","state","replaceState","__tempLocation","pathname","search","then","isClient","path","href","catch","console","error"],"sources":["../../src/createApp.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/router/interceptRoutes.mjs

@@ -1,4 +1,4 @@
-import { matchDynamicName, stripGroupSegmentsFromPath } from "./matchers.mjs";
+import { matchDynamicName, matchRoutePattern, stripGroupSegmentsFromPath } from "./matchers.mjs";
 import { isNative } from "../constants.mjs";
 let navigationMode = "hard";
 function setNavigationType(type) {
@@ -27,27 +27,8 @@ function getLayoutPath(node) {
   return "/" + path;
 }
 function isLayoutAncestorOfPath(layoutPath, currentPath) {
-  const normalizedLayout = layoutPath.replace(/\/+$/, "") || "/";
-  const normalizedCurrent = currentPath.replace(/\/+$/, "") || "/";
-  if (normalizedLayout === "/") return true;
-  const layoutParts = normalizedLayout.split("/").filter(Boolean);
-  const currentParts = normalizedCurrent.split("/").filter(Boolean);
-  if (layoutParts.length > currentParts.length) return false;
-  for (let i = 0; i < layoutParts.length; i++) {
-    const layoutPart = layoutParts[i];
-    const currentPart = currentParts[i];
-    const dynamicMatch = matchDynamicName(layoutPart);
-    if (dynamicMatch) {
-      if (dynamicMatch.deep) {
-        return true;
-      }
-      continue;
-    }
-    if (layoutPart !== currentPart) {
-      return false;
-    }
-  }
-  return true;
+  if (!layoutPath.replace(/\/+$/, "")) return true;
+  return matchRoutePattern(layoutPath, currentPath) !== null;
 }
 function findLayoutsWithSlotsAlongPath(rootNode, currentPath) {
   if (!rootNode) return [];