Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 820594a

Browse filesBrowse files
delbaoliveiradelbaoliveira
authored
Merge branch 'canary' into docs-ia-redirect-guide
2 parents 3c6611b + d9e41e4 commit 820594a
Copy full SHA for 820594a

File tree

Expand file treeCollapse file tree

173 files changed

+2767
-11580
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

173 files changed

+2767
-11580
lines changed

‎.changeset/giant-bushes-sink.md

Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'next': patch
3+
---
4+
5+
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

Copy file name to clipboardExpand all lines: .github/workflows/build_and_deploy.yml
+22-11Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ env:
1919
#
2020
# See https://doc.rust-lang.org/rustc/platform-support/apple-darwin.html#os-version for more details
2121
MACOSX_DEPLOYMENT_TARGET: 11.0
22-
# This will become "true" if the latest commit is
23-
# "Version Packages" or "Version Pacakges (canary)"
22+
# This will become "true" if the latest commit (merged release PR) is either:
23+
# - "Version Packages (#<number>)"
24+
# - "Version Pacakges (canary/rc) (#<number>)"
2425
# set from scripts/check-is-release.js
2526
__NEW_RELEASE: 'false'
2627

@@ -50,10 +51,11 @@ jobs:
5051
run: |
5152
# TODO: Remove the new release check once the new release workflow is fully replaced.
5253
RELEASE_CHECK=$(node ./scripts/check-is-release.js 2> /dev/null || :)
53-
if [[ $RELEASE_CHECK =~ ^Version\ Packages(\ \(canary\))?$ ]];
54+
if [[ $RELEASE_CHECK == 'new-release' ]];
5455
then
5556
echo "__NEW_RELEASE=true" >> $GITHUB_ENV
56-
elif [[ $RELEASE_CHECK = v* ]];
57+
echo "value=production" >> $GITHUB_OUTPUT
58+
elif [[ $RELEASE_CHECK == v* ]];
5759
then
5860
echo "value=production" >> $GITHUB_OUTPUT
5961
elif [ '${{ github.ref }}' == 'refs/heads/canary' ]
@@ -530,7 +532,7 @@ jobs:
530532
path: crates/wasm
531533

532534
- name: Create tarballs
533-
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"
535+
run: node scripts/create-preview-tarballs.js "${{ github.sha }}" "${{ runner.temp }}/preview-tarballs"
534536

535537
- name: Upload tarballs
536538
uses: actions/upload-artifact@v4
@@ -611,14 +613,14 @@ jobs:
611613
env:
612614
GITHUB_TOKEN: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
613615
NPM_TOKEN: ${{ secrets.NPM_TOKEN_ELEVATED }}
614-
RELEASE_TYPE: ${{ github.event.inputs.releaseType }}
615616

616-
# Add label to verify the PR is created from this workflow.
617-
- name: Add label to PR
618-
if: steps.changesets.outputs.pullRequestNumber
619-
run: 'gh pr edit ${{ steps.changesets.outputs.pullRequestNumber }} --add-label "created-by: CI"'
617+
- name: Send a Slack notification of the publish status
618+
run: pnpm tsx scripts/release/slack.ts
620619
env:
621-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
620+
SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
621+
RELEASE_STATUS: ${{ steps.changesets.outputs.published }}
622+
WORKFLOW_LINK: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
623+
WORKFLOW_ACTOR: ${{ github.actor }}
622624

623625
- name: Upload npm log artifact
624626
if: steps.changesets.outputs.published == 'true'
@@ -686,6 +688,15 @@ jobs:
686688
VERCEL_API_TOKEN: ${{ secrets.VERCEL_API_TOKEN }}
687689
DEPLOY_ENVIRONMENT: production
688690

