react-router 0.0.0-experimental-cb0fdf114 → 0.0.0-experimental-689d76079

package/CHANGELOG.md

@@ -1,5 +1,79 @@
 # `react-router`
 
+## v7.14.1
+
+### Patch Changes
+
+- Fix a potential race condition that can occur when rendering a `HydrateFallback` and initial loaders land before the `router.subscribe` call happens in the `RouterProvider` layout effect
+- Normalize double-slashes in redirect paths
+
+## 7.14.0
+
+### Patch Changes
+
+- UNSTABLE RSC FRAMEWORK MODE BREAKING CHANGE - Existing route module exports remain unchanged from stable v7 non-RSC mode, but new exports are added for RSC mode. If you want to use RSC features, you will need to update your route modules to export the new annotations. ([#14901](https://github.com/remix-run/react-router/pull/14901))
+
+  If you are using RSC framework mode currently, you will need to update your route modules to the new conventions. The following route module components have their own mutually exclusive server component counterparts:
+
+  | Server Component Export | Client Component  |
+  | ----------------------- | ----------------- |
+  | `ServerComponent`       | `default`         |
+  | `ServerErrorBoundary`   | `ErrorBoundary`   |
+  | `ServerLayout`          | `Layout`          |
+  | `ServerHydrateFallback` | `HydrateFallback` |
+
+  If you were previously exporting a `ServerComponent`, your `ErrorBoundary`, `Layout`, and `HydrateFallback` were also server components. If you want to keep those as server components, you can rename them and prefix them with `Server`. If you were previously importing the implementations of those components from a client module, you can simply inline them.
+
+  Example:
+
+  Before
+
+  ```tsx
+  import { ErrorBoundary as ClientErrorBoundary } from "./client";
+
+  export function ServerComponent() {
+    // ...
+  }
+
+  export function ErrorBoundary() {
+    return <ClientErrorBoundary />;
+  }
+
+  export function Layout() {
+    // ...
+  }
+
+  export function HydrateFallback() {
+    // ...
+  }
+  ```
+
+  After
+
+  ```tsx
+  export function ServerComponent() {
+    // ...
+  }
+
+  export function ErrorBoundary() {
+    // previous implementation of ClientErrorBoundary, this is now a client component
+  }
+
+  export function ServerLayout() {
+    // rename previous Layout export to ServerLayout to make it a server component
+  }
+
+  export function ServerHydrateFallback() {
+    // rename previous HydrateFallback export to ServerHydrateFallback to make it a server component
+  }
+  ```
+
+- rsc Link prefetch ([#14902](https://github.com/remix-run/react-router/pull/14902))
+
+- Remove recursion from turbo-stream v2 allowing for encoding / decoding of massive payloads. ([#14838](https://github.com/remix-run/react-router/pull/14838))
+
+- encodeViaTurboStream leaked memory via unremoved AbortSignal listener ([#14900](https://github.com/remix-run/react-router/pull/14900))
+
 ## 7.13.2
 
 ### Patch Changes

package/dist/development/{browser-C9Ar1yxG.d.ts → browser-C-UvoYvi.d.ts}

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterInit } from './instrumentation-BYr6ff5D.js';
-import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './routeModules-CA7kSxJJ.js';
+import { R as RouterInit } from './instrumentation-g0dG8UL0.js';
+import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './routeModules-7rtk67cd.js';
 
 declare function getRequest(): Request;
 type RSCRouteConfigEntryBase = {

package/dist/development/{browser-vtIR1Kpe.d.mts → browser-I6n6wVSO.d.mts}

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterInit } from './context-phCt_zmH.mjs';
-import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './routeModules-BRrCYrSL.mjs';
+import { R as RouterInit } from './context-DGGUoDIu.mjs';
+import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './routeModules-BW4a8k3I.mjs';
 
 declare function getRequest(): Request;
 type RSCRouteConfigEntryBase = {

package/dist/development/{chunk-C2BCPNNB.js → chunk-64IGXH5S.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v0.0.0-experimental-cb0fdf114
+ * react-router v0.0.0-experimental-689d76079
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -723,8 +723,7 @@ function generatePath(originalPath, params = {}) {
   const segments = path.split(/\/+/).map((segment, index, array) => {
     const isLastSegment = index === array.length - 1;
     if (isLastSegment && segment === "*") {
-      const star = "*";
-      return stringify2(params[star]);
+      return stringify2(params["*"]);
     }
     const keyMatch = segment.match(/^:([\w-]+)(\??)(.*)/);
     if (keyMatch) {
@@ -845,7 +844,7 @@ function resolvePath(to, fromPathname = "/") {
   } = typeof to === "string" ? parsePath(to) : to;
   let pathname;
   if (toPathname) {
-    toPathname = toPathname.replace(/\/\/+/g, "/");
+    toPathname = removeDoubleSlashes(toPathname);
     if (toPathname.startsWith("/")) {
       pathname = resolvePathname(toPathname.substring(1), "/");
     } else {
@@ -861,7 +860,7 @@ function resolvePath(to, fromPathname = "/") {
   };
 }
 function resolvePathname(relativePath, fromPathname) {
-  let segments = fromPathname.replace(/\/+$/, "").split("/");
+  let segments = removeTrailingSlash(fromPathname).split("/");
   let relativeSegments = relativePath.split("/");
   relativeSegments.forEach((segment) => {
     if (segment === "..") {
@@ -932,8 +931,10 @@ function resolveTo(toArg, routePathnames, locationPathname, isPathRelative = fal
   }
   return path;
 }
-var joinPaths = (paths) => paths.join("/").replace(/\/\/+/g, "/");
-var normalizePathname = (pathname) => pathname.replace(/\/+$/, "").replace(/^\/*/, "/");
+var removeDoubleSlashes = (path) => path.replace(/\/\/+/g, "/");
+var joinPaths = (paths) => removeDoubleSlashes(paths.join("/"));
+var removeTrailingSlash = (path) => path.replace(/\/+$/, "");
+var normalizePathname = (pathname) => removeTrailingSlash(pathname).replace(/^\/*/, "/");
 var normalizeSearch = (search) => !search || search === "?" ? "" : search.startsWith("?") ? search : "?" + search;
 var normalizeHash = (hash) => !hash || hash === "#" ? "" : hash.startsWith("#") ? hash : "#" + hash;
 var DataWithResponseInit = class {
@@ -987,7 +988,8 @@ function isRouteErrorResponse(error) {
   return error != null && typeof error.status === "number" && typeof error.statusText === "string" && typeof error.internal === "boolean" && "data" in error;
 }
 function getRoutePattern(matches) {
-  return matches.map((m) => m.route.path).filter(Boolean).join("/").replace(/\/\/*/g, "/") || "/";
+  let parts = matches.map((m) => m.route.path).filter(Boolean);
+  return joinPaths(parts) || "/";
 }
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 function parseToInfo(_to, basename) {
@@ -2656,6 +2658,14 @@ function createRouter(init) {
       key
     );
     let result = results[match.route.id];
+    if (!result) {
+      for (let match2 of matches) {
+        if (results[match2.route.id]) {
+          result = results[match2.route.id];
+          break;
+        }
+      }
+    }
     if (fetchControllers.get(key) === abortController) {
       fetchControllers.delete(key);
     }
@@ -5022,7 +5032,7 @@ function normalizeRedirectLocation(location, currentUrl, basename, historyInstan
     }
     let isSameBasename = stripBasename(url.pathname, basename) != null;
     if (url.origin === currentUrl.origin && isSameBasename) {
-      return url.pathname + url.search + url.hash;
+      return removeDoubleSlashes(url.pathname) + url.search + url.hash;
     }
   }
   try {
@@ -5711,9 +5721,6 @@ async function stringify(stack) {
             deferred[index] = input;
           } else if (input instanceof Error) {
             str[index] = `["${TYPE_ERROR}",${JSON.stringify(input.message)}`;
-            if (input.name !== "Error") {
-              str[index] += `,${JSON.stringify(input.name)}`;
-            }
             str[index] += "]";
           } else if (Object.getPrototypeOf(input) === null) {
             str[index] = `["${TYPE_NULL_OBJECT}",{${partsForObj(input)}}]`;
@@ -5778,7 +5785,6 @@ function isPlainObject2(thing) {
 }
 
 // vendor/turbo-stream-v2/unflatten.ts
-var globalObj = typeof window !== "undefined" ? window : typeof globalThis !== "undefined" ? globalThis : void 0;
 function unflatten(parsed) {
   const { hydrated, values } = this;
   if (typeof parsed === "number") return hydrate.call(this, parsed);
@@ -5921,8 +5927,8 @@ function hydrate(index) {
             }
             continue;
           case TYPE_ERROR:
-            const [, message, errorType] = value;
-            let error = errorType && globalObj && globalObj[errorType] ? new globalObj[errorType](message) : new Error(message);
+            const [, message] = value;
+            let error = new Error(message);
             hydrated[index2] = error;
             set(error);
             continue;
@@ -6628,9 +6634,9 @@ function singleFetchUrl(reqUrl, basename, trailingSlashAware, extension) {
     if (url.pathname === "/") {
       url.pathname = `_root.${extension}`;
     } else if (basename && stripBasename(url.pathname, basename) === "/") {
-      url.pathname = `${basename.replace(/\/$/, "")}/_root.${extension}`;
+      url.pathname = `${removeTrailingSlash(basename)}/_root.${extension}`;
     } else {
-      url.pathname = `${url.pathname.replace(/\/$/, "")}.${extension}`;
+      url.pathname = `${removeTrailingSlash(url.pathname)}.${extension}`;
     }
   }
   return url;
@@ -6984,7 +6990,7 @@ function useOutlet(context) {
 function useParams() {
   let { matches } = React3.useContext(RouteContext);
   let routeMatch = matches[matches.length - 1];
-  return routeMatch ? routeMatch.params : {};
+  return _nullishCoalesce(_optionalChain([routeMatch, 'optionalAccess', _87 => _87.params]), () => ( {}));
 }
 function useResolvedPath(to, { relative } = {}) {
   let { matches } = React3.useContext(RouteContext);
@@ -7032,7 +7038,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
   if (locationArg) {
     let parsedLocationArg = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
     invariant(
-      parentPathnameBase === "/" || _optionalChain([parsedLocationArg, 'access', _87 => _87.pathname, 'optionalAccess', _88 => _88.startsWith, 'call', _89 => _89(parentPathnameBase)]),
+      parentPathnameBase === "/" || _optionalChain([parsedLocationArg, 'access', _88 => _88.pathname, 'optionalAccess', _89 => _89.startsWith, 'call', _90 => _90(parentPathnameBase)]),
       `When overriding the location using \`<Routes location>\` or \`useRoutes(routes, location)\`, the location pathname must begin with the portion of the URL pathname that was matched by all parent routes. The current pathname base is "${parentPathnameBase}" but pathname "${parsedLocationArg.pathname}" was given in the \`location\` prop.`
     );
     location = parsedLocationArg;
@@ -7226,7 +7232,7 @@ function RenderedRoute({ routeContext, match, children }) {
   return /* @__PURE__ */ React3.createElement(RouteContext.Provider, { value: routeContext }, children);
 }
 function _renderMatches(matches, parentMatches = [], dataRouterOpts) {
-  let dataRouterState = _optionalChain([dataRouterOpts, 'optionalAccess', _90 => _90.state]);
+  let dataRouterState = _optionalChain([dataRouterOpts, 'optionalAccess', _91 => _91.state]);
   if (matches == null) {
     if (!dataRouterState) {
       return null;
@@ -7240,10 +7246,10 @@ function _renderMatches(matches, parentMatches = [], dataRouterOpts) {
     }
   }
   let renderedMatches = matches;
-  let errors = _optionalChain([dataRouterState, 'optionalAccess', _91 => _91.errors]);
+  let errors = _optionalChain([dataRouterState, 'optionalAccess', _92 => _92.errors]);
   if (errors != null) {
     let errorIndex = renderedMatches.findIndex(
-      (m) => m.route.id && _optionalChain([errors, 'optionalAccess', _92 => _92[m.route.id]]) !== void 0
+      (m) => m.route.id && _optionalChain([errors, 'optionalAccess', _93 => _93[m.route.id]]) !== void 0
     );
     invariant(
       errorIndex >= 0,
@@ -7282,11 +7288,11 @@ function _renderMatches(matches, parentMatches = [], dataRouterOpts) {
       }
     }
   }
-  let onErrorHandler = _optionalChain([dataRouterOpts, 'optionalAccess', _93 => _93.onError]);
+  let onErrorHandler = _optionalChain([dataRouterOpts, 'optionalAccess', _94 => _94.onError]);
   let onError = dataRouterState && onErrorHandler ? (error, errorInfo) => {
     onErrorHandler(error, {
       location: dataRouterState.location,
-      params: _nullishCoalesce(_optionalChain([dataRouterState, 'access', _94 => _94.matches, 'optionalAccess', _95 => _95[0], 'optionalAccess', _96 => _96.params]), () => ( {})),
+      params: _nullishCoalesce(_optionalChain([dataRouterState, 'access', _95 => _95.matches, 'optionalAccess', _96 => _96[0], 'optionalAccess', _97 => _97.params]), () => ( {})),
       unstable_pattern: getRoutePattern(dataRouterState.matches),
       errorInfo
     });
@@ -7433,15 +7439,15 @@ function useRouteError() {
   if (error !== void 0) {
     return error;
   }
-  return _optionalChain([state, 'access', _97 => _97.errors, 'optionalAccess', _98 => _98[routeId]]);
+  return _optionalChain([state, 'access', _98 => _98.errors, 'optionalAccess', _99 => _99[routeId]]);
 }
 function useAsyncValue() {
   let value = React3.useContext(AwaitContext);
-  return _optionalChain([value, 'optionalAccess', _99 => _99._data]);
+  return _optionalChain([value, 'optionalAccess', _100 => _100._data]);
 }
 function useAsyncError() {
   let value = React3.useContext(AwaitContext);
-  return _optionalChain([value, 'optionalAccess', _100 => _100._error]);
+  return _optionalChain([value, 'optionalAccess', _101 => _101._error]);
 }
 var blockerId = 0;
 function useBlocker(shouldBlock) {
@@ -7522,7 +7528,7 @@ function useRoute(...args) {
   return {
     handle: route.route.handle,
     loaderData: state.loaderData[id],
-    actionData: _optionalChain([state, 'access', _101 => _101.actionData, 'optionalAccess', _102 => _102[id]])
+    actionData: _optionalChain([state, 'access', _102 => _102.actionData, 'optionalAccess', _103 => _103[id]])
   };
 }
 
@@ -7567,7 +7573,7 @@ function getKeyedLinksForMatches(matches, routeModules, manifest) {
     let route = manifest.routes[match.route.id];
     return [
       route && route.css ? route.css.map((href) => ({ rel: "stylesheet", href })) : [],
-      _optionalChain([module, 'optionalAccess', _103 => _103.links, 'optionalCall', _104 => _104()]) || []
+      _optionalChain([module, 'optionalAccess', _104 => _104.links, 'optionalCall', _105 => _105()]) || []
     ];
   }).flat(2);
   let preloads = getModuleLinkHrefs(matches, manifest);
@@ -7668,7 +7674,7 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
       // param change, /users/123 -> /users/456
       currentMatches[index].pathname !== match.pathname || // splat param changed, which is not present in match.path
       // e.g. /files/images/avatar.jpg -> files/finances.xls
-      _optionalChain([currentMatches, 'access', _105 => _105[index], 'access', _106 => _106.route, 'access', _107 => _107.path, 'optionalAccess', _108 => _108.endsWith, 'call', _109 => _109("*")]) && currentMatches[index].params["*"] !== match.params["*"]
+      _optionalChain([currentMatches, 'access', _106 => _106[index], 'access', _107 => _107.route, 'access', _108 => _108.path, 'optionalAccess', _109 => _109.endsWith, 'call', _110 => _110("*")]) && currentMatches[index].params["*"] !== match.params["*"]
     );
   };
   if (mode === "assets") {
@@ -7691,7 +7697,7 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
             location.pathname + location.search + location.hash,
             window.origin
           ),
-          currentParams: _optionalChain([currentMatches, 'access', _110 => _110[0], 'optionalAccess', _111 => _111.params]) || {},
+          currentParams: _optionalChain([currentMatches, 'access', _111 => _111[0], 'optionalAccess', _112 => _112.params]) || {},
           nextUrl: new URL(page, window.origin),
           nextParams: match.params,
           defaultShouldRevalidate: true
@@ -7963,10 +7969,10 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
         )
       });
       let hasInitialData = initialState && initialState.loaderData && route.id in initialState.loaderData;
-      let initialData = hasInitialData ? _optionalChain([initialState, 'optionalAccess', _112 => _112.loaderData, 'optionalAccess', _113 => _113[route.id]]) : void 0;
+      let initialData = hasInitialData ? _optionalChain([initialState, 'optionalAccess', _113 => _113.loaderData, 'optionalAccess', _114 => _114[route.id]]) : void 0;
       let hasInitialError = initialState && initialState.errors && route.id in initialState.errors;
-      let initialError = hasInitialError ? _optionalChain([initialState, 'optionalAccess', _114 => _114.errors, 'optionalAccess', _115 => _115[route.id]]) : void 0;
-      let isHydrationRequest = needsRevalidation == null && (_optionalChain([routeModule, 'access', _116 => _116.clientLoader, 'optionalAccess', _117 => _117.hydrate]) === true || !route.hasLoader);
+      let initialError = hasInitialError ? _optionalChain([initialState, 'optionalAccess', _115 => _115.errors, 'optionalAccess', _116 => _116[route.id]]) : void 0;
+      let isHydrationRequest = needsRevalidation == null && (_optionalChain([routeModule, 'access', _117 => _117.clientLoader, 'optionalAccess', _118 => _118.hydrate]) === true || !route.hasLoader);
       dataRoute.loader = async ({
         request,
         params,
@@ -8275,7 +8281,7 @@ function getPatchRoutesOnNavigationFunction(getRouter, manifest, routeModules, s
 function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscovery, isSpaMode) {
   React6.useEffect(() => {
     if (!isFogOfWarEnabled(routeDiscovery, ssr) || // @ts-expect-error - TS doesn't know about this yet
-    _optionalChain([window, 'access', _118 => _118.navigator, 'optionalAccess', _119 => _119.connection, 'optionalAccess', _120 => _120.saveData]) === true) {
+    _optionalChain([window, 'access', _119 => _119.navigator, 'optionalAccess', _120 => _120.connection, 'optionalAccess', _121 => _121.saveData]) === true) {
       return;
     }
     function registerElement(el) {
@@ -8330,10 +8336,7 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscover
 }
 function getManifestPath(_manifestPath, basename) {
   let manifestPath = _manifestPath || "/__manifest";
-  if (basename == null) {
-    return manifestPath;
-  }
-  return `${basename}${manifestPath}`.replace(/\/+/g, "/");
+  return basename == null ? manifestPath : joinPaths([basename, manifestPath]);
 }
 var MANIFEST_VERSION_STORAGE_KEY = "react-router-manifest-version";
 async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, manifestPath, patchRoutes, signal) {
@@ -8384,7 +8387,7 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
     }
     serverPatches = await res.json();
   } catch (e) {
-    if (_optionalChain([signal, 'optionalAccess', _121 => _121.aborted])) return;
+    if (_optionalChain([signal, 'optionalAccess', _122 => _122.aborted])) return;
     throw e;
   }
   let knownRoutes = new Set(Object.keys(manifest.routes));
@@ -8687,7 +8690,7 @@ function PrefetchPageLinksImpl({
       if (!manifestRoute || !manifestRoute.hasLoader) {
         return;
       }
-      if (!newMatchesForData.some((m2) => m2.route.id === m.route.id) && m.route.id in loaderData && _optionalChain([routeModules, 'access', _122 => _122[m.route.id], 'optionalAccess', _123 => _123.shouldRevalidate])) {
+      if (!newMatchesForData.some((m2) => m2.route.id === m.route.id) && m.route.id in loaderData && _optionalChain([routeModules, 'access', _123 => _123[m.route.id], 'optionalAccess', _124 => _124.shouldRevalidate])) {
         foundOptOutRoute = true;
       } else if (manifestRoute.hasClientLoader) {
         foundOptOutRoute = true;
@@ -8775,7 +8778,7 @@ function Meta() {
       error
     };
     matches[i] = match;
-    if (_optionalChain([routeModule, 'optionalAccess', _124 => _124.meta])) {
+    if (_optionalChain([routeModule, 'optionalAccess', _125 => _125.meta])) {
       routeMeta = typeof routeModule.meta === "function" ? routeModule.meta({
         data: data2,
         loaderData: data2,
@@ -8874,7 +8877,7 @@ function Scripts(scriptProps) {
     }
     let streamScript = "window.__reactRouterContext.stream = new ReadableStream({start(controller){window.__reactRouterContext.streamController = controller;}}).pipeThrough(new TextEncoderStream());";
     let contextScript = staticContext ? `window.__reactRouterContext = ${serverHandoffString};${streamScript}` : " ";
-    let routeModulesScript = !isStatic ? " " : `${_optionalChain([manifest, 'access', _125 => _125.hmr, 'optionalAccess', _126 => _126.runtime]) ? `import ${JSON.stringify(manifest.hmr.runtime)};` : ""}${!enableFogOfWar ? `import ${JSON.stringify(manifest.url)}` : ""};
+    let routeModulesScript = !isStatic ? " " : `${_optionalChain([manifest, 'access', _126 => _126.hmr, 'optionalAccess', _127 => _127.runtime]) ? `import ${JSON.stringify(manifest.hmr.runtime)};` : ""}${!enableFogOfWar ? `import ${JSON.stringify(manifest.url)}` : ""};
 ${matches.map((match, routeIndex) => {
       let routeVarName = `route${routeIndex}`;
       let manifestEntry = manifest.routes[match.route.id];
@@ -9105,7 +9108,7 @@ function BoundaryShell({
   children
 }) {
   let { routeModules } = useFrameworkContext();
-  if (_optionalChain([routeModules, 'access', _127 => _127.root, 'optionalAccess', _128 => _128.Layout]) && !isOutsideRemixApp) {
+  if (_optionalChain([routeModules, 'access', _128 => _128.root, 'optionalAccess', _129 => _129.Layout]) && !isOutsideRemixApp) {
     return children;
   }
   return /* @__PURE__ */ React8.createElement("html", { lang: "en" }, /* @__PURE__ */ React8.createElement("head", null, /* @__PURE__ */ React8.createElement("meta", { charSet: "utf-8" }), /* @__PURE__ */ React8.createElement(
@@ -9185,20 +9188,20 @@ var hydrationRouteProperties = [
 ];
 function createMemoryRouter(routes, opts) {
   return createRouter({
-    basename: _optionalChain([opts, 'optionalAccess', _129 => _129.basename]),
-    getContext: _optionalChain([opts, 'optionalAccess', _130 => _130.getContext]),
-    future: _optionalChain([opts, 'optionalAccess', _131 => _131.future]),
+    basename: _optionalChain([opts, 'optionalAccess', _130 => _130.basename]),
+    getContext: _optionalChain([opts, 'optionalAccess', _131 => _131.getContext]),
+    future: _optionalChain([opts, 'optionalAccess', _132 => _132.future]),
     history: createMemoryHistory({
-      initialEntries: _optionalChain([opts, 'optionalAccess', _132 => _132.initialEntries]),
-      initialIndex: _optionalChain([opts, 'optionalAccess', _133 => _133.initialIndex])
+      initialEntries: _optionalChain([opts, 'optionalAccess', _133 => _133.initialEntries]),
+      initialIndex: _optionalChain([opts, 'optionalAccess', _134 => _134.initialIndex])
     }),
-    hydrationData: _optionalChain([opts, 'optionalAccess', _134 => _134.hydrationData]),
+    hydrationData: _optionalChain([opts, 'optionalAccess', _135 => _135.hydrationData]),
     routes,
     hydrationRouteProperties,
     mapRouteProperties,
-    dataStrategy: _optionalChain([opts, 'optionalAccess', _135 => _135.dataStrategy]),
-    patchRoutesOnNavigation: _optionalChain([opts, 'optionalAccess', _136 => _136.patchRoutesOnNavigation]),
-    unstable_instrumentations: _optionalChain([opts, 'optionalAccess', _137 => _137.unstable_instrumentations])
+    dataStrategy: _optionalChain([opts, 'optionalAccess', _136 => _136.dataStrategy]),
+    patchRoutesOnNavigation: _optionalChain([opts, 'optionalAccess', _137 => _137.patchRoutesOnNavigation]),
+    unstable_instrumentations: _optionalChain([opts, 'optionalAccess', _138 => _138.unstable_instrumentations])
   }).initialize();
 }
 var Deferred2 = class {
@@ -9244,7 +9247,7 @@ function RouterProvider({
         Object.values(newErrors).forEach(
           (error) => onError(error, {
             location: newState.location,
-            params: _nullishCoalesce(_optionalChain([newState, 'access', _138 => _138.matches, 'access', _139 => _139[0], 'optionalAccess', _140 => _140.params]), () => ( {})),
+            params: _nullishCoalesce(_optionalChain([newState, 'access', _139 => _139.matches, 'access', _140 => _140[0], 'optionalAccess', _141 => _141.params]), () => ( {})),
             unstable_pattern: getRoutePattern(newState.matches)
           })
         );
@@ -9282,7 +9285,7 @@ function RouterProvider({
       if (reactDomFlushSyncImpl && flushSync) {
         reactDomFlushSyncImpl(() => {
           if (transition) {
-            _optionalChain([renderDfd, 'optionalAccess', _141 => _141.resolve, 'call', _142 => _142()]);
+            _optionalChain([renderDfd, 'optionalAccess', _142 => _142.resolve, 'call', _143 => _143()]);
             transition.skipTransition();
           }
           setVtContext({
@@ -9307,7 +9310,7 @@ function RouterProvider({
         return;
       }
       if (transition) {
-        _optionalChain([renderDfd, 'optionalAccess', _143 => _143.resolve, 'call', _144 => _144()]);
+        _optionalChain([renderDfd, 'optionalAccess', _144 => _144.resolve, 'call', _145 => _145()]);
         transition.skipTransition();
         setInterruption({
           state: newState,
@@ -9335,6 +9338,16 @@ function RouterProvider({
     ]
   );
   React9.useLayoutEffect(() => router.subscribe(setState), [router, setState]);
+  let initialized = state.initialized;
+  React9.useLayoutEffect(() => {
+    if (!initialized && router.state.initialized) {
+      setState(router.state, {
+        deletedFetchers: [],
+        flushSync: false,
+        newErrors: null
+      });
+    }
+  }, [initialized, setState, router.state]);
   React9.useEffect(() => {
     if (vtContext.isTransitioning && !vtContext.flushSync) {
       setRenderDfd(new Deferred2());
@@ -9396,12 +9409,12 @@ function RouterProvider({
       go: (n) => router.navigate(n),
       push: (to, state2, opts) => router.navigate(to, {
         state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _145 => _145.preventScrollReset])
+        preventScrollReset: _optionalChain([opts, 'optionalAccess', _146 => _146.preventScrollReset])
       }),
       replace: (to, state2, opts) => router.navigate(to, {
         replace: true,
         state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _146 => _146.preventScrollReset])
+        preventScrollReset: _optionalChain([opts, 'optionalAccess', _147 => _147.preventScrollReset])
       })
     };
   }, [router]);
@@ -9633,7 +9646,7 @@ function Await({
       if (dataRouterContext && dataRouterContext.onError && dataRouterStateContext) {
         dataRouterContext.onError(error, {
           location: dataRouterStateContext.location,
-          params: _optionalChain([dataRouterStateContext, 'access', _147 => _147.matches, 'access', _148 => _148[0], 'optionalAccess', _149 => _149.params]) || {},
+          params: _optionalChain([dataRouterStateContext, 'access', _148 => _148.matches, 'access', _149 => _149[0], 'optionalAccess', _150 => _150.params]) || {},
           unstable_pattern: getRoutePattern(dataRouterStateContext.matches),
           errorInfo
         });
@@ -9695,7 +9708,7 @@ var AwaitErrorBoundary = class extends React9.Component {
       promise = resolve.then(
         (data2) => Object.defineProperty(resolve, "_data", { get: () => data2 }),
         (error) => {
-          _optionalChain([this, 'access', _150 => _150.props, 'access', _151 => _151.onError, 'optionalCall', _152 => _152(error)]);
+          _optionalChain([this, 'access', _151 => _151.props, 'access', _152 => _152.onError, 'optionalCall', _153 => _153(error)]);
           Object.defineProperty(resolve, "_error", { get: () => error });
         }
       );

package/dist/{production/chunk-TVHB74EG.js → development/chunk-E4C63BHH.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }/**
- * react-router v0.0.0-experimental-cb0fdf114
+ * react-router v0.0.0-experimental-689d76079
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,7 +14,7 @@
 
 
 
-var _chunkAS4FL2MBjs = require('./chunk-AS4FL2MB.js');
+var _chunk64IGXH5Sjs = require('./chunk-64IGXH5S.js');
 
 // lib/dom/ssr/hydration.tsx
 function getHydrationData({
@@ -29,12 +29,12 @@ function getHydrationData({
     ...state,
     loaderData: { ...state.loaderData }
   };
-  let initialMatches = _chunkAS4FL2MBjs.matchRoutes.call(void 0, routes, location, basename);
+  let initialMatches = _chunk64IGXH5Sjs.matchRoutes.call(void 0, routes, location, basename);
   if (initialMatches) {
     for (let match of initialMatches) {
       let routeId = match.route.id;
       let routeInfo = getRouteInfo(routeId);
-      if (_chunkAS4FL2MBjs.shouldHydrateRouteLoader.call(void 0, 
+      if (_chunk64IGXH5Sjs.shouldHydrateRouteLoader.call(void 0, 
         routeId,
         routeInfo.clientLoader,
         routeInfo.hasLoader,
@@ -112,7 +112,7 @@ function RSCDefaultRootErrorBoundaryImpl({
       }
     }
   );
-  if (_chunkAS4FL2MBjs.isRouteErrorResponse.call(void 0, error)) {
+  if (_chunk64IGXH5Sjs.isRouteErrorResponse.call(void 0, error)) {
     return /* @__PURE__ */ _react2.default.createElement(
       ErrorWrapper,
       {
@@ -120,7 +120,7 @@ function RSCDefaultRootErrorBoundaryImpl({
         title: "Unhandled Thrown Response!"
       },
       /* @__PURE__ */ _react2.default.createElement("h1", { style: { fontSize: "24px" } }, error.status, " ", error.statusText),
-      _chunkAS4FL2MBjs.ENABLE_DEV_WARNINGS ? heyDeveloper : null
+      _chunk64IGXH5Sjs.ENABLE_DEV_WARNINGS ? heyDeveloper : null
     );
   }
   let errorInstance;
@@ -146,7 +146,7 @@ function RSCDefaultRootErrorBoundaryImpl({
 function RSCDefaultRootErrorBoundary({
   hasRootLayout
 }) {
-  let error = _chunkAS4FL2MBjs.useRouteError.call(void 0, );
+  let error = _chunk64IGXH5Sjs.useRouteError.call(void 0, );
   if (hasRootLayout === void 0) {
     throw new Error("Missing 'hasRootLayout' prop");
   }

package/dist/development/{chunk-N5N2QD3Q.mjs → chunk-N6IZKBC5.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-cb0fdf114
+ * react-router v0.0.0-experimental-689d76079
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -51,7 +51,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-L7VOOA4V.mjs";
+} from "./chunk-RPWK4TB6.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -579,7 +579,7 @@ function getDevServerHooks() {
 function getBuildTimeHeader(request, headerName) {
   if (typeof process !== "undefined") {
     try {
-      if (process.env?.IS_RR_BUILD_REQUEST === "yes") {
+      if (process.env.hasOwnProperty("IS_RR_BUILD_REQUEST") && process.env.IS_RR_BUILD_REQUEST === "yes") {
         return request.headers.get(headerName);
       }
     } catch (e) {