refactor: fs-router to use new_createPages & fix staticPaths

e2e/fixtures/ssg-performance/src/Path.tsx

@@ -1,5 +1,3 @@
-import { getPath } from './context.js';
-
-export function Path() {
-  return <h1>{getPath()}</h1>;
+export function Path({ path }: { path: string }) {
+  return <h1>{path}</h1>;
 }

e2e/fixtures/ssg-performance/src/pages/[path].tsx → e2e/fixtures/ssg-performance/src/pages/[slug].tsx

@@ -1,8 +1,9 @@
+import type { PageProps } from 'waku/router';
 import { Path } from '../Path.js';
 
-export default async function Test() {
+export default async function Test({ path }: PageProps<'/[slug]'>) {
   await new Promise((resolve) => setTimeout(resolve, 1000));
-  return <Path />;
+  return <Path path={path} />;
 }
 
 export async function getConfig() {

e2e/fixtures/ssg-performance/src/pages/_layout.tsx

@@ -1,10 +1,5 @@
 import type { PropsWithChildren } from 'react';
-import { setPath } from '../context.js';
 
-export default function Layout({
-  children,
-  path,
-}: PropsWithChildren<{ path: string }>) {
-  setPath(path);
-  return children;
+export default function Layout({ children }: PropsWithChildren) {
+  return <div>{children}</div>;
 }

e2e/fixtures/ssg-wildcard/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "waku-example",
+  "name": "ssg-wildcard",
   "version": "0.1.0",
   "type": "module",
   "private": true,

examples/11_fs-router/src/main.tsx

@@ -1,6 +1,6 @@
 import { StrictMode } from 'react';
 import { createRoot, hydrateRoot } from 'react-dom/client';
-import { Router } from 'waku/router/client';
+import { NewRouter as Router } from 'waku/router/client';
 
 const rootElement = (
   <StrictMode>

examples/44_cloudflare/waku.cloudflare-dev-server.ts

@@ -9,10 +9,7 @@ export const cloudflareDevServer = (cfOptions: any) => {
     Object.assign(globalThis, { WebSocketPair });
   });
   return async (req: Request, app: Hono<BlankEnv, BlankSchema>) => {
-    const [proxy, _] = await Promise.all([
-      await wranglerPromise,
-      await miniflarePromise,
-    ]);
+    const [proxy, _] = await Promise.all([wranglerPromise, miniflarePromise]);
     Object.assign(req, { cf: proxy.cf });
     Object.assign(globalThis, {
       caches: proxy.caches,

packages/waku/src/lib/plugins/vite-plugin-rsc-managed.ts

@@ -22,7 +22,7 @@ export default fsRouter(
 const getManagedMain = () => `
 import { StrictMode, createElement } from 'react';
 import { createRoot, hydrateRoot } from 'react-dom/client';
-import { Router } from 'waku/router/client';
+import { NewRouter as Router } from 'waku/router/client';
 
 const rootElement = createElement(StrictMode, null, createElement(Router));
 

packages/waku/src/router/fs-router.ts

@@ -1,5 +1,5 @@
 import { unstable_getPlatformObject } from '../server.js';
-import { createPages } from './create-pages.js';
+import { new_createPages as createPages } from './create-pages.js';
 
 import { EXTENSIONS } from '../lib/constants.js';
 
@@ -64,7 +64,11 @@ export function fsRouter(
           ? pathItems.slice(0, -1)
           : pathItems
         ).join('/');
-      if (pathItems.at(-1) === '_layout') {
+      if (pathItems.at(-1) === '[path]') {
+        throw new Error(
+          'Page file cannot be named [path]. This will conflict with the path prop of the page component.',
+        );
+      } else if (pathItems.at(-1) === '_layout') {
         createLayout({
           path,
           component: mod.default,