{data().eager}
-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/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/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/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..967ecb9c58
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,87 @@
+{
+ "mode": "pre",
+ "tag": "beta",
+ "initialVersions": {
+ "@tanstack/arktype-adapter": "1.166.7",
+ "@tanstack/eslint-plugin-router": "1.161.4",
+ "@tanstack/history": "1.161.4",
+ "@tanstack/nitro-v2-vite-plugin": "1.154.7",
+ "@tanstack/react-router": "1.166.7",
+ "@tanstack/react-router-devtools": "1.166.7",
+ "@tanstack/react-router-ssr-query": "1.166.7",
+ "@tanstack/react-start": "1.166.8",
+ "@tanstack/react-start-client": "1.166.7",
+ "@tanstack/react-start-server": "1.166.7",
+ "@tanstack/router-cli": "1.166.7",
+ "@tanstack/router-core": "1.166.7",
+ "@tanstack/router-devtools": "1.166.7",
+ "@tanstack/router-devtools-core": "1.166.7",
+ "@tanstack/router-generator": "1.166.7",
+ "@tanstack/router-plugin": "1.166.7",
+ "@tanstack/router-ssr-query-core": "1.166.7",
+ "@tanstack/router-utils": "1.161.4",
+ "@tanstack/router-vite-plugin": "1.166.7",
+ "@tanstack/solid-router": "1.166.7",
+ "@tanstack/solid-router-devtools": "1.166.7",
+ "@tanstack/solid-router-ssr-query": "1.166.7",
+ "@tanstack/solid-start": "1.166.8",
+ "@tanstack/solid-start-client": "1.166.7",
+ "@tanstack/solid-start-server": "1.166.7",
+ "@tanstack/start-client-core": "1.166.7",
+ "@tanstack/start-fn-stubs": "1.161.4",
+ "@tanstack/start-plugin-core": "1.166.8",
+ "@tanstack/start-server-core": "1.166.7",
+ "@tanstack/start-static-server-functions": "1.166.8",
+ "@tanstack/start-storage-context": "1.166.7",
+ "@tanstack/valibot-adapter": "1.166.7",
+ "@tanstack/virtual-file-routes": "1.161.4",
+ "@tanstack/vue-router": "1.166.7",
+ "@tanstack/vue-router-devtools": "1.166.7",
+ "@tanstack/vue-router-ssr-query": "1.166.7",
+ "@tanstack/vue-start": "1.166.8",
+ "@tanstack/vue-start-client": "1.166.7",
+ "@tanstack/vue-start-server": "1.166.7",
+ "@tanstack/zod-adapter": "1.166.7",
+ "@tanstack/eslint-plugin-start": "0.1.0",
+ "@tanstack/react-start-rsc": "0.1.17"
+ },
+ "changesets": [
+ "brave-pans-create",
+ "brown-breads-begin",
+ "bump-solid-query-beta-5",
+ "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",
+ "modern-islands-enjoy",
+ "petite-icons-press",
+ "proxy-free-link-props",
+ "quiet-shrimps-jam",
+ "shaky-tools-think",
+ "silent-streets-camp",
+ "smooth-swans-ask",
+ "social-mails-sort",
+ "social-rules-fold",
+ "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-kings-help",
+ "solid-match-suspend-ssr-only",
+ "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/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-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-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-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/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/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/benchmarks/bundle-size/package.json b/benchmarks/bundle-size/package.json
index 8cd8f73f41..373ae09aaa 100644
--- a/benchmarks/bundle-size/package.json
+++ b/benchmarks/bundle-size/package.json
@@ -27,15 +27,16 @@
}
},
"dependencies": {
+ "@solidjs/web": "2.0.0-beta.25",
"@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-beta.25",
"vue": "^3.5.16"
},
"devDependencies": {
@@ -49,6 +50,6 @@
"@vitejs/plugin-vue-jsx": "^5.1.5",
"typescript": "^6.0.2",
"vite": "^8.0.14",
- "vite-plugin-solid": "^2.11.11"
+ "vite-plugin-solid": "^3.0.0-next.16"
}
}
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-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/client-nav/package.json b/benchmarks/client-nav/package.json
index 701e068b49..9fdd1186dc 100644
--- a/benchmarks/client-nav/package.json
+++ b/benchmarks/client-nav/package.json
@@ -19,27 +19,28 @@
"test:types:vue": "tsc -p ./vue/tsconfig.json --noEmit"
},
"dependencies": {
+ "@solidjs/web": "2.0.0-beta.25",
"@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-beta.25",
"vue": "^3.5.16"
},
"devDependencies": {
- "@platformatic/flame": "^1.6.0",
"@codspeed/vitest-plugin": "^5.5.0",
+ "@platformatic/flame": "^1.6.0",
"@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": "^6.0.2",
"vite": "^8.0.14",
- "vite-plugin-solid": "^2.11.11",
+ "vite-plugin-solid": "^3.0.0-next.16",
"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 92dcc74d0a..c9268ec31c 100644
--- a/benchmarks/client-nav/scenarios/async-pipeline/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/async-pipeline/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'
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/control-flow/solid/src/main.tsx b/benchmarks/client-nav/scenarios/control-flow/solid/src/main.tsx
index 817045bd02..b43608e191 100644
--- a/benchmarks/client-nav/scenarios/control-flow/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/control-flow/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'
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/head/solid/src/main.tsx b/benchmarks/client-nav/scenarios/head/solid/src/main.tsx
index 817045bd02..b43608e191 100644
--- a/benchmarks/client-nav/scenarios/head/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/head/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'
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/history/solid/src/main.tsx b/benchmarks/client-nav/scenarios/history/solid/src/main.tsx
index 817045bd02..b43608e191 100644
--- a/benchmarks/client-nav/scenarios/history/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/history/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'
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/links/solid/src/main.tsx b/benchmarks/client-nav/scenarios/links/solid/src/main.tsx
index 817045bd02..b43608e191 100644
--- a/benchmarks/client-nav/scenarios/links/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/links/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'
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/loaders/solid/src/main.tsx b/benchmarks/client-nav/scenarios/loaders/solid/src/main.tsx
index 817045bd02..b43608e191 100644
--- a/benchmarks/client-nav/scenarios/loaders/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/loaders/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'
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/mount/solid/src/main.tsx b/benchmarks/client-nav/scenarios/mount/solid/src/main.tsx
index ae03b145ca..520d8cff89 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,
createBrowserHistory,
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/nested-params/solid/src/main.tsx b/benchmarks/client-nav/scenarios/nested-params/solid/src/main.tsx
index 817045bd02..b43608e191 100644
--- a/benchmarks/client-nav/scenarios/nested-params/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/nested-params/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'
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/preload/solid/src/main.tsx b/benchmarks/client-nav/scenarios/preload/solid/src/main.tsx
index 72e414c0a0..6e944942f8 100644
--- a/benchmarks/client-nav/scenarios/preload/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/preload/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'
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/rewrites/solid/src/main.tsx b/benchmarks/client-nav/scenarios/rewrites/solid/src/main.tsx
index a80de580fb..9e7fbfe87f 100644
--- a/benchmarks/client-nav/scenarios/rewrites/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/rewrites/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 { 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/route-tree-scale/solid/src/main.tsx b/benchmarks/client-nav/scenarios/route-tree-scale/solid/src/main.tsx
index 817045bd02..b43608e191 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,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/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/search-params/solid/src/main.tsx b/benchmarks/client-nav/scenarios/search-params/solid/src/main.tsx
index e95846e12d..16814f03f7 100644
--- a/benchmarks/client-nav/scenarios/search-params/solid/src/main.tsx
+++ b/benchmarks/client-nav/scenarios/search-params/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'
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/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 (
<>
{data().eager}