@solidjs/start 2.0.4 → 2.0.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @solidjs/start
 
+## 2.0.5
+
+### Patch Changes
+
+- eca4cc4: Only strip a whole `index` segment when mapping route files to paths. Route files whose names merely end in "index", such as `routes/reindex.tsx`, were previously served at `/re` instead of `/reindex`.
+
 ## 2.0.4
 
 ### Patch Changes

package/dist/config/fs-router.js

@@ -1,20 +1,29 @@
 import { analyzeModule, BaseFileSystemRouter, cleanPath, } from "./fs-routes/router.js";
+/**
+ * Maps a route file to its router path: strips the routes directory and extension,
+ * drops a trailing `index` segment (`blog/index` -> `/blog/`, `index` -> `/`) and
+ * converts `[param]`, `[[optional]]` and `[...rest]` segments to router syntax.
+ */
+function toRoutePath(src, config) {
+    const routePath = cleanPath(src, config)
+        // remove the initial slash
+        .slice(1)
+        // only strip a whole `index` segment, not a name that merely ends in "index" (e.g. `reindex`)
+        .replace(/(^|\/)index$/, "$1")
+        .replace(/\[([^/]+)\]/g, (_, m) => {
+        if (m.length > 3 && m.startsWith("...")) {
+            return `*${m.slice(3)}`;
+        }
+        if (m.length > 2 && m.startsWith("[") && m.endsWith("]")) {
+            return `:${m.slice(1, -1)}?`;
+        }
+        return `:${m}`;
+    });
+    return routePath.length > 0 ? `/${routePath}` : "/";
+}
 export class SolidStartClientFileRouter extends BaseFileSystemRouter {
     toPath(src) {
-        const routePath = cleanPath(src, this.config)
-            // remove the initial slash
-            .slice(1)
-            .replace(/index$/, "")
-            .replace(/\[([^/]+)\]/g, (_, m) => {
-            if (m.length > 3 && m.startsWith("...")) {
-                return `*${m.slice(3)}`;
-            }
-            if (m.length > 2 && m.startsWith("[") && m.endsWith("]")) {
-                return `:${m.slice(1, -1)}?`;
-            }
-            return `:${m}`;
-        });
-        return routePath?.length > 0 ? `/${routePath}` : "/";
+        return toRoutePath(src, this.config);
     }
     toRoute(src) {
         const path = this.toPath(src);
@@ -87,20 +96,7 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
         super(config);
     }
     toPath(src) {
-        const routePath = cleanPath(src, this.config)
-            // remove the initial slash
-            .slice(1)
-            .replace(/index$/, "")
-            .replace(/\[([^/]+)\]/g, (_, m) => {
-            if (m.length > 3 && m.startsWith("...")) {
-                return `*${m.slice(3)}`;
-            }
-            if (m.length > 2 && m.startsWith("[") && m.endsWith("]")) {
-                return `:${m.slice(1, -1)}?`;
-            }
-            return `:${m}`;
-        });
-        return routePath?.length > 0 ? `/${routePath}` : "/";
+        return toRoutePath(src, this.config);
     }
     toRoute(src) {
         const path = this.toPath(src);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/solidjs/solid-start.git",