Unverified Commit bd6ab041 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Upgrade Turborepo (#64767)

## What?

Upgrade Turborepo to the latest version and enable the new terminal UI
to dogfood: https://turbo.build/blog/turbo-1-13-0#new-terminal-ui.

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->


Closes NEXT-3164
parent 35879797
...@@ -7,7 +7,7 @@ on: ...@@ -7,7 +7,7 @@ on:
env: env:
NAPI_CLI_VERSION: 2.16.2 NAPI_CLI_VERSION: 2.16.2
TURBO_VERSION: 1.12.5 TURBO_VERSION: 1.13.2
NODE_LTS_VERSION: 20 NODE_LTS_VERSION: 20
CARGO_PROFILE_RELEASE_LTO: 'true' CARGO_PROFILE_RELEASE_LTO: 'true'
TURBO_TEAM: 'vercel' TURBO_TEAM: 'vercel'
......
...@@ -8,7 +8,7 @@ on: ...@@ -8,7 +8,7 @@ on:
env: env:
NAPI_CLI_VERSION: 2.14.7 NAPI_CLI_VERSION: 2.14.7
TURBO_VERSION: 1.12.5 TURBO_VERSION: 1.13.2
NODE_MAINTENANCE_VERSION: 18 NODE_MAINTENANCE_VERSION: 18
NODE_LTS_VERSION: 20 NODE_LTS_VERSION: 20
TEST_CONCURRENCY: 8 TEST_CONCURRENCY: 8
......
...@@ -52,7 +52,7 @@ on: ...@@ -52,7 +52,7 @@ on:
env: env:
NAPI_CLI_VERSION: 2.14.7 NAPI_CLI_VERSION: 2.14.7
TURBO_VERSION: 1.12.5 TURBO_VERSION: 1.13.2
NODE_LTS_VERSION: 20.9.0 NODE_LTS_VERSION: 20.9.0
TEST_CONCURRENCY: 8 TEST_CONCURRENCY: 8
# disable backtrace for test snapshots # disable backtrace for test snapshots
......
...@@ -17,7 +17,7 @@ name: Code Freeze ...@@ -17,7 +17,7 @@ name: Code Freeze
env: env:
NAPI_CLI_VERSION: 2.14.7 NAPI_CLI_VERSION: 2.14.7
TURBO_VERSION: 1.12.5 TURBO_VERSION: 1.13.2
NODE_LTS_VERSION: 20 NODE_LTS_VERSION: 20
jobs: jobs:
......
...@@ -6,7 +6,7 @@ name: Generate Pull Request Stats ...@@ -6,7 +6,7 @@ name: Generate Pull Request Stats
env: env:
NAPI_CLI_VERSION: 2.14.7 NAPI_CLI_VERSION: 2.14.7
TURBO_VERSION: 1.12.5 TURBO_VERSION: 1.13.2
NODE_LTS_VERSION: 20 NODE_LTS_VERSION: 20
TEST_CONCURRENCY: 6 TEST_CONCURRENCY: 6
......
name: test-e2e-deploy
on:
schedule:
# run every day at midnight
- cron: '0 0 * * *'
# allow triggering manually as well
workflow_dispatch:
jobs:
build:
if: github.repository_owner == 'vercel'
runs-on: ubuntu-latest
env:
VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
VERCEL_TEST_TEAM: vtest314-next-e2e-tests
DATADOG_API_KEY: ${{ secrets.DATA_DOG_API_KEY }}
NAPI_CLI_VERSION: 2.16.2
TURBO_VERSION: 1.13.2
NODE_LTS_VERSION: 20
CARGO_PROFILE_RELEASE_LTO: 'true'
TURBO_TEAM: 'vercel'
TURBO_REMOTE_ONLY: 'true'
TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
NEXT_TELEMETRY_DISABLED: 1
strategy:
fail-fast: false
matrix:
group: [1, 2]
steps:
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_LTS_VERSION }}
check-latest: true
- run: corepack enable
- uses: actions/checkout@v4
with:
fetch-depth: 25
- run: pnpm install
- run: pnpm run build
- run: npm i -g vercel@latest
- run: node scripts/run-e2e-test-project-reset.mjs
name: Reset test project
- run: docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.35.1-jammy /bin/bash -c "cd /work && NODE_VERSION=${{ env.NODE_LTS_VERSION }} ./scripts/setup-node.sh && corepack enable > /dev/null && NEXT_JUNIT_TEST_REPORT=true DATADOG_API_KEY=${DATADOG_API_KEY} DD_ENV=ci VERCEL_TEST_TOKEN=${{ secrets.VERCEL_TEST_TOKEN }} VERCEL_TEST_TEAM=vtest314-next-e2e-tests NEXT_TEST_JOB=1 NEXT_TEST_MODE=deploy TEST_TIMINGS_TOKEN=${{ secrets.TEST_TIMINGS_TOKEN }} xvfb-run node run-tests.js --type e2e --timings -g ${{ matrix.group }}/2 -c 1 >> /proc/1/fd/1"
name: Run test/e2e (deploy)
- name: Upload test report
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: |
ls -al ./test/*junit
DD_ENV=ci npx @datadog/datadog-ci@2.23.1 junit upload --tags test.type:nextjs_deploy_e2e --service nextjs ./test/test-junit-report
...@@ -22,7 +22,7 @@ jobs: ...@@ -22,7 +22,7 @@ jobs:
TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }} TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
TURBO_REMOTE_ONLY: 'true' TURBO_REMOTE_ONLY: 'true'
TURBO_TEAM: 'vercel' TURBO_TEAM: 'vercel'
TURBO_VERSION: 1.12.5 TURBO_VERSION: 1.13.2
VERCEL_TEST_TEAM: vtest314-next-e2e-tests VERCEL_TEST_TEAM: vtest314-next-e2e-tests
VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }} VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
...@@ -54,11 +54,11 @@ jobs: ...@@ -54,11 +54,11 @@ jobs:
- name: Run tests - name: Run tests
run: | run: |
docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.41.2-jammy /bin/bash -c "cd /work && \ 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 && \ corepack enable > /dev/null && \
NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \ NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \
DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \ 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_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \
VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \ VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \
NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \ NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \
......
...@@ -26,7 +26,7 @@ jobs: ...@@ -26,7 +26,7 @@ jobs:
TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }} TEST_TIMINGS_TOKEN: ${{ secrets.TEST_TIMINGS_TOKEN }}
TURBO_REMOTE_ONLY: 'true' TURBO_REMOTE_ONLY: 'true'
TURBO_TEAM: 'vercel' TURBO_TEAM: 'vercel'
TURBO_VERSION: 1.12.5 TURBO_VERSION: 1.13.2
VERCEL_TEST_TEAM: vtest314-next-e2e-tests VERCEL_TEST_TEAM: vtest314-next-e2e-tests
VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }} VERCEL_TEST_TOKEN: ${{ secrets.VERCEL_TEST_TOKEN }}
...@@ -60,11 +60,11 @@ jobs: ...@@ -60,11 +60,11 @@ jobs:
- name: Run tests - name: Run tests
run: | run: |
docker run --rm -v $(pwd):/work mcr.microsoft.com/playwright:v1.41.2-jammy /bin/bash -c "cd /work && \ 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 && \ corepack enable > /dev/null && \
NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \ NEXT_JUNIT_TEST_REPORT=${{ env.NEXT_JUNIT_TEST_REPORT }} \
DATADOG_API_KEY=${{ env.DATADOG_API_KEY }} \ 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_TOKEN=${{ env.VERCEL_TEST_TOKEN }} \
VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \ VERCEL_TEST_TEAM=${{ env.VERCEL_TEST_TEAM }} \
NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \ NEXT_TEST_JOB=${{ env.NEXT_TEST_JOB }} \
......
...@@ -29,7 +29,7 @@ name: Trigger Release ...@@ -29,7 +29,7 @@ name: Trigger Release
env: env:
NAPI_CLI_VERSION: 2.14.7 NAPI_CLI_VERSION: 2.14.7
TURBO_VERSION: 1.12.5 TURBO_VERSION: 1.13.2
NODE_LTS_VERSION: 20 NODE_LTS_VERSION: 20
jobs: jobs:
......
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
"taskr": "1.1.0", "taskr": "1.1.0",
"tree-kill": "1.2.2", "tree-kill": "1.2.2",
"tsec": "0.2.1", "tsec": "0.2.1",
"turbo": "1.12.5", "turbo": "1.13.2",
"typescript": "5.3.3", "typescript": "5.3.3",
"unfetch": "4.2.0", "unfetch": "4.2.0",
"wait-port": "0.2.2", "wait-port": "0.2.2",
......
...@@ -540,8 +540,8 @@ importers: ...@@ -540,8 +540,8 @@ importers:
specifier: 0.2.1 specifier: 0.2.1
version: 0.2.1(@bazel/bazelisk@1.18.0)(typescript@5.3.3) version: 0.2.1(@bazel/bazelisk@1.18.0)(typescript@5.3.3)
turbo: turbo:
specifier: 1.12.5 specifier: 1.13.2
version: 1.12.5 version: 1.13.2
typescript: typescript:
specifier: 5.3.3 specifier: 5.3.3
version: 5.3.3 version: 5.3.3
...@@ -24058,64 +24058,64 @@ packages: ...@@ -24058,64 +24058,64 @@ packages:
engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'} engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'}
dev: true dev: true
/turbo-darwin-64@1.12.5: /turbo-darwin-64@1.13.2:
resolution: {integrity: sha512-0GZ8reftwNQgIQLHkHjHEXTc/Z1NJm+YjsrBP+qhM/7yIZ3TEy9gJhuogDt2U0xIWwFgisTyzbtU7xNaQydtoA==} resolution: {integrity: sha512-CCSuD8CfmtncpohCuIgq7eAzUas0IwSbHfI8/Q3vKObTdXyN8vAo01gwqXjDGpzG9bTEVedD0GmLbD23dR0MLA==}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo-darwin-arm64@1.12.5: /turbo-darwin-arm64@1.13.2:
resolution: {integrity: sha512-8WpOLNNzvH6kohQOjihD+gaWL+ZFNfjvBwhOF0rjEzvW+YR3Pa7KjhulrjWyeN2yMFqAPubTbZIGOz1EVXLuQA==} resolution: {integrity: sha512-0HySm06/D2N91rJJ89FbiI/AodmY8B3WDSFTVEpu2+8spUw7hOJ8okWOT0e5iGlyayUP9gr31eOeL3VFZkpfCw==}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo-linux-64@1.12.5: /turbo-linux-64@1.13.2:
resolution: {integrity: sha512-INit73+bNUpwqGZCxgXCR3I+cQsdkQ3/LkfkgSOibkpg+oGqxJRzeXw3sp990d7SCoE8QOcs3iw+PtiFX/LDAA==} resolution: {integrity: sha512-7HnibgbqZrjn4lcfIouzlPu8ZHSBtURG4c7Bedu7WJUDeZo+RE1crlrQm8wuwO54S0siYqUqo7GNHxu4IXbioQ==}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo-linux-arm64@1.12.5: /turbo-linux-arm64@1.13.2:
resolution: {integrity: sha512-6lkRBvxtI/GQdGtaAec9LvVQUoRw6nXFp0kM+Eu+5PbZqq7yn6cMkgDJLI08zdeui36yXhone8XGI8pHg8bpUQ==} resolution: {integrity: sha512-sUq4dbpk6SNKg/Hkwn256Vj2AEYSQdG96repio894h5/LEfauIK2QYiC/xxAeW3WBMc6BngmvNyURIg7ltrePg==}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo-windows-64@1.12.5: /turbo-windows-64@1.13.2:
resolution: {integrity: sha512-gQYbOhZg5Ww0bQ/bC0w/4W6yQRwBumUUnkB+QPo15VznwxZe2a7bo6JM+9Xy9dKLa/kn+p7zTqme4OEp6M3/Yg==} resolution: {integrity: sha512-DqzhcrciWq3dpzllJR2VVIyOhSlXYCo4mNEWl98DJ3FZ08PEzcI3ceudlH6F0t/nIcfSItK1bDP39cs7YoZHEA==}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo-windows-arm64@1.12.5: /turbo-windows-arm64@1.13.2:
resolution: {integrity: sha512-auvhZ9FrhnvQ4mgBlY9O68MT4dIfprYGvd2uPICba/mHUZZvVy5SGgbHJ0KbMwaJfnnFoPgLJO6M+3N2gDprKw==} resolution: {integrity: sha512-WnPMrwfCXxK69CdDfS1/j2DlzcKxSmycgDAqV0XCYpK/812KB0KlvsVAt5PjEbZGXkY88pCJ1BLZHAjF5FcbqA==}
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
requiresBuild: true requiresBuild: true
dev: true dev: true
optional: true optional: true
/turbo@1.12.5: /turbo@1.13.2:
resolution: {integrity: sha512-FATU5EnhrYG8RvQJYFJnDd18DpccDjyvd53hggw9T9JEg9BhWtIEoeaKtBjYbpXwOVrJQMDdXcIB4f2nD3QPPg==} resolution: {integrity: sha512-rX/d9f4MgRT3yK6cERPAkfavIxbpBZowDQpgvkYwGMGDQ0Nvw1nc0NVjruE76GrzXQqoxR1UpnmEP54vBARFHQ==}
hasBin: true hasBin: true
optionalDependencies: optionalDependencies:
turbo-darwin-64: 1.12.5 turbo-darwin-64: 1.13.2
turbo-darwin-arm64: 1.12.5 turbo-darwin-arm64: 1.13.2
turbo-linux-64: 1.12.5 turbo-linux-64: 1.13.2
turbo-linux-arm64: 1.12.5 turbo-linux-arm64: 1.13.2
turbo-windows-64: 1.12.5 turbo-windows-64: 1.13.2
turbo-windows-arm64: 1.12.5 turbo-windows-arm64: 1.13.2
dev: true dev: true
/tweetnacl@0.14.5: /tweetnacl@0.14.5:
......
{ {
"$schema": "https://turborepo.org/schema.json", "$schema": "https://turborepo.org/schema.json",
"experimentalUI": true,
"pipeline": { "pipeline": {
"build-native": { "build-native": {
"inputs": [ "inputs": [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment