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

Author: delbaoliveira

.changeset/giant-bushes-sink.md

@@ -0,0 +1,5 @@
+---
+'next': patch
+---
+
+Resolved bug where hitting the parameterized path directly would cause a fallback shell generation instead of just rendering the route with the parameterized placeholders.

.github/workflows/build_and_deploy.yml

@@ -19,8 +19,9 @@ 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" or "Version Pacakges (canary)"
+  # This will become "true" if the latest commit (merged release PR) is either:
+  # - "Version Packages (#<number>)"
+  # - "Version Pacakges (canary/rc) (#<number>)"
   # set from scripts/check-is-release.js
   __NEW_RELEASE: 'false'
 
@@ -50,10 +51,11 @@ 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(\ \(canary\))?$ ]];
+          if [[ $RELEASE_CHECK == 'new-release' ]];
           then
             echo "__NEW_RELEASE=true" >> $GITHUB_ENV
-          elif [[ $RELEASE_CHECK = v* ]];
+            echo "value=production" >> $GITHUB_OUTPUT
+          elif [[ $RELEASE_CHECK == v* ]];
           then
             echo "value=production" >> $GITHUB_OUTPUT
           elif [ '${{ github.ref }}' == 'refs/heads/canary' ]
@@ -530,7 +532,7 @@ jobs:
           path: crates/wasm
 
       - name: Create tarballs
-        run: GH_PR_NUMBER=${{ github.event.pull_request && github.event.pull_request.number || '' }} node scripts/create-preview-tarballs.js "${{ github.sha }}" "${{ runner.temp }}/preview-tarballs"
+        run: node scripts/create-preview-tarballs.js "${{ github.sha }}" "${{ runner.temp }}/preview-tarballs"
 
       - name: Upload tarballs
         uses: actions/upload-artifact@v4
@@ -611,14 +613,14 @@ jobs:
         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"'
+      - name: Send a Slack notification of the publish status
+        run: pnpm tsx scripts/release/slack.ts
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
+          RELEASE_STATUS: ${{ steps.changesets.outputs.published }}
+          WORKFLOW_LINK: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          WORKFLOW_ACTOR: ${{ github.actor }}
 
       - name: Upload npm log artifact
         if: steps.changesets.outputs.published == 'true'
@@ -686,6 +688,15 @@ jobs:
           VERCEL_API_TOKEN: ${{ secrets.VERCEL_API_TOKEN }}
           DEPLOY_ENVIRONMENT: production
 
+  buildPassed:
+    needs: ['deploy-target', 'build', 'build-wasm', 'build-native']
+    if: always()
+    name: thank you, build
+    runs-on: ubuntu-latest
+    steps:
+      - run: exit 1
+        if: ${{ always() && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')) }}
+
   releaseStats:
     name: Release Stats
     runs-on:

.github/workflows/build_and_test.yml

@@ -39,7 +39,8 @@ jobs:
       - name: check for release
         id: is-release
         run: |
-          if [[ $(node ./scripts/check-is-release.js 2> /dev/null || :) = v* ]];
+          RELEASE_CHECK=$(node ./scripts/check-is-release.js 2> /dev/null || :)
+          if [[ $RELEASE_CHECK == "new-release" || $RELEASE_CHECK == v* ]];
             then
               echo "IS_RELEASE=true" >> $GITHUB_OUTPUT
             else

.github/workflows/retry_test.yml

@@ -21,7 +21,6 @@ jobs:
       ${{ 
         github.event.workflow_run.conclusion == 'failure' &&
         github.repository == 'vercel/next.js' &&
-        github.event.workflow.name != 'build-and-deploy' &&
         github.event.workflow_run.run_attempt < 3
       }}
     runs-on: ubuntu-latest
@@ -43,7 +42,7 @@ jobs:
     if: >-
       ${{ 
         github.event.workflow_run.conclusion == 'failure' &&
-        (github.event.workflow_run.run_attempt >= 3 || github.event.workflow.name == 'build-and-deploy') &&
+        github.event.workflow_run.run_attempt >= 3 &&
         !github.event.workflow_run.head_repository.fork
       }}
     runs-on: ubuntu-latest

.github/workflows/trigger_release_new.yml

@@ -18,8 +18,7 @@ on:
         options:
           - canary
           - stable
-          # TODO: Follow up enable the case.
-          # - release-candidate
+          - release-candidate
 
       force:
         description: Forced Release
@@ -108,7 +107,17 @@ jobs:
       - run: pnpm run build
 
       - name: Create Release Pull Request
-        id: version-packages
+        id: changesets
         uses: changesets/action@v1
         with:
           version: pnpm ci:version
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
+          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 }}

Cargo.lock

@@ -266,7 +266,6 @@ turbo-tasks-hash = { path = "turbopack/crates/turbo-tasks-hash" }
 turbo-tasks-macros = { path = "turbopack/crates/turbo-tasks-macros" }
 turbo-tasks-macros-shared = { path = "turbopack/crates/turbo-tasks-macros-shared" }
 turbo-tasks-macros-tests = { path = "turbopack/crates/turbo-tasks-macros-tests" }
-turbo-tasks-memory = { path = "turbopack/crates/turbo-tasks-memory" }
 turbo-tasks-testing = { path = "turbopack/crates/turbo-tasks-testing" }
 turbopack = { path = "turbopack/crates/turbopack" }
 turbopack-bench = { path = "turbopack/crates/turbopack-bench" }
@@ -431,3 +430,5 @@ webbrowser = "0.8.7"
 
 [patch.crates-io]
 mdxjs = { git = "https://github.com/kdy1/mdxjs-rs", branch = "swc-core-26" }
+# Use unreleased version of sourcemap, in the name of performance
+sourcemap = { git = "https://github.com/getsentry/rust-sourcemap", branch = "master" }

Cargo.toml

@@ -103,7 +103,6 @@ lightningcss-napi = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 turbo-rcstr = { workspace = true }
 turbo-tasks = { workspace = true }
-turbo-tasks-memory = { workspace = true }
 turbo-tasks-backend = { workspace = true }
 turbo-tasks-fs = { workspace = true }
 next-api = { workspace = true }

crates/napi/Cargo.toml

@@ -31,7 +31,6 @@ turbo-tasks = { workspace = true }
 turbo-tasks-env = { workspace = true }
 turbo-tasks-fs = { workspace = true }
 turbo-tasks-hash = { workspace = true }
-turbo-tasks-memory = { workspace = true }
 turbopack = { workspace = true }
 turbopack-browser = { workspace = true }
 turbopack-cli-utils = { workspace = true }

crates/next-api/Cargo.toml

@@ -1459,7 +1459,6 @@ impl AppEndpoint {
                     entry_name: app_entry.original_name.clone(),
                     client_references,
                     client_references_chunks,
-                    rsc_app_entry_chunks: app_entry_chunks,
                     client_chunking_context,
                     ssr_chunking_context,
                     async_module_info: module_graphs.full.async_module_info().to_resolved().await?,