react-router 7.9.2-pre.0 → 7.9.2-pre.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # `react-router`
 
+## 7.9.2-pre.1
+
+### Patch Changes
+
+- feat: enable full transition support for the rsc router ([#14362](https://github.com/remix-run/react-router/pull/14362))
+
 ## 7.9.2-pre.0
 
 ### Patch Changes

package/dist/development/{chunk-EPSRV6KC.mjs → chunk-I4PRIPRX.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.9.2-pre.0
+ * react-router v7.9.2-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5653,6 +5653,119 @@ var Deferred = class {
     });
   }
 };
+function shallowDiff(a, b) {
+  if (a === b) {
+    return false;
+  }
+  let aKeys = Object.keys(a);
+  let bKeys = Object.keys(b);
+  if (aKeys.length !== bKeys.length) {
+    return true;
+  }
+  for (let key of aKeys) {
+    if (a[key] !== b[key]) {
+      return true;
+    }
+  }
+  return false;
+}
+function UNSTABLE_TransitionEnabledRouterProvider({
+  router,
+  flushSync: reactDomFlushSyncImpl,
+  unstable_onError
+}) {
+  let fetcherData = React3.useRef(/* @__PURE__ */ new Map());
+  let [revalidating, startRevalidation] = React3.useTransition();
+  let [state, setState] = React3.useState(router.state);
+  router.__setPendingRerender = (promise) => startRevalidation(
+    // @ts-expect-error - need react 19 types for this to be async
+    async () => {
+      const rerender = await promise;
+      startRevalidation(() => {
+        rerender();
+      });
+    }
+  );
+  let navigator = React3.useMemo(() => {
+    return {
+      createHref: router.createHref,
+      encodeLocation: router.encodeLocation,
+      go: (n) => router.navigate(n),
+      push: (to, state2, opts) => router.navigate(to, {
+        state: state2,
+        preventScrollReset: opts?.preventScrollReset
+      }),
+      replace: (to, state2, opts) => router.navigate(to, {
+        replace: true,
+        state: state2,
+        preventScrollReset: opts?.preventScrollReset
+      })
+    };
+  }, [router]);
+  let basename = router.basename || "/";
+  let dataRouterContext = React3.useMemo(
+    () => ({
+      router,
+      navigator,
+      static: false,
+      basename,
+      unstable_onError
+    }),
+    [router, navigator, basename, unstable_onError]
+  );
+  React3.useLayoutEffect(() => {
+    return router.subscribe(
+      (newState, { deletedFetchers, flushSync, viewTransitionOpts }) => {
+        newState.fetchers.forEach((fetcher, key) => {
+          if (fetcher.data !== void 0) {
+            fetcherData.current.set(key, fetcher.data);
+          }
+        });
+        deletedFetchers.forEach((key) => fetcherData.current.delete(key));
+        const diff = shallowDiff(state, newState);
+        if (!diff) return;
+        if (flushSync) {
+          if (reactDomFlushSyncImpl) {
+            reactDomFlushSyncImpl(() => setState(newState));
+          } else {
+            setState(newState);
+          }
+        } else {
+          React3.startTransition(() => {
+            setState(newState);
+          });
+        }
+      }
+    );
+  }, [router, reactDomFlushSyncImpl, state]);
+  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(DataRouterContext.Provider, { value: dataRouterContext }, /* @__PURE__ */ React3.createElement(
+    DataRouterStateContext.Provider,
+    {
+      value: {
+        ...state,
+        revalidation: revalidating ? "loading" : state.revalidation
+      }
+    },
+    /* @__PURE__ */ React3.createElement(FetchersContext.Provider, { value: fetcherData.current }, /* @__PURE__ */ React3.createElement(
+      Router,
+      {
+        basename,
+        location: state.location,
+        navigationType: state.historyAction,
+        navigator
+      },
+      /* @__PURE__ */ React3.createElement(
+        MemoizedDataRoutes,
+        {
+          routes: router.routes,
+          future: router.future,
+          state,
+          unstable_onError
+        }
+      )
+    ))
+  )), null);
+}
 function RouterProvider({
   router,
   flushSync: reactDomFlushSyncImpl,
@@ -8997,7 +9110,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.9.2-pre.0";
+    "7.9.2-pre.1";
   }
 } catch (e) {
 }
@@ -10159,6 +10272,7 @@ export {
   mapRouteProperties,
   hydrationRouteProperties,
   createMemoryRouter,
+  UNSTABLE_TransitionEnabledRouterProvider,
   RouterProvider,
   MemoryRouter,
   Navigate,

package/dist/{production/chunk-HAV7J4RO.mjs → development/chunk-ITFVGECV.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.9.2-pre.0
+ * react-router v7.9.2-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -22,6 +22,7 @@ import {
   SingleFetchRedirectSymbol,
   StaticRouterProvider,
   StreamTransfer,
+  UNSTABLE_TransitionEnabledRouterProvider,
   convertRoutesToDataRoutes,
   createBrowserHistory,
   createContext,
@@ -59,7 +60,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-662O2YDJ.mjs";
+} from "./chunk-I4PRIPRX.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -1856,7 +1857,7 @@ function createCallServer({
   return async (id, args) => {
     let actionId = globalVar.__routerActionID = (globalVar.__routerActionID ?? (globalVar.__routerActionID = 0)) + 1;
     const temporaryReferences = createTemporaryReferenceSet();
-    const response = await fetchImplementation(
+    const payloadPromise = fetchImplementation(
       new Request(location.href, {
         body: await encodeReply(args, { temporaryReferences }),
         method: "POST",
@@ -1865,44 +1866,45 @@ function createCallServer({
           "rsc-action-id": id
         }
       })
-    );
-    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;
+    ).then((response) => {
+      if (!response.body) {
+        throw new Error("No response body");
       }
-      globalVar.__reactRouterDataRouter.navigate(payload.location, {
-        replace: payload.replace
+      return createFromReadableStream(response.body, {
+        temporaryReferences
       });
-      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.__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 () => {
               globalVar.__reactRouterDataRouter.navigate(rerender.location, {
                 replace: rerender.replace
               });
-              return;
-            }
+            };
+          }
+          return () => {
             let lastMatch;
             for (const match of rerender.matches) {
               globalVar.__reactRouterDataRouter.patchRoutes(
@@ -1913,29 +1915,32 @@ 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 payload.actionResult;
+        return () => {
+        };
+      }).catch(() => {
+      })
+    );
+    return payloadPromise.then((payload) => {
+      if (payload.type !== "action" && payload.type !== "redirect") {
+        throw new Error("Unexpected payload type");
+      }
+      return payload.actionResult;
+    });
   };
 }
 function createRouterFromPayload({
@@ -2302,7 +2307,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(RouterProvider, { 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(UNSTABLE_TransitionEnabledRouterProvider, { router, flushSync: ReactDOM.flushSync }))));
 }
 function createRouteFromServerManifest(match, payload) {
   let hasInitialData = payload && match.id in payload.loaderData;

package/dist/development/{chunk-ED2JHW2I.js → chunk-MVCD4EFU.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 v7.9.2-pre.0
+ * react-router v7.9.2-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *