Merge branch 'main' into feat/with-nestjs

vercel · May 21, 2024 · 763f23f · 763f23f
2 parents 8ef9b7a + d52a6d2
commit 763f23f
Show file tree

Hide file tree

Showing 541 changed files with 17,668 additions and 13,741 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -15,9 +15,19 @@ rustdocflags = ["-Znormalize-docs"]
 [target.x86_64-pc-windows-msvc]
 linker = "rust-lld"
 
-[target.aarch64-apple-darwin]
+[target.'cfg(target_os = "macos")']
 linker = "rust-lld"
 
+[target.'cfg(all(target_os = "linux", target_env = "gnu"))']
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-Zshare-generics=y",
+  "-Zthreads=8",
+  "-Csymbol-mangling-version=v0",
+  "-Clink-arg=-fuse-ld=lld",
+]
+
 [alias]
 xtask = "run --package xtask --"
 tr-build = "build -p turbo"

diff --git a/.github/actions/install-global-turbo/action.yml b/.github/actions/install-global-turbo/action.yml
@@ -0,0 +1,12 @@
+name: "Install Global Turbo"
+description: "Installs turbo globally. Expects Node and npm to already be installed"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install Turbo globally
+      shell: bash
+      run: |
+        VERSION=$(npm view turbo --json | jq -r '.versions | last')
+        echo "Latest published version: $VERSION"
+        npm i -g turbo@$VERSION
diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml
@@ -34,6 +34,11 @@ runs:
         # we want more specific settings
         cache: false
 
+    - name: "Install LLD (LLVM Linker) for Linux"
+      if: runner.os == 'Linux'
+      shell: bash
+      run: sudo apt-get -y update && sudo apt-get install -y lld
+
     - name: "Set Windows default host to MinGW"
       if: ${{ inputs.windows == 'true' }}
       shell: bash
@@ -42,16 +47,16 @@ runs:
     - name: Set Up Protoc
       id: set-up-protoc
       continue-on-error: true
-      uses: arduino/setup-protoc@v1.2.0
+      uses: arduino/setup-protoc@v2.1.0
       with:
-        version: "3.x"
+        version: "26.x"
         repo-token: ${{ inputs.github-token }}
 
     - name: Set Up Protoc (second try)
       if: steps.set-up-protoc.outcome == 'failure'
-      uses: arduino/setup-protoc@v1.2.0
+      uses: arduino/setup-protoc@v2.1.0
       with:
-        version: "3.x"
+        version: "26.x"
         repo-token: ${{ inputs.github-token }}
 
     - name: "Add cargo problem matchers"

diff --git a/.github/actions/setup-turborepo-environment/action.yml b/.github/actions/setup-turborepo-environment/action.yml
@@ -8,6 +8,10 @@ inputs:
   github-token:
     description: "GitHub token. You can pass secrets.GITHUB_TOKEN"
     required: true
+  node-version:
+    description: Node version
+    required: false
+    default: "18"
 
 runs:
   using: "composite"
@@ -16,7 +20,7 @@ runs:
       uses: ./.github/actions/setup-node
       with:
         extra-flags: --no-optional
-        node-version: "20"
+        node-version: ${{ inputs.node-version }}
 
     - name: "Setup Rust"
       uses: ./.github/actions/setup-rust
@@ -29,10 +33,3 @@ runs:
 
     - name: "Setup capnproto"
       uses: ./.github/actions/setup-capnproto
-
-    - name: Install Turbo globally
-      shell: bash
-      run: |
-        VERSION=$(npm view turbo --json | jq -r '.versions | last')
-        echo "Latest published version: $VERSION"
-        npm i -g turbo@$VERSION
diff --git a/.github/turbo-orchestrator.yml b/.github/turbo-orchestrator.yml
@@ -44,7 +44,12 @@ labeler:
         isPRAuthorMatch: "^(bgw|ForsakenHarmony|kdy1|kwonoj|padmaia|sokra|wbinnssmith)$"
     - label: "created-by: turborepo"
       when:
-        isPRAuthorMatch: "^(gsoltis|anthonyshew|tknickman|mehulkar|chris-olszewski|NicholasLYang|arlyon|Zertsov)$"
+        isPRAuthorMatch: "^(gsoltis|anthonyshew|tknickman|mehulkar|chris-olszewski|NicholasLYang|arlyon|Zertsov|paulogdm|codybrouwers)$"
+
+    # needs: triage when not any of the turbopack or turborepo team
+    - label: "needs: triage"
+      when:
+        isNotPRAuthorMatch: "^(bgw|ForsakenHarmony|kdy1|kwonoj|padmaia|sokra|wbinnssmith|gsoltis|anthonyshew|tknickman|mehulkar|chris-olszewski|NicholasLYang|arlyon|Zertsov|paulogdm|codybrouwers)$"
 
     # areas
     - label: "area: ci"

