diff --git a/.changeset/brave-pans-create.md b/.changeset/brave-pans-create.md
new file mode 100644
index 0000000000..0411cdfa59
--- /dev/null
+++ b/.changeset/brave-pans-create.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+Update to beta.4
diff --git a/.changeset/brown-breads-begin.md b/.changeset/brown-breads-begin.md
new file mode 100644
index 0000000000..0c54b09096
--- /dev/null
+++ b/.changeset/brown-breads-begin.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+Fix two related issues with HeadContent in solid-router
diff --git a/.changeset/bump-solid-query-beta-5.md b/.changeset/bump-solid-query-beta-5.md
new file mode 100644
index 0000000000..270f7bf30f
--- /dev/null
+++ b/.changeset/bump-solid-query-beta-5.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+---
+
+Upgrade `@tanstack/solid-query` to `6.0.0-beta.5`
diff --git a/.changeset/bump-solid-query-rc-4.md b/.changeset/bump-solid-query-rc-4.md
new file mode 100644
index 0000000000..016ce240fc
--- /dev/null
+++ b/.changeset/bump-solid-query-rc-4.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+---
+
+Upgrade `@tanstack/solid-query` to `6.0.0-rc.4`
diff --git a/.changeset/bump-solid-rc-16.md b/.changeset/bump-solid-rc-16.md
new file mode 100644
index 0000000000..64a1880fa1
--- /dev/null
+++ b/.changeset/bump-solid-rc-16.md
@@ -0,0 +1,14 @@
+---
+'@tanstack/solid-router': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-start': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+---
+
+Bump solid-js and @solidjs/web to ^2.0.0-rc.16 and @solidjs/vite-plugin to ^3.0.0-next.51 across the monorepo (with @solidjs/babel-plugin 2.0.0-rc.16 for the webpack path and the `@rsbuild/plugin-solid` compiler overrides), and raise the Solid packages' solid-js / @solidjs/web peer floors to 2.0.0-rc.16. @solidjs/vite-plugin 3.0.0-next.51 peer-requires rc.16 and no longer adds a `$$moduleUrl` export to SSR entry chunks, which Cloudflare Workers rejected (solidjs/solid-vite-plugin#423).
+
+Bump @tanstack/solid-query to ^6.0.0-rc.5 and move @tanstack/solid-query-devtools off its exact 6.0.0-rc.1 pin to ^6.0.0-rc.5; every solid-js export the rc.5 devtools import exists in rc.16.
+
+`` no longer renders its children with `undefined` data while hydrating a streamed deferred promise. seroval has already settled the promise by then, but `defer()` only records the result in a `.then` callback, so `` now reads seroval's synchronous status markers when the deferred state is still pending.
diff --git a/.changeset/bump-solid-rc-2.md b/.changeset/bump-solid-rc-2.md
new file mode 100644
index 0000000000..875876dc38
--- /dev/null
+++ b/.changeset/bump-solid-rc-2.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-start': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+---
+
+Bump solid-js and @solidjs/web to ^2.0.0-rc.2 and @solidjs/vite-plugin to ^3.0.0-next.32 across the monorepo.
diff --git a/.changeset/bump-solid-rc-20.md b/.changeset/bump-solid-rc-20.md
new file mode 100644
index 0000000000..7db54eb07c
--- /dev/null
+++ b/.changeset/bump-solid-rc-20.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-start': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+---
+
+Bump solid-js and @solidjs/web to ^2.0.0-rc.20 and @solidjs/vite-plugin to ^3.0.0-next.54 across the monorepo (with @solidjs/babel-plugin 2.0.0-rc.20 for the webpack path and the `@rsbuild/plugin-solid` compiler overrides), and raise the Solid packages' solid-js / @solidjs/web peer floors to 2.0.0-rc.20.
diff --git a/.changeset/bump-solid-rc-4.md b/.changeset/bump-solid-rc-4.md
new file mode 100644
index 0000000000..079673ee61
--- /dev/null
+++ b/.changeset/bump-solid-rc-4.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-start': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+---
+
+Bump solid-js and @solidjs/web to ^2.0.0-rc.4 and @solidjs/vite-plugin to ^3.0.0-next.35 across the monorepo.
diff --git a/.changeset/bump-solid-rc-6.md b/.changeset/bump-solid-rc-6.md
new file mode 100644
index 0000000000..b7f8375097
--- /dev/null
+++ b/.changeset/bump-solid-rc-6.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-start': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+---
+
+Bump solid-js, @solidjs/web, and @solidjs/signals to ^2.0.0-rc.6 across the monorepo. rc.6 provides the named flight-data source API (registerFlightDataSource / two-argument subscribeFlightData) that the Start single-flight integration now requires; @tanstack/solid-start's peer floor moves to rc.6 accordingly.
diff --git a/.changeset/bump-solid-rc-8.md b/.changeset/bump-solid-rc-8.md
new file mode 100644
index 0000000000..41a0a604db
--- /dev/null
+++ b/.changeset/bump-solid-rc-8.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-start': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+---
+
+Bump solid-js and @solidjs/web to ^2.0.0-rc.8 and @solidjs/vite-plugin to ^3.0.0-next.43 across the monorepo (with @rsbuild/plugin-solid ^2.0.0-rc.0 and @solidjs/babel-plugin ^2.0.0-rc.8 for the rsbuild/webpack paths). rc.8 is ESM-only and declares `engines.node >= 22.12`. @solidjs/vite-plugin 3.0.0-next.43 is the first release that honors `resolve.noExternal` patterns when it externalizes the dependencies of packages that consume the Solid runtime (solidjs/solid-vite-plugin#360); on next.41 and next.42, `vite dev` fails for TanStack Start apps with "Package import specifier '#tanstack-router-entry' is not defined".
diff --git a/.changeset/bump-solid-rc-9.md b/.changeset/bump-solid-rc-9.md
new file mode 100644
index 0000000000..bad75b7481
--- /dev/null
+++ b/.changeset/bump-solid-rc-9.md
@@ -0,0 +1,14 @@
+---
+'@tanstack/solid-router': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-start': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+---
+
+Bump solid-js and @solidjs/web to ^2.0.0-rc.9 and @solidjs/vite-plugin to ^3.0.0-next.44 across the monorepo (with @solidjs/babel-plugin 2.0.0-rc.9 for the webpack path). @solidjs/vite-plugin 3.0.0-next.44 peer-requires solid-js ^2.0.0-rc.9 and ships the rc.9 compiler.
+
+rc.9 changed `serverFunctionUrl` to describe a `GET()` reference's own call (`serverFunctionUrl(fn, ...args)`) and moved the id-based form-post address to `serverFunctionActionUrl` / `parseServerFunctionActionUrl` (solidjs/solid#3440); @tanstack/solid-start's server-function handler now uses those.
+
+Rsbuild apps: `@rsbuild/plugin-solid@2.0.0-rc.0` hard-pins the rc.6 compiler, which emits the old delegated-event key (`el.$$click`) that the rc.9 runtime no longer reads (`_$$click`), so delegated handlers never fire. Until the plugin ships an rc.9-based release, override its `@solidjs/compiler` and `@solidjs/babel-plugin` to 2.0.0-rc.9 (the monorepo does this in `pnpm-workspace.yaml`).
diff --git a/.changeset/clever-apples-jog.md b/.changeset/clever-apples-jog.md
new file mode 100644
index 0000000000..279c5ab8d2
--- /dev/null
+++ b/.changeset/clever-apples-jog.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+fix: move HydrationScript to HeadContent
diff --git a/.changeset/clever-bears-stand.md b/.changeset/clever-bears-stand.md
new file mode 100644
index 0000000000..1d4eb2d164
--- /dev/null
+++ b/.changeset/clever-bears-stand.md
@@ -0,0 +1,7 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade to Solid 2.0.0-beta.5
diff --git a/.changeset/clever-vans-yawn.md b/.changeset/clever-vans-yawn.md
new file mode 100644
index 0000000000..2f2ad97772
--- /dev/null
+++ b/.changeset/clever-vans-yawn.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+build: bundle packages with rolldown
diff --git a/.changeset/cruel-tips-shine.md b/.changeset/cruel-tips-shine.md
new file mode 100644
index 0000000000..b282563a90
--- /dev/null
+++ b/.changeset/cruel-tips-shine.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade to solidjs beta 14
diff --git a/.changeset/cuddly-drinks-count.md b/.changeset/cuddly-drinks-count.md
new file mode 100644
index 0000000000..d02d0893b2
--- /dev/null
+++ b/.changeset/cuddly-drinks-count.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+chore: sync main to pre-release branch
diff --git a/.changeset/curly-times-sip.md b/.changeset/curly-times-sip.md
new file mode 100644
index 0000000000..a7f13c676d
--- /dev/null
+++ b/.changeset/curly-times-sip.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade to Solid v2.0.0-beta.6
diff --git a/.changeset/cyan-otters-notice.md b/.changeset/cyan-otters-notice.md
new file mode 100644
index 0000000000..c2b84d53fd
--- /dev/null
+++ b/.changeset/cyan-otters-notice.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade to solid v2 beta 10
diff --git a/.changeset/evil-parrots-end.md b/.changeset/evil-parrots-end.md
new file mode 100644
index 0000000000..6f7116a6c4
--- /dev/null
+++ b/.changeset/evil-parrots-end.md
@@ -0,0 +1,6 @@
+---
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+Bump to solid js 2.0.0-beta.3
diff --git a/.changeset/fuzzy-peas-sneeze.md b/.changeset/fuzzy-peas-sneeze.md
new file mode 100644
index 0000000000..95bd1c048d
--- /dev/null
+++ b/.changeset/fuzzy-peas-sneeze.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+Update to solid v2 beta 8
diff --git a/.changeset/hot-pillows-bathe.md b/.changeset/hot-pillows-bathe.md
new file mode 100644
index 0000000000..f6b3bf8463
--- /dev/null
+++ b/.changeset/hot-pillows-bathe.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+chore: bump solid 2 to beta.7
diff --git a/.changeset/load-flight-target.md b/.changeset/load-flight-target.md
new file mode 100644
index 0000000000..ab03351452
--- /dev/null
+++ b/.changeset/load-flight-target.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+New `loadFlightTarget` helper (exported from `@tanstack/solid-router/ssr/server`): the router's half of a single-flight refresh. Given the mutation request's target href, it builds a router for that location, loads it, and returns the dehydrated payload for the `tsr` flight-data slice, so server collectors can refresh router state alongside other caches on the same mutation response.
diff --git a/.changeset/modern-islands-enjoy.md b/.changeset/modern-islands-enjoy.md
new file mode 100644
index 0000000000..2d8953740d
--- /dev/null
+++ b/.changeset/modern-islands-enjoy.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+fix: pin solid 2 beta.6 due to server range with -experimental tag
diff --git a/.changeset/named-flight-source.md b/.changeset/named-flight-source.md
new file mode 100644
index 0000000000..ec82099738
--- /dev/null
+++ b/.changeset/named-flight-source.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-start': patch
+---
+
+Adopt Solid's multi-source single-flight protocol: the router's flight data (loader/match state, dehydrated data) registers under its own source id (`tsr`), so other caches' slices — e.g. solid-query's `sq` — coexist on the same mutation response instead of competing for a single consumer slot, and a user-supplied `collectFlightData` hook adds data alongside the router's rather than displacing it. Requires solid-js / @solidjs/web 2.0.0-rc.6+ (named flight-data sources).
diff --git a/.changeset/petite-icons-press.md b/.changeset/petite-icons-press.md
new file mode 100644
index 0000000000..b33b9eda69
--- /dev/null
+++ b/.changeset/petite-icons-press.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+---
+
+chore: bump solid-query to 6.0.0-alpha.1
diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 0000000000..057a165725
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,127 @@
+{
+ "mode": "pre",
+ "tag": "rc",
+ "initialVersions": {
+ "@tanstack/arktype-adapter": "1.167.0",
+ "@tanstack/eslint-plugin-router": "1.162.0",
+ "@tanstack/eslint-plugin-start": "0.1.0",
+ "@tanstack/history": "1.162.0",
+ "@tanstack/nitro-v2-vite-plugin": "1.155.0",
+ "@tanstack/react-router": "1.170.19",
+ "@tanstack/react-router-devtools": "1.167.1",
+ "@tanstack/react-router-ssr-query": "1.167.1",
+ "@tanstack/react-start": "1.168.36",
+ "@tanstack/react-start-client": "1.168.17",
+ "@tanstack/react-start-rsc": "0.1.35",
+ "@tanstack/react-start-server": "1.167.24",
+ "@tanstack/router-cli": "1.167.22",
+ "@tanstack/router-core": "1.171.16",
+ "@tanstack/router-devtools": "1.167.1",
+ "@tanstack/router-devtools-core": "1.168.1",
+ "@tanstack/router-generator": "1.167.22",
+ "@tanstack/router-plugin": "1.168.24",
+ "@tanstack/router-ssr-query-core": "1.169.1",
+ "@tanstack/router-utils": "1.162.2",
+ "@tanstack/router-vite-plugin": "1.167.24",
+ "@tanstack/solid-router": "2.0.0-beta.30",
+ "@tanstack/solid-router-devtools": "2.0.0-beta.25",
+ "@tanstack/solid-router-ssr-query": "2.0.0-beta.31",
+ "@tanstack/solid-start": "2.0.0-beta.31",
+ "@tanstack/solid-start-client": "2.0.0-beta.30",
+ "@tanstack/solid-start-server": "2.0.0-beta.30",
+ "@tanstack/start-client-core": "1.170.15",
+ "@tanstack/start-fn-stubs": "1.162.0",
+ "@tanstack/start-plugin-core": "1.171.27",
+ "@tanstack/start-server-core": "1.169.19",
+ "@tanstack/start-static-server-functions": "1.167.20",
+ "@tanstack/start-storage-context": "1.167.18",
+ "@tanstack/valibot-adapter": "1.167.0",
+ "@tanstack/virtual-file-routes": "1.162.0",
+ "@tanstack/vue-router": "1.170.18",
+ "@tanstack/vue-router-devtools": "1.167.1",
+ "@tanstack/vue-router-ssr-query": "1.167.1",
+ "@tanstack/vue-start": "1.168.34",
+ "@tanstack/vue-start-client": "1.167.20",
+ "@tanstack/vue-start-server": "1.167.24",
+ "@tanstack/zod-adapter": "1.167.0"
+ },
+ "changesets": [
+ "brave-pans-create",
+ "brown-breads-begin",
+ "bump-solid-query-beta-5",
+ "bump-solid-query-rc-4",
+ "bump-solid-rc-16",
+ "bump-solid-rc-2",
+ "bump-solid-rc-20",
+ "bump-solid-rc-4",
+ "bump-solid-rc-6",
+ "bump-solid-rc-8",
+ "bump-solid-rc-9",
+ "clever-apples-jog",
+ "clever-bears-stand",
+ "clever-vans-yawn",
+ "cruel-tips-shine",
+ "cuddly-drinks-count",
+ "curly-times-sip",
+ "cyan-otters-notice",
+ "evil-parrots-end",
+ "fuzzy-peas-sneeze",
+ "hot-pillows-bathe",
+ "load-flight-target",
+ "modern-islands-enjoy",
+ "named-flight-source",
+ "petite-icons-press",
+ "proxy-free-link-props",
+ "quiet-shrimps-jam",
+ "retire-solid-router-ssr-query",
+ "shaky-tools-think",
+ "silent-streets-camp",
+ "smooth-swans-ask",
+ "social-mails-sort",
+ "social-rules-fold",
+ "solid-functions-flight",
+ "solid-js-beta-15",
+ "solid-js-beta-17",
+ "solid-js-beta-18",
+ "solid-js-beta-19",
+ "solid-js-beta-20",
+ "solid-js-beta-21",
+ "solid-js-beta-25",
+ "solid-js-beta-27",
+ "solid-js-beta-29",
+ "solid-js-beta-32",
+ "solid-js-rc-0",
+ "solid-kings-help",
+ "solid-lazy-route-components",
+ "solid-link-idle-preload-listeners",
+ "solid-link-role",
+ "solid-match-suspend-ssr-only",
+ "solid-native-ssr-transfer",
+ "solid-router-dev-ssr-detection",
+ "solid-router-no-router-owned-loading-boundaries",
+ "solid-router-observe-blocker-interaction",
+ "solid-router-observe-first-load-redirect",
+ "solid-router-observe-initial-route",
+ "solid-router-observe-interaction",
+ "solid-router-observe-location-href",
+ "solid-router-observe-navigation",
+ "solid-router-observe-pending-not-found",
+ "solid-router-observe-redirect-hops",
+ "solid-router-observe-route-names",
+ "solid-router-public-hydration-api",
+ "solid-router-server-function-metadata",
+ "solid-router-settlement-ack",
+ "solid-rsbuild-native-loader",
+ "solid-server-fn-abort-signal",
+ "solid-usehead-registry",
+ "spotty-moons-listen",
+ "store-bridge-single-flush",
+ "tall-horses-repair",
+ "tame-lions-hunt",
+ "three-carrots-return",
+ "tiny-beds-tan",
+ "tired-pants-eat",
+ "violet-turkeys-cross",
+ "wicked-olives-poke"
+ ]
+}
diff --git a/.changeset/proxy-free-link-props.md b/.changeset/proxy-free-link-props.md
new file mode 100644
index 0000000000..e0f5879cc3
--- /dev/null
+++ b/.changeset/proxy-free-link-props.md
@@ -0,0 +1,23 @@
+---
+'@tanstack/solid-router': patch
+---
+
+perf(solid-router): make `useLinkProps` proxy-free in the spread hot path
+
+`useLinkProps` previously layered four proxies (`merge` for defaults, two
+`splitProps`/`omit` proxies, and a final `merge` of spreadable props with the
+resolved props memo). Solid's `spread()` re-enumerated all of them through V8
+proxy traps on every navigation, for every `Link`, which showed up in CodSpeed
+profiles as a large unattributed "NodeJS internals" cost.
+
+`useLinkProps` now returns a plain object with a stable key set whose
+reactivity lives in property getters backed by fine-grained memos. Values that
+no longer apply resolve to `undefined`, which `spread()` treats as attribute
+removal. The built-location memo also gained href-based equality so downstream
+memos skip work when a navigation doesn't change a link's target.
+
+This makes the client-side navigation benchmark ~30% faster.
+
+Note: keys returned by `activeProps`/`inactiveProps` functions are discovered
+once at setup — functions that later return brand-new keys (beyond the initial
+set plus `class`/`style`) won't have those keys applied.
diff --git a/.changeset/quiet-shrimps-jam.md b/.changeset/quiet-shrimps-jam.md
new file mode 100644
index 0000000000..240815ab5c
--- /dev/null
+++ b/.changeset/quiet-shrimps-jam.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+---
+
+fix: use solid v2 compatible solid-query
diff --git a/.changeset/retire-solid-router-ssr-query.md b/.changeset/retire-solid-router-ssr-query.md
new file mode 100644
index 0000000000..7603eaeecd
--- /dev/null
+++ b/.changeset/retire-solid-router-ssr-query.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+---
+
+Deprecated: Solid Query's `QueryClientProvider` now carries the Router + Query SSR pairing natively (registry hydration, named single-flight sources, redirect handling via userland glue), so this integration package is no longer needed. See the README for the migration.
diff --git a/.changeset/shaky-tools-think.md b/.changeset/shaky-tools-think.md
new file mode 100644
index 0000000000..2218cdd8d4
--- /dev/null
+++ b/.changeset/shaky-tools-think.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+---
+
+chore: bump solid-query to 6.0.0-alpha.2
diff --git a/.changeset/silent-streets-camp.md b/.changeset/silent-streets-camp.md
new file mode 100644
index 0000000000..e2d8144dd7
--- /dev/null
+++ b/.changeset/silent-streets-camp.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+fix: adjust pre-release ranges
diff --git a/.changeset/smooth-swans-ask.md b/.changeset/smooth-swans-ask.md
new file mode 100644
index 0000000000..bf7ecda35a
--- /dev/null
+++ b/.changeset/smooth-swans-ask.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+fix: add vite 8 compat
diff --git a/.changeset/social-mails-sort.md b/.changeset/social-mails-sort.md
new file mode 100644
index 0000000000..77309d35a0
--- /dev/null
+++ b/.changeset/social-mails-sort.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': major
+'@tanstack/solid-router-devtools': major
+'@tanstack/solid-start-client': major
+'@tanstack/solid-start-server': major
+'@tanstack/solid-router': major
+'@tanstack/solid-start': major
+---
+
+solid v2 pre-release for solid-router and start
diff --git a/.changeset/social-rules-fold.md b/.changeset/social-rules-fold.md
new file mode 100644
index 0000000000..62c77ee9cd
--- /dev/null
+++ b/.changeset/social-rules-fold.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+chore: bump solid-query and vite-plugin-solid
diff --git a/.changeset/solid-functions-flight.md b/.changeset/solid-functions-flight.md
new file mode 100644
index 0000000000..de272fadd2
--- /dev/null
+++ b/.changeset/solid-functions-flight.md
@@ -0,0 +1,12 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Run Solid Start server functions through the Solid 2 server-function runtime, including request handling, serialization, middleware, direct SSR calls, and no-JS forms.
+
+POST server functions now use Solid 2's single-flight transport to return updated Router loader and hydration data with the mutation response.
diff --git a/.changeset/solid-js-beta-15.md b/.changeset/solid-js-beta-15.md
new file mode 100644
index 0000000000..93e0d17c2a
--- /dev/null
+++ b/.changeset/solid-js-beta-15.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-beta.15`
diff --git a/.changeset/solid-js-beta-17.md b/.changeset/solid-js-beta-17.md
new file mode 100644
index 0000000000..bfa0012943
--- /dev/null
+++ b/.changeset/solid-js-beta-17.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-beta.17`
diff --git a/.changeset/solid-js-beta-18.md b/.changeset/solid-js-beta-18.md
new file mode 100644
index 0000000000..be50246023
--- /dev/null
+++ b/.changeset/solid-js-beta-18.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-beta.18`
diff --git a/.changeset/solid-js-beta-19.md b/.changeset/solid-js-beta-19.md
new file mode 100644
index 0000000000..9f488348bc
--- /dev/null
+++ b/.changeset/solid-js-beta-19.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-beta.19` and `vite-plugin-solid` to `3.0.0-next.11`
diff --git a/.changeset/solid-js-beta-20.md b/.changeset/solid-js-beta-20.md
new file mode 100644
index 0000000000..2f531e0c6a
--- /dev/null
+++ b/.changeset/solid-js-beta-20.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-beta.20`
diff --git a/.changeset/solid-js-beta-21.md b/.changeset/solid-js-beta-21.md
new file mode 100644
index 0000000000..aeb66b6f90
--- /dev/null
+++ b/.changeset/solid-js-beta-21.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-beta.21`
diff --git a/.changeset/solid-js-beta-25.md b/.changeset/solid-js-beta-25.md
new file mode 100644
index 0000000000..934dd8661e
--- /dev/null
+++ b/.changeset/solid-js-beta-25.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-beta.25`
diff --git a/.changeset/solid-js-beta-27.md b/.changeset/solid-js-beta-27.md
new file mode 100644
index 0000000000..49ee209768
--- /dev/null
+++ b/.changeset/solid-js-beta-27.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-beta.27`
diff --git a/.changeset/solid-js-beta-29.md b/.changeset/solid-js-beta-29.md
new file mode 100644
index 0000000000..c9fa2b2729
--- /dev/null
+++ b/.changeset/solid-js-beta-29.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-beta.29`
diff --git a/.changeset/solid-js-beta-32.md b/.changeset/solid-js-beta-32.md
new file mode 100644
index 0000000000..ad1c5d575b
--- /dev/null
+++ b/.changeset/solid-js-beta-32.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-beta.32`
diff --git a/.changeset/solid-js-rc-0.md b/.changeset/solid-js-rc-0.md
new file mode 100644
index 0000000000..59ca0fcbdc
--- /dev/null
+++ b/.changeset/solid-js-rc-0.md
@@ -0,0 +1,16 @@
+---
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-start': patch
+---
+
+Upgrade `solid-js` and `@solidjs/web` to `2.0.0-rc.0`, and migrate from `vite-plugin-solid` to its new name `@solidjs/vite-plugin` at `3.0.0-next.28`
+
+`vite-plugin-solid` was renamed to `@solidjs/vite-plugin`; its final release (`3.0.0-next.27`) is a re-export shim over the new package. `@solidjs/vite-plugin@3.0.0-next.28` requires `solid-js`/`@solidjs/web` `^2.0.0-rc.0`, so the rename and the `rc` bump land together.
+
+`@tanstack/router-plugin` is intentionally untouched: it detects the Solid JSX plugin by its Vite plugin _name_ (`solid`), which the renamed package still registers, and its `vite-plugin-solid` peer is optional — so it keeps working for both Solid 1 and Solid 2 consumers without a change.
+
+Also bumps `@tanstack/solid-query` and `@tanstack/solid-query-devtools` to `^6.0.0-rc.0` (whose peer requires `solid-js >=2.0.0-rc.0`), and converges `@tanstack/query-core` on `5.101.4` — `solid-query` depends on query-core `5.101.0`, which previously resolved to a stale `5.99.0` and produced two incompatible `QueryClient` types.
diff --git a/.changeset/solid-kings-help.md b/.changeset/solid-kings-help.md
new file mode 100644
index 0000000000..b638658e9b
--- /dev/null
+++ b/.changeset/solid-kings-help.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Upgrade solid refresh, fix deep equal for promises
diff --git a/.changeset/solid-lazy-route-components.md b/.changeset/solid-lazy-route-components.md
new file mode 100644
index 0000000000..7d75969507
--- /dev/null
+++ b/.changeset/solid-lazy-route-components.md
@@ -0,0 +1,17 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+`lazyRouteComponent` now delegates to Solid's `lazy()` using its `{ export }`
+option (solid-js 2.0.0-rc.1): the module namespace passes through untouched,
+so SSR'd route chunks resolve their client assets (stylesheet links,
+modulepreload hints, hydration gating) through the client-assets manifest,
+and hydration claims the component synchronously from the preloaded module.
+Failed chunk downloads are retried by the next preload or render, and the
+module-not-found reload-once behavior is unchanged. Solid packages are
+bumped to the 2.0.0-rc.1 line (`@solidjs/vite-plugin` 3.0.0-next.30).
diff --git a/.changeset/solid-link-idle-preload-listeners.md b/.changeset/solid-link-idle-preload-listeners.md
new file mode 100644
index 0000000000..345c56f777
--- /dev/null
+++ b/.changeset/solid-link-idle-preload-listeners.md
@@ -0,0 +1,18 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Stop installing intent-preload listeners on `` when intent preloading is off.
+
+`useLinkProps` handed out `onFocus`/`onBlur`/`onMouseEnter`/`onMouseLeave` (and the
+mouse-over/out/touch-start pair) unconditionally, with the `preload() !== 'intent'`
+check living _inside_ each handler. Solid does not delegate `mouseenter`,
+`mouseleave`, `focus` or `blur`, so every anchor installed four real listeners that
+did nothing but return — on a list view that is four per row (a 165-row board
+measured 660 listeners whose only job was to bail).
+
+The handlers are now resolved through getters: with intent preloading off the
+property yields whatever the consumer passed (or `undefined`, which `spread()`
+treats as removal), and nothing is attached. Behaviour is unchanged — the getters
+stay reactive, so flipping `preload` back to `'intent'` re-runs the consuming
+spread and attaches the composed handler.
diff --git a/.changeset/solid-link-role.md b/.changeset/solid-link-role.md
new file mode 100644
index 0000000000..b66e1c1dc6
--- /dev/null
+++ b/.changeset/solid-link-role.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Preserve caller-provided roles on enabled links.
diff --git a/.changeset/solid-match-suspend-ssr-only.md b/.changeset/solid-match-suspend-ssr-only.md
new file mode 100644
index 0000000000..c83ea61355
--- /dev/null
+++ b/.changeset/solid-match-suspend-ssr-only.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Suspend on the match `loadPromise` only during SSR. On the client, suspending on the pending match kept a live async source in the tree, which since `solid-js@2.0.0-beta.16` routed signal writes into a transition hold and broke synchronous write-then-load flows such as `invalidate()` on a `notFound` match.
diff --git a/.changeset/solid-native-ssr-transfer.md b/.changeset/solid-native-ssr-transfer.md
new file mode 100644
index 0000000000..08093414b6
--- /dev/null
+++ b/.changeset/solid-native-ssr-transfer.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Native SSR state transfer for Solid: router match state (loaderData, beforeLoad context, status, errors) now rides Solid's hydration registry under `tsr:` keys instead of a bespoke bootstrap script, deferred `loaderData` promises stream natively via seroval, the client primes router state from the registry in the Router constructor (before any render context, eliminating boot-time refetches and `bootLoad`-style workarounds), and `RouterProvider` owns the server-side `router.load()` dispatch so server entries no longer await it manually.
diff --git a/.changeset/solid-router-dev-ssr-detection.md b/.changeset/solid-router-dev-ssr-detection.md
new file mode 100644
index 0000000000..21530ba043
--- /dev/null
+++ b/.changeset/solid-router-dev-ssr-detection.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Fall back to the router instance's server flag during development SSR. This prevents router construction from entering client hydration on the server and restores provider-owned loading and match-state serialization.
diff --git a/.changeset/solid-router-no-router-owned-loading-boundaries.md b/.changeset/solid-router-no-router-owned-loading-boundaries.md
new file mode 100644
index 0000000000..4baa6d86b6
--- /dev/null
+++ b/.changeset/solid-router-no-router-owned-loading-boundaries.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Remove all router-owned `Loading` boundaries from `Matches`, `Match`, and `Outlet`, and only install one in `Await` when a `fallback` is provided. Async reads in route components are no longer caught by an invisible router boundary, so Solid's implicit transitions hold the previous view — live and interactive — until the new route settles, then swap atomically. `pendingComponent` is presented through router pending state (`pendingMs`/`pendingMinMs`) as before; loading boundaries are now exclusively user-provided.
diff --git a/.changeset/solid-router-observe-blocker-interaction.md b/.changeset/solid-router-observe-blocker-interaction.md
new file mode 100644
index 0000000000..82b952637b
--- /dev/null
+++ b/.changeset/solid-router-observe-blocker-interaction.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Observe tier (Solid's dev and observe builds only): a navigation that passes a `useBlocker` keeps the interaction that requested it and is dated from the request, though the history awaits the blocker before it changes; one the blocker holds until `proceed()` joins the interaction that proceeds and is dated from it, as `@solidjs/router`'s `retry()` makes it. The router notes the request at `commitLocation` for the history change to take. A navigation the blocker stops, or a request that changes no history (the same location reloading), leaves nothing noted behind. Nothing changes in production, where `OBSERVE` is undefined.
diff --git a/.changeset/solid-router-observe-first-load-redirect.md b/.changeset/solid-router-observe-first-load-redirect.md
new file mode 100644
index 0000000000..a70d283c45
--- /dev/null
+++ b/.changeset/solid-router-observe-first-load-redirect.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Observe tier (Solid's dev and observe builds only): a redirect while the first page loads — a client-rendered arrival whose `beforeLoad` or loader throws `redirect()` — is recorded as a navigation from the arrival to where the redirect sent it, after the initial record that names the arrival, as `@solidjs/router` records one. It had no record: nothing was shown yet to navigate from. Nothing changes in production, where `OBSERVE` is undefined.
diff --git a/.changeset/solid-router-observe-initial-route.md b/.changeset/solid-router-observe-initial-route.md
new file mode 100644
index 0000000000..fe61ae8df2
--- /dev/null
+++ b/.changeset/solid-router-observe-initial-route.md
@@ -0,0 +1,7 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Observe tier (Solid's dev and observe builds only): the router declares the route the document arrived on, with the same `OBSERVE.attribution.withOrigin` call it makes for every navigation (`initial: true` on the ref), around the work that establishes its initial match — the Transitioner's on the client, `RouterProvider`'s load on the server. On the client this is the first `"navigation"` record (`initial: true`, `at` the document's navigation start, no write to wait for), kept out of `feedback().navigations`; on the server the same declaration names the request's `"render"` record (`RenderEvent.route`: the matched route's `fullPath`, the path and search, the params), read when the render settles, so a render whose provider ran the load names the location it resolved. A consumer naming page loads and requests by route (`/users/$id` rather than one name per user) had this for every navigation but the first; now it has the first too.
+
+The Transitioner committing the canonical form of the arrival location (search defaults, trailing slash) is part of the arrival, as in `@solidjs/router`: the initial record names the canonical location, a router loaded before it mounted no longer records the commit as a navigation, and the next navigation is dated from its own request rather than from that commit. Nothing changes in production, where `OBSERVE` is undefined.
diff --git a/.changeset/solid-router-observe-interaction.md b/.changeset/solid-router-observe-interaction.md
new file mode 100644
index 0000000000..c10135c4e9
--- /dev/null
+++ b/.changeset/solid-router-observe-interaction.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Observe tier (Solid's dev and observe builds only): a navigation's record joins the interaction that requested it — the `` click, or any handler that called `navigate()` — though the match publish it wraps runs after the loaders, long after the handler returned. The Transitioner captures `OBSERVE.attribution.currentOrigin()` with the request time when the history changes and hands it back as `NavigationRef.interaction` (solid-js 2.0.0-rc.12), so the record, and every hold and re-run the publish causes, carries the click. A navigation requested outside any interaction declares none. Nothing changes in production, where `OBSERVE` is undefined.
diff --git a/.changeset/solid-router-observe-location-href.md b/.changeset/solid-router-observe-location-href.md
new file mode 100644
index 0000000000..fc320dadcf
--- /dev/null
+++ b/.changeset/solid-router-observe-location-href.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Observe tier (Solid's dev and observe builds only): a navigation's `to` and `from`, the initial record's `to`, and a server render's `RenderEvent.route.to` are the location's path, search and hash (`/users/42?tab=posts#bio`) rather than its pathname, as `@solidjs/router` gives them — its `href`, in the router's own path space, the one `name` is in (before a basepath or rewrite). A request carries no hash, so a render's `to` is the path and search. The name stays the route pattern the pathname matches. Nothing changes in production, where `OBSERVE` is undefined.
diff --git a/.changeset/solid-router-observe-navigation.md b/.changeset/solid-router-observe-navigation.md
new file mode 100644
index 0000000000..78147b945b
--- /dev/null
+++ b/.changeset/solid-router-observe-navigation.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Declare navigations to Solid's observe tier. On Solid's dev and observe builds (`OBSERVE` defined), the match publish inside `startTransition` is wrapped in `OBSERVE.attribution.withOrigin` with the destination route's `fullPath`, params, `to`/`from` pathnames and `at` from the history change that started the load, so the holds and re-runs a navigation causes are named after the route and the record spans the loader wait. The pending offer, the initial load and same-location reloads are published undeclared. Nothing changes in production, where `OBSERVE` is undefined.
diff --git a/.changeset/solid-router-observe-pending-not-found.md b/.changeset/solid-router-observe-pending-not-found.md
new file mode 100644
index 0000000000..24096baee0
--- /dev/null
+++ b/.changeset/solid-router-observe-pending-not-found.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Observe tier (Solid's dev and observe builds only): a not-found under a route with a loader (`/users/2/nope` under `/users/$id`) is recorded, named by its pathname, as `@solidjs/router` records an unmatched path. The route's match sits below the not-found boundary and never loads, so it stays `pending` in the publish that lands, which was mistaken for the pending offer and published undeclared: the navigation had no record. Only a match pending at or above the not-found boundary marks the pending offer now. Nothing changes in production, where `OBSERVE` is undefined.
diff --git a/.changeset/solid-router-observe-redirect-hops.md b/.changeset/solid-router-observe-redirect-hops.md
new file mode 100644
index 0000000000..e5ae7fd166
--- /dev/null
+++ b/.changeset/solid-router-observe-redirect-hops.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Observe tier (Solid's dev and observe builds only): a navigation sent elsewhere while it is pending — a `beforeLoad` or loader redirecting it, or another navigation requested before it published — is one record with its hops, as `@solidjs/router` declares one: the record keeps the first request's time and interaction, names the destination that showed, and lists the destinations it abandoned in `redirects` (each with its name, `to`, params, and when it was sent on). The router declares a `redirect: n` ref per hop around the publish that lands. The browser moving (back, forward) while a navigation is pending supersedes it instead: a record of its own, from the location shown. Before, the record named only the final destination and kept no hops. Nothing changes in production, where `OBSERVE` is undefined.
diff --git a/.changeset/solid-router-observe-route-names.md b/.changeset/solid-router-observe-route-names.md
new file mode 100644
index 0000000000..2313b52dd6
--- /dev/null
+++ b/.changeset/solid-router-observe-route-names.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Observe tier (Solid's dev and observe builds only): a navigation's record names a not-found by its pathname instead of the route above it, so `/nope` no longer files under `/` beside the home page, and its `params` are the strings the path bound rather than the values `params.parse` returned, as Solid's `NavigationRef` declares them. Nothing changes in production, where `OBSERVE` is undefined.
diff --git a/.changeset/solid-router-public-hydration-api.md b/.changeset/solid-router-public-hydration-api.md
new file mode 100644
index 0000000000..d0249f5d6d
--- /dev/null
+++ b/.changeset/solid-router-public-hydration-api.md
@@ -0,0 +1,12 @@
+---
+'@tanstack/solid-router': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-start': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+---
+
+Bump solid-js and @solidjs/web to ^2.0.0-rc.13 (and @solidjs/vite-plugin to ^3.0.0-next.46), and raise the Solid peer floors to 2.0.0-rc.13.
+
+@tanstack/solid-router moves off Solid's internal `sharedConfig` and the raw `_$HY` registry onto the public hydration API rc.13 ships (solidjs/solid#3718): `useHydrated` reads `isHydrating()`; the native SSR match transfer writes through `getHydrationWriter()` gated on `isHydratable()`, so it now respects ``; and the client boot takes each match's entry with `takeHydrationValue()`.
diff --git a/.changeset/solid-router-server-function-metadata.md b/.changeset/solid-router-server-function-metadata.md
new file mode 100644
index 0000000000..10995632ba
--- /dev/null
+++ b/.changeset/solid-router-server-function-metadata.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Consume Solid server-function response metadata. `RouterContextProvider` registers the router as the transport's unnamed single-flight consumer on the client, so the response helpers a mutation returns take effect without the caller wrapping the call: `redirect()` navigates — same-origin targets softly under the router with `replace`, other origins through a document navigation via `navigate({ href })` so the protocol allowlist and blockers still apply — and any declaration of a write (`redirect()`, `reload({ revalidate })`, `respond(value, { revalidate })`, the reserved `revalidate: '*'`) reloads route data through `router.invalidate()`. An empty declaration (`revalidate: []`) is honored as nothing to reload. Navigation runs before invalidation so a redirect costs one load: the destination commits with its shared layouts reloaded and the page being left never reruns its own loaders. `X-Revalidate` keys name entries in caches the router does not own and are left to those caches' consumers.
diff --git a/.changeset/solid-router-settlement-ack.md b/.changeset/solid-router-settlement-ack.md
new file mode 100644
index 0000000000..c7133af16a
--- /dev/null
+++ b/.changeset/solid-router-settlement-ack.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Resolve the `router.startTransition` render acknowledgement when the commit's transition actually settles instead of immediately after flush. View transitions, `onRendered` (scroll restoration), pending minimum-display timing, and `status: 'idle'` now observe the committed swap instead of firing against held DOM; superseded or rolled-back commits acknowledge `false` instead of leaking. Synchronous navigations still acknowledge within the same flush.
diff --git a/.changeset/solid-rsbuild-native-loader.md b/.changeset/solid-rsbuild-native-loader.md
new file mode 100644
index 0000000000..8532432e66
--- /dev/null
+++ b/.changeset/solid-rsbuild-native-loader.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-start': patch
+---
+
+Patch @rsbuild/plugin-solid's native `solid` loader options for SSR builds. Since 2.0.0-beta.1 the plugin compiles through its own loader (native compiler by default) instead of registering babel-preset-solid, so the babel preset patch never fired and node-target bundles were compiled in dom mode, crashing at import with "Client-only API called on the server side". The rsbuild start plugin now patches the loader's `solid` options (`generate: 'ssr'` on node targets, `hydratable: true`) alongside the legacy babel preset patch.
diff --git a/.changeset/solid-server-fn-abort-signal.md b/.changeset/solid-server-fn-abort-signal.md
new file mode 100644
index 0000000000..f6f9202526
--- /dev/null
+++ b/.changeset/solid-server-fn-abort-signal.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-start': patch
+---
+
+Support per-call AbortSignals for Solid server functions. solid-js 2.0.0-rc.4 added the per-call invocation channel (`invoke(fn, { signal }, ...args)`) and moved server function id resolution from the `X-Server-Function` header to the request url pathname; the client rpc now rides that channel when a `signal` is passed to a server function, and the server handler resolves/normalizes ids via the url. The previously skipped abort e2e tests are re-enabled.
diff --git a/.changeset/solid-usehead-registry.md b/.changeset/solid-usehead-registry.md
new file mode 100644
index 0000000000..9af2b378e0
--- /dev/null
+++ b/.changeset/solid-usehead-registry.md
@@ -0,0 +1,19 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+Register head tags through Solid's `useHead` registry. `HeadContent` now
+feeds the route-derived tags to Solid's head registry as one reactive group
+instead of rendering elements in-tree: the registry owns head emission on
+both runtimes (SSR splicing/streaming and client-side patching), replacing
+the manual relocate-into-head, imperative script injection, and
+`document.title` syncing. Inline scripts and styles carry a stable
+content-derived key so server and client reconcile on the same identity.
+`HeadContent` can now be rendered anywhere in the tree. The dedicated
+development entry (`index.dev`) and its `development` export conditions are
+retired along with it.
diff --git a/.changeset/spotty-moons-listen.md b/.changeset/spotty-moons-listen.md
new file mode 100644
index 0000000000..e2d8cc318b
--- /dev/null
+++ b/.changeset/spotty-moons-listen.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+fix: keep route-scoped accessors (e.g. `Route.useParams()`, `Route.useSearch()`) readable when read from async work after navigating away. Once the owning scope is disposed, the accessor returns its last known value instead of `undefined` for the now-missing match.
diff --git a/.changeset/store-bridge-single-flush.md b/.changeset/store-bridge-single-flush.md
new file mode 100644
index 0000000000..0a63beb57f
--- /dev/null
+++ b/.changeset/store-bridge-single-flush.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Stop force-flushing Solid's scheduler on every router-core batch. Store writes now coalesce through the scheduler (one settle per navigation instead of 3-5 full synchronous flushes) while reads stay synchronously fresh via a shadow value in the store bridge.
diff --git a/.changeset/tall-horses-repair.md b/.changeset/tall-horses-repair.md
new file mode 100644
index 0000000000..295b9e819d
--- /dev/null
+++ b/.changeset/tall-horses-repair.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+fix: use TSR_DEFERRED_PROMISE
diff --git a/.changeset/tame-lions-hunt.md b/.changeset/tame-lions-hunt.md
new file mode 100644
index 0000000000..d54795134a
--- /dev/null
+++ b/.changeset/tame-lions-hunt.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router': patch
+---
+
+Fix hydration desync by resolving `defaultNotFoundComponent` at render time instead of lazily mutating the boundary route's `options.notFoundComponent`. Route objects are module singletons shared across server requests, so once the server handled any 404, later SSRs of valid URLs wrapped the match in a `CatchNotFound` boundary the client didn't render, shifting hydration keys and leaving the subtree inert.
diff --git a/.changeset/three-carrots-return.md b/.changeset/three-carrots-return.md
new file mode 100644
index 0000000000..bd8daa172e
--- /dev/null
+++ b/.changeset/three-carrots-return.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+bump to alpha.1
diff --git a/.changeset/tiny-beds-tan.md b/.changeset/tiny-beds-tan.md
new file mode 100644
index 0000000000..fb8bca1450
--- /dev/null
+++ b/.changeset/tiny-beds-tan.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+sync main
diff --git a/.changeset/tired-pants-eat.md b/.changeset/tired-pants-eat.md
new file mode 100644
index 0000000000..d4a071c298
--- /dev/null
+++ b/.changeset/tired-pants-eat.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-start': patch
+---
+
+fix: better rollupOptions/rolldownOptions handling
diff --git a/.changeset/violet-turkeys-cross.md b/.changeset/violet-turkeys-cross.md
new file mode 100644
index 0000000000..b095b45e58
--- /dev/null
+++ b/.changeset/violet-turkeys-cross.md
@@ -0,0 +1,10 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+'@tanstack/solid-router-devtools': patch
+'@tanstack/solid-start-client': patch
+'@tanstack/solid-start-server': patch
+'@tanstack/solid-router': patch
+'@tanstack/solid-start': patch
+---
+
+chore: sync main branch with store refactor
diff --git a/.changeset/warm-routes-rest.md b/.changeset/warm-routes-rest.md
deleted file mode 100644
index 37e759c41e..0000000000
--- a/.changeset/warm-routes-rest.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@tanstack/solid-router': patch
-'@tanstack/vue-router': patch
----
-
-Keep active route components mounted by default when route params change.
diff --git a/.changeset/wicked-olives-poke.md b/.changeset/wicked-olives-poke.md
new file mode 100644
index 0000000000..479ea10d53
--- /dev/null
+++ b/.changeset/wicked-olives-poke.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/solid-router-ssr-query': patch
+---
+
+fix: use solid-query 6.0.0-alpha.0
diff --git a/.nxignore b/.nxignore
new file mode 100644
index 0000000000..867e529a65
--- /dev/null
+++ b/.nxignore
@@ -0,0 +1,23 @@
+# Solid v2 migration: temporarily excluded apps.
+#
+# These apps depend on third-party packages that do not yet support SolidJS v2
+# (solid-js@2.x). They cannot build against the v2 catalog and are excluded from
+# the Nx graph (build + e2e) until the upstream deps ship Solid v2 support.
+# Re-include each one by deleting its line once its blocking dep is Solid-2 ready.
+
+# solid-motionone (peer solid-js ^1.8.0, no Solid 2 release)
+examples/solid/with-framer-motion
+
+# convex-solidjs@0.0.3 (peer solid-js ^1.6.0, imports solid-js/web)
+examples/solid/start-convex-better-auth
+
+# @tanstack/solid-virtual (no Solid 2 release; imports solid-js/store)
+examples/solid/scroll-restoration
+e2e/solid-router/basic-scroll-restoration
+
+# @tanstack/solid-devtools@0.7.0 (devtools shell, peer solid-js >=1.9.7)
+examples/solid/start-bun
+examples/solid/start-i18n-paraglide
+
+# @sentry/solid@10.x (imports splitProps from solid-js)
+e2e/solid-router/sentry-integration
diff --git a/RFC-solid-native-ssr.md b/RFC-solid-native-ssr.md
new file mode 100644
index 0000000000..bdc1030fa6
--- /dev/null
+++ b/RFC-solid-native-ssr.md
@@ -0,0 +1,138 @@
+# RFC: Solid-native SSR/hydration for `@tanstack/solid-router`
+
+**Status:** draft for discussion
+**Scope:** the Solid adapter's SSR transfer and hydration boot — not the cross-framework router API
+
+## Context
+
+The Solid v2 line has been converging on a pattern, one PR at a time: every
+mechanism the router carried for moving state across the wire has a Solid
+2.0 channel that does it natively, and every replacement so far has shrunk
+code and payload while keeping every e2e suite green.
+
+- SSR query transfer → the hydration registry, content-addressed
+ (`solid-query` v6; `solid-router-ssr-query` retired in
+ [#8193](https://github.com/TanStack/router/pull/8193), which removed a
+ double-ship of every query payload)
+- Post-mutation data → the multi-source single-flight envelope
+ ([#8192](https://github.com/TanStack/router/pull/8192): named sources +
+ `loadFlightTarget`)
+- Redirects from cache-driven fetches → a dozen lines composing
+ `isRedirect`/`resolveRedirect` with the caches' `config.onError`
+- The reference for all of it: solidjs/templates `fullstack-tanstack`
+ (bare vite + Router + Query, no Start, no integration package —
+ [templates#287](https://github.com/solidjs/templates/pull/287))
+
+What remains are the deeper assumptions, inherited from the React
+integration model where the framework has no serialization channel and no
+hydration-claiming, so the router had to build both:
+
+1. **The router owns the SSR envelope.** `router.serverSsr`, the
+ `dehydrate()`/`hydrate()` options, and the `__TSR_SSR__` script protocol
+ form a parallel serialization channel through the router's own stream
+ injection.
+2. **The router loads before hydration.** The client is expected to
+ resolve and commit matches before first render (the template's
+ `bootLoad`, plus the prefetch-pausing it drags along) because React
+ hydration can't claim through async work.
+3. **The router owns the HTML's boundary structure.** A global catch
+ boundary is injected client-side that the server never rendered —
+ correct when TanStack's stream handlers produce the HTML, a hydration
+ mismatch when Solid's renderer does (today's escape hatch:
+ `disableGlobalCatchBoundary: true`).
+4. **Suspense-era data ergonomics.** Deferred/`Await` patterns exist
+ because components couldn't just read async values. In Solid 2 they
+ can; the idiomatic usage is already "loaders as non-blocking prefetch
+ hints, suspension at the read point."
+
+## Principles
+
+- **The framework channel is the transfer.** Anything Solid can serialize
+ through the hydration registry (promise-valued, streamed by seroval as
+ it settles) should not ride a router-owned side channel.
+- **Never block up front.** No pre-hydration load pass, no up-front chunk
+ resolution, no envelope waiting. Solid's `lazy` already participates in
+ hydration — a route chunk resolves under its boundary and claims its
+ markup when it lands — so `route.lazy` maps onto read-point resolution.
+ The same goes for data: pending loaders transfer as promises and settle
+ where they're read.
+- **Loader API semantics are untouched.** Blocking loaders,
+ `pendingComponent`, `beforeLoad`, deferred — the cross-framework
+ contract stays. This RFC changes how the _adapter_ transfers and boots,
+ not what the API promises.
+- **Data lives in caches that know how to transfer themselves.** The
+ router transfers _its_ state (matches, `loaderData`, statuses); query
+ caches transfer theirs; the flight envelope keys them independently.
+ Nothing aggregates someone else's state.
+
+## Phase 1 — the bare pairing goes fully native (no Start exposure)
+
+The template path (`createRouter` + `RouterProvider` under Solid's
+renderer) never enters `createStartHandler`, so it can change freely.
+
+- **Registry match transfer.** _(Landed: `registryTransfer.ts`,
+ serialization in `RouterProvider`.)_ During server render the adapter
+ serializes each settled match's state content-addressed
+ (`tsr:` keys) — the pattern `solid-query`'s provider proved.
+ Still open within this bullet: promise-valued entries for matches
+ pending at render time (streaming SSR). This core has no per-match
+ settle promise, so it needs a dispatch-time hook; today pending matches
+ are skipped and the client boot falls through to current behavior.
+- **Hydration-claiming boot.** _(Landed: the `Router` constructor.)_
+ Match synchronously, prime match state from the registry, commit
+ without running loaders. Placement discovered to be load-bearing:
+ committing inside the hydration render desyncs the claiming walk's
+ registry bookkeeping even with writes moved off the owner — router
+ creation is the client's natural pre-render moment (after document
+ parse, before `hydrate()`). Route chunks resolve at the read point via
+ Solid `lazy` semantics. This deleted the template's `bootLoad` (and its
+ URL-divergence reload guard) and the prefetch-pausing flag outright —
+ verified on the production template: zero server-function requests at
+ boot, hydration clean, single-flight unchanged.
+- **Boundary parity.** _(Already true on this line.)_ The adapter's
+ boundary structure is symmetric between server and client
+ (`_resolveMatchesLoadingBoundary` consults no hydration state), so
+ `disableGlobalCatchBoundary` is no longer a parity workaround — it
+ survives as a semantic choice: let errors (including SSR-thrown
+ `redirect()`) bubble past the router to app-owned boundaries and the
+ stream handler. The template's comment was corrected to say so.
+
+## Phase 2 — Start rides it behind the existing contract
+
+`start-server-core` orchestrates through `attachRouterServerSsrUtils`,
+`dehydrate()`/`hydrate()`, and the stream handler — that contract is
+shared core and stays intact as a facade. Within it, the Solid
+`defaultStreamHandler`/`renderRouterToStream` source the transfer from the
+registry channel instead of `__TSR_SSR__` script injection wherever both
+exist; user `dehydrate`/`hydrate` hooks keep working. The flight collector
+already went through this door: `loadFlightTarget` absorbed the
+event-derivation half, and its extraction half shrinks further once match
+state is registry-addressed.
+
+**Regression gate:** the three Solid Start e2e suites
+(`basic-solid-query`, `server-functions`, `server-routes` — 37 tests,
+including redirect-from-query on both mount and SSR paths, and the
+transition semantics) all run locally today and define "didn't break
+Start."
+
+## Phase 3 — upstream
+
+Once both runs are proven, propose the defaults upstream with working
+code and measured deltas (payload double-ship eliminated, boot code
+deleted, boundary workaround gone), the same argument shape as #8193 one
+layer deeper. React/Vue adapters are untouched throughout;
+`router-ssr-query-core`'s transport remains correct for frameworks
+without a native channel.
+
+## Open questions
+
+- Match key identity: route id + params hash vs match id — needs to be
+ stable across server/client and across redirects into the same route.
+- `loaderData` streaming semantics vs the existing deferred API: a
+ promise-valued registry entry makes deferred _transfer_ free, but the
+ read-side API compatibility needs mapping.
+- Scroll restoration and `__TSR_SSR__` consumers beyond match state
+ (manifest/asset injection) — inventory what else rides the script
+ channel before swapping it.
+- Where the SSR teardown lands for router state (the query cache got
+ cancel+clear on render disposal; matches may want the same).
diff --git a/benchmarks/bundle-size/package.json b/benchmarks/bundle-size/package.json
index 500cf9b8f2..47d61512b4 100644
--- a/benchmarks/bundle-size/package.json
+++ b/benchmarks/bundle-size/package.json
@@ -36,20 +36,22 @@
}
},
"dependencies": {
+ "@solidjs/web": "^2.0.0-rc.20",
"@tanstack/react-router": "workspace:^",
- "@tanstack/solid-router": "workspace:^",
- "@tanstack/vue-router": "workspace:^",
"@tanstack/react-start": "workspace:^",
+ "@tanstack/solid-router": "workspace:^",
"@tanstack/solid-start": "workspace:^",
+ "@tanstack/vue-router": "workspace:^",
"@tanstack/vue-start": "workspace:^",
"react": "^19.0.0",
"react-dom": "^19.0.0",
- "solid-js": "^1.9.10",
+ "solid-js": "^2.0.0-rc.20",
"vue": "^3.5.16"
},
"devDependencies": {
"@rsbuild/core": "^2.1.0",
"@rsbuild/plugin-react": "^2.0.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.54",
"@tanstack/router-plugin": "workspace:^",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
@@ -58,7 +60,6 @@
"@vitejs/plugin-vue-jsx": "^5.1.5",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
- "vite": "^8.0.14",
- "vite-plugin-solid": "^2.11.11"
+ "vite": "^8.0.14"
}
}
diff --git a/benchmarks/bundle-size/scenarios/solid-router-full/src/main.tsx b/benchmarks/bundle-size/scenarios/solid-router-full/src/main.tsx
index 505f79aee0..eaa48dd6c1 100644
--- a/benchmarks/bundle-size/scenarios/solid-router-full/src/main.tsx
+++ b/benchmarks/bundle-size/scenarios/solid-router-full/src/main.tsx
@@ -1,4 +1,4 @@
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/bundle-size/scenarios/solid-router-full/vite.config.ts b/benchmarks/bundle-size/scenarios/solid-router-full/vite.config.ts
index 9729ada0e8..c536beefe7 100644
--- a/benchmarks/bundle-size/scenarios/solid-router-full/vite.config.ts
+++ b/benchmarks/bundle-size/scenarios/solid-router-full/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
export default defineConfig({
diff --git a/benchmarks/bundle-size/scenarios/solid-router-minimal/src/main.tsx b/benchmarks/bundle-size/scenarios/solid-router-minimal/src/main.tsx
index 210120b3f1..f7c0b4bc7f 100644
--- a/benchmarks/bundle-size/scenarios/solid-router-minimal/src/main.tsx
+++ b/benchmarks/bundle-size/scenarios/solid-router-minimal/src/main.tsx
@@ -1,4 +1,4 @@
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/bundle-size/scenarios/solid-router-minimal/vite.config.ts b/benchmarks/bundle-size/scenarios/solid-router-minimal/vite.config.ts
index 9729ada0e8..c536beefe7 100644
--- a/benchmarks/bundle-size/scenarios/solid-router-minimal/vite.config.ts
+++ b/benchmarks/bundle-size/scenarios/solid-router-minimal/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
export default defineConfig({
diff --git a/benchmarks/bundle-size/scenarios/solid-start-deferred-hydration/vite.config.ts b/benchmarks/bundle-size/scenarios/solid-start-deferred-hydration/vite.config.ts
index 0bd21e64f4..8c3cc043ea 100644
--- a/benchmarks/bundle-size/scenarios/solid-start-deferred-hydration/vite.config.ts
+++ b/benchmarks/bundle-size/scenarios/solid-start-deferred-hydration/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
export default defineConfig({
diff --git a/benchmarks/bundle-size/scenarios/solid-start-full/vite.config.ts b/benchmarks/bundle-size/scenarios/solid-start-full/vite.config.ts
index 0bd21e64f4..8c3cc043ea 100644
--- a/benchmarks/bundle-size/scenarios/solid-start-full/vite.config.ts
+++ b/benchmarks/bundle-size/scenarios/solid-start-full/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
export default defineConfig({
diff --git a/benchmarks/bundle-size/scenarios/solid-start-minimal/vite.config.ts b/benchmarks/bundle-size/scenarios/solid-start-minimal/vite.config.ts
index 0bd21e64f4..8c3cc043ea 100644
--- a/benchmarks/bundle-size/scenarios/solid-start-minimal/vite.config.ts
+++ b/benchmarks/bundle-size/scenarios/solid-start-minimal/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
export default defineConfig({
diff --git a/benchmarks/client-nav/package.json b/benchmarks/client-nav/package.json
index 5b1262c31d..386028271f 100644
--- a/benchmarks/client-nav/package.json
+++ b/benchmarks/client-nav/package.json
@@ -19,6 +19,7 @@
"test:types:vue": "tsc -p ./vue/tsconfig.json --noEmit"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0-rc.20",
"@tanstack/history": "workspace:^",
"@tanstack/react-router": "workspace:^",
"@tanstack/router-core": "workspace:^",
@@ -26,23 +27,23 @@
"@tanstack/vue-router": "workspace:^",
"react": "^19.0.0",
"react-dom": "^19.0.0",
- "solid-js": "^1.9.10",
+ "solid-js": "^2.0.0-rc.20",
"vue": "^3.5.16"
},
"devDependencies": {
- "@platformatic/flame": "^1.6.0",
"@codspeed/vitest-plugin": "^5.5.0",
+ "@platformatic/flame": "^1.6.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.54",
"@tanstack/router-plugin": "workspace:^",
"@testing-library/react": "^16.2.0",
+ "@types/jsdom": "28.0.0",
"@vitejs/plugin-react": "^6.0.1",
"@vitejs/plugin-vue": "^6.0.5",
"@vitejs/plugin-vue-jsx": "^5.1.5",
- "@types/jsdom": "28.0.0",
"@typescript/native": "npm:typescript@^7.0.2",
"jsdom": "^29.1.1",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
- "vite-plugin-solid": "^2.11.11",
"vitest": "^4.1.4"
},
"nx": {
diff --git a/benchmarks/client-nav/scenarios/async-pipeline/solid/src/main.tsx b/benchmarks/client-nav/scenarios/async-pipeline/solid/src/main.tsx
index 4c6d49f501..4f6d12dba4 100644
--- a/benchmarks/client-nav/scenarios/async-pipeline/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/async-pipeline/solid/src/main.tsx
@@ -1,5 +1,5 @@
import type { RouterHistory } from '@tanstack/history'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/client-nav/scenarios/async-pipeline/solid/tsconfig.json b/benchmarks/client-nav/scenarios/async-pipeline/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/async-pipeline/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/async-pipeline/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/async-pipeline/solid/vite.config.ts b/benchmarks/client-nav/scenarios/async-pipeline/solid/vite.config.ts
index 5107c1f056..a53f61652b 100644
--- a/benchmarks/client-nav/scenarios/async-pipeline/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/async-pipeline/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -19,7 +19,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/scenarios/control-flow/solid/src/main.tsx b/benchmarks/client-nav/scenarios/control-flow/solid/src/main.tsx
index fa9d239418..f7148011f5 100644
--- a/benchmarks/client-nav/scenarios/control-flow/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/control-flow/solid/src/main.tsx
@@ -1,5 +1,5 @@
import type { RouterHistory } from '@tanstack/history'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/client-nav/scenarios/control-flow/solid/tsconfig.json b/benchmarks/client-nav/scenarios/control-flow/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/control-flow/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/control-flow/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/control-flow/solid/vite.config.ts b/benchmarks/client-nav/scenarios/control-flow/solid/vite.config.ts
index 1c6244d3d1..d5e1af5470 100644
--- a/benchmarks/client-nav/scenarios/control-flow/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/control-flow/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -19,7 +19,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/scenarios/head/solid/src/main.tsx b/benchmarks/client-nav/scenarios/head/solid/src/main.tsx
index fa9d239418..f7148011f5 100644
--- a/benchmarks/client-nav/scenarios/head/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/head/solid/src/main.tsx
@@ -1,5 +1,5 @@
import type { RouterHistory } from '@tanstack/history'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/client-nav/scenarios/head/solid/tsconfig.json b/benchmarks/client-nav/scenarios/head/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/head/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/head/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/head/solid/vite.config.ts b/benchmarks/client-nav/scenarios/head/solid/vite.config.ts
index 7b5a1e22b4..fc3876b03e 100644
--- a/benchmarks/client-nav/scenarios/head/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/head/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -19,7 +19,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/scenarios/history/solid/src/main.tsx b/benchmarks/client-nav/scenarios/history/solid/src/main.tsx
index fa9d239418..f7148011f5 100644
--- a/benchmarks/client-nav/scenarios/history/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/history/solid/src/main.tsx
@@ -1,5 +1,5 @@
import type { RouterHistory } from '@tanstack/history'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/client-nav/scenarios/history/solid/tsconfig.json b/benchmarks/client-nav/scenarios/history/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/history/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/history/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/history/solid/vite.config.ts b/benchmarks/client-nav/scenarios/history/solid/vite.config.ts
index de0eda543c..8ddc9e6a0c 100644
--- a/benchmarks/client-nav/scenarios/history/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/history/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -19,7 +19,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/scenarios/links/solid/src/main.tsx b/benchmarks/client-nav/scenarios/links/solid/src/main.tsx
index fa9d239418..f7148011f5 100644
--- a/benchmarks/client-nav/scenarios/links/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/links/solid/src/main.tsx
@@ -1,5 +1,5 @@
import type { RouterHistory } from '@tanstack/history'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/client-nav/scenarios/links/solid/tsconfig.json b/benchmarks/client-nav/scenarios/links/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/links/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/links/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/links/solid/vite.config.ts b/benchmarks/client-nav/scenarios/links/solid/vite.config.ts
index 9a5b3d138b..7a0bb18aee 100644
--- a/benchmarks/client-nav/scenarios/links/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/links/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -19,7 +19,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/scenarios/loaders/solid/src/main.tsx b/benchmarks/client-nav/scenarios/loaders/solid/src/main.tsx
index fa9d239418..f7148011f5 100644
--- a/benchmarks/client-nav/scenarios/loaders/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/loaders/solid/src/main.tsx
@@ -1,5 +1,5 @@
import type { RouterHistory } from '@tanstack/history'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/client-nav/scenarios/loaders/solid/src/routes/cached.$id.tsx b/benchmarks/client-nav/scenarios/loaders/solid/src/routes/cached.$id.tsx
index aab6be74dc..4838141b22 100644
--- a/benchmarks/client-nav/scenarios/loaders/solid/src/routes/cached.$id.tsx
+++ b/benchmarks/client-nav/scenarios/loaders/solid/src/routes/cached.$id.tsx
@@ -15,9 +15,12 @@ export const Route = createFileRoute('/cached/$id')({
const subscriberIndexes = Array.from({ length: 2 }, (_, index) => index)
function PerfValue(props: { value: () => number }) {
- createRenderEffect(() => {
- void props.value()
- })
+ createRenderEffect(
+ () => {
+ void props.value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/loaders/solid/src/routes/deps.tsx b/benchmarks/client-nav/scenarios/loaders/solid/src/routes/deps.tsx
index 2f23f2d3da..258c7bc23b 100644
--- a/benchmarks/client-nav/scenarios/loaders/solid/src/routes/deps.tsx
+++ b/benchmarks/client-nav/scenarios/loaders/solid/src/routes/deps.tsx
@@ -25,9 +25,12 @@ export const Route = createFileRoute('/deps')({
const subscriberIndexes = Array.from({ length: 2 }, (_, index) => index)
function PerfValue(props: { value: () => number }) {
- createRenderEffect(() => {
- void props.value()
- })
+ createRenderEffect(
+ () => {
+ void props.value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/loaders/solid/src/routes/fresh.$id.tsx b/benchmarks/client-nav/scenarios/loaders/solid/src/routes/fresh.$id.tsx
index acd6a9aa27..29bc35a650 100644
--- a/benchmarks/client-nav/scenarios/loaders/solid/src/routes/fresh.$id.tsx
+++ b/benchmarks/client-nav/scenarios/loaders/solid/src/routes/fresh.$id.tsx
@@ -15,9 +15,12 @@ export const Route = createFileRoute('/fresh/$id')({
const subscriberIndexes = Array.from({ length: 2 }, (_, index) => index)
function PerfValue(props: { value: () => number }) {
- createRenderEffect(() => {
- void props.value()
- })
+ createRenderEffect(
+ () => {
+ void props.value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/loaders/solid/tsconfig.json b/benchmarks/client-nav/scenarios/loaders/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/loaders/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/loaders/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/loaders/solid/vite.config.ts b/benchmarks/client-nav/scenarios/loaders/solid/vite.config.ts
index ea913ac578..723e95e181 100644
--- a/benchmarks/client-nav/scenarios/loaders/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/loaders/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -19,7 +19,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/scenarios/mount/solid/src/main.tsx b/benchmarks/client-nav/scenarios/mount/solid/src/main.tsx
index 2586872f5c..bd29324154 100644
--- a/benchmarks/client-nav/scenarios/mount/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/mount/solid/src/main.tsx
@@ -1,4 +1,4 @@
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
import type { RouterHistory } from '@tanstack/history'
diff --git a/benchmarks/client-nav/scenarios/mount/solid/tsconfig.json b/benchmarks/client-nav/scenarios/mount/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/mount/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/mount/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/mount/solid/vite.config.ts b/benchmarks/client-nav/scenarios/mount/solid/vite.config.ts
index 910d332f9c..0669a8052d 100644
--- a/benchmarks/client-nav/scenarios/mount/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/mount/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -19,7 +19,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/src/main.tsx b/benchmarks/client-nav/scenarios/nested-params/solid/src/main.tsx
index fa9d239418..f7148011f5 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/nested-params/solid/src/main.tsx
@@ -1,5 +1,5 @@
import type { RouterHistory } from '@tanstack/history'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.$g.$h.tsx b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.$g.$h.tsx
index 7dc55db0e4..fccc6ca7bb 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.$g.$h.tsx
+++ b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.$g.$h.tsx
@@ -13,9 +13,12 @@ export const Route = createFileRoute('/l/$a/$b/$c/$d/$e/$f/$g/$h')({
function ParamsSubscriberOne() {
const value = Route.useParams({ select: (params) => smallHash(params.h) })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -23,17 +26,23 @@ function ParamsSubscriberTwo() {
const value = Route.useParams({
select: (params) => smallHash(`${params.h}:2`),
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
function ContextSubscriberOne() {
const value = Route.useRouteContext({ select: (context) => context.ctxH })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -41,9 +50,12 @@ function ContextSubscriberTwo() {
const value = Route.useRouteContext({
select: (context) => (context.ctxH * 31 + 7) >>> 0,
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.$g.tsx b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.$g.tsx
index d9c6c9429b..7274a19aac 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.$g.tsx
+++ b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.$g.tsx
@@ -13,9 +13,12 @@ export const Route = createFileRoute('/l/$a/$b/$c/$d/$e/$f/$g')({
function ParamsSubscriberOne() {
const value = Route.useParams({ select: (params) => smallHash(params.g) })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -23,17 +26,23 @@ function ParamsSubscriberTwo() {
const value = Route.useParams({
select: (params) => smallHash(`${params.g}:2`),
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
function ContextSubscriberOne() {
const value = Route.useRouteContext({ select: (context) => context.ctxG })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -41,9 +50,12 @@ function ContextSubscriberTwo() {
const value = Route.useRouteContext({
select: (context) => (context.ctxG * 31 + 7) >>> 0,
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.tsx b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.tsx
index 010f89bc4d..a7ec5597f7 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.tsx
+++ b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.$f.tsx
@@ -13,9 +13,12 @@ export const Route = createFileRoute('/l/$a/$b/$c/$d/$e/$f')({
function ParamsSubscriberOne() {
const value = Route.useParams({ select: (params) => smallHash(params.f) })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -23,17 +26,23 @@ function ParamsSubscriberTwo() {
const value = Route.useParams({
select: (params) => smallHash(`${params.f}:2`),
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
function ContextSubscriberOne() {
const value = Route.useRouteContext({ select: (context) => context.ctxF })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -41,9 +50,12 @@ function ContextSubscriberTwo() {
const value = Route.useRouteContext({
select: (context) => (context.ctxF * 31 + 7) >>> 0,
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.tsx b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.tsx
index 08c107f0c6..79c6b118e0 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.tsx
+++ b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.$e.tsx
@@ -13,9 +13,12 @@ export const Route = createFileRoute('/l/$a/$b/$c/$d/$e')({
function ParamsSubscriberOne() {
const value = Route.useParams({ select: (params) => smallHash(params.e) })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -23,17 +26,23 @@ function ParamsSubscriberTwo() {
const value = Route.useParams({
select: (params) => smallHash(`${params.e}:2`),
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
function ContextSubscriberOne() {
const value = Route.useRouteContext({ select: (context) => context.ctxE })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -41,9 +50,12 @@ function ContextSubscriberTwo() {
const value = Route.useRouteContext({
select: (context) => (context.ctxE * 31 + 7) >>> 0,
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.tsx b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.tsx
index 1b64edd58b..e0dc4c10d2 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.tsx
+++ b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.$d.tsx
@@ -13,9 +13,12 @@ export const Route = createFileRoute('/l/$a/$b/$c/$d')({
function ParamsSubscriberOne() {
const value = Route.useParams({ select: (params) => smallHash(params.d) })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -23,17 +26,23 @@ function ParamsSubscriberTwo() {
const value = Route.useParams({
select: (params) => smallHash(`${params.d}:2`),
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
function ContextSubscriberOne() {
const value = Route.useRouteContext({ select: (context) => context.ctxD })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -41,9 +50,12 @@ function ContextSubscriberTwo() {
const value = Route.useRouteContext({
select: (context) => (context.ctxD * 31 + 7) >>> 0,
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.tsx b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.tsx
index e509ea82c6..3a0df7eb71 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.tsx
+++ b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.$c.tsx
@@ -13,9 +13,12 @@ export const Route = createFileRoute('/l/$a/$b/$c')({
function ParamsSubscriberOne() {
const value = Route.useParams({ select: (params) => smallHash(params.c) })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -23,17 +26,23 @@ function ParamsSubscriberTwo() {
const value = Route.useParams({
select: (params) => smallHash(`${params.c}:2`),
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
function ContextSubscriberOne() {
const value = Route.useRouteContext({ select: (context) => context.ctxC })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -41,9 +50,12 @@ function ContextSubscriberTwo() {
const value = Route.useRouteContext({
select: (context) => (context.ctxC * 31 + 7) >>> 0,
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.tsx b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.tsx
index ada853b845..6133e72b48 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.tsx
+++ b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.$b.tsx
@@ -13,9 +13,12 @@ export const Route = createFileRoute('/l/$a/$b')({
function ParamsSubscriberOne() {
const value = Route.useParams({ select: (params) => smallHash(params.b) })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -23,17 +26,23 @@ function ParamsSubscriberTwo() {
const value = Route.useParams({
select: (params) => smallHash(`${params.b}:2`),
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
function ContextSubscriberOne() {
const value = Route.useRouteContext({ select: (context) => context.ctxB })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -41,9 +50,12 @@ function ContextSubscriberTwo() {
const value = Route.useRouteContext({
select: (context) => (context.ctxB * 31 + 7) >>> 0,
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.tsx b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.tsx
index 5ecf004fae..7bd378431b 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.tsx
+++ b/benchmarks/client-nav/scenarios/nested-params/solid/src/routes/l.$a.tsx
@@ -13,9 +13,12 @@ export const Route = createFileRoute('/l/$a')({
function ParamsSubscriberOne() {
const value = Route.useParams({ select: (params) => smallHash(params.a) })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -23,17 +26,23 @@ function ParamsSubscriberTwo() {
const value = Route.useParams({
select: (params) => smallHash(`${params.a}:2`),
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
function ContextSubscriberOne() {
const value = Route.useRouteContext({ select: (context) => context.ctxA })
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
@@ -41,9 +50,12 @@ function ContextSubscriberTwo() {
const value = Route.useRouteContext({
select: (context) => (context.ctxA * 31 + 7) >>> 0,
})
- createRenderEffect(() => {
- void value()
- })
+ createRenderEffect(
+ () => {
+ void value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/tsconfig.json b/benchmarks/client-nav/scenarios/nested-params/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/nested-params/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/nested-params/solid/vite.config.ts b/benchmarks/client-nav/scenarios/nested-params/solid/vite.config.ts
index f5c9e13c0f..12ce6954aa 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/nested-params/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -19,7 +19,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/scenarios/preload/solid/src/main.tsx b/benchmarks/client-nav/scenarios/preload/solid/src/main.tsx
index 3791156c64..ad7e065f2e 100644
--- a/benchmarks/client-nav/scenarios/preload/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/preload/solid/src/main.tsx
@@ -1,5 +1,5 @@
import type { RouterHistory } from '@tanstack/history'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/client-nav/scenarios/preload/solid/tsconfig.json b/benchmarks/client-nav/scenarios/preload/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/preload/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/preload/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/preload/solid/vite.config.ts b/benchmarks/client-nav/scenarios/preload/solid/vite.config.ts
index b542834469..99f5b9fad5 100644
--- a/benchmarks/client-nav/scenarios/preload/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/preload/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -19,7 +19,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/src/main.tsx b/benchmarks/client-nav/scenarios/rewrites/solid/src/main.tsx
index 31f1d07650..9f34e66a66 100644
--- a/benchmarks/client-nav/scenarios/rewrites/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/src/main.tsx
@@ -1,5 +1,5 @@
import type { RouterHistory } from '@tanstack/history'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
import { basepath, localeRewrite } from '../../shared'
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/tsconfig.json b/benchmarks/client-nav/scenarios/rewrites/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/rewrites/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/rewrites/solid/vite.config.ts b/benchmarks/client-nav/scenarios/rewrites/solid/vite.config.ts
index 41613c2ad4..c499a0a89b 100644
--- a/benchmarks/client-nav/scenarios/rewrites/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/rewrites/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -19,7 +19,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/main.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/main.tsx
index fa9d239418..f7148011f5 100644
--- a/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/main.tsx
@@ -1,5 +1,5 @@
import type { RouterHistory } from '@tanstack/history'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/tsconfig.json b/benchmarks/client-nav/scenarios/route-tree-scale/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/route-tree-scale/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/route-tree-scale/solid/vite.config.ts b/benchmarks/client-nav/scenarios/route-tree-scale/solid/vite.config.ts
index dd0bd234e0..3c870e9c21 100644
--- a/benchmarks/client-nav/scenarios/route-tree-scale/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/route-tree-scale/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -22,7 +22,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/main.tsx b/benchmarks/client-nav/scenarios/search-params/solid/src/main.tsx
index 25071f7979..714d5a0098 100644
--- a/benchmarks/client-nav/scenarios/search-params/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/search-params/solid/src/main.tsx
@@ -1,5 +1,5 @@
import type { RouterHistory } from '@tanstack/history'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { RouterProvider, createRouter } from '@tanstack/solid-router'
import { routeTree } from './routeTree.gen'
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/routes/__root.tsx b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/__root.tsx
index 30c042f9c5..e6f9592e07 100644
--- a/benchmarks/client-nav/scenarios/search-params/solid/src/routes/__root.tsx
+++ b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/__root.tsx
@@ -18,9 +18,12 @@ export const Route = createRootRoute({
const rootSubscribers = Array.from({ length: 4 }, (_, index) => index)
function PerfValue(props: { value: () => number }) {
- createRenderEffect(() => {
- void props.value()
- })
+ createRenderEffect(
+ () => {
+ void props.value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/routes/catalog.tsx b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/catalog.tsx
index 60cf8e7896..7f3fcf7078 100644
--- a/benchmarks/client-nav/scenarios/search-params/solid/src/routes/catalog.tsx
+++ b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/catalog.tsx
@@ -19,9 +19,12 @@ export const Route = createFileRoute('/catalog')({
const subscriberIndexes = Array.from({ length: 2 }, (_, index) => index)
function PerfValue(props: { value: () => number }) {
- createRenderEffect(() => {
- void props.value()
- })
+ createRenderEffect(
+ () => {
+ void props.value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/src/routes/products.tsx b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/products.tsx
index 8b2a252155..1319aabae3 100644
--- a/benchmarks/client-nav/scenarios/search-params/solid/src/routes/products.tsx
+++ b/benchmarks/client-nav/scenarios/search-params/solid/src/routes/products.tsx
@@ -37,9 +37,12 @@ export const Route = createFileRoute('/products')({
const subscriberIndexes = Array.from({ length: 2 }, (_, index) => index)
function PerfValue(props: { value: () => number }) {
- createRenderEffect(() => {
- void props.value()
- })
+ createRenderEffect(
+ () => {
+ void props.value()
+ },
+ () => {},
+ )
return null
}
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/tsconfig.json b/benchmarks/client-nav/scenarios/search-params/solid/tsconfig.json
index 98d76ad6b8..8c57ff876a 100644
--- a/benchmarks/client-nav/scenarios/search-params/solid/tsconfig.json
+++ b/benchmarks/client-nav/scenarios/search-params/solid/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"allowImportingTsExtensions": true,
"types": ["node", "vite/client", "vitest/globals"]
},
diff --git a/benchmarks/client-nav/scenarios/search-params/solid/vite.config.ts b/benchmarks/client-nav/scenarios/search-params/solid/vite.config.ts
index c2f4b32806..e404b55b51 100644
--- a/benchmarks/client-nav/scenarios/search-params/solid/vite.config.ts
+++ b/benchmarks/client-nav/scenarios/search-params/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackRouter } from '@tanstack/router-plugin/vite'
@@ -19,7 +19,7 @@ export default defineConfig({
routesDirectory: `${rootDir}src/routes`,
generatedRouteTree: `${rootDir}src/routeTree.gen.ts`,
}),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/client-nav/solid/app.tsx b/benchmarks/client-nav/solid/app.tsx
index ef90130f5e..4779054bec 100644
--- a/benchmarks/client-nav/solid/app.tsx
+++ b/benchmarks/client-nav/solid/app.tsx
@@ -1,5 +1,5 @@
import { For, createRenderEffect } from 'solid-js'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import {
Link,
Outlet,
@@ -37,9 +37,10 @@ const routeSelectors = Array.from({ length: 6 }, (_, index) => index)
const linkGroups = Array.from({ length: 4 }, (_, index) => index)
function PerfValue(props: { value: () => number }) {
- createRenderEffect(() => {
- void props.value()
- })
+ createRenderEffect(
+ () => props.value(),
+ () => {},
+ )
return null
}
@@ -66,7 +67,8 @@ function LinkPanel() {
return (
<>
- {(groupIndex) => {
+ {(groupIndexAccessor) => {
+ const groupIndex = groupIndexAccessor
const itemsId = groupIndex === 0 ? 1 : groupIndex + 2
const ctxId = groupIndex + 1
diff --git a/benchmarks/client-nav/solid/tsconfig.json b/benchmarks/client-nav/solid/tsconfig.json
index 4c500d0793..aa3cfb2444 100644
--- a/benchmarks/client-nav/solid/tsconfig.json
+++ b/benchmarks/client-nav/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"jsx": "preserve",
"allowImportingTsExtensions": true,
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/client-nav/solid/vite.config.ts b/benchmarks/client-nav/solid/vite.config.ts
index bd11fe8de9..57c23312a5 100644
--- a/benchmarks/client-nav/solid/vite.config.ts
+++ b/benchmarks/client-nav/solid/vite.config.ts
@@ -1,6 +1,6 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import codspeedPlugin from '@codspeed/vitest-plugin'
// Anchor the project root to the package directory so this config resolves
@@ -15,7 +15,7 @@ export default defineConfig({
plugins: [
!!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
codspeedPlugin(),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './solid/dist',
diff --git a/benchmarks/memory/client/package.json b/benchmarks/memory/client/package.json
index d4c9f732c7..5c67b9118a 100644
--- a/benchmarks/memory/client/package.json
+++ b/benchmarks/memory/client/package.json
@@ -12,19 +12,21 @@
"#memory-client/lifecycle": "./lifecycle.ts"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0-rc.20",
"@tanstack/react-router": "workspace:*",
"@tanstack/router-core": "workspace:*",
"@tanstack/solid-router": "workspace:*",
"@tanstack/vue-router": "workspace:*",
"react": "^19.0.0",
"react-dom": "^19.0.0",
- "solid-js": "^1.9.10",
+ "solid-js": "^2.0.0-rc.20",
"vue": "^3.5.16"
},
"devDependencies": {
"@codspeed/vitest-plugin": "^5.5.0",
"@datadog/pprof": "^5.13.2",
"@platformatic/flame": "^1.6.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.54",
"@testing-library/react": "^16.2.0",
"@vitejs/plugin-react": "^6.0.1",
"@vitejs/plugin-vue": "^6.0.5",
@@ -34,7 +36,6 @@
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
- "vite-plugin-solid": "^2.11.11",
"vitest": "^4.1.4"
},
"nx": {
diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/solid/src/app.tsx b/benchmarks/memory/client/scenarios/interrupted-navigations/solid/src/app.tsx
index 6288b5fab1..9264e1cc51 100644
--- a/benchmarks/memory/client/scenarios/interrupted-navigations/solid/src/app.tsx
+++ b/benchmarks/memory/client/scenarios/interrupted-navigations/solid/src/app.tsx
@@ -1,5 +1,5 @@
import { RouterProvider } from '@tanstack/solid-router'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { getRouter } from './router'
export {
diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/solid/tsconfig.json b/benchmarks/memory/client/scenarios/interrupted-navigations/solid/tsconfig.json
index b12dcb7ade..9558353c88 100644
--- a/benchmarks/memory/client/scenarios/interrupted-navigations/solid/tsconfig.json
+++ b/benchmarks/memory/client/scenarios/interrupted-navigations/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"jsx": "preserve",
"allowImportingTsExtensions": true,
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/client/scenarios/interrupted-navigations/solid/vite.config.ts b/benchmarks/memory/client/scenarios/interrupted-navigations/solid/vite.config.ts
index e710e0fd12..d7c4a8d9d2 100644
--- a/benchmarks/memory/client/scenarios/interrupted-navigations/solid/vite.config.ts
+++ b/benchmarks/memory/client/scenarios/interrupted-navigations/solid/vite.config.ts
@@ -1,7 +1,7 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -13,7 +13,7 @@ export default defineConfig({
plugins: [
!!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
codspeedPlugin(),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/client/scenarios/loader-data-retention/solid/src/app.tsx b/benchmarks/memory/client/scenarios/loader-data-retention/solid/src/app.tsx
index 4315a4b15c..1b47cda1f9 100644
--- a/benchmarks/memory/client/scenarios/loader-data-retention/solid/src/app.tsx
+++ b/benchmarks/memory/client/scenarios/loader-data-retention/solid/src/app.tsx
@@ -1,5 +1,5 @@
import { RouterProvider } from '@tanstack/solid-router'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { getRouter } from './router'
export { loaderPayloadRecordCount } from '../../loader-data'
diff --git a/benchmarks/memory/client/scenarios/loader-data-retention/solid/tsconfig.json b/benchmarks/memory/client/scenarios/loader-data-retention/solid/tsconfig.json
index b12dcb7ade..9558353c88 100644
--- a/benchmarks/memory/client/scenarios/loader-data-retention/solid/tsconfig.json
+++ b/benchmarks/memory/client/scenarios/loader-data-retention/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"jsx": "preserve",
"allowImportingTsExtensions": true,
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/client/scenarios/loader-data-retention/solid/vite.config.ts b/benchmarks/memory/client/scenarios/loader-data-retention/solid/vite.config.ts
index 58d6b77acc..b2bcdee643 100644
--- a/benchmarks/memory/client/scenarios/loader-data-retention/solid/vite.config.ts
+++ b/benchmarks/memory/client/scenarios/loader-data-retention/solid/vite.config.ts
@@ -1,7 +1,7 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -13,7 +13,7 @@ export default defineConfig({
plugins: [
!!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
codspeedPlugin(),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/client/scenarios/mount-unmount/solid/src/app.tsx b/benchmarks/memory/client/scenarios/mount-unmount/solid/src/app.tsx
index b23bc126d5..e82e21bd97 100644
--- a/benchmarks/memory/client/scenarios/mount-unmount/solid/src/app.tsx
+++ b/benchmarks/memory/client/scenarios/mount-unmount/solid/src/app.tsx
@@ -1,5 +1,5 @@
import { RouterProvider } from '@tanstack/solid-router'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { getRouter } from './router'
export function mountTestApp(container: Element) {
diff --git a/benchmarks/memory/client/scenarios/mount-unmount/solid/tsconfig.json b/benchmarks/memory/client/scenarios/mount-unmount/solid/tsconfig.json
index b12dcb7ade..9558353c88 100644
--- a/benchmarks/memory/client/scenarios/mount-unmount/solid/tsconfig.json
+++ b/benchmarks/memory/client/scenarios/mount-unmount/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"jsx": "preserve",
"allowImportingTsExtensions": true,
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/client/scenarios/mount-unmount/solid/vite.config.ts b/benchmarks/memory/client/scenarios/mount-unmount/solid/vite.config.ts
index 5f0ab26252..d5727728e6 100644
--- a/benchmarks/memory/client/scenarios/mount-unmount/solid/vite.config.ts
+++ b/benchmarks/memory/client/scenarios/mount-unmount/solid/vite.config.ts
@@ -1,7 +1,7 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -13,7 +13,7 @@ export default defineConfig({
plugins: [
!!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
codspeedPlugin(),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/client/scenarios/navigation-churn/solid/src/app.tsx b/benchmarks/memory/client/scenarios/navigation-churn/solid/src/app.tsx
index 16000c90a1..5917ef0191 100644
--- a/benchmarks/memory/client/scenarios/navigation-churn/solid/src/app.tsx
+++ b/benchmarks/memory/client/scenarios/navigation-churn/solid/src/app.tsx
@@ -1,5 +1,5 @@
import { RouterProvider } from '@tanstack/solid-router'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { getRouter } from './router'
export function mountTestApp(container: Element) {
diff --git a/benchmarks/memory/client/scenarios/navigation-churn/solid/tsconfig.json b/benchmarks/memory/client/scenarios/navigation-churn/solid/tsconfig.json
index b12dcb7ade..9558353c88 100644
--- a/benchmarks/memory/client/scenarios/navigation-churn/solid/tsconfig.json
+++ b/benchmarks/memory/client/scenarios/navigation-churn/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"jsx": "preserve",
"allowImportingTsExtensions": true,
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/client/scenarios/navigation-churn/solid/vite.config.ts b/benchmarks/memory/client/scenarios/navigation-churn/solid/vite.config.ts
index 6b6735891a..c885d5edcb 100644
--- a/benchmarks/memory/client/scenarios/navigation-churn/solid/vite.config.ts
+++ b/benchmarks/memory/client/scenarios/navigation-churn/solid/vite.config.ts
@@ -1,7 +1,7 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -13,7 +13,7 @@ export default defineConfig({
plugins: [
!!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
codspeedPlugin(),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/client/scenarios/preload-churn/solid/src/app.tsx b/benchmarks/memory/client/scenarios/preload-churn/solid/src/app.tsx
index 18ad5b97e4..b5b0a1d555 100644
--- a/benchmarks/memory/client/scenarios/preload-churn/solid/src/app.tsx
+++ b/benchmarks/memory/client/scenarios/preload-churn/solid/src/app.tsx
@@ -1,5 +1,5 @@
import { RouterProvider } from '@tanstack/solid-router'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { getRouter } from './router'
export { getTrackedItemLoaderCount } from '../../item-payload'
diff --git a/benchmarks/memory/client/scenarios/preload-churn/solid/tsconfig.json b/benchmarks/memory/client/scenarios/preload-churn/solid/tsconfig.json
index b12dcb7ade..9558353c88 100644
--- a/benchmarks/memory/client/scenarios/preload-churn/solid/tsconfig.json
+++ b/benchmarks/memory/client/scenarios/preload-churn/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"jsx": "preserve",
"allowImportingTsExtensions": true,
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/client/scenarios/preload-churn/solid/vite.config.ts b/benchmarks/memory/client/scenarios/preload-churn/solid/vite.config.ts
index c86a6fcbb3..6fc5fa6c4e 100644
--- a/benchmarks/memory/client/scenarios/preload-churn/solid/vite.config.ts
+++ b/benchmarks/memory/client/scenarios/preload-churn/solid/vite.config.ts
@@ -1,7 +1,7 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -13,7 +13,7 @@ export default defineConfig({
plugins: [
!!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
codspeedPlugin(),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/client/scenarios/unique-location-churn/solid/src/app.tsx b/benchmarks/memory/client/scenarios/unique-location-churn/solid/src/app.tsx
index 16000c90a1..5917ef0191 100644
--- a/benchmarks/memory/client/scenarios/unique-location-churn/solid/src/app.tsx
+++ b/benchmarks/memory/client/scenarios/unique-location-churn/solid/src/app.tsx
@@ -1,5 +1,5 @@
import { RouterProvider } from '@tanstack/solid-router'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { getRouter } from './router'
export function mountTestApp(container: Element) {
diff --git a/benchmarks/memory/client/scenarios/unique-location-churn/solid/tsconfig.json b/benchmarks/memory/client/scenarios/unique-location-churn/solid/tsconfig.json
index b12dcb7ade..9558353c88 100644
--- a/benchmarks/memory/client/scenarios/unique-location-churn/solid/tsconfig.json
+++ b/benchmarks/memory/client/scenarios/unique-location-churn/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"jsx": "preserve",
"allowImportingTsExtensions": true,
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/client/scenarios/unique-location-churn/solid/vite.config.ts b/benchmarks/memory/client/scenarios/unique-location-churn/solid/vite.config.ts
index d4acf0019a..df652ab2c4 100644
--- a/benchmarks/memory/client/scenarios/unique-location-churn/solid/vite.config.ts
+++ b/benchmarks/memory/client/scenarios/unique-location-churn/solid/vite.config.ts
@@ -1,7 +1,7 @@
import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -13,7 +13,7 @@ export default defineConfig({
plugins: [
!!(process.env.VITEST && process.env.WITH_INSTRUMENTATION) &&
codspeedPlugin(),
- solid({ hot: false, dev: false }),
+ solid({ refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/server/package.json b/benchmarks/memory/server/package.json
index ae09eb8511..3663b3aa1e 100644
--- a/benchmarks/memory/server/package.json
+++ b/benchmarks/memory/server/package.json
@@ -11,6 +11,7 @@
"#memory-server/flame-runner": "./flame-runner.ts"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0-rc.20",
"@tanstack/react-router": "workspace:*",
"@tanstack/react-start": "workspace:*",
"@tanstack/solid-router": "workspace:*",
@@ -19,19 +20,19 @@
"@tanstack/vue-start": "workspace:*",
"react": "^19.0.0",
"react-dom": "^19.0.0",
- "solid-js": "^1.9.10",
+ "solid-js": "^2.0.0-rc.20",
"vue": "^3.5.16"
},
"devDependencies": {
"@codspeed/vitest-plugin": "^5.5.0",
"@datadog/pprof": "^5.13.2",
"@platformatic/flame": "^1.6.0",
+ "@solidjs/vite-plugin": "^3.0.0-next.54",
"@vitejs/plugin-react": "^6.0.1",
"@vitejs/plugin-vue-jsx": "^5.1.5",
"@typescript/native": "npm:typescript@^7.0.2",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "^8.0.14",
- "vite-plugin-solid": "^2.11.11",
"vitest": "^4.1.4"
},
"nx": {
diff --git a/benchmarks/memory/server/scenarios/aborted-requests/solid/src/routes/__root.tsx b/benchmarks/memory/server/scenarios/aborted-requests/solid/src/routes/__root.tsx
index aaf7dfdd89..6e83136ea0 100644
--- a/benchmarks/memory/server/scenarios/aborted-requests/solid/src/routes/__root.tsx
+++ b/benchmarks/memory/server/scenarios/aborted-requests/solid/src/routes/__root.tsx
@@ -4,7 +4,7 @@ import {
Scripts,
createRootRoute,
} from '@tanstack/solid-router'
-import { HydrationScript } from 'solid-js/web'
+import { HydrationScript } from '@solidjs/web'
export const Route = createRootRoute({
head: () => ({
diff --git a/benchmarks/memory/server/scenarios/aborted-requests/solid/src/routes/stream.$id.tsx b/benchmarks/memory/server/scenarios/aborted-requests/solid/src/routes/stream.$id.tsx
index b47f25a405..0ddc6d1447 100644
--- a/benchmarks/memory/server/scenarios/aborted-requests/solid/src/routes/stream.$id.tsx
+++ b/benchmarks/memory/server/scenarios/aborted-requests/solid/src/routes/stream.$id.tsx
@@ -1,5 +1,5 @@
-import { createFileRoute } from '@tanstack/solid-router'
-import { Show, Suspense, createResource } from 'solid-js'
+import { Await, createFileRoute } from '@tanstack/solid-router'
+import { Loading } from 'solid-js'
import {
makeAbortedRequestRecords,
type DeferredRecord,
@@ -95,48 +95,47 @@ function StreamComponent() {
return (
{data().eager}
- loading-alpha
}
>
-
-
-
+ {(records) => (
+
+ )}
+
+
+ loading-beta
}
>
-
-
+
+ {(records) => (
+
+ )}
+
+
)
}
function DeferredRecords(props: {
- promise: Promise>
+ records: Array
dataBench: string
}) {
- const [records] = createResource(
- () => props.promise,
- (promise) => promise,
- )
-
return (
-
- {(resolvedRecords) => (
-
- {resolvedRecords().map((record) => (
- - {record.label}
- ))}
-
- )}
-
+
+ {props.records.map((record) => (
+ - {record.label}
+ ))}
+
)
}
diff --git a/benchmarks/memory/server/scenarios/aborted-requests/solid/tsconfig.json b/benchmarks/memory/server/scenarios/aborted-requests/solid/tsconfig.json
index 4b61264e11..cdb88448d7 100644
--- a/benchmarks/memory/server/scenarios/aborted-requests/solid/tsconfig.json
+++ b/benchmarks/memory/server/scenarios/aborted-requests/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"allowImportingTsExtensions": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/server/scenarios/aborted-requests/solid/vite.config.ts b/benchmarks/memory/server/scenarios/aborted-requests/solid/vite.config.ts
index 5ee4e152af..6b39cd33c3 100644
--- a/benchmarks/memory/server/scenarios/aborted-requests/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/aborted-requests/solid/vite.config.ts
@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -14,7 +14,7 @@ export default defineConfig({
tanstackStart({
srcDirectory: 'src',
}),
- solid({ ssr: true, hot: false, dev: false }),
+ solid({ ssr: true, refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/src/routes/__root.tsx b/benchmarks/memory/server/scenarios/error-paths/solid/src/routes/__root.tsx
index aaf7dfdd89..6e83136ea0 100644
--- a/benchmarks/memory/server/scenarios/error-paths/solid/src/routes/__root.tsx
+++ b/benchmarks/memory/server/scenarios/error-paths/solid/src/routes/__root.tsx
@@ -4,7 +4,7 @@ import {
Scripts,
createRootRoute,
} from '@tanstack/solid-router'
-import { HydrationScript } from 'solid-js/web'
+import { HydrationScript } from '@solidjs/web'
export const Route = createRootRoute({
head: () => ({
diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/tsconfig.json b/benchmarks/memory/server/scenarios/error-paths/solid/tsconfig.json
index 4b61264e11..cdb88448d7 100644
--- a/benchmarks/memory/server/scenarios/error-paths/solid/tsconfig.json
+++ b/benchmarks/memory/server/scenarios/error-paths/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"allowImportingTsExtensions": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/server/scenarios/error-paths/solid/vite.config.ts b/benchmarks/memory/server/scenarios/error-paths/solid/vite.config.ts
index 401d1e5f25..9a3f302349 100644
--- a/benchmarks/memory/server/scenarios/error-paths/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/error-paths/solid/vite.config.ts
@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -14,7 +14,7 @@ export default defineConfig({
tanstackStart({
srcDirectory: 'src',
}),
- solid({ ssr: true, hot: false, dev: false }),
+ solid({ ssr: true, refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/server/scenarios/peak-large-page/solid/src/routes/__root.tsx b/benchmarks/memory/server/scenarios/peak-large-page/solid/src/routes/__root.tsx
index aaf7dfdd89..6e83136ea0 100644
--- a/benchmarks/memory/server/scenarios/peak-large-page/solid/src/routes/__root.tsx
+++ b/benchmarks/memory/server/scenarios/peak-large-page/solid/src/routes/__root.tsx
@@ -4,7 +4,7 @@ import {
Scripts,
createRootRoute,
} from '@tanstack/solid-router'
-import { HydrationScript } from 'solid-js/web'
+import { HydrationScript } from '@solidjs/web'
export const Route = createRootRoute({
head: () => ({
diff --git a/benchmarks/memory/server/scenarios/peak-large-page/solid/tsconfig.json b/benchmarks/memory/server/scenarios/peak-large-page/solid/tsconfig.json
index 4b61264e11..cdb88448d7 100644
--- a/benchmarks/memory/server/scenarios/peak-large-page/solid/tsconfig.json
+++ b/benchmarks/memory/server/scenarios/peak-large-page/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"allowImportingTsExtensions": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/server/scenarios/peak-large-page/solid/vite.config.ts b/benchmarks/memory/server/scenarios/peak-large-page/solid/vite.config.ts
index 27d4dd65f7..5e906a464b 100644
--- a/benchmarks/memory/server/scenarios/peak-large-page/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/peak-large-page/solid/vite.config.ts
@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -14,7 +14,7 @@ export default defineConfig({
tanstackStart({
srcDirectory: 'src',
}),
- solid({ ssr: true, hot: false, dev: false }),
+ solid({ ssr: true, refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/server/scenarios/request-churn/solid/src/routes/__root.tsx b/benchmarks/memory/server/scenarios/request-churn/solid/src/routes/__root.tsx
index aaf7dfdd89..6e83136ea0 100644
--- a/benchmarks/memory/server/scenarios/request-churn/solid/src/routes/__root.tsx
+++ b/benchmarks/memory/server/scenarios/request-churn/solid/src/routes/__root.tsx
@@ -4,7 +4,7 @@ import {
Scripts,
createRootRoute,
} from '@tanstack/solid-router'
-import { HydrationScript } from 'solid-js/web'
+import { HydrationScript } from '@solidjs/web'
export const Route = createRootRoute({
head: () => ({
diff --git a/benchmarks/memory/server/scenarios/request-churn/solid/tsconfig.json b/benchmarks/memory/server/scenarios/request-churn/solid/tsconfig.json
index 4b61264e11..cdb88448d7 100644
--- a/benchmarks/memory/server/scenarios/request-churn/solid/tsconfig.json
+++ b/benchmarks/memory/server/scenarios/request-churn/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"allowImportingTsExtensions": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/server/scenarios/request-churn/solid/vite.config.ts b/benchmarks/memory/server/scenarios/request-churn/solid/vite.config.ts
index fbf8df9491..b9dffd9ec9 100644
--- a/benchmarks/memory/server/scenarios/request-churn/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/request-churn/solid/vite.config.ts
@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -14,7 +14,7 @@ export default defineConfig({
tanstackStart({
srcDirectory: 'src',
}),
- solid({ ssr: true, hot: false, dev: false }),
+ solid({ ssr: true, refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/server/scenarios/serialization-payload/solid/src/routes/__root.tsx b/benchmarks/memory/server/scenarios/serialization-payload/solid/src/routes/__root.tsx
index aaf7dfdd89..6e83136ea0 100644
--- a/benchmarks/memory/server/scenarios/serialization-payload/solid/src/routes/__root.tsx
+++ b/benchmarks/memory/server/scenarios/serialization-payload/solid/src/routes/__root.tsx
@@ -4,7 +4,7 @@ import {
Scripts,
createRootRoute,
} from '@tanstack/solid-router'
-import { HydrationScript } from 'solid-js/web'
+import { HydrationScript } from '@solidjs/web'
export const Route = createRootRoute({
head: () => ({
diff --git a/benchmarks/memory/server/scenarios/serialization-payload/solid/tsconfig.json b/benchmarks/memory/server/scenarios/serialization-payload/solid/tsconfig.json
index 4b61264e11..cdb88448d7 100644
--- a/benchmarks/memory/server/scenarios/serialization-payload/solid/tsconfig.json
+++ b/benchmarks/memory/server/scenarios/serialization-payload/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"allowImportingTsExtensions": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/server/scenarios/serialization-payload/solid/vite.config.ts b/benchmarks/memory/server/scenarios/serialization-payload/solid/vite.config.ts
index 926646ee12..7313699668 100644
--- a/benchmarks/memory/server/scenarios/serialization-payload/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/serialization-payload/solid/vite.config.ts
@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -14,7 +14,7 @@ export default defineConfig({
tanstackStart({
srcDirectory: 'src',
}),
- solid({ ssr: true, hot: false, dev: false }),
+ solid({ ssr: true, refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts b/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts
index 6e2959e757..a385f28bf5 100644
--- a/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts
+++ b/benchmarks/memory/server/scenarios/server-fn-churn/shared.ts
@@ -14,12 +14,18 @@ type FnUrls = {
post: string
}
-type PayloadFixture = {
+export type PayloadFixture = {
id: string
body: string
query: string
}
+export type ServerFnChurnAdapter = {
+ buildGetRequest: (url: string, fixture: PayloadFixture) => Request
+ buildPostRequest: (url: string, fixture: PayloadFixture) => Request
+ validateResponse: (response: Response, request: Request) => void
+}
+
type SerovalNode =
| {
t: 1
@@ -162,6 +168,12 @@ function validateServerFnResponse(response: Response, request: Request) {
}
}
+const tanstackServerFnChurnAdapter: ServerFnChurnAdapter = {
+ buildGetRequest,
+ buildPostRequest,
+ validateResponse: validateServerFnResponse,
+}
+
function validateEchoedBody(
body: string,
request: Request,
@@ -181,27 +193,29 @@ function validateEchoedBody(
async function assertServerFnChurnSanity(
handler: StartRequestHandler,
urls: FnUrls,
+ adapter: ServerFnChurnAdapter,
) {
const getFixture = getFixtures[0]!
- const getRequest = buildGetRequest(urls.get, getFixture)
+ const getRequest = adapter.buildGetRequest(urls.get, getFixture)
const getResponse = await handler.fetch(getRequest)
const getBody = await getResponse.text()
- validateServerFnResponse(getResponse, getRequest)
+ adapter.validateResponse(getResponse, getRequest)
validateEchoedBody(getBody, getRequest, getFixture.id)
const postFixture = postFixtures[0]!
- const postRequest = buildPostRequest(urls.post, postFixture)
+ const postRequest = adapter.buildPostRequest(urls.post, postFixture)
const postResponse = await handler.fetch(postRequest)
const postBody = await postResponse.text()
- validateServerFnResponse(postResponse, postRequest)
+ adapter.validateResponse(postResponse, postRequest)
validateEchoedBody(postBody, postRequest, postFixture.id)
}
export async function createWorkloadGroup(
framework: Framework,
handler: StartRequestHandler,
+ adapter: ServerFnChurnAdapter = tanstackServerFnChurnAdapter,
) {
const urls = await discoverUrls(handler)
const run = () =>
@@ -214,17 +228,17 @@ export async function createWorkloadGroup(
if (index % 2 === 0) {
const fixture = getFixtures[fixtureIndex]!
- return buildGetRequest(urls.get, fixture)
+ return adapter.buildGetRequest(urls.get, fixture)
} else {
const fixture = postFixtures[fixtureIndex]!
- return buildPostRequest(urls.post, fixture)
+ return adapter.buildPostRequest(urls.post, fixture)
}
},
- validateResponse: validateServerFnResponse,
+ validateResponse: adapter.validateResponse,
})
return {
- sanity: () => assertServerFnChurnSanity(handler, urls),
+ sanity: () => assertServerFnChurnSanity(handler, urls, adapter),
workloads: [
{
name: `mem server server-fn-churn (${framework})`,
diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/solid/adapter.ts b/benchmarks/memory/server/scenarios/server-fn-churn/solid/adapter.ts
new file mode 100644
index 0000000000..f23735ce8f
--- /dev/null
+++ b/benchmarks/memory/server/scenarios/server-fn-churn/solid/adapter.ts
@@ -0,0 +1,28 @@
+import {
+ createSolidServerFunctionGetRequest,
+ createSolidServerFunctionPostRequest,
+ validateSolidServerFunctionResponse,
+} from '../../../../../solid-server-functions'
+import type { PayloadFixture, ServerFnChurnAdapter } from '../shared'
+
+function buildGetRequest(url: string, fixture: PayloadFixture) {
+ return createSolidServerFunctionGetRequest(
+ url,
+ [{ method: 'GET', data: { id: fixture.id } }],
+ `memory-get:${fixture.id}`,
+ )
+}
+
+function buildPostRequest(url: string, fixture: PayloadFixture) {
+ return createSolidServerFunctionPostRequest(
+ url,
+ [{ method: 'POST', data: { id: fixture.id } }],
+ `memory-post:${fixture.id}`,
+ )
+}
+
+export const solidServerFnChurnAdapter: ServerFnChurnAdapter = {
+ buildGetRequest,
+ buildPostRequest,
+ validateResponse: validateSolidServerFunctionResponse,
+}
diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/solid/setup.ts b/benchmarks/memory/server/scenarios/server-fn-churn/solid/setup.ts
index 4fe85c3f00..1a732965b8 100644
--- a/benchmarks/memory/server/scenarios/server-fn-churn/solid/setup.ts
+++ b/benchmarks/memory/server/scenarios/server-fn-churn/solid/setup.ts
@@ -1,5 +1,6 @@
import type { ServerMemoryWorkloadGroup } from '#memory-server/benchmark'
import { createWorkloadGroup } from '../shared.ts'
+import { solidServerFnChurnAdapter } from './adapter'
import type { StartRequestHandler } from '../shared.ts'
const appModuleUrl = new URL('./dist/server/server.js', import.meta.url).href
@@ -11,4 +12,4 @@ const { default: handler } = (await import(
}
export const workloadGroup: ServerMemoryWorkloadGroup =
- await createWorkloadGroup('solid', handler)
+ await createWorkloadGroup('solid', handler, solidServerFnChurnAdapter)
diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/solid/src/routes/__root.tsx b/benchmarks/memory/server/scenarios/server-fn-churn/solid/src/routes/__root.tsx
index aaf7dfdd89..6e83136ea0 100644
--- a/benchmarks/memory/server/scenarios/server-fn-churn/solid/src/routes/__root.tsx
+++ b/benchmarks/memory/server/scenarios/server-fn-churn/solid/src/routes/__root.tsx
@@ -4,7 +4,7 @@ import {
Scripts,
createRootRoute,
} from '@tanstack/solid-router'
-import { HydrationScript } from 'solid-js/web'
+import { HydrationScript } from '@solidjs/web'
export const Route = createRootRoute({
head: () => ({
diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/solid/tsconfig.json b/benchmarks/memory/server/scenarios/server-fn-churn/solid/tsconfig.json
index 4b61264e11..cdb88448d7 100644
--- a/benchmarks/memory/server/scenarios/server-fn-churn/solid/tsconfig.json
+++ b/benchmarks/memory/server/scenarios/server-fn-churn/solid/tsconfig.json
@@ -3,7 +3,7 @@
"compilerOptions": {
"allowImportingTsExtensions": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
diff --git a/benchmarks/memory/server/scenarios/server-fn-churn/solid/vite.config.ts b/benchmarks/memory/server/scenarios/server-fn-churn/solid/vite.config.ts
index 8d6d226e97..762bb152e3 100644
--- a/benchmarks/memory/server/scenarios/server-fn-churn/solid/vite.config.ts
+++ b/benchmarks/memory/server/scenarios/server-fn-churn/solid/vite.config.ts
@@ -2,7 +2,7 @@ import { fileURLToPath } from 'node:url'
import { defineConfig } from 'vitest/config'
import codspeedPlugin from '@codspeed/vitest-plugin'
import { tanstackStart } from '@tanstack/solid-start/plugin/vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
const rootDir = fileURLToPath(new URL('.', import.meta.url))
@@ -14,7 +14,7 @@ export default defineConfig({
tanstackStart({
srcDirectory: 'src',
}),
- solid({ ssr: true, hot: false, dev: false }),
+ solid({ ssr: true, refresh: false, dev: false }),
],
build: {
outDir: './dist',
diff --git a/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts b/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts
index 9a5c211fee..138ad2bbde 100644
--- a/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts
+++ b/benchmarks/memory/server/scenarios/streaming-peak/solid/memory.bench.ts
@@ -1,11 +1,14 @@
import { bench, describe } from 'vitest'
import { memoryBenchOptions } from '#memory-server/bench-utils'
-import { workloadGroup } from './setup'
-
-await workloadGroup.sanity()
+// TODO(solid-router-v2): re-enable once router-core's SSR stream transformer
+// supports Solid 2's streaming shape. Solid 2's renderToStream emits
+// `