Revert "fix: catch-all server side handler"

This reverts commit 7e8be92.
spacecodeur · Jan 5, 2025 · c6de772 · c6de772
1 parent 97c83b4
commit c6de772
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/packages/tuono-fs-router-vite-plugin/src/generator.ts b/packages/tuono-fs-router-vite-plugin/src/generator.ts
@@ -85,7 +85,8 @@ async function getRouteNodes(
         } else if (fullPath.match(/\.(rs)$/)) {
           const filePath = replaceBackslash(path.join(dir, dirent.name))
           const filePathNoExt = removeExt(filePath)
-          let routePath = cleanPath(`/${filePathNoExt}`) || ''
+          let routePath =
+            cleanPath(`/${filePathNoExt.split('.').join('/')}`) || ''
 
           if (routePath === 'index') {
             routePath = '/'
@@ -166,16 +167,17 @@ export async function routeGenerator(config = defaultConfig): Promise<void> {
   const imports = [
     ...sortedRouteNodes.map((node) => {
       const extension = node.filePath.endsWith('mdx') ? '.mdx' : ''
-      return `const ${node.variableName as string
-        }Import = dynamic(() => import('./${replaceBackslash(
-          removeExt(
-            path.relative(
-              path.dirname(config.generatedRouteTree),
-              path.resolve(config.folderName, node.filePath),
-            ),
-            false,
+      return `const ${
+        node.variableName as string
+      }Import = dynamic(() => import('./${replaceBackslash(
+        removeExt(
+          path.relative(
+            path.dirname(config.generatedRouteTree),
+            path.resolve(config.folderName, node.filePath),
           ),
-        )}${extension}'))`
+          false,
+        ),
+      )}${extension}'))`
     }),
   ].join('\n')
 

diff --git a/packages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routeTree.expected.ts b/packages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routeTree.expected.ts
@@ -24,7 +24,6 @@ const IndexRoute = Index.update({
 const PostscatchallRoute = Postscatchall.update({
   path: '/posts/[...catch_all]',
   getParentRoute: () => rootRoute,
-  hasHandler: true,
 })
 
 // Create and export the route tree

diff --git a/...ages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routes/posts/[...catch_all].rs b/...ages/tuono-fs-router-vite-plugin/tests/generator/catch_all/routes/posts/[...catch_all].rs