react-router 7.0.0-pre.0 → 7.0.0-pre.2

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # `react-router`
 
+## 7.0.0-pre.2
+
+### Major Changes
+
+- Migrate Remix type generics to React Router ([#12180](https://github.com/remix-run/react-router/pull/12180))
+
+  - These generics are provided for Remix v2 migration purposes
+  - These generics and the APIs they exist on should be considered informally deprecated in favor of the new `Route.*` types
+  - Anyone migrating from React Router v6 should probably not leverage these new generics and should migrate straight to the `Route.*` types
+  - For React Router v6 users, these generics are new and should not impact your app, with one exception
+    - `useFetcher` previously had an optional generic (used primarily by Remix v2) that expected the data type
+    - This has been updated in v7 to expect the type of the function that generates the data (i.e., `typeof loader`/`typeof action`)
+    - Therefore, you should update your usages:
+      - ❌ `useFetcher<LoaderData>()`
+      - ✅ `useFetcher<typeof loader>()`
+
+- - Consolidate types previously duplicated across `@remix-run/router`, `@remix-run/server-runtime`, and `@remix-run/react` now that they all live in `react-router` ([#12177](https://github.com/remix-run/react-router/pull/12177))
+    - Examples: `LoaderFunction`, `LoaderFunctionArgs`, `ActionFunction`, `ActionFunctionArgs`, `DataFunctionArgs`, `RouteManifest`, `LinksFunction`, `Route`, `EntryRoute`
+    - The `RouteManifest` type used by the "remix" code is now slightly stricter because it is using the former `@remix-run/router` `RouteManifest`
+      - `Record<string, Route> -> Record<string, Route | undefined>`
+    - Removed `AppData` type in favor of inlining `unknown` in the few locations it was used
+    - Removed `ServerRuntimeMeta*` types in favor of the `Meta*` types they were duplicated from
+- Drop support for Node 18, update minimum Node vestion to 20 ([#12171](https://github.com/remix-run/react-router/pull/12171))
+
+  - Remove `installGlobals()` as this should no longer be necessary
+
+- Update `cookie` dependency to `^1.0.1` - please see the [release notes](https://github.com/jshttp/cookie/releases) for any breaking changes ([#12172](https://github.com/remix-run/react-router/pull/12172))
+
+### Patch Changes
+
+- Replace `substr` with `substring` ([#12080](https://github.com/remix-run/react-router/pull/12080))
+- Remove the deprecated `json` utility ([#12146](https://github.com/remix-run/react-router/pull/12146))
+
+  - You can use [`Response.json`](https://developer.mozilla.org/en-US/docs/Web/API/Response/json_static) if you still need to construct JSON responses in your app
+
+- Updated dependencies:
+  - `react-router@7.0.0-pre.2`
+
+## 7.0.0-pre.1
+
+### Patch Changes
+
+- Fix typegen for routes with a client loader but no server loader ([#12117](https://github.com/remix-run/react-router/pull/12117))
+- - Fix `react-router-serve` handling of prerendered HTML files by removing the `redirect: false` option so it now falls back on the default `redirect: true` behavior of redirecting from `/folder` -> `/folder/` which will then pick up `/folder/index.html` from disk. See https://expressjs.com/en/resources/middleware/serve-static.html ([#12071](https://github.com/remix-run/react-router/pull/12071))
+  - Proxy prerendered loader data into prerender pass for HTML files to avoid double-invocations of the loader at build time
+- Updated dependencies:
+  - `react-router@7.0.0-pre.1`
+
 ## 7.0.0-pre.0
 
 ### Major Changes
@@ -152,12 +200,12 @@
 - ### Typesafety improvements ([#12019](https://github.com/remix-run/react-router/pull/12019))
 
   React Router now generates types for each of your route modules.
-  You can access those types by importing them from `./+types/<route filename without extension>`.
+  You can access those types by importing them from `./+types.<route filename without extension>`.
   For example:
 
   ```ts
   // app/routes/product.tsx
-  import type * as Route from "./+types/product";
+  import type * as Route from "./+types.product";
 
   export function loader({ params }: Route.LoaderArgs) {}
 

package/dist/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * React Router v7.0.0-pre.0
+ * React Router v7.0.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -46,8 +46,10 @@ function createHydratedRouter() {
   if (!ssrInfo) {
     throw new Error("You must be using the SSR features of React Router in order to skip " + "passing a `router` prop to `<RouterProvider>`");
   }
+
   // We need to suspend until the initial state snapshot is decoded into
   // window.__reactRouterContext.state
+
   let localSsrInfo = ssrInfo;
   // Note: `stateDecodingPromise` is not coupled to `router` - we'll reach this
   // code potentially many times waiting for our state to arrive, but we'll
@@ -92,7 +94,7 @@ function createHydratedRouter() {
         // route opted into clientLoader hydration and either:
         // * gave us a HydrateFallback
         // * or doesn't have a server loader and we have no data to render
-        if (route && UNSAFE_shouldHydrateRouteLoader(manifestRoute, route, ssrInfo.context.isSpaMode) && (route.HydrateFallback || !manifestRoute.hasLoader)) {
+        if (route && manifestRoute && UNSAFE_shouldHydrateRouteLoader(manifestRoute, route, ssrInfo.context.isSpaMode) && (route.HydrateFallback || !manifestRoute.hasLoader)) {
           delete hydrationData.loaderData[routeId];
         } else if (manifestRoute && !manifestRoute.hasLoader) {
           // Since every Remix route gets a `loader` on the client side to load
@@ -110,6 +112,7 @@ function createHydratedRouter() {
       hydrationData.errors = UNSAFE_deserializeErrors(hydrationData.errors);
     }
   }
+
   // We don't use createBrowserRouter here because we need fine-grained control
   // over initialization to support synchronous `clientLoader` flows.
   let router = UNSAFE_createRouter({
@@ -122,18 +125,21 @@ function createHydratedRouter() {
     patchRoutesOnNavigation: UNSAFE_getPatchRoutesOnNavigationFunction(ssrInfo.manifest, ssrInfo.routeModules, ssrInfo.context.isSpaMode, ssrInfo.context.basename)
   });
   ssrInfo.router = router;
+
   // We can call initialize() immediately if the router doesn't have any
   // loaders to run on hydration
   if (router.state.initialized) {
     ssrInfo.routerInitialized = true;
     router.initialize();
   }
+
   // @ts-ignore
   router.createRoutesForHMR = /* spacer so ts-ignore does not affect the right hand of the assignment */
   UNSAFE_createClientRoutesWithHMRRevalidationOptOut;
-  window.__reactRouterInstance = router;
+  window.__reactRouterDataRouter = router;
   return router;
 }
+
 /**
  * @category Router Components
  */
@@ -142,6 +148,7 @@ function HydratedRouter() {
   if (!router) {
     router = createHydratedRouter();
   }
+
   // Critical CSS can become stale after code changes, e.g. styles might be
   // removed from a component, but the styles will still be present in the
   // server HTML. This allows our HMR logic to clear the critical CSS state.
@@ -171,6 +178,7 @@ function HydratedRouter() {
   }, [location]);
   !ssrInfo ? process.env.NODE_ENV !== "production" ? UNSAFE_invariant(false, "ssrInfo unavailable for HydratedRouter") : UNSAFE_invariant(false) : void 0;
   UNSAFE_useFogOFWarDiscovery(router, ssrInfo.manifest, ssrInfo.routeModules, ssrInfo.context.isSpaMode);
+
   // We need to include a wrapper RemixErrorBoundary here in case the root error
   // boundary also throws and we need to bubble up outside of the router entirely.
   // Then we need a stateful location here so the user can back-button navigate

package/dist/dom-export.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"dom-export.mjs","sources":["../../lib/dom-export/hydrated-router.tsx","../../lib/dom-export/dom-router-provider.tsx"],"sourcesContent":["import * as React from \"react\";\n\nimport type {\n  UNSAFE_AssetsManifest as AssetsManifest,\n  UNSAFE_RouteModules as RouteModules,\n  DataRouter,\n  HydrationState,\n} from \"react-router\";\nimport {\n  UNSAFE_invariant as invariant,\n  UNSAFE_FrameworkContext as FrameworkContext,\n  UNSAFE_decodeViaTurboStream as decodeViaTurboStream,\n  UNSAFE_RemixErrorBoundary as RemixErrorBoundary,\n  UNSAFE_createBrowserHistory as createBrowserHistory,\n  UNSAFE_createClientRoutes as createClientRoutes,\n  UNSAFE_createRouter as createRouter,\n  UNSAFE_deserializeErrors as deserializeErrors,\n  UNSAFE_getSingleFetchDataStrategy as getSingleFetchDataStrategy,\n  UNSAFE_getPatchRoutesOnNavigationFunction as getPatchRoutesOnNavigationFunction,\n  UNSAFE_shouldHydrateRouteLoader as shouldHydrateRouteLoader,\n  UNSAFE_useFogOFWarDiscovery as useFogOFWarDiscovery,\n  UNSAFE_mapRouteProperties as mapRouteProperties,\n  UNSAFE_createClientRoutesWithHMRRevalidationOptOut as createClientRoutesWithHMRRevalidationOptOut,\n  matchRoutes,\n} from \"react-router\";\nimport { RouterProvider } from \"./dom-router-provider\";\n\ntype SSRInfo = {\n  context: NonNullable<(typeof window)[\"__reactRouterContext\"]>;\n  routeModules: RouteModules;\n  manifest: AssetsManifest;\n  stateDecodingPromise:\n    | (Promise<void> & {\n        value?: unknown;\n        error?: unknown;\n      })\n    | undefined;\n  router: DataRouter | undefined;\n  routerInitialized: boolean;\n};\n\nlet ssrInfo: SSRInfo | null = null;\nlet router: DataRouter | null = null;\n\nfunction initSsrInfo(): void {\n  if (\n    !ssrInfo &&\n    window.__reactRouterContext &&\n    window.__reactRouterManifest &&\n    window.__reactRouterRouteModules\n  ) {\n    ssrInfo = {\n      context: window.__reactRouterContext,\n      manifest: window.__reactRouterManifest,\n      routeModules: window.__reactRouterRouteModules,\n      stateDecodingPromise: undefined,\n      router: undefined,\n      routerInitialized: false,\n    };\n  }\n}\n\nfunction createHydratedRouter(): DataRouter {\n  initSsrInfo();\n\n  if (!ssrInfo) {\n    throw new Error(\n      \"You must be using the SSR features of React Router in order to skip \" +\n        \"passing a `router` prop to `<RouterProvider>`\"\n    );\n  }\n\n  // We need to suspend until the initial state snapshot is decoded into\n  // window.__reactRouterContext.state\n\n  let localSsrInfo = ssrInfo;\n  // Note: `stateDecodingPromise` is not coupled to `router` - we'll reach this\n  // code potentially many times waiting for our state to arrive, but we'll\n  // then only get past here and create the `router` one time\n  if (!ssrInfo.stateDecodingPromise) {\n    let stream = ssrInfo.context.stream;\n    invariant(stream, \"No stream found for single fetch decoding\");\n    ssrInfo.context.stream = undefined;\n    ssrInfo.stateDecodingPromise = decodeViaTurboStream(stream, window)\n      .then((value) => {\n        ssrInfo!.context.state =\n          value.value as typeof localSsrInfo.context.state;\n        localSsrInfo.stateDecodingPromise!.value = true;\n      })\n      .catch((e) => {\n        localSsrInfo.stateDecodingPromise!.error = e;\n      });\n  }\n  if (ssrInfo.stateDecodingPromise.error) {\n    throw ssrInfo.stateDecodingPromise.error;\n  }\n  if (!ssrInfo.stateDecodingPromise.value) {\n    throw ssrInfo.stateDecodingPromise;\n  }\n\n  let routes = createClientRoutes(\n    ssrInfo.manifest.routes,\n    ssrInfo.routeModules,\n    ssrInfo.context.state,\n    ssrInfo.context.isSpaMode\n  );\n\n  let hydrationData: HydrationState | undefined = undefined;\n  if (!ssrInfo.context.isSpaMode) {\n    // Create a shallow clone of `loaderData` we can mutate for partial hydration.\n    // When a route exports a `clientLoader` and a `HydrateFallback`, the SSR will\n    // render the fallback so we need the client to do the same for hydration.\n    // The server loader data has already been exposed to these route `clientLoader`'s\n    // in `createClientRoutes` above, so we need to clear out the version we pass to\n    // `createBrowserRouter` so it initializes and runs the client loaders.\n    hydrationData = {\n      ...ssrInfo.context.state,\n      loaderData: { ...ssrInfo.context.state.loaderData },\n    };\n    let initialMatches = matchRoutes(\n      routes,\n      window.location,\n      window.__reactRouterContext?.basename\n    );\n    if (initialMatches) {\n      for (let match of initialMatches) {\n        let routeId = match.route.id;\n        let route = ssrInfo.routeModules[routeId];\n        let manifestRoute = ssrInfo.manifest.routes[routeId];\n        // Clear out the loaderData to avoid rendering the route component when the\n        // route opted into clientLoader hydration and either:\n        // * gave us a HydrateFallback\n        // * or doesn't have a server loader and we have no data to render\n        if (\n          route &&\n          shouldHydrateRouteLoader(\n            manifestRoute,\n            route,\n            ssrInfo.context.isSpaMode\n          ) &&\n          (route.HydrateFallback || !manifestRoute.hasLoader)\n        ) {\n          delete hydrationData.loaderData![routeId];\n        } else if (manifestRoute && !manifestRoute.hasLoader) {\n          // Since every Remix route gets a `loader` on the client side to load\n          // the route JS module, we need to add a `null` value to `loaderData`\n          // for any routes that don't have server loaders so our partial\n          // hydration logic doesn't kick off the route module loaders during\n          // hydration\n          hydrationData.loaderData![routeId] = null;\n        }\n      }\n    }\n\n    if (hydrationData && hydrationData.errors) {\n      // TODO: De-dup this or remove entirely in v7 where single fetch is the\n      // only approach and we have already serialized or deserialized on the server\n      hydrationData.errors = deserializeErrors(hydrationData.errors);\n    }\n  }\n\n  // We don't use createBrowserRouter here because we need fine-grained control\n  // over initialization to support synchronous `clientLoader` flows.\n  let router = createRouter({\n    routes,\n    history: createBrowserHistory(),\n    basename: ssrInfo.context.basename,\n    hydrationData,\n    mapRouteProperties,\n    dataStrategy: getSingleFetchDataStrategy(\n      ssrInfo.manifest,\n      ssrInfo.routeModules,\n      () => router\n    ),\n    patchRoutesOnNavigation: getPatchRoutesOnNavigationFunction(\n      ssrInfo.manifest,\n      ssrInfo.routeModules,\n      ssrInfo.context.isSpaMode,\n      ssrInfo.context.basename\n    ),\n  });\n  ssrInfo.router = router;\n\n  // We can call initialize() immediately if the router doesn't have any\n  // loaders to run on hydration\n  if (router.state.initialized) {\n    ssrInfo.routerInitialized = true;\n    router.initialize();\n  }\n\n  // @ts-ignore\n  router.createRoutesForHMR =\n    /* spacer so ts-ignore does not affect the right hand of the assignment */\n    createClientRoutesWithHMRRevalidationOptOut;\n  window.__reactRouterInstance = router;\n\n  return router;\n}\n\n/**\n * @category Router Components\n */\nexport function HydratedRouter() {\n  if (!router) {\n    router = createHydratedRouter();\n  }\n\n  // Critical CSS can become stale after code changes, e.g. styles might be\n  // removed from a component, but the styles will still be present in the\n  // server HTML. This allows our HMR logic to clear the critical CSS state.\n  let [criticalCss, setCriticalCss] = React.useState(\n    process.env.NODE_ENV === \"development\"\n      ? ssrInfo?.context.criticalCss\n      : undefined\n  );\n  if (process.env.NODE_ENV === \"development\") {\n    if (ssrInfo) {\n      window.__reactRouterClearCriticalCss = () => setCriticalCss(undefined);\n    }\n  }\n\n  let [location, setLocation] = React.useState(router.state.location);\n\n  React.useLayoutEffect(() => {\n    // If we had to run clientLoaders on hydration, we delay initialization until\n    // after we've hydrated to avoid hydration issues from synchronous client loaders\n    if (ssrInfo && ssrInfo.router && !ssrInfo.routerInitialized) {\n      ssrInfo.routerInitialized = true;\n      ssrInfo.router.initialize();\n    }\n  }, []);\n\n  React.useLayoutEffect(() => {\n    if (ssrInfo && ssrInfo.router) {\n      return ssrInfo.router.subscribe((newState) => {\n        if (newState.location !== location) {\n          setLocation(newState.location);\n        }\n      });\n    }\n  }, [location]);\n\n  invariant(ssrInfo, \"ssrInfo unavailable for HydratedRouter\");\n\n  useFogOFWarDiscovery(\n    router,\n    ssrInfo.manifest,\n    ssrInfo.routeModules,\n    ssrInfo.context.isSpaMode\n  );\n\n  // We need to include a wrapper RemixErrorBoundary here in case the root error\n  // boundary also throws and we need to bubble up outside of the router entirely.\n  // Then we need a stateful location here so the user can back-button navigate\n  // out of there\n  return (\n    // This fragment is important to ensure we match the <ServerRouter> JSX\n    // structure so that useId values hydrate correctly\n    <>\n      <FrameworkContext.Provider\n        value={{\n          manifest: ssrInfo.manifest,\n          routeModules: ssrInfo.routeModules,\n          future: ssrInfo.context.future,\n          criticalCss,\n          isSpaMode: ssrInfo.context.isSpaMode,\n        }}\n      >\n        <RemixErrorBoundary location={location}>\n          <RouterProvider router={router} />\n        </RemixErrorBoundary>\n      </FrameworkContext.Provider>\n      {/*\n          This fragment is important to ensure we match the <ServerRouter> JSX\n          structure so that useId values hydrate correctly\n        */}\n      <></>\n    </>\n  );\n}\n","import * as React from \"react\";\nimport * as ReactDOM from \"react-dom\";\n\nimport type { RouterProviderProps as BaseRouterProviderProps } from \"react-router\";\nimport { RouterProvider as BaseRouterProvider } from \"react-router\";\n\nexport { HydratedRouter } from \"./hydrated-router\";\n\nexport type RouterProviderProps = Omit<BaseRouterProviderProps, \"flushSync\">;\n\nexport function RouterProvider(props: Omit<RouterProviderProps, \"flushSync\">) {\n  return <BaseRouterProvider flushSync={ReactDOM.flushSync} {...props} />;\n}\n"],"names":["ssrInfo","router","initSsrInfo","window","__reactRouterContext","__reactRouterManifest","__reactRouterRouteModules","context","manifest","routeModules","stateDecodingPromise","undefined","routerInitialized","createHydratedRouter","Error","localSsrInfo","stream","process","env","NODE_ENV","invariant","decodeViaTurboStream","then","value","state","catch","e","error","routes","createClientRoutes","isSpaMode","hydrationData","_window$__reactRouter","_extends","loaderData","initialMatches","matchRoutes","location","basename","match","routeId","route","id","manifestRoute","shouldHydrateRouteLoader","HydrateFallback","hasLoader","errors","deserializeErrors","createRouter","history","createBrowserHistory","mapRouteProperties","dataStrategy","getSingleFetchDataStrategy","patchRoutesOnNavigation","getPatchRoutesOnNavigationFunction","initialized","initialize","createRoutesForHMR","createClientRoutesWithHMRRevalidationOptOut","__reactRouterInstance","HydratedRouter","_ssrInfo","criticalCss","setCriticalCss","React","useState","__reactRouterClearCriticalCss","setLocation","useLayoutEffect","subscribe","newState","useFogOFWarDiscovery","createElement","Fragment","FrameworkContext","Provider","future","RemixErrorBoundary","RouterProvider","props","BaseRouterProvider","flushSync","ReactDOM"],"mappings":"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"}
+{"version":3,"file":"dom-export.mjs","sources":["../lib/dom-export/hydrated-router.tsx","../lib/dom-export/dom-router-provider.tsx"],"sourcesContent":["import * as React from \"react\";\n\nimport type {\n  UNSAFE_AssetsManifest as AssetsManifest,\n  UNSAFE_RouteModules as RouteModules,\n  DataRouter,\n  HydrationState,\n} from \"react-router\";\nimport {\n  UNSAFE_invariant as invariant,\n  UNSAFE_FrameworkContext as FrameworkContext,\n  UNSAFE_decodeViaTurboStream as decodeViaTurboStream,\n  UNSAFE_RemixErrorBoundary as RemixErrorBoundary,\n  UNSAFE_createBrowserHistory as createBrowserHistory,\n  UNSAFE_createClientRoutes as createClientRoutes,\n  UNSAFE_createRouter as createRouter,\n  UNSAFE_deserializeErrors as deserializeErrors,\n  UNSAFE_getSingleFetchDataStrategy as getSingleFetchDataStrategy,\n  UNSAFE_getPatchRoutesOnNavigationFunction as getPatchRoutesOnNavigationFunction,\n  UNSAFE_shouldHydrateRouteLoader as shouldHydrateRouteLoader,\n  UNSAFE_useFogOFWarDiscovery as useFogOFWarDiscovery,\n  UNSAFE_mapRouteProperties as mapRouteProperties,\n  UNSAFE_createClientRoutesWithHMRRevalidationOptOut as createClientRoutesWithHMRRevalidationOptOut,\n  matchRoutes,\n} from \"react-router\";\nimport { RouterProvider } from \"./dom-router-provider\";\n\ntype SSRInfo = {\n  context: NonNullable<(typeof window)[\"__reactRouterContext\"]>;\n  routeModules: RouteModules;\n  manifest: AssetsManifest;\n  stateDecodingPromise:\n    | (Promise<void> & {\n        value?: unknown;\n        error?: unknown;\n      })\n    | undefined;\n  router: DataRouter | undefined;\n  routerInitialized: boolean;\n};\n\nlet ssrInfo: SSRInfo | null = null;\nlet router: DataRouter | null = null;\n\nfunction initSsrInfo(): void {\n  if (\n    !ssrInfo &&\n    window.__reactRouterContext &&\n    window.__reactRouterManifest &&\n    window.__reactRouterRouteModules\n  ) {\n    ssrInfo = {\n      context: window.__reactRouterContext,\n      manifest: window.__reactRouterManifest,\n      routeModules: window.__reactRouterRouteModules,\n      stateDecodingPromise: undefined,\n      router: undefined,\n      routerInitialized: false,\n    };\n  }\n}\n\nfunction createHydratedRouter(): DataRouter {\n  initSsrInfo();\n\n  if (!ssrInfo) {\n    throw new Error(\n      \"You must be using the SSR features of React Router in order to skip \" +\n        \"passing a `router` prop to `<RouterProvider>`\"\n    );\n  }\n\n  // We need to suspend until the initial state snapshot is decoded into\n  // window.__reactRouterContext.state\n\n  let localSsrInfo = ssrInfo;\n  // Note: `stateDecodingPromise` is not coupled to `router` - we'll reach this\n  // code potentially many times waiting for our state to arrive, but we'll\n  // then only get past here and create the `router` one time\n  if (!ssrInfo.stateDecodingPromise) {\n    let stream = ssrInfo.context.stream;\n    invariant(stream, \"No stream found for single fetch decoding\");\n    ssrInfo.context.stream = undefined;\n    ssrInfo.stateDecodingPromise = decodeViaTurboStream(stream, window)\n      .then((value) => {\n        ssrInfo!.context.state =\n          value.value as typeof localSsrInfo.context.state;\n        localSsrInfo.stateDecodingPromise!.value = true;\n      })\n      .catch((e) => {\n        localSsrInfo.stateDecodingPromise!.error = e;\n      });\n  }\n  if (ssrInfo.stateDecodingPromise.error) {\n    throw ssrInfo.stateDecodingPromise.error;\n  }\n  if (!ssrInfo.stateDecodingPromise.value) {\n    throw ssrInfo.stateDecodingPromise;\n  }\n\n  let routes = createClientRoutes(\n    ssrInfo.manifest.routes,\n    ssrInfo.routeModules,\n    ssrInfo.context.state,\n    ssrInfo.context.isSpaMode\n  );\n\n  let hydrationData: HydrationState | undefined = undefined;\n  if (!ssrInfo.context.isSpaMode) {\n    // Create a shallow clone of `loaderData` we can mutate for partial hydration.\n    // When a route exports a `clientLoader` and a `HydrateFallback`, the SSR will\n    // render the fallback so we need the client to do the same for hydration.\n    // The server loader data has already been exposed to these route `clientLoader`'s\n    // in `createClientRoutes` above, so we need to clear out the version we pass to\n    // `createBrowserRouter` so it initializes and runs the client loaders.\n    hydrationData = {\n      ...ssrInfo.context.state,\n      loaderData: { ...ssrInfo.context.state.loaderData },\n    };\n    let initialMatches = matchRoutes(\n      routes,\n      window.location,\n      window.__reactRouterContext?.basename\n    );\n    if (initialMatches) {\n      for (let match of initialMatches) {\n        let routeId = match.route.id;\n        let route = ssrInfo.routeModules[routeId];\n        let manifestRoute = ssrInfo.manifest.routes[routeId];\n        // Clear out the loaderData to avoid rendering the route component when the\n        // route opted into clientLoader hydration and either:\n        // * gave us a HydrateFallback\n        // * or doesn't have a server loader and we have no data to render\n        if (\n          route &&\n          manifestRoute &&\n          shouldHydrateRouteLoader(\n            manifestRoute,\n            route,\n            ssrInfo.context.isSpaMode\n          ) &&\n          (route.HydrateFallback || !manifestRoute.hasLoader)\n        ) {\n          delete hydrationData.loaderData![routeId];\n        } else if (manifestRoute && !manifestRoute.hasLoader) {\n          // Since every Remix route gets a `loader` on the client side to load\n          // the route JS module, we need to add a `null` value to `loaderData`\n          // for any routes that don't have server loaders so our partial\n          // hydration logic doesn't kick off the route module loaders during\n          // hydration\n          hydrationData.loaderData![routeId] = null;\n        }\n      }\n    }\n\n    if (hydrationData && hydrationData.errors) {\n      // TODO: De-dup this or remove entirely in v7 where single fetch is the\n      // only approach and we have already serialized or deserialized on the server\n      hydrationData.errors = deserializeErrors(hydrationData.errors);\n    }\n  }\n\n  // We don't use createBrowserRouter here because we need fine-grained control\n  // over initialization to support synchronous `clientLoader` flows.\n  let router = createRouter({\n    routes,\n    history: createBrowserHistory(),\n    basename: ssrInfo.context.basename,\n    hydrationData,\n    mapRouteProperties,\n    dataStrategy: getSingleFetchDataStrategy(\n      ssrInfo.manifest,\n      ssrInfo.routeModules,\n      () => router\n    ),\n    patchRoutesOnNavigation: getPatchRoutesOnNavigationFunction(\n      ssrInfo.manifest,\n      ssrInfo.routeModules,\n      ssrInfo.context.isSpaMode,\n      ssrInfo.context.basename\n    ),\n  });\n  ssrInfo.router = router;\n\n  // We can call initialize() immediately if the router doesn't have any\n  // loaders to run on hydration\n  if (router.state.initialized) {\n    ssrInfo.routerInitialized = true;\n    router.initialize();\n  }\n\n  // @ts-ignore\n  router.createRoutesForHMR =\n    /* spacer so ts-ignore does not affect the right hand of the assignment */\n    createClientRoutesWithHMRRevalidationOptOut;\n  window.__reactRouterDataRouter = router;\n\n  return router;\n}\n\n/**\n * @category Router Components\n */\nexport function HydratedRouter() {\n  if (!router) {\n    router = createHydratedRouter();\n  }\n\n  // Critical CSS can become stale after code changes, e.g. styles might be\n  // removed from a component, but the styles will still be present in the\n  // server HTML. This allows our HMR logic to clear the critical CSS state.\n  let [criticalCss, setCriticalCss] = React.useState(\n    process.env.NODE_ENV === \"development\"\n      ? ssrInfo?.context.criticalCss\n      : undefined\n  );\n  if (process.env.NODE_ENV === \"development\") {\n    if (ssrInfo) {\n      window.__reactRouterClearCriticalCss = () => setCriticalCss(undefined);\n    }\n  }\n\n  let [location, setLocation] = React.useState(router.state.location);\n\n  React.useLayoutEffect(() => {\n    // If we had to run clientLoaders on hydration, we delay initialization until\n    // after we've hydrated to avoid hydration issues from synchronous client loaders\n    if (ssrInfo && ssrInfo.router && !ssrInfo.routerInitialized) {\n      ssrInfo.routerInitialized = true;\n      ssrInfo.router.initialize();\n    }\n  }, []);\n\n  React.useLayoutEffect(() => {\n    if (ssrInfo && ssrInfo.router) {\n      return ssrInfo.router.subscribe((newState) => {\n        if (newState.location !== location) {\n          setLocation(newState.location);\n        }\n      });\n    }\n  }, [location]);\n\n  invariant(ssrInfo, \"ssrInfo unavailable for HydratedRouter\");\n\n  useFogOFWarDiscovery(\n    router,\n    ssrInfo.manifest,\n    ssrInfo.routeModules,\n    ssrInfo.context.isSpaMode\n  );\n\n  // We need to include a wrapper RemixErrorBoundary here in case the root error\n  // boundary also throws and we need to bubble up outside of the router entirely.\n  // Then we need a stateful location here so the user can back-button navigate\n  // out of there\n  return (\n    // This fragment is important to ensure we match the <ServerRouter> JSX\n    // structure so that useId values hydrate correctly\n    <>\n      <FrameworkContext.Provider\n        value={{\n          manifest: ssrInfo.manifest,\n          routeModules: ssrInfo.routeModules,\n          future: ssrInfo.context.future,\n          criticalCss,\n          isSpaMode: ssrInfo.context.isSpaMode,\n        }}\n      >\n        <RemixErrorBoundary location={location}>\n          <RouterProvider router={router} />\n        </RemixErrorBoundary>\n      </FrameworkContext.Provider>\n      {/*\n          This fragment is important to ensure we match the <ServerRouter> JSX\n          structure so that useId values hydrate correctly\n        */}\n      <></>\n    </>\n  );\n}\n","import * as React from \"react\";\nimport * as ReactDOM from \"react-dom\";\n\nimport type { RouterProviderProps as BaseRouterProviderProps } from \"react-router\";\nimport { RouterProvider as BaseRouterProvider } from \"react-router\";\n\nexport { HydratedRouter } from \"./hydrated-router\";\n\nexport type RouterProviderProps = Omit<BaseRouterProviderProps, \"flushSync\">;\n\nexport function RouterProvider(props: Omit<RouterProviderProps, \"flushSync\">) {\n  return <BaseRouterProvider flushSync={ReactDOM.flushSync} {...props} />;\n}\n"],"names":["ssrInfo","router","initSsrInfo","window","__reactRouterContext","__reactRouterManifest","__reactRouterRouteModules","context","manifest","routeModules","stateDecodingPromise","undefined","routerInitialized","createHydratedRouter","Error","localSsrInfo","stream","process","env","NODE_ENV","invariant","decodeViaTurboStream","then","value","state","catch","e","error","routes","createClientRoutes","isSpaMode","hydrationData","_window$__reactRouter","_extends","loaderData","initialMatches","matchRoutes","location","basename","match","routeId","route","id","manifestRoute","shouldHydrateRouteLoader","HydrateFallback","hasLoader","errors","deserializeErrors","createRouter","history","createBrowserHistory","mapRouteProperties","dataStrategy","getSingleFetchDataStrategy","patchRoutesOnNavigation","getPatchRoutesOnNavigationFunction","initialized","initialize","createRoutesForHMR","createClientRoutesWithHMRRevalidationOptOut","__reactRouterDataRouter","HydratedRouter","_ssrInfo","criticalCss","setCriticalCss","React","useState","__reactRouterClearCriticalCss","setLocation","useLayoutEffect","subscribe","newState","useFogOFWarDiscovery","createElement","Fragment","FrameworkContext","Provider","future","RemixErrorBoundary","RouterProvider","props","BaseRouterProvider","flushSync","ReactDOM"],"mappings":"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"}

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 export type { InitialEntry, Location, Path, To } from "./lib/router/history";
 export type { HydrationState, StaticHandler, GetScrollPositionFunction, GetScrollRestorationKeyFunction, StaticHandlerContext, Fetcher, Navigation, NavigationStates, RelativeRoutingType, Blocker, BlockerFunction, Router as DataRouter, RouterState, RouterInit, RouterSubscriber, RouterNavigateOptions, RouterFetchOptions, RevalidationState, } from "./lib/router/router";
-export type { ActionFunction, ActionFunctionArgs, DataStrategyFunction, DataStrategyFunctionArgs, DataStrategyMatch, DataStrategyResult, DataWithResponseInit as UNSAFE_DataWithResponseInit, ErrorResponse, FormEncType, FormMethod, HTMLFormMethod, JsonFunction, LazyRouteFunction, LoaderFunction, LoaderFunctionArgs, ParamParseKey, Params, PathMatch, PathParam, PathPattern, RedirectFunction, ShouldRevalidateFunction, ShouldRevalidateFunctionArgs, UIMatch, } from "./lib/router/utils";
+export type { ActionFunction, ActionFunctionArgs, DataStrategyFunction, DataStrategyFunctionArgs, DataStrategyMatch, DataStrategyResult, DataWithResponseInit as UNSAFE_DataWithResponseInit, ErrorResponse, FormEncType, FormMethod, HTMLFormMethod, LazyRouteFunction, LoaderFunction, LoaderFunctionArgs, ParamParseKey, Params, PathMatch, PathParam, PathPattern, RedirectFunction, ShouldRevalidateFunction, ShouldRevalidateFunctionArgs, UIMatch, } from "./lib/router/utils";
 export { Action as NavigationType, createPath, parsePath, } from "./lib/router/history";
 export { IDLE_NAVIGATION, IDLE_FETCHER, IDLE_BLOCKER, } from "./lib/router/router";
-export { data, generatePath, isRouteErrorResponse, json, matchPath, matchRoutes, redirect, redirectDocument, replace, resolvePath, } from "./lib/router/utils";
+export { data, generatePath, isRouteErrorResponse, matchPath, matchRoutes, redirect, redirectDocument, replace, resolvePath, } from "./lib/router/utils";
 export type { DataRouteMatch, DataRouteObject, IndexRouteObject, NavigateOptions, Navigator, NonIndexRouteObject, PatchRoutesOnNavigationFunction, PatchRoutesOnNavigationFunctionArgs, RouteMatch, RouteObject, } from "./lib/context";
 export type { AwaitProps, IndexRouteProps, LayoutRouteProps, MemoryRouterProps, NavigateProps, OutletProps, PathRouteProps, RouteProps, RouterProps, RouterProviderProps, RoutesProps, } from "./lib/components";
 export type { NavigateFunction } from "./lib/hooks";
@@ -36,8 +36,7 @@ export type { HandleDataRequestFunction, HandleDocumentRequestFunction, HandleEr
 export type { Cookie, CookieOptions, CookieParseOptions, CookieSerializeOptions, CookieSignatureOptions, } from "./lib/server-runtime/cookies";
 export type { AppLoadContext } from "./lib/server-runtime/data";
 export type { PageLinkDescriptor, HtmlLinkDescriptor, LinkDescriptor, } from "./lib/router/links";
-export type { TypedResponse } from "./lib/server-runtime/responses";
-export type { DataFunctionArgs, HeadersArgs, HeadersFunction, } from "./lib/server-runtime/routeModules";
+export type { HeadersArgs, HeadersFunction, } from "./lib/server-runtime/routeModules";
 export type { RequestHandler } from "./lib/server-runtime/server";
 export type { Session, SessionData, SessionIdStorageStrategy, SessionStorage, FlashSessionData, } from "./lib/server-runtime/sessions";
 /** @internal */