chore: try to backport to next 14

.cargo/config.toml

@@ -1,37 +1,52 @@
 [env]
 CARGO_WORKSPACE_DIR = { value = "", relative = true }
+TURBO_PNPM_WORKSPACE_DIR = { value = "", relative = true }
 
 [build]
-
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-Zshare-generics=y", # make the current crate share its generic instantiations
+  "-Zthreads=8", # parallel frontend https://blog.rust-lang.org/2023/11/09/parallel-rustc.html
+  "-Csymbol-mangling-version=v0",
+]
 rustdocflags = []
 
 [target.x86_64-pc-windows-msvc]
 linker = "rust-lld"
 rustflags = ["-C", "target-feature=+crt-static"]
+
 [target.i686-pc-windows-msvc]
 rustflags = ["-C", "target-feature=+crt-static"]
 
-[target.aarch64-unknown-linux-gnu]
-linker = "aarch64-linux-gnu-gcc"
+[target.aarch64-pc-windows-msvc]
+linker = "rust-lld"
 
-[target.aarch64-unknown-linux-musl]
-linker = "aarch64-linux-musl-gcc"
+[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",
+  "-Zunstable-options",
   "-Csymbol-mangling-version=v0",
-  "-Ctarget-feature=-crt-static",
-  "-Clink-arg=-lgcc",
+  "-Clinker-flavor=gnu-lld-cc",
+  "-Clink-self-contained=+linker",
 ]
 
-[target.armv7-unknown-linux-gnueabihf]
-linker = "arm-linux-gnueabihf-gcc"
-
-[target.'cfg(all())']
+[target.aarch64-unknown-linux-musl]
+linker = "aarch64-linux-musl-gcc"
 rustflags = [
   "--cfg",
   "tokio_unstable",
   "-Zshare-generics=y",
   "-Csymbol-mangling-version=v0",
+  "-Ctarget-feature=-crt-static",
+  "-Clink-arg=-lgcc",
 ]
+
+[target.armv7-unknown-linux-gnueabihf]
+linker = "arm-linux-gnueabihf-gcc"

.config/ast-grep/rule-tests/__snapshots__/no-context-snapshot.yml

@@ -0,0 +1,42 @@
+id: no-context
+snapshots:
+  'fn foo(context: ChunkingContext) -> u32 { 5 };':
+    labels:
+      - source: context
+        style: primary
+        start: 7
+        end: 14
+      - source: 'context: ChunkingContext'
+        style: secondary
+        start: 7
+        end: 31
+  foo(|context| context):
+    labels:
+      - source: context
+        style: primary
+        start: 5
+        end: 12
+      - source: '|context|'
+        style: secondary
+        start: 4
+        end: 13
+  let context = ChunkingContext::new();:
+    labels:
+      - source: context
+        style: primary
+        start: 4
+        end: 11
+      - source: let context = ChunkingContext::new();
+        style: secondary
+        start: 0
+        end: 37
+  'struct Foo { context: Context };':
+    labels:
+      - source: context
+        style: primary
+        start: 13
+        end: 20
+      - source: 'context: Context'
+        style: secondary
+        start: 13
+        end: 29

.config/ast-grep/rule-tests/no-context-test.yml

@@ -0,0 +1,11 @@
+id: no-context
+valid:
+  - 'let chunking_context = ChunkingContext::new();'
+  - 'struct Foo { chunking_context: Context };'
+  - 'foo(|chunking_context| context)'
+  - 'fn foo(chunking_context: ChunkingContext) -> u32 { 5 };'
+invalid:
+  - 'let context = ChunkingContext::new();'
+  - 'struct Foo { context: Context };'
+  - 'foo(|context| context)'
+  - 'fn foo(context: ChunkingContext) -> u32 { 5 };'

.config/ast-grep/rules/no-context.yml

@@ -0,0 +1,35 @@
+id: no-context
+message: Don't name variables `context`.
+note: Use a more specific name, such as chunking_context, asset_context, etc.
+severity: error
+language: Rust
+rule:
+  regex: \bcontext\b
+  any:
+    - all:
+        - inside:
+            any:
+              - kind: closure_parameters
+              - kind: parameter
+              - kind: function_item
+              - kind: let_declaration
+        - kind: identifier
+    - all:
+        - kind: field_identifier
+        - inside:
+            kind: field_declaration
+ignores:
+  - './crates/turbopack-css/**'
+  - './crates/turbopack-dev-server/**'
+  - './crates/turbopack-browser/**'
+  - './crates/turbopack-ecmascript-hmr-protocol/**'
+  - './crates/turbopack-ecmascript-plugins/**'
+  - './crates/turbopack-ecmascript-runtime/**'
+  - './crates/turbopack-json/**'
+  - './crates/turbopack-mdx/**'
+  - './crates/turbopack-node/**'
+  - './crates/turbopack-static/**'
+  - './crates/turbopack-tests/**'
+  - './crates/turbopack/**'
+  - './crates/turborepo-cache/**'
+  - './crates/turborepo-scm/**'

