Merge branch 'main' into himself65/20241123/migrate

himself65 · Dec 11, 2024 · 63b5896 · 63b5896
2 parents 8c872c8 + b59f5a1
commit 63b5896
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 15 deletions.
diff --git a/.github/workflows/canary-ci.yml b/.github/workflows/canary-ci.yml
@@ -0,0 +1,12 @@
+name: Canary CI
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  canary-ci:
+    if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }}
+    uses: ./.github/workflows/ci.yml
+    with:
+      use_canary: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,6 +5,11 @@ on:
     branches: [main]
   pull_request:
     types: [opened, synchronize]
+  workflow_call:
+    inputs:
+      use_canary:
+        required: true
+        type: boolean
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -21,25 +26,31 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.version }}
-          cache: 'pnpm'
+          cache: ${{ inputs.use_canary && '' || 'pnpm' }}
           cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - name: Install dependencies
+        run: |
+          ${{ inputs.use_canary && 'pnpm -r update react@canary react-dom@canary react-server-dom-webpack@canary' || '' }}
+          pnpm install --frozen-lockfile
       - run: pnpm test
 
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: 'pnpm'
+          cache: ${{ inputs.use_canary && '' || 'pnpm' }}
           cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - name: Install dependencies
+        run: |
+          ${{ inputs.use_canary && 'pnpm -r update react@canary react-dom@canary react-server-dom-webpack@canary' || '' }}
+          pnpm install --frozen-lockfile
       - run: pnpm run compile
       - uses: actions/upload-artifact@v4
         with:
@@ -81,12 +92,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.version }}
-          cache: 'pnpm'
+          cache: ${{ inputs.use_canary && '' || 'pnpm' }}
           cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - name: Install dependencies
+        run: |
+          ${{ inputs.use_canary && 'pnpm -r update react@canary react-dom@canary react-server-dom-webpack@canary' || '' }}
+          pnpm install --frozen-lockfile
       - uses: actions/download-artifact@v4
         with:
           name: create-waku

diff --git a/packages/waku/src/lib/plugins/vite-plugin-fs-router-typegen.ts b/packages/waku/src/lib/plugins/vite-plugin-fs-router-typegen.ts
@@ -186,8 +186,7 @@ export const fsRouterTypegenPlugin = (opts: { srcDir: string }): Plugin => {
           }
         }
 
-        result += `\ntype Page = {
-  DO_NOT_USE_pages:`;
+        result += `\ntype Page =\n`;
 
         for (const file of fileInfo) {
           const moduleName = moduleNames[file.src];
@@ -198,7 +197,7 @@ export const fsRouterTypegenPlugin = (opts: { srcDir: string }): Plugin => {
           }
         }
 
-        result += `};
+        result += `;
 
   declare module 'waku/router' {
     interface RouteConfig {

diff --git a/packages/waku/src/router/create-pages-utils/inferred-path-types.ts b/packages/waku/src/router/create-pages-utils/inferred-path-types.ts
@@ -141,10 +141,17 @@ export type AnyPage = {
  * type MyPaths = PathsForPages<typeof pages>;
  * // type MyPaths = '/foo' | '/bar';
  */
-export type PathsForPages<PagesResult extends { DO_NOT_USE_pages: AnyPage }> =
-  CollectPaths<PagesResult['DO_NOT_USE_pages']> extends never
+export type PathsForPages<
+  PagesResult extends { DO_NOT_USE_pages: AnyPage } | AnyPage,
+> = PagesResult extends { DO_NOT_USE_pages: AnyPage }
+  ? CollectPaths<PagesResult['DO_NOT_USE_pages']> extends never
     ? string
-    : CollectPaths<PagesResult['DO_NOT_USE_pages']>;
+    : CollectPaths<PagesResult['DO_NOT_USE_pages']>
+  : PagesResult extends AnyPage
+    ? CollectPaths<PagesResult> extends never
+      ? string
+      : CollectPaths<PagesResult>
+    : never;
 
 type _GetSlugs<
   Route extends string,