react-router 7.7.0-pre.1 → 7.7.0-pre.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # `react-router`
 
+## 7.7.0-pre.2
+
+### Patch Changes
+
+- [REMOVE] Inject client route component props during RSC render ([#14007](https://github.com/remix-run/react-router/pull/14007))
+
 ## 7.7.0-pre.1
 
 ### Patch Changes

package/dist/development/{browser-BSrXyLft.d.mts → browser-CcxeZJcQ.d.mts}

@@ -1,6 +1,6 @@
-import * as React from 'react';
-import { u as unstable_RouterContextProvider, p as ActionFunction, C as ClientActionFunction, q as ClientLoaderFunction, r as HeadersFunction, s as LinksFunction, t as LoaderFunction, M as MetaFunction, v as ShouldRevalidateFunction, L as Location, g as Params, h as Router, R as RouterInit } from './route-data-DAw7Esur.mjs';
 import { AsyncLocalStorage } from 'node:async_hooks';
+import * as React from 'react';
+import { u as unstable_RouterContextProvider, i as ActionFunction, C as ClientActionFunction, j as ClientLoaderFunction, k as HeadersFunction, l as LinksFunction, m as LoaderFunction, M as MetaFunction, S as ShouldRevalidateFunction, c as Location, h as Params } from './route-data-DjzmHYNR.mjs';
 
 type ServerContext = {
     redirect?: Response;
@@ -120,33 +120,6 @@ declare function matchRSCServerRequest({ createTemporaryReferenceSet, basename,
     }) => Response;
 }): Promise<Response>;
 
-type BrowserCreateFromReadableStreamFunction = (body: ReadableStream<Uint8Array>, { temporaryReferences, }: {
-    temporaryReferences: unknown;
-}) => Promise<unknown>;
-type EncodeReplyFunction = (args: unknown[], options: {
-    temporaryReferences: unknown;
-}) => Promise<BodyInit>;
-declare global {
-    interface Window {
-        __router: Router;
-        __routerInitialized: boolean;
-        __routerActionID: number;
-    }
-}
-declare function createCallServer({ createFromReadableStream, createTemporaryReferenceSet, encodeReply, fetch: fetchImplementation, }: {
-    createFromReadableStream: BrowserCreateFromReadableStreamFunction;
-    createTemporaryReferenceSet: () => unknown;
-    encodeReply: EncodeReplyFunction;
-    fetch?: (request: Request) => Promise<Response>;
-}): (id: string, args: unknown[]) => Promise<unknown>;
-declare function RSCHydratedRouter({ createFromReadableStream, fetch: fetchImplementation, payload, routeDiscovery, unstable_getContext, }: {
-    createFromReadableStream: BrowserCreateFromReadableStreamFunction;
-    fetch?: (request: Request) => Promise<Response>;
-    payload: RSCPayload;
-    routeDiscovery?: "eager" | "lazy";
-    unstable_getContext?: RouterInit["unstable_getContext"];
-}): React.JSX.Element;
-
 declare global {
     interface Window {
         __FLIGHT_DATA: any[];
@@ -154,4 +127,4 @@ declare global {
 }
 declare function getRSCStream(): ReadableStream<any>;
 
-export { type BrowserCreateFromReadableStreamFunction as B, type DecodeActionFunction as D, type EncodeReplyFunction as E, type LoadServerActionFunction as L, type RSCPayload as R, RSCHydratedRouter as a, type DecodeFormStateFunction as b, createCallServer as c, type DecodeReplyFunction as d, type RSCManifestPayload as e, type RSCMatch as f, getRSCStream as g, type RSCRenderPayload as h, type RSCRouteManifest as i, type RSCRouteMatch as j, type RSCRouteConfigEntry as k, type RSCRouteConfig as l, matchRSCServerRequest as m };
+export { type DecodeActionFunction as D, type LoadServerActionFunction as L, type RSCPayload as R, type DecodeFormStateFunction as a, type DecodeReplyFunction as b, type RSCManifestPayload as c, type RSCMatch as d, type RSCRenderPayload as e, type RSCRouteManifest as f, getRSCStream as g, type RSCRouteMatch as h, type RSCRouteConfigEntry as i, type RSCRouteConfig as j, matchRSCServerRequest as m };

package/dist/development/{chunk-Z7T4GLA7.js → chunk-3JI27NJZ.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.7.0-pre.1
+ * react-router v7.7.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/{production/chunk-KZZC37RO.mjs → development/chunk-NMPYIXDO.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.7.0-pre.1
+ * react-router v7.7.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -57,7 +57,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-4FKAWASN.mjs";
+} from "./chunk-XPO7SIPX.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -1805,9 +1805,10 @@ function createCallServer({
   encodeReply,
   fetch: fetchImplementation = fetch
 }) {
+  const globalVar = window;
   let landedActionId = 0;
   return async (id, args) => {
-    let actionId = window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
+    let actionId = globalVar.__routerActionID = (globalVar.__routerActionID ?? (globalVar.__routerActionID = 0)) + 1;
     const temporaryReferences = createTemporaryReferenceSet();
     const response = await fetchImplementation(
       new Request(location.href, {
@@ -1830,7 +1831,7 @@ function createCallServer({
         window.location.href = payload.location;
         return;
       }
-      window.__router.navigate(payload.location, {
+      globalVar.__router.navigate(payload.location, {
         replace: payload.replace
       });
       return payload.actionResult;
@@ -1844,21 +1845,21 @@ function createCallServer({
         async () => {
           const rerender = await payload.rerender;
           if (!rerender) return;
-          if (landedActionId < actionId && window.__routerActionID <= actionId) {
+          if (landedActionId < actionId && globalVar.__routerActionID <= actionId) {
             landedActionId = actionId;
             if (rerender.type === "redirect") {
               if (rerender.reload) {
                 window.location.href = rerender.location;
                 return;
               }
-              window.__router.navigate(rerender.location, {
+              globalVar.__router.navigate(rerender.location, {
                 replace: rerender.replace
               });
               return;
             }
             let lastMatch;
             for (const match of rerender.matches) {
-              window.__router.patchRoutes(
+              globalVar.__router.patchRoutes(
                 lastMatch?.id ?? null,
                 [createRouteFromServerManifest(match)],
                 true
@@ -1870,12 +1871,12 @@ function createCallServer({
               window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({
                 loaderData: Object.assign(
                   {},
-                  window.__router.state.loaderData,
+                  globalVar.__router.state.loaderData,
                   rerender.loaderData
                 ),
                 errors: rerender.errors ? Object.assign(
                   {},
-                  window.__router.state.errors,
+                  globalVar.__router.state.errors,
                   rerender.errors
                 ) : null
               });
@@ -1893,7 +1894,8 @@ function createRouterFromPayload({
   unstable_getContext,
   payload
 }) {
-  if (window.__router) return window.__router;
+  const globalVar = window;
+  if (globalVar.__router) return globalVar.__router;
   if (payload.type !== "render") throw new Error("Invalid payload type");
   let patches = /* @__PURE__ */ new Map();
   payload.patches?.forEach((patch) => {
@@ -1919,7 +1921,7 @@ function createRouterFromPayload({
     }
     return [route];
   }, []);
-  window.__router = createRouter({
+  globalVar.__router = createRouter({
     routes,
     unstable_getContext,
     basename: payload.basename,
@@ -1957,26 +1959,26 @@ function createRouterFromPayload({
     },
     // FIXME: Pass `build.ssr` into this function
     dataStrategy: getRSCSingleFetchDataStrategy(
-      () => window.__router,
+      () => globalVar.__router,
       true,
       payload.basename,
       createFromReadableStream,
       fetchImplementation
     )
   });
-  if (window.__router.state.initialized) {
-    window.__routerInitialized = true;
-    window.__router.initialize();
+  if (globalVar.__router.state.initialized) {
+    globalVar.__routerInitialized = true;
+    globalVar.__router.initialize();
   } else {
-    window.__routerInitialized = false;
+    globalVar.__routerInitialized = false;
   }
   let lastLoaderData = void 0;
-  window.__router.subscribe(({ loaderData, actionData }) => {
+  globalVar.__router.subscribe(({ loaderData, actionData }) => {
     if (lastLoaderData !== loaderData) {
-      window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
+      globalVar.__routerActionID = (globalVar.__routerActionID ?? (globalVar.__routerActionID = 0)) + 1;
     }
   });
-  return window.__router;
+  return globalVar.__router;
 }
 var renderedRoutesContext = unstable_createContext();
 function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
@@ -2109,9 +2111,10 @@ function RSCHydratedRouter({
     ]
   );
   React4.useLayoutEffect(() => {
-    if (!window.__routerInitialized) {
-      window.__routerInitialized = true;
-      window.__router.initialize();
+    const globalVar = window;
+    if (!globalVar.__routerInitialized) {
+      globalVar.__routerInitialized = true;
+      globalVar.__router.initialize();
     }
   }, []);
   let [location2, setLocation] = React4.useState(router.state.location);
@@ -2297,7 +2300,8 @@ function getManifestUrl(paths) {
   if (paths.length === 1) {
     return new URL(`${paths[0]}.manifest`, window.location.origin);
   }
-  let basename = (window.__router.basename ?? "").replace(/^\/|\/$/g, "");
+  const globalVar = window;
+  let basename = (globalVar.__router.basename ?? "").replace(/^\/|\/$/g, "");
   let url = new URL(`${basename}/.manifest`, window.location.origin);
   paths.sort().forEach((path) => url.searchParams.append("p", path));
   return url;
@@ -2323,9 +2327,10 @@ async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fet
   }
   paths.forEach((p) => addToFifoQueue(p, discoveredPaths));
   payload.patches.forEach((p) => {
-    window.__router.patchRoutes(p.parentId ?? null, [
-      createRouteFromServerManifest(p)
-    ]);
+    window.__router.patchRoutes(
+      p.parentId ?? null,
+      [createRouteFromServerManifest(p)]
+    );
   });
 }
 function addToFifoQueue(path, queue) {

package/dist/development/{chunk-YNUF36W5.mjs → chunk-XPO7SIPX.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.7.0-pre.1
+ * react-router v7.7.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5993,35 +5993,62 @@ var createRoutesFromElements = createRoutesFromChildren;
 function renderMatches(matches) {
   return _renderMatches(matches);
 }
+function useRouteComponentProps() {
+  return {
+    params: useParams(),
+    loaderData: useLoaderData(),
+    actionData: useActionData(),
+    matches: useMatches()
+  };
+}
+function WithComponentProps({
+  children
+}) {
+  const props = useRouteComponentProps();
+  return React3.cloneElement(children, props);
+}
 function withComponentProps(Component4) {
-  return function WithComponentProps() {
-    const props = {
-      params: useParams(),
-      loaderData: useLoaderData(),
-      actionData: useActionData(),
-      matches: useMatches()
-    };
+  return function WithComponentProps2() {
+    const props = useRouteComponentProps();
     return React3.createElement(Component4, props);
   };
 }
+function useHydrateFallbackProps() {
+  return {
+    params: useParams(),
+    loaderData: useLoaderData(),
+    actionData: useActionData()
+  };
+}
+function WithHydrateFallbackProps({
+  children
+}) {
+  const props = useHydrateFallbackProps();
+  return React3.cloneElement(children, props);
+}
 function withHydrateFallbackProps(HydrateFallback) {
-  return function WithHydrateFallbackProps() {
-    const props = {
-      params: useParams(),
-      loaderData: useLoaderData(),
-      actionData: useActionData()
-    };
+  return function WithHydrateFallbackProps2() {
+    const props = useHydrateFallbackProps();
     return React3.createElement(HydrateFallback, props);
   };
 }
+function useErrorBoundaryProps() {
+  return {
+    params: useParams(),
+    loaderData: useLoaderData(),
+    actionData: useActionData(),
+    error: useRouteError()
+  };
+}
+function WithErrorBoundaryProps({
+  children
+}) {
+  const props = useErrorBoundaryProps();
+  return React3.cloneElement(children, props);
+}
 function withErrorBoundaryProps(ErrorBoundary) {
-  return function WithErrorBoundaryProps() {
-    const props = {
-      params: useParams(),
-      loaderData: useLoaderData(),
-      actionData: useActionData(),
-      error: useRouteError()
-    };
+  return function WithErrorBoundaryProps2() {
+    const props = useErrorBoundaryProps();
     return React3.createElement(ErrorBoundary, props);
   };
 }
@@ -8815,7 +8842,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.7.0-pre.1";
+    "7.7.0-pre.2";
   }
 } catch (e) {
 }
@@ -9982,8 +10009,11 @@ export {
   createRoutesFromChildren,
   createRoutesFromElements,
   renderMatches,
+  WithComponentProps,
   withComponentProps,
+  WithHydrateFallbackProps,
   withHydrateFallbackProps,
+  WithErrorBoundaryProps,
   withErrorBoundaryProps,
   createSearchParams,
   encode,