Skip to content

Commit d348092

Browse files
Merge branch 'fix/experimental-https-metaimage' of github.com:schoenwaldnils/next.js into fix/experimental-https-metaimage
* 'fix/experimental-https-metaimage' of github.com:schoenwaldnils/next.js: (74 commits) [dev-overlay] Move code into new top-level folder in src/next-devtools (vercel#80281) Docs: Polish Getting Started section (vercel#80402) Fix a couple typos (vercel#80080) feat(turbopack): Add simple tree shaker (vercel#78286) docs: server-only/client-only in Next.js (vercel#80408) v15.4.0-canary.78 Add response handling inside handlers (vercel#80189) Docs: Getting Started feedback (vercel#80401) [test] unflake turbopack dev navigation test case (vercel#80407) Use new `browserWithResponse()` method in `empty-fallback-shells` tests (vercel#80406) Update Turbopack development test manifest (vercel#80399) Update Rspack development test manifest (vercel#80397) Update Rspack production test manifest (vercel#80398) Update Turbopack production test manifest (vercel#80400) Require that `turbo_tasks::value_trait` items be annotated with `turbo-tasks::function` (vercel#79178) Docs: Clarify how intercepting routes work and update example (vercel#80145) build(turbopack): Update `swc_core` to `v27.0.1` (vercel#80338) v15.4.0-canary.77 Turbopack: include obsolete entries in computation (vercel#80362) fix(next-swc-wasm): Only enable turbo-rcstr's napi feature when building the next-swc-napi crate/package (vercel#80390) ...
2 parents 8ce27d3 + 09b9551 commit d348092

File tree

628 files changed

+9918
-5655
lines changed

Some content is hidden

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

628 files changed

+9918
-5655
lines changed

.eslintrc.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,17 @@
297297
"no-octal": "error",
298298
"no-octal-escape": "error",
299299
"no-regex-spaces": "error",
300+
"no-restricted-imports": [
301+
"error",
302+
{
303+
"patterns": [
304+
{
305+
"group": ["*/next-devtools/dev-overlay*"],
306+
"message": "Use `next/dist/compiled/next-devtools` (`src/next-devtools/dev-overlay/entrypoint.ts`) instead. Prefer `src/next-devtools/shared/` for shared utils."
307+
}
308+
]
309+
}
310+
],
300311
"no-restricted-syntax": [
301312
"error",
302313
"WithStatement",

.github/workflows/build_and_deploy.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ env:
2828
jobs:
2929
deploy-target:
3030
runs-on: ubuntu-latest
31+
# Don't trigger this job on `pull_request` events from upstream branches.
32+
# Those would already run this job on the `push` event
33+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork }}
3134
outputs:
3235
value: ${{ steps.deploy-target.outputs.value }}
3336
steps:
@@ -693,7 +696,7 @@ jobs:
693696

694697
buildPassed:
695698
needs: ['deploy-target', 'build', 'build-wasm', 'build-native']
696-
if: always()
699+
if: ${{ always() && needs.deploy-target.outputs.value != '' }}
697700
name: thank you, build
698701
runs-on: ubuntu-latest
699702
steps:

.github/workflows/turbopack-benchmark.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ on:
55
push:
66
branches:
77
- canary
8-
paths:
9-
- '**/crates/**'
10-
- '**/Cargo.toml'
11-
- '**/Cargo.lock'
128
pull_request:
139
types: ['opened', 'reopened', 'synchronize', 'labeled']
1410
paths:
@@ -30,29 +26,6 @@ env:
3026
TURBO_TOKEN: ${{ secrets.HOSTED_TURBO_TOKEN }}
3127

3228
jobs:
33-
benchmark-tiny:
34-
name: Benchmark Rust Crates (tiny)
35-
runs-on: ['self-hosted', 'linux', 'x64', 'metal']
36-
steps:
37-
- uses: actions/checkout@v4
38-
39-
- name: Setup Rust toolchain
40-
uses: ./.github/actions/setup-rust
41-
42-
- name: Install cargo-codspeed
43-
uses: taiki-e/install-action@v2
44-
with:
45-
46-
47-
- name: Build the benchmark target(s)
48-
run: cargo codspeed build -p turbo-rcstr
49-
50-
- name: Run the benchmarks
51-
uses: CodSpeedHQ/action@v3
52-
with:
53-
run: cargo codspeed run
54-
token: ${{ secrets.CODSPEED_TOKEN }}
55-
5629
benchmark-small-apps:
5730
name: Benchmark Rust Crates (small apps)
5831
runs-on: ['self-hosted', 'linux', 'x64', 'metal']

0 commit comments

Comments
 (0)