refactor: fs-router to use new_createPages & fix staticPaths

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>

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

@@ -22,7 +22,7 @@ export default fsRouter(
 const getManagedMain = () => `
 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>

packages/waku/src/router/create-pages.ts

@@ -588,7 +588,7 @@ export const new_createPages = <
           }
         });
         staticPathMap.set(
-          page.path,
+          '/' + pathItems.join('/'),
           pathItems.map((name) => ({ type: 'literal', name })),
         );
         const id = joinPath(...pathItems, 'page');

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';
 

packages/waku/tests/create-pages.test.ts

@@ -829,6 +829,56 @@ describe('createPages', () => {
     expect(TestPage).toHaveBeenCalledWith({ path: ['a', 'b'] }, undefined);
   });
 
+  it('creates multiple static pages with wildcards', async () => {
+    const TestPage = vi.fn();
+    createPages(async ({ createPage }) => [
+      createPage({
+        render: 'static',
+        path: '/test/[...path]',
+        staticPaths: [[], ['hi'], ['a', 'b']],
+        component: TestPage,
+      }),
+    ]);
+    const { getPathConfig, getComponent } = injectedFunctions();
+    expect(await getPathConfig()).toEqual([
+      {
+        pattern: '^/test/(.*)$',
+        path: [{ type: 'literal', name: 'test' }],
+        isStatic: true,
+        noSsr: false,
+      },
+      {
+        pattern: '^/test/(.*)$',
+        path: [
+          { type: 'literal', name: 'test' },
+          { type: 'literal', name: 'hi' },
+        ],
+        isStatic: true,
+        noSsr: false,
+      },
+      {
+        pattern: '^/test/(.*)$',
+        path: [
+          { type: 'literal', name: 'test' },
+          { type: 'literal', name: 'a' },
+          { type: 'literal', name: 'b' },
+        ],
+        isStatic: true,
+        noSsr: false,
+      },
+    ]);
+    const setShouldSkip = vi.fn();
+    const WrappedComponent = await getComponent('test/a/b/page', {
+      unstable_setShouldSkip: setShouldSkip,
+    });
+    assert(WrappedComponent);
+    expect(setShouldSkip).toHaveBeenCalledTimes(1);
+    expect(setShouldSkip).toHaveBeenCalledWith([]);
+    renderToString(createElement(WrappedComponent as any));
+    expect(TestPage).toHaveBeenCalledTimes(1);
+    expect(TestPage).toHaveBeenCalledWith({ path: ['a', 'b'] }, undefined);
+  });
+
   it('creates a dynamic page with wildcards', async () => {
     const TestPage = vi.fn();
     createPages(async ({ createPage }) => [