diff --git a/.github/workflows/bench-turborepo.yml b/.github/workflows/bench-turborepo.yml
@@ -25,12 +25,13 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup-node
 
-      - uses: ./.github/actions/setup-turborepo-environment
+      - name: Setup Turborepo Environment
+        uses: ./.github/actions/setup-turborepo-environment
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Build
-        run: cd cli && make turbo-prod
+        run: pnpm -F cli build:release
 
       - name: Run benchmarks
         run: pnpm -F @turbo/benchmark benchmark
@@ -78,13 +79,14 @@ jobs:
         if: ${{ matrix.os.runner == 'windows-latest'}}
         run: rustup target add x86_64-pc-windows-gnu
 
-      - uses: ./.github/actions/setup-turborepo-environment
+      - name: Setup Turborepo Environment
+        uses: ./.github/actions/setup-turborepo-environment
         with:
           windows: ${{ matrix.os.name == 'windows' }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Build Turborepo from source
-        run: cd cli && make turbo-prod
+        run: pnpm -F cli build:release
 
       - name: Run benchmarks
         shell: bash

diff --git a/.github/workflows/lsp.yml b/.github/workflows/lsp.yml
@@ -15,10 +15,10 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          - host: macos-latest
+          - host: macos-12
             target: "x86_64-apple-darwin"
             container-options: "--rm"
-          - host: macos-latest
+          - host: macos-12
             target: "aarch64-apple-darwin"
             container-options: "--rm"
           - host: ubuntu-latest

diff --git a/.github/workflows/test-turbopack-rust-bench-test.yml b/.github/workflows/test-turbopack-rust-bench-test.yml
@@ -32,6 +32,7 @@ jobs:
         uses: ./.github/actions/setup-rust
         with:
           save-cache: true
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Setup Node.js
         uses: ./.github/actions/setup-node

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -219,10 +219,15 @@ jobs:
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@v0.0.3
 
-      - uses: ./.github/actions/setup-turborepo-environment
+      - name: Setup Turborepo Environment
+        uses: ./.github/actions/setup-turborepo-environment
         with:
-          windows: ${{ matrix.os.name == 'windows' }}
+          windows: ${{ matrix.os.runner == 'windows-latest' }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Install Global Turbo
+        uses: ./.github/actions/install-global-turbo
+
       # We explicitly unset RUSTC_WRAPPER if it is an empty string as causes build issues
       - run: |
           if [ -z "${RUSTC_WRAPPER}" ]; then
@@ -269,11 +274,16 @@ jobs:
         shell: bash
         run: git config --global core.autocrlf input
       - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup-turborepo-environment
+
+      - name: Setup Turborepo Environment
+        uses: ./.github/actions/setup-turborepo-environment
         with:
           windows: ${{ matrix.os.runner == 'windows-latest' }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
+      - name: Install Global Turbo
+        uses: ./.github/actions/install-global-turbo
+
       - name: Setup Graphviz
         uses: ts-graphviz/setup-graphviz@v1
         with:
@@ -308,11 +318,14 @@ jobs:
         shell: bash
         run: corepack disable
 
-      - uses: ./.github/actions/setup-turborepo-environment
+      - name: Setup Turborepo Environment
+        uses: ./.github/actions/setup-turborepo-environment
         with:
-          windows: ${{ matrix.os.runner == 'windows-latest' }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
+      - name: Install Global Turbo
+        uses: ./.github/actions/install-global-turbo
+
       - name: Check examples
         shell: bash
         # Concurrency being 1 is a big hammer here.
@@ -364,11 +377,14 @@ jobs:
           ref: ${{ github.ref }}
           fetch-depth: ${{ steps.fetch-depth.outputs.depth  }}
 
-      - name: Build turborepo CLI from source
+      - name: Setup Turborepo Environment
         uses: ./.github/actions/setup-turborepo-environment
         with:
-          windows: ${{ matrix.os.name == 'windows' }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
+          node-version: "20"
+
+      - name: Install Global Turbo
+        uses: ./.github/actions/install-global-turbo
 
       - name: Run tests
         # We manually set TURBO_API to an empty string to override Hetzner env
@@ -459,7 +475,6 @@ jobs:
       - name: Setup Turborepo Environment
         uses: ./.github/actions/setup-turborepo-environment
         with:
-          windows: ${{ matrix.os.name == 'windows' }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Run cargo check
@@ -481,7 +496,6 @@ jobs:
       - name: Setup Turborepo Environment
         uses: ./.github/actions/setup-turborepo-environment
         with:
-          windows: ${{ matrix.os.name == 'windows' }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Run cargo clippy
@@ -513,6 +527,7 @@ jobs:
         uses: ./.github/actions/setup-rust
         with:
           targets: wasm32-unknown-unknown,wasm32-wasip1-threads
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Run cargo check release
         run: |
@@ -658,7 +673,7 @@ jobs:
       - name: Setup Turborepo Environment
         uses: ./.github/actions/setup-turborepo-environment
         with:
-          windows: ${{ matrix.os.name == 'windows' }}
+          windows: ${{ matrix.os.runner == 'windows-latest' }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Run tests
@@ -725,7 +740,7 @@ jobs:
       matrix:
         os:
           - name: macos
-            runner: macos-latest
+            runner: macos-12
           - name: windows
             runner: windows-latest
     runs-on: ${{ matrix.os.runner }}
@@ -818,7 +833,7 @@ jobs:
       matrix:
         os:
           - name: macos
-            runner: macos-latest
+            runner: macos-12
           # Temporarily disable windows bench due to consistent timeouts
           # - name: windows
           #   runner: windows-2019
@@ -846,10 +861,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - uses: ./.github/actions/setup-turborepo-environment
+      - name: Setup Turborepo Environment
+        uses: ./.github/actions/setup-turborepo-environment
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
+      - name: Install Global Turbo
+        uses: ./.github/actions/install-global-turbo
+
       - name: Lint
         # Filters some workspaces out:
         # - Other `@vercel/*` packages because ??

diff --git a/.github/workflows/turborepo-library-release.yml b/.github/workflows/turborepo-library-release.yml
@@ -45,24 +45,30 @@ jobs:
             target: "x86_64-unknown-linux-musl"
             container: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-alpine
             install: |
+              apk update && apk upgrade
               apk add libc6-compat curl
+              echo /root/.cargo/bin >> ${GITHUB_PATH}
+              echo /usr/local/cargo/bin/rustup >> ${GITHUB_PATH}
             setup: |
+              export PATH=/usr/local/cargo/bin/rustup:/root/.cargo/bin:${PATH}
+              rustup show active-toolchain
+              dirname $(rustup which cargo) >> ${GITHUB_PATH}
               pnpm install
 
           - host: ubuntu-latest
             target: "aarch64-unknown-linux-musl"
             container: ghcr.io/napi-rs/napi-rs/nodejs-rust:stable-2023-09-17-alpine
             install: |
+              apk update && apk upgrade
               apk add libc6-compat curl
               echo /root/.cargo/bin >> ${GITHUB_PATH}
               echo /usr/local/cargo/bin/rustup >> ${GITHUB_PATH}
               echo /aarch64-linux-musl-cross/bin >> ${GITHUB_PATH}
-              export PATH=/aarch64-linux-musl-cross/bin:/usr/local/cargo/bin/rustup:/root/.cargo/bin:${PATH}
             setup: |
               export PATH=/aarch64-linux-musl-cross/bin:/usr/local/cargo/bin/rustup:/root/.cargo/bin:${PATH}
-              rustup default $(cat ./rust-toolchain)-aarch64-unknown-linux-musl
+              rustup show active-toolchain
               rustup target add aarch64-unknown-linux-musl
-              rustup toolchain install $(cat ./rust-toolchain)
+              dirname $(rustup which cargo) >> ${GITHUB_PATH}
               pnpm install
             rust_env: CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc RUSTFLAGS="-Ctarget-feature=-crt-static"
 
@@ -103,7 +109,10 @@ jobs:
         if: ${{ matrix.settings.setup }}
 
       - name: Build native library
+        # For some reason PATH modifications from Setup toolchain aren't populated
+        # when using the nodejs-rust alpine container.
         run: |
+          export PATH=/usr/local/cargo/bin/rustup:/root/.cargo/bin:${PATH}
           cd packages/turbo-repository
           ${{ matrix.settings.rust_env }} pnpm build:release --target=${{ matrix.settings.target }}
 

diff --git a/.github/workflows/turborepo-native-lib-test.yml b/.github/workflows/turborepo-native-lib-test.yml
@@ -43,11 +43,15 @@ jobs:
           ref: ${{ github.ref }}
           fetch-depth: ${{ steps.fetch-depth.outputs.depth  }}
 
-      - name: Build turborepo CLI from source
+      - name: Setup Turborepo Environment
         uses: ./.github/actions/setup-turborepo-environment
         with:
           windows: ${{ matrix.os.name == 'windows' }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
+          node-version: "20"
+
+      - name: Install Global Turbo
+        uses: ./.github/actions/install-global-turbo
 
       - name: Run tests
         # Manually set TURBO_API to an empty string to override Hetzner env