Skip to content

Commit 0f78e1c

Browse files
authored
Merge branch 'canary' into mischnic/pack-3139-got-external-test
2 parents b9d67de + 33c91d9 commit 0f78e1c

File tree

199 files changed

+340725
-499519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+340725
-499519
lines changed

.github/.react-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
19.0.0-rc-6230622a1a-20240610
1+
19.0.0-rc-76002254-20240724

.github/actions/next-integration-stat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
"engines": {
2424
"node": ">=18.18.0"
2525
},
26-
"packageManager": "pnpm@9.5.0"
26+
"packageManager": "pnpm@9.6.0"
2727
}

.github/actions/next-stats-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
"engines": {
2121
"node": ">=18.18.0"
2222
},
23-
"packageManager": "pnpm@9.5.0"
23+
"packageManager": "pnpm@9.6.0"
2424
}

.github/actions/upload-turboyet-data/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
"engines": {
1515
"node": ">=18.18.0"
1616
},
17-
"packageManager": "pnpm@9.5.0"
17+
"packageManager": "pnpm@9.6.0"
1818
}

.github/workflows/build_and_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
NAPI_CLI_VERSION: 2.16.2
12-
TURBO_VERSION: 2.0.7
12+
TURBO_VERSION: 2.0.9
1313
NODE_LTS_VERSION: 20
1414
CARGO_PROFILE_RELEASE_LTO: 'true'
1515
TURBO_TEAM: 'vercel'

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
NAPI_CLI_VERSION: 2.14.7
11-
TURBO_VERSION: 2.0.7
11+
TURBO_VERSION: 2.0.9
1212
NODE_MAINTENANCE_VERSION: 18
1313
NODE_LTS_VERSION: 20
1414
TEST_CONCURRENCY: 8

.github/workflows/code_freeze.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ name: Code Freeze
1717

1818
env:
1919
NAPI_CLI_VERSION: 2.14.7
20-
TURBO_VERSION: 2.0.7
20+
TURBO_VERSION: 2.0.9
2121
NODE_LTS_VERSION: 20
2222

2323
jobs:

.github/workflows/pull_request_stats.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Generate Pull Request Stats
66

77
env:
88
NAPI_CLI_VERSION: 2.14.7
9-
TURBO_VERSION: 2.0.7
9+
TURBO_VERSION: 2.0.9
1010
NODE_LTS_VERSION: 20
1111
TEST_CONCURRENCY: 6
1212

.github/workflows/trigger_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ name: Trigger Release
3535

3636
env:
3737
NAPI_CLI_VERSION: 2.14.7
38-
TURBO_VERSION: 2.0.7
38+
TURBO_VERSION: 2.0.9
3939
NODE_LTS_VERSION: 20
4040

4141
jobs:

docs/02-app/01-building-your-application/01-routing/05-error-handling.mdx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ export default function Error({ error, reset }) {
211211
}
212212
```
213213
214+
If you want errors to bubble up to the parent error boundary, you can `throw` when rendering the `error` component.
215+
214216
### Handling Errors in Nested Routes
215217
216218
Errors will bubble up to the nearest parent error boundary. This allows for granular error handling by placing `error.tsx` files at different levels in the [route hierarchy](/docs/app/building-your-application/routing#component-hierarchy).

0 commit comments

Comments
 (0)