Merge branch 'canary' into docs-ia-forms-guide

Author: delbaoliveira

.changeset/config.json

@@ -1,8 +1,8 @@
 {
   "$schema": "https://unpkg.com/@changesets/config@3.1.1/schema.json",
-  "changelog": "@changesets/cli/changelog",
+  "changelog": ["@changesets/changelog-github", { "repo": "vercel/next.js" }],
   "commit": false,
-  "fixed": [],
+  "fixed": [["next", "@next/swc"]],
   "linked": [],
   "access": "public",
   "baseBranch": "canary",

.changeset/seven-seas-run.md

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

.changeset/tricky-planes-worry.md

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

.github/workflows/build_and_deploy.yml

@@ -20,7 +20,8 @@ env:
   # 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", set from check-is-release.js
+  # "Version Packages" or "Version Pacakges (canary)"
+  # set from scripts/check-is-release.js
   __NEW_RELEASE: 'false'
 
 jobs:
@@ -49,7 +50,7 @@ jobs:
         run: |
           # 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$ ]];
+          if [[ $RELEASE_CHECK =~ ^Version\ Packages(\ \(canary\))?$ ]];
           then
             echo "__NEW_RELEASE=true" >> $GITHUB_ENV
           elif [[ $RELEASE_CHECK = v* ]];
@@ -602,18 +603,26 @@ jobs:
 
       # New release process
       - name: Publish to NPM
-        id: publish-packages
+        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/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

@@ -1,15 +1,22 @@
 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:
-          # TODO: Follow up enable the case.
-          # - canary
+          - canary
           - stable
           # TODO: Follow up enable the case.
           # - release-candidate
@@ -26,6 +33,10 @@ env:
   TURBO_VERSION: 2.3.3
   NODE_LTS_VERSION: 20
 
+permissions:
+  # To create PR
+  pull-requests: write
+
 jobs:
   start:
     if: github.repository_owner == 'vercel'

.vscode/settings.json

@@ -59,6 +59,7 @@
     // singleton modules should always use "*.external" instead of "*-instance"
     "packages/next/src/server/app-render/action-async-storage-instance.ts",
     "packages/next/src/server/app-render/after-task-async-storage-instance.ts",
+    "packages/next/src/server/app-render/dynamic-access-async-storage-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/client/components/segment-cache-impl/*"