@react-router/dev 0.0.0-experimental-23ff92a9d → 0.0.0-experimental-dcaf20023

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-23ff92a9d
+ * @react-router/dev v0.0.0-experimental-dcaf20023
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -100,27 +100,53 @@ var init_vite = __esm({
   }
 });
 
+// vite/ssr-externals.ts
+var ssrExternals;
+var init_ssr_externals = __esm({
+  "vite/ssr-externals.ts"() {
+    "use strict";
+    init_is_react_router_repo();
+    ssrExternals = isReactRouterRepo() ? [
+      // This is only needed within this repo because these packages
+      // are linked to a directory outside of node_modules so Vite
+      // treats them as internal code by default.
+      "react-router",
+      "react-router-dom",
+      "@react-router/architect",
+      "@react-router/cloudflare",
+      "@react-router/dev",
+      "@react-router/express",
+      "@react-router/node",
+      "@react-router/serve"
+    ] : void 0;
+  }
+});
+
 // vite/vite-node.ts
-async function createContext(viteConfig = {}) {
+async function createContext({
+  root,
+  mode
+}) {
   await preloadVite();
   const vite2 = getVite();
-  const devServer = await vite2.createServer(
-    vite2.mergeConfig(
-      {
-        server: {
-          preTransformRequests: false,
-          hmr: false
-        },
-        optimizeDeps: {
-          noDiscovery: true
-        },
-        configFile: false,
-        envFile: false,
-        plugins: []
-      },
-      viteConfig
-    )
-  );
+  const devServer = await vite2.createServer({
+    root,
+    mode,
+    server: {
+      preTransformRequests: false,
+      hmr: false,
+      watch: null
+    },
+    ssr: {
+      external: ssrExternals
+    },
+    optimizeDeps: {
+      noDiscovery: true
+    },
+    configFile: false,
+    envFile: false,
+    plugins: []
+  });
   await devServer.pluginContainer.buildStart({});
   const server = new import_server.ViteNodeServer(devServer);
   (0, import_source_map.installSourcemapsSupport)({
@@ -146,6 +172,7 @@ var init_vite_node = __esm({
     import_client = require("vite-node/client");
     import_source_map = require("vite-node/source-map");
     init_vite();
+    init_ssr_externals();
   }
 });
 
@@ -392,6 +419,7 @@ async function resolveConfig({
     unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
+    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
@@ -419,11 +447,7 @@ async function createConfigLoader({
   root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode: watch2 ? "development" : "production",
-    server: !watch2 ? { watch: null } : {},
-    ssr: {
-      external: ssrExternals
-    }
+    mode: watch2 ? "development" : "production"
   });
   let reactRouterConfigFile = findEntry(root, "react-router.config", {
     absolute: true
@@ -517,7 +541,7 @@ function findEntry(dir, basename2, options) {
   }
   return void 0;
 }
-var import_node_fs, import_node_child_process, import_package_json, import_pathe3, import_chokidar, import_picocolors, import_pick2, import_omit, import_cloneDeep, import_isEqual, excludedConfigPresetKeys, mergeReactRouterConfig, deepFreeze, ssrExternals, entryExts;
+var import_node_fs, import_node_child_process, import_package_json, import_pathe3, import_chokidar, import_picocolors, import_pick2, import_omit, import_cloneDeep, import_isEqual, excludedConfigPresetKeys, mergeReactRouterConfig, deepFreeze, entryExts;
 var init_config = __esm({
   "config/config.ts"() {
     "use strict";
@@ -534,7 +558,6 @@ var init_config = __esm({
     import_isEqual = __toESM(require("lodash/isEqual"));
     init_routes();
     init_detectPackageManager();
-    init_is_react_router_repo();
     excludedConfigPresetKeys = ["presets"];
     mergeReactRouterConfig = (...configs) => {
       let reducer = (configA, configB) => {
@@ -574,19 +597,6 @@ var init_config = __esm({
       });
       return o;
     };
-    ssrExternals = isReactRouterRepo() ? [
-      // This is only needed within this repo because these packages
-      // are linked to a directory outside of node_modules so Vite
-      // treats them as internal code by default.
-      "react-router",
-      "react-router-dom",
-      "@react-router/architect",
-      "@react-router/cloudflare",
-      "@react-router/dev",
-      "@react-router/express",
-      "@react-router/node",
-      "@react-router/serve"
-    ] : void 0;
     entryExts = [".js", ".jsx", ".ts", ".tsx"];
   }
 });
@@ -851,6 +861,8 @@ async function writeAll(ctx) {
   });
   const registerPath = Path4.join(typegenDir, "+register.ts");
   import_node_fs3.default.writeFileSync(registerPath, register(ctx));
+  const virtualPath = Path4.join(typegenDir, "+virtual.ts");
+  import_node_fs3.default.writeFileSync(virtualPath, virtual);
 }
 function register(ctx) {
   const register2 = import_dedent2.default`
@@ -863,12 +875,16 @@ function register(ctx) {
     }
   `;
   const { t: t2 } = babel_exports;
+  const indexPaths = new Set(
+    Object.values(ctx.config.routes).filter((route) => route.index).map((route) => route.path)
+  );
   const typeParams = t2.tsTypeAliasDeclaration(
     t2.identifier("Params"),
     null,
     t2.tsTypeLiteral(
       Object.values(ctx.config.routes).map((route) => {
         if (route.id !== "root" && !route.path) return void 0;
+        if (!route.index && indexPaths.has(route.path)) return void 0;
         const lineage2 = lineage(ctx.config.routes, route);
         const fullpath2 = fullpath(lineage2);
         const params = parse2(fullpath2);
@@ -892,7 +908,7 @@ function register(ctx) {
   );
   return [register2, generate(typeParams).code].join("\n\n");
 }
-var import_node_fs3, import_dedent2, Path4, import_picocolors3;
+var import_node_fs3, import_dedent2, Path4, import_picocolors3, virtual;
 var init_typegen = __esm({
   "typegen/index.ts"() {
     "use strict";
@@ -906,6 +922,22 @@ var init_typegen = __esm({
     init_paths();
     init_params();
     init_route();
+    virtual = import_dedent2.default`
+  declare module "virtual:react-router/server-build" {
+    import { ServerBuild } from "react-router";
+    export const assets: ServerBuild["assets"];
+    export const assetsBuildDirectory: ServerBuild["assetsBuildDirectory"];
+    export const basename: ServerBuild["basename"];
+    export const entry: ServerBuild["entry"];
+    export const future: ServerBuild["future"];
+    export const isSpaMode: ServerBuild["isSpaMode"];
+    export const prerender: ServerBuild["prerender"];
+    export const publicPath: ServerBuild["publicPath"];
+    export const routes: ServerBuild["routes"];
+    export const ssr: ServerBuild["ssr"];
+    export const unstable_getCriticalCss: ServerBuild["unstable_getCriticalCss"];
+  }
+`;
   }
 });
 
@@ -1187,7 +1219,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
         copyPublicDir: false,
         // Assets in the public directory are only used by the client
         rollupOptions: {
-          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id,
+          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual2.serverBuild.id,
           output: {
             entryFileNames: serverBuildFile,
             format: serverModuleFormat
@@ -1291,11 +1323,12 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
-var import_node_crypto, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, CSS_DEV_HELPER_ENVIRONMENT_NAME, virtualHmrRuntime, virtualInjectHmrRuntime, resolveRelativeRouteFilePath, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, fs4, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, CSS_DEV_HELPER_ENVIRONMENT_NAME, virtualHmrRuntime, virtualInjectHmrRuntime, resolveRelativeRouteFilePath, virtual2, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
     import_node_crypto = require("crypto");
+    fs4 = __toESM(require("fs"));
     path7 = __toESM(require("path"));
     url = __toESM(require("url"));
     fse = __toESM(require("fs-extra"));
@@ -1315,6 +1348,7 @@ var init_plugin = __esm({
     init_resolve_file_url();
     init_combine_urls();
     init_remove_exports();
+    init_ssr_externals();
     init_route_chunks();
     init_vite();
     init_config();
@@ -1346,7 +1380,7 @@ var init_plugin = __esm({
       let fullPath = path7.resolve(reactRouterConfig.appDirectory, file);
       return vite2.normalizePath(fullPath);
     };
-    virtual = {
+    virtual2 = {
       serverBuild: create("server-build"),
       serverManifest: create("server-manifest"),
       browserManifest: create("browser-manifest")

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

@@ -15,6 +15,8 @@ export default function handleRequest(
   responseHeaders: Headers,
   routerContext: EntryContext,
   loadContext: AppLoadContext
+  // If you have middleware enabled:
+  // loadContext: unstable_RouterContextProvider
 ) {
   return new Promise((resolve, reject) => {
     let shellRendered = false;

package/dist/config.d.ts

@@ -46,6 +46,7 @@ interface FutureConfig {
      * Automatically split route modules into multiple chunks when possible.
      */
     unstable_splitRouteModules: boolean | "enforce";
+    unstable_subResourceIntegrity: boolean;
     /**
      * Use Vite Environment API (experimental)
      */

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-23ff92a9d
+ * @react-router/dev v0.0.0-experimental-dcaf20023
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-23ff92a9d
+ * @react-router/dev v0.0.0-experimental-dcaf20023
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.d.ts

@@ -1,7 +1,8 @@
-import { AppLoadContext } from 'react-router';
+import { UNSAFE_MiddlewareEnabled, unstable_InitialContext, AppLoadContext } from 'react-router';
 import { Plugin } from 'vite';
 import { GetPlatformProxyOptions, PlatformProxy } from 'wrangler';
 
+type MaybePromise<T> = T | Promise<T>;
 type CfProperties = Record<string, unknown>;
 type LoadContext<Env, Cf extends CfProperties> = {
     cloudflare: Omit<PlatformProxy<Env, Cf>, "dispose">;
@@ -9,7 +10,7 @@ type LoadContext<Env, Cf extends CfProperties> = {
 type GetLoadContext<Env, Cf extends CfProperties> = (args: {
     request: Request;
     context: LoadContext<Env, Cf>;
-}) => AppLoadContext | Promise<AppLoadContext>;
+}) => UNSAFE_MiddlewareEnabled extends true ? MaybePromise<unstable_InitialContext> : MaybePromise<AppLoadContext>;
 /**
  * Vite plugin that provides [Node proxies to local workerd
  * bindings](https://developers.cloudflare.com/workers/wrangler/api/#getplatformproxy)

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-23ff92a9d
+ * @react-router/dev v0.0.0-experimental-dcaf20023
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -176,26 +176,47 @@ var import_package_json = __toESM(require("@npmcli/package-json"));
 var import_server = require("vite-node/server");
 var import_client = require("vite-node/client");
 var import_source_map = require("vite-node/source-map");
-async function createContext(viteConfig = {}) {
+
+// vite/ssr-externals.ts
+var ssrExternals = isReactRouterRepo() ? [
+  // This is only needed within this repo because these packages
+  // are linked to a directory outside of node_modules so Vite
+  // treats them as internal code by default.
+  "react-router",
+  "react-router-dom",
+  "@react-router/architect",
+  "@react-router/cloudflare",
+  "@react-router/dev",
+  "@react-router/express",
+  "@react-router/node",
+  "@react-router/serve"
+] : void 0;
+
+// vite/vite-node.ts
+async function createContext({
+  root,
+  mode
+}) {
   await preloadVite();
   const vite2 = getVite();
-  const devServer = await vite2.createServer(
-    vite2.mergeConfig(
-      {
-        server: {
-          preTransformRequests: false,
-          hmr: false
-        },
-        optimizeDeps: {
-          noDiscovery: true
-        },
-        configFile: false,
-        envFile: false,
-        plugins: []
-      },
-      viteConfig
-    )
-  );
+  const devServer = await vite2.createServer({
+    root,
+    mode,
+    server: {
+      preTransformRequests: false,
+      hmr: false,
+      watch: null
+    },
+    ssr: {
+      external: ssrExternals
+    },
+    optimizeDeps: {
+      noDiscovery: true
+    },
+    configFile: false,
+    envFile: false,
+    plugins: []
+  });
   await devServer.pluginContainer.buildStart({});
   const server = new import_server.ViteNodeServer(devServer);
   (0, import_source_map.installSourcemapsSupport)({
@@ -491,6 +512,7 @@ async function resolveConfig({
     unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
+    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
@@ -518,11 +540,7 @@ async function createConfigLoader({
   root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode: watch ? "development" : "production",
-    server: !watch ? { watch: null } : {},
-    ssr: {
-      external: ssrExternals
-    }
+    mode: watch ? "development" : "production"
   });
   let reactRouterConfigFile = findEntry(root, "react-router.config", {
     absolute: true
@@ -607,19 +625,6 @@ async function loadConfig({ rootDirectory }) {
   await configLoader.close();
   return config;
 }
-var ssrExternals = isReactRouterRepo() ? [
-  // This is only needed within this repo because these packages
-  // are linked to a directory outside of node_modules so Vite
-  // treats them as internal code by default.
-  "react-router",
-  "react-router-dom",
-  "@react-router/architect",
-  "@react-router/cloudflare",
-  "@react-router/dev",
-  "@react-router/express",
-  "@react-router/node",
-  "@react-router/serve"
-] : void 0;
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
 function findEntry(dir, basename, options) {
   for (let ext of entryExts) {

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-23ff92a9d
+ * @react-router/dev v0.0.0-experimental-dcaf20023
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -46,6 +46,7 @@ module.exports = __toCommonJS(vite_exports);
 
 // vite/plugin.ts
 var import_node_crypto = require("crypto");
+var fs3 = __toESM(require("fs"));
 var path6 = __toESM(require("path"));
 var url = __toESM(require("url"));
 var fse = __toESM(require("fs-extra"));
@@ -117,27 +118,46 @@ function getVite() {
   return vite;
 }
 
+// vite/ssr-externals.ts
+var ssrExternals = isReactRouterRepo() ? [
+  // This is only needed within this repo because these packages
+  // are linked to a directory outside of node_modules so Vite
+  // treats them as internal code by default.
+  "react-router",
+  "react-router-dom",
+  "@react-router/architect",
+  "@react-router/cloudflare",
+  "@react-router/dev",
+  "@react-router/express",
+  "@react-router/node",
+  "@react-router/serve"
+] : void 0;
+
 // vite/vite-node.ts
-async function createContext(viteConfig = {}) {
+async function createContext({
+  root,
+  mode
+}) {
   await preloadVite();
   const vite2 = getVite();
-  const devServer = await vite2.createServer(
-    vite2.mergeConfig(
-      {
-        server: {
-          preTransformRequests: false,
-          hmr: false
-        },
-        optimizeDeps: {
-          noDiscovery: true
-        },
-        configFile: false,
-        envFile: false,
-        plugins: []
-      },
-      viteConfig
-    )
-  );
+  const devServer = await vite2.createServer({
+    root,
+    mode,
+    server: {
+      preTransformRequests: false,
+      hmr: false,
+      watch: null
+    },
+    ssr: {
+      external: ssrExternals
+    },
+    optimizeDeps: {
+      noDiscovery: true
+    },
+    configFile: false,
+    envFile: false,
+    plugins: []
+  });
   await devServer.pluginContainer.buildStart({});
   const server = new import_server.ViteNodeServer(devServer);
   (0, import_source_map.installSourcemapsSupport)({
@@ -456,6 +476,7 @@ async function resolveConfig({
     unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
     unstable_optimizeDeps: reactRouterUserConfig.future?.unstable_optimizeDeps ?? false,
     unstable_splitRouteModules: reactRouterUserConfig.future?.unstable_splitRouteModules ?? false,
+    unstable_subResourceIntegrity: reactRouterUserConfig.future?.unstable_subResourceIntegrity ?? false,
     unstable_viteEnvironmentApi: reactRouterUserConfig.future?.unstable_viteEnvironmentApi ?? false
   };
   let reactRouterConfig = deepFreeze({
@@ -483,11 +504,7 @@ async function createConfigLoader({
   root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode: watch2 ? "development" : "production",
-    server: !watch2 ? { watch: null } : {},
-    ssr: {
-      external: ssrExternals
-    }
+    mode: watch2 ? "development" : "production"
   });
   let reactRouterConfigFile = findEntry(root, "react-router.config", {
     absolute: true
@@ -611,19 +628,6 @@ async function resolveEntryFiles({
   let entryServerFilePath = userEntryServerFile ? import_pathe3.default.resolve(reactRouterConfig.appDirectory, userEntryServerFile) : import_pathe3.default.resolve(defaultsDirectory, entryServerFile);
   return { entryClientFilePath, entryServerFilePath };
 }
-var ssrExternals = isReactRouterRepo() ? [
-  // This is only needed within this repo because these packages
-  // are linked to a directory outside of node_modules so Vite
-  // treats them as internal code by default.
-  "react-router",
-  "react-router-dom",
-  "@react-router/architect",
-  "@react-router/cloudflare",
-  "@react-router/dev",
-  "@react-router/express",
-  "@react-router/node",
-  "@react-router/serve"
-] : void 0;
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
 function findEntry(dir, basename2, options) {
   for (let ext of entryExts) {
@@ -823,6 +827,8 @@ async function writeAll(ctx) {
   });
   const registerPath = Path4.join(typegenDir, "+register.ts");
   import_node_fs2.default.writeFileSync(registerPath, register(ctx));
+  const virtualPath = Path4.join(typegenDir, "+virtual.ts");
+  import_node_fs2.default.writeFileSync(virtualPath, virtual);
 }
 function register(ctx) {
   const register2 = import_dedent2.default`
@@ -835,12 +841,16 @@ function register(ctx) {
     }
   `;
   const { t: t2 } = babel_exports;
+  const indexPaths = new Set(
+    Object.values(ctx.config.routes).filter((route) => route.index).map((route) => route.path)
+  );
   const typeParams = t2.tsTypeAliasDeclaration(
     t2.identifier("Params"),
     null,
     t2.tsTypeLiteral(
       Object.values(ctx.config.routes).map((route) => {
         if (route.id !== "root" && !route.path) return void 0;
+        if (!route.index && indexPaths.has(route.path)) return void 0;
         const lineage2 = lineage(ctx.config.routes, route);
         const fullpath2 = fullpath(lineage2);
         const params = parse2(fullpath2);
@@ -864,6 +874,22 @@ function register(ctx) {
   );
   return [register2, generate(typeParams).code].join("\n\n");
 }
+var virtual = import_dedent2.default`
+  declare module "virtual:react-router/server-build" {
+    import { ServerBuild } from "react-router";
+    export const assets: ServerBuild["assets"];
+    export const assetsBuildDirectory: ServerBuild["assetsBuildDirectory"];
+    export const basename: ServerBuild["basename"];
+    export const entry: ServerBuild["entry"];
+    export const future: ServerBuild["future"];
+    export const isSpaMode: ServerBuild["isSpaMode"];
+    export const prerender: ServerBuild["prerender"];
+    export const publicPath: ServerBuild["publicPath"];
+    export const routes: ServerBuild["routes"];
+    export const ssr: ServerBuild["ssr"];
+    export const unstable_getCriticalCss: ServerBuild["unstable_getCriticalCss"];
+  }
+`;
 
 // vite/node-adapter.ts
 var import_node_events = require("events");
@@ -2008,7 +2034,7 @@ var isRouteVirtualModule = (id) => {
   return isRouteEntryModuleId(id) || isRouteChunkModuleId(id);
 };
 var isServerBuildVirtualModuleId = (id) => {
-  return id.split("?")[0] === virtual.serverBuild.id;
+  return id.split("?")[0] === virtual2.serverBuild.id;
 };
 var getServerBuildFile = (viteManifest) => {
   let serverBuildIds = Object.keys(viteManifest).filter(
@@ -2038,13 +2064,13 @@ var resolveRelativeRouteFilePath = (route, reactRouterConfig) => {
   let fullPath = path6.resolve(reactRouterConfig.appDirectory, file);
   return vite2.normalizePath(fullPath);
 };
-var virtual = {
+var virtual2 = {
   serverBuild: create("server-build"),
   serverManifest: create("server-manifest"),
   browserManifest: create("browser-manifest")
 };
 var invalidateVirtualModules = (viteDevServer) => {
-  Object.values(virtual).forEach((vmod2) => {
+  Object.values(virtual2).forEach((vmod2) => {
     let mod = viteDevServer.moduleGraph.getModuleById(vmod2.resolvedId);
     if (mod) {
       viteDevServer.moduleGraph.invalidateModule(mod);
@@ -2316,7 +2342,7 @@ var reactRouterVitePlugin = () => {
       }
     }).join("\n")}
       export { default as assets } from ${JSON.stringify(
-      virtual.serverManifest.id
+      virtual2.serverManifest.id
     )};
       export const assetsBuildDirectory = ${JSON.stringify(
       path6.relative(
@@ -2345,7 +2371,7 @@ var reactRouterVitePlugin = () => {
     }).join(",\n  ")}
       };
       ${ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "serve" ? `
-              export const getCriticalCss = ({ pathname }) => {
+              export const unstable_getCriticalCss = ({ pathname }) => {
                 return {
                   rel: "stylesheet",
                   href: "${viteUserConfig.base ?? "/"}@react-router/critical.css?pathname=" + pathname,
@@ -2374,6 +2400,34 @@ var reactRouterVitePlugin = () => {
     );
     return /* @__PURE__ */ new Set([...cssUrlPaths, ...chunkAssetPaths]);
   };
+  let generateSriManifest = async (ctx2) => {
+    let clientBuildDirectory = getClientBuildDirectory(ctx2.reactRouterConfig);
+    let entries = fs3.readdirSync(clientBuildDirectory, {
+      withFileTypes: true,
+      recursive: true
+    });
+    let sriManifest = {};
+    for (const entry of entries) {
+      if (entry.isFile() && entry.name.endsWith(".js")) {
+        let contents;
+        try {
+          contents = await fse.readFile(
+            path6.join(entry.path, entry.name),
+            "utf-8"
+          );
+        } catch (e) {
+          logger.error(`Failed to read file for SRI generation: ${entry.name}`);
+          throw e;
+        }
+        let hash = (0, import_node_crypto.createHash)("sha384").update(contents).digest().toString("base64");
+        let filepath = getVite().normalizePath(
+          path6.relative(clientBuildDirectory, path6.join(entry.path, entry.name))
+        );
+        sriManifest[`${ctx2.publicPath}${filepath}`] = `sha384-${hash}`;
+      }
+    }
+    return sriManifest;
+  };
   let generateReactRouterManifestsForBuild = async ({
     routeIds
   }) => {
@@ -2468,7 +2522,8 @@ var reactRouterVitePlugin = () => {
     let nonFingerprintedValues = { url: url2, version };
     let reactRouterBrowserManifest = {
       ...fingerprintedValues,
-      ...nonFingerprintedValues
+      ...nonFingerprintedValues,
+      sri: void 0
     };
     await writeFileSafe(
       path6.join(getClientBuildDirectory(ctx.reactRouterConfig), manifestPath),
@@ -2476,9 +2531,14 @@ var reactRouterVitePlugin = () => {
         reactRouterBrowserManifest
       )};`
     );
+    let sri = void 0;
+    if (ctx.reactRouterConfig.future.unstable_subResourceIntegrity) {
+      sri = await generateSriManifest(ctx);
+    }
     let reactRouterServerManifest = {
       ...reactRouterBrowserManifest,
-      routes: serverRoutes
+      routes: serverRoutes,
+      sri
     };
     return {
       reactRouterBrowserManifest,
@@ -2542,9 +2602,10 @@ var reactRouterVitePlugin = () => {
         imports: []
       };
     }
+    let sri = void 0;
     let reactRouterManifestForDev = {
       version: String(Math.random()),
-      url: combineURLs(ctx.publicPath, virtual.browserManifest.url),
+      url: combineURLs(ctx.publicPath, virtual2.browserManifest.url),
       hmr: {
         runtime: combineURLs(ctx.publicPath, virtualInjectHmrRuntime.url)
       },
@@ -2555,6 +2616,7 @@ var reactRouterVitePlugin = () => {
         ),
         imports: []
       },
+      sri,
       routes
     };
     currentReactRouterManifestForDev = reactRouterManifestForDev;
@@ -2913,11 +2975,11 @@ var reactRouterVitePlugin = () => {
                     return;
                   }
                   build = await ssrEnvironment.runner.import(
-                    virtual.serverBuild.id
+                    virtual2.serverBuild.id
                   );
                 } else {
                   build = await viteDevServer.ssrLoadModule(
-                    virtual.serverBuild.id
+                    virtual2.serverBuild.id
                   );
                 }
                 let handler = (0, import_react_router2.createRequestHandler)(build, "development");
@@ -3138,16 +3200,16 @@ var reactRouterVitePlugin = () => {
       name: "react-router:virtual-modules",
       enforce: "pre",
       resolveId(id) {
-        const vmod2 = Object.values(virtual).find((vmod3) => vmod3.id === id);
+        const vmod2 = Object.values(virtual2).find((vmod3) => vmod3.id === id);
         if (vmod2) return vmod2.resolvedId;
       },
       async load(id) {
         switch (id) {
-          case virtual.serverBuild.resolvedId: {
+          case virtual2.serverBuild.resolvedId: {
             let routeIds = getServerBundleRouteIds(this, ctx);
             return await getServerEntry({ routeIds });
           }
-          case virtual.serverManifest.resolvedId: {
+          case virtual2.serverManifest.resolvedId: {
             let routeIds = getServerBundleRouteIds(this, ctx);
             let reactRouterManifest = viteCommand === "build" ? (await generateReactRouterManifestsForBuild({
               routeIds
@@ -3165,7 +3227,7 @@ var reactRouterVitePlugin = () => {
               es6: true
             })};`;
           }
-          case virtual.browserManifest.resolvedId: {
+          case virtual2.browserManifest.resolvedId: {
             if (viteCommand === "build") {
               throw new Error("This module only exists in development");
             }
@@ -4209,7 +4271,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
         copyPublicDir: false,
         // Assets in the public directory are only used by the client
         rollupOptions: {
-          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual.serverBuild.id,
+          input: (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig.environments?.ssr?.build?.rollupOptions?.input : viteUserConfig.build?.rollupOptions?.input) ?? virtual2.serverBuild.id,
           output: {
             entryFileNames: serverBuildFile,
             format: serverModuleFormat

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-23ff92a9d",
+  "version": "0.0.0-experimental-dcaf20023",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -76,19 +76,17 @@
     "es-module-lexer": "^1.3.1",
     "exit-hook": "2.2.1",
     "fs-extra": "^10.0.0",
-    "gunzip-maybe": "^1.4.2",
     "jsesc": "3.0.2",
     "lodash": "^4.17.21",
     "pathe": "^1.1.2",
     "picocolors": "^1.1.1",
-    "picomatch": "^2.3.1",
     "prettier": "^2.7.1",
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "3.0.0-beta.2",
-    "@react-router/node": "0.0.0-experimental-23ff92a9d"
+    "@react-router/node": "0.0.0-experimental-dcaf20023"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -97,35 +95,30 @@
     "@types/dedent": "^0.7.0",
     "@types/express": "^4.17.9",
     "@types/fs-extra": "^8.1.2",
-    "@types/gunzip-maybe": "^1.4.0",
     "@types/jsesc": "^3.0.1",
     "@types/lodash": "^4.14.182",
     "@types/node": "^20.0.0",
     "@types/npmcli__package-json": "^4.0.0",
-    "@types/picomatch": "^2.3.0",
     "@types/prettier": "^2.7.3",
     "@types/set-cookie-parser": "^2.4.1",
-    "dotenv": "^16.0.0",
     "esbuild-register": "^3.6.0",
     "execa": "5.1.1",
     "express": "^4.19.2",
     "fast-glob": "3.2.11",
-    "strip-ansi": "^6.0.1",
-    "tiny-invariant": "^1.2.0",
     "tsup": "^8.3.0",
     "typescript": "^5.1.6",
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^3.109.2",
-    "@react-router/serve": "0.0.0-experimental-23ff92a9d",
-    "react-router": "^0.0.0-experimental-23ff92a9d"
+    "@react-router/serve": "0.0.0-experimental-dcaf20023",
+    "react-router": "^0.0.0-experimental-dcaf20023"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-23ff92a9d",
-    "react-router": "^0.0.0-experimental-23ff92a9d"
+    "@react-router/serve": "^0.0.0-experimental-dcaf20023",
+    "react-router": "^0.0.0-experimental-dcaf20023"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {