Merge branch 'canary' into patch-3

Author: LihaoWang

Diff for: .github/workflows/build_and_deploy.yml

@@ -146,8 +146,8 @@ jobs:
             # --env-mode loose is a breaking change required with turbo 2.x since Strict mode is now the default
             # TODO: we should add the relevant envs later to to switch to strict mode
             build: |
-              npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" && corepack enable
-              turbo run build-native-release -vvv --env-mode loose --remote-cache-timeout 90 --summarize -- --target x86_64-apple-darwin
+              npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" && corepack enable
+              pnpm dlx turbo@${TURBO_VERSION} run build-native-release -vvv --env-mode loose --remote-cache-timeout 90 --summarize -- --target x86_64-apple-darwin
               strip -x packages/next-swc/native/next-swc.*.node
 
           - host:
@@ -159,8 +159,8 @@ jobs:
             # --env-mode loose is a breaking change required with turbo 2.x since Strict mode is now the default
             # TODO: we should add the relevant envs later to to switch to strict mode
             build: |
-              npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}" && corepack enable
-              turbo run build-native-release -vvv --env-mode loose --remote-cache-timeout 90 --summarize -- --target aarch64-apple-darwin
+              npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" && corepack enable
+              pnpm dlx turbo@${TURBO_VERSION} run build-native-release -vvv --env-mode loose --remote-cache-timeout 90 --summarize -- --target aarch64-apple-darwin
               strip -x packages/next-swc/native/next-swc.*.node
 
           - host:
@@ -172,8 +172,8 @@ jobs:
             # TODO: we should add the relevant envs later to to switch to strict mode
             build: |
               corepack enable
-              npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}"
-              turbo run build-native-release -vvv --env-mode loose --remote-cache-timeout 90 --summarize -- --target x86_64-pc-windows-msvc
+              npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}"
+              pnpm dlx turbo@${TURBO_VERSION} run build-native-release -vvv --env-mode loose --remote-cache-timeout 90 --summarize -- --target x86_64-pc-windows-msvc
             target: 'x86_64-pc-windows-msvc'
 
           - host:
@@ -186,8 +186,8 @@ jobs:
             # TODO: we should add the relevant envs later to to switch to strict mode
             build: |
               corepack enable
-              npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}" "turbo@${TURBO_VERSION}"
-              turbo run build-native-no-plugin-release -vvv --env-mode loose --remote-cache-timeout 90 --summarize -- --target aarch64-pc-windows-msvc
+              npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}"
+              pnpm dlx turbo@${TURBO_VERSION} run build-native-no-plugin-release -vvv --env-mode loose --remote-cache-timeout 90 --summarize -- --target aarch64-pc-windows-msvc
 
           - host:
               - 'self-hosted'
@@ -304,7 +304,11 @@ jobs:
         with:
           node-version: ${{ env.NODE_LTS_VERSION }}
           check-latest: true
-      - run: corepack enable
+
+      - name: Setup corepack
+        run: |
+          npm i -g [email protected]
+          corepack enable
 
       # we always want to run this to set environment variables
       - name: Install Rust
@@ -334,7 +338,7 @@ jobs:
       # issues with turbo caching
       - name: pull build cache
         if: ${{ matrix.settings.docker }}
-        run: npm i -g turbo@${{ env.TURBO_VERSION }} && node ./scripts/pull-turbo-cache.js ${{ matrix.settings.target }}
+        run: TURBO_VERSION=${TURBO_VERSION} node ./scripts/pull-turbo-cache.js ${{ matrix.settings.target }}
 
       - name: check build exists
         if: ${{ matrix.settings.docker }}
@@ -423,8 +427,6 @@ jobs:
         with:
           targets: wasm32-unknown-unknown
 
-      - run: npm i -g turbo@${{ env.TURBO_VERSION }}
-
       - name: Install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 
@@ -434,7 +436,7 @@ jobs:
       - name: Build
         # --env-mode loose is a breaking change required with turbo 2.x since Strict mode is now the default
         # TODO: we should add the relevant envs later to to switch to strict mode
-        run: turbo run build-wasm -vvv --env-mode loose --remote-cache-timeout 90 --summarize -- --target ${{ matrix.target }}
+        run: pnpm dlx turbo@${TURBO_VERSION} run build-wasm -vvv --env-mode loose --remote-cache-timeout 90 --summarize -- --target ${{ matrix.target }}
 
       - name: Add target to folder name
         run: '[[ -d "crates/wasm/pkg" ]] && mv crates/wasm/pkg crates/wasm/pkg-${{ matrix.target }} || ls crates/wasm'

Diff for: .github/workflows/build_and_test.yml

@@ -164,7 +164,7 @@ jobs:
       stepName: 'rust-check'
     secrets: inherit
 
-  rust-doc-check:
+  rustdoc-check:
     name: rustdoc check
     needs: ['changes', 'build-next']
     if: ${{ needs.changes.outputs.docs-only == 'false' }}
@@ -175,7 +175,7 @@ jobs:
       skipInstallBuild: 'yes'
       skipNativeBuild: 'yes'
       afterBuild: ./scripts/deploy-turbopack-docs.sh
-      stepName: 'rust-doc-check'
+      stepName: 'rustdoc-check'
     secrets: inherit
 
   ast-grep:
@@ -249,11 +249,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        exclude:
-          # Excluding React 18 tests unless on `canary` branch until budget is approved.
-          - react: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'run-react-18-tests') && '18.3.1' }}
         group: [1/6, 2/6, 3/6, 4/6, 5/6, 6/6]
         # Empty value uses default
+        # TODO: Run with React 18.
+        # Integration tests use the installed React version in next/package.json.include:
+        # We can't easily switch like we do for e2e tests.
+        # Skipping this dimensions until we can figure out a way to test multiple React versions.
         react: ['']
     uses: ./.github/workflows/build_reusable.yml
     with:
@@ -545,9 +546,9 @@ jobs:
           - 11/13
           - 12/13
           - 13/13
-          # Empty value uses default
-          # TODO: Run with React 18.
-          # Integration tests use the installed React version in next/package.json.include:
+        # Empty value uses default
+        # TODO: Run with React 18.
+        # Integration tests use the installed React version in next/package.json.include:
         # We can't easily switch like we do for e2e tests.
         # Skipping this dimensions until we can figure out a way to test multiple React versions.
         react: ['']
@@ -635,6 +636,7 @@ jobs:
         'test-ppr-integration',
         'test-cargo-unit',
         'rust-check',
+        'rustdoc-check',
         'test-next-swc-wasm',
         'test-turbopack-dev',
         'test-turbopack-integration',

Diff for: .github/workflows/build_reusable.yml

@@ -167,7 +167,7 @@ jobs:
       - run: rustc --version
         if: ${{ inputs.skipNativeBuild != 'yes' || inputs.needsNextest == 'yes' || inputs.needsRust == 'yes' }}
 
-      - run: corepack prepare --activate [email protected] && (killall turbo || echo 'no turbo') && npm i -g "turbo@${TURBO_VERSION}" "@napi-rs/cli@${NAPI_CLI_VERSION}"
+      - run: corepack prepare --activate [email protected] && npm i -g "@napi-rs/cli@${NAPI_CLI_VERSION}"
 
       - name: Cache on ${{ github.ref_name }}
         uses: ijjk/[email protected]
@@ -193,7 +193,7 @@ jobs:
       - run: node scripts/normalize-version-bump.js
         name: normalize versions
 
-      - run: turbo run build-native-release -v --env-mode loose --remote-cache-timeout 90 --summarize -- --target ${{ inputs.buildNativeTarget }}
+      - run: pnpm dlx turbo@${TURBO_VERSION} run build-native-release -v --env-mode loose --remote-cache-timeout 90 --summarize -- --target ${{ inputs.buildNativeTarget }}
         if: ${{ inputs.skipNativeBuild != 'yes' }}
 
       - name: Upload next-swc artifact
@@ -224,7 +224,7 @@ jobs:
       - run: pnpm playwright install chromium
         if: ${{ inputs.skipInstallBuild != 'yes' }}
 
-      - run: turbo run get-test-timings -- --build ${{ github.sha }}
+      - run: pnpm dlx turbo@${TURBO_VERSION} run get-test-timings -- --build ${{ github.sha }}
 
       - run: ${{ inputs.afterBuild }}
         # defaults.run.shell sets a stronger options (`-leo pipefail`)

Diff for: .github/workflows/rspack-nextjs-build-integration-tests.yml

@@ -14,11 +14,7 @@ jobs:
       name: rspack-production
       test_type: production
       run_before_test: |
-        export NEXT_RSPACK=1 \
-          NEXT_TEST_USE_RSPACK=1 \
-          BUILTIN_FLIGHT_CLIENT_ENTRY_PLUGIN=1 \
-          BUILTIN_APP_LOADER=1 \
-          BUILTIN_SWC_LOADER=1
+        export NEXT_RSPACK=1 NEXT_TEST_USE_RSPACK=1 \
       # Failing tests take longer (due to timeouts and retries). Since we have
       # many failing tests, we need smaller groups and longer timeouts, in case
       # a group gets stuck with a cluster of failing tests.

