react-router 0.0.0-experimental-1d760f6a6 → 0.0.0-experimental-b2bc694a6

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # `react-router`
 
+## 7.5.3
+
+### Patch Changes
+
+- Fix bug where bubbled action errors would result in `loaderData` being cleared at the handling `ErrorBoundary` route ([#13476](https://github.com/remix-run/react-router/pull/13476))
+- Handle redirects from `clientLoader.hydrate` initial load executions ([#13477](https://github.com/remix-run/react-router/pull/13477))
+
 ## 7.5.2
 
 ### Patch Changes

package/dist/development/{chunk-QBMD7MNB.mjs → chunk-YFJEQYI5.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-1d760f6a6
+ * react-router v0.0.0-experimental-b2bc694a6
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1590,7 +1590,11 @@ function createRouter(init) {
       }
       return {
         matches,
-        pendingActionResult: [boundaryMatch.route.id, result]
+        pendingActionResult: [
+          boundaryMatch.route.id,
+          result,
+          actionMatch.route.id
+        ]
       };
     }
     return {
@@ -4361,7 +4365,9 @@ function processRouteLoaderData(matches, results, pendingActionResult, isStaticH
   });
   if (pendingError !== void 0 && pendingActionResult) {
     errors = { [pendingActionResult[0]]: pendingError };
-    loaderData[pendingActionResult[0]] = void 0;
+    if (pendingActionResult[2]) {
+      loaderData[pendingActionResult[2]] = void 0;
+    }
   }
   return {
     loaderData,
@@ -6525,7 +6531,8 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
     )
   );
   await Promise.all(routeDfds.map((d) => d.promise));
-  if ((!router.state.initialized || routesParams.size === 0) && !window.__reactRouterHdrActive) {
+  let isInitialLoad = !router.state.initialized && router.state.navigation.state === "idle";
+  if ((isInitialLoad || routesParams.size === 0) && !window.__reactRouterHdrActive) {
     singleFetchDfd.resolve({ routes: {} });
   } else {
     let targetRoutes = ssr && foundOptOutRoute && routesParams.size > 0 ? [...routesParams.keys()] : void 0;
@@ -7267,8 +7274,8 @@ var nextPaths = /* @__PURE__ */ new Set();
 var discoveredPathsMaxSize = 1e3;
 var discoveredPaths = /* @__PURE__ */ new Set();
 var URL_LIMIT = 7680;
-function isFogOfWarEnabled(ssr) {
-  return ssr === true;
+function isFogOfWarEnabled(routeDiscovery, ssr) {
+  return routeDiscovery.mode === "lazy" && ssr === true;
 }
 function getPartialManifest({ sri, ...manifest }, router) {
   let routeIds = new Set(router.state.matches.map((m) => m.route.id));
@@ -7295,8 +7302,8 @@ function getPartialManifest({ sri, ...manifest }, router) {
     sri: sri ? true : void 0
   };
 }
-function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, isSpaMode, basename) {
-  if (!isFogOfWarEnabled(ssr)) {
+function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, routeDiscovery, isSpaMode, basename) {
+  if (!isFogOfWarEnabled(routeDiscovery, ssr)) {
     return void 0;
   }
   return async ({ path, patch, signal, fetcherKey }) => {
@@ -7311,14 +7318,15 @@ function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, isSpaMo
       ssr,
       isSpaMode,
       basename,
+      routeDiscovery.manifestPath,
       patch,
       signal
     );
   };
 }
-function useFogOFWarDiscovery(router, manifest, routeModules, ssr, isSpaMode) {
+function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscovery, isSpaMode) {
   React8.useEffect(() => {
-    if (!isFogOfWarEnabled(ssr) || navigator.connection?.saveData === true) {
+    if (!isFogOfWarEnabled(routeDiscovery, ssr) || navigator.connection?.saveData === true) {
       return;
     }
     function registerElement(el) {
@@ -7352,6 +7360,7 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, isSpaMode) {
           ssr,
           isSpaMode,
           router.basename,
+          routeDiscovery.manifestPath,
           router.patchRoutes
         );
       } catch (e) {
@@ -7368,15 +7377,21 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, isSpaMode) {
       attributeFilter: ["data-discover", "href", "action"]
     });
     return () => observer.disconnect();
-  }, [ssr, isSpaMode, manifest, routeModules, router]);
+  }, [ssr, isSpaMode, manifest, routeModules, router, routeDiscovery]);
+}
+function getManifestPath(_manifestPath, basename) {
+  let manifestPath = _manifestPath || "/__manifest";
+  if (basename == null) {
+    return manifestPath;
+  }
+  return `${basename}${manifestPath}`.replace(/\/+/g, "/");
 }
 var MANIFEST_VERSION_STORAGE_KEY = "react-router-manifest-version";
-async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, patchRoutes, signal) {
-  let manifestPath = `${basename != null ? basename : "/"}/__manifest`.replace(
-    /\/+/g,
-    "/"
+async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, manifestPath, patchRoutes, signal) {
+  let url = new URL(
+    getManifestPath(manifestPath, basename),
+    window.location.origin
   );
-  let url = new URL(manifestPath, window.location.origin);
   paths.sort().forEach((path) => url.searchParams.append("p", path));
   url.searchParams.set("version", manifest.version);
   if (url.toString().length > URL_LIMIT) {
@@ -7403,7 +7418,9 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
       }
       sessionStorage.setItem(MANIFEST_VERSION_STORAGE_KEY, manifest.version);
       window.location.href = errorReloadPath;
-      throw new Error("Detected manifest version mismatch, reloading...");
+      console.warn("Detected manifest version mismatch, reloading...");
+      await new Promise(() => {
+      });
     } else if (res.status >= 400) {
       throw new Error(await res.text());
     }
@@ -7782,10 +7799,17 @@ function isValidMetaTag(tagName) {
 }
 var isHydrated = false;
 function Scripts(props) {
-  let { manifest, serverHandoffString, isSpaMode, ssr, renderMeta } = useFrameworkContext();
+  let {
+    manifest,
+    serverHandoffString,
+    isSpaMode,
+    renderMeta,
+    routeDiscovery,
+    ssr
+  } = useFrameworkContext();
   let { router, static: isStatic, staticContext } = useDataRouterContext2();
   let { matches: routerMatches } = useDataRouterStateContext();
-  let enableFogOfWar = isFogOfWarEnabled(ssr);
+  let enableFogOfWar = isFogOfWarEnabled(routeDiscovery, ssr);
   if (renderMeta) {
     renderMeta.didRenderScripts = true;
   }
@@ -7941,7 +7965,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "0.0.0-experimental-1d760f6a6";
+    window.__reactRouterVersion = "0.0.0-experimental-b2bc694a6";
   }
 } catch (e) {
 }
@@ -9065,6 +9089,7 @@ function ServerRouter({
         future: context.future,
         ssr: context.ssr,
         isSpaMode: context.isSpaMode,
+        routeDiscovery: context.routeDiscovery,
         serializeError: context.serializeError,
         renderMeta: context.renderMeta
       }
@@ -9114,7 +9139,8 @@ function createRoutesStub(routes, unstable_getContext) {
         },
         routeModules: {},
         ssr: false,
-        isSpaMode: false
+        isSpaMode: false,
+        routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" }
       };
       let patched = processRoutes(
         // @ts-expect-error `StubRouteObject` is stricter about `loader`/`action`
@@ -10083,7 +10109,10 @@ Error: ${e instanceof Error ? e.toString() : e}`
         }
       }
     }
-    let manifestUrl = `${normalizedBasename}/__manifest`.replace(/\/+/g, "/");
+    let manifestUrl = getManifestPath(
+      _build.routeDiscovery.manifestPath,
+      normalizedBasename
+    );
     if (url.pathname === manifestUrl) {
       try {
         let res = await handleManifestRequest(_build, routes, url);
@@ -10093,7 +10122,7 @@ Error: ${e instanceof Error ? e.toString() : e}`
         return new Response("Unknown Server Error", { status: 500 });
       }
     }
