@react-router/dev 0.0.0-experimental-3278f3ca6 → 0.0.0-experimental-2d5e406e4

package/dist/vite/plugin.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3278f3ca6
+ * @react-router/dev v0.0.0-experimental-2d5e406e4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -15,9 +15,6 @@ 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$1 = require('@babel/core');
 var reactRouter = require('react-router');
@@ -35,6 +32,7 @@ var removeExports = require('./remove-exports.js');
 var importViteEsmSync = require('./import-vite-esm-sync.js');
 var config = require('./config.js');
 var withProps = require('./with-props.js');
+var viteNode = require('./vite-node.js');
 var parser = require('@babel/parser');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -241,7 +239,7 @@ let getServerBuildDirectory = ctx => path__namespace.join(ctx.reactRouterConfig.
 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));
-invariant["default"](defaultEntries.length > 0, "No default entries found");
+invariant(defaultEntries.length > 0, "No default entries found");
 let reactRouterDevLoadContext = () => ({});
 // Inlined from https://github.com/jsdf/deep-freeze
 let deepFreeze = o => {
@@ -268,8 +266,7 @@ const reactRouterVitePlugin = _config => {
   let viteConfig;
   let cssModulesManifest = {};
   let viteChildCompiler = null;
-  let routeConfigViteServer = null;
-  let viteNodeRunner = null;
+  let routesViteNodeContext = 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
@@ -286,14 +283,14 @@ const reactRouterVitePlugin = _config => {
   } = {}) => {
     var _viteUserConfig$build;
     let rootDirectory = viteUserConfig.root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
-    invariant["default"](viteNodeRunner);
+    invariant(routesViteNodeContext);
     let reactRouterConfig = await config.resolveReactRouterConfig({
       rootDirectory,
       reactRouterUserConfig,
       routeConfigChanged,
       viteUserConfig,
       viteCommand,
-      viteNodeRunner
+      routesViteNodeContext
     });
     let {
       entryClientFilePath,
@@ -322,11 +319,11 @@ const reactRouterVitePlugin = _config => {
     };
   };
   let pluginIndex = pluginName => {
-    invariant["default"](viteConfig);
+    invariant(viteConfig);
     return viteConfig.plugins.findIndex(plugin => plugin.name === pluginName);
   };
   let getServerEntry = async () => {
-    invariant["default"](viteConfig, "viteconfig required to generate the server entry");
+    invariant(viteConfig, "viteconfig required to generate the 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
@@ -381,7 +378,7 @@ const reactRouterVitePlugin = _config => {
     return new Set([...cssUrlPaths, ...chunkAssetPaths]);
   };
   let generateReactRouterManifestsForBuild = async () => {
-    invariant["default"](viteConfig);
+    invariant(viteConfig);
     let viteManifest = await loadViteManifest(getClientBuildDirectory(ctx.reactRouterConfig));
     let entry = getReactRouterManifestBuildAssets(ctx, viteManifest, ctx.entryClientFilePath);
     let browserRoutes = {};
@@ -489,36 +486,13 @@ const reactRouterVitePlugin = _config => {
       viteUserConfig = _viteUserConfig;
       viteConfigEnv = _viteConfigEnv;
       viteCommand = viteConfigEnv.command;
-      routeConfigViteServer = await vite.createServer({
+      routesViteNodeContext = await viteNode.createContext({
         mode: viteConfigEnv.mode,
         server: {
-          watch: viteCommand === "build" ? null : undefined,
-          preTransformRequests: false,
-          hmr: false
+          watch: viteCommand === "build" ? null : undefined
         },
         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();
@@ -630,7 +604,7 @@ const reactRouterVitePlugin = _config => {
     async configResolved(resolvedViteConfig) {
       await esModuleLexer.init;
       viteConfig = resolvedViteConfig;
-      invariant["default"](viteConfig);
+      invariant(viteConfig);
       // We load the same Vite config file again for the child compiler so
       // that both parent and child compiler's plugins have independent state.
       // If we re-used the `viteUserConfig.plugins` array for the child
@@ -648,7 +622,7 @@ const reactRouterVitePlugin = _config => {
         mode: viteConfig.mode,
         isSsrBuild: ctx.isSsrBuild
       }, viteConfig.configFile);
-      invariant["default"](childCompilerConfigFile, "Vite config file was unable to be resolved for React Router child compiler");
+      invariant(childCompilerConfigFile, "Vite config file was unable to be resolved for React Router child compiler");
       // Validate that commonly used Rollup plugins that need to run before
       // ours are in the correct order. This is because Rollup plugins can't
       // set `enforce: "pre"` like Vite plugins can. Explicitly validating
@@ -691,7 +665,7 @@ const reactRouterVitePlugin = _config => {
       }
     },
     buildStart() {
-      invariant["default"](viteConfig);
+      invariant(viteConfig);
       if (viteCommand === "build" && viteConfig.mode === "production" && !viteConfig.build.ssr && viteConfig.build.sourcemap) {
         viteConfig.logger.warn(colors__default["default"].yellow("\n" + colors__default["default"].bold("  ⚠️  Source maps are enabled in production\n") + ["This makes your server code publicly", "visible in the browser. This is highly", "discouraged! If you insist, ensure that", "you are using environment variables for", "secrets and not hard-coding them in", "your source code."].map(line => "     " + line).join("\n") + "\n"));
       }
@@ -721,19 +695,19 @@ const reactRouterVitePlugin = _config => {
       });
       // Invalidate virtual modules and update cached plugin config via file watcher
       viteDevServer.watcher.on("all", async (eventName, rawFilepath) => {
-        var _viteConfig, _routeConfigViteServe;
+        var _viteConfig, _routesViteNodeContex, _routesViteNodeContex2;
         let {
           normalizePath
         } = importViteEsmSync.importViteEsmSync();
         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);
+        invariant((_viteConfig = viteConfig) === null || _viteConfig === void 0 ? void 0 : _viteConfig.configFile);
         let viteConfigChanged = eventName === "change" && filepath === normalizePath(viteConfig.configFile);
-        let routeConfigChanged = Boolean((_routeConfigViteServe = routeConfigViteServer) === null || _routeConfigViteServe === void 0 ? void 0 : _routeConfigViteServe.moduleGraph.getModuleById(filepath));
+        let routeConfigChanged = Boolean((_routesViteNodeContex = routesViteNodeContext) === null || _routesViteNodeContex === void 0 ? void 0 : (_routesViteNodeContex2 = _routesViteNodeContex.devServer) === null || _routesViteNodeContex2 === void 0 ? void 0 : _routesViteNodeContex2.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();
+          var _routesViteNodeContex3, _routesViteNodeContex4, _routesViteNodeContex5, _routesViteNodeContex6;
+          (_routesViteNodeContex3 = routesViteNodeContext) === null || _routesViteNodeContex3 === void 0 ? void 0 : (_routesViteNodeContex4 = _routesViteNodeContex3.devServer) === null || _routesViteNodeContex4 === void 0 ? void 0 : _routesViteNodeContex4.moduleGraph.invalidateAll();
+          (_routesViteNodeContex5 = routesViteNodeContext) === null || _routesViteNodeContex5 === void 0 ? void 0 : (_routesViteNodeContex6 = _routesViteNodeContex5.runner) === null || _routesViteNodeContex6 === void 0 ? void 0 : _routesViteNodeContex6.moduleCache.clear();
         }
         if (appFileAddedOrRemoved || viteConfigChanged || routeConfigChanged) {
           let lastReactRouterConfig = ctx.reactRouterConfig;
@@ -773,7 +747,7 @@ const reactRouterVitePlugin = _config => {
         if (!ctx.isSsrBuild) {
           return;
         }
-        invariant["default"](viteConfig);
+        invariant(viteConfig);
         let clientBuildDirectory = getClientBuildDirectory(ctx.reactRouterConfig);
         let serverBuildDirectory = getServerBuildDirectory(ctx);
         let ssrViteManifest = await loadViteManifest(serverBuildDirectory);
@@ -802,7 +776,7 @@ const reactRouterVitePlugin = _config => {
         if (movedAssetPaths.length) {
           viteConfig.logger.info(["", `${colors__default["default"].green("✓")} ${movedAssetPaths.length} asset${movedAssetPaths.length > 1 ? "s" : ""} moved from React Router server build to client assets.`, ...movedAssetPaths.map(movedAssetPath => colors__default["default"].dim(path__namespace.relative(ctx.rootDirectory, movedAssetPath))), ""].join("\n"));
         }
-        if (ctx.reactRouterConfig.prerender != null) {
+        if (ctx.reactRouterConfig.prerender != null && ctx.reactRouterConfig.prerender !== false) {
           // If we have prerender routes, that takes precedence over SPA mode
           // which is ssr:false and only the rot route being rendered
           await handlePrerender(viteConfig, ctx.reactRouterConfig, serverBuildDirectory, clientBuildDirectory);
@@ -819,9 +793,9 @@ const reactRouterVitePlugin = _config => {
       }
     },
     async buildEnd() {
-      var _viteChildCompiler, _routeConfigViteServe3;
+      var _viteChildCompiler, _routesViteNodeContex7, _routesViteNodeContex8;
       await ((_viteChildCompiler = viteChildCompiler) === null || _viteChildCompiler === void 0 ? void 0 : _viteChildCompiler.close());
-      await ((_routeConfigViteServe3 = routeConfigViteServer) === null || _routeConfigViteServe3 === void 0 ? void 0 : _routeConfigViteServe3.close());
+      await ((_routesViteNodeContex7 = routesViteNodeContext) === null || _routesViteNodeContex7 === void 0 ? void 0 : (_routesViteNodeContex8 = _routesViteNodeContex7.devServer) === null || _routesViteNodeContex8 === void 0 ? void 0 : _routesViteNodeContex8.close());
     }
   }, {
     name: "react-router-route-entry",
@@ -1168,7 +1142,17 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     handler
   } = await getPrerenderBuildAndHandler(viteConfig, reactRouterConfig, serverBuildDirectory);
   let routes = createPrerenderRoutes(build.routes);
-  let routesToPrerender = reactRouterConfig.prerender || ["/"];
+  let routesToPrerender;
+  if (typeof reactRouterConfig.prerender === "boolean") {
+    invariant(reactRouterConfig.prerender, "Expected prerender:true");
+    routesToPrerender = determineStaticPrerenderRoutes(routes, viteConfig, true);
+  } else if (typeof reactRouterConfig.prerender === "function") {
+    routesToPrerender = await reactRouterConfig.prerender({
+      getStaticPaths: () => determineStaticPrerenderRoutes(routes, viteConfig, false)
+    });
+  } else {
+    routesToPrerender = reactRouterConfig.prerender || ["/"];
+  }
   let requestInit = {
     headers: {
       // Header that can be used in the loader to know if you're running at
@@ -1186,6 +1170,34 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
   }
   await prerenderManifest(build, clientBuildDirectory, reactRouterConfig, viteConfig);
 }
+function determineStaticPrerenderRoutes(routes, viteConfig, isBooleanUsage = false) {
+  // Always start with the root/index route included
+  let paths = ["/"];
+  let paramRoutes = [];
+  // Then recursively add any new path defined by the tree
+  function recurse(subtree, prefix = "") {
+    for (let route of subtree) {
+      let newPath = [prefix, route.path].join("/").replace(/\/\/+/g, "/");
+      if (route.path) {
+        let segments = route.path.split("/");
+        if (segments.some(s => s.startsWith(":") || s === "*")) {
+          paramRoutes.push(route.path);
+        } else {
+          paths.push(newPath);
+        }
+      }
+      if (route.children) {
+        recurse(route.children, newPath);
+      }
+    }
+  }
+  recurse(routes);
+  if (isBooleanUsage && paramRoutes) {
+    viteConfig.logger.warn("The following paths were not prerendered because Dynamic Param and Splat " + "routes cannot be prerendered when using `prerender:true`. You may want to " + "consider using the `prerender()` API if you wish to prerender slug and " + "splat routes.");
+  }
+  // Clean double slashes and remove trailing slashes
+  return paths.map(p => p.replace(/\/\/+/g, "/").replace(/(.+)\/$/, "$1"));
+}
 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);
@@ -1220,10 +1232,7 @@ async function prerenderManifest(build, clientBuildDirectory, reactRouterConfig,
   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
-  });
+  let manifestData = JSON.stringify(build.assets.routes);
   await fse__namespace.outputFile(outfile, manifestData);
   viteConfig.logger.info(`Prerender: Generated ${colors__default["default"].bold(outfile)}`);
 }

package/dist/vite/profiler.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3278f3ca6
+ * @react-router/dev v0.0.0-experimental-2d5e406e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/remove-exports.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3278f3ca6
+ * @react-router/dev v0.0.0-experimental-2d5e406e4
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3278f3ca6
+ * @react-router/dev v0.0.0-experimental-2d5e406e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/styles.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3278f3ca6
+ * @react-router/dev v0.0.0-experimental-2d5e406e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/vite-node.d.ts

@@ -0,0 +1,9 @@
+import { ViteNodeServer } from "vite-node/server";
+import { ViteNodeRunner } from "vite-node/client";
+import type * as Vite from "vite";
+export type Context = {
+    devServer: Vite.ViteDevServer;
+    server: ViteNodeServer;
+    runner: ViteNodeRunner;
+};
+export declare function createContext(viteConfig?: Vite.InlineConfig): Promise<Context>;

package/dist/vite/vite-node.js

@@ -0,0 +1,57 @@
+/**
+ * @react-router/dev v0.0.0-experimental-2d5e406e4
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var server = require('vite-node/server');
+var client = require('vite-node/client');
+var sourceMap = require('vite-node/source-map');
+var importViteEsmSync = require('./import-vite-esm-sync.js');
+
+async function createContext(viteConfig = {}) {
+  await importViteEsmSync.preloadViteEsm();
+  const vite = importViteEsmSync.importViteEsmSync();
+  const devServer = await vite.createServer(vite.mergeConfig({
+    server: {
+      preTransformRequests: false,
+      hmr: false
+    },
+    optimizeDeps: {
+      noDiscovery: true
+    },
+    configFile: false,
+    envFile: false,
+    plugins: []
+  }, viteConfig));
+  await devServer.pluginContainer.buildStart({});
+  const server$1 = new server.ViteNodeServer(devServer);
+  sourceMap.installSourcemapsSupport({
+    getSourceMap: source => server$1.getSourceMap(source)
+  });
+  const runner = new client.ViteNodeRunner({
+    root: devServer.config.root,
+    base: devServer.config.base,
+    fetchModule(id) {
+      return server$1.fetchModule(id);
+    },
+    resolveId(id, importer) {
+      return server$1.resolveId(id, importer);
+    }
+  });
+  return {
+    devServer,
+    server: server$1,
+    runner
+  };
+}
+
+exports.createContext = createContext;

package/dist/vite/vmod.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3278f3ca6
+ * @react-router/dev v0.0.0-experimental-2d5e406e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/with-props.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3278f3ca6
+ * @react-router/dev v0.0.0-experimental-2d5e406e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-3278f3ca6
+ * @react-router/dev v0.0.0-experimental-2d5e406e4
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-3278f3ca6",
+  "version": "0.0.0-experimental-2d5e406e4",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -12,6 +12,7 @@
     "directory": "packages/react-router-dev"
   },
   "license": "MIT",
+  "main": "./dist/typescript/plugin.ts",
   "exports": {
     "./routes": {
       "types": "./dist/routes.d.ts",
@@ -43,6 +44,7 @@
     "arg": "^5.0.1",
     "babel-dead-code-elimination": "^1.0.6",
     "chalk": "^4.1.2",
+    "chokidar": "^4.0.0",
     "dedent": "^1.5.3",
     "es-module-lexer": "^1.3.1",
     "exit-hook": "2.2.1",
@@ -50,15 +52,16 @@
     "gunzip-maybe": "^1.4.2",
     "jsesc": "3.0.2",
     "lodash": "^4.17.21",
+    "pathe": "^1.1.2",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
     "prettier": "^2.7.1",
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
     "set-cookie-parser": "^2.6.0",
-    "vite-node": "^1.6.0",
     "valibot": "^0.41.0",
-    "@react-router/node": "0.0.0-experimental-3278f3ca6"
+    "vite-node": "^1.6.0",
+    "@react-router/node": "0.0.0-experimental-2d5e406e4"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -82,17 +85,18 @@
     "fast-glob": "3.2.11",
     "strip-ansi": "^6.0.1",
     "tiny-invariant": "^1.2.0",
+    "typescript": "^5.6.2",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "0.0.0-experimental-3278f3ca6",
-    "react-router": "^0.0.0-experimental-3278f3ca6"
+    "react-router": "^0.0.0-experimental-2d5e406e4",
+    "@react-router/serve": "0.0.0-experimental-2d5e406e4"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-3278f3ca6",
-    "react-router": "^0.0.0-experimental-3278f3ca6"
+    "@react-router/serve": "^0.0.0-experimental-2d5e406e4",
+    "react-router": "^0.0.0-experimental-2d5e406e4"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {