react-router 0.0.0-experimental-e2130f538 → 0.0.0-experimental-73e447577

package/CHANGELOG.md

@@ -1,40 +1,5 @@
 # `react-router`
 
-## 7.9.3
-
-### Patch Changes
-
-- Do not try to use `turbo-stream` to decode CDN errors that never reached the server ([#14385](https://github.com/remix-run/react-router/pull/14385))
-  - We used to do this but lost this check with the adoption of single fetch
-
-- Fix Data Mode regression causing a 404 during initial load in when `middleware` exists without any `loader` functions ([#14393](https://github.com/remix-run/react-router/pull/14393))
-
-## 7.9.2
-
-### Patch Changes
-
-- - Update client-side router to run client `middleware` on initial load even if no loaders exist ([#14348](https://github.com/remix-run/react-router/pull/14348))
-  - Update `createRoutesStub` to run route middleware
-    - You will need to set the `<RoutesStub future={{ v8_middleware: true }} />` flag to enable the proper `context` type
-
-- Update Lazy Route Discovery manifest requests to use a singular comma-separated `paths` query param instead of repeated `p` query params ([#14321](https://github.com/remix-run/react-router/pull/14321))
-  - This is because Cloudflare has a hard limit of 100 URL search param key/value pairs when used as a key for caching purposes
-  - If more that 100 paths were included, the cache key would be incomplete and could produce false-positive cache hits
-
-- \[UNSTABLE] Add `fetcher.unstable_reset()` API ([#14206](https://github.com/remix-run/react-router/pull/14206))
-
-- Made useOutlet element reference have stable identity in-between route chages ([#13382](https://github.com/remix-run/react-router/pull/13382))
-
-- feat: enable full transition support for the rsc router ([#14362](https://github.com/remix-run/react-router/pull/14362))
-
-- In RSC Data Mode, handle SSR'd client errors and re-try in the browser ([#14342](https://github.com/remix-run/react-router/pull/14342))
-
-- Support `middleware` prop on `<Route>` for usage with a data router via `createRoutesFromElements` ([#14357](https://github.com/remix-run/react-router/pull/14357))
-
-- Handle encoded question mark and hash characters in ancestor splat routes ([#14249](https://github.com/remix-run/react-router/pull/14249))
-
-- Fail gracefully on manifest version mismatch logic if `sessionStorage` access is blocked ([#14335](https://github.com/remix-run/react-router/pull/14335))
-
 ## 7.9.1
 
 ### Patch Changes

package/dist/development/{chunk-KLLSQY3I.mjs → chunk-NKIXC2FA.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e2130f538
+ * react-router v0.0.0-experimental-73e447577
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -22,7 +22,6 @@ import {
   SingleFetchRedirectSymbol,
   StaticRouterProvider,
   StreamTransfer,
-  UNSTABLE_TransitionEnabledRouterProvider,
   convertRoutesToDataRoutes,
   createBrowserHistory,
   createContext,
@@ -38,6 +37,7 @@ import {
   getManifestPath,
   getSingleFetchDataStrategyImpl,
   getStaticContextFromError,
+  instrumentHandler,
   invariant,
   isDataWithResponseInit,
   isMutationMethod,
@@ -60,7 +60,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-KNNCBCIS.mjs";
+} from "./chunk-PF7FO4KS.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -517,7 +517,8 @@ async function callRouteHandler(handler, args) {
   let result = await handler({
     request: stripRoutesParam(stripIndexParam2(args.request)),
     params: args.params,
-    context: args.context
+    context: args.context,
+    pattern: args.pattern
   });
   if (isDataWithResponseInit(result) && result.init && result.init.status && isRedirectStatusCode(result.init.status)) {
     throw new Response(null, result.init);
@@ -1010,7 +1011,8 @@ function derive(build, mode) {
   let dataRoutes = createStaticHandlerDataRoutes(build.routes, build.future);
   let serverMode = isServerMode(mode) ? mode : "production" /* Production */;
   let staticHandler = createStaticHandler(dataRoutes, {
-    basename: build.basename
+    basename: build.basename,
+    unstable_instrumentations: build.entry.module.unstable_instrumentations
   });
   let errorHandler = build.entry.module.handleError || ((error, { request }) => {
     if (serverMode !== "test" /* Test */ && !request.signal.aborted) {
@@ -1020,35 +1022,7 @@ function derive(build, mode) {
       );
     }
   });
-  return {
-    routes,
-    dataRoutes,
-    serverMode,
-    staticHandler,
-    errorHandler
-  };
-}
-var createRequestHandler = (build, mode) => {
-  let _build;
-  let routes;
-  let serverMode;
-  let staticHandler;
-  let errorHandler;
-  return async function requestHandler(request, initialContext) {
-    _build = typeof build === "function" ? await build() : build;
-    if (typeof build === "function") {
-      let derived = derive(_build, mode);
-      routes = derived.routes;
-      serverMode = derived.serverMode;
-      staticHandler = derived.staticHandler;
-      errorHandler = derived.errorHandler;
-    } else if (!routes || !serverMode || !staticHandler || !errorHandler) {
-      let derived = derive(_build, mode);
-      routes = derived.routes;
-      serverMode = derived.serverMode;
-      staticHandler = derived.staticHandler;
-      errorHandler = derived.errorHandler;
-    }
+  let requestHandler = async (request, initialContext) => {
     let params = {};
     let loadContext;
     let handleError = (error) => {
@@ -1061,7 +1035,7 @@ var createRequestHandler = (build, mode) => {
         request
       });
     };
-    if (_build.future.v8_middleware) {
+    if (build.future.v8_middleware) {
       if (initialContext && !(initialContext instanceof RouterContextProvider)) {
         let error = new Error(
           "Invalid `context` value provided to `handleRequest`. When middleware is enabled you must return an instance of `RouterContextProvider` from your `getLoadContext` function."
@@ -1074,7 +1048,7 @@ var createRequestHandler = (build, mode) => {
       loadContext = initialContext || {};
     }
     let url = new URL(request.url);
-    let normalizedBasename = _build.basename || "/";
+    let normalizedBasename = build.basename || "/";
     let normalizedPath = url.pathname;
     if (stripBasename(normalizedPath, normalizedBasename) === "/_root.data") {
       normalizedPath = normalizedBasename;
@@ -1085,7 +1059,7 @@ var createRequestHandler = (build, mode) => {
       normalizedPath = normalizedPath.slice(0, -1);
     }
     let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
-    if (!_build.ssr) {
+    if (!build.ssr) {
       let decodedPath = decodeURI(normalizedPath);
       if (normalizedBasename !== "/") {
         let strippedPath = stripBasename(decodedPath, normalizedBasename);
@@ -1109,9 +1083,9 @@ var createRequestHandler = (build, mode) => {
         }
         decodedPath = strippedPath;
       }
-      if (_build.prerender.length === 0) {
+      if (build.prerender.length === 0) {
         isSpaMode = true;
-      } else if (!_build.prerender.includes(decodedPath) && !_build.prerender.includes(decodedPath + "/")) {
+      } else if (!build.prerender.includes(decodedPath) && !build.prerender.includes(decodedPath + "/")) {
         if (url.pathname.endsWith(".data")) {
           errorHandler(
             new ErrorResponseImpl(
@@ -1135,19 +1109,19 @@ var createRequestHandler = (build, mode) => {
       }
     }
     let manifestUrl = getManifestPath(
-      _build.routeDiscovery.manifestPath,
+      build.routeDiscovery.manifestPath,
       normalizedBasename
     );
     if (url.pathname === manifestUrl) {
       try {
-        let res = await handleManifestRequest(_build, routes, url);
+        let res = await handleManifestRequest(build, routes, url);
         return res;
       } catch (e) {
         handleError(e);
         return new Response("Unknown Server Error", { status: 500 });
       }
     }
-    let matches = matchServerRoutes(routes, normalizedPath, _build.basename);
+    let matches = matchServerRoutes(routes, normalizedPath, build.basename);
     if (matches && matches.length > 0) {
       Object.assign(params, matches[0].params);
     }
@@ -1158,11 +1132,11 @@ var createRequestHandler = (build, mode) => {
       let singleFetchMatches = matchServerRoutes(
         routes,
         handlerUrl.pathname,
-        _build.basename
+        build.basename
       );
       response = await handleSingleFetchRequest(
         serverMode,
-        _build,
+        build,
         staticHandler,
         request,
         handlerUrl,
@@ -1173,12 +1147,12 @@ var createRequestHandler = (build, mode) => {
         response = generateSingleFetchRedirectResponse(
           response,
           request,
-          _build,
+          build,
           serverMode
         );
       }
-      if (_build.entry.module.handleDataRequest) {
-        response = await _build.entry.module.handleDataRequest(response, {
+      if (build.entry.module.handleDataRequest) {
+        response = await build.entry.module.handleDataRequest(response, {
           context: loadContext,
           params: singleFetchMatches ? singleFetchMatches[0].params : {},
           request
@@ -1187,7 +1161,7 @@ var createRequestHandler = (build, mode) => {
           response = generateSingleFetchRedirectResponse(
             response,
             request,
-            _build,
+            build,
             serverMode
           );
         }
@@ -1195,7 +1169,7 @@ var createRequestHandler = (build, mode) => {
     } else if (!isSpaMode && matches && matches[matches.length - 1].route.module.default == null && matches[matches.length - 1].route.module.ErrorBoundary == null) {
       response = await handleResourceRequest(
         serverMode,
-        _build,
+        build,
         staticHandler,
         matches.slice(-1)[0].route.id,
         request,
@@ -1205,14 +1179,14 @@ var createRequestHandler = (build, mode) => {
     } else {
       let { pathname } = url;
       let criticalCss = void 0;
-      if (_build.unstable_getCriticalCss) {
-        criticalCss = await _build.unstable_getCriticalCss({ pathname });
+      if (build.unstable_getCriticalCss) {
+        criticalCss = await build.unstable_getCriticalCss({ pathname });
       } else if (mode === "development" /* Development */ && getDevServerHooks()?.getCriticalCss) {
         criticalCss = await getDevServerHooks()?.getCriticalCss?.(pathname);
       }
       response = await handleDocumentRequest(
         serverMode,
-        _build,
+        build,
         staticHandler,
         request,
         loadContext,
@@ -1230,6 +1204,47 @@ var createRequestHandler = (build, mode) => {
     }
     return response;
   };
+  if (build.entry.module.unstable_instrumentations) {
+    requestHandler = instrumentHandler(
+      requestHandler,
+      build.entry.module.unstable_instrumentations.map((i) => i.handler).filter(Boolean)
+    );
+  }
+  return {
+    routes,
+    dataRoutes,
+    serverMode,
+    staticHandler,
+    errorHandler,
+    requestHandler
+  };
+}
+var createRequestHandler = (build, mode) => {
+  let _build;
+  let routes;
+  let serverMode;
+  let staticHandler;
+  let errorHandler;
+  let _requestHandler;
+  return async function requestHandler(request, initialContext) {
+    _build = typeof build === "function" ? await build() : build;
+    if (typeof build === "function") {
+      let derived = derive(_build, mode);
+      routes = derived.routes;
+      serverMode = derived.serverMode;
+      staticHandler = derived.staticHandler;
+      errorHandler = derived.errorHandler;
+      _requestHandler = derived.requestHandler;
+    } else if (!routes || !serverMode || !staticHandler || !errorHandler || !_requestHandler) {
+      let derived = derive(_build, mode);
+      routes = derived.routes;
+      serverMode = derived.serverMode;
+      staticHandler = derived.staticHandler;
+      errorHandler = derived.errorHandler;
+      _requestHandler = derived.requestHandler;
+    }
+    return _requestHandler(request, initialContext);
+  };
 };
 async function handleManifestRequest(build, routes, url) {
   if (build.assets.version !== url.searchParams.get("version")) {
@@ -1459,6 +1474,7 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
   }
   function handleQueryRouteError(error) {
     if (isResponse(error)) {
+      error.headers.set("X-Remix-Catch", "yes");
       return error;
     }
     if (isRouteErrorResponse(error)) {
@@ -1485,7 +1501,10 @@ function errorResponseToJson(errorResponse, serverMode) {
     ),
     {
       status: errorResponse.status,
-      statusText: errorResponse.statusText
+      statusText: errorResponse.statusText,
+      headers: {
+        "X-Remix-Error": "yes"
+      }
     }
   );
 }
@@ -1853,7 +1872,7 @@ function createCallServer({
   return async (id, args) => {
     let actionId = globalVar.__routerActionID = (globalVar.__routerActionID ?? (globalVar.__routerActionID = 0)) + 1;
     const temporaryReferences = createTemporaryReferenceSet();
-    const payloadPromise = fetchImplementation(
+    const response = await fetchImplementation(
       new Request(location.href, {
         body: await encodeReply(args, { temporaryReferences }),
         method: "POST",
@@ -1862,45 +1881,44 @@ function createCallServer({
           "rsc-action-id": id
         }
       })
-    ).then((response) => {
-      if (!response.body) {
-        throw new Error("No response body");
+    );
+    if (!response.body) {
+      throw new Error("No response body");
+    }
+    const payload = await createFromReadableStream(response.body, {
+      temporaryReferences
+    });
+    if (payload.type === "redirect") {
+      if (payload.reload) {
+        window.location.href = payload.location;
+        return;
       }
-      return createFromReadableStream(response.body, {
-        temporaryReferences
+      globalVar.__reactRouterDataRouter.navigate(payload.location, {
+        replace: payload.replace
       });
-    });
-    globalVar.__reactRouterDataRouter.__setPendingRerender(
-      Promise.resolve(payloadPromise).then(async (payload) => {
-        if (payload.type === "redirect") {
-          if (payload.reload) {
-            window.location.href = payload.location;
-            return () => {
-            };
-          }
-          return () => {
-            globalVar.__reactRouterDataRouter.navigate(payload.location, {
-              replace: payload.replace
-            });
-          };
-        }
-        if (payload.type !== "action") {
-          throw new Error("Unexpected payload type");
-        }
-        const rerender = await payload.rerender;
-        if (rerender && landedActionId < actionId && globalVar.__routerActionID <= actionId) {
-          if (rerender.type === "redirect") {
-            if (rerender.reload) {
-              window.location.href = rerender.location;
-              return;
-            }
-            return () => {
+      return payload.actionResult;
+    }
+    if (payload.type !== "action") {
+      throw new Error("Unexpected payload type");
+    }
+    if (payload.rerender) {
+      React4.startTransition(
+        // @ts-expect-error - We have old react types that don't know this can be async
+        async () => {
+          const rerender = await payload.rerender;
+          if (!rerender) return;
+          if (landedActionId < actionId && globalVar.__routerActionID <= actionId) {
+            landedActionId = actionId;
+            if (rerender.type === "redirect") {
+              if (rerender.reload) {
+                window.location.href = rerender.location;
+                return;
+              }
               globalVar.__reactRouterDataRouter.navigate(rerender.location, {
                 replace: rerender.replace
               });
-            };
-          }
-          return () => {
+              return;
+            }
             let lastMatch;
             for (const match of rerender.matches) {
               globalVar.__reactRouterDataRouter.patchRoutes(
@@ -1911,32 +1929,29 @@ function createCallServer({
               lastMatch = match;
             }
             window.__reactRouterDataRouter._internalSetStateDoNotUseOrYouWillBreakYourApp(
-              {
-                loaderData: Object.assign(
-                  {},
-                  globalVar.__reactRouterDataRouter.state.loaderData,
-                  rerender.loaderData
-                ),
-                errors: rerender.errors ? Object.assign(
-                  {},
-                  globalVar.__reactRouterDataRouter.state.errors,
-                  rerender.errors
-                ) : null
-              }
+              {}
             );
-          };
+            React4.startTransition(() => {
+              window.__reactRouterDataRouter._internalSetStateDoNotUseOrYouWillBreakYourApp(
+                {
+                  loaderData: Object.assign(
+                    {},
+                    globalVar.__reactRouterDataRouter.state.loaderData,
+                    rerender.loaderData
+                  ),
+                  errors: rerender.errors ? Object.assign(
+                    {},
+                    globalVar.__reactRouterDataRouter.state.errors,
+                    rerender.errors
+                  ) : null
+                }
+              );
+            });
+          }
         }
-        return () => {
-        };
-      }).catch(() => {
-      })
-    );
-    return payloadPromise.then((payload) => {
-      if (payload.type !== "action" && payload.type !== "redirect") {
-        throw new Error("Unexpected payload type");
-      }
-      return payload.actionResult;
-    });
+      );
+    }
+    return payload.actionResult;
   };
 }
 function createRouterFromPayload({
@@ -2156,8 +2171,8 @@ function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation)
     let res = await fetchImplementation(
       new Request(url, await createRequestInit(request))
     );
-    if (res.status >= 400 && !res.headers.has("X-Remix-Response")) {
-      throw new ErrorResponseImpl(res.status, res.statusText, await res.text());
+    if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
+      throw new ErrorResponseImpl(404, "Not Found", true);
     }
     invariant(res.body, "No response body to decode");
     try {
@@ -2303,7 +2318,7 @@ function RSCHydratedRouter({
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
     routeModules
   };
-  return /* @__PURE__ */ React4.createElement(RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React4.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React4.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React4.createElement(UNSTABLE_TransitionEnabledRouterProvider, { router, flushSync: ReactDOM.flushSync }))));
+  return /* @__PURE__ */ React4.createElement(RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React4.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React4.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React4.createElement(RouterProvider, { router, flushSync: ReactDOM.flushSync }))));
 }
 function createRouteFromServerManifest(match, payload) {
   let hasInitialData = payload && match.id in payload.loaderData;
@@ -2645,7 +2660,7 @@ async function routeRSCServerRequest({
       headers2.delete("Content-Encoding");
       headers2.delete("Content-Length");
       headers2.delete("Content-Type");
-      headers2.delete("X-Remix-Response");
+      headers2.delete("x-remix-response");
       headers2.set("Location", payload.location);
       return new Response(serverResponseB?.body || "", {
         headers: headers2,