@react-router/dev 0.0.0-experimental-13d6d438f → 0.0.0-experimental-9aebdc522

package/dist/vite/build.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -149,26 +149,13 @@ async function cleanBuildDirectory(viteConfig, ctx) {
 }
 function getViteManifestPaths(ctx, serverBuilds) {
   let buildRelative = pathname => path__default["default"].resolve(ctx.reactRouterConfig.buildDirectory, pathname);
-  let viteManifestPaths = [{
-    srcPath: "client/.vite/manifest.json",
-    destPath: ".vite/client-manifest.json"
-  }, ...serverBuilds.map(({
+  let viteManifestPaths = ["client/.vite/manifest.json", ...serverBuilds.map(({
     serverBundleBuildConfig
   }) => {
     let serverBundleId = serverBundleBuildConfig === null || serverBundleBuildConfig === void 0 ? void 0 : serverBundleBuildConfig.serverBundleId;
     let serverBundlePath = serverBundleId ? serverBundleId + "/" : "";
-    let serverBundleSuffix = serverBundleId ? serverBundleId + "-" : "";
-    return {
-      srcPath: `server/${serverBundlePath}.vite/manifest.json`,
-      destPath: `.vite/server-${serverBundleSuffix}manifest.json`
-    };
-  })].map(({
-    srcPath,
-    destPath
-  }) => ({
-    srcPath: buildRelative(srcPath),
-    destPath: buildRelative(destPath)
-  }));
+    return `server/${serverBundlePath}.vite/manifest.json`;
+  })].map(srcPath => buildRelative(srcPath));
   return viteManifestPaths;
 }
 async function build(root, {
@@ -227,7 +214,16 @@ async function build(root, {
     });
   }
   await cleanBuildDirectory(viteConfig, ctx);
-  // Run the Vite client build first
+  // Then run React server build first
+  if (reactRouterConfig.future.unstable_serverComponents) {
+    // TODO: This will be handled by the vite env API in the future
+    process.env.REACT_SERVER_BUILD = "1";
+    await viteBuild({
+      ssr: true
+    });
+  }
+  process.env.REACT_SERVER_BUILD = "";
+  // Run the Vite client build second
   await viteBuild({
     ssr: false
   });
@@ -238,35 +234,29 @@ async function build(root, {
   } = await getServerBuilds(ctx);
   await Promise.all(serverBuilds.map(viteBuild));
   let viteManifestPaths = getViteManifestPaths(ctx, serverBuilds);
-  await Promise.all(viteManifestPaths.map(async ({
-    srcPath,
-    destPath
-  }) => {
-    let manifestExists = await fse__default["default"].pathExists(srcPath);
+  await Promise.all(viteManifestPaths.map(async viteManifestPath => {
+    let manifestExists = await fse__default["default"].pathExists(viteManifestPath);
     if (!manifestExists) return;
-    // Move/delete original Vite manifest file
-    if (ctx.viteManifestEnabled) {
-      await fse__default["default"].ensureDir(path__default["default"].dirname(destPath));
-      await fse__default["default"].move(srcPath, destPath);
-    } else {
-      await fse__default["default"].remove(srcPath);
+    // Delete original Vite manifest file if consumer doesn't want it
+    if (!ctx.viteManifestEnabled) {
+      await fse__default["default"].remove(viteManifestPath);
     }
     // Remove .vite dir if it's now empty
-    let viteDir = path__default["default"].dirname(srcPath);
+    let viteDir = path__default["default"].dirname(viteManifestPath);
     let viteDirFiles = await fse__default["default"].readdir(viteDir);
     if (viteDirFiles.length === 0) {
       await fse__default["default"].remove(viteDir);
     }
   }));
-  if (ctx.reactRouterConfig.manifest) {
-    await fse__default["default"].ensureDir(path__default["default"].join(ctx.reactRouterConfig.buildDirectory, ".react-router"));
-    await fse__default["default"].writeFile(path__default["default"].join(ctx.reactRouterConfig.buildDirectory, ".react-router", "manifest.json"), JSON.stringify(buildManifest, null, 2), "utf-8");
-  }
   await ((_reactRouterConfig$bu = reactRouterConfig.buildEnd) === null || _reactRouterConfig$bu === void 0 ? void 0 : _reactRouterConfig$bu.call(reactRouterConfig, {
     buildManifest,
     reactRouterConfig,
     viteConfig
   }));
+  const {
+    serverModules
+  } = plugin.getReactServerOptions();
+  invariant["default"](!serverModules.size, "`use server` is not yet supported.");
 }
 
 exports.build = build;

package/dist/vite/cloudflare-proxy-plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/dev.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/import-vite-esm-sync.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/node-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/plugin.d.ts

@@ -59,7 +59,9 @@ type ReactRouterPluginSsrBuildContext = {
 export type ReactRouterPluginContext = ReactRouterPluginSsrBuildContext & {
     rootDirectory: string;
     entryClientFilePath: string;
+    entryReactServerFilePath?: string;
     entryServerFilePath: string;
+    publicPath: string;
     reactRouterConfig: ResolvedVitePluginConfig;
     viteManifestEnabled: boolean;
 };
@@ -68,4 +70,12 @@ type MaybePromise<T> = T | Promise<T>;
 export declare let setReactRouterDevLoadContext: (loadContext: (request: Request) => MaybePromise<Record<string, unknown>>) => void;
 export type ReactRouterVitePlugin = (config?: VitePluginConfig) => Vite.Plugin[];
 export declare const reactRouterVitePlugin: ReactRouterVitePlugin;
+declare global {
+    var __clientModules: Set<string>;
+    var __serverModules: Set<string>;
+}
+export declare function getReactServerOptions(): {
+    clientModules: Set<string>;
+    serverModules: Set<string>;
+};
 export {};

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -22,6 +22,7 @@ var reactRouter = require('react-router');
 var esModuleLexer = require('es-module-lexer');
 var jsesc = require('jsesc');
 var colors = require('picocolors');
+var unpluginRsc = require('unplugin-rsc');
 var findConfig = require('../config/findConfig.js');
 var invariant = require('../invariant.js');
 var nodeAdapter = require('./node-adapter.js');
@@ -118,13 +119,16 @@ let serverManifestId = vmod.id("server-manifest");
 let browserManifestId = vmod.id("browser-manifest");
 let hmrRuntimeId = vmod.id("hmr-runtime");
 let injectHmrRuntimeId = vmod.id("inject-hmr-runtime");
+let reactServerBuildId = vmod.id("react-server-build");
+let clientReferencesId = vmod.id("client-references");
+let serverReferencesId = vmod.id("server-references");
 const resolveRelativeRouteFilePath = (route, reactRouterConfig) => {
   let vite = importViteEsmSync.importViteEsmSync();
   let file = route.file;
   let fullPath = path__namespace.resolve(reactRouterConfig.appDirectory, file);
   return vite.normalizePath(fullPath);
 };
-let vmods = [serverBuildId, serverManifestId, browserManifestId];
+let vmods = [serverBuildId, serverManifestId, browserManifestId, reactServerBuildId, clientReferencesId, serverReferencesId];
 const invalidateVirtualModules = viteDevServer => {
   vmods.forEach(vmod$1 => {
     let mod = viteDevServer.moduleGraph.getModuleById(vmod.resolve(vmod$1));
@@ -153,12 +157,12 @@ const getReactRouterManifestBuildAssets = (ctx, viteManifest, entryFilePath, pre
   let prependedAssetChunks = prependedAssetFilePaths.map(filePath => resolveChunk(ctx, viteManifest, filePath));
   let chunks = resolveDependantChunks(viteManifest, [...prependedAssetChunks, entryChunk]);
   return {
-    module: `${ctx.reactRouterConfig.publicPath}${entryChunk.file}`,
+    module: `${ctx.publicPath}${entryChunk.file}`,
     imports: dedupe(chunks.flatMap(e => e.imports ?? [])).map(imported => {
-      return `${ctx.reactRouterConfig.publicPath}${viteManifest[imported].file}`;
+      return `${ctx.publicPath}${viteManifest[imported].file}`;
     }) ?? [],
     css: dedupe(chunks.flatMap(e => e.css ?? [])).map(href => {
-      return `${ctx.reactRouterConfig.publicPath}${href}`;
+      return `${ctx.publicPath}${href}`;
     }) ?? []
   };
 };
@@ -233,6 +237,7 @@ const getServerBundleBuildConfig = viteUserConfig => {
   return viteUserConfig.__reactRouterServerBundleBuildConfig;
 };
 let getServerBuildDirectory = ctx => path__namespace.join(ctx.reactRouterConfig.buildDirectory, "server", ...(ctx.serverBundleBuildConfig ? [ctx.serverBundleBuildConfig.serverBundleId] : []));
+let getReactServerBuildDirectory = reactRouterConfig => path__namespace.join(reactRouterConfig.buildDirectory, "react-server");
 let getClientBuildDirectory = reactRouterConfig => path__namespace.join(reactRouterConfig.buildDirectory, "client");
 let defaultEntriesDir = path__namespace.resolve(__dirname, "..", "config", "defaults");
 let defaultEntries = fse__namespace.readdirSync(defaultEntriesDir).map(filename => path__namespace.join(defaultEntriesDir, filename));
@@ -280,11 +285,13 @@ const reactRouterVitePlugin = _config => {
     });
     let {
       entryClientFilePath,
+      entryReactServerFilePath,
       entryServerFilePath
     } = await config.resolveEntryFiles({
       rootDirectory,
       reactRouterConfig
     });
+    let publicPath = config.resolvePublicPath(viteUserConfig);
     let viteManifestEnabled = ((_viteUserConfig$build = viteUserConfig.build) === null || _viteUserConfig$build === void 0 ? void 0 : _viteUserConfig$build.manifest) === true;
     let ssrBuildCtx = viteConfigEnv.isSsrBuild && viteCommand === "build" ? {
       isSsrBuild: true,
@@ -297,7 +304,9 @@ const reactRouterVitePlugin = _config => {
       reactRouterConfig,
       rootDirectory,
       entryClientFilePath,
+      entryReactServerFilePath,
       entryServerFilePath,
+      publicPath,
       viteManifestEnabled,
       ...ssrBuildCtx
     };
@@ -314,7 +323,7 @@ const reactRouterVitePlugin = _config => {
     ctx.serverBundleBuildConfig.routes :
     // Otherwise, all routes are imported as usual
     ctx.reactRouterConfig.routes;
-    return `
+    let code = `
     import * as entryServer from ${JSON.stringify(resolveFileUrl.resolveFileUrl(ctx, ctx.entryServerFilePath))};
     ${Object.keys(routes).map((key, index) => {
       let route = routes[key];
@@ -325,7 +334,7 @@ const reactRouterVitePlugin = _config => {
       export const basename = ${JSON.stringify(ctx.reactRouterConfig.basename)};
       export const future = ${JSON.stringify(ctx.reactRouterConfig.future)};
       export const isSpaMode = ${!ctx.reactRouterConfig.ssr && ctx.reactRouterConfig.prerender == null};
-      export const publicPath = ${JSON.stringify(ctx.reactRouterConfig.publicPath)};
+      export const publicPath = ${JSON.stringify(ctx.publicPath)};
       export const entry = { module: entryServer };
       export const routes = {
         ${Object.keys(routes).map((key, index) => {
@@ -340,6 +349,61 @@ const reactRouterVitePlugin = _config => {
         }`;
     }).join(",\n  ")}
       };`;
+    if (ctx.reactRouterConfig.future.unstable_serverComponents) {
+      code += `
+      export { default as clientReferences } from ${JSON.stringify(clientReferencesId)};`;
+    }
+    return code;
+  };
+  let {
+    clientModules,
+    serverModules
+  } = getReactServerOptions();
+  let getReactServerEntry = () => {
+    invariant["default"](viteConfig, "viteconfig required to generate the react-server entry");
+    invariant["default"](ctx.entryReactServerFilePath, "entryReactServerFilePath required to generate the react-server entry");
+    let routes = ctx.serverBundleBuildConfig ?
+    // For server bundle builds, the server build should only import the
+    // routes for this bundle rather than importing all routes
+    ctx.serverBundleBuildConfig.routes :
+    // Otherwise, all routes are imported as usual
+    ctx.reactRouterConfig.routes;
+    return `
+      import * as entryServer from ${JSON.stringify(resolveFileUrl.resolveFileUrl(ctx, ctx.entryReactServerFilePath))};
+      ${Object.keys(routes).map((key, index) => {
+      let route = routes[key];
+      return `import * as route${index} from ${JSON.stringify(resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)))};`;
+    }).join("\n")}
+      export const future = ${JSON.stringify(ctx.reactRouterConfig.future)};
+      export const basename = ${JSON.stringify(ctx.reactRouterConfig.basename)};
+      export const entry = { module: entryServer };
+      export const routes = {
+        ${Object.keys(routes).map((key, index) => {
+      let route = routes[key];
+      return `${JSON.stringify(key)}: {
+        id: ${JSON.stringify(route.id)},
+        parentId: ${JSON.stringify(route.parentId)},
+        path: ${JSON.stringify(route.path)},
+        index: ${JSON.stringify(route.index)},
+        caseSensitive: ${JSON.stringify(route.caseSensitive)},
+        module: route${index}
+      }`;
+    }).join(",\n  ")}
+      };`;
+  };
+  let getClientReferencesEntry = () => {
+    let result = "export default {";
+    for (let clientModule of clientModules) {
+      result += `${JSON.stringify(prodHash(clientModule))}: () => import(${JSON.stringify(clientModule)}),`;
+    }
+    return `${result}};`;
+  };
+  let getServerReferencesEntry = () => {
+    let result = "export default {";
+    for (let serverModule of serverModules) {
+      result += `${JSON.stringify(prodHash(serverModule))}: () => import(${JSON.stringify(serverModule)}),`;
+    }
+    return `${result}\};`;
   };
   let loadViteManifest = async directory => {
     let manifestContents = await fse__namespace.readFile(path__namespace.resolve(directory, ".vite", "manifest.json"), "utf-8");
@@ -397,7 +461,7 @@ const reactRouterVitePlugin = _config => {
     };
     let version = getHash(JSON.stringify(fingerprintedValues), 8);
     let manifestPath = path__namespace.posix.join(viteConfig.build.assetsDir, `manifest-${version}.js`);
-    let url = `${ctx.reactRouterConfig.publicPath}${manifestPath}`;
+    let url = `${ctx.publicPath}${manifestPath}`;
     let nonFingerprintedValues = {
       url,
       version
@@ -432,7 +496,7 @@ const reactRouterVitePlugin = _config => {
         path: route.path,
         index: route.index,
         caseSensitive: route.caseSensitive,
-        module: path__namespace.posix.join(ctx.reactRouterConfig.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}`),
+        module: path__namespace.posix.join(ctx.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}`),
         hasAction: sourceExports.includes("action"),
         hasLoader: sourceExports.includes("loader"),
         hasClientAction: sourceExports.includes("clientAction"),
@@ -443,12 +507,12 @@ const reactRouterVitePlugin = _config => {
     }
     return {
       version: String(Math.random()),
-      url: path__namespace.posix.join(ctx.reactRouterConfig.publicPath, vmod.url(browserManifestId)),
+      url: path__namespace.posix.join(ctx.publicPath, vmod.url(browserManifestId)),
       hmr: {
-        runtime: path__namespace.posix.join(ctx.reactRouterConfig.publicPath, vmod.url(injectHmrRuntimeId))
+        runtime: path__namespace.posix.join(ctx.publicPath, vmod.url(injectHmrRuntimeId))
       },
       entry: {
-        module: path__namespace.posix.join(ctx.reactRouterConfig.publicPath, resolveFileUrl.resolveFileUrl(ctx, ctx.entryClientFilePath)),
+        module: path__namespace.posix.join(ctx.publicPath, resolveFileUrl.resolveFileUrl(ctx, ctx.entryClientFilePath)),
         imports: []
       },
       routes
@@ -538,9 +602,9 @@ const reactRouterVitePlugin = _config => {
               rollupOptions: {
                 ...baseRollupOptions,
                 preserveEntrySignatures: "exports-only",
-                input: [ctx.entryClientFilePath, ...Object.values(ctx.reactRouterConfig.routes).map(route => `${path__namespace.resolve(ctx.reactRouterConfig.appDirectory, route.file)}${BUILD_CLIENT_ROUTE_QUERY_STRING}`)]
+                input: [ctx.entryClientFilePath, ...Object.values(ctx.reactRouterConfig.routes).map(route => `${path__namespace.resolve(ctx.reactRouterConfig.appDirectory, route.file)}${BUILD_CLIENT_ROUTE_QUERY_STRING}`), ...(ctx.reactRouterConfig.future.unstable_serverComponents ? clientModules : [])]
               }
-            } : {
+            } : !ctx.reactRouterConfig.future.unstable_serverComponents || !process.env.REACT_SERVER_BUILD ? {
               // We move SSR-only assets to client assets. Note that the
               // SSR build can also emit code-split JS files (e.g. by
               // dynamic import) under the same assets directory
@@ -561,6 +625,28 @@ const reactRouterVitePlugin = _config => {
                   format: ctx.reactRouterConfig.serverModuleFormat
                 }
               }
+            } : {
+              // We move SSR-only assets to client assets. Note that the
+              // SSR build can also emit code-split JS files (e.g. by
+              // dynamic import) under the same assets directory
+              // regardless of "ssrEmitAssets" option, so we also need to
+              // keep these JS files have to be kept as-is.
+              ssrEmitAssets: true,
+              copyPublicDir: false,
+              // Assets in the public directory are only used by the client
+              manifest: true,
+              // We need the manifest to detect SSR-only assets
+              outDir: getReactServerBuildDirectory(ctx.reactRouterConfig),
+              rollupOptions: {
+                ...baseRollupOptions,
+                preserveEntrySignatures: "exports-only",
+                // TODO: Add server references (serverModules) to input
+                input: reactServerBuildId,
+                output: {
+                  entryFileNames: ctx.reactRouterConfig.serverBuildFile,
+                  format: ctx.reactRouterConfig.serverModuleFormat
+                }
+              }
             })
           }
         } : undefined),
@@ -714,7 +800,7 @@ const reactRouterVitePlugin = _config => {
       // After the SSR build is finished, we inspect the Vite manifest for
       // the SSR build and move server-only assets to client assets directory
       async handler() {
-        if (!ctx.isSsrBuild) {
+        if (!ctx.isSsrBuild || process.env.REACT_SERVER_BUILD) {
           return;
         }
         invariant["default"](viteConfig);
@@ -798,6 +884,18 @@ const reactRouterVitePlugin = _config => {
             });
             return `window.__remixManifest=${reactRouterManifestString};`;
           }
+        case vmod.resolve(reactServerBuildId):
+          {
+            return getReactServerEntry();
+          }
+        case vmod.resolve(clientReferencesId):
+          {
+            return getClientReferencesEntry();
+          }
+        case vmod.resolve(serverReferencesId):
+          {
+            return getServerReferencesEntry();
+          }
       }
     }
   }, {
@@ -853,9 +951,20 @@ const reactRouterVitePlugin = _config => {
   }, {
     name: "react-router-route-exports",
     async transform(code, id, options) {
-      if (options !== null && options !== void 0 && options.ssr) return;
+      var _ctx;
+      if (options !== null && options !== void 0 && options.ssr && !((_ctx = ctx) !== null && _ctx !== void 0 && _ctx.reactRouterConfig.future.unstable_serverComponents)) {
+        return;
+      }
       let route = getRoute(ctx.reactRouterConfig, id);
       if (!route) return;
+      let [filepath] = id.split("?");
+      if (ctx.reactRouterConfig.future.unstable_serverComponents && process.env.REACT_SERVER_BUILD) {
+        return removeExports.removeExports(code, CLIENT_ROUTE_EXPORTS, {
+          sourceMaps: true,
+          filename: id,
+          sourceFileName: filepath
+        });
+      }
       if (!ctx.reactRouterConfig.ssr) {
         let serverOnlyExports = esModuleLexer.parse(code)[1].map(exp => exp.n).filter(exp => SERVER_ONLY_ROUTE_EXPORTS.includes(exp));
         if (serverOnlyExports.length > 0) {
@@ -871,7 +980,6 @@ const reactRouterVitePlugin = _config => {
           }
         }
       }
-      let [filepath] = id.split("?");
       return removeExports.removeExports(code, SERVER_ONLY_ROUTE_EXPORTS, {
         sourceMaps: true,
         filename: id,
@@ -967,6 +1075,88 @@ const reactRouterVitePlugin = _config => {
       });
       return modules;
     }
+  }, {
+    name: "remix:react-server",
+    config() {
+      const env = process.env.REACT_SERVER_BUILD ? "server" : "client";
+      switch (env) {
+        case "client":
+          return {
+            optimizeDeps: {
+              include: ["react", "react/jsx-runtime", "react/jsx-dev-runtime", "react-server-dom-diy/client"]
+            }
+          };
+        case "server":
+          return {
+            optimizeDeps: {
+              include: ["react", "react/jsx-runtime", "react/jsx-dev-runtime", "react-server-dom-diy/server"]
+            },
+            resolve: {
+              conditions: ["react-server"]
+            },
+            ssr: {
+              noExternal: ["react", "react/jsx-runtime", "react/jsx-dev-runtime", "react-server-dom-diy/server"],
+              optimizeDeps: {
+                include: ["react", "react/jsx-runtime", "react/jsx-dev-runtime", "react-server-dom-diy/server"]
+              },
+              resolve: {
+                conditions: ["react-server"],
+                externalConditions: ["react-server"]
+              }
+            }
+          };
+      }
+    },
+    configResolved(resolvedViteConfig) {
+      viteConfig = resolvedViteConfig;
+      invariant["default"](viteConfig);
+    },
+    transform(...args) {
+      invariant["default"](viteConfig);
+      const env = process.env.REACT_SERVER_BUILD ? "server" : "client";
+      let hash = viteConfig.mode !== "production" ? devHash : prodHash;
+      switch (env) {
+        case "client":
+          return unpluginRsc.rscClientPlugin.vite({
+            include: ["**/*"],
+            transformModuleId: hash,
+            useServerRuntime: {
+              function: "createServerReference",
+              module: "@react-router/dev/dist/runtime.client.js"
+            },
+            onModuleFound(id, type) {
+              switch (type) {
+                case "use server":
+                  serverModules.add(id);
+                  break;
+              }
+            }
+          }).transform.call(this, ...args);
+        case "server":
+          return unpluginRsc.rscServerPlugin.vite({
+            include: ["**/*"],
+            transformModuleId: hash,
+            useClientRuntime: {
+              function: "registerClientReference",
+              module: "react-server-dom-diy/server"
+            },
+            useServerRuntime: {
+              function: "registerServerReference",
+              module: "react-server-dom-diy/server"
+            },
+            onModuleFound(id, type) {
+              switch (type) {
+                case "use client":
+                  clientModules.add(id);
+                  break;
+                case "use server":
+                  serverModules.add(id);
+                  break;
+              }
+            }
+          }).transform.call(this, ...args);
+      }
+    }
   }];
 };
 function isInReactRouterMonorepo() {
@@ -1033,8 +1223,8 @@ async function getRouteMetadata(ctx, viteChildCompiler, route, readRouteFile) {
     path: route.path,
     index: route.index,
     caseSensitive: route.caseSensitive,
-    url: path__namespace.posix.join(ctx.reactRouterConfig.publicPath, "/" + path__namespace.relative(ctx.rootDirectory, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))),
-    module: path__namespace.posix.join(ctx.reactRouterConfig.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}?import`),
+    url: path__namespace.posix.join(ctx.publicPath, "/" + path__namespace.relative(ctx.rootDirectory, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))),
+    module: path__namespace.posix.join(ctx.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}?import`),
     // Ensure the Vite dev server responds with a JS module
     hasAction: sourceExports.includes("action"),
     hasClientAction: sourceExports.includes("clientAction"),
@@ -1165,8 +1355,31 @@ function createPrerenderRoutes(manifest, parentId = "", routesByParentId = group
     };
   });
 }
+function prodHash(str, _) {
+  return `/${path__namespace.relative(process.cwd(), str)}`;
+}
+function devHash(str, _) {
+  const resolved = path__namespace.resolve(str);
+  let unixPath = resolved.replace(/\\/g, "/");
+  if (!unixPath.startsWith("/")) {
+    unixPath = `/${unixPath}`;
+  }
+  if (resolved.startsWith(process.cwd())) {
+    return `/${path__namespace.relative(process.cwd(), unixPath)}`;
+  }
+  return `/@fs${unixPath}`;
+}
+global.__clientModules = global.__clientModules || new Set();
+global.__serverModules = global.__serverModules || new Set();
+function getReactServerOptions() {
+  return {
+    clientModules: global.__clientModules,
+    serverModules: global.__serverModules
+  };
+}
 
 exports.extractPluginContext = extractPluginContext;
+exports.getReactServerOptions = getReactServerOptions;
 exports.getServerBuildDirectory = getServerBuildDirectory;
 exports.loadPluginContext = loadPluginContext;
 exports.reactRouterVitePlugin = reactRouterVitePlugin;

package/dist/vite/profiler.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/remove-exports.d.ts

@@ -1,2 +1,4 @@
 import type { GeneratorOptions } from "@babel/generator";
-export declare const removeExports: (source: string, exportsToRemove: string[], generateOptions?: GeneratorOptions) => import("@babel/generator").GeneratorResult;
+export declare const removeExports: (source: string, exportsToRemove: string[], generateOptions?: GeneratorOptions) => import("@babel/generator").GeneratorResult | {
+    code: string;
+};

package/dist/vite/remove-exports.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -179,6 +179,20 @@ const removeExports = (source, exportsToRemove, generateOptions = {}) => {
       if (shouldRemove) {
         path.remove();
       }
+    },
+    ExportDefaultDeclaration(path) {
+      if (exportsToRemove.includes("default")) {
+        removedExports.add("default");
+        path.remove();
+        return false;
+      }
+    },
+    ExportDefaultSpecifier(path) {
+      if (exportsToRemove.includes("default")) {
+        removedExports.add("default");
+        path.remove();
+        return false;
+      }
     }
   });
   if (removedExports.size === 0) {
@@ -272,7 +286,9 @@ const removeExports = (source, exportsToRemove, generateOptions = {}) => {
       ImportNamespaceSpecifier: sweepImport
     });
   } while (referencesRemovedInThisPass);
-  return babel.generate(document, generateOptions);
+  return {
+    code: babel.generate(document, generateOptions).code + `\n${[...removedExports].map(exp => exp === "default" ? "export default 1;" : `export const ${exp} = 1;`).join("\n")}`
+  };
 };
 
 exports.removeExports = removeExports;

package/dist/vite/resolve-file-url.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/styles.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vmod.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-13d6d438f
+ * @react-router/dev v0.0.0-experimental-9aebdc522
  *
  * Copyright (c) Remix Software Inc.
  *