@react-router/dev 0.0.0-experimental-d07149147 → 0.0.0-experimental-479e73b7b

package/dist/config/default-rsc-entries/entry.rsc.tsx

@@ -15,6 +15,7 @@ import {
 import routes from "virtual:react-router/unstable_rsc/routes";
 import routeDiscovery from "virtual:react-router/unstable_rsc/route-discovery";
 import basename from "virtual:react-router/unstable_rsc/basename";
+import clientVersion from "virtual:react-router/unstable_rsc/client-version";
 import unstable_reactRouterServeConfig from "virtual:react-router/unstable_rsc/react-router-serve-config";
 
 export { unstable_reactRouterServeConfig };
@@ -31,6 +32,8 @@ export function fetchServer(
     decodeFormState,
     decodeReply,
     loadServerAction,
+    // Detect stale clients after a new deployment.
+    clientVersion,
     // The incoming request.
     request,
     requestContext,

package/dist/config/default-rsc-entries/entry.ssr.tsx

@@ -4,6 +4,7 @@ import {
   unstable_routeRSCServerRequest as routeRSCServerRequest,
   unstable_RSCStaticRouter as RSCStaticRouter,
 } from "react-router";
+import subResourceIntegrity from "virtual:react-router/unstable_rsc/subresource-integrity";
 
 export async function generateHTML(
   request: Request,
@@ -31,6 +32,9 @@ export async function generateHTML(
           ...options,
           bootstrapScriptContent,
           formState,
+          importMap: subResourceIntegrity
+            ? { integrity: subResourceIntegrity }
+            : undefined,
           signal: request.signal,
         },
       );

package/dist/config/defaults/entry.server.node.tsx

@@ -1,6 +1,6 @@
 import { PassThrough } from "node:stream";
 
-import type { AppLoadContext, EntryContext } from "react-router";
+import type { EntryContext, RouterContextProvider } from "react-router";
 import { createReadableStreamFromReadable } from "@react-router/node";
 import { ServerRouter } from "react-router";
 import { isbot } from "isbot";
@@ -14,9 +14,7 @@ export default function handleRequest(
   responseStatusCode: number,
   responseHeaders: Headers,
   routerContext: EntryContext,
-  loadContext: AppLoadContext,
-  // If you have middleware enabled:
-  // loadContext: RouterContextProvider
+  loadContext: RouterContextProvider,
 ) {
   // https://httpwg.org/specs/rfc9110.html#HEAD
   if (request.method.toUpperCase() === "HEAD") {

package/dist/config/defaults/entry.server.web.tsx

@@ -0,0 +1,54 @@
+import type { EntryContext, RouterContextProvider } from "react-router";
+import { ServerRouter } from "react-router";
+import { isbot } from "isbot";
+import { renderToReadableStream } from "react-dom/server";
+
+export const streamTimeout = 5_000;
+
+export default async function handleRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  routerContext: EntryContext,
+  _loadContext: RouterContextProvider,
+) {
+  // https://httpwg.org/specs/rfc9110.html#HEAD
+  if (request.method.toUpperCase() === "HEAD") {
+    return new Response(null, {
+      status: responseStatusCode,
+      headers: responseHeaders,
+    });
+  }
+
+  let shellRendered = false;
+  let userAgent = request.headers.get("user-agent");
+
+  const body = await renderToReadableStream(
+    <ServerRouter context={routerContext} url={request.url} />,
+    {
+      signal: AbortSignal.timeout(streamTimeout + 1000),
+      onError(error: unknown) {
+        responseStatusCode = 500;
+        // Log streaming rendering errors from inside the shell. Don't log
+        // errors encountered during initial shell rendering since they'll
+        // reject and get logged in handleDocumentRequest.
+        if (shellRendered) {
+          console.error(error);
+        }
+      },
+    },
+  );
+  shellRendered = true;
+
+  // Ensure requests from bots and SPA Mode renders wait for all content to load before responding
+  // https://react.dev/reference/react-dom/server/renderToPipeableStream#waiting-for-all-content-to-load-for-crawlers-and-static-generation
+  if ((userAgent && isbot(userAgent)) || routerContext.isSpaMode) {
+    await body.allReady;
+  }
+
+  responseHeaders.set("Content-Type", "text/html");
+  return new Response(body, {
+    headers: responseHeaders,
+    status: responseStatusCode,
+  });
+}

package/dist/config-t89niiFv.d.ts

@@ -0,0 +1,280 @@
+
+import { i as RouteManifestEntry, n as RouteConfigEntry, r as RouteManifest } from "./routes-Kx8VZRs3.js";
+import * as Vite from "vite";
+
+//#region config/config.d.ts
+declare const excludedConfigPresetKeys: readonly ["presets"];
+type ExcludedConfigPresetKey = (typeof excludedConfigPresetKeys)[number];
+type ConfigPreset = Omit<ReactRouterConfig, ExcludedConfigPresetKey>;
+type Preset = {
+  name: string;
+  reactRouterConfig?: (args: {
+    reactRouterUserConfig: ReactRouterConfig;
+  }) => ConfigPreset | Promise<ConfigPreset>;
+  reactRouterConfigResolved?: (args: {
+    reactRouterConfig: ResolvedReactRouterConfig;
+  }) => void | Promise<void>;
+};
+declare const branchRouteProperties: readonly ["id", "path", "file", "index"];
+type BranchRoute = Pick<RouteManifestEntry, (typeof branchRouteProperties)[number]>;
+type ServerBundlesFunction = (args: {
+  branch: BranchRoute[];
+}) => string | Promise<string>;
+type BaseBuildManifest = {
+  routes: RouteManifest;
+};
+type DefaultBuildManifest = BaseBuildManifest & {
+  serverBundles?: never;
+  routeIdToServerBundleId?: never;
+};
+type ServerBundlesBuildManifest = BaseBuildManifest & {
+  serverBundles: {
+    [serverBundleId: string]: {
+      id: string;
+      file: string;
+    };
+  };
+  routeIdToServerBundleId: Record<string, string>;
+};
+type ServerModuleFormat = "esm" | "cjs";
+interface FutureConfig {
+  unstable_enableNodeReadableStream: boolean;
+  unstable_optimizeDeps: boolean;
+}
+type SplitRouteModulesOption = boolean | "enforce";
+type BuildManifest = DefaultBuildManifest | ServerBundlesBuildManifest;
+type BuildEndHook = (args: {
+  buildManifest: BuildManifest | undefined;
+  reactRouterConfig: ResolvedReactRouterConfig;
+  viteConfig: Vite.ResolvedConfig;
+}) => void | Promise<void>;
+type PrerenderPaths = boolean | Array<string> | ((args: {
+  getStaticPaths: () => string[];
+}) => Array<string> | Promise<Array<string>>);
+/**
+ * Config to be exported via the default export from `react-router.config.ts`.
+ */
+type ReactRouterConfig = {
+  /**
+   * The path to the `app` directory, relative to the root directory. Defaults
+   * to `"app"`.
+   */
+  appDirectory?: string;
+  /**
+   * The output format of the server build. Defaults to "esm".
+   */
+  serverModuleFormat?: ServerModuleFormat;
+  /**
+   * Enabled future flags
+   */
+  future?: [keyof FutureConfig] extends [never] ? {
+    [key: string]: never;
+  } : Partial<FutureConfig>;
+  /**
+   * Automatically split route modules into multiple chunks when possible.
+   *
+   * This can be set to `false` to keep route modules in a single chunk, or
+   * `"enforce"` to require all routes to be splittable.
+   *
+   * Defaults to `true`.
+   */
+  splitRouteModules?: SplitRouteModulesOption;
+  /**
+   * The React Router app basename.  Defaults to `"/"`.
+   */
+  basename?: string;
+  /**
+   * The path to the build directory, relative to the project. Defaults to
+   * `"build"`.
+   */
+  buildDirectory?: string;
+  /**
+   * A function that is called after the full React Router build is complete.
+   */
+  buildEnd?: BuildEndHook;
+  /**
+   * An array of URLs to prerender to HTML files at build time.  Can also be a
+   * function returning an array to dynamically generate URLs.
+   *
+   * `concurrency` defaults to 1, which means "no concurrency" - fully serial execution.
+   * Setting it to a value more than 1 enables concurrent prerendering.
+   * Setting it to a value higher than one can increase the speed of the build,
+   * but may consume more resources, and send more concurrent requests to the
+   * server/CMS.
+   */
+  prerender?: PrerenderPaths | {
+    paths: PrerenderPaths;
+    concurrency?: number;
+  };
+  /**
+   * An array of React Router plugin config presets to ease integration with
+   * other platforms and tools.
+   */
+  presets?: Array<Preset>;
+  /**
+   * Control the "Lazy Route Discovery" behavior
+   *
+   * - `routeDiscovery.mode`: By default, this resolves to `lazy` which will
+   *   lazily discover routes as the user navigates around your application.
+   *   You can set this to `initial` to opt-out of this behavior and load all
+   *   routes with the initial HTML document load.
+   * - `routeDiscovery.manifestPath`: The path to serve the manifest file from.
+   *    Only applies to `mode: "lazy"` and defaults to `/__manifest`.
+   */
+  routeDiscovery?: {
+    mode: "lazy";
+    manifestPath?: string;
+  } | {
+    mode: "initial";
+  };
+  /**
+   * The file name of the server build output. This file
+   * should end in a `.js` extension and should be deployed to your server.
+   * Defaults to `"index.js"`.
+   */
+  serverBuildFile?: string;
+  /**
+   * A function for assigning routes to different server bundles. This
+   * function should return a server bundle ID which will be used as the
+   * bundle's directory name within the server build directory.
+   */
+  serverBundles?: ServerBundlesFunction;
+  /**
+   * Enable server-side rendering for your application. Disable to use "SPA
+   * Mode", which will request the `/` path at build-time and save it as an
+   * `index.html` file with your assets so your application can be deployed as a
+   * SPA without server-rendering. Default's to `true`.
+   */
+  ssr?: boolean;
+  /**
+   * Enable subresource integrity hashes on asset script tags. Defaults to
+   * `false`.
+   */
+  subResourceIntegrity?: boolean;
+  /**
+   * An array of allowed origin hosts for action submissions to UI routes (does not apply
+   * to resource routes). Supports micromatch glob patterns (`*` to match one segment,
+   * `**` to match multiple).
+   *
+   * ```tsx
+   * export default {
+   *   allowedActionOrigins: [
+   *     "example.com",
+   *     "*.example.com", // sub.example.com
+   *     "**.example.com", // sub.domain.example.com
+   *   ],
+   * } satisfies Config;
+   * ```
+   *
+   * If you need to set this value at runtime, you can do in by setting the value
+   * on the server build in your custom server. For example, when using `express`:
+   *
+   * ```ts
+   * import express from "express";
+   * import { createRequestHandler } from "@react-router/express";
+   * import type { ServerBuild } from "react-router";
+   *
+   * export const app = express();
+   *
+   * async function getBuild() {
+   *   let build: ServerBuild = await import(
+   *     "virtual:react-router/server-build"
+   *   );
+   *   return {
+   *     ...build,
+   *     allowedActionOrigins:
+   *       process.env.NODE_ENV === "development"
+   *         ? undefined
+   *         : ["staging.example.com", "www.example.com"],
+   *   };
+   * }
+   *
+   * app.use(createRequestHandler({ build: getBuild }));
+   */
+  allowedActionOrigins?: string[];
+};
+type ResolvedReactRouterConfig = Readonly<{
+  /**
+   * The absolute path to the application source directory.
+   */
+  appDirectory: string;
+  /**
+   * The React Router app basename.  Defaults to `"/"`.
+   */
+  basename: string;
+  /**
+   * The absolute path to the build directory.
+   */
+  buildDirectory: string;
+  /**
+   * A function that is called after the full React Router build is complete.
+   */
+  buildEnd?: BuildEndHook;
+  /**
+   * Enabled future flags
+   */
+  future: FutureConfig;
+  /**
+   * Whether to automatically split route modules into multiple chunks when
+   * possible.
+   */
+  splitRouteModules: SplitRouteModulesOption;
+  /**
+   * An array of URLs to prerender to HTML files at build time.  Can also be a
+   * function returning an array to dynamically generate URLs.
+   */
+  prerender: ReactRouterConfig["prerender"];
+  /**
+   * Control the "Lazy Route Discovery" behavior
+   *
+   * - `routeDiscovery.mode`: By default, this resolves to `lazy` which will
+   *   lazily discover routes as the user navigates around your application.
+   *   You can set this to `initial` to opt-out of this behavior and load all
+   *   routes with the initial HTML document load.
+   * - `routeDiscovery.manifestPath`: The path to serve the manifest file from.
+   *    Only applies to `mode: "lazy"` and defaults to `/__manifest`.
+   */
+  routeDiscovery: ReactRouterConfig["routeDiscovery"];
+  /**
+   * An object of all available routes, keyed by route id.
+   */
+  routes: RouteManifest;
+  /**
+   * The file name of the server build output. This file
+   * should end in a `.js` extension and should be deployed to your server.
+   * Defaults to `"index.js"`.
+   */
+  serverBuildFile: string;
+  /**
+   * A function for assigning routes to different server bundles. This
+   * function should return a server bundle ID which will be used as the
+   * bundle's directory name within the server build directory.
+   */
+  serverBundles?: ServerBundlesFunction;
+  /**
+   * The output format of the server build. Defaults to "esm".
+   */
+  serverModuleFormat: ServerModuleFormat;
+  /**
+   * Enable server-side rendering for your application. Disable to use "SPA
+   * Mode", which will request the `/` path at build-time and save it as an
+   * `index.html` file with your assets so your application can be deployed as a
+   * SPA without server-rendering. Default's to `true`.
+   */
+  ssr: boolean;
+  /**
+   * Whether to generate subresource integrity hashes for asset script tags.
+   */
+  subResourceIntegrity: boolean;
+  /**
+   * The allowed origins for actions / mutations. Does not apply to routes
+   * without a component. micromatch glob patterns are supported.
+   */
+  allowedActionOrigins: string[] | false;
+  /**
+   * The resolved array of route config entries exported from `routes.ts`
+   */
+  unstable_routeConfig: RouteConfigEntry[];
+}>;
+//#endregion
+export { ServerBundlesFunction as i, Preset as n, ReactRouterConfig as r, BuildManifest as t };

package/dist/config.d.ts

@@ -1,281 +1,3 @@
-import * as Vite from 'vite';
-import { R as RouteManifest, a as RouteManifestEntry, b as RouteConfigEntry } from './routes-CZR-bKRt.js';
-import 'valibot';
 
-declare const excludedConfigPresetKeys: readonly ["presets"];
-type ExcludedConfigPresetKey = (typeof excludedConfigPresetKeys)[number];
-type ConfigPreset = Omit<ReactRouterConfig, ExcludedConfigPresetKey>;
-type Preset = {
-    name: string;
-    reactRouterConfig?: (args: {
-        reactRouterUserConfig: ReactRouterConfig;
-    }) => ConfigPreset | Promise<ConfigPreset>;
-    reactRouterConfigResolved?: (args: {
-        reactRouterConfig: ResolvedReactRouterConfig;
-    }) => void | Promise<void>;
-};
-declare const branchRouteProperties: readonly ["id", "path", "file", "index"];
-type BranchRoute = Pick<RouteManifestEntry, (typeof branchRouteProperties)[number]>;
-type ServerBundlesFunction = (args: {
-    branch: BranchRoute[];
-}) => string | Promise<string>;
-type BaseBuildManifest = {
-    routes: RouteManifest;
-};
-type DefaultBuildManifest = BaseBuildManifest & {
-    serverBundles?: never;
-    routeIdToServerBundleId?: never;
-};
-type ServerBundlesBuildManifest = BaseBuildManifest & {
-    serverBundles: {
-        [serverBundleId: string]: {
-            id: string;
-            file: string;
-        };
-    };
-    routeIdToServerBundleId: Record<string, string>;
-};
-type ServerModuleFormat = "esm" | "cjs";
-interface FutureConfig {
-    unstable_optimizeDeps: boolean;
-    v8_passThroughRequests: boolean;
-    v8_trailingSlashAwareDataRequests: boolean;
-    /**
-     * Prerender with Vite Preview server
-     */
-    unstable_previewServerPrerendering?: boolean;
-    /**
-     * Enable route middleware
-     */
-    v8_middleware: boolean;
-    /**
-     * Automatically split route modules into multiple chunks when possible.
-     */
-    v8_splitRouteModules: boolean | "enforce";
-    /**
-     * Use Vite Environment API
-     */
-    v8_viteEnvironmentApi: boolean;
-}
-type BuildManifest = DefaultBuildManifest | ServerBundlesBuildManifest;
-type BuildEndHook = (args: {
-    buildManifest: BuildManifest | undefined;
-    reactRouterConfig: ResolvedReactRouterConfig;
-    viteConfig: Vite.ResolvedConfig;
-}) => void | Promise<void>;
-type PrerenderPaths = boolean | Array<string> | ((args: {
-    getStaticPaths: () => string[];
-}) => Array<string> | Promise<Array<string>>);
-/**
- * Config to be exported via the default export from `react-router.config.ts`.
- */
-type ReactRouterConfig = {
-    /**
-     * The path to the `app` directory, relative to the root directory. Defaults
-     * to `"app"`.
-     */
-    appDirectory?: string;
-    /**
-     * The output format of the server build. Defaults to "esm".
-     */
-    serverModuleFormat?: ServerModuleFormat;
-    /**
-     * Enabled future flags
-     */
-    future?: [keyof FutureConfig] extends [never] ? {
-        [key: string]: never;
-    } : Partial<FutureConfig>;
-    /**
-     * The React Router app basename.  Defaults to `"/"`.
-     */
-    basename?: string;
-    /**
-     * The path to the build directory, relative to the project. Defaults to
-     * `"build"`.
-     */
-    buildDirectory?: string;
-    /**
-     * A function that is called after the full React Router build is complete.
-     */
-    buildEnd?: BuildEndHook;
-    /**
-     * An array of URLs to prerender to HTML files at build time.  Can also be a
-     * function returning an array to dynamically generate URLs.
-     *
-     * `concurrency` defaults to 1, which means "no concurrency" - fully serial execution.
-     * Setting it to a value more than 1 enables concurrent prerendering.
-     * Setting it to a value higher than one can increase the speed of the build,
-     * but may consume more resources, and send more concurrent requests to the
-     * server/CMS.
-     */
-    prerender?: PrerenderPaths | {
-        paths: PrerenderPaths;
-        concurrency?: number;
-    };
-    /**
-     * An array of React Router plugin config presets to ease integration with
-     * other platforms and tools.
-     */
-    presets?: Array<Preset>;
-    /**
-     * Control the "Lazy Route Discovery" behavior
-     *
-     * - `routeDiscovery.mode`: By default, this resolves to `lazy` which will
-     *   lazily discover routes as the user navigates around your application.
-     *   You can set this to `initial` to opt-out of this behavior and load all
-     *   routes with the initial HTML document load.
-     * - `routeDiscovery.manifestPath`: The path to serve the manifest file from.
-     *    Only applies to `mode: "lazy"` and defaults to `/__manifest`.
-     */
-    routeDiscovery?: {
-        mode: "lazy";
-        manifestPath?: string;
-    } | {
-        mode: "initial";
-    };
-    /**
-     * The file name of the server build output. This file
-     * should end in a `.js` extension and should be deployed to your server.
-     * Defaults to `"index.js"`.
-     */
-    serverBuildFile?: string;
-    /**
-     * A function for assigning routes to different server bundles. This
-     * function should return a server bundle ID which will be used as the
-     * bundle's directory name within the server build directory.
-     */
-    serverBundles?: ServerBundlesFunction;
-    /**
-     * Enable server-side rendering for your application. Disable to use "SPA
-     * Mode", which will request the `/` path at build-time and save it as an
-     * `index.html` file with your assets so your application can be deployed as a
-     * SPA without server-rendering. Default's to `true`.
-     */
-    ssr?: boolean;
-    /**
-     * Enable subresource integrity hashes on asset script tags. Defaults to
-     * `false`.
-     */
-    subResourceIntegrity?: boolean;
-    /**
-     * An array of allowed origin hosts for action submissions to UI routes (does not apply
-     * to resource routes). Supports micromatch glob patterns (`*` to match one segment,
-     * `**` to match multiple).
-     *
-     * ```tsx
-     * export default {
-     *   allowedActionOrigins: [
-     *     "example.com",
-     *     "*.example.com", // sub.example.com
-     *     "**.example.com", // sub.domain.example.com
-     *   ],
-     * } satisfies Config;
-     * ```
-     *
-     * If you need to set this value at runtime, you can do in by setting the value
-     * on the server build in your custom server. For example, when using `express`:
-     *
-     * ```ts
-     * import express from "express";
-     * import { createRequestHandler } from "@react-router/express";
-     * import type { ServerBuild } from "react-router";
-     *
-     * export const app = express();
-     *
-     * async function getBuild() {
-     *   let build: ServerBuild = await import(
-     *     "virtual:react-router/server-build"
-     *   );
-     *   return {
-     *     ...build,
-     *     allowedActionOrigins:
-     *       process.env.NODE_ENV === "development"
-     *         ? undefined
-     *         : ["staging.example.com", "www.example.com"],
-     *   };
-     * }
-     *
-     * app.use(createRequestHandler({ build: getBuild }));
-     */
-    allowedActionOrigins?: string[];
-};
-type ResolvedReactRouterConfig = Readonly<{
-    /**
-     * The absolute path to the application source directory.
-     */
-    appDirectory: string;
-    /**
-     * The React Router app basename.  Defaults to `"/"`.
-     */
-    basename: string;
-    /**
-     * The absolute path to the build directory.
-     */
-    buildDirectory: string;
-    /**
-     * A function that is called after the full React Router build is complete.
-     */
-    buildEnd?: BuildEndHook;
-    /**
-     * Enabled future flags
-     */
-    future: FutureConfig;
-    /**
-     * An array of URLs to prerender to HTML files at build time.  Can also be a
-     * function returning an array to dynamically generate URLs.
-     */
-    prerender: ReactRouterConfig["prerender"];
-    /**
-     * Control the "Lazy Route Discovery" behavior
-     *
-     * - `routeDiscovery.mode`: By default, this resolves to `lazy` which will
-     *   lazily discover routes as the user navigates around your application.
-     *   You can set this to `initial` to opt-out of this behavior and load all
-     *   routes with the initial HTML document load.
-     * - `routeDiscovery.manifestPath`: The path to serve the manifest file from.
-     *    Only applies to `mode: "lazy"` and defaults to `/__manifest`.
-     */
-    routeDiscovery: ReactRouterConfig["routeDiscovery"];
-    /**
-     * An object of all available routes, keyed by route id.
-     */
-    routes: RouteManifest;
-    /**
-     * The file name of the server build output. This file
-     * should end in a `.js` extension and should be deployed to your server.
-     * Defaults to `"index.js"`.
-     */
-    serverBuildFile: string;
-    /**
-     * A function for assigning routes to different server bundles. This
-     * function should return a server bundle ID which will be used as the
-     * bundle's directory name within the server build directory.
-     */
-    serverBundles?: ServerBundlesFunction;
-    /**
-     * The output format of the server build. Defaults to "esm".
-     */
-    serverModuleFormat: ServerModuleFormat;
-    /**
-     * Enable server-side rendering for your application. Disable to use "SPA
-     * Mode", which will request the `/` path at build-time and save it as an
-     * `index.html` file with your assets so your application can be deployed as a
-     * SPA without server-rendering. Default's to `true`.
-     */
-    ssr: boolean;
-    /**
-     * Whether to generate subresource integrity hashes for asset script tags.
-     */
-    subResourceIntegrity: boolean;
-    /**
-     * The allowed origins for actions / mutations. Does not apply to routes
-     * without a component. micromatch glob patterns are supported.
-     */
-    allowedActionOrigins: string[] | false;
-    /**
-     * The resolved array of route config entries exported from `routes.ts`
-     */
-    unstable_routeConfig: RouteConfigEntry[];
-}>;
-
-export type { BuildManifest, ReactRouterConfig as Config, Preset, ServerBundlesFunction };
+import { i as ServerBundlesFunction, n as Preset, r as ReactRouterConfig, t as BuildManifest } from "./config-t89niiFv.js";
+export type { BuildManifest, ReactRouterConfig as Config, Preset, ServerBundlesFunction };