-    let matches = matchServerRoutes(routes, url.pathname, _build.basename);
+    let matches = matchServerRoutes(routes, normalizedPath, _build.basename);
     if (matches && matches.length > 0) {
       Object.assign(params, matches[0].params);
     }
@@ -10281,17 +10310,21 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
       actionData: context.actionData,
       errors: serializeErrors2(context.errors, serverMode)
     };
+    let baseServerHandoff = {
+      basename: build.basename,
+      future: build.future,
+      routeDiscovery: build.routeDiscovery,
+      ssr: build.ssr,
+      isSpaMode: isSpaMode2
+    };
     let entryContext = {
       manifest: build.assets,
       routeModules: createEntryRouteModules(build.routes),
       staticHandlerContext: context,
       criticalCss,
       serverHandoffString: createServerHandoffString({
-        basename: build.basename,
-        criticalCss,
-        future: build.future,
-        ssr: build.ssr,
-        isSpaMode: isSpaMode2
+        ...baseServerHandoff,
+        criticalCss
       }),
       serverHandoffStream: encodeViaTurboStream(
         state,
@@ -10302,6 +10335,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
       renderMeta: {},
       future: build.future,
       ssr: build.ssr,
+      routeDiscovery: build.routeDiscovery,
       isSpaMode: isSpaMode2,
       serializeError: (err) => serializeError(err, serverMode)
     };
@@ -10344,12 +10378,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
       entryContext = {
         ...entryContext,
         staticHandlerContext: context,
-        serverHandoffString: createServerHandoffString({
-          basename: build.basename,
-          future: build.future,
-          ssr: build.ssr,
-          isSpaMode: isSpaMode2
-        }),
+        serverHandoffString: createServerHandoffString(baseServerHandoff),
         serverHandoffStream: encodeViaTurboStream(
           state2,
           request.signal,

package/dist/development/dom-export.d.mts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './fog-of-war-D2zsXvum.mjs';
-import { R as RouterInit } from './route-data-C12CLHiN.mjs';
+import { R as RouterProviderProps$1 } from './fog-of-war-B1MWugqW.mjs';
+import { R as RouterInit } from './route-data-BvrN3Sw4.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;

package/dist/development/dom-export.d.ts

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './fog-of-war-BLArG-qZ.js';
-import { R as RouterInit } from './route-data-C12CLHiN.js';
+import { RouterProviderProps as RouterProviderProps$1, RouterInit } from 'react-router';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;