From d27c564732e301ed27b1ab7d866944c7f6d110a1 Mon Sep 17 00:00:00 2001 From: samcx Date: Tue, 11 Jun 2024 11:56:16 -0700 Subject: [PATCH 1/4] chore: bump turbo to 2.0.3 --- .github/workflows/build_and_deploy.yml | 2 +- .github/workflows/build_and_test.yml | 2 +- .github/workflows/build_reusable.yml | 2 +- .github/workflows/code_freeze.yml | 2 +- .github/workflows/pull_request_stats.yml | 2 +- .../workflows/test_e2e_deploy_scheduled.yml | 6 +-- .github/workflows/trigger_release.yml | 2 +- package.json | 2 +- packages/next-swc/turbo.json | 2 +- pnpm-lock.yaml | 46 +++++++++---------- turbo.json | 3 +- 11 files changed, 35 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index d3781cf285419..887edf7030212 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -7,7 +7,7 @@ on: env: NAPI_CLI_VERSION: 2.16.2 - TURBO_VERSION: 1.13.3-canary.2 + TURBO_VERSION: 2.0.3 NODE_LTS_VERSION: 20 CARGO_PROFILE_RELEASE_LTO: 'true' TURBO_TEAM: 'vercel' diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 4a306d1773f45..45c44ba508571 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -8,7 +8,7 @@ on: env: NAPI_CLI_VERSION: 2.14.7 - TURBO_VERSION: 1.13.3-canary.2 + TURBO_VERSION: 2.0.3 NODE_MAINTENANCE_VERSION: 18 NODE_LTS_VERSION: 20 TEST_CONCURRENCY: 8 diff --git a/.github/workflows/build_reusable.yml b/.github/workflows/build_reusable.yml index 6cc1bc92c6c82..20acc77a2f004 100644 --- a/.github/workflows/build_reusable.yml +++ b/.github/workflows/build_reusable.yml @@ -52,7 +52,7 @@ on: env: NAPI_CLI_VERSION: 2.14.7 - TURBO_VERSION: 1.13.3-canary.2 + TURBO_VERSION: 2.0.3 NODE_LTS_VERSION: 20.9.0 TEST_CONCURRENCY: 8 # disable backtrace for test snapshots diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml index 5d005b1086350..8517359ac6100 100644 --- a/.github/workflows/code_freeze.yml +++ b/.github/workflows/code_freeze.yml @@ -17,7 +17,7 @@ name: Code Freeze env: NAPI_CLI_VERSION: 2.14.7 - TURBO_VERSION: 1.13.3-canary.2 + TURBO_VERSION: 2.0.3 NODE_LTS_VERSION: 20 jobs: diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml index 64a4a3b65a992..d970f7a6a9490 100644 --- a/.github/workflows/pull_request_stats.yml +++ b/.github/workflows/pull_request_stats.yml @@ -6,7 +6,7 @@ name: Generate Pull Request Stats env: NAPI_CLI_VERSION: 2.14.7 - TURBO_VERSION: 1.13.3-canary.2 + TURBO_VERSION: 2.0.3 NODE_LTS_VERSION: 20 TEST_CONCURRENCY: 6 diff --git a/.github/workflows/test_e2e_deploy_scheduled.yml b/.github/workflows/test_e2e_deploy_scheduled.yml index 02729a8c4a7ce..d9aab09f09f49 100644 --- a/.github/workflows/test_e2e_deploy_scheduled.yml +++ b/.github/workflows/test_e2e_deploy_scheduled.yml @@ -26,7 +26,7 @@ jobs: TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }} TURBO_REMOTE_ONLY: 'true' TURBO_TEAM: 'vercel' - TURBO_VERSION: 1.13.3-canary.2 + TURBO_VERSION: 2.0.3 VERCEL_TEST_TEAM: vtest314-next-e2e-tests VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }} @@ -60,11 +60,11 @@ jobs: - name: Run tests run: | docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.41.2-jammy /bin/bash -c "cd /work && \ - NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \ + NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \ corepack enable > /dev/null && \ NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \ DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \ - DD_ENV=${{ env.DD_ENV }} \ + DD_ENV=${{ env.DD_ENV }} \ VERCEL_TEST_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \ VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \ NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \ diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml index d961f14795226..6fbd15189a539 100644 --- a/.github/workflows/trigger_release.yml +++ b/.github/workflows/trigger_release.yml @@ -35,7 +35,7 @@ name: Trigger Release env: NAPI_CLI_VERSION: 2.14.7 - TURBO_VERSION: 1.13.3-canary.2 + TURBO_VERSION: 2.0.3 NODE_LTS_VERSION: 20 jobs: diff --git a/package.json b/package.json index 07c9d84f46acd..6ce8823941c29 100644 --- a/package.json +++ b/package.json @@ -232,7 +232,7 @@ "taskr": "1.1.0", "tree-kill": "1.2.2", "tsec": "0.2.1", - "turbo": "1.13.3-canary.2", + "turbo": "2.0.3", "typescript": "5.3.3", "unfetch": "4.2.0", "wait-port": "0.2.2", diff --git a/packages/next-swc/turbo.json b/packages/next-swc/turbo.json index f811943d1a917..b30afd28e2694 100644 --- a/packages/next-swc/turbo.json +++ b/packages/next-swc/turbo.json @@ -1,6 +1,6 @@ { "extends": ["//"], - "pipeline": { + "tasks": { "build-native": { "inputs": [ "../../.cargo/**", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2b5fe5bd0adc3..71a61880c3079 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -546,8 +546,8 @@ importers: specifier: 0.2.1 version: 0.2.1(@bazel/bazelisk@1.18.0)(typescript@5.3.3) turbo: - specifier: 1.13.3-canary.2 - version: 1.13.3-canary.2 + specifier: 2.0.3 + version: 2.0.3 typescript: specifier: 5.3.3 version: 5.3.3 @@ -14347,7 +14347,7 @@ packages: engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.1.1 + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -24347,64 +24347,64 @@ packages: engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'} dev: true - /turbo-darwin-64@1.13.3-canary.2: - resolution: {integrity: sha512-M8QDR6SKPSLEjSLWnIM//caHWBhcZNkIPdnnMkHm8R9/fpFSI5X//GBdR0qnXcgdqOdFgnxheabwYm5Bm+1KWQ==} + /turbo-darwin-64@2.0.3: + resolution: {integrity: sha512-v7ztJ8sxdHw3SLfO2MhGFeeU4LQhFii1hIGs9uBiXns/0YTGOvxLeifnfGqhfSrAIIhrCoByXO7nR9wlm10n3Q==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.13.3-canary.2: - resolution: {integrity: sha512-4RpdYK+XF9Lx7/nmUzbn978t4HBCmmemAazOjmhyd0pOMn8rLVexPkByDEV84SrgofkCWdTHDwcHaOQvOLrKtw==} + /turbo-darwin-arm64@2.0.3: + resolution: {integrity: sha512-LUcqvkV9Bxtng6QHbevp8IK8zzwbIxM6HMjCE7FEW6yJBN1KwvTtRtsGBwwmTxaaLO0wD1Jgl3vgkXAmQ4fqUw==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.13.3-canary.2: - resolution: {integrity: sha512-8gzyPtOmzACNwtWi5//ZHwcJb2i21pZVXQEiNwTycypyBtV2H0WChmqjulS7M3z5dxwHcx0Ehf9TqY4K023j2A==} + /turbo-linux-64@2.0.3: + resolution: {integrity: sha512-xpdY1suXoEbsQsu0kPep2zrB8ijv/S5aKKrntGuQ62hCiwDFoDcA/Z7FZ8IHQ2u+dpJARa7yfiByHmizFE0r5Q==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.13.3-canary.2: - resolution: {integrity: sha512-QzRIyO+HUMc5+hj5cVBCKpCyOiBPxzAao4zWZgz6iKMuSC6utjHLf/9AAo6NOMFgBONTYsMUArL5gDyLLOO0lw==} + /turbo-linux-arm64@2.0.3: + resolution: {integrity: sha512-MBACTcSR874L1FtLL7gkgbI4yYJWBUCqeBN/iE29D+8EFe0d3fAyviFlbQP4K/HaDYet1i26xkkOiWr0z7/V9A==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.13.3-canary.2: - resolution: {integrity: sha512-s4k+yclLr/MWuwYURPZX2v6y1PP7E2aUUao6syQ68Un+36RYBgINN/VV4HucZuiXyqLuBuaDjfrnE1TX3FREOg==} + /turbo-windows-64@2.0.3: + resolution: {integrity: sha512-zi3YuKPkM9JxMTshZo3excPk37hUrj5WfnCqh4FjI26ux6j/LJK+Dh3SebMHd9mR7wP9CMam4GhmLCT+gDfM+w==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.13.3-canary.2: - resolution: {integrity: sha512-p5qGGeb3z1Gaxq43lTFm/PyTh7xtuDCfesxGWZWESG6MyXZuZYzuEH2cSmM8jqta6EC+G+iF5sxeKUzIpsJWeQ==} + /turbo-windows-arm64@2.0.3: + resolution: {integrity: sha512-wmed4kkenLvRbidi7gISB4PU77ujBuZfgVGDZ4DXTFslE/kYpINulwzkVwJIvNXsJtHqyOq0n6jL8Zwl3BrwDg==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.13.3-canary.2: - resolution: {integrity: sha512-GqkwRxoigbjvj/m1JfY7kGDupNeuADW7Hg1+rO+KqNMEUihOfq8a1kjCbwlqOfyS8PPfMHDkDPXrfhA8A1N9vg==} + /turbo@2.0.3: + resolution: {integrity: sha512-jF1K0tTUyryEWmgqk1V0ALbSz3VdeZ8FXUo6B64WsPksCMCE48N5jUezGOH2MN0+epdaRMH8/WcPU0QQaVfeLA==} hasBin: true optionalDependencies: - turbo-darwin-64: 1.13.3-canary.2 - turbo-darwin-arm64: 1.13.3-canary.2 - turbo-linux-64: 1.13.3-canary.2 - turbo-linux-arm64: 1.13.3-canary.2 - turbo-windows-64: 1.13.3-canary.2 - turbo-windows-arm64: 1.13.3-canary.2 + turbo-darwin-64: 2.0.3 + turbo-darwin-arm64: 2.0.3 + turbo-linux-64: 2.0.3 + turbo-linux-arm64: 2.0.3 + turbo-windows-64: 2.0.3 + turbo-windows-arm64: 2.0.3 dev: true /tweetnacl@0.14.5: diff --git a/turbo.json b/turbo.json index 3ee8c97f8f7bc..0cb4370968adb 100644 --- a/turbo.json +++ b/turbo.json @@ -1,7 +1,6 @@ { "$schema": "https://turborepo.org/schema.json", - "experimentalUI": true, - "pipeline": { + "tasks": { "build": { "dependsOn": ["^build"], "outputs": ["dist/**"] From e6f67f45b806826ab7be6860b4c8563af88f9726 Mon Sep 17 00:00:00 2001 From: samcx Date: Tue, 11 Jun 2024 12:02:21 -0700 Subject: [PATCH 2/4] chore: add packageManager to package.jsons --- packages/create-next-app/package.json | 6 ++++-- packages/next/package.json | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json index acc47eb880e53..c5cab4fad02e6 100644 --- a/packages/create-next-app/package.json +++ b/packages/create-next-app/package.json @@ -51,6 +51,8 @@ "validate-npm-package-name": "5.0.1" }, "engines": { - "node": ">=18.17.0" - } + "node": ">=18.17.0", + "pnpm": "8.15.7" + }, + "packageManager": "pnpm@8.15.7" } diff --git a/packages/next/package.json b/packages/next/package.json index 6bcdf71ce10e1..ebcad6caa7c06 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -344,6 +344,8 @@ "vercel" ], "engines": { - "node": ">=18.17.0" - } + "node": ">=18.17.0", + "pnpm": "8.15.7" + }, + "packageManager": "pnpm@8.15.7" } From f82d1718447329c8d5bd04b44ff2034e562f94e3 Mon Sep 17 00:00:00 2001 From: samcx Date: Tue, 11 Jun 2024 12:11:40 -0700 Subject: [PATCH 3/4] chore: add packageManager to package.jsons --- scripts/normalize-version-bump.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/normalize-version-bump.js b/scripts/normalize-version-bump.js index e13eb4b8928fb..25bcd42519483 100755 --- a/scripts/normalize-version-bump.js +++ b/scripts/normalize-version-bump.js @@ -72,5 +72,6 @@ const writeJson = async (filePath, data) => private: true, workspaces: ['packages/*'], scripts: {}, + packageManager: 'pnpm@8.15.7', }) })() From 73c6192fce0b9158ae71270817660a45c9cd7a09 Mon Sep 17 00:00:00 2001 From: samcx Date: Tue, 11 Jun 2024 15:10:10 -0700 Subject: [PATCH 4/4] chore: fix conflict --- .../workflows/test_e2e_deploy_scheduled.yml | 87 ------------------- 1 file changed, 87 deletions(-) delete mode 100644 .github/workflows/test_e2e_deploy_scheduled.yml diff --git a/.github/workflows/test_e2e_deploy_scheduled.yml b/.github/workflows/test_e2e_deploy_scheduled.yml deleted file mode 100644 index d9aab09f09f49..0000000000000 --- a/.github/workflows/test_e2e_deploy_scheduled.yml +++ /dev/null @@ -1,87 +0,0 @@ -name: Test E2E (Vercel Deploy), scheduled - -on: - schedule: - # run every day at midnight - - cron: '0 0 * * *' - # allow triggering manually as well - workflow_dispatch: - -jobs: - test: - if: github.repository_owner == 'vercel' - runs-on: ubuntu-latest - - env: - CARGO_PROFILE_RELEASE_LTO: 'true' - DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }} - DD_ENV: 'ci' - NAPI_CLI_VERSION: 2.16.2 - NEXT_JUNIT_TEST_REPORT: 'true' - NEXT_TELEMETRY_DISABLED: 1 - NEXT_TEST_CONTINUE_ON_ERROR: 1 - NEXT_TEST_JOB: 1 - NEXT_TEST_MODE: 'deploy' - NODE_LTS_VERSION: 20 - TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }} - TURBO_REMOTE_ONLY: 'true' - TURBO_TEAM: 'vercel' - TURBO_VERSION: 2.0.3 - VERCEL_TEST_TEAM: vtest314-next-e2e-tests - VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }} - - strategy: - fail-fast: false - matrix: - group: [1, 2] - - steps: - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: ${{ env.NODE_LTS_VERSION }} - check-latest: true - - - name: Setup pnpm - run: corepack enable - - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 25 - - - name: Setup tests - run: | - pnpm install - pnpm run build - npm i -g vercel@latest - node scripts/run-e2e-test-project-reset.mjs - - - name: Run tests - run: | - docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.41.2-jammy /bin/bash -c "cd /work && \ - NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && \ - corepack enable > /dev/null && \ - NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \ - DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \ - DD_ENV=${{ env.DD_ENV }} \ - VERCEL_TEST_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \ - VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \ - NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \ - NEXT_TEST_MODE=${{ env.NEXT_TEST_MODE }} \ - TEST_TIMINGS_TOKEN=${{ env.TEST_TIMINGS_TOKEN }} \ - xvfb-run node run-tests.js --type e2e --timings -g ${{ matrix.group }}/2 -c 1 >> /proc/1/fd/1" - - - name: Save test report as artifacts - if: always() - uses: actions/upload-artifact@v4 - with: - name: test-reports - if-no-files-found: ignore - retention-days: 2 - path: test/test-junit-report - - - name: Upload test report to Datadog - continue-on-error: true - run: | - pnpx @datadog/datadog-ci@2.23.1 junit upload --tags test.type:nextjs_deploy_e2e --service nextjs ./test/test-junit-report