Skip to content

[pull] canary from vercel:canary - #1315

Merged
pull[bot] merged 7 commits into
code:canaryfrom
vercel:canary
Aug 18, 2026
Merged

[pull] canary from vercel:canary#1315
pull[bot] merged 7 commits into
code:canaryfrom
vercel:canary

Conversation

@pull

@pull pull Bot commented Aug 18, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

mischnic and others added 7 commits August 18, 2026 10:20
Recreation of #96910

### What?

Adds a test for i18n basepath fallbacks.

### Why?

We had this test in `vercel/vercel`:
https://github.com/vercel/vercel/blob/main/packages/next/test/fixtures/00-i18n-basepath-fallback-false-404/index.test.js

We're getting rid of it in favor of moving it to here in Next.js. This
new test is meant to be equivalent to the original.

Co-authored-by: Anthony Shew <anthonyshew@gmail.com>
- Adding
docs/01-app/03-api-reference/05-config/01-next-config-js/cacheMaxMemorySize.mdx
- Various use cache snippet fixes
- Break nuance for fetch default
- Point to correct turbopack cache flags
In #80281 we moved the README from
`../../packages/next/src/client/components/react-dev-overlay/README.md`
to `packages/next/src/next-devtools/README.md`, but did not update the
link in the contributing guide.
… tests (#97460)

Co-authored-by: Claude Code (kimi-k3[1m]) <noreply@anthropic.com>
### What?

Adds a public OpenTelemetry span for the cold evaluation of an App
Route's
lazy userland module:

- span type: `AppRouteRouteModule.loadUserland`
- display name: `load app route module`
- route-specific attribute: the normalized `next.route` pattern

### Why?

`LoadComponents.loadRouteModule` measures loading Next.js's compiled
route
entry. App Routes then defer the actual userland module behind a
`LazyModule`, so expensive top-level module evaluation can occur after
that
existing span has ended and remain invisible in traces.

### How?

The App Route module wraps only its lazy userland factory with the
Next.js
tracer. `LazyModule` still memoizes that factory, so each route-module
instance
emits one span for its successful cold initialization and warm requests
reuse
the initialized value. The HMR getter remains untraced, and the span
records no
resolved filename or request URL.

The integration fixture uses top-level await to exercise the
asynchronous
module path. Coverage verifies the span is a descendant of the request,
appears exactly once across cold and warm requests, and works with the
direct
entrypoint handler.

### Verification

- `pnpm exec jest packages/next/src/server/lib/trace/tracer.test.ts
--runInBand`
- `HEADLESS=true pnpm test-dev-turbo
test/e2e/opentelemetry/instrumentation/opentelemetry.test.ts -t 'should
trace cold App Route module loading'`
- `HEADLESS=true pnpm test-dev-webpack
test/e2e/opentelemetry/instrumentation/opentelemetry.test.ts -t 'should
trace cold App Route module loading'`
- `HEADLESS=true pnpm test-start-turbo
test/e2e/opentelemetry/instrumentation/opentelemetry.test.ts -t 'should
trace cold App Route module loading'`
- `HEADLESS=true pnpm test-start-webpack
test/e2e/opentelemetry/instrumentation/opentelemetry.test.ts -t 'should
trace cold App Route module loading'`
- Exact-head GitHub build-and-test run `31950299347`: 102/102 jobs
passed.
- Exact-head Generate Stats run `31950299340`: passed.
@pull pull Bot locked and limited conversation to collaborators Aug 18, 2026
@pull pull Bot added the ⤵️ pull label Aug 18, 2026
@pull
pull Bot merged commit d00eb6b into code:canary Aug 18, 2026
15 of 18 checks passed
@pull
pull Bot had a problem deploying to preview-builds August 18, 2026 16:29 Failure
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants