react-router 0.0.0-experimental-426e5caec → 0.0.0-experimental-7ed11be

package/CHANGELOG.md

@@ -1,29 +1,5 @@
 # `react-router`
 
-## 7.8.2
-
-### Patch Changes
-
-- \[UNSTABLE] Remove Data Mode `future.unstable_middleware` flag from `createBrowserRouter` ([#14213](https://github.com/remix-run/react-router/pull/14213))
-  - This is only needed as a Framework Mode flag because of the route modules and the `getLoadContext` type behavior change
-  - In Data Mode, it's an opt-in feature because it's just a new property on a route object, so there's no behavior changes that necessitate a flag
-
-- \[UNSTABLE] Add `<RouterProvider unstable_onError>`/`<HydratedRouter unstable_onError>` prop for client side error reporting ([#14162](https://github.com/remix-run/react-router/pull/14162))
-
-- server action revalidation opt out via $SKIP_REVALIDATION field ([#14154](https://github.com/remix-run/react-router/pull/14154))
-
-- Properly escape interpolated param values in `generatePath()` ([#13530](https://github.com/remix-run/react-router/pull/13530))
-
-- Maintain `ReadonlyMap` and `ReadonlySet` types in server response data. ([#13092](https://github.com/remix-run/react-router/pull/13092))
-
-- \[UNSTABLE] Delay serialization of `.data` redirects to 202 responses until after middleware chain ([#14205](https://github.com/remix-run/react-router/pull/14205))
-
-- Fix `TypeError` if you throw from `patchRoutesOnNavigation` when no partial matches exist ([#14198](https://github.com/remix-run/react-router/pull/14198))
-
-- Fix `basename` usage without a leading slash in data routers ([#11671](https://github.com/remix-run/react-router/pull/11671))
-
-- \[UNSTABLE] Update client middleware so it returns the data strategy results allowing for more advanced post-processing middleware ([#14151](https://github.com/remix-run/react-router/pull/14151))
-
 ## 7.8.1
 
 ### Patch Changes

package/dist/{production/chunk-DZS627TW.mjs → development/chunk-2OYLVAZB.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-426e5caec
+ * react-router v0.0.0-experimental-7ed11be
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -16,7 +16,6 @@ import {
   Outlet,
   RSCRouterContext,
   RemixErrorBoundary,
-  RouterContextProvider,
   RouterProvider,
   SINGLE_FETCH_REDIRECT_STATUS,
   SingleFetchRedirectSymbol,
@@ -24,7 +23,6 @@ import {
   StreamTransfer,
   convertRoutesToDataRoutes,
   createBrowserHistory,
-  createContext,
   createMemoryRouter,
   createRequestInit,
   createRouter,
@@ -53,12 +51,14 @@ import {
   singleFetchUrl,
   stripBasename,
   stripIndexParam,
+  unstable_RouterContextProvider,
+  unstable_createContext,
   useRouteError,
   warnOnce,
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-5W7O3ZZ2.mjs";
+} from "./chunk-MUVPFEOF.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -145,7 +145,7 @@ function createRoutesStub(routes, _context) {
       frameworkContextRef.current = {
         future: {
           unstable_subResourceIntegrity: future?.unstable_subResourceIntegrity === true,
-          v8_middleware: future?.v8_middleware === true
+          unstable_middleware: future?.unstable_middleware === true
         },
         manifest: {
           routes: {},
@@ -162,7 +162,7 @@ function createRoutesStub(routes, _context) {
         // @ts-expect-error `StubRouteObject` is stricter about `loader`/`action`
         // types compared to `AgnosticRouteObject`
         convertRoutesToDataRoutes(routes, (r) => r),
-        _context !== void 0 ? _context : future?.v8_middleware ? new RouterContextProvider() : {},
+        _context !== void 0 ? _context : future?.unstable_middleware ? new unstable_RouterContextProvider() : {},
         frameworkContextRef.current.manifest,
         frameworkContextRef.current.routeModules
       );
@@ -612,7 +612,7 @@ function createStaticHandlerDataRoutes(manifest, future, parentId = "", routesBy
       hasErrorBoundary: route.id === "root" || route.module.ErrorBoundary != null,
       id: route.id,
       path: route.path,
-      middleware: route.module.middleware,
+      unstable_middleware: route.module.unstable_middleware,
       // Need to use RR's version in the param typed here to permit the optional
       // context even though we know it'll always be provided in remix
       loader: route.module.loader ? async (args) => {
@@ -785,7 +785,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
       requestContext: loadContext,
       skipLoaderErrorBubbling: true,
       skipRevalidation: true,
-      generateMiddlewareResponse: build.future.v8_middleware ? async (query) => {
+      unstable_generateMiddlewareResponse: build.future.unstable_middleware ? async (query) => {
         try {
           let innerResult = await query(handlerRequest);
           return handleQueryResult(innerResult);
@@ -799,7 +799,21 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
     return handleQueryError(error);
   }
   function handleQueryResult(result) {
-    return isResponse(result) ? result : staticContextToResponse(result);
+    if (!isResponse(result)) {
+      result = staticContextToResponse(result);
+    }
+    if (isRedirectResponse(result)) {
+      return generateSingleFetchResponse(request, build, serverMode, {
+        result: getSingleFetchRedirect(
+          result.status,
+          result.headers,
+          build.basename
+        ),
+        headers: result.headers,
+        status: SINGLE_FETCH_REDIRECT_STATUS
+      });
+    }
+    return result;
   }
   function handleQueryError(error) {
     handleError(error);
@@ -812,7 +826,15 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
   function staticContextToResponse(context) {
     let headers = getDocumentHeaders(context, build);
     if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
-      return new Response(null, { status: context.statusCode, headers });
+      return generateSingleFetchResponse(request, build, serverMode, {
+        result: getSingleFetchRedirect(
+          context.statusCode,
+          headers,
+          build.basename
+        ),
+        headers,
+        status: SINGLE_FETCH_REDIRECT_STATUS
+      });
     }
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
@@ -849,7 +871,7 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
       requestContext: loadContext,
       filterMatchesToLoad: (m) => !loadRouteIds || loadRouteIds.has(m.route.id),
       skipLoaderErrorBubbling: true,
-      generateMiddlewareResponse: build.future.v8_middleware ? async (query) => {
+      unstable_generateMiddlewareResponse: build.future.unstable_middleware ? async (query) => {
         try {
           let innerResult = await query(handlerRequest);
           return handleQueryResult(innerResult);
@@ -863,7 +885,21 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
     return handleQueryError(error);
   }
   function handleQueryResult(result) {
-    return isResponse(result) ? result : staticContextToResponse(result);
+    let response = isResponse(result) ? result : staticContextToResponse(result);
+    if (isRedirectResponse(response)) {
+      return generateSingleFetchResponse(request, build, serverMode, {
+        result: {
+          [SingleFetchRedirectSymbol]: getSingleFetchRedirect(
+            response.status,
+            response.headers,
+            build.basename
+          )
+        },
+        headers: response.headers,
+        status: SINGLE_FETCH_REDIRECT_STATUS
+      });
+    }
+    return response;
   }
   function handleQueryError(error) {
     handleError(error);
@@ -876,7 +912,17 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
   function staticContextToResponse(context) {
     let headers = getDocumentHeaders(context, build);
     if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
-      return new Response(null, { status: context.statusCode, headers });
+      return generateSingleFetchResponse(request, build, serverMode, {
+        result: {
+          [SingleFetchRedirectSymbol]: getSingleFetchRedirect(
+            context.statusCode,
+            headers,
+            build.basename
+          )
+        },
+        headers,
+        status: SINGLE_FETCH_REDIRECT_STATUS
+      });
     }
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
@@ -934,21 +980,6 @@ function generateSingleFetchResponse(request, build, serverMode, {
     }
   );
 }
-function generateSingleFetchRedirectResponse(redirectResponse, request, build, serverMode) {
-  let redirect2 = getSingleFetchRedirect(
-    redirectResponse.status,
-    redirectResponse.headers,
-    build.basename
-  );
-  let headers = new Headers(redirectResponse.headers);
-  headers.delete("Location");
-  headers.set("Content-Type", "text/x-script");
-  return generateSingleFetchResponse(request, build, serverMode, {
-    result: request.method === "GET" ? { [SingleFetchRedirectSymbol]: redirect2 } : redirect2,
-    headers,
-    status: SINGLE_FETCH_REDIRECT_STATUS
-  });
-}
 function getSingleFetchRedirect(status, headers, basename) {
   let redirect2 = headers.get("Location");
   if (basename) {
@@ -1066,15 +1097,15 @@ var createRequestHandler = (build, mode) => {
         request
       });
     };
-    if (_build.future.v8_middleware) {
-      if (initialContext && !(initialContext instanceof RouterContextProvider)) {
+    if (_build.future.unstable_middleware) {
+      if (initialContext && !(initialContext instanceof unstable_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."
+          "Invalid `context` value provided to `handleRequest`. When middleware is enabled you must return an instance of `unstable_RouterContextProvider` from your `getLoadContext` function."
         );
         handleError(error);
         return returnLastResortErrorResponse(error, serverMode);
       }
-      loadContext = initialContext || new RouterContextProvider();
+      loadContext = initialContext || new unstable_RouterContextProvider();
     } else {
       loadContext = initialContext || {};
     }
@@ -1174,14 +1205,6 @@ var createRequestHandler = (build, mode) => {
         loadContext,
         handleError
       );
-      if (isRedirectResponse(response)) {
-        response = generateSingleFetchRedirectResponse(
-          response,
-          request,
-          _build,
-          serverMode
-        );
-      }
       if (_build.entry.module.handleDataRequest) {
         response = await _build.entry.module.handleDataRequest(response, {
           context: loadContext,
@@ -1189,11 +1212,29 @@ var createRequestHandler = (build, mode) => {
           request
         });
         if (isRedirectResponse(response)) {
-          response = generateSingleFetchRedirectResponse(
-            response,
-            request,
-            _build,
-            serverMode
+          let result = getSingleFetchRedirect(
+            response.status,
+            response.headers,
+            _build.basename
+          );
+          if (request.method === "GET") {
+            result = {
+              [SingleFetchRedirectSymbol]: result
+            };
+          }
+          let headers = new Headers(response.headers);
+          headers.set("Content-Type", "text/x-script");
+          return new Response(
+            encodeViaTurboStream(
+              result,
+              request.signal,
+              _build.entry.module.streamTimeout,
+              serverMode
+            ),
+            {
+              status: SINGLE_FETCH_REDIRECT_STATUS,
+              headers
+            }
           );
         }
       }
@@ -1302,7 +1343,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
   try {
     let result = await staticHandler.query(request, {
       requestContext: loadContext,
-      generateMiddlewareResponse: build.future.v8_middleware ? async (query) => {
+      unstable_generateMiddlewareResponse: build.future.unstable_middleware ? async (query) => {
         try {
           let innerResult = await query(request);
           if (!isResponse(innerResult)) {
@@ -1438,7 +1479,7 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
     let result = await staticHandler.queryRoute(request, {
       routeId,
       requestContext: loadContext,
-      generateMiddlewareResponse: build.future.v8_middleware ? async (queryRoute) => {
+      unstable_generateMiddlewareResponse: build.future.unstable_middleware ? async (queryRoute) => {
         try {
           let innerResult = await queryRoute(request);
           return handleQueryRouteResult(innerResult);
@@ -1933,7 +1974,7 @@ function createCallServer({
 function createRouterFromPayload({
   fetchImplementation,
   createFromReadableStream,
-  getContext,
+  unstable_getContext,
   payload
 }) {
   const globalVar = window;
@@ -1971,7 +2012,7 @@ function createRouterFromPayload({
   }, []);
   globalVar.__reactRouterDataRouter = createRouter({
     routes,
-    getContext,
+    unstable_getContext,
     basename: payload.basename,
     history: createBrowserHistory(),
     hydrationData: getHydrationData(
@@ -2081,7 +2122,7 @@ function createRouterFromPayload({
     routeModules: globalVar.__reactRouterRouteModules
   };
 }
-var renderedRoutesContext = createContext();
+var renderedRoutesContext = unstable_createContext();
 function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
   let dataStrategy = getSingleFetchDataStrategyImpl(
     getRouter,
@@ -2108,7 +2149,7 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReada
       return M.route.hasComponent && !M.route.element;
     }
   );
-  return async (args) => args.runClientMiddleware(async () => {
+  return async (args) => args.unstable_runClientMiddleware(async () => {
     let context = args.context;
     context.set(renderedRoutesContext, []);
     let results = await dataStrategy(args);
@@ -2194,17 +2235,22 @@ function RSCHydratedRouter({
   fetch: fetchImplementation = fetch,
   payload,
   routeDiscovery = "eager",
-  getContext
+  unstable_getContext
 }) {
   if (payload.type !== "render") throw new Error("Invalid payload type");
   let { router, routeModules } = React4.useMemo(
     () => createRouterFromPayload({
       payload,
       fetchImplementation,
-      getContext,
+      unstable_getContext,
       createFromReadableStream
     }),
-    [createFromReadableStream, payload, fetchImplementation, getContext]
+    [
+      createFromReadableStream,
+      payload,
+      fetchImplementation,
+      unstable_getContext
+    ]
   );
   React4.useEffect(() => {
     setIsHydrated();
@@ -2276,7 +2322,7 @@ function RSCHydratedRouter({
     future: {
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
-      v8_middleware: false,
+      unstable_middleware: false,
       unstable_subResourceIntegrity: false
     },
     isSpaMode: false,
@@ -2692,7 +2738,7 @@ function RSCStaticRouter({ getPayload }) {
     future: {
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
-      v8_middleware: false,
+      unstable_middleware: false,
       unstable_subResourceIntegrity: false
     },
     isSpaMode: false,