.config/nextest.toml

@@ -0,0 +1,17 @@
+[profile.tp-test-linux.junit]
+path = "junit.xml"
+report-name = "Turbopack tests (Linux)"
+store-success-output = true
+store-failure-output = true
+
+[profile.tp-test-mac.junit]
+path = "junit.xml"
+report-name = "Turbopack tests (Mac)"
+store-success-output = true
+store-failure-output = true
+
+[profile.tp-test-win.junit]
+path = "junit.xml"
+report-name = "Turbopack tests (Windows)"
+store-success-output = true
+store-failure-output = true

.eslintignore

@@ -32,7 +32,7 @@ test/development/basic/legacy-decorators/**/*
 test/production/emit-decorator-metadata/**/*.js
 test/e2e/app-dir/rsc-errors/app/swc/use-client/page.js
 test-timings.json
-packages/next-swc/crates/**
+crates/**
 bench/nested-deps/**
 bench/nested-deps-app-router/**
 packages/next-bundle-analyzer/index.d.ts
@@ -41,3 +41,7 @@ test/development/basic/hmr/components/parse-error.js
 packages/next-swc/docs/assets/**/*
 test/lib/amp-validator-wasm.js
 test/production/pages-dir/production/fixture/amp-validator-wasm.js
+
+# turbopack crates
+turbopack/crates/*/tests/**
+turbopack/crates/*/js/src/compiled

.eslintrc.json

@@ -7,7 +7,8 @@
     "commonjs": true,
     "es6": true,
     "node": true,
-    "jest": true
+    "jest": true,
+    "es2020": true
   },
   "parserOptions": {
     "requireConfigFile": false,
@@ -96,7 +97,11 @@
           "warn",
           {
             "args": "none",
-            "ignoreRestSiblings": true
+            "ignoreRestSiblings": true,
+            "argsIgnorePattern": "^_",
+            "caughtErrorsIgnorePattern": "^_",
+            "destructuredArrayIgnorePattern": "^_",
+            "varsIgnorePattern": "^_"
           }
         ],
         "no-use-before-define": "off",

.gitattributes

