Merge branch 'main' into main

.gitattributes

@@ -1,4 +1,5 @@
 .config/ast-grep/rule-tests/__snapshots__/** linguist-generated=true
 crates/turbo-tasks-macros-tests/tests/**/*.stderr linguist-generated=true
+crates/turbopack-ecmascript/tests/tree-shaker/analyzer/**/output.md linguist-generated=true
 crates/turbopack-tests/tests/snapshot/**/output/** linguist-generated=true
 crates/turborepo-lockfiles/fixtures/*.lock text eol=lf

.github/actions/setup-rust/action.yml

@@ -66,6 +66,8 @@ runs:
 
     - name: "Install cargo-sweep"
       uses: taiki-e/install-action@v2
+      env:
+        GITHUB_TOKEN: ${{ inputs.github-token }}
       with:
         tool: cargo-sweep@0.6.2,cargo-groups@0.1.9
 

.github/turbo-orchestrator.yml

@@ -41,15 +41,15 @@ labeler:
     # created-by
     - label: "created-by: turbopack"
       when:
-        isPRAuthorMatch: "^(bgw|ForsakenHarmony|kdy1|kwonoj|padmaia|sokra|wbinnssmith)$"
+        isPRAuthorMatch: "^(arlyon|bgw|ForsakenHarmony|kdy1|LichuAcu|mischnic|padmaia|sokra|wbinnssmith)$"
     - label: "created-by: turborepo"
       when:
-        isPRAuthorMatch: "^(anthonyshew|dimitropoulos|tknickman|mehulkar|chris-olszewski|NicholasLYang|Zertsov|paulogdm|codybrouwers)$"
+        isPRAuthorMatch: "^(anthonyshew|dimitropoulos|tknickman|chris-olszewski|NicholasLYang|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|anthonyshew|tknickman|mehulkar|chris-olszewski|NicholasLYang|arlyon|Zertsov|paulogdm|codybrouwers)$"
+        isNotPRAuthorMatch: "^(arlyon|bgw|ForsakenHarmony|kdy1|LichuAcu|mischnic|padmaia|sokra|wbinnssmith|anthonyshew|dimitropoulos|tknickman|chris-olszewski|NicholasLYang|Zertsov|paulogdm|codybrouwers)$"
 
     # areas
     - label: "area: ci"

.github/workflows/bench-turbotrace-against-node-nft.yml

@@ -42,6 +42,8 @@ jobs:
 
       - name: Install nextest
         uses: taiki-e/install-action@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tool: cargo-nextest@0.9.61
 

.github/workflows/test-js-packages.yml

@@ -52,7 +52,7 @@ jobs:
       docs: ${{ steps.docs.outputs.diff != '' }}
 
   js_packages:
-    name: JS Package Tests
+    name: "JS Package Tests (${{matrix.os.name}}, Node ${{matrix.node-version}})"
     timeout-minutes: 30
     if: needs.determine_jobs.outputs.ci == 'true' || needs.determine_jobs.outputs.packages == 'true' || needs.determine_jobs.outputs.docs == 'true'
     needs: [determine_jobs]
@@ -69,6 +69,9 @@ jobs:
               - "metal"
           - name: macos
             runner: macos-12
+        node-version:
+          - 18
+          - 20
     env:
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
       TURBO_TEAM: ${{ vars.TURBO_TEAM }}
@@ -88,11 +91,13 @@ jobs:
           ref: ${{ github.ref }}
           fetch-depth: ${{ steps.fetch-depth.outputs.depth  }}
 
-      - name: Setup Turborepo Environment
-        uses: ./.github/actions/setup-turborepo-environment
+      - name: "Setup Node"
+        uses: ./.github/actions/setup-node
         with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-          node-version: "20"
+          extra-flags: --no-optional
+          node-version: ${{ matrix.node-version }}
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
 
       - name: Install Global Turbo
         uses: ./.github/actions/install-global-turbo
@@ -104,6 +109,8 @@ jobs:
         # changes, and we don't want to enable that beahvior for _all_ our JS packages.
         run: |
           TURBO_API= turbo run check-types test --filter="!turborepo-repository" --filter={./packages/*}...[${{ github.event.pull_request.base.sha || 'HEAD^1' }}] --color --env-mode=strict
+        env:
+          NODE_VERSION: ${{ matrix.node-version }}
 
   summary:
     name: Turborepo JS Test Summary

.github/workflows/test-turbopack-rust-bench-test.yml

@@ -30,6 +30,8 @@ jobs:
 
       - name: Setup Rust
         uses: ./.github/actions/setup-rust
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
         with:
           save-cache: true
           github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/turbopack-test.yml

@@ -339,6 +339,8 @@ jobs:
 
       - name: Install nextest
         uses: taiki-e/install-action@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tool: cargo-nextest@0.9.61
 
@@ -414,6 +416,8 @@ jobs:
 
       - name: Install nextest
         uses: taiki-e/install-action@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tool: cargo-nextest@0.9.61
 

.github/workflows/turborepo-native-lib-test.yml

@@ -11,7 +11,7 @@ permissions:
 
 jobs:
   js_native_packages:
-    name: JS Native Package Tests
+    name: "@turbo/repository (${{matrix.os.name}}, Node ${{matrix.node-version}})"
     timeout-minutes: 30
     runs-on: ${{ matrix.os.runner }}
     strategy:
@@ -26,6 +26,9 @@ jobs:
               - "metal"
           - name: macos
             runner: macos-latest
+        node-version:
+          - 18
+          - 20
     env:
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
       TURBO_TEAM: ${{ vars.TURBO_TEAM }}
@@ -46,9 +49,8 @@ jobs:
       - name: Setup Turborepo Environment
         uses: ./.github/actions/setup-turborepo-environment
         with:
-          windows: ${{ matrix.os.name == 'windows' }}
           github-token: "${{ secrets.GITHUB_TOKEN }}"
-          node-version: "20"
+          node-version: ${{ matrix.node-version }}
 
       - name: Install Global Turbo
         uses: ./.github/actions/install-global-turbo
@@ -57,3 +59,5 @@ jobs:
         # Manually set TURBO_API to an empty string to override Hetzner env
         run: |
           TURBO_API= turbo run test --filter "turborepo-repository" --color --env-mode=strict
+        env:
+          NODE_VERSION: ${{ matrix.node-version }}

.github/workflows/turborepo-test.yml

@@ -169,7 +169,7 @@ jobs:
     needs: [determine_jobs, build_turborepo]
     if: needs.determine_jobs.outputs.turborepo_integration == 'true'
     runs-on: ${{ matrix.os.runner }}
-    timeout-minutes: 30
+    timeout-minutes: 45
     strategy:
       fail-fast: false
       matrix:

Cargo.toml

@@ -226,7 +226,7 @@ camino = { version = "1.1.4", features = ["serde1"] }
 chrono = "0.4.23"
 clap = "4.5.2"
 clap_complete = "4.5.1"
-concurrent-queue = "2.1.0"
+concurrent-queue = "2.5.0"
 console = "0.15.5"
 console-subscriber = "0.1.8"
 criterion = "0.4.0"
@@ -252,8 +252,6 @@ lightningcss = { version = "1.0.0-alpha.57", features = [
 ] }
 mime = "0.3.16"
 notify = "6.1.1"
-notify-debouncer-full = "0.3.1"
-notify-debouncer-mini = { version = "0.3.0", default-features = false }
 once_cell = "1.17.1"
 owo-colors = "3.5.0"
 parcel_selectors = "0.26.0"