691+
buildPassed:
692+
needs: ['deploy-target', 'build', 'build-wasm', 'build-native']
693+
if: always()
694+
name: thank you, build
695+
runs-on: ubuntu-latest
696+
steps:
697+
- run: exit 1
698+
if: ${{ always() && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')) }}
699+
689700
releaseStats:
690701
name: Release Stats
691702
runs-on:

‎.github/workflows/build_and_test.yml

Copy file name to clipboardExpand all lines: .github/workflows/build_and_test.yml
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ jobs:
3939
- name: check for release
4040
id: is-release
4141
run: |
42-
if [[ $(node ./scripts/check-is-release.js 2> /dev/null || :) = v* ]];
42+
RELEASE_CHECK=$(node ./scripts/check-is-release.js 2> /dev/null || :)
43+
if [[ $RELEASE_CHECK == "new-release" || $RELEASE_CHECK == v* ]];
4344
then
4445
echo "IS_RELEASE=true" >> $GITHUB_OUTPUT
4546
else

‎.github/workflows/retry_test.yml

Copy file name to clipboardExpand all lines: .github/workflows/retry_test.yml
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
${{
2222
github.event.workflow_run.conclusion == 'failure' &&
2323
github.repository == 'vercel/next.js' &&
24-
github.event.workflow.name != 'build-and-deploy' &&
2524
github.event.workflow_run.run_attempt < 3
2625
}}
2726
runs-on: ubuntu-latest
@@ -43,7 +42,7 @@ jobs:
4342
if: >-
4443
${{
4544
github.event.workflow_run.conclusion == 'failure' &&
46-
(github.event.workflow_run.run_attempt >= 3 || github.event.workflow.name == 'build-and-deploy') &&
45+
github.event.workflow_run.run_attempt >= 3 &&
4746
!github.event.workflow_run.head_repository.fork
4847
}}
4948
runs-on: ubuntu-latest

‎.github/workflows/trigger_release_new.yml

Copy file name to clipboardExpand all lines: .github/workflows/trigger_release_new.yml
+12-3Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ on:
1818
options:
1919
- canary
2020
- stable
21-
# TODO: Follow up enable the case.
22-
# - release-candidate
21+
- release-candidate
2322

2423
force:
2524
description: Forced Release
@@ -108,7 +107,17 @@ jobs:
108107
- run: pnpm run build
109108

110109
- name: Create Release Pull Request
111-
id: version-packages
110+
id: changesets
112111
uses: changesets/action@v1
113112
with:
114113
version: pnpm ci:version
114+
env:
115+
GITHUB_TOKEN: ${{ secrets.RELEASE_BOT_GITHUB_TOKEN }}
116+
RELEASE_TYPE: ${{ github.event.inputs.releaseType }}
117+
118+
# Add label to verify the PR is created from this workflow.
119+
- name: Add label to PR
120+
if: steps.changesets.outputs.pullRequestNumber
121+
run: 'gh pr edit ${{ steps.changesets.outputs.pullRequestNumber }} --add-label "created-by: CI"'
122+
env:
123+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎Cargo.lock

Copy file name to clipboardExpand all lines: Cargo.lock
+6-115Lines changed: 6 additions & 115 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Copy file name to clipboardExpand all lines: Cargo.toml
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ turbo-tasks-hash = { path = "turbopack/crates/turbo-tasks-hash" }
266266
turbo-tasks-macros = { path = "turbopack/crates/turbo-tasks-macros" }
267267
turbo-tasks-macros-shared = { path = "turbopack/crates/turbo-tasks-macros-shared" }
268268
turbo-tasks-macros-tests = { path = "turbopack/crates/turbo-tasks-macros-tests" }
269-
turbo-tasks-memory = { path = "turbopack/crates/turbo-tasks-memory" }
270269
turbo-tasks-testing = { path = "turbopack/crates/turbo-tasks-testing" }
271270
turbopack = { path = "turbopack/crates/turbopack" }
272271
turbopack-bench = { path = "turbopack/crates/turbopack-bench" }
@@ -431,3 +430,5 @@ webbrowser = "0.8.7"
431430

432431
[patch.crates-io]
433432
mdxjs = { git = "https://github.com/kdy1/mdxjs-rs", branch = "swc-core-26" }
433+
# Use unreleased version of sourcemap, in the name of performance
434+
sourcemap = { git = "https://github.com/getsentry/rust-sourcemap", branch = "master" }

‎crates/napi/Cargo.toml

Copy file name to clipboardExpand all lines: crates/napi/Cargo.toml
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ lightningcss-napi = { workspace = true }
103103
tokio = { workspace = true, features = ["full"] }
104104
turbo-rcstr = { workspace = true }
105105
turbo-tasks = { workspace = true }
106-
turbo-tasks-memory = { workspace = true }
107106
turbo-tasks-backend = { workspace = true }
108107
turbo-tasks-fs = { workspace = true }
109108
next-api = { workspace = true }

‎crates/next-api/Cargo.toml

Copy file name to clipboardExpand all lines: crates/next-api/Cargo.toml
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ turbo-tasks = { workspace = true }
3131
turbo-tasks-env = { workspace = true }
3232
turbo-tasks-fs = { workspace = true }
3333
turbo-tasks-hash = { workspace = true }
34-
turbo-tasks-memory = { workspace = true }
3534
turbopack = { workspace = true }
3635
turbopack-browser = { workspace = true }
3736
turbopack-cli-utils = { workspace = true }

‎crates/next-api/src/app.rs

Copy file name to clipboardExpand all lines: crates/next-api/src/app.rs
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,6 @@ impl AppEndpoint {
14591459
entry_name: app_entry.original_name.clone(),
14601460
client_references,
14611461
client_references_chunks,
1462-
rsc_app_entry_chunks: app_entry_chunks,
14631462
client_chunking_context,
14641463
ssr_chunking_context,
14651464
async_module_info: module_graphs.full.async_module_info().to_resolved().await?,

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.