fix: changes from review

.gitignore

@@ -11,3 +11,4 @@ dist
 .cache
 .nvmrc
 .node-version
+entries.gen.tsx

e2e/fixtures/render-type/src/entries.tsx

@@ -2,6 +2,8 @@ import { createPages } from 'waku/router/server';
 
 import { ServerEcho } from './ServerEcho.js';
 import { ClientEcho } from './ClientEcho.js';
+import { FunctionComponent } from 'react';
+import { RouteProps } from '../../../../packages/waku/dist/router/common.js';
 
 // This needs type annotations for the return type of createPages
 // @see https://github.com/microsoft/TypeScript/issues/42873#issuecomment-2065572017

e2e/fixtures/ssr-catch-error/src/pages/_layout.tsx

@@ -19,5 +19,5 @@ export default async function RootLayout({
 export const getConfig = async () => {
   return {
     render: 'static',
-  };
+  } as const;
 };

e2e/fixtures/ssr-catch-error/src/pages/index.tsx

@@ -12,5 +12,5 @@ export default async function HomePage() {
 export const getConfig = async () => {
   return {
     render: 'static',
-  };
+  } as const;
 };

e2e/fixtures/ssr-catch-error/src/pages/invalid.tsx

@@ -9,5 +9,5 @@ export default async function InvalidPage() {
 export const getConfig = async () => {
   return {
     render: 'dynamic',
-  };
+  } as const;
 };

examples/03_demo/src/pages/[slug].tsx

@@ -78,5 +78,5 @@ export const getConfig = async () => {
   return {
     render: 'static',
     staticPaths: pokemonPaths,
-  };
+  } as const;
 };

examples/03_demo/src/pages/_layout.tsx

@@ -40,5 +40,5 @@ const getData = async () => {
 export const getConfig = async () => {
   return {
     render: 'static',
-  };
+  } as const;
 };

examples/03_demo/src/pages/index.tsx

@@ -51,5 +51,5 @@ export default async function HomePage() {
 export const getConfig = async () => {
   return {
     render: 'dynamic',
-  };
+  } as const;
 };

examples/04_cssmodules/src/pages/_layout.tsx

@@ -38,5 +38,5 @@ const getData = async () => {
 export const getConfig = async () => {
   return {
     render: 'static',
-  };
+  } as const;
 };

examples/04_cssmodules/src/pages/about.tsx

@@ -30,5 +30,5 @@ const getData = async () => {
 export const getConfig = async () => {
   return {
     render: 'static',
-  };
+  } as const;
 };

examples/04_cssmodules/src/pages/index.tsx

@@ -32,5 +32,5 @@ const getData = async () => {
 export const getConfig = async () => {
   return {
     render: 'static',
-  };
+  } as const;
 };

packages/waku/src/lib/plugins/vite-plugin-fs-router-typegen.ts

@@ -1,8 +1,7 @@
 import type { Plugin } from 'vite';
 import { readdir, writeFile } from 'node:fs/promises';
 import { existsSync, readFileSync } from 'node:fs';
-import path from 'node:path';
-import { SRC_ENTRIES } from '../constants.js';
+import { SRC_ENTRIES, EXTENSIONS } from '../constants.js';
 import { joinPath } from '../utils/path.js';
 
 const SRC_PAGES = 'pages';
@@ -62,7 +61,7 @@ export const fsRouterTypegenPlugin = (opts: { srcDir: string }): Plugin => {
     apply: 'serve',
     async configResolved(config) {
       pagesDir = joinPath(config.root, opts.srcDir, SRC_PAGES);
-      entriesFilePossibilities = ['tsx', 'ts', 'js', 'jsx'].map((ext) =>
+      entriesFilePossibilities = EXTENSIONS.map((ext) =>
         joinPath(config.root, opts.srcDir, `${SRC_ENTRIES}.${ext}`),
       );
       outputFile = joinPath(config.root, opts.srcDir, `${SRC_ENTRIES}.gen.tsx`);
@@ -98,9 +97,8 @@ export const fsRouterTypegenPlugin = (opts: { srcDir: string }): Plugin => {
         });
 
         for (const file of files) {
-          const fullPath = path.join(dir, file.name);
-          if (fullPath.endsWith('.tsx')) {
-            results.push(fullPath.replace(pagesDir, ''));
+          if (file.name.endsWith('.tsx')) {
+            results.push('/' + file.name);
           }
         }
         return results;