Skip to content

Commit 696f1f6

Browse files
authored
Merge branch 'canary' into patch-3
2 parents 66fe8ea + 1009c50 commit 696f1f6

File tree

693 files changed

+11221
-7228
lines changed

Some content is hidden

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

693 files changed

+11221
-7228
lines changed

.changeset/empty-paths-check.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'next': patch
3+
---
4+
5+
Add `regions` to the function config manifest file

.eslintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@
127127
},
128128
{
129129
"files": ["packages/**/*.ts", "packages/**/*.tsx"],
130+
"plugins": ["@next/eslint-plugin-internal"],
130131
"rules": {
132+
"@next/internal/typechecked-require": "error",
131133
"jsdoc/no-types": "error",
132134
"jsdoc/no-undefined-types": "error"
133135
}
@@ -166,6 +168,7 @@
166168
"files": ["packages/**"],
167169
"excludedFiles": [
168170
"packages/next/taskfile*.js",
171+
"packages/next/next-devtools.webpack-config.js",
169172
"packages/next/next-runtime.webpack-config.js"
170173
],
171174
"rules": {

.github/workflows/turbopack-benchmark.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- '**/Cargo.toml'
1111
- '**/Cargo.lock'
1212
pull_request:
13-
types: ['opened', 'reopened', 'synchronize']
13+
types: ['opened', 'reopened', 'synchronize', 'labeled']
1414
paths:
1515
- '**/crates/**'
1616
- '**/Cargo.toml'
@@ -92,8 +92,7 @@ jobs:
9292

9393
benchmark-large:
9494
name: Benchmark Rust Crates (large)
95-
# If the task is triggered manually, we want to run the large benchmarks
96-
if: ${{ github.event_name == 'workflow_dispatch' }}
95+
if: ${{ github.event.label.name == 'benchmark' || github.event_name == 'workflow_dispatch' }}
9796
runs-on: ['self-hosted', 'linux', 'x64', 'metal']
9897
steps:
9998
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)