@react-router/dev 0.0.0-experimental-b2bc694a6 → 0.0.0-experimental-b571356c3

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-b2bc694a6
+ * @react-router/dev v0.0.0-experimental-b571356c3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -933,18 +933,21 @@ function register(ctx) {
     }
   `;
   const { t: t2 } = babel_exports;
-  const indexPaths = new Set(
-    Object.values(ctx.config.routes).filter((route) => route.index).map((route) => route.path)
-  );
+  const fullpaths = {};
+  for (const route of Object.values(ctx.config.routes)) {
+    if (route.id !== "root" && !route.path) continue;
+    const lineage2 = lineage(ctx.config.routes, route);
+    const fullpath2 = fullpath(lineage2);
+    const existing = fullpaths[fullpath2];
+    if (!existing || existing.length < lineage2.length) {
+      fullpaths[fullpath2] = lineage2;
+    }
+  }
   const typeParams = t2.tsTypeAliasDeclaration(
     t2.identifier("Params"),
     null,
     t2.tsTypeLiteral(
-      Object.values(ctx.config.routes).map((route) => {
-        if (route.id !== "root" && !route.path) return void 0;
-        if (!route.index && indexPaths.has(route.path)) return void 0;
-        const lineage2 = lineage(ctx.config.routes, route);
-        const fullpath2 = fullpath(lineage2);
+      Object.keys(fullpaths).map((fullpath2) => {
         const params = parse2(fullpath2);
         return t2.tsPropertySignature(
           t2.stringLiteral(fullpath2),
@@ -961,7 +964,7 @@ function register(ctx) {
             )
           )
         );
-      }).filter((x) => x !== void 0)
+      })
     )
   );
   return [register2, generate(typeParams).code].join("\n\n");

package/dist/config.js

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

package/dist/routes.js

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

package/dist/vite/cloudflare.js

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

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-b2bc694a6
+ * @react-router/dev v0.0.0-experimental-b571356c3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -906,18 +906,21 @@ function register(ctx) {
     }
   `;
   const { t: t2 } = babel_exports;
-  const indexPaths = new Set(
-    Object.values(ctx.config.routes).filter((route) => route.index).map((route) => route.path)
-  );
+  const fullpaths = {};
+  for (const route of Object.values(ctx.config.routes)) {
+    if (route.id !== "root" && !route.path) continue;
+    const lineage2 = lineage(ctx.config.routes, route);
+    const fullpath2 = fullpath(lineage2);
+    const existing = fullpaths[fullpath2];
+    if (!existing || existing.length < lineage2.length) {
+      fullpaths[fullpath2] = lineage2;
+    }
+  }
   const typeParams = t2.tsTypeAliasDeclaration(
     t2.identifier("Params"),
     null,
     t2.tsTypeLiteral(
-      Object.values(ctx.config.routes).map((route) => {
-        if (route.id !== "root" && !route.path) return void 0;
-        if (!route.index && indexPaths.has(route.path)) return void 0;
-        const lineage2 = lineage(ctx.config.routes, route);
-        const fullpath2 = fullpath(lineage2);
+      Object.keys(fullpaths).map((fullpath2) => {
         const params = parse2(fullpath2);
         return t2.tsPropertySignature(
           t2.stringLiteral(fullpath2),
@@ -934,7 +937,7 @@ function register(ctx) {
             )
           )
         );
-      }).filter((x) => x !== void 0)
+      })
     )
   );
   return [register2, generate(typeParams).code].join("\n\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-b2bc694a6",
+  "version": "0.0.0-experimental-b571356c3",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -86,7 +86,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "3.0.0-beta.2",
-    "@react-router/node": "0.0.0-experimental-b2bc694a6"
+    "@react-router/node": "0.0.0-experimental-b571356c3"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -110,15 +110,15 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.2.0",
-    "react-router": "^0.0.0-experimental-b2bc694a6",
-    "@react-router/serve": "0.0.0-experimental-b2bc694a6"
+    "@react-router/serve": "0.0.0-experimental-b571356c3",
+    "react-router": "^0.0.0-experimental-b571356c3"
   },
   "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-b2bc694a6",
-    "react-router": "^0.0.0-experimental-b2bc694a6"
+    "@react-router/serve": "^0.0.0-experimental-b571356c3",
+    "react-router": "^0.0.0-experimental-b571356c3"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {