@react-router/dev 0.0.0-experimental-00e730ed0 → 0.0.0-experimental-93ddf3985

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-00e730ed0
+ * @react-router/dev v0.0.0-experimental-93ddf3985
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -858,8 +858,11 @@ function lineage(routes2, route) {
   return result;
 }
 function fullpath(lineage2) {
-  if (lineage2.length === 1 && lineage2[0].id === "root") return "/";
-  return "/" + lineage2.map((route) => route.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path8) => path8 !== void 0 && path8 !== "").join("/");
+  const route = lineage2.at(-1);
+  if (lineage2.length === 1 && route?.id === "root") return "/";
+  const isLayout = route && route.index !== true && route.path === void 0;
+  if (isLayout) return void 0;
+  return "/" + lineage2.map((route2) => route2.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path8) => path8 !== void 0 && path8 !== "").join("/");
 }
 var init_route = __esm({
   "typegen/route.ts"() {
@@ -909,27 +912,65 @@ function generateServerBuild(ctx) {
   `;
   return { filename: filename2, content };
 }
-function generatePages(ctx) {
-  const filename2 = Path3.join(typesDirectory(ctx), "+pages.ts");
-  const fullpaths = /* @__PURE__ */ new Set();
-  Object.values(ctx.config.routes).forEach((route) => {
-    if (route.id !== "root" && !route.path) return;
+function generateRoutes(ctx) {
+  const fileToRoutes = /* @__PURE__ */ new Map();
+  const lineages = /* @__PURE__ */ new Map();
+  const pages = /* @__PURE__ */ new Set();
+  const routeToPages = /* @__PURE__ */ new Map();
+  for (const route of Object.values(ctx.config.routes)) {
+    let routeIds = fileToRoutes.get(route.file);
+    if (!routeIds) {
+      routeIds = /* @__PURE__ */ new Set();
+      fileToRoutes.set(route.file, routeIds);
+    }
+    routeIds.add(route.id);
     const lineage2 = lineage(ctx.config.routes, route);
-    const fullpath2 = fullpath(lineage2);
-    fullpaths.add(fullpath2);
-  });
-  const pagesType = t2.tsTypeAliasDeclaration(
+    lineages.set(route.id, lineage2);
+    const page = fullpath(lineage2);
+    if (!page) continue;
+    pages.add(page);
+    lineage2.forEach(({ id }) => {
+      let routePages = routeToPages.get(id);
+      if (!routePages) {
+        routePages = /* @__PURE__ */ new Set();
+        routeToPages.set(id, routePages);
+      }
+      routePages.add(page);
+    });
+  }
+  const routesTs = {
+    filename: Path3.join(typesDirectory(ctx), "+routes.ts"),
+    content: import_dedent.default`
+        // Generated by React Router
+
+        import "react-router"
+
+        declare module "react-router" {
+          interface Register {
+            pages: Pages
+            routeFiles: RouteFiles
+          }
+        }
+      ` + "\n\n" + generate(pagesType(pages)).code + "\n\n" + generate(routeFilesType({ fileToRoutes, routeToPages })).code
+  };
+  const allAnnotations = Array.from(fileToRoutes.entries()).filter(([file]) => isInAppDirectory(ctx, file)).map(
+    ([file, routeIds]) => getRouteAnnotations({ ctx, file, routeIds, lineages })
+  );
+  return [routesTs, ...allAnnotations];
+}
+function pagesType(pages) {
+  return t2.tsTypeAliasDeclaration(
     t2.identifier("Pages"),
     null,
     t2.tsTypeLiteral(
-      Array.from(fullpaths).map((fullpath2) => {
+      Array.from(pages).map((page) => {
         return t2.tsPropertySignature(
-          t2.stringLiteral(fullpath2),
+          t2.stringLiteral(page),
           t2.tsTypeAnnotation(
             t2.tsTypeLiteral([
               t2.tsPropertySignature(
                 t2.identifier("params"),
-                t2.tsTypeAnnotation(paramsType(fullpath2))
+                t2.tsTypeAnnotation(paramsType(page))
               )
             ])
           )
@@ -937,55 +978,92 @@ function generatePages(ctx) {
       })
     )
   );
-  const content = import_dedent.default`
-      // Generated by React Router
-
-      import "react-router"
-
-      declare module "react-router" {
-        interface Register {
-          pages: Pages
-        }
-      }
-    ` + "\n\n" + generate(pagesType).code;
-  return { filename: filename2, content };
 }
-function generateRoutes(ctx) {
-  const filename2 = Path3.join(typesDirectory(ctx), "+routes-pre.ts");
-  const routesType = t2.tsTypeAliasDeclaration(
-    t2.identifier("routesPre"),
+function routeFilesType({
+  fileToRoutes,
+  routeToPages
+}) {
+  return t2.tsTypeAliasDeclaration(
+    t2.identifier("RouteFiles"),
     null,
     t2.tsTypeLiteral(
-      Object.values(ctx.config.routes).map((route) => {
-        return t2.tsPropertySignature(
-          t2.stringLiteral(route.id),
+      Array.from(fileToRoutes).map(
+        ([file, routeIds]) => t2.tsPropertySignature(
+          t2.stringLiteral(file),
           t2.tsTypeAnnotation(
-            t2.tsTypeLiteral([
-              t2.tsPropertySignature(
-                t2.identifier("parentId"),
-                t2.tsTypeAnnotation(
-                  route.parentId ? t2.tsLiteralType(t2.stringLiteral(route.parentId)) : t2.tsUndefinedKeyword()
-                )
-              ),
-              t2.tsPropertySignature(
-                t2.identifier("path"),
-                t2.tsTypeAnnotation(
-                  route.path ? t2.tsLiteralType(t2.stringLiteral(route.path)) : t2.tsUndefinedKeyword()
-                )
-              ),
+            t2.tsUnionType(
+              Array.from(routeIds).map((routeId) => {
+                const pages = routeToPages.get(routeId) ?? /* @__PURE__ */ new Set();
+                return t2.tsTypeLiteral([
+                  t2.tsPropertySignature(
+                    t2.identifier("id"),
+                    t2.tsTypeAnnotation(
+                      t2.tsLiteralType(t2.stringLiteral(routeId))
+                    )
+                  ),
+                  t2.tsPropertySignature(
+                    t2.identifier("page"),
+                    t2.tsTypeAnnotation(
+                      pages ? t2.tsUnionType(
+                        Array.from(pages).map(
+                          (page) => t2.tsLiteralType(t2.stringLiteral(page))
+                        )
+                      ) : t2.tsNeverKeyword()
+                    )
+                  )
+                ]);
+              })
+            )
+          )
+        )
+      )
+    )
+  );
+}
+function isInAppDirectory(ctx, routeFile) {
+  const path8 = Path3.resolve(ctx.config.appDirectory, routeFile);
+  return path8.startsWith(ctx.config.appDirectory);
+}
+function getRouteAnnotations({
+  ctx,
+  file,
+  routeIds,
+  lineages
+}) {
+  const filename2 = Path3.join(
+    typesDirectory(ctx),
+    Path3.relative(ctx.rootDirectory, ctx.config.appDirectory),
+    Path3.dirname(file),
+    "+types",
+    Pathe.filename(file) + ".ts"
+  );
+  const matchesType = t2.tsTypeAliasDeclaration(
+    t2.identifier("Matches"),
+    null,
+    t2.tsUnionType(
+      Array.from(routeIds).map((routeId) => {
+        const lineage2 = lineages.get(routeId);
+        return t2.tsTupleType(
+          lineage2.map(
+            (route) => t2.tsTypeLiteral([
               t2.tsPropertySignature(
-                t2.identifier("params"),
-                t2.tsTypeAnnotation(paramsType(route.path ?? ""))
+                t2.identifier("id"),
+                t2.tsTypeAnnotation(t2.tsLiteralType(t2.stringLiteral(route.id)))
               ),
               t2.tsPropertySignature(
-                t2.identifier("index"),
+                t2.identifier("module"),
                 t2.tsTypeAnnotation(
-                  t2.tsLiteralType(t2.booleanLiteral(route.index ?? false))
+                  t2.tsTypeQuery(
+                    t2.tsImportType(
+                      t2.stringLiteral(
+                        relativeImportSource(
+                          rootDirsPath(ctx, filename2),
+                          Path3.resolve(ctx.config.appDirectory, route.file)
+                        )
+                      )
+                    )
+                  )
                 )
-              ),
-              t2.tsPropertySignature(
-                t2.identifier("file"),
-                t2.tsTypeAnnotation(t2.tsLiteralType(t2.stringLiteral(route.file)))
               )
             ])
           )
@@ -993,127 +1071,77 @@ function generateRoutes(ctx) {
       })
     )
   );
+  const routeImportSource = relativeImportSource(
+    rootDirsPath(ctx, filename2),
+    Path3.resolve(ctx.config.appDirectory, file)
+  );
   const content = import_dedent.default`
       // Generated by React Router
 
-      import "react-router"
-
-      declare module "react-router" {
-        interface Register {
-          routesPre: routesPre
-        }
-      }
-    ` + "\n\n" + generate(routesType).code;
-  return { filename: filename2, content };
-}
-function generateRouteModuleAnnotations(ctx) {
-  return Object.values(ctx.config.routes).filter((route) => isRouteInAppDirectory(ctx, route)).map((route) => {
-    const filename2 = getRouteModuleAnnotationsFilepath(ctx, route);
-    const parents = getParents(ctx, route);
-    const content = import_dedent.default`
-        // Generated by React Router
-
-        import type {
-          Params,
-          RouteModuleAnnotations,
-          CreateLoaderData,
-          CreateActionData,
-        } from "react-router/internal";
-
-        ${parents.map((parent) => parent.import).join("\n" + "  ".repeat(3))}
-        type Parents = [${parents.map((parent) => parent.name).join(", ")}]
+      import type { GetInfo, GetAnnotations } from "react-router/internal";
 
-        type Id = "${route.id}"
-        type Module = typeof import("../${Pathe.filename(route.file)}.js")
+      type Module = typeof import("${routeImportSource}")
 
-        export type unstable_Props = {
-          params: Params[Id]
-          loaderData: CreateLoaderData<Module>
-          actionData: CreateActionData<Module>
-        }
+      type Info = GetInfo<{
+        file: "${file}",
+        module: Module
+      }>
+    ` + "\n\n" + generate(matchesType).code + "\n\n" + import_dedent.default`
+      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }>;
 
-        type Annotations = RouteModuleAnnotations<unstable_Props & {
-          parents: Parents,
-          module: Module,
-        }>;
+      export namespace Route {
+        // links
+        export type LinkDescriptors = Annotations["LinkDescriptors"];
+        export type LinksFunction = Annotations["LinksFunction"];
 
-        export namespace Route {
-          // links
-          export type LinkDescriptors = Annotations["LinkDescriptors"];
-          export type LinksFunction = Annotations["LinksFunction"];
+        // meta
+        export type MetaArgs = Annotations["MetaArgs"];
+        export type MetaDescriptors = Annotations["MetaDescriptors"];
+        export type MetaFunction = Annotations["MetaFunction"];
 
-          // meta
-          export type MetaArgs = Annotations["MetaArgs"];
-          export type MetaDescriptors = Annotations["MetaDescriptors"];
-          export type MetaFunction = Annotations["MetaFunction"];
+        // headers
+        export type HeadersArgs = Annotations["HeadersArgs"];
+        export type HeadersFunction = Annotations["HeadersFunction"];
 
-          // headers
-          export type HeadersArgs = Annotations["HeadersArgs"];
-          export type HeadersFunction = Annotations["HeadersFunction"];
+        // unstable_middleware
+        export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
 
-          // unstable_middleware
-          export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
+        // unstable_clientMiddleware
+        export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
 
-          // unstable_clientMiddleware
-          export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
+        // loader
+        export type LoaderArgs = Annotations["LoaderArgs"];
 
-          // loader
-          export type LoaderArgs = Annotations["LoaderArgs"];
+        // clientLoader
+        export type ClientLoaderArgs = Annotations["ClientLoaderArgs"];
 
-          // clientLoader
-          export type ClientLoaderArgs = Annotations["ClientLoaderArgs"];
+        // action
+        export type ActionArgs = Annotations["ActionArgs"];
 
-          // action
-          export type ActionArgs = Annotations["ActionArgs"];
+        // clientAction
+        export type ClientActionArgs = Annotations["ClientActionArgs"];
 
-          // clientAction
-          export type ClientActionArgs = Annotations["ClientActionArgs"];
+        // HydrateFallback
+        export type HydrateFallbackProps = Annotations["HydrateFallbackProps"];
 
-          // HydrateFallback
-          export type HydrateFallbackProps = Annotations["HydrateFallbackProps"];
+        // Component
+        export type ComponentProps = Annotations["ComponentProps"];
 
-          // Component
-          export type ComponentProps = Annotations["ComponentProps"];
-
-          // ErrorBoundary
-          export type ErrorBoundaryProps = Annotations["ErrorBoundaryProps"];
-        }
-      `;
-    return { filename: filename2, content };
-  });
-}
-function isRouteInAppDirectory(ctx, route) {
-  const absoluteRoutePath = Path3.resolve(ctx.config.appDirectory, route.file);
-  return absoluteRoutePath.startsWith(ctx.config.appDirectory);
-}
-function getRouteModuleAnnotationsFilepath(ctx, route) {
-  return Path3.join(
-    typesDirectory(ctx),
-    Path3.relative(ctx.rootDirectory, ctx.config.appDirectory),
-    Path3.dirname(route.file),
-    "+types/" + Pathe.filename(route.file) + ".ts"
-  );
+        // ErrorBoundary
+        export type ErrorBoundaryProps = Annotations["ErrorBoundaryProps"];
+      }
+    `;
+  return { filename: filename2, content };
 }
-function getParents(ctx, route) {
-  const typesPath = getRouteModuleAnnotationsFilepath(ctx, route);
-  const lineage2 = lineage(ctx.config.routes, route);
-  const parents = lineage2.slice(0, -1);
-  return parents.map((parent, i) => {
-    const rel = Path3.relative(
-      Path3.dirname(typesPath),
-      getRouteModuleAnnotationsFilepath(ctx, parent)
-    );
-    let source = noExtension(rel);
-    if (!source.startsWith("../")) source = "./" + source;
-    const name = `Parent${i}`;
-    return {
-      name,
-      import: `import type { unstable_Props as ${name} } from "${source}.js"`
-    };
-  });
+function relativeImportSource(from, to) {
+  let path8 = Path3.relative(Path3.dirname(from), to);
+  path8 = Path3.join(Path3.dirname(path8), Pathe.filename(path8));
+  if (!path8.startsWith("../")) path8 = "./" + path8;
+  return path8 + ".js";
 }
-function noExtension(path8) {
-  return Path3.join(Path3.dirname(path8), Pathe.filename(path8));
+function rootDirsPath(ctx, typesPath) {
+  const rel = Path3.relative(typesDirectory(ctx), typesPath);
+  return Path3.join(ctx.rootDirectory, rel);
 }
 function paramsType(path8) {
   const params = parse2(path8);
@@ -1162,10 +1190,8 @@ async function run(rootDirectory, { mode }) {
   await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
-    generatePages(ctx),
-    generateRoutes(ctx),
     generateServerBuild(ctx),
-    ...generateRouteModuleAnnotations(ctx)
+    ...generateRoutes(ctx)
   );
 }
 async function watch(rootDirectory, { mode, logger }) {
@@ -1173,10 +1199,8 @@ async function watch(rootDirectory, { mode, logger }) {
   await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
-    generatePages(ctx),
-    generateRoutes(ctx),
     generateServerBuild(ctx),
-    ...generateRouteModuleAnnotations(ctx)
+    ...generateRoutes(ctx)
   );
   logger?.info((0, import_picocolors3.green)("generated types"), { timestamp: true, clear: true });
   ctx.configLoader.onChange(
@@ -1195,11 +1219,7 @@ async function watch(rootDirectory, { mode, logger }) {
       }
       if (routeConfigChanged) {
         await clearRouteModuleAnnotations(ctx);
-        await write(
-          generatePages(ctx),
-          generateRoutes(ctx),
-          ...generateRouteModuleAnnotations(ctx)
-        );
+        await write(...generateRoutes(ctx));
         logger?.info((0, import_picocolors3.green)("regenerated types"), {
           timestamp: true,
           clear: true
@@ -1591,7 +1611,7 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
-var import_node_crypto, fs4, path6, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, import_tinyglobby, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, fs4, path6, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, virtualHmrRuntime, virtualInjectHmrRuntime, virtual, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
@@ -1607,7 +1627,6 @@ var init_plugin = __esm({
     import_jsesc = __toESM(require("jsesc"));
     import_picocolors4 = __toESM(require("picocolors"));
     import_kebabCase = __toESM(require("lodash/kebabCase"));
-    import_tinyglobby = require("tinyglobby");
     init_typegen();
     init_invariant();
     init_babel();

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-00e730ed0
+ * @react-router/dev v0.0.0-experimental-93ddf3985
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-00e730ed0
+ * @react-router/dev v0.0.0-experimental-93ddf3985
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-00e730ed0
+ * @react-router/dev v0.0.0-experimental-93ddf3985
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-00e730ed0
+ * @react-router/dev v0.0.0-experimental-93ddf3985
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -57,7 +57,6 @@ var import_pick3 = __toESM(require("lodash/pick"));
 var import_jsesc = __toESM(require("jsesc"));
 var import_picocolors3 = __toESM(require("picocolors"));
 var import_kebabCase = __toESM(require("lodash/kebabCase"));
-var import_tinyglobby = require("tinyglobby");
 
 // typegen/index.ts
 var import_promises = __toESM(require("fs/promises"));
@@ -850,8 +849,11 @@ function lineage(routes, route) {
   return result;
 }
 function fullpath(lineage2) {
-  if (lineage2.length === 1 && lineage2[0].id === "root") return "/";
-  return "/" + lineage2.map((route) => route.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path6) => path6 !== void 0 && path6 !== "").join("/");
+  const route = lineage2.at(-1);
+  if (lineage2.length === 1 && route?.id === "root") return "/";
+  const isLayout = route && route.index !== true && route.path === void 0;
+  if (isLayout) return void 0;
+  return "/" + lineage2.map((route2) => route2.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path6) => path6 !== void 0 && path6 !== "").join("/");
 }
 
 // typegen/generate.ts
@@ -897,27 +899,65 @@ function generateServerBuild(ctx) {
   return { filename: filename2, content };
 }
 var { t: t2 } = babel_exports;
-function generatePages(ctx) {
-  const filename2 = Path3.join(typesDirectory(ctx), "+pages.ts");
-  const fullpaths = /* @__PURE__ */ new Set();
-  Object.values(ctx.config.routes).forEach((route) => {
-    if (route.id !== "root" && !route.path) return;
+function generateRoutes(ctx) {
+  const fileToRoutes = /* @__PURE__ */ new Map();
+  const lineages = /* @__PURE__ */ new Map();
+  const pages = /* @__PURE__ */ new Set();
+  const routeToPages = /* @__PURE__ */ new Map();
+  for (const route of Object.values(ctx.config.routes)) {
+    let routeIds = fileToRoutes.get(route.file);
+    if (!routeIds) {
+      routeIds = /* @__PURE__ */ new Set();
+      fileToRoutes.set(route.file, routeIds);
+    }
+    routeIds.add(route.id);
     const lineage2 = lineage(ctx.config.routes, route);
-    const fullpath2 = fullpath(lineage2);
-    fullpaths.add(fullpath2);
-  });
-  const pagesType = t2.tsTypeAliasDeclaration(
+    lineages.set(route.id, lineage2);
+    const page = fullpath(lineage2);
+    if (!page) continue;
+    pages.add(page);
+    lineage2.forEach(({ id }) => {
+      let routePages = routeToPages.get(id);
+      if (!routePages) {
+        routePages = /* @__PURE__ */ new Set();
+        routeToPages.set(id, routePages);
+      }
+      routePages.add(page);
+    });
+  }
+  const routesTs = {
+    filename: Path3.join(typesDirectory(ctx), "+routes.ts"),
+    content: import_dedent.default`
+        // Generated by React Router
+
+        import "react-router"
+
+        declare module "react-router" {
+          interface Register {
+            pages: Pages
+            routeFiles: RouteFiles
+          }
+        }
+      ` + "\n\n" + generate(pagesType(pages)).code + "\n\n" + generate(routeFilesType({ fileToRoutes, routeToPages })).code
+  };
+  const allAnnotations = Array.from(fileToRoutes.entries()).filter(([file]) => isInAppDirectory(ctx, file)).map(
+    ([file, routeIds]) => getRouteAnnotations({ ctx, file, routeIds, lineages })
+  );
+  return [routesTs, ...allAnnotations];
+}
+function pagesType(pages) {
+  return t2.tsTypeAliasDeclaration(
     t2.identifier("Pages"),
     null,
     t2.tsTypeLiteral(
-      Array.from(fullpaths).map((fullpath2) => {
+      Array.from(pages).map((page) => {
         return t2.tsPropertySignature(
-          t2.stringLiteral(fullpath2),
+          t2.stringLiteral(page),
           t2.tsTypeAnnotation(
             t2.tsTypeLiteral([
               t2.tsPropertySignature(
                 t2.identifier("params"),
-                t2.tsTypeAnnotation(paramsType(fullpath2))
+                t2.tsTypeAnnotation(paramsType(page))
               )
             ])
           )
@@ -925,55 +965,92 @@ function generatePages(ctx) {
       })
     )
   );
-  const content = import_dedent.default`
-      // Generated by React Router
-
-      import "react-router"
-
-      declare module "react-router" {
-        interface Register {
-          pages: Pages
-        }
-      }
-    ` + "\n\n" + generate(pagesType).code;
-  return { filename: filename2, content };
 }
-function generateRoutes(ctx) {
-  const filename2 = Path3.join(typesDirectory(ctx), "+routes-pre.ts");
-  const routesType = t2.tsTypeAliasDeclaration(
-    t2.identifier("routesPre"),
+function routeFilesType({
+  fileToRoutes,
+  routeToPages
+}) {
+  return t2.tsTypeAliasDeclaration(
+    t2.identifier("RouteFiles"),
     null,
     t2.tsTypeLiteral(
-      Object.values(ctx.config.routes).map((route) => {
-        return t2.tsPropertySignature(
-          t2.stringLiteral(route.id),
+      Array.from(fileToRoutes).map(
+        ([file, routeIds]) => t2.tsPropertySignature(
+          t2.stringLiteral(file),
           t2.tsTypeAnnotation(
-            t2.tsTypeLiteral([
-              t2.tsPropertySignature(
-                t2.identifier("parentId"),
-                t2.tsTypeAnnotation(
-                  route.parentId ? t2.tsLiteralType(t2.stringLiteral(route.parentId)) : t2.tsUndefinedKeyword()
-                )
-              ),
-              t2.tsPropertySignature(
-                t2.identifier("path"),
-                t2.tsTypeAnnotation(
-                  route.path ? t2.tsLiteralType(t2.stringLiteral(route.path)) : t2.tsUndefinedKeyword()
-                )
-              ),
+            t2.tsUnionType(
+              Array.from(routeIds).map((routeId) => {
+                const pages = routeToPages.get(routeId) ?? /* @__PURE__ */ new Set();
+                return t2.tsTypeLiteral([
+                  t2.tsPropertySignature(
+                    t2.identifier("id"),
+                    t2.tsTypeAnnotation(
+                      t2.tsLiteralType(t2.stringLiteral(routeId))
+                    )
+                  ),
+                  t2.tsPropertySignature(
+                    t2.identifier("page"),
+                    t2.tsTypeAnnotation(
+                      pages ? t2.tsUnionType(
+                        Array.from(pages).map(
+                          (page) => t2.tsLiteralType(t2.stringLiteral(page))
+                        )
+                      ) : t2.tsNeverKeyword()
+                    )
+                  )
+                ]);
+              })
+            )
+          )
+        )
+      )
+    )
+  );
+}
+function isInAppDirectory(ctx, routeFile) {
+  const path6 = Path3.resolve(ctx.config.appDirectory, routeFile);
+  return path6.startsWith(ctx.config.appDirectory);
+}
+function getRouteAnnotations({
+  ctx,
+  file,
+  routeIds,
+  lineages
+}) {
+  const filename2 = Path3.join(
+    typesDirectory(ctx),
+    Path3.relative(ctx.rootDirectory, ctx.config.appDirectory),
+    Path3.dirname(file),
+    "+types",
+    Pathe.filename(file) + ".ts"
+  );
+  const matchesType = t2.tsTypeAliasDeclaration(
+    t2.identifier("Matches"),
+    null,
+    t2.tsUnionType(
+      Array.from(routeIds).map((routeId) => {
+        const lineage2 = lineages.get(routeId);
+        return t2.tsTupleType(
+          lineage2.map(
+            (route) => t2.tsTypeLiteral([
               t2.tsPropertySignature(
-                t2.identifier("params"),
-                t2.tsTypeAnnotation(paramsType(route.path ?? ""))
+                t2.identifier("id"),
+                t2.tsTypeAnnotation(t2.tsLiteralType(t2.stringLiteral(route.id)))
               ),
               t2.tsPropertySignature(
-                t2.identifier("index"),
+                t2.identifier("module"),
                 t2.tsTypeAnnotation(
-                  t2.tsLiteralType(t2.booleanLiteral(route.index ?? false))
+                  t2.tsTypeQuery(
+                    t2.tsImportType(
+                      t2.stringLiteral(
+                        relativeImportSource(
+                          rootDirsPath(ctx, filename2),
+                          Path3.resolve(ctx.config.appDirectory, route.file)
+                        )
+                      )
+                    )
+                  )
                 )
-              ),
-              t2.tsPropertySignature(
-                t2.identifier("file"),
-                t2.tsTypeAnnotation(t2.tsLiteralType(t2.stringLiteral(route.file)))
               )
             ])
           )
@@ -981,127 +1058,77 @@ function generateRoutes(ctx) {
       })
     )
   );
+  const routeImportSource = relativeImportSource(
+    rootDirsPath(ctx, filename2),
+    Path3.resolve(ctx.config.appDirectory, file)
+  );
   const content = import_dedent.default`
       // Generated by React Router
 
-      import "react-router"
+      import type { GetInfo, GetAnnotations } from "react-router/internal";
 
-      declare module "react-router" {
-        interface Register {
-          routesPre: routesPre
-        }
-      }
-    ` + "\n\n" + generate(routesType).code;
-  return { filename: filename2, content };
-}
-function generateRouteModuleAnnotations(ctx) {
-  return Object.values(ctx.config.routes).filter((route) => isRouteInAppDirectory(ctx, route)).map((route) => {
-    const filename2 = getRouteModuleAnnotationsFilepath(ctx, route);
-    const parents = getParents(ctx, route);
-    const content = import_dedent.default`
-        // Generated by React Router
+      type Module = typeof import("${routeImportSource}")
 
-        import type {
-          Params,
-          RouteModuleAnnotations,
-          CreateLoaderData,
-          CreateActionData,
-        } from "react-router/internal";
+      type Info = GetInfo<{
+        file: "${file}",
+        module: Module
+      }>
+    ` + "\n\n" + generate(matchesType).code + "\n\n" + import_dedent.default`
+      type Annotations = GetAnnotations<Info & { module: Module, matches: Matches }>;
 
-        ${parents.map((parent) => parent.import).join("\n" + "  ".repeat(3))}
-        type Parents = [${parents.map((parent) => parent.name).join(", ")}]
+      export namespace Route {
+        // links
+        export type LinkDescriptors = Annotations["LinkDescriptors"];
+        export type LinksFunction = Annotations["LinksFunction"];
 
-        type Id = "${route.id}"
-        type Module = typeof import("../${Pathe.filename(route.file)}.js")
+        // meta
+        export type MetaArgs = Annotations["MetaArgs"];
+        export type MetaDescriptors = Annotations["MetaDescriptors"];
+        export type MetaFunction = Annotations["MetaFunction"];
 
-        export type unstable_Props = {
-          params: Params[Id]
-          loaderData: CreateLoaderData<Module>
-          actionData: CreateActionData<Module>
-        }
+        // headers
+        export type HeadersArgs = Annotations["HeadersArgs"];
+        export type HeadersFunction = Annotations["HeadersFunction"];
 
-        type Annotations = RouteModuleAnnotations<unstable_Props & {
-          parents: Parents,
-          module: Module,
-        }>;
+        // unstable_middleware
+        export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
 
-        export namespace Route {
-          // links
-          export type LinkDescriptors = Annotations["LinkDescriptors"];
-          export type LinksFunction = Annotations["LinksFunction"];
+        // unstable_clientMiddleware
+        export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
 
-          // meta
-          export type MetaArgs = Annotations["MetaArgs"];
-          export type MetaDescriptors = Annotations["MetaDescriptors"];
-          export type MetaFunction = Annotations["MetaFunction"];
+        // loader
+        export type LoaderArgs = Annotations["LoaderArgs"];
 
-          // headers
-          export type HeadersArgs = Annotations["HeadersArgs"];
-          export type HeadersFunction = Annotations["HeadersFunction"];
+        // clientLoader
+        export type ClientLoaderArgs = Annotations["ClientLoaderArgs"];
 
-          // unstable_middleware
-          export type unstable_MiddlewareFunction = Annotations["unstable_MiddlewareFunction"];
+        // action
+        export type ActionArgs = Annotations["ActionArgs"];
 
-          // unstable_clientMiddleware
-          export type unstable_ClientMiddlewareFunction = Annotations["unstable_ClientMiddlewareFunction"];
+        // clientAction
+        export type ClientActionArgs = Annotations["ClientActionArgs"];
 
-          // loader
-          export type LoaderArgs = Annotations["LoaderArgs"];
+        // HydrateFallback
+        export type HydrateFallbackProps = Annotations["HydrateFallbackProps"];
 
-          // clientLoader
-          export type ClientLoaderArgs = Annotations["ClientLoaderArgs"];
+        // Component
+        export type ComponentProps = Annotations["ComponentProps"];
 
-          // action
-          export type ActionArgs = Annotations["ActionArgs"];
-
-          // clientAction
-          export type ClientActionArgs = Annotations["ClientActionArgs"];
-
-          // HydrateFallback
-          export type HydrateFallbackProps = Annotations["HydrateFallbackProps"];
-
-          // Component
-          export type ComponentProps = Annotations["ComponentProps"];
-
-          // ErrorBoundary
-          export type ErrorBoundaryProps = Annotations["ErrorBoundaryProps"];
-        }
-      `;
-    return { filename: filename2, content };
-  });
-}
-function isRouteInAppDirectory(ctx, route) {
-  const absoluteRoutePath = Path3.resolve(ctx.config.appDirectory, route.file);
-  return absoluteRoutePath.startsWith(ctx.config.appDirectory);
-}
-function getRouteModuleAnnotationsFilepath(ctx, route) {
-  return Path3.join(
-    typesDirectory(ctx),
-    Path3.relative(ctx.rootDirectory, ctx.config.appDirectory),
-    Path3.dirname(route.file),
-    "+types/" + Pathe.filename(route.file) + ".ts"
-  );
+        // ErrorBoundary
+        export type ErrorBoundaryProps = Annotations["ErrorBoundaryProps"];
+      }
+    `;
+  return { filename: filename2, content };
 }
-function getParents(ctx, route) {
-  const typesPath = getRouteModuleAnnotationsFilepath(ctx, route);
-  const lineage2 = lineage(ctx.config.routes, route);
-  const parents = lineage2.slice(0, -1);
-  return parents.map((parent, i) => {
-    const rel = Path3.relative(
-      Path3.dirname(typesPath),
-      getRouteModuleAnnotationsFilepath(ctx, parent)
-    );
-    let source = noExtension(rel);
-    if (!source.startsWith("../")) source = "./" + source;
-    const name = `Parent${i}`;
-    return {
-      name,
-      import: `import type { unstable_Props as ${name} } from "${source}.js"`
-    };
-  });
+function relativeImportSource(from, to) {
+  let path6 = Path3.relative(Path3.dirname(from), to);
+  path6 = Path3.join(Path3.dirname(path6), Pathe.filename(path6));
+  if (!path6.startsWith("../")) path6 = "./" + path6;
+  return path6 + ".js";
 }
-function noExtension(path6) {
-  return Path3.join(Path3.dirname(path6), Pathe.filename(path6));
+function rootDirsPath(ctx, typesPath) {
+  const rel = Path3.relative(typesDirectory(ctx), typesPath);
+  return Path3.join(ctx.rootDirectory, rel);
 }
 function paramsType(path6) {
   const params = parse2(path6);
@@ -1137,10 +1164,8 @@ async function watch(rootDirectory, { mode, logger }) {
   await import_promises.default.rm(typesDirectory(ctx), { recursive: true, force: true });
   await write(
     generateFuture(ctx),
-    generatePages(ctx),
-    generateRoutes(ctx),
     generateServerBuild(ctx),
-    ...generateRouteModuleAnnotations(ctx)
+    ...generateRoutes(ctx)
   );
   logger?.info((0, import_picocolors2.green)("generated types"), { timestamp: true, clear: true });
   ctx.configLoader.onChange(
@@ -1159,11 +1184,7 @@ async function watch(rootDirectory, { mode, logger }) {
       }
       if (routeConfigChanged) {
         await clearRouteModuleAnnotations(ctx);
-        await write(
-          generatePages(ctx),
-          generateRoutes(ctx),
-          ...generateRouteModuleAnnotations(ctx)
-        );
+        await write(...generateRoutes(ctx));
         logger?.info((0, import_picocolors2.green)("regenerated types"), {
           timestamp: true,
           clear: true
@@ -3023,7 +3044,7 @@ var reactRouterVitePlugin = () => {
               ...Object.values(ctx.reactRouterConfig.routes).map(
                 (route) => resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
               )
-            ].map(import_tinyglobby.convertPathToPattern) : [],
+            ] : [],
             include: [
               // Pre-bundle React dependencies to avoid React duplicates,
               // even if React dependencies are not direct dependencies.
@@ -3126,7 +3147,7 @@ var reactRouterVitePlugin = () => {
                     ctx.reactRouterConfig
                   )
                 )
-              ].map(import_tinyglobby.convertPathToPattern),
+              ],
               include: [
                 "react",
                 "react/jsx-dev-runtime",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-00e730ed0",
+  "version": "0.0.0-experimental-93ddf3985",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -84,10 +84,9 @@
     "react-refresh": "^0.14.0",
     "semver": "^7.3.7",
     "set-cookie-parser": "^2.6.0",
-    "tinyglobby": "^0.2.13",
     "valibot": "^0.41.0",
     "vite-node": "3.0.0-beta.2",
-    "@react-router/node": "0.0.0-experimental-00e730ed0"
+    "@react-router/node": "0.0.0-experimental-93ddf3985"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -111,15 +110,15 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.2.0",
-    "@react-router/serve": "0.0.0-experimental-00e730ed0",
-    "react-router": "^0.0.0-experimental-00e730ed0"
+    "@react-router/serve": "0.0.0-experimental-93ddf3985",
+    "react-router": "^0.0.0-experimental-93ddf3985"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-00e730ed0",
-    "react-router": "^0.0.0-experimental-00e730ed0"
+    "@react-router/serve": "^0.0.0-experimental-93ddf3985",
+    "react-router": "^0.0.0-experimental-93ddf3985"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {