Merge branch 'vercel:canary' into canary

Author: iqbqioza

.cargo/config.toml

@@ -34,9 +34,6 @@ rustflags = [
   "target-feature=+crt-static"
 ]
 
-[target.'cfg(target_os = "macos")']
-linker = "rust-lld"
-
 [target.'cfg(all(target_os = "linux", target_env = "gnu"))']
 rustflags = [
   "--cfg",

.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
+  "changelog": ["@changesets/changelog-github", { "repo": "vercel/next.js" }],
+  "commit": false,
+  "fixed": [["next", "@next/swc"]],
+  "linked": [],
+  "access": "public",
+  "baseBranch": "canary",
+  "updateInternalDependencies": "patch",
+  "ignore": []
+}

.changeset/dry-roses-nail.md

@@ -0,0 +1,5 @@
+---
+"next": patch
+---
+
+Enable `ppr` when `dynamicIO` is enabled

.changeset/loose-cows-pump.md

@@ -0,0 +1,5 @@
+---
+'next': patch
+---
+
+Fix dangling promise in unstable_cache

.changeset/lovely-bulldogs-dress.md

@@ -0,0 +1,5 @@
+---
+"next": patch
+---
+
+Always pass implicit/soft tags into the `CacheHandler.get` method

.changeset/seven-seas-run.md

@@ -0,0 +1,5 @@
+---
+"next": patch
+---
+
+[TypeScript Plugin] Match method signature (`someFunc(): void`) type for client boundary warnings.

.changeset/shaggy-owls-visit.md

@@ -0,0 +1,5 @@
+---
+'next': patch
+---
+
+Fixed rewrite params of the interception routes not being parsed correctly in certain deployed environments

.changeset/shaggy-pears-tell.md

@@ -0,0 +1,5 @@
+---
+"next": patch
+---
+
+Use `onPostpone` to determine if segment prefetch is partial

.changeset/shy-impalas-add.md

@@ -0,0 +1,5 @@
+---
+"next": patch
+---
+
+[TypeScript Plugin] Moved the diagnostics' positions to the prop's type instead of the value for client-boundary warnings.

.changeset/spotty-hotels-train.md

@@ -0,0 +1,5 @@
+---
+"next": patch
+---
+
+[Segment Cache] Fix: Ensure server references can be prerendered

.changeset/swift-socks-find.md

@@ -0,0 +1,5 @@
+---
+'next': patch
+---
+
+Sourcemap errors during prerender if `experimental.enablePrerenderSourceMaps` is enabled

.changeset/tricky-planes-worry.md

@@ -0,0 +1,5 @@
+---
+"next": patch
+---
+
+[dynamicIO] Avoid timeout errors with dynamic params in `"use cache"`

.eslintrc.json

@@ -48,7 +48,7 @@
         "jest/no-export": "off",
         "jest/no-standalone-expect": [
           "error",
-          { "additionalTestBlockFunctions": ["retry"] }
+          { "additionalTestBlockFunctions": ["retry", "itCI", "itHeaded"] }
         ]
       }
     },

.git-blame-ignore-revs

@@ -9,4 +9,30 @@
 64b718c6618b6c419872abbf22163ae543ac259e
 
 # Replace createNextDescribe with nextTestSetup
-c6320ed87ab41eee6f3ac54352ad02a239f329b2
+c6320ed87ab41eee6f3ac54352ad02a239f329b2
+
+# Enable prettier for turbopack
+eaad5b4c1451f35c4b3b6a3c9c67445b434c4a80
+
+# Turbopack: Make `turbopack-core` Rust 2024
+f5d537f23de7c61e427fd915b5b70d2298fdd5ad
+# Turbopack: Make `turbo-tasks-malloc` crate Rust 2024
+7e9b55da8b0d72c22708ae08a71581858e802bef
+# Turbopack: Make `turbopack-ecmascript` Rust 2024
+f9e78faee6e959a2bbc8891e3f7761d0d7d7dcb1
+# Turbopack: Make `turbopack-resolve` and `turbopack-trace-server` Rust 2024
+75bc3548e154453897d2dfaecab2cdf60912ae0c
+# Turbopack: Make `turbo-tasks-memory` crate Rust 2024
+1226d7e47c54173f568c9dd4bf87ef09f22122b5
+# Turbopack: Make `turbo-tasks-env` crate Rust 2024
+5a4dba153defeaa6330d2c23d0934594f2df3383
+# Turbopack: Make `turbo-macros` crate Rust 2024
+305635343df51bbabc19c0df8a82bb8302d86aef
+# Turbopack: Make `turbo-backend` crate Rust 2024
+9bf6e364d484f3ab7eed18b67fbd878dfc3bee6f
+# Turbopack: Make `turbo-rcstr` crate Rust 2024
+9156b3b25bcdd74b4dee58eede731ba895c9e0d9
+# Turbopack: Make `napi` crate Rust 2024
+02219cc880e0991b2060f1591757d97d9f678f9f
+# Turbopack: Make `turbo-tasks` crate Rust 2024
+47689a6e2552328cf90a2d1f14573d006868f197

.github/labeler.json

@@ -73,7 +73,8 @@
       { "type": "user", "pattern": "leerob" },
       { "type": "user", "pattern": "manovotny" },
       { "type": "user", "pattern": "molebox" },
-      { "type": "user", "pattern": "timeyoutakeit" }
+      { "type": "user", "pattern": "timeyoutakeit" },
+      { "type": "user", "pattern": "icyJoseph" }
     ],
     "created-by: Turbopack team": [
       { "type": "user", "pattern": "bgw" },

.github/workflows/build_and_deploy.yml

@@ -15,6 +15,14 @@ env:
   CARGO_PROFILE_RELEASE_LTO: 'true'
   TURBO_TEAM: 'vercel'
   TURBO_CACHE: 'remote:rw'
+  # Without this environment variable, rust-lld will fail because some dependencies defaults to newer version of macOS by default.
+  #
+  # See https://doc.rust-lang.org/rustc/platform-support/apple-darwin.html#os-version for more details
+  MACOSX_DEPLOYMENT_TARGET: 11.0
+  # This will become "true" if the latest commit is
+  # "Version Packages" or "Version Pacakges (canary)"
+  # set from scripts/check-is-release.js
+  __NEW_RELEASE: 'false'
 
 jobs:
   deploy-target:
@@ -40,7 +48,12 @@ jobs:
         # 'staging' for canary branch since that will eventually be published i.e. become the production build.
         id: deploy-target
         run: |
-          if [[ $(node ./scripts/check-is-release.js 2> /dev/null || :) = v* ]];
+          # TODO: Remove the new release check once the new release workflow is fully replaced.
+          RELEASE_CHECK=$(node ./scripts/check-is-release.js 2> /dev/null || :)
+          if [[ $RELEASE_CHECK =~ ^Version\ Packages(\ \(canary\))?$ ]];
+          then
+            echo "__NEW_RELEASE=true" >> $GITHUB_ENV
+          elif [[ $RELEASE_CHECK = v* ]];
           then
             echo "value=production" >> $GITHUB_OUTPUT
           elif [ '${{ github.ref }}' == 'refs/heads/canary' ]
@@ -582,13 +595,34 @@ jobs:
       - run: npm i -g [email protected] # need latest version for provenance (pinning to avoid bugs)
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
       - run: ./scripts/publish-native.js
+      # Legacy release process
       - run: ./scripts/publish-release.js
+        if: ${{ env.__NEW_RELEASE == 'false' }}
         env:
           RELEASE_BOT_GITHUB_TOKEN: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
 
+      # New release process
+      - name: Publish to NPM
+        id: changesets
+        if: ${{ env.__NEW_RELEASE == 'true' }}
+        uses: changesets/action@v1
+        with:
+          publish: pnpm ci:publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN_ELEVATED }}
+          RELEASE_TYPE: ${{ github.event.inputs.releaseType }}
+
+      # Add label to verify the PR is created from this workflow.
+      - name: Add label to PR
+        if: steps.changesets.outputs.pullRequestNumber
+        run: 'gh pr edit ${{ steps.changesets.outputs.pullRequestNumber }} --add-label "created-by: CI"'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Upload npm log artifact
+        if: steps.changesets.outputs.published == 'true'
         uses: actions/upload-artifact@v4
-        if: always()
         with:
           name: npm-publish-logs
           path: /home/runner/.npm/_logs/*

.github/workflows/build_reusable.yml

@@ -97,11 +97,6 @@ env:
   NEXT_TEST_PREFER_OFFLINE: 1
   NEXT_CI_RUNNER: ${{ inputs.runs_on_labels }}
 
-  # Without this environment variable, rust-lld will fail because some dependencies defaults to newer version of macOS by default.
-  #
-  # See https://doc.rust-lang.org/rustc/platform-support/apple-darwin.html#os-version for more details
-  MACOSX_DEPLOYMENT_TARGET: 11.0
-
 jobs:
   build:
     timeout-minutes: ${{ inputs.timeout_minutes }}

.github/workflows/force_merge_canary_release_pr.yml

@@ -0,0 +1,23 @@
+name: Force Merge Canary Release PR
+
+on: pull_request
+
+permissions:
+  # To bypass and merge PR
+  pull-requests: write
+
+jobs:
+  force-merge-canary-release-pr:
+    runs-on: ubuntu-latest
+    # Validate the login, PR title, and the label to ensure the PR is
+    # from the release PR and prevent spoofing.
+    if: |
+      github.event.pull_request.user.login == 'vercel-release-bot' &&
+      github.event.pull_request.title == 'Version Packages (canary)' &&
+      contains(github.event.pull_request.labels.*.name, 'created-by: CI')
+    steps:
+      - name: Bypass required status checks and merge PR
+        run: gh pr merge --admin --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/test_e2e_deploy_release.yml

@@ -6,6 +6,11 @@ on:
     types: [published]
   # allow triggering manually as well
   workflow_dispatch:
+    inputs:
+      nextVersion:
+        description: canary or custom tarball URL
+        default: canary
+        type: string
 
 env:
   VERCEL_TEST_TEAM: vtest314-next-e2e-tests
@@ -54,7 +59,7 @@ jobs:
       matrix:
         group: [1/6, 2/6, 3/6, 4/6, 5/6, 6/6]
     with:
-      afterBuild: npm i -g vercel@latest && NEXT_E2E_TEST_TIMEOUT=240000 NEXT_TEST_MODE=deploy NEXT_EXTERNAL_TESTS_FILTERS="test/deploy-tests-manifest.json" node run-tests.js --timings -g ${{ matrix.group }} -c 2 --type e2e
+      afterBuild: npm i -g vercel@latest && NEXT_E2E_TEST_TIMEOUT=240000 NEXT_TEST_MODE=deploy NEXT_EXTERNAL_TESTS_FILTERS="test/deploy-tests-manifest.json" NEXT_TEST_VERSION="${{ github.event.inputs.nextVersion || 'canary' }}" node run-tests.js --timings -g ${{ matrix.group }} -c 2 --type e2e
       skipNativeBuild: 'yes'
       skipNativeInstall: 'no'
       stepName: 'test-deploy-${{ matrix.group }}'

.github/workflows/trigger_release_new.yml

@@ -0,0 +1,114 @@
+name: Trigger Release (New)
+
+on:
+  # Run every day at 23:15 UTC
+  # TODO: Disabled cron for now, but uncomment
+  # once replaced the old release workflow.
+  # schedule:
+  #   - cron: '15 23 * * *'
+  # Run manually
+  workflow_dispatch:
+    inputs:
+      releaseType:
+        description: Release Type
+        required: true
+        type: choice
+        # Cron job will run canary release
+        default: canary
+        options:
+          - canary
+          - stable
+          # TODO: Follow up enable the case.
+          # - release-candidate
+
+      force:
+        description: Forced Release
+        default: false
+        type: boolean
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+env:
+  NAPI_CLI_VERSION: 2.14.7
+  TURBO_VERSION: 2.3.3
+  NODE_LTS_VERSION: 20
+
+permissions:
+  # To create PR
+  pull-requests: write
+
+jobs:
+  start:
+    if: github.repository_owner == 'vercel'
+    runs-on: ubuntu-latest
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+      # we build a dev binary for use in CI so skip downloading
+      # canary next-swc binaries in the monorepo
+      NEXT_SKIP_NATIVE_POSTINSTALL: 1
+
+    environment: release-${{ github.event.inputs.releaseType }}
+    steps:
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_LTS_VERSION }}
+          check-latest: true
+
+      # Since actions/checkout won't include the latest tag information,
+      # use the old clone workflow while still preserving branch specific
+      # checkout behavior to support backports.
+      # x-ref: https://github.com/vercel/next.js/pull/63167
+      - name: Clone Next.js repository
+        run: git clone https://github.com/vercel/next.js.git --depth=25 --single-branch --branch ${GITHUB_REF_NAME:-canary} .
+
+      - name: Check token
+        run: gh auth status
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
+
+      - name: Get commit of the latest tag
+        run: echo "LATEST_TAG_COMMIT=$(git rev-list -n 1 $(git describe --tags --abbrev=0))" >> $GITHUB_ENV
+
+      - name: Get latest commit
+        run: echo "LATEST_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
+      - name: Check if new commits since last tag
+        if: ${{ github.event.inputs.releaseType != 'stable' && github.event.inputs.force != true }}
+        run: |
+          if [ "$LATEST_TAG_COMMIT" = "$LATEST_COMMIT" ]; then
+            echo "No new commits. Exiting..."
+            exit 1
+          fi
+
+      # https://github.com/actions/virtual-environments/issues/1187
+      - name: tune linux network
+        run: sudo ethtool -K eth0 tx off rx off
+
+      - name: Setup corepack
+        run: |
+          npm i -g [email protected]
+          corepack enable
+          pnpm --version
+
+      - id: get-store-path
+        run: echo STORE_PATH=$(pnpm store path) >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        timeout-minutes: 5
+        id: cache-pnpm-store
+        with:
+          path: ${{ steps.get-store-path.outputs.STORE_PATH }}
+          key: pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
+          restore-keys: |
+            pnpm-store-
+            pnpm-store-${{ hashFiles('pnpm-lock.yaml') }}
+
+      - run: pnpm install
+      - run: pnpm run build
+
+      - name: Create Release Pull Request
+        id: version-packages
+        uses: changesets/action@v1
+        with:
+          version: pnpm ci:version

.gitignore

@@ -8,6 +8,9 @@ tarballs/
 packages/**/*.tgz
 .errors/
 
+# rust compiler crashes
+rustc-ice-*.txt
+
 # dependencies
 node_modules
 package-lock.json
@@ -30,6 +33,7 @@ coverage
 # test output
 test/**/out/*
 test/**/next-env.d.ts
+test/**/.next*
 .DS_Store
 /e2e-tests
 test/tmp/**