From f1b2bd1b613587078432b4753160b4a868ba818f Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Thu, 2 Jan 2025 18:01:34 -0500 Subject: [PATCH 01/35] ci: manual canary ci job --- .github/workflows/canary-e2e.yml | 13 +++++++++++++ .github/workflows/e2e.yml | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/canary-e2e.yml diff --git a/.github/workflows/canary-e2e.yml b/.github/workflows/canary-e2e.yml new file mode 100644 index 000000000..def5f19cf --- /dev/null +++ b/.github/workflows/canary-e2e.yml @@ -0,0 +1,13 @@ +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') }} + steps: + - uses: ./.github/workflows/ci.yml + with: + react_version: 'canary' \ No newline at end of file diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 768d53acb..8cec3a3de 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -15,6 +15,11 @@ on: - 'examples/**' - 'e2e/**' - '.github/workflows/e2e.yml' + workflow_call: + inputs: + react_version: + required: false + type: string concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -29,7 +34,10 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 20 - cache: 'pnpm' + cache: ${{ !inputs.react_version && 'pnpm' || '' }} + - if: ${{ inputs.react_version }} + run: | + pnpm -r update react@${{ inputs.react_version }} react-dom@${{ inputs.react_version }} react-server-dom-webpack@${{ inputs.react_version }} - run: pnpm install - run: pnpm run compile - uses: actions/upload-artifact@v4 @@ -75,7 +83,10 @@ jobs: - uses: actions/setup-node@v4 with: node-version: ${{ matrix.version }} - cache: 'pnpm' + cache: ${{ !inputs.react_version && 'pnpm' || '' }} + - if: ${{ inputs.react_version }} + run: | + pnpm -r update react@${{ inputs.react_version }} react-dom@${{ inputs.react_version }} react-server-dom-webpack@${{ inputs.react_version }} - run: pnpm install - uses: actions/download-artifact@v4 with: From b37b5c4d607d829e2c6cbb96c6090591eb976320 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:07:31 -0800 Subject: [PATCH 02/35] Update e2e.yml --- .github/workflows/e2e.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 8cec3a3de..421050da3 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -16,10 +16,10 @@ on: - 'e2e/**' - '.github/workflows/e2e.yml' workflow_call: - inputs: - react_version: - required: false - type: string + inputs: + react_version: + required: false + type: string concurrency: group: ${{ github.workflow }}-${{ github.ref }} From e2d19ccfede62d0ea72009e4e9f8a02652c93a0f Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:25:46 -0800 Subject: [PATCH 03/35] Update canary-e2e.yml --- .github/workflows/canary-e2e.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/canary-e2e.yml b/.github/workflows/canary-e2e.yml index def5f19cf..56c5cd0c8 100644 --- a/.github/workflows/canary-e2e.yml +++ b/.github/workflows/canary-e2e.yml @@ -6,8 +6,9 @@ on: jobs: canary-ci: + runs-on: ubuntu-latest if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} steps: - uses: ./.github/workflows/ci.yml with: - react_version: 'canary' \ No newline at end of file + react_version: 'canary' From aceb242b15b2406b18c2a1dab2ba0157feb12c69 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Thu, 2 Jan 2025 18:29:23 -0500 Subject: [PATCH 04/35] show react version in ci title when it's used --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 421050da3..dbcfd460f 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -56,7 +56,7 @@ jobs: if-no-files-found: error e2e: - name: E2E on ${{ matrix.os }} (Node ${{ matrix.version }}) - (${{ matrix.shared }}/4) + name: E2E on ${{ matrix.os }} (Node ${{ matrix.version }}) - (${{ matrix.shared }}/4)${{ inputs.react_version && format(' with react@{0}', inputs.react_version) || '' }} needs: - build strategy: From c89cdc97ea6f1ead5acd21d9bf52fdda07927b48 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 11:46:25 -0500 Subject: [PATCH 05/35] test canary --- .github/workflows/e2e-wip.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/e2e-wip.yml diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml new file mode 100644 index 000000000..f105e75b0 --- /dev/null +++ b/.github/workflows/e2e-wip.yml @@ -0,0 +1,14 @@ +name: E2E WIP - Test Canary + +on: + pull_request: + types: [synchronize] + +jobs: + canary-ci: + runs-on: ubuntu-latest + if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} + steps: + - uses: ./.github/workflows/ci.yml + with: + react_version: 'canary' From 1562df18f892ab049ad8499d8344c3b2dfbb9316 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 11:55:23 -0500 Subject: [PATCH 06/35] remove if check on wip --- .github/workflows/e2e-wip.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml index f105e75b0..69c45cac4 100644 --- a/.github/workflows/e2e-wip.yml +++ b/.github/workflows/e2e-wip.yml @@ -7,7 +7,6 @@ on: jobs: canary-ci: runs-on: ubuntu-latest - if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} steps: - uses: ./.github/workflows/ci.yml with: From e373ef4ce5662ed2aa6cb35e5137dbd692b80f97 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 11:56:09 -0500 Subject: [PATCH 07/35] change path --- .github/workflows/e2e-wip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml index 69c45cac4..85d41e4a7 100644 --- a/.github/workflows/e2e-wip.yml +++ b/.github/workflows/e2e-wip.yml @@ -8,6 +8,6 @@ jobs: canary-ci: runs-on: ubuntu-latest steps: - - uses: ./.github/workflows/ci.yml + - uses: .github/workflows/ci.yml with: react_version: 'canary' From 73ae7ed055e6cf4cd8385403e2ced92af18c8a54 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 12:04:10 -0500 Subject: [PATCH 08/35] weird --- .github/workflows/canary-e2e.yml | 2 +- .github/workflows/e2e-wip.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/canary-e2e.yml b/.github/workflows/canary-e2e.yml index 56c5cd0c8..c490fc7eb 100644 --- a/.github/workflows/canary-e2e.yml +++ b/.github/workflows/canary-e2e.yml @@ -9,6 +9,6 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} steps: - - uses: ./.github/workflows/ci.yml + - uses: .github/workflows/e2e.yml with: react_version: 'canary' diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml index 85d41e4a7..a94ab1356 100644 --- a/.github/workflows/e2e-wip.yml +++ b/.github/workflows/e2e-wip.yml @@ -8,6 +8,6 @@ jobs: canary-ci: runs-on: ubuntu-latest steps: - - uses: .github/workflows/ci.yml + - uses: .github/workflows/e2e.yml with: react_version: 'canary' From e7524083e3aa9d55581435c22bf21cce5e040b82 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 12:07:55 -0500 Subject: [PATCH 09/35] change on --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index dbcfd460f..d00d73e77 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -9,7 +9,7 @@ on: - 'e2e/**' - '.github/workflows/e2e.yml' pull_request: - types: [opened, synchronize] + types: [opened] # todo add synchronize paths: - 'packages/**' - 'examples/**' From aba0d3ab9d61172d8b8935951f24e826cedce846 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 12:10:30 -0500 Subject: [PATCH 10/35] path fix --- .github/workflows/canary-e2e.yml | 2 +- .github/workflows/e2e-wip.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/canary-e2e.yml b/.github/workflows/canary-e2e.yml index c490fc7eb..fd9337fb9 100644 --- a/.github/workflows/canary-e2e.yml +++ b/.github/workflows/canary-e2e.yml @@ -9,6 +9,6 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} steps: - - uses: .github/workflows/e2e.yml + - uses: ./.github/workflows/e2e.yml with: react_version: 'canary' diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml index a94ab1356..c06f8ca51 100644 --- a/.github/workflows/e2e-wip.yml +++ b/.github/workflows/e2e-wip.yml @@ -8,6 +8,6 @@ jobs: canary-ci: runs-on: ubuntu-latest steps: - - uses: .github/workflows/e2e.yml + - uses: ./.github/workflows/e2e.yml with: react_version: 'canary' From 848b284f07a03f523cb9ca5a9ee1d5e904b24f8b Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 12:15:32 -0500 Subject: [PATCH 11/35] try branch ref --- .github/workflows/e2e-wip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml index c06f8ca51..9d5b1bb58 100644 --- a/.github/workflows/e2e-wip.yml +++ b/.github/workflows/e2e-wip.yml @@ -8,6 +8,6 @@ jobs: canary-ci: runs-on: ubuntu-latest steps: - - uses: ./.github/workflows/e2e.yml + - uses: ./.github/workflows/e2e.yml@tylersayshi:canary-ci-again with: react_version: 'canary' From f9c4106712af39a298fb6e184b05c9b9307254c9 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 12:16:21 -0500 Subject: [PATCH 12/35] see what happens with main --- .github/workflows/e2e-wip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml index 9d5b1bb58..5f5a37cf3 100644 --- a/.github/workflows/e2e-wip.yml +++ b/.github/workflows/e2e-wip.yml @@ -8,6 +8,6 @@ jobs: canary-ci: runs-on: ubuntu-latest steps: - - uses: ./.github/workflows/e2e.yml@tylersayshi:canary-ci-again + - uses: ./.github/workflows/e2e.yml@main with: react_version: 'canary' From bb194bdf67c922e9dbb91608aef03bdbaf287a37 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 12:18:15 -0500 Subject: [PATCH 13/35] checkout first --- .github/workflows/e2e-wip.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml index 5f5a37cf3..1f2c62f0f 100644 --- a/.github/workflows/e2e-wip.yml +++ b/.github/workflows/e2e-wip.yml @@ -8,6 +8,7 @@ jobs: canary-ci: runs-on: ubuntu-latest steps: - - uses: ./.github/workflows/e2e.yml@main + - uses: actions/checkout@v4 + - uses: ./.github/workflows/e2e.yml with: react_version: 'canary' From c1d9b80b2afb690642adfde369473ef6848c1316 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 12:22:02 -0500 Subject: [PATCH 14/35] debug ls --- .github/workflows/e2e-wip.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml index 1f2c62f0f..d627098e5 100644 --- a/.github/workflows/e2e-wip.yml +++ b/.github/workflows/e2e-wip.yml @@ -9,6 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - run: | + ls + ls ./.github/workflows - uses: ./.github/workflows/e2e.yml with: react_version: 'canary' From 7ecc30105e04834fd8e960a46fdfe911b9924d19 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 12:27:19 -0500 Subject: [PATCH 15/35] try with repo ref https://docs.github.com/en/actions/sharing-automations/reusing-workflows#using-inputs-and-secrets-in-a-reusable-workflow --- .github/workflows/e2e-wip.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml index d627098e5..8cd25bf2d 100644 --- a/.github/workflows/e2e-wip.yml +++ b/.github/workflows/e2e-wip.yml @@ -9,9 +9,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - run: | - ls - ls ./.github/workflows - - uses: ./.github/workflows/e2e.yml + - uses: tylersayshi/waku/.github/workflows/e2e.yml@canary-ci-again with: react_version: 'canary' From 60baababf709c246f58e470bec9f0815f6c0726b Mon Sep 17 00:00:00 2001 From: Tyler <26290074+tylersayshi@users.noreply.github.com> Date: Fri, 3 Jan 2025 09:32:02 -0800 Subject: [PATCH 16/35] Update e2e-wip.yml --- .github/workflows/e2e-wip.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml index 8cd25bf2d..3d13ac698 100644 --- a/.github/workflows/e2e-wip.yml +++ b/.github/workflows/e2e-wip.yml @@ -6,9 +6,6 @@ on: jobs: canary-ci: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: tylersayshi/waku/.github/workflows/e2e.yml@canary-ci-again - with: - react_version: 'canary' + uses: tylersayshi/waku/.github/workflows/e2e.yml@canary-ci-again + with: + react_version: 'canary' From f654a45d752cf755580399640cd6f98bced0d368 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 13:18:43 -0500 Subject: [PATCH 17/35] add devDeps so they're updatable --- packages/waku/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/waku/package.json b/packages/waku/package.json index 03b7aa60c..afb852d00 100644 --- a/packages/waku/package.json +++ b/packages/waku/package.json @@ -97,6 +97,9 @@ "devDependencies": { "@netlify/functions": "^3.0.0", "@swc/cli": "^0.5.2", + "react": "19.0.0", + "react-dom": "19.0.0", + "react-server-dom-webpack": "19.0.0", "rollup": "^4.29.1", "ts-expect": "^1.3.0", "vitest": "3.0.0-beta.3" From 0f88714078a6d0bf027d3f7c6b2b1b58d6857fc6 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 13:19:30 -0500 Subject: [PATCH 18/35] update lock --- pnpm-lock.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f57ec389c..7aebd1950 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1154,7 +1154,7 @@ importers: version: 7.4.3 tsup: specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.10.4)(jiti@2.4.2)(postcss@8.4.49)(typescript@5.7.2)(yaml@2.7.0) + version: 8.3.5(@swc/core@1.10.4(@swc/helpers@0.5.15))(jiti@2.4.2)(postcss@8.4.49)(typescript@5.7.2)(yaml@2.7.0) update-check: specifier: ^1.5.4 version: 1.5.4 @@ -1176,15 +1176,6 @@ importers: hono: specifier: 4.6.15 version: 4.6.15 - react: - specifier: ~19.0.0 - version: 19.0.0 - react-dom: - specifier: ~19.0.0 - version: 19.0.0(react@19.0.0) - react-server-dom-webpack: - specifier: ~19.0.0 - version: 19.0.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(webpack@5.97.1(@swc/core@1.10.4(@swc/helpers@0.5.15))) rsc-html-stream: specifier: 0.0.4 version: 0.0.4 @@ -1198,6 +1189,15 @@ importers: '@swc/cli': specifier: ^0.5.2 version: 0.5.2(@swc/core@1.10.4(@swc/helpers@0.5.15))(chokidar@3.6.0) + react: + specifier: 19.0.0 + version: 19.0.0 + react-dom: + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) + react-server-dom-webpack: + specifier: 19.0.0 + version: 19.0.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(webpack@5.97.1(@swc/core@1.10.4(@swc/helpers@0.5.15))) rollup: specifier: ^4.29.1 version: 4.29.1 @@ -8039,7 +8039,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.19.0(eslint@9.17.0(jiti@2.4.2))(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0)(eslint@9.17.0(jiti@2.4.2)))(eslint@9.17.0(jiti@2.4.2)): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.19.0(eslint@9.17.0(jiti@2.4.2))(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0)(eslint@9.17.0(jiti@2.4.2)): dependencies: debug: 3.2.7 optionalDependencies: @@ -8061,7 +8061,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.17.0(jiti@2.4.2) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.19.0(eslint@9.17.0(jiti@2.4.2))(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0)(eslint@9.17.0(jiti@2.4.2)))(eslint@9.17.0(jiti@2.4.2)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.19.0(eslint@9.17.0(jiti@2.4.2))(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0)(eslint@9.17.0(jiti@2.4.2)) hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 @@ -10319,7 +10319,7 @@ snapshots: tslib@2.8.1: {} - tsup@8.3.5(@swc/core@1.10.4)(jiti@2.4.2)(postcss@8.4.49)(typescript@5.7.2)(yaml@2.7.0): + tsup@8.3.5(@swc/core@1.10.4(@swc/helpers@0.5.15))(jiti@2.4.2)(postcss@8.4.49)(typescript@5.7.2)(yaml@2.7.0): dependencies: bundle-require: 5.1.0(esbuild@0.24.2) cac: 6.7.14 From ddea97ef17ef4169cc104959ae399aeac317f2be Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 13:36:41 -0500 Subject: [PATCH 19/35] update canary e2e reference and if --- .github/workflows/canary-e2e.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/canary-e2e.yml b/.github/workflows/canary-e2e.yml index fd9337fb9..689d1f0ec 100644 --- a/.github/workflows/canary-e2e.yml +++ b/.github/workflows/canary-e2e.yml @@ -6,9 +6,7 @@ on: jobs: canary-ci: - runs-on: ubuntu-latest if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} - steps: - - uses: ./.github/workflows/e2e.yml - with: - react_version: 'canary' + uses: dai-shi/waku/.github/workflows/e2e.yml@main + with: + react_version: 'canary' \ No newline at end of file From efe975f747567f31e494e2dc358b3259345acc1e Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Fri, 3 Jan 2025 19:17:45 -0500 Subject: [PATCH 20/35] cleanup --- .github/workflows/e2e-wip.yml | 11 ----------- .github/workflows/e2e.yml | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .github/workflows/e2e-wip.yml diff --git a/.github/workflows/e2e-wip.yml b/.github/workflows/e2e-wip.yml deleted file mode 100644 index 3d13ac698..000000000 --- a/.github/workflows/e2e-wip.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: E2E WIP - Test Canary - -on: - pull_request: - types: [synchronize] - -jobs: - canary-ci: - uses: tylersayshi/waku/.github/workflows/e2e.yml@canary-ci-again - with: - react_version: 'canary' diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index d00d73e77..dbcfd460f 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -9,7 +9,7 @@ on: - 'e2e/**' - '.github/workflows/e2e.yml' pull_request: - types: [opened] # todo add synchronize + types: [opened, synchronize] paths: - 'packages/**' - 'examples/**' From 89238dbc477f8a6461929fbf6057aa1f988505df Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 5 Jan 2025 13:15:19 -0500 Subject: [PATCH 21/35] wip test for ./ path to uses template --- .github/workflows/canary-e2e.yml | 2 +- .github/workflows/canary-wip.yml | 11 +++++++++++ .github/workflows/e2e.yml | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/canary-wip.yml diff --git a/.github/workflows/canary-e2e.yml b/.github/workflows/canary-e2e.yml index 689d1f0ec..e0a15ede5 100644 --- a/.github/workflows/canary-e2e.yml +++ b/.github/workflows/canary-e2e.yml @@ -7,6 +7,6 @@ on: jobs: canary-ci: if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} - uses: dai-shi/waku/.github/workflows/e2e.yml@main + uses: ./.github/workflows/e2e.yml with: react_version: 'canary' \ No newline at end of file diff --git a/.github/workflows/canary-wip.yml b/.github/workflows/canary-wip.yml new file mode 100644 index 000000000..4776cab95 --- /dev/null +++ b/.github/workflows/canary-wip.yml @@ -0,0 +1,11 @@ +name: Canary CI Test WIP + +on: + pull_request: + types: [synchronize] + +jobs: + canary-ci: + uses: ./.github/workflows/e2e.yml + with: + react_version: 'canary' \ No newline at end of file diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index dbcfd460f..373cff635 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -9,7 +9,7 @@ on: - 'e2e/**' - '.github/workflows/e2e.yml' pull_request: - types: [opened, synchronize] + types: [opened] paths: - 'packages/**' - 'examples/**' From 782a5cbd398b0df2cf0222082497e075c053ded2 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 5 Jan 2025 13:47:20 -0800 Subject: [PATCH 22/35] unit tests too --- .github/workflows/canary-e2e.yml | 7 ++++++- .github/workflows/canary-wip.yml | 4 ++++ .github/workflows/e2e.yml | 2 +- .github/workflows/test.yml | 12 ++++++++++-- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.github/workflows/canary-e2e.yml b/.github/workflows/canary-e2e.yml index e0a15ede5..ed1dbce11 100644 --- a/.github/workflows/canary-e2e.yml +++ b/.github/workflows/canary-e2e.yml @@ -5,8 +5,13 @@ on: types: [created] jobs: - canary-ci: + canary-ci-e2e: if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} uses: ./.github/workflows/e2e.yml + with: + react_version: 'canary' + canary-ci-test: + if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} + uses: ./.github/workflows/test.yml with: react_version: 'canary' \ No newline at end of file diff --git a/.github/workflows/canary-wip.yml b/.github/workflows/canary-wip.yml index 4776cab95..c0237fe1e 100644 --- a/.github/workflows/canary-wip.yml +++ b/.github/workflows/canary-wip.yml @@ -7,5 +7,9 @@ on: jobs: canary-ci: uses: ./.github/workflows/e2e.yml + with: + react_version: 'canary' + canary-ci-test: + uses: ./.github/workflows/test.yml with: react_version: 'canary' \ No newline at end of file diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 373cff635..a7acec242 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -18,7 +18,7 @@ on: workflow_call: inputs: react_version: - required: false + required: true type: string concurrency: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index de5865654..550de994c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,11 @@ on: branches: [main] pull_request: types: [opened, synchronize] + workflow_call: + inputs: + react_version: + required: true + type: string concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -24,6 +29,9 @@ jobs: - uses: actions/setup-node@v4 with: node-version: ${{ matrix.version }} - cache: 'pnpm' - - run: pnpm install + cache: ${{ !inputs.react_version && 'pnpm' || '' }} + - if: ${{ inputs.react_version }} + run: | + pnpm -r update react@${{ inputs.react_version }} react-dom@${{ inputs.react_version }} react-server-dom-webpack@${{ inputs.react_version }} + - run: pnpm install --frozen-lockfile - run: pnpm test From ccd82b29a3f5bb7fc3a367559d9631aaff7596bf Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 5 Jan 2025 14:56:55 -0800 Subject: [PATCH 23/35] update filename and parse version --- .github/workflows/canary-ci.yml | 35 ++++++++++++++++++++++++++++++++ .github/workflows/canary-e2e.yml | 17 ---------------- .github/workflows/canary-wip.yml | 15 -------------- 3 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/canary-ci.yml delete mode 100644 .github/workflows/canary-e2e.yml delete mode 100644 .github/workflows/canary-wip.yml diff --git a/.github/workflows/canary-ci.yml b/.github/workflows/canary-ci.yml new file mode 100644 index 000000000..2d08d1003 --- /dev/null +++ b/.github/workflows/canary-ci.yml @@ -0,0 +1,35 @@ +name: Canary CI + +on: + issue_comment: + types: [created] + +jobs: + parse-version: + if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} + runs-on: ubuntu-latest + outputs: + react_version: ${{ steps.get-version.outputs.react_version }} + steps: + - name: Get React version from comment + id: get-version + run: | + comment="${{ github.event.comment.body }}" + # Extract version after '/canary-ci run', defaulting to 'canary' if not specified + version=$(echo "$comment" | sed -n 's/^\/canary-ci run\s*\(\S*\).*/\1/p') + if [ -z "$version" ]; then + version="canary" + fi + echo "react_version=$version" >> $GITHUB_OUTPUT + + canary-ci-e2e: + needs: parse-version + uses: ./.github/workflows/e2e.yml + with: + react_version: ${{ needs.parse-version.outputs.react_version }} + + canary-ci-test: + needs: parse-version + uses: ./.github/workflows/test.yml + with: + react_version: ${{ needs.parse-version.outputs.react_version }} \ No newline at end of file diff --git a/.github/workflows/canary-e2e.yml b/.github/workflows/canary-e2e.yml deleted file mode 100644 index ed1dbce11..000000000 --- a/.github/workflows/canary-e2e.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Canary CI - -on: - issue_comment: - types: [created] - -jobs: - canary-ci-e2e: - if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} - uses: ./.github/workflows/e2e.yml - with: - react_version: 'canary' - canary-ci-test: - if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} - uses: ./.github/workflows/test.yml - with: - react_version: 'canary' \ No newline at end of file diff --git a/.github/workflows/canary-wip.yml b/.github/workflows/canary-wip.yml deleted file mode 100644 index c0237fe1e..000000000 --- a/.github/workflows/canary-wip.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Canary CI Test WIP - -on: - pull_request: - types: [synchronize] - -jobs: - canary-ci: - uses: ./.github/workflows/e2e.yml - with: - react_version: 'canary' - canary-ci-test: - uses: ./.github/workflows/test.yml - with: - react_version: 'canary' \ No newline at end of file From 96efb27ee19b75ad21ac6a597b184592d40add89 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 5 Jan 2025 14:58:04 -0800 Subject: [PATCH 24/35] fix --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index a7acec242..e280276fc 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -9,7 +9,7 @@ on: - 'e2e/**' - '.github/workflows/e2e.yml' pull_request: - types: [opened] + types: [opened, synchronize] paths: - 'packages/**' - 'examples/**' From 96f7745d77e7a431cde6f6c6750f2ff22b6910b2 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 5 Jan 2025 20:35:09 -0800 Subject: [PATCH 25/35] review --- .github/workflows/canary-ci.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/canary-ci.yml b/.github/workflows/canary-ci.yml index 2d08d1003..bd16aca8c 100644 --- a/.github/workflows/canary-ci.yml +++ b/.github/workflows/canary-ci.yml @@ -32,4 +32,4 @@ jobs: needs: parse-version uses: ./.github/workflows/test.yml with: - react_version: ${{ needs.parse-version.outputs.react_version }} \ No newline at end of file + react_version: ${{ needs.parse-version.outputs.react_version }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 550de994c..3a73f4e0b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,5 +33,5 @@ jobs: - if: ${{ inputs.react_version }} run: | pnpm -r update react@${{ inputs.react_version }} react-dom@${{ inputs.react_version }} react-server-dom-webpack@${{ inputs.react_version }} - - run: pnpm install --frozen-lockfile + - run: pnpm install - run: pnpm test From a573938e25db8b37eac5554e9d6e64fe254b0bb6 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 12 Jan 2025 17:40:57 -0800 Subject: [PATCH 26/35] test with canary again and remove output --- .github/workflows/canary-ci-wip.yml | 11 +++++++++++ .github/workflows/canary-ci.yml | 2 -- .github/workflows/e2e.yml | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/canary-ci-wip.yml diff --git a/.github/workflows/canary-ci-wip.yml b/.github/workflows/canary-ci-wip.yml new file mode 100644 index 000000000..131c03d2d --- /dev/null +++ b/.github/workflows/canary-ci-wip.yml @@ -0,0 +1,11 @@ +name: E2E WIP - Test Canary + +on: + pull_request: + types: [synchronize] + +jobs: + canary-ci: + uses: tylersayshi/waku/.github/workflows/e2e.yml@canary-ci-again + with: + react_version: 'canary' \ No newline at end of file diff --git a/.github/workflows/canary-ci.yml b/.github/workflows/canary-ci.yml index bd16aca8c..d3d27175a 100644 --- a/.github/workflows/canary-ci.yml +++ b/.github/workflows/canary-ci.yml @@ -8,8 +8,6 @@ jobs: parse-version: if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/canary-ci run') }} runs-on: ubuntu-latest - outputs: - react_version: ${{ steps.get-version.outputs.react_version }} steps: - name: Get React version from comment id: get-version diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index e280276fc..a7acec242 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -9,7 +9,7 @@ on: - 'e2e/**' - '.github/workflows/e2e.yml' pull_request: - types: [opened, synchronize] + types: [opened] paths: - 'packages/**' - 'examples/**' From 614bf3a4cc83aa1a4547ab05063be83091586199 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 12 Jan 2025 17:50:37 -0800 Subject: [PATCH 27/35] try beta --- .github/workflows/canary-ci-wip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/canary-ci-wip.yml b/.github/workflows/canary-ci-wip.yml index 131c03d2d..c3600ff9e 100644 --- a/.github/workflows/canary-ci-wip.yml +++ b/.github/workflows/canary-ci-wip.yml @@ -8,4 +8,4 @@ jobs: canary-ci: uses: tylersayshi/waku/.github/workflows/e2e.yml@canary-ci-again with: - react_version: 'canary' \ No newline at end of file + react_version: 'beta' \ No newline at end of file From 7cbe07ef875795d841bea8137c7d96a08086cfa8 Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 12 Jan 2025 18:34:07 -0800 Subject: [PATCH 28/35] try old canary --- .github/workflows/canary-ci-wip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/canary-ci-wip.yml b/.github/workflows/canary-ci-wip.yml index c3600ff9e..d0c8a52b5 100644 --- a/.github/workflows/canary-ci-wip.yml +++ b/.github/workflows/canary-ci-wip.yml @@ -8,4 +8,4 @@ jobs: canary-ci: uses: tylersayshi/waku/.github/workflows/e2e.yml@canary-ci-again with: - react_version: 'beta' \ No newline at end of file + react_version: '19.0.0-rc-372ec00c-20241209' \ No newline at end of file From 074b6b2c253a07846d6e43a70e3ca5d9b371b76a Mon Sep 17 00:00:00 2001 From: Tyler <26290074+thegitduck@users.noreply.github.com> Date: Sun, 12 Jan 2025 22:23:03 -0800 Subject: [PATCH 29/35] try rc.1 --- .github/workflows/canary-ci-wip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/canary-ci-wip.yml b/.github/workflows/canary-ci-wip.yml index d0c8a52b5..6c3ae1479 100644 --- a/.github/workflows/canary-ci-wip.yml +++ b/.github/workflows/canary-ci-wip.yml @@ -8,4 +8,4 @@ jobs: canary-ci: uses: tylersayshi/waku/.github/workflows/e2e.yml@canary-ci-again with: - react_version: '19.0.0-rc-372ec00c-20241209' \ No newline at end of file + react_version: '19.0.0-rc.1' \ No newline at end of file From be729c7696562da084de12e0dc5549b4a215dcf0 Mon Sep 17 00:00:00 2001 From: daishi Date: Mon, 13 Jan 2025 18:32:02 +0900 Subject: [PATCH 30/35] fix e2e utils --- e2e/utils.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/e2e/utils.ts b/e2e/utils.ts index f369eb0bf..a886f8a2f 100644 --- a/e2e/utils.ts +++ b/e2e/utils.ts @@ -139,7 +139,7 @@ export const prepareNormalSetup = (fixtureName: string) => { }; const PACKAGE_INSTALL = { - npm: (path: string) => `npm add ${path}`, + npm: (path: string) => `npm add --force ${path}`, pnpm: (path: string) => `pnpm add ${path}`, yarn: (path: string) => `yarn add ${path}`, } as const; @@ -172,14 +172,13 @@ export const prepareStandaloneSetup = (fixtureName: string) => { }); execSync(`pnpm pack --pack-destination ${standaloneDir}`, { cwd: wakuDir, - stdio: 'inherit', }); const wakuPackageTgz = join(standaloneDir, `waku-${version}.tgz`); const installScript = PACKAGE_INSTALL[packageManager](wakuPackageTgz); - execSync(installScript, { cwd: standaloneDir, stdio: 'inherit' }); + execSync(installScript, { cwd: standaloneDir }); execSync( `npm install --force ${join(standaloneDir, `waku-${version}.tgz`)}`, - { cwd: standaloneDir, stdio: 'inherit' }, + { cwd: standaloneDir }, ); } if (mode !== 'DEV' && !built) { From ca141b8107b931b544948bca54e17edf47642e31 Mon Sep 17 00:00:00 2001 From: daishi Date: Mon, 13 Jan 2025 20:59:20 +0900 Subject: [PATCH 31/35] now let us try this --- .github/workflows/canary-ci-wip.yml | 2 +- packages/waku/package.json | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/canary-ci-wip.yml b/.github/workflows/canary-ci-wip.yml index 6c3ae1479..3d13ac698 100644 --- a/.github/workflows/canary-ci-wip.yml +++ b/.github/workflows/canary-ci-wip.yml @@ -8,4 +8,4 @@ jobs: canary-ci: uses: tylersayshi/waku/.github/workflows/e2e.yml@canary-ci-again with: - react_version: '19.0.0-rc.1' \ No newline at end of file + react_version: 'canary' diff --git a/packages/waku/package.json b/packages/waku/package.json index a9bde01c8..c512d86f9 100644 --- a/packages/waku/package.json +++ b/packages/waku/package.json @@ -97,9 +97,6 @@ "devDependencies": { "@netlify/functions": "^3.0.0", "@swc/cli": "^0.6.0", - "react": "19.0.0", - "react-dom": "19.0.0", - "react-server-dom-webpack": "19.0.0", "rollup": "^4.30.1", "ts-expect": "^1.3.0", "vitest": "3.0.0-beta.3" From a55413ab63377a3172ad56187d57206439c0414d Mon Sep 17 00:00:00 2001 From: daishi Date: Mon, 13 Jan 2025 21:01:55 +0900 Subject: [PATCH 32/35] update lockfile --- pnpm-lock.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ce165124a..9b8c83350 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1184,7 +1184,7 @@ importers: version: 7.4.3 tsup: specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.10.7(@swc/helpers@0.5.15))(jiti@2.4.2)(postcss@8.4.49)(typescript@5.7.3)(yaml@2.7.0) + version: 8.3.5(@swc/core@1.10.7)(jiti@2.4.2)(postcss@8.4.49)(typescript@5.7.3)(yaml@2.7.0) update-check: specifier: ^1.5.4 version: 1.5.4 @@ -1206,6 +1206,15 @@ importers: hono: specifier: 4.6.16 version: 4.6.16 + react: + specifier: ~19.0.0 + version: 19.0.0 + react-dom: + specifier: ~19.0.0 + version: 19.0.0(react@19.0.0) + react-server-dom-webpack: + specifier: ~19.0.0 + version: 19.0.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(webpack@5.97.1(@swc/core@1.10.7(@swc/helpers@0.5.15))) rsc-html-stream: specifier: 0.0.4 version: 0.0.4 @@ -1219,15 +1228,6 @@ importers: '@swc/cli': specifier: ^0.6.0 version: 0.6.0(@swc/core@1.10.7(@swc/helpers@0.5.15))(chokidar@4.0.3) - react: - specifier: 19.0.0 - version: 19.0.0 - react-dom: - specifier: 19.0.0 - version: 19.0.0(react@19.0.0) - react-server-dom-webpack: - specifier: 19.0.0 - version: 19.0.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(webpack@5.97.1(@swc/core@1.10.7(@swc/helpers@0.5.15))) rollup: specifier: ^4.30.1 version: 4.30.1 @@ -9383,7 +9383,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.19.1(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0)(eslint@9.18.0(jiti@2.4.2)): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.19.1(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0)(eslint@9.18.0(jiti@2.4.2)))(eslint@9.18.0(jiti@2.4.2)): dependencies: debug: 3.2.7 optionalDependencies: @@ -9405,7 +9405,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.18.0(jiti@2.4.2) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.19.1(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0)(eslint@9.18.0(jiti@2.4.2)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.19.1(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0)(eslint@9.18.0(jiti@2.4.2)))(eslint@9.18.0(jiti@2.4.2)) hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 @@ -10826,7 +10826,7 @@ snapshots: pkg-types@1.2.1: dependencies: confbox: 0.1.8 - mlly: 1.7.2 + mlly: 1.7.3 pathe: 1.1.2 pkg-types@1.3.0: @@ -11699,7 +11699,7 @@ snapshots: tslib@2.8.1: {} - tsup@8.3.5(@swc/core@1.10.7(@swc/helpers@0.5.15))(jiti@2.4.2)(postcss@8.4.49)(typescript@5.7.3)(yaml@2.7.0): + tsup@8.3.5(@swc/core@1.10.7)(jiti@2.4.2)(postcss@8.4.49)(typescript@5.7.3)(yaml@2.7.0): dependencies: bundle-require: 5.1.0(esbuild@0.24.2) cac: 6.7.14 From 4b9e3fa6f6a2adfe5bd3ec523f0ac8ff02641b30 Mon Sep 17 00:00:00 2001 From: daishi Date: Mon, 13 Jan 2025 21:30:06 +0900 Subject: [PATCH 33/35] no it does not, it is a different issue --- packages/waku/package.json | 3 +++ pnpm-lock.yaml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/waku/package.json b/packages/waku/package.json index c512d86f9..a9bde01c8 100644 --- a/packages/waku/package.json +++ b/packages/waku/package.json @@ -97,6 +97,9 @@ "devDependencies": { "@netlify/functions": "^3.0.0", "@swc/cli": "^0.6.0", + "react": "19.0.0", + "react-dom": "19.0.0", + "react-server-dom-webpack": "19.0.0", "rollup": "^4.30.1", "ts-expect": "^1.3.0", "vitest": "3.0.0-beta.3" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9b8c83350..f49aab809 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1206,15 +1206,6 @@ importers: hono: specifier: 4.6.16 version: 4.6.16 - react: - specifier: ~19.0.0 - version: 19.0.0 - react-dom: - specifier: ~19.0.0 - version: 19.0.0(react@19.0.0) - react-server-dom-webpack: - specifier: ~19.0.0 - version: 19.0.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(webpack@5.97.1(@swc/core@1.10.7(@swc/helpers@0.5.15))) rsc-html-stream: specifier: 0.0.4 version: 0.0.4 @@ -1228,6 +1219,15 @@ importers: '@swc/cli': specifier: ^0.6.0 version: 0.6.0(@swc/core@1.10.7(@swc/helpers@0.5.15))(chokidar@4.0.3) + react: + specifier: 19.0.0 + version: 19.0.0 + react-dom: + specifier: 19.0.0 + version: 19.0.0(react@19.0.0) + react-server-dom-webpack: + specifier: 19.0.0 + version: 19.0.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(webpack@5.97.1(@swc/core@1.10.7(@swc/helpers@0.5.15))) rollup: specifier: ^4.30.1 version: 4.30.1 From 5ac6ad6399231c7473cda67b3338bc229fae5ccb Mon Sep 17 00:00:00 2001 From: daishi Date: Mon, 13 Jan 2025 21:47:29 +0900 Subject: [PATCH 34/35] try dec 16 canary --- .github/workflows/canary-ci-wip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/canary-ci-wip.yml b/.github/workflows/canary-ci-wip.yml index 3d13ac698..3f5553236 100644 --- a/.github/workflows/canary-ci-wip.yml +++ b/.github/workflows/canary-ci-wip.yml @@ -8,4 +8,4 @@ jobs: canary-ci: uses: tylersayshi/waku/.github/workflows/e2e.yml@canary-ci-again with: - react_version: 'canary' + react_version: '19.0.0-rc-7283a213-20241206' From 8604d89cab8db6cefc11af908b922eea82146827 Mon Sep 17 00:00:00 2001 From: daishi Date: Mon, 13 Jan 2025 22:08:42 +0900 Subject: [PATCH 35/35] revert wip things --- .github/workflows/canary-ci-wip.yml | 11 ----------- .github/workflows/e2e.yml | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 .github/workflows/canary-ci-wip.yml diff --git a/.github/workflows/canary-ci-wip.yml b/.github/workflows/canary-ci-wip.yml deleted file mode 100644 index 3f5553236..000000000 --- a/.github/workflows/canary-ci-wip.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: E2E WIP - Test Canary - -on: - pull_request: - types: [synchronize] - -jobs: - canary-ci: - uses: tylersayshi/waku/.github/workflows/e2e.yml@canary-ci-again - with: - react_version: '19.0.0-rc-7283a213-20241206' diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 157531390..5b4a41b3e 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -9,7 +9,7 @@ on: - 'e2e/**' - '.github/workflows/e2e.yml' pull_request: - types: [opened] + types: [opened, synchronize] paths: - 'packages/**' - 'examples/**'