Skip to content

Solid v2 beta 10 #7284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
birkskyum merged 8 commits into from
Apr 30, 2026
Merged

Solid v2 beta 10 #7284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b21d44
chore: solid v2 beta 9
brenelz Apr 28, 2026
4f1a734
chore: add changeset
brenelz Apr 28, 2026
1a6df41
chore: fix build
brenelz Apr 28, 2026
5b40496
fix: get soldi 2.0 beta.9 to pass
brenelz Apr 29, 2026
7b039d6
Revert "fix: get soldi 2.0 beta.9 to pass"
brenelz Apr 29, 2026
43bdcbf
chore: update solid v2 beta 10
brenelz Apr 30, 2026
ad6acb6
Merge branch 'solid-router-v2-pre' into solid-v2-beta-9
brenelz Apr 30, 2026
299cce3
fix: update Solid JSX types in examples
brenelz Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .changeset/cyan-otters-notice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions benchmarks/bundle-size/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"build": "node ../../scripts/benchmarks/bundle-size/measure.mjs"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.10",
"@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:^",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"solid-js": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"vue": "^3.5.16"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions benchmarks/client-nav/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@
"test:types:vue": "tsc -p ./vue/tsconfig.json --noEmit"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.10",
"@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": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"vue": "^3.5.16"
},
"devDependencies": {
"@platformatic/flame": "^1.6.0",
"@codspeed/vitest-plugin": "^5.0.1",
"@platformatic/flame": "^1.6.0",
"@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.0",
"vite-plugin-solid": "^3.0.0-next.5",
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/client-nav/solid/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"compilerOptions": {
"jsx": "preserve",
"allowImportingTsExtensions": true,
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/ssr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"test:types:vue": "tsc -p ./vue/tsconfig.json --noEmit"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.10",
"@tanstack/react-router": "workspace:^",
"@tanstack/react-start": "workspace:^",
"@tanstack/solid-router": "workspace:^",
Expand All @@ -24,8 +25,7 @@
"@tanstack/vue-start": "workspace:^",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"solid-js": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"vue": "^3.5.16"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/ssr/solid/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": "../../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"types": ["node", "vite/client", "vitest/globals"]
},
"include": [
Expand Down
2 changes: 1 addition & 1 deletion docs/router/installation/with-router-cli.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ If you are using TypeScript, you should also add the following options to your `
{
"compilerOptions": {
"jsx": "preserve",
"jsxImportSource": "solid-js"
"jsxImportSource": "@solidjs/web"
}
}
```
Expand Down
2 changes: 1 addition & 1 deletion docs/start/framework/solid/build-from-scratch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ We highly recommend using TypeScript with TanStack Start. Create a `tsconfig.jso
{
"compilerOptions": {
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"moduleResolution": "Bundler",
"module": "ESNext",
"target": "ES2022",
Expand Down
10 changes: 5 additions & 5 deletions e2e/solid-router/basepath-file-based/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.10",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/router-plugin": "workspace:^",
"solid-js": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.8"
"solid-js": "2.0.0-beta.10"
},
"devDependencies": {
"@playwright/test": "^1.50.1",
"@tanstack/router-e2e-utils": "workspace:^",
"vite-plugin-solid": "^3.0.0-next.5",
"vite": "^8.0.0"
"vite": "^8.0.0",
"vite-plugin-solid": "^3.0.0-next.5"
}
}
2 changes: 1 addition & 1 deletion e2e/solid-router/basepath-file-based/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"target": "ESNext",
"moduleResolution": "Bundler",
"module": "ESNext",
Expand Down
4 changes: 2 additions & 2 deletions e2e/solid-router/basic-esbuild-file-based/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.10",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/zod-adapter": "workspace:^",
"redaxios": "^0.5.1",
"solid-js": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"zod": "^3.24.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion e2e/solid-router/basic-esbuild-file-based/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"target": "ESNext",
"moduleResolution": "Bundler",
"module": "ESNext",
Expand Down
4 changes: 2 additions & 2 deletions e2e/solid-router/basic-file-based-code-splitting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"test:e2e": "rm -rf port*.txt; pnpm run test:e2e:verbose-routes:true && pnpm run test:e2e:verbose-routes:false"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.10",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"solid-js": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"tailwindcss": "^4.2.2",
"zod": "^3.24.2"
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/solid-router/basic-file-based-code-splitting/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"target": "ESNext",
"moduleResolution": "Bundler",
"module": "ESNext",
Expand Down
4 changes: 2 additions & 2 deletions e2e/solid-router/basic-file-based/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"test:e2e:default": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.10",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/zod-adapter": "workspace:^",
"redaxios": "^0.5.1",
"solid-js": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"tailwindcss": "^4.2.2",
"zod": "^3.24.2"
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/solid-router/basic-file-based/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"target": "ESNext",
"moduleResolution": "Bundler",
"module": "ESNext",
Expand Down
8 changes: 4 additions & 4 deletions e2e/solid-router/basic-scroll-restoration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@
"test:e2e": "exit 0; rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.10",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/solid-virtual": "^3.13.0",
"redaxios": "^0.5.1",
"solid-js": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
"@playwright/test": "^1.50.1",
"@tanstack/router-e2e-utils": "workspace:^",
"typescript": "~5.9.0",
"vite": "^8.0.0",
"vite-plugin-solid": "^3.0.0-next.5",
"typescript": "~5.9.0"
"vite-plugin-solid": "^3.0.0-next.5"
}
}
2 changes: 1 addition & 1 deletion e2e/solid-router/basic-scroll-restoration/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"target": "ESNext",
"moduleResolution": "Bundler",
"module": "ESNext",
Expand Down
4 changes: 2 additions & 2 deletions e2e/solid-router/basic-solid-query-file-based/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.10",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-query": "^6.0.0-beta.4",
"@tanstack/solid-query-devtools": "^6.0.0-beta.4",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
"solid-js": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"tailwindcss": "^4.2.2",
"zod": "^3.24.2"
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/solid-router/basic-solid-query-file-based/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"target": "ESNext",
"moduleResolution": "Bundler",
"module": "ESNext",
Expand Down
4 changes: 2 additions & 2 deletions e2e/solid-router/basic-solid-query/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.10",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-query": "^6.0.0-beta.4",
"@tanstack/solid-query-devtools": "^6.0.0-beta.4",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
"solid-js": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion e2e/solid-router/basic-solid-query/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"target": "ESNext",
"moduleResolution": "Bundler",
"module": "ESNext",
Expand Down
4 changes: 2 additions & 2 deletions e2e/solid-router/basic-virtual-file-based/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.10",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/virtual-file-routes": "workspace:^",
"redaxios": "^0.5.1",
"solid-js": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"tailwindcss": "^4.2.2",
"zod": "^3.24.2"
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/solid-router/basic-virtual-file-based/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"target": "ESNext",
"moduleResolution": "Bundler",
"module": "ESNext",
Expand Down
4 changes: 2 additions & 2 deletions e2e/solid-router/basic-virtual-named-export-config-file-based/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.10",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/router-plugin": "workspace:^",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"@tanstack/virtual-file-routes": "workspace:^",
"redaxios": "^0.5.1",
"solid-js": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"tailwindcss": "^4.2.2",
"zod": "^3.24.2"
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/solid-router/basic-virtual-named-export-config-file-based/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"target": "ESNext",
"moduleResolution": "Bundler",
"module": "ESNext",
Expand Down
4 changes: 2 additions & 2 deletions e2e/solid-router/basic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"test:e2e": "rm -rf port*.txt; playwright test --project=chromium"
},
"dependencies": {
"@solidjs/web": "2.0.0-beta.10",
"@tailwindcss/vite": "^4.2.2",
"@tanstack/solid-router": "workspace:^",
"@tanstack/solid-router-devtools": "workspace:^",
"redaxios": "^0.5.1",
"solid-js": "2.0.0-beta.8",
"@solidjs/web": "2.0.0-beta.8",
"solid-js": "2.0.0-beta.10",
"tailwindcss": "^4.2.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion e2e/solid-router/basic/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strict": true,
"esModuleInterop": true,
"jsx": "preserve",
"jsxImportSource": "solid-js",
"jsxImportSource": "@solidjs/web",
"target": "ESNext",
"moduleResolution": "Bundler",
"module": "ESNext",
Expand Down
Loading
Loading