@react-router/dev 0.0.0-experimental-49eef6a01 → 0.0.0-experimental-a26b992a1

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -15,22 +15,27 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var node_crypto = require('node:crypto');
 var path = require('node:path');
 var url = require('node:url');
+var server = require('vite-node/server');
+var client = require('vite-node/client');
+var sourceMap = require('vite-node/source-map');
 var fse = require('fs-extra');
-var babel = require('@babel/core');
+var babel$1 = require('@babel/core');
 var reactRouter = require('react-router');
 var esModuleLexer = require('es-module-lexer');
 var jsesc = require('jsesc');
 var colors = require('picocolors');
-var findConfig = require('../config/findConfig.js');
 var invariant = require('../invariant.js');
+var babel = require('./babel.js');
 var nodeAdapter = require('./node-adapter.js');
 var styles = require('./styles.js');
 var vmod = require('./vmod.js');
 var resolveFileUrl = require('./resolve-file-url.js');
+var combineUrls = require('./combine-urls.js');
 var removeExports = require('./remove-exports.js');
 var importViteEsmSync = require('./import-vite-esm-sync.js');
-var config = require('../config.js');
-var defineRoute = require('./define-route.js');
+var config = require('./config.js');
+var withProps = require('./with-props.js');
+var parser = require('@babel/parser');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -55,7 +60,7 @@ function _interopNamespace(e) {
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
 var url__namespace = /*#__PURE__*/_interopNamespace(url);
 var fse__namespace = /*#__PURE__*/_interopNamespace(fse);
-var babel__default = /*#__PURE__*/_interopDefaultLegacy(babel);
+var babel__default = /*#__PURE__*/_interopDefaultLegacy(babel$1);
 var jsesc__default = /*#__PURE__*/_interopDefaultLegacy(jsesc);
 var colors__default = /*#__PURE__*/_interopDefaultLegacy(colors);
 
@@ -90,7 +95,7 @@ async function loadPluginContext({
   if (!root) {
     root = process.env.REACT_ROUTER_ROOT || process.cwd();
   }
-  configFile = configFile ?? findConfig.findConfig(root, "vite.config", [".ts", ".cts", ".mts", ".js", ".cjs", ".mjs"]);
+  configFile = configFile ?? findConfig(root, "vite.config", [".ts", ".cts", ".mts", ".js", ".cjs", ".mjs"]);
   if (!configFile) {
     console.error(colors__default["default"].red("Vite config file not found"));
     process.exit(1);
@@ -168,12 +173,12 @@ function resolveDependantChunks(viteManifest, entryChunks) {
     if (chunks.has(chunk)) {
       return;
     }
+    chunks.add(chunk);
     if (chunk.imports) {
       for (let importKey of chunk.imports) {
         walk(viteManifest[importKey]);
       }
     }
-    chunks.add(chunk);
   }
   for (let entryChunk of entryChunks) {
     walk(entryChunk);
@@ -195,20 +200,6 @@ const getRouteManifestModuleExports = async (viteChildCompiler, ctx) => {
   return Object.fromEntries(entries);
 };
 const getRouteModuleExports = async (viteChildCompiler, ctx, routeFile, readRouteFile) => {
-  let routePath = path__namespace.resolve(ctx.reactRouterConfig.appDirectory, routeFile);
-  let code = await ((readRouteFile === null || readRouteFile === void 0 ? void 0 : readRouteFile()) ?? fse__namespace.readFile(routePath, "utf-8"));
-  if (!code.includes("defineRoute")) {
-    return _getRouteModuleExports(viteChildCompiler, ctx, routeFile, readRouteFile);
-  }
-  let renameFields = ["Component", "serverLoader", "actionLoader"];
-  let fields = defineRoute.parseFields(code);
-  let exports = fields.filter(exportName => !renameFields.includes(exportName));
-  if (fields.includes("Component")) exports.push("default");
-  if (fields.includes("serverLoader")) exports.push("loader");
-  if (fields.includes("serverAction")) exports.push("action");
-  return exports;
-};
-const _getRouteModuleExports = async (viteChildCompiler, ctx, routeFile, readRouteFile) => {
   if (!viteChildCompiler) {
     throw new Error("Vite child compiler not found");
   }
@@ -252,9 +243,6 @@ let defaultEntriesDir = path__namespace.resolve(__dirname, "..", "config", "defa
 let defaultEntries = fse__namespace.readdirSync(defaultEntriesDir).map(filename => path__namespace.join(defaultEntriesDir, filename));
 invariant["default"](defaultEntries.length > 0, "No default entries found");
 let reactRouterDevLoadContext = () => ({});
-let setReactRouterDevLoadContext = loadContext => {
-  reactRouterDevLoadContext = loadContext;
-};
 // Inlined from https://github.com/jsdf/deep-freeze
 let deepFreeze = o => {
   Object.freeze(o);
@@ -267,6 +255,9 @@ let deepFreeze = o => {
   });
   return o;
 };
+/**
+ * React Router [Vite plugin.](https://vitejs.dev/guide/using-plugins.html)
+ */
 const reactRouterVitePlugin = _config => {
   let reactRouterUserConfig = _config ?? {};
   // Prevent mutations to the user config
@@ -277,20 +268,32 @@ const reactRouterVitePlugin = _config => {
   let viteConfig;
   let cssModulesManifest = {};
   let viteChildCompiler = null;
+  let routeConfigViteServer = null;
+  let viteNodeRunner = null;
+  let ssrExternals = isInReactRouterMonorepo() ? [
+  // 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"] : undefined;
   // This is initialized by `updatePluginContext` during Vite's `config`
   // hook, so most of the code can assume this defined without null check.
   // During dev, `updatePluginContext` is called again on every config file
   // change or route file addition/removal.
   let ctx;
   /** Mutates `ctx` as a side-effect */
-  let updatePluginContext = async () => {
+  let updatePluginContext = async ({
+    routeConfigChanged = false
+  } = {}) => {
     var _viteUserConfig$build;
     let rootDirectory = viteUserConfig.root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
+    invariant["default"](viteNodeRunner);
     let reactRouterConfig = await config.resolveReactRouterConfig({
       rootDirectory,
       reactRouterUserConfig,
+      routeConfigChanged,
       viteUserConfig,
-      viteCommand
+      viteCommand,
+      viteNodeRunner
     });
     let {
       entryClientFilePath,
@@ -361,9 +364,14 @@ const reactRouterVitePlugin = _config => {
     let manifestContents = await fse__namespace.readFile(path__namespace.resolve(directory, ".vite", "manifest.json"), "utf-8");
     return JSON.parse(manifestContents);
   };
-  let getViteManifestFilePaths = viteManifest => {
-    let filePaths = Object.values(viteManifest).map(chunk => chunk.file);
-    return new Set(filePaths);
+  let hasDependency = name => {
+    try {
+      return Boolean(require.resolve(name, {
+        paths: [ctx.rootDirectory]
+      }));
+    } catch (err) {
+      return false;
+    }
   };
   let getViteManifestAssetPaths = viteManifest => {
     // Get .css?url imports and CSS entry points
@@ -448,7 +456,7 @@ const reactRouterVitePlugin = _config => {
         path: route.path,
         index: route.index,
         caseSensitive: route.caseSensitive,
-        module: path__namespace.posix.join(ctx.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}${ROUTE_ENTRY_QUERY_STRING}`),
+        module: combineUrls.combineURLs(ctx.publicPath, `${resolveFileUrl.resolveFileUrl(ctx, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))}${ROUTE_ENTRY_QUERY_STRING}`),
         hasAction: sourceExports.includes("action"),
         hasLoader: sourceExports.includes("loader"),
         hasClientAction: sourceExports.includes("clientAction"),
@@ -459,12 +467,12 @@ const reactRouterVitePlugin = _config => {
     }
     return {
       version: String(Math.random()),
-      url: path__namespace.posix.join(ctx.publicPath, vmod.url(browserManifestId)),
+      url: combineUrls.combineURLs(ctx.publicPath, vmod.url(browserManifestId)),
       hmr: {
-        runtime: path__namespace.posix.join(ctx.publicPath, vmod.url(injectHmrRuntimeId))
+        runtime: combineUrls.combineURLs(ctx.publicPath, vmod.url(injectHmrRuntimeId))
       },
       entry: {
-        module: path__namespace.posix.join(ctx.publicPath, resolveFileUrl.resolveFileUrl(ctx, ctx.entryClientFilePath)),
+        module: combineUrls.combineURLs(ctx.publicPath, resolveFileUrl.resolveFileUrl(ctx, ctx.entryClientFilePath)),
         imports: []
       },
       routes
@@ -481,6 +489,38 @@ const reactRouterVitePlugin = _config => {
       viteUserConfig = _viteUserConfig;
       viteConfigEnv = _viteConfigEnv;
       viteCommand = viteConfigEnv.command;
+      routeConfigViteServer = await vite.createServer({
+        mode: viteConfigEnv.mode,
+        server: {
+          watch: viteCommand === "build" ? null : undefined,
+          preTransformRequests: false,
+          hmr: false
+        },
+        ssr: {
+          external: ssrExternals
+        },
+        optimizeDeps: {
+          noDiscovery: true
+        },
+        configFile: false,
+        envFile: false,
+        plugins: []
+      });
+      await routeConfigViteServer.pluginContainer.buildStart({});
+      let viteNodeServer = new server.ViteNodeServer(routeConfigViteServer);
+      sourceMap.installSourcemapsSupport({
+        getSourceMap: source => viteNodeServer.getSourceMap(source)
+      });
+      viteNodeRunner = new client.ViteNodeRunner({
+        root: routeConfigViteServer.config.root,
+        base: routeConfigViteServer.config.base,
+        fetchModule(id) {
+          return viteNodeServer.fetchModule(id);
+        },
+        resolveId(id, importer) {
+          return viteNodeServer.resolveId(id, importer);
+        }
+      });
       await updatePluginContext();
       Object.assign(process.env, vite.loadEnv(viteConfigEnv.mode, ctx.rootDirectory,
       // We override default prefix of "VITE_" with a blank string since
@@ -506,11 +546,7 @@ const reactRouterVitePlugin = _config => {
         __reactRouterPluginContext: ctx,
         appType: viteCommand === "serve" && viteConfigEnv.mode === "production" && ctx.reactRouterConfig.ssr === false ? "spa" : "custom",
         ssr: {
-          external: isInReactRouterMonorepo() ? [
-          // 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/cloudflare", "@react-router/dev", "@react-router/express", "@react-router/node", "@react-router/serve"] : undefined
+          external: ssrExternals
         },
         optimizeDeps: {
           include: [
@@ -520,7 +556,9 @@ const reactRouterVitePlugin = _config => {
           "react", "react/jsx-runtime", "react/jsx-dev-runtime", "react-dom/client",
           // Pre-bundle router dependencies to avoid router duplicates.
           // Mismatching routers cause `Error: You must render this element inside a <Remix> element`.
-          "react-router", "react-router-dom"]
+          "react-router",
+          // Check to avoid "Failed to resolve dependency: react-router-dom, present in 'optimizeDeps.include'"
+          ...(hasDependency("react-router-dom") ? ["react-router-dom"] : [])]
         },
         esbuild: {
           jsx: "automatic",
@@ -682,17 +720,26 @@ const reactRouterVitePlugin = _config => {
         }
       });
       // Invalidate virtual modules and update cached plugin config via file watcher
-      viteDevServer.watcher.on("all", async (eventName, filepath) => {
-        var _viteConfig;
+      viteDevServer.watcher.on("all", async (eventName, rawFilepath) => {
+        var _viteConfig, _routeConfigViteServe;
         let {
           normalizePath
         } = importViteEsmSync.importViteEsmSync();
-        let appFileAddedOrRemoved = (eventName === "add" || eventName === "unlink") && normalizePath(filepath).startsWith(normalizePath(ctx.reactRouterConfig.appDirectory));
+        let filepath = normalizePath(rawFilepath);
+        let appFileAddedOrRemoved = (eventName === "add" || eventName === "unlink") && filepath.startsWith(normalizePath(ctx.reactRouterConfig.appDirectory));
         invariant["default"]((_viteConfig = viteConfig) === null || _viteConfig === void 0 ? void 0 : _viteConfig.configFile);
-        let viteConfigChanged = eventName === "change" && normalizePath(filepath) === normalizePath(viteConfig.configFile);
-        if (appFileAddedOrRemoved || viteConfigChanged) {
+        let viteConfigChanged = eventName === "change" && filepath === normalizePath(viteConfig.configFile);
+        let routeConfigChanged = Boolean((_routeConfigViteServe = routeConfigViteServer) === null || _routeConfigViteServe === void 0 ? void 0 : _routeConfigViteServe.moduleGraph.getModuleById(filepath));
+        if (routeConfigChanged || appFileAddedOrRemoved) {
+          var _routeConfigViteServe2, _viteNodeRunner;
+          (_routeConfigViteServe2 = routeConfigViteServer) === null || _routeConfigViteServe2 === void 0 ? void 0 : _routeConfigViteServe2.moduleGraph.invalidateAll();
+          (_viteNodeRunner = viteNodeRunner) === null || _viteNodeRunner === void 0 ? void 0 : _viteNodeRunner.moduleCache.clear();
+        }
+        if (appFileAddedOrRemoved || viteConfigChanged || routeConfigChanged) {
           let lastReactRouterConfig = ctx.reactRouterConfig;
-          await updatePluginContext();
+          await updatePluginContext({
+            routeConfigChanged
+          });
           if (!isEqualJson(lastReactRouterConfig, ctx.reactRouterConfig)) {
             invalidateVirtualModules(viteDevServer);
           }
@@ -730,8 +777,6 @@ const reactRouterVitePlugin = _config => {
         let clientBuildDirectory = getClientBuildDirectory(ctx.reactRouterConfig);
         let serverBuildDirectory = getServerBuildDirectory(ctx);
         let ssrViteManifest = await loadViteManifest(serverBuildDirectory);
-        let clientViteManifest = await loadViteManifest(clientBuildDirectory);
-        let clientFilePaths = getViteManifestFilePaths(clientViteManifest);
         let ssrAssetPaths = getViteManifestAssetPaths(ssrViteManifest);
         // We only move assets that aren't in the client build, otherwise we
         // remove them. These assets only exist because we explicitly set
@@ -742,8 +787,8 @@ const reactRouterVitePlugin = _config => {
         let movedAssetPaths = [];
         for (let ssrAssetPath of ssrAssetPaths) {
           let src = path__namespace.join(serverBuildDirectory, ssrAssetPath);
-          if (!clientFilePaths.has(ssrAssetPath)) {
-            let dest = path__namespace.join(clientBuildDirectory, ssrAssetPath);
+          let dest = path__namespace.join(clientBuildDirectory, ssrAssetPath);
+          if (!fse__namespace.existsSync(dest)) {
             await fse__namespace.move(src, dest);
             movedAssetPaths.push(dest);
           } else {
@@ -774,36 +819,20 @@ const reactRouterVitePlugin = _config => {
       }
     },
     async buildEnd() {
-      var _viteChildCompiler;
+      var _viteChildCompiler, _routeConfigViteServe3;
       await ((_viteChildCompiler = viteChildCompiler) === null || _viteChildCompiler === void 0 ? void 0 : _viteChildCompiler.close());
+      await ((_routeConfigViteServe3 = routeConfigViteServer) === null || _routeConfigViteServe3 === void 0 ? void 0 : _routeConfigViteServe3.close());
     }
   }, {
     name: "react-router-route-entry",
     enforce: "pre",
-    async transform(code, id, options) {
+    async transform(_code, id, options) {
       if (!isRouteEntry(id)) return;
       let routeModuleId = id.replace(ROUTE_ENTRY_QUERY_STRING, "");
       let routeFileName = path__namespace.basename(routeModuleId);
-      if (!code.includes("defineRoute")) {
-        let sourceExports = await getRouteModuleExports(viteChildCompiler, ctx, routeModuleId);
-        let reexports = sourceExports.filter(exportName => (options === null || options === void 0 ? void 0 : options.ssr) && SERVER_ONLY_ROUTE_EXPORTS.includes(exportName) || CLIENT_ROUTE_EXPORTS.includes(exportName)).join(", ");
-        return `export { ${reexports} } from "./${routeFileName}";`;
-      }
-      let renameFields = ["Component", "serverLoader", "serverAction"];
-      let fields = defineRoute.parseFields(code);
-      let reexports = fields.filter(exportName => !renameFields.includes(exportName)).filter(exportName => (options === null || options === void 0 ? void 0 : options.ssr) && SERVER_ONLY_ROUTE_EXPORTS.includes(exportName) || CLIENT_ROUTE_EXPORTS.includes(exportName)).map(reexport => `export const ${reexport} = route.${reexport};`);
-      let content = `import route from "./${routeFileName}";`;
-      if (fields.includes("Component")) {
-        content += `\n` + [`import { createElement } from "react";`, `import { useParams, useLoaderData, useActionData } from "react-router";`, `export default function Route() {`, `  let params = useParams();`, `  let loaderData = useLoaderData();`, `  let actionData = useActionData();`, `  return createElement(route.Component, { params, loaderData, actionData });`, `}`].join("\n");
-      }
-      if (options !== null && options !== void 0 && options.ssr && fields.includes("serverLoader")) {
-        content += `\nexport const loader = route.serverLoader;`;
-      }
-      if (options !== null && options !== void 0 && options.ssr && fields.includes("serverAction")) {
-        content += `\nexport const action = route.serverAction;`;
-      }
-      content += "\n" + reexports.join("\n");
-      return content;
+      let sourceExports = await getRouteModuleExports(viteChildCompiler, ctx, routeModuleId);
+      let reexports = sourceExports.filter(exportName => (options === null || options === void 0 ? void 0 : options.ssr) && SERVER_ONLY_ROUTE_EXPORTS.includes(exportName) || CLIENT_ROUTE_EXPORTS.includes(exportName)).join(", ");
+      return `export { ${reexports} } from "./${routeFileName}";`;
     }
   }, {
     name: "react-router-virtual-modules",
@@ -837,25 +866,14 @@ const reactRouterVitePlugin = _config => {
           }
       }
     }
-  }, {
-    name: "react-router-define-route",
-    enforce: "pre",
-    async transform(code, id, options) {
-      if (options !== null && options !== void 0 && options.ssr) return;
-      if (!code.includes("defineRoute")) return; // temporary back compat, remove once old style routes are unsupported
-      if (id.endsWith(ROUTE_ENTRY_QUERY_STRING)) return;
-      let route = getRoute(ctx.reactRouterConfig, id);
-      if (!route && code.includes("defineRoute")) {
-        return defineRoute.assertNotImported(code);
-      }
-      return defineRoute.transform(code, id, options);
-    }
   }, {
     name: "react-router-dot-server",
     enforce: "pre",
     async resolveId(id, importer, options) {
       var _options$custom;
-      if (options !== null && options !== void 0 && options.ssr) return;
+      // https://vitejs.dev/config/dep-optimization-options
+      let isOptimizeDeps = viteCommand === "serve" && (options === null || options === void 0 ? void 0 : options.scan) === true;
+      if (isOptimizeDeps || options !== null && options !== void 0 && options.ssr) return;
       let isResolving = (options === null || options === void 0 ? void 0 : (_options$custom = options.custom) === null || _options$custom === void 0 ? void 0 : _options$custom["react-router-dot-server"]) ?? false;
       if (isResolving) return;
       options.custom = {
@@ -900,7 +918,7 @@ const reactRouterVitePlugin = _config => {
         };
       }
     }
-  }, {
+  }, withProps.plugin, {
     name: "react-router-route-exports",
     async transform(code, id, options) {
       if (options !== null && options !== void 0 && options.ssr) return;
@@ -922,7 +940,12 @@ const reactRouterVitePlugin = _config => {
         }
       }
       let [filepath] = id.split("?");
-      return removeExports.removeExports(code, SERVER_ONLY_ROUTE_EXPORTS, {
+      let ast = parser.parse(code, {
+        sourceType: "module"
+      });
+      removeExports.removeExports(ast, SERVER_ONLY_ROUTE_EXPORTS);
+      withProps.transform(ast);
+      return babel.generate(ast, {
         sourceMaps: true,
         filename: id,
         sourceFileName: filepath
@@ -1015,7 +1038,7 @@ const reactRouterVitePlugin = _config => {
           invalidateVirtualModules(server);
         }
       }
-      server.ws.send({
+      server.hot.send({
         type: "custom",
         event: "react-router:hmr",
         data: hmrEventData
@@ -1024,6 +1047,14 @@ const reactRouterVitePlugin = _config => {
     }
   }];
 };
+function findConfig(dir, basename, extensions) {
+  for (let ext of extensions) {
+    let name = basename + ext;
+    let file = path__namespace.join(dir, name);
+    if (fse__namespace.existsSync(file)) return file;
+  }
+  return undefined;
+}
 function isInReactRouterMonorepo() {
   // We use '@react-router/node' for this check since it's a
   // dependency of this package and guaranteed to be in node_modules
@@ -1037,7 +1068,14 @@ function isEqualJson(v1, v2) {
 function addRefreshWrapper(reactRouterConfig, code, id) {
   let route = getRoute(reactRouterConfig, id);
   let acceptExports = route || isRouteEntry(id) ? ["clientAction", "clientLoader", "handle", "meta", "links", "shouldRevalidate"] : [];
-  return REACT_REFRESH_HEADER.replaceAll("__SOURCE__", JSON.stringify(id)) + code + REACT_REFRESH_FOOTER.replaceAll("__SOURCE__", JSON.stringify(id)).replaceAll("__ACCEPT_EXPORTS__", JSON.stringify(acceptExports)).replaceAll("__ROUTE_ID__", JSON.stringify(route === null || route === void 0 ? void 0 : route.id));
+  return "\n\n" + withCommentBoundaries("REACT REFRESH HEADER", REACT_REFRESH_HEADER.replaceAll("__SOURCE__", JSON.stringify(id))) + "\n\n" + withCommentBoundaries("REACT REFRESH BODY", code) + "\n\n" + withCommentBoundaries("REACT REFRESH FOOTER", REACT_REFRESH_FOOTER.replaceAll("__SOURCE__", JSON.stringify(id)).replaceAll("__ACCEPT_EXPORTS__", JSON.stringify(acceptExports)).replaceAll("__ROUTE_ID__", JSON.stringify(route === null || route === void 0 ? void 0 : route.id))) + "\n";
+}
+function withCommentBoundaries(label, text) {
+  let begin = `// [BEGIN] ${label} `;
+  begin += "-".repeat(80 - begin.length);
+  let end = `// [END] ${label} `;
+  end += "-".repeat(80 - end.length);
+  return `${begin}\n${text}\n${end}`;
 }
 const REACT_REFRESH_HEADER = `
 import RefreshRuntime from "${hmrRuntimeId}";
@@ -1059,7 +1097,7 @@ if (import.meta.hot && !inWebWorker) {
     RefreshRuntime.register(type, __SOURCE__ + " " + id)
   };
   window.$RefreshSig$ = RefreshRuntime.createSignatureFunctionForTransform;
-}`.replace(/\n+/g, "");
+}`.trim();
 const REACT_REFRESH_FOOTER = `
 if (import.meta.hot && !inWebWorker) {
   window.$RefreshReg$ = prevRefreshReg;
@@ -1073,7 +1111,7 @@ if (import.meta.hot && !inWebWorker) {
       if (invalidateMessage) import.meta.hot.invalidate(invalidateMessage);
     });
   });
-}`;
+}`.trim();
 function getRoute(pluginConfig, file) {
   let vite = importViteEsmSync.importViteEsmSync();
   let routePath = vite.normalizePath(path__namespace.relative(pluginConfig.appDirectory, file));
@@ -1088,8 +1126,8 @@ async function getRouteMetadata(ctx, viteChildCompiler, route, readRouteFile) {
     path: route.path,
     index: route.index,
     caseSensitive: route.caseSensitive,
-    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`),
+    url: combineUrls.combineURLs(ctx.publicPath, "/" + path__namespace.relative(ctx.rootDirectory, resolveRelativeRouteFilePath(route, ctx.reactRouterConfig))),
+    module: combineUrls.combineURLs(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"),
@@ -1146,20 +1184,19 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     }
     await prerenderRoute(handler, path, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit);
   }
-  await prerenderManifest(build, clientBuildDirectory, reactRouterConfig, viteConfig);
-}
-async function prerenderData(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
-  let normalizedPath = `${reactRouterConfig.basename}${prerenderPath === "/" ? "/_root.data" : `${prerenderPath.replace(/\/$/, "")}.data`}`.replace(/\/\/+/g, "/");
-  let request = new Request(`http://localhost${normalizedPath}`, requestInit);
-  let response = await handler(request);
-  let data = await response.text();
-  validatePrerenderedResponse(response, data, "Prerender", normalizedPath);
-  // Write out the .data file
-  let outdir = path__namespace.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path__namespace.join(outdir, ...normalizedPath.split("/"));
-  await fse__namespace.ensureDir(path__namespace.dirname(outfile));
-  await fse__namespace.outputFile(outfile, data);
-  viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
+  async function prerenderData(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
+    let normalizedPath = `${reactRouterConfig.basename}${prerenderPath === "/" ? "/_root.data" : `${prerenderPath.replace(/\/$/, "")}.data`}`.replace(/\/\/+/g, "/");
+    let request = new Request(`http://localhost${normalizedPath}`, requestInit);
+    let response = await handler(request);
+    let data = await response.text();
+    validatePrerenderedResponse(response, data, "Prerender", normalizedPath);
+    // Write out the .data file
+    let outdir = path__namespace.relative(process.cwd(), clientBuildDirectory);
+    let outfile = path__namespace.join(outdir, normalizedPath.split("/").join(path__namespace.sep));
+    await fse__namespace.ensureDir(path__namespace.dirname(outfile));
+    await fse__namespace.outputFile(outfile, data);
+    viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
+  }
 }
 async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
   let normalizedPath = `${reactRouterConfig.basename}${prerenderPath}/`.replace(/\/\/+/g, "/");
@@ -1177,18 +1214,6 @@ async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reac
   await fse__namespace.outputFile(outfile, html);
   viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
 }
-async function prerenderManifest(build, clientBuildDirectory, reactRouterConfig, viteConfig) {
-  let normalizedPath = `${reactRouterConfig.basename}/__manifest`.replace(/\/\/+/g, "/");
-  let outdir = path__namespace.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path__namespace.join(outdir, ...normalizedPath.split("/"));
-  await fse__namespace.ensureDir(path__namespace.dirname(outfile));
-  let manifestData = JSON.stringify({
-    notFoundPaths: [],
-    patches: build.assets.routes
-  });
-  await fse__namespace.outputFile(outfile, manifestData);
-  viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
-}
 function validatePrerenderedResponse(response, html, prefix, path) {
   if (response.status !== 200) {
     throw new Error(`${prefix}: Received a ${response.status} status code from ` + `\`entry.server.tsx\` while prerendering the \`${path}\` ` + `path.\n${html}`);
@@ -1239,4 +1264,3 @@ exports.getServerBuildDirectory = getServerBuildDirectory;
 exports.loadPluginContext = loadPluginContext;
 exports.reactRouterVitePlugin = reactRouterVitePlugin;
 exports.resolveViteConfig = resolveViteConfig;
-exports.setReactRouterDevLoadContext = setReactRouterDevLoadContext;

package/dist/vite/profiler.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-49eef6a01
+ * @react-router/dev v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,2 +1,2 @@
-import type { GeneratorOptions } from "@babel/generator";
-export declare const removeExports: (source: string, exportsToRemove: string[], generateOptions?: GeneratorOptions) => import("@babel/generator").GeneratorResult;
+import type { Babel, ParseResult } from "./babel";
+export declare const removeExports: (ast: ParseResult<Babel.File>, exportsToRemove: string[]) => void;