Diff for: .github/workflows/rspack-nextjs-dev-integration-tests.yml

@@ -14,11 +14,7 @@ jobs:
       name: rspack-development
       test_type: development
       run_before_test: |
-        export NEXT_RSPACK=1 \
-          NEXT_TEST_USE_RSPACK=1 \
-          BUILTIN_FLIGHT_CLIENT_ENTRY_PLUGIN=1 \
-          BUILTIN_APP_LOADER=1 \
-          BUILTIN_SWC_LOADER=1
+        export NEXT_RSPACK=1 NEXT_TEST_USE_RSPACK=1
       # Failing tests take longer (due to timeouts and retries). Since we have
       # many failing tests, we need smaller groups and longer timeouts, in case
       # a group gets stuck with a cluster of failing tests.

Diff for: .github/workflows/rspack-update-tests-manifest.yml

@@ -41,7 +41,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
           BRANCH_NAME: rspack-manifest
-          SCRIPT: test/build-rspack-dev-tests-manifest.js
+          # We need to use `--override` for rspack (but not for turbopack).
+          # We don't currently have any CI running on every PR, so it's quite
+          # possible for us to regress on tests. We need to skip the
+          # only-promote-to-passing merge logic.
+          SCRIPT: test/update_build_manifest.js --bundler rspack --testSuite dev --override
           PR_TITLE: Update bundler development test manifest
           PR_BODY: This auto-generated PR updates the development integration test manifest used when testing alternative bundlers.
   update_build_manifest:
@@ -77,6 +81,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
           BRANCH_NAME: rspack-manifest
-          SCRIPT: test/build-rspack-build-tests-manifest.js
+          SCRIPT: test/update_build_manifest.js --bundler rspack --testSuite build --override
           PR_TITLE: Update bundler production test manifest
           PR_BODY: This auto-generated PR updates the production integration test manifest used when testing alternative bundlers.

Diff for: .github/workflows/turbopack-update-tests-manifest.yml

@@ -41,7 +41,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
           BRANCH_NAME: turbopack-manifest
-          SCRIPT: test/build-turbopack-dev-tests-manifest.js
+          SCRIPT: test/update_build_manifest.js --bundler turbopack --testSuite dev
           PR_TITLE: Update Turbopack development test manifest
           PR_BODY: This auto-generated PR updates the development integration test manifest used when testing Turbopack.
   update_build_manifest:
@@ -77,6 +77,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN_PULL_REQUESTS }}
           BRANCH_NAME: turbopack-manifest
-          SCRIPT: test/build-turbopack-build-tests-manifest.js
+          SCRIPT: test/update_build_manifest.js --bundler turbopack --testSuite build
           PR_TITLE: Update Turbopack production test manifest
           PR_BODY: This auto-generated PR updates the production integration test manifest used when testing Turbopack.

Diff for: .github/workflows/turbopack-upload-tests-manifest.yml renamed to .github/workflows/upload-tests-manifest.yml

@@ -1,7 +1,7 @@
 # Workflow to upload next.js integration test results to KV for https://areweturboyet.com/
 # This workflow assumes the `next-integration-test` workflow has been executed
 # and test reports have been uploaded to the `test-results` artifact.
-name: Upload Turbopack tests manifest to areweturboyet.com
+name: Upload bundler test manifests to areweturboyet.com
 
 on:
   schedule:
@@ -12,6 +12,11 @@ on:
         description: Next.js version, sha, branch to test
         type: string
         default: 'canary'
+  push:
+    branches:
+      - canary
+    paths:
+      - 'test/*-manifest.json'
 
 jobs:
   upload_test_results:

Diff for: .vscode/settings.json

@@ -61,7 +61,8 @@
     "packages/next/src/server/app-render/after-task-async-storage-instance.ts",
     "packages/next/src/server/app-render/clean-async-snapshot-instance.ts",
     "packages/next/src/server/app-render/work-async-storage-instance.ts",
-    "packages/next/src/server/app-render/work-unit-async-storage-instance.ts"
+    "packages/next/src/server/app-render/work-unit-async-storage-instance.ts",
+    "packages/next/src/client/components/segment-cache-impl/*"
   ],
   // Disable TypeScript surveys.
   "typescript.surveys.enabled": false,