@@ -3,3 +3,7 @@ packages/next/compiled/** -text linguist-vendored
 
 # Make next/src/build folder indexable for github search
 build/** linguist-generated=false
+
+turbopack/crates/turbo-tasks-macros-tests/tests/**/*.stderr linguist-generated=true
+turbopack/crates/turbopack-ecmascript/tests/tree-shaker/analyzer/**/output.md linguist-generated=true
+turbopack/crates/turbopack-tests/tests/snapshot/**/output/** linguist-generated=true

.github/actions/next-integration-stat/package.json

@@ -21,8 +21,7 @@
     "strip-ansi": "^7.0.1"
   },
   "engines": {
-    "node": ">=18.17.0",
-    "pnpm": "8.15.4"
+    "node": ">=18.17.0"
   },
-  "packageManager": "pnpm@8.15.4"
+  "packageManager": "pnpm@9.6.0"
 }

.github/actions/next-stats-action/package.json

@@ -18,8 +18,7 @@
     "typescript": "5.1.6"
   },
   "engines": {
-    "node": ">=18.17.0",
-    "pnpm": "8.15.4"
+    "node": ">=18.17.0"
   },
-  "packageManager": "pnpm@8.15.4"
+  "packageManager": "pnpm@9.6.0"
 }

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

@@ -4,61 +4,22 @@ inputs:
   targets:
     description: 'Comma-separated list of target triples to install for this toolchain'
     required: false
-  components:
-    description: 'Comma-separated list of components to be additionally installed'
-    required: false
-  skip-install:
-    description: 'Sets environment variables without installing the rust toolchain'
-    required: false
 
 runs:
   using: 'composite'
   steps:
-    - name: 'Get toolchain version from file'
-      id: file
-      shell: bash
-      run: echo "toolchain=$(cat ./rust-toolchain)" >> $GITHUB_OUTPUT
-
-    - shell: bash
-      run: |
-        : force toolchain version
-        echo "RUST_TOOLCHAIN=${{ steps.file.outputs.toolchain }}" >> $GITHUB_ENV
-
-    - shell: bash
-      run: |
-        : disable incremental compilation
-        if [ -z "${CARGO_INCREMENTAL+set}" ]; then
-          echo CARGO_INCREMENTAL=0 >> $GITHUB_ENV
-        fi
-
-    - shell: bash
-      run: |
-        : enable colors in Cargo output
-        if [ -z "${CARGO_TERM_COLOR+set}" ]; then
-          echo CARGO_TERM_COLOR=always >> $GITHUB_ENV
-        fi
-
-    - shell: bash
-      run: |
-        : enable rust backtrace
-        if [ -z "${RUST_BACKTRACE+set}" ]; then
-          echo RUST_BACKTRACE=short >> $GITHUB_ENV
-        fi
-
-    - shell: bash
-      run: |
-        : enable faster cargo sparse registry
-        if [ -z "${CARGO_REGISTRIES_CRATES_IO_PROTOCOL+set}" ]; then
-          echo CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse >> $GITHUB_ENV
-        fi
-
     - name: 'Setup Rust toolchain'
-      uses: dtolnay/rust-toolchain@master
-      if: ${{ !inputs.skip-install }}
+      uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
-        toolchain: ${{ steps.file.outputs.toolchain }}
-        targets: ${{ inputs.targets }}
-        components: ${{ inputs.components }}
+        target: ${{ inputs.targets }}
+        # needed to not make it override the defaults
+        rustflags: ''
+        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: 'Add cargo problem matchers'
       shell: bash

.github/actions/upload-turboyet-data/package.json

@@ -12,8 +12,7 @@
     "@vercel/ncc": "^0.36.0"
   },
   "engines": {
-    "node": ">=18.17.0",
-    "pnpm": "8.15.4"
+    "node": ">=18.17.0"
   },
-  "packageManager": "pnpm@8.15.4"
+  "packageManager": "pnpm@9.6.0"
 }

.github/labeler.json

@@ -5,7 +5,7 @@
     "area: examples": ["examples/**"],
     "area: Font Optimization": ["**/*font*"],
     "area: tests": ["test/**", "bench/**"],
-    "area: Turbopack": ["packages/next-swc/crates/next-*/**"],
+    "area: Turbopack": ["crates/next-*/**"],
     "created-by: Chrome Aurora": [
       { "type": "user", "pattern": "atcastle" },
       { "type": "user", "pattern": "devknoll" },

.github/workflows/build_and_deploy.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.16.2
-  TURBO_VERSION: 1.12.5
+  TURBO_VERSION: 2.0.9
   NODE_LTS_VERSION: 20
   CARGO_PROFILE_RELEASE_LTO: 'true'
   TURBO_TEAM: 'vercel'
@@ -381,7 +381,7 @@ jobs:
         run: turbo run build-wasm -vvv --remote-cache-timeout 90 --summarize -- --target ${{ matrix.target }}
 
       - name: Add target to folder name
-        run: '[[ -d "packages/next-swc/crates/wasm/pkg" ]] && mv packages/next-swc/crates/wasm/pkg packages/next-swc/crates/wasm/pkg-${{ matrix.target }} || ls packages/next-swc/crates/wasm'
+        run: '[[ -d "crates/wasm/pkg" ]] && mv crates/wasm/pkg crates/wasm/pkg-${{ matrix.target }} || ls crates/wasm'
 
       - name: Upload turbo summary artifact
         uses: actions/upload-artifact@v4
@@ -393,7 +393,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: wasm-binaries-${{matrix.target}}
-          path: packages/next-swc/crates/wasm/pkg-*
+          path: crates/wasm/pkg-*
 
   deployTarball:
     if: ${{ needs.build.outputs.isRelease != 'true' }}
@@ -435,7 +435,7 @@ jobs:
         with:
           pattern: wasm-binaries-*
           merge-multiple: true
-          path: packages/next-swc/crates/wasm
+          path: crates/wasm
 
       - run: npm i -g vercel@latest
 
@@ -483,7 +483,7 @@ jobs:
         with:
           pattern: wasm-binaries-*
           merge-multiple: true
-          path: packages/next-swc/crates/wasm
+          path: crates/wasm
 
       - run: npm i -g npm@10.4.0 # need latest version for provenance (pinning to avoid bugs)
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc