@react-router/dev 0.0.0-experimental-9f7fdccd4 → 0.0.0-experimental-16086cbff

package/dist/cli/index.d.ts

@@ -1,2 +1 @@
-
-export {  }
+#!/usr/bin/env node

package/dist/cli/index.js

@@ -1,5 +1,6 @@
+#!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-9f7fdccd4
+ * @react-router/dev v0.0.0-experimental-16086cbff
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -411,7 +412,7 @@ var init_plugin = __esm({
       "config",
       "defaults"
     );
-    defaultEntries = fse2.readdirSync(defaultEntriesDir).map((filename2) => path4.join(defaultEntriesDir, filename2));
+    defaultEntries = fse2.readdirSync(defaultEntriesDir).map((filename3) => path4.join(defaultEntriesDir, filename3));
     invariant(defaultEntries.length > 0, "No default entries found");
     REACT_REFRESH_HEADER = `
 import RefreshRuntime from "${hmrRuntimeId}";
@@ -870,12 +871,11 @@ function transpile(tsx, options = {}) {
 // cli/commands.ts
 init_profiler();
 
-// typegen.ts
+// typegen/index.ts
 var import_node_fs2 = __toESM(require("fs"));
 var import_chokidar = __toESM(require("chokidar"));
-var import_dedent2 = __toESM(require("dedent"));
 var Path = __toESM(require("pathe"));
-var Pathe = __toESM(require("pathe/utils"));
+var Pathe2 = __toESM(require("pathe/utils"));
 var import_picocolors5 = __toESM(require("picocolors"));
 
 // logger.ts
@@ -916,121 +916,23 @@ var info = log("info");
 var warn = log("warn");
 var error = log("error");
 
-// typegen.ts
+// typegen/index.ts
 init_routes();
 init_vite_node();
 init_config();
 init_plugin();
-function getDirectory(ctx) {
-  return Path.join(ctx.rootDirectory, ".react-router/types");
-}
-async function watch(rootDirectory, options = {}) {
-  const watchStart = performance.now();
-  const vitePluginCtx = await loadPluginContext({
-    root: rootDirectory,
-    configFile: options.configFile
-  });
-  const routeConfigFile = findEntry(
-    vitePluginCtx.reactRouterConfig.appDirectory,
-    "routes"
-  );
-  if (!routeConfigFile) {
-    warn(
-      `Could not find route config within ${import_picocolors5.default.blue(
-        Path.relative(
-          vitePluginCtx.rootDirectory,
-          vitePluginCtx.reactRouterConfig.appDirectory
-        )
-      )}`
-    );
-    process.exit(1);
-  }
-  const routeConfigPath = Path.join(
-    vitePluginCtx.reactRouterConfig.appDirectory,
-    routeConfigFile
-  );
-  const routesViteNodeContext = await createContext({
-    root: rootDirectory
-  });
-  async function getRoutes() {
-    const routes2 = {};
-    const rootRouteFile = findEntry(
-      vitePluginCtx.reactRouterConfig.appDirectory,
-      "root"
-    );
-    if (rootRouteFile) {
-      routes2.root = { path: "", id: "root", file: rootRouteFile };
-    } else {
-      warn(`Could not find \`root\` route`);
-    }
-    routesViteNodeContext.devServer.moduleGraph.invalidateAll();
-    routesViteNodeContext.runner.moduleCache.clear();
-    const routeConfig = (await routesViteNodeContext.runner.executeFile(routeConfigPath)).routes;
-    return {
-      ...routes2,
-      ...configRoutesToRouteManifest(await routeConfig)
-    };
-  }
-  const ctx = {
-    rootDirectory,
-    appDirectory: vitePluginCtx.reactRouterConfig.appDirectory,
-    routes: await getRoutes()
-  };
-  await writeAll(ctx);
-  info("generated initial types", {
-    durationMs: performance.now() - watchStart
-  });
-  const watcher = import_chokidar.default.watch(ctx.appDirectory, { ignoreInitial: true });
-  watcher.on("all", async (event, path8) => {
-    const eventStart = performance.now();
-    path8 = Path.normalize(path8);
-    ctx.routes = await getRoutes();
-    const routeConfigChanged = Boolean(
-      routesViteNodeContext.devServer.moduleGraph.getModuleById(path8)
-    );
-    if (routeConfigChanged) {
-      await writeAll(ctx);
-      info("changed route config", {
-        durationMs: performance.now() - eventStart
-      });
-      return;
-    }
-    const route = Object.values(ctx.routes).find(
-      (route2) => path8 === Path.join(ctx.appDirectory, route2.file)
-    );
-    if (route && (event === "add" || event === "unlink")) {
-      await writeAll(ctx);
-      info(
-        `${event === "add" ? "added" : "removed"} route ${import_picocolors5.default.blue(route.file)}`,
-        { durationMs: performance.now() - eventStart }
-      );
-      return;
-    }
-  });
-}
-async function writeAll(ctx) {
-  import_node_fs2.default.rmSync(getDirectory(ctx), { recursive: true, force: true });
-  Object.values(ctx.routes).forEach((route) => {
-    if (!import_node_fs2.default.existsSync(Path.join(ctx.appDirectory, route.file))) return;
-    const typesPath = Path.join(
-      getDirectory(ctx),
-      Path.relative(ctx.rootDirectory, ctx.appDirectory),
-      Path.dirname(route.file),
-      "+types." + Pathe.filename(route.file) + ".d.ts"
-    );
-    const content = getModule(ctx.routes, route);
-    import_node_fs2.default.mkdirSync(Path.dirname(typesPath), { recursive: true });
-    import_node_fs2.default.writeFileSync(typesPath, content);
-  });
-}
-function getModule(routes2, route) {
+
+// typegen/generate.ts
+var import_dedent2 = __toESM(require("dedent"));
+var Pathe = __toESM(require("pathe/utils"));
+function generate2(routes2, route) {
   return import_dedent2.default`
     // React Router generated types for route:
     // ${route.file}
 
     import * as T from "react-router/types"
 
-    export type Params = {${formattedParamsProperties(routes2, route)}}
+    export type Params = {${formatParamProperties(routes2, route)}}
 
     type RouteModule = typeof import("./${Pathe.filename(route.file)}")
 
@@ -1049,24 +951,24 @@ function getModule(routes2, route) {
     }
   `;
 }
-function formattedParamsProperties(routes2, route) {
-  const urlpath = routeLineage(routes2, route).map((route2) => route2.path).join("/");
+function formatParamProperties(routes2, route) {
+  const urlpath = getRouteLineage(routes2, route).map((route2) => route2.path).join("/");
   const params = parseParams(urlpath);
   const indent = "  ".repeat(3);
   const properties = Object.entries(params).map(([name, values]) => {
     if (values.length === 1) {
       const isOptional = values[0];
-      return indent + (isOptional ? `${name}?: string` : `${name}: string`);
+      return indent + (isOptional ? `"${name}"?: string` : `"${name}": string`);
     }
     const items = values.map(
       (isOptional) => isOptional ? "string | undefined" : "string"
     );
-    return indent + `${name}: [${items.join(", ")}]`;
+    return indent + `"${name}": [${items.join(", ")}]`;
   });
   const body = properties.length === 0 ? "" : "\n" + properties.join("\n") + "\n";
   return body;
 }
-function routeLineage(routes2, route) {
+function getRouteLineage(routes2, route) {
   const result = [];
   while (route) {
     result.push(route);
@@ -1079,19 +981,119 @@ function routeLineage(routes2, route) {
 function parseParams(urlpath) {
   const result = {};
   let segments = urlpath.split("/");
-  segments.filter((s) => s.startsWith(":")).forEach((param) => {
-    param = param.slice(1);
-    let isOptional = param.endsWith("?");
-    if (isOptional) {
-      param = param.slice(0, -1);
-    }
+  segments.forEach((segment) => {
+    const match = segment.match(/^:([\w-]+)(\?)?/);
+    if (!match) return;
+    const param = match[1];
+    const isOptional = match[2] !== void 0;
     result[param] ??= [];
     result[param].push(isOptional);
     return;
   });
+  const hasSplat = segments.at(-1) === "*";
+  if (hasSplat) result["*"] = [false];
   return result;
 }
 
+// typegen/index.ts
+async function run(rootDirectory, configFile) {
+  const ctx = await createContext2(rootDirectory, configFile);
+  await writeAll(ctx);
+}
+async function watch(rootDirectory, configFile) {
+  const watchStart = performance.now();
+  const ctx = await createContext2(rootDirectory, configFile);
+  await writeAll(ctx);
+  info("generated initial types", {
+    durationMs: performance.now() - watchStart
+  });
+  const watcher = import_chokidar.default.watch(ctx.appDirectory, { ignoreInitial: true });
+  watcher.on("all", async (event, path8) => {
+    path8 = Path.normalize(path8);
+    const eventStart = performance.now();
+    const didRouteConfigChange = Boolean(
+      ctx.routeConfigEnv.devServer.moduleGraph.getModuleById(path8)
+    );
+    if (didRouteConfigChange) {
+      await writeAll(ctx);
+      info("changed route config", {
+        durationMs: performance.now() - eventStart
+      });
+      return;
+    }
+    ctx.routes = await getRoutes(ctx);
+    const route = findRoute(ctx, path8);
+    if (route && (event === "add" || event === "unlink")) {
+      await writeAll(ctx);
+      info(
+        `${event === "add" ? "added" : "removed"} route ${import_picocolors5.default.blue(route.file)}`,
+        { durationMs: performance.now() - eventStart }
+      );
+      return;
+    }
+  });
+}
+async function createContext2(rootDirectory, configFile) {
+  const appDirectory = await getAppDirectory(rootDirectory, configFile);
+  const routeConfigEnv = await createContext({
+    root: rootDirectory
+  });
+  return {
+    rootDirectory,
+    appDirectory,
+    routeConfigEnv,
+    routes: await getRoutes({ rootDirectory, appDirectory, routeConfigEnv })
+  };
+}
+async function getAppDirectory(rootDirectory, configFile) {
+  const { reactRouterConfig } = await loadPluginContext({
+    root: rootDirectory,
+    configFile
+  });
+  return reactRouterConfig.appDirectory;
+}
+function findRoute(ctx, path8) {
+  return Object.values(ctx.routes).find(
+    (route) => path8 === Path.join(ctx.appDirectory, route.file)
+  );
+}
+async function getRoutes(ctx) {
+  ctx.routeConfigEnv.devServer.moduleGraph.invalidateAll();
+  ctx.routeConfigEnv.runner.moduleCache.clear();
+  const routeConfigFile = findEntry(ctx.appDirectory, "routes");
+  if (!routeConfigFile) {
+    warn(
+      `Could not find route config within ${import_picocolors5.default.blue(
+        Path.relative(ctx.rootDirectory, ctx.appDirectory)
+      )}`
+    );
+    process.exit(1);
+  }
+  const routeConfigPath = Path.join(ctx.appDirectory, routeConfigFile);
+  const routeConfig = (await ctx.routeConfigEnv.runner.executeFile(routeConfigPath)).routes;
+  const routes2 = configRoutesToRouteManifest(await routeConfig);
+  const rootRouteFile = findEntry(ctx.appDirectory, "root");
+  if (!rootRouteFile) throw new Error("Could not find `root` route");
+  routes2.root = { path: "", id: "root", file: rootRouteFile };
+  return routes2;
+}
+async function writeAll(ctx) {
+  const typegenDir = Path.join(ctx.rootDirectory, ".react-router/types");
+  import_node_fs2.default.rmSync(typegenDir, { recursive: true, force: true });
+  Object.values(ctx.routes).forEach((route) => {
+    if (!import_node_fs2.default.existsSync(Path.join(ctx.appDirectory, route.file))) return;
+    const typesPath = Path.join(
+      typegenDir,
+      Path.relative(ctx.rootDirectory, ctx.appDirectory),
+      Path.dirname(route.file),
+      "+types." + Pathe2.filename(route.file) + ".d.ts"
+    );
+    const content = generate2(ctx.routes, route);
+    import_node_fs2.default.mkdirSync(Path.dirname(typesPath), { recursive: true });
+    import_node_fs2.default.writeFileSync(typesPath, content);
+  });
+}
+
 // cli/commands.ts
 async function routes(reactRouterRoot, flags = {}) {
   let ctx = await loadPluginContext({
@@ -1223,17 +1225,12 @@ async function createClientEntry(rootDirectory, appDirectory, inputFile) {
 async function typegen(root, flags) {
   root ??= process.cwd();
   if (flags.watch) {
-    await watch(root, { configFile: flags.config });
+    await watch(root, flags.config);
     await new Promise(() => {
     });
     return;
   }
-  let ctx = await loadPluginContext({ root, configFile: flags.config });
-  await writeAll({
-    rootDirectory: root,
-    appDirectory: ctx.reactRouterConfig.appDirectory,
-    routes: ctx.reactRouterConfig.routes
-  });
+  await run(root, flags.config);
 }
 
 // cli/run.ts
@@ -1311,7 +1308,7 @@ ${import_picocolors9.default.blueBright("react-router")}
    $ react-router typegen --watch
    $ react-router typegen --config vite.react-router.config.ts
 `;
-async function run(argv = process.argv.slice(2)) {
+async function run2(argv = process.argv.slice(2)) {
   let versions = process.versions;
   let MINIMUM_NODE_VERSION = 20;
   if (versions && versions.node && import_semver.default.major(versions.node) < MINIMUM_NODE_VERSION) {
@@ -1403,7 +1400,7 @@ async function run(argv = process.argv.slice(2)) {
 }
 
 // cli/index.ts
-run().then(
+run2().then(
   () => {
     process.exit(0);
   },

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-9f7fdccd4
+ * @react-router/dev v0.0.0-experimental-16086cbff
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-9f7fdccd4
+ * @react-router/dev v0.0.0-experimental-16086cbff
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-9f7fdccd4
+ * @react-router/dev v0.0.0-experimental-16086cbff
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1492,7 +1492,8 @@ var reactRouterVitePlugin = (_config) => {
               "react-router",
               "react-router/dom",
               "react-router-dom"
-            ]
+            ],
+            conditions: viteCommand === "build" ? [] : ["development"]
           },
           base: viteUserConfig.base,
           // When consumer provides an allow list for files that can be read by
@@ -2256,7 +2257,12 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
         clientBuildDirectory,
         reactRouterConfig,
         viteConfig,
-        data ? { headers: { ...headers, "X-React-Router-Prerender-Data": data } } : { headers }
+        data ? {
+          headers: {
+            ...headers,
+            "X-React-Router-Prerender-Data": encodeURI(data)
+          }
+        } : { headers }
       );
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-9f7fdccd4",
+  "version": "0.0.0-experimental-16086cbff",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -36,7 +36,7 @@
       "files": [
         "cli/**",
         "config/**",
-        "typescript/**",
+        "typegen/**",
         "vite/**",
         "*.ts",
         "bin.js",
@@ -77,7 +77,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "^1.6.0",
-    "@react-router/node": "0.0.0-experimental-9f7fdccd4"
+    "@react-router/node": "0.0.0-experimental-16086cbff"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -106,15 +106,15 @@
     "vite": "^5.1.0",
     "wireit": "0.14.9",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "0.0.0-experimental-9f7fdccd4",
-    "react-router": "^0.0.0-experimental-9f7fdccd4"
+    "@react-router/serve": "0.0.0-experimental-16086cbff",
+    "react-router": "^0.0.0-experimental-16086cbff"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0",
     "wrangler": "^3.28.2",
-    "react-router": "^0.0.0-experimental-9f7fdccd4",
-    "@react-router/serve": "^0.0.0-experimental-9f7fdccd4"
+    "react-router": "^0.0.0-experimental-16086cbff",
+    "@react-router/serve": "^0.0.0-experimental-16086cbff"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {