Merge branch 'canary' into fix/incoming-request

vercel · Feb 3, 2025 · eda5790 · eda5790
2 parents 94ad3b3 + 309092f
commit eda5790
Show file tree

Hide file tree

Showing 88 changed files with 1,035 additions and 509 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -54,6 +54,7 @@ rustflags = [
 
 [target.aarch64-unknown-linux-musl]
 linker = "aarch64-linux-musl-gcc"
+# Config need to be mirrowed to .github/workflows/build_and_deploy.yml
 rustflags = [
   "--cfg",
   "tokio_unstable",
@@ -63,5 +64,16 @@ rustflags = [
   "-Clink-arg=-lgcc",
 ]
 
+[target.x86_64-unknown-linux-musl]
+# Config need to be mirrowed to .github/workflows/build_and_deploy.yml
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-Zshare-generics=y",
+  "-Zthreads=8",
+  "-Csymbol-mangling-version=v0",
+  "-Ctarget-feature=-crt-static",
+]
+
 [target.armv7-unknown-linux-gnueabihf]
 linker = "arm-linux-gnueabihf-gcc"
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -28,4 +28,5 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # RUN su node -c "npm install -g <your-package-list-here>"
 
 # Enable pnpm
+RUN npm i -g corepack@latest
 RUN corepack enable pnpm
diff --git a/.github/actions/next-stats-action/Dockerfile b/.github/actions/next-stats-action/Dockerfile
@@ -12,6 +12,7 @@ RUN apt install unzip wget curl nano htop screen build-essential pkg-config libs
 RUN ln $(which python3) /usr/bin/python
 
 RUN curl -sfLS https://install-node.vercel.app/v18.18.2 | bash -s -- -f
+RUN npm i -g corepack@0.31
 RUN corepack enable
 
 WORKDIR /next-stats

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -29,7 +29,10 @@ jobs:
         with:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
       - name: Determine deploy target
         # 'force-preview' performs a full preview build but only if acknowledged i.e. workflow_dispatch
         # 'automated-preview' for pushes on branches other than 'canary' for integration testing.
@@ -70,7 +73,10 @@ jobs:
         with:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - uses: actions/checkout@v4
         with:
@@ -225,6 +231,7 @@ jobs:
               rustup show &&
               rustup target add x86_64-unknown-linux-musl &&
               npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" &&
+              export RUSTFLAGS='--cfg tokio_unstable -Zshare-generics=y -Zthreads=8 -Csymbol-mangling-version=v0 -Ctarget-feature=-crt-static' &&
               cd packages/next-swc && npm run build-native-release -- --target x86_64-unknown-linux-musl &&
               strip native/next-swc.*.node
 
@@ -266,6 +273,7 @@ jobs:
               npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" &&
               rustup show &&
               rustup target add aarch64-unknown-linux-musl &&
+              export RUSTFLAGS='--cfg tokio_unstable -Zshare-generics=y -Zthreads=8 -Zunstable-options -Csymbol-mangling-version=v0 -Clinker-flavor=gnu-lld-cc -Clink-self-contained=+linker' &&
               cd packages/next-swc && npm run build-native-release -- --target aarch64-unknown-linux-musl &&
               llvm-strip -x native/next-swc.*.node
 
@@ -458,7 +466,10 @@ jobs:
         with:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
@@ -518,7 +529,10 @@ jobs:
         with:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       # https://github.com/actions/virtual-environments/issues/1187
       - name: tune linux network
@@ -576,7 +590,10 @@ jobs:
         with:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - uses: ./.github/actions/setup-rust
         with:

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -108,7 +108,10 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
       - name: 'Run link checker'
         run: node ./.github/actions/validate-docs-links/dist/index.js
         env:

diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml
@@ -31,7 +31,10 @@ jobs:
         with:
           node-version: 18
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - run: git clone https://github.com/vercel/next.js.git --depth=1 .
 

diff --git a/.github/workflows/issue_wrong_template.yml b/.github/workflows/issue_wrong_template.yml
@@ -11,7 +11,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
       - name: 'Close issues using the wrong issue template'
         run: node ./.github/actions/next-repo-actions/dist/wrong-issue-template/index.js
         env:

diff --git a/.github/workflows/popular.yml b/.github/workflows/popular.yml
@@ -12,7 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
       - name: 'Issues: Send notification to Slack'
         run: node ./.github/actions/next-repo-actions/dist/issues/index.mjs
         continue-on-error: true

diff --git a/.github/workflows/rspack-nextjs-build-integration-tests.yml b/.github/workflows/rspack-nextjs-build-integration-tests.yml
@@ -149,7 +149,7 @@ jobs:
           name: test-reports-build-integration-${{ matrix.group }}
           if-no-files-found: 'error'
           path: |
-            test/turbopack-test-junit-report
+            test/rspack-test-junit-report
 
   # Collect integration test results from execute_tests,
   # Store it as github artifact for next step to consume.

diff --git a/.github/workflows/rspack-update-tests-manifest.yml b/.github/workflows/rspack-update-tests-manifest.yml
@@ -26,7 +26,10 @@ jobs:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
 
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         shell: bash
@@ -59,7 +62,10 @@ jobs:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
 
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         shell: bash

diff --git a/.github/workflows/setup-nextjs-build.yml b/.github/workflows/setup-nextjs-build.yml
@@ -82,6 +82,7 @@ jobs:
         run: |
           wget https://github.com/sharkdp/hyperfine/releases/download/v1.16.1/hyperfine_1.16.1_amd64.deb
           sudo dpkg -i hyperfine_1.16.1_amd64.deb
+          npm i -g corepack@0.31
           corepack enable
           pnpm install --loglevel error
 

diff --git a/.github/workflows/test_e2e_deploy_release.yml b/.github/workflows/test_e2e_deploy_release.yml
@@ -25,7 +25,9 @@ jobs:
           check-latest: true
 
       - name: Setup pnpm
-        run: corepack enable
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/test_examples.yml b/.github/workflows/test_examples.yml
@@ -39,7 +39,10 @@ jobs:
         with:
           node-version: 18
           check-latest: true
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - run: pnpm install
       - run: pnpm build

diff --git a/.github/workflows/triage_with_ai.yml b/.github/workflows/triage_with_ai.yml
@@ -10,7 +10,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
       - name: 'Send report to Slack (AI-powered)'
         run: node ./.github/actions/next-repo-actions/dist/triage-issues-with-ai/index.js
     env:

diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
@@ -82,7 +82,11 @@ jobs:
       - name: tune linux network
         run: sudo ethtool -K eth0 tx off rx off
 
-      - run: corepack enable && pnpm --version
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
+          pnpm --version
 
       - id: get-store-path
         run: echo STORE_PATH=$(pnpm store path) >> $GITHUB_OUTPUT

diff --git a/.github/workflows/turbopack-nextjs-dev-integration-tests.yml b/.github/workflows/turbopack-nextjs-dev-integration-tests.yml
@@ -178,7 +178,7 @@ jobs:
       - name: Store artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: test-results-turbopack-development
           path: |
             nextjs-test-results.json
             failed-test-path-list.json

diff --git a/.github/workflows/turbopack-update-tests-manifest.yml b/.github/workflows/turbopack-update-tests-manifest.yml
@@ -26,7 +26,10 @@ jobs:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
 
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         shell: bash

diff --git a/.github/workflows/turbopack-upload-tests-manifest.yml b/.github/workflows/turbopack-upload-tests-manifest.yml
@@ -27,7 +27,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         shell: bash

diff --git a/.github/workflows/update_fonts_data.yml b/.github/workflows/update_fonts_data.yml
@@ -28,7 +28,10 @@ jobs:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
 
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         shell: bash

diff --git a/.github/workflows/update_react.yml b/.github/workflows/update_react.yml
@@ -39,7 +39,10 @@ jobs:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
 
-      - run: corepack enable
+      - name: Setup corepack
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         shell: bash

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/napi/src/next_api/project.rs b/crates/napi/src/next_api/project.rs
@@ -206,6 +206,8 @@ pub struct NapiTurboEngineOptions {
     pub persistent_caching: Option<bool>,
     /// An upper bound of memory that turbopack will attempt to stay under.
     pub memory_limit: Option<f64>,
+    /// Track dependencies between tasks. If false, any change during build will error.
+    pub dependency_tracking: Option<bool>,
 }
 
 impl From<NapiWatchOptions> for WatchOptions {
@@ -377,10 +379,12 @@ pub async fn project_new(
         .map(|m| m as usize)
         .unwrap_or(usize::MAX);
     let persistent_caching = turbo_engine_options.persistent_caching.unwrap_or_default();
+    let dependency_tracking = turbo_engine_options.dependency_tracking.unwrap_or(true);
     let turbo_tasks = create_turbo_tasks(
         PathBuf::from(&options.dist_dir),
         persistent_caching,
         memory_limit,
+        dependency_tracking,
     )?;
     if !persistent_caching {
         use std::io::Write;

diff --git a/crates/napi/src/next_api/utils.rs b/crates/napi/src/next_api/utils.rs
@@ -127,6 +127,7 @@ pub fn create_turbo_tasks(
     output_path: PathBuf,
     persistent_caching: bool,
     _memory_limit: usize,
+    dependency_tracking: bool,
 ) -> Result<NextTurboTasks> {
     Ok(if persistent_caching {
         let dirty_suffix = if crate::build::GIT_CLEAN
@@ -158,6 +159,7 @@ pub fn create_turbo_tasks(
                     } else {
                         turbo_tasks_backend::StorageMode::ReadWrite
                     }),
+                    dependency_tracking,
                     ..Default::default()
                 },
                 default_backing_storage(&output_path.join("cache/turbopack"), &version_info)?,