* fix(solid-router): make the global loading boundary opt-in and server/client-symmetric
`Matches` wrapped the match tree in a client-only `Solid.Loading`
boundary unless `disableGlobalCatchBoundary`, `isServer`, or
`router.ssr` was set, while the server side always rendered
`SafeFragment`. Apps that server-render without the `$_TSR` stream
protocol (own server entry: memory history, awaited `router.load()`,
`renderToStream`) never set `router.ssr`, so the client hydrated a
boundary the server never rendered. That desyncs Solid's positional
node claiming and surfaces as an opaque `reconcileArrays` crash
(`NotFoundError: insertBefore`).
The wrapper is now opt-in and the decision is evaluated identically on
the server and the client. It renders only when all of these hold:
- the app configured root pending UI (root `pendingComponent` or
`defaultPendingComponent`) — new;
- `router.ssr` is not set (the `$_TSR` protocol short-circuit,
unchanged and pinned by tests);
- `disableGlobalCatchBoundary` is not set (unchanged).
There is no `isServer` arm, no hydration probe, and no match-state
inspection — the decision reads only router configuration, so the
server tree and the hydrating client tree cannot disagree.
With nothing configured there is no wrapper at all: pending propagates
as ordinary Solid 2 async. The previous behavior there was an invisible
`Solid.Loading` with a `null` fallback, which also converted errors to
pending. With pending UI configured, the boundary now renders on both
sides, so external SSR hydrates cleanly (server nodes claimed and
reused, no pending flash) and the pending UI keeps working for
post-hydration navigations — a client-only wrapper, even a settled one,
shifts hydration-key derivation and leaves the server nodes unclaimed.
Tests: matches-hydration-boundary.test.tsx pins the opt-in decision,
the protocol short-circuit, `disableGlobalCatchBoundary`, and that the
decision is identical whether or not a hydration pass is in flight (a
hydration-keyed decision would freeze `SafeFragment` into hydrated apps
permanently); server-mode matchesLoadingBoundary.test.tsx pins the
symmetric server output. Verified additionally against a real
`renderToString` -> `hydrate` round trip: zero hydration errors, zero
unclaimed nodes, server DOM reused by identity.
Co-authored-by: Cursor <cursoragent@cursor.com>
* ci: apply automated fixes
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
onMount is gone in Solid 2 — record the pending/target mount events via
onSettled instead. Also picks up routeTree.gen.ts regeneration churn.
Verified with the selective-ssr e2e suite (11/11 passing).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Solid 2's streaming renderer resolves the modules behind server-rendered
lazy() boundaries through its `manifest` render option: it emits stylesheet
links and modulepreloads for the lazy chunk and serializes the module→asset
map the client needs to preload it before hydration. TanStack Start never
provided that manifest — its own start manifest is route-keyed and
intentionally excludes dynamic-import chunks — so direct visits to routes
with SSR'd lazy() components rendered without the lazy chunk's CSS and
logged "Asset manifest returned no client assets" on every request.
(Pre-merge this was masked: the old Match tree re-rendered the boundary
client-side after the failed hydration, fetching the CSS late via Vite's
dynamic-import helper.)
Wire up vite-plugin-solid's `virtual:solid-manifest` (dev module-graph
resolver in dev, the client build's `.vite/manifest.json` in builds), kept
entirely inside the solid packages:
- solid-router ships an inert `ssr/clientAssetsManifest` stub that the
renderers prefer over the route-keyed manifest when non-undefined
- solid-start's vite plugin swaps the stub for `virtual:solid-manifest` in
the server environment (with `isEntry` neutralized so Solid doesn't
duplicate the entry stylesheet Start already emits) and enables
`build.manifest` for the client build
- bundlers without the plugin (rsbuild) keep the stub and current behavior
Fixes the two shared-widget lazy-CSS tests in the solid-start
start-manifest e2e (10/10 passing; selective-ssr and basic suites verified
unaffected).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Solid 2 derives hydration keys from the reactive owner tree, and its server
onSettled stub consumes a child-id slot to mirror the client's effect owner.
The server early-return in Transitioner skipped that registration, shifting
every subsequent hydration key by one and causing a root-level hydration
mismatch that discarded the server-rendered HTML (breaking deferred/streaming
content and redirects in the solid-start e2e suites).
Run the same code on both sides again: the onSettled callback never executes
on the server, so only the owner-tree structure is shared.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Use the Start storage context for request cancellation and focused server entrypoints to keep unrelated route dependencies out of the RSC module graph. Add emitted-build regression coverage for the boundary.
fixes#7938
* Upgrade solidjs beta 29
Upgrade `solid-js`, `@solidjs/web` and `babel-preset-solid` to
`2.0.0-beta.29`, and `vite-plugin-solid` to `3.0.0-next.20`
(peer-requires `>=2.0.0-beta.28`).
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Upgrade vite-plugin-solid to 3.0.0-next.21
Peer-requires `>=2.0.0-beta.29` (already satisfied) and ships
`@dom-expressions/compiler@0.50.0-next.34`.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Upgrade @tanstack/solid-query to 6.0.0-beta.7
Bump `@tanstack/solid-query` and `@tanstack/solid-query-devtools` to
`6.0.0-beta.7`. The devtools package peer-requires
`@tanstack/solid-query: ^6.0.0-beta.7`, so the two must move together.
`@tanstack/solid-query` is pinned through the `catalog:` entry in
pnpm-workspace.yaml and forced repo-wide via `overrides`, so the catalog
value is bumped alongside the package.json ranges — editing the
package.json ranges alone has no effect on resolution.
Both packages are added to `minimumReleaseAgeExclude`; the repo gates on
`minimumReleaseAge: 1440` and these betas are newer than that.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Upgrade `solid-js`, `@solidjs/web` and `babel-preset-solid` to
`2.0.0-beta.27`, and `vite-plugin-solid` to `3.0.0-next.17`
(peer-requires `>=2.0.0-beta.26`).
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
* chore: upgrade Solid v2 packages to 2.0.0-beta.20
Bumps solid-js and @solidjs/web from 2.0.0-beta.19 to 2.0.0-beta.20 and
vite-plugin-solid from 3.0.0-next.11 to 3.0.0-next.13 across packages,
examples, e2e apps, and benchmarks.
vite-plugin-solid 3.0.0-next.13 defaults to the new native JSX backend
(@dom-expressions/compiler), which is an incomplete milestone build that
cannot compile components with element children yet ("Only text and
expression component children are implemented in the AST-native
milestone"). Every vite-plugin-solid call site now passes
compiler: 'babel' to keep the babel-preset-solid pipeline until the
native compiler matures.
Also fixes two pins that had gone stale: the quickstart-webpack example's
direct babel-preset-solid pin (stuck on beta.18) and
@rsbuild/plugin-solid's babel-preset-solid lockfile resolution (also
beta.18), so the compiler and runtime are in lockstep everywhere.
Verified with solid-router test:unit (client + server modes) and
e2e/solid-start/basic (pnpm build + test:e2e:local).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* chore: use the native JSX compiler (vite-plugin-solid default)
Removes the compiler: 'babel' escape hatch from all vite-plugin-solid
call sites, returning to next.13's default native backend
(@dom-expressions/compiler).
The native compiler's only unimplemented construct that this repo used
was a fragment passed as a component's child (dom mode only). The single
instance — the redundant <>{props.children}</> wrapper in solid-router's
ClientOnly — is removed; props.children is a valid JSX child on its own.
Verified: solid-router test:unit (client + server), e2e/solid-start/basic
(pnpm build + test:e2e:local), and a direct scan of all 1353 solid
.tsx/.jsx files in the repo through @dom-expressions/compiler in both
dom and ssr modes with zero failures.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>