diff --git a/.changeset/solid-form-solid-2.md b/.changeset/solid-form-solid-2.md
new file mode 100644
index 0000000000..496ceb38aa
--- /dev/null
+++ b/.changeset/solid-form-solid-2.md
@@ -0,0 +1,11 @@
+---
+'@tanstack/solid-form': patch
+---
+
+BREAKING: `@tanstack/solid-form` now targets Solid 2 and no longer supports Solid 1.
+
+Migration:
+
+- upgrade to Solid 2 (`solid-js` and `@solidjs/web` 2.0)
+- import `render` and JSX types from `@solidjs/web` instead of `solid-js/web`
+- `useSelector` and `useStore` are now exported by `@tanstack/solid-form` itself, which no longer depends on `@tanstack/solid-store`
diff --git a/docs/framework/solid/guides/async-initial-values.md b/docs/framework/solid/guides/async-initial-values.md
index e0197a3711..9bf46711f2 100644
--- a/docs/framework/solid/guides/async-initial-values.md
+++ b/docs/framework/solid/guides/async-initial-values.md
@@ -4,13 +4,12 @@ title: Async Initial Values
---
Forms often edit data loaded from an API. A server-state library such as
-TanStack Query should own fetching, caching, loading, and retries; TanStack Form
+TanStack Query (`@tanstack/solid-query` v6 for Solid 2) should own fetching, caching, loading, and retries; TanStack Form
should own the editable copy.
-There are two supported ways to provide async initial values: wait to create the
-form until the data is ready, or create it immediately with complete fallback
-values. Choose the approach that best matches the loading experience your UI
-needs.
+In Solid 2, wait to create the form until the data is ready. Query data is
+async, so don't read it inside the `createForm` options: those options are read
+when the form is created, before the data has loaded.
## Wait for data before creating the editor
@@ -19,13 +18,13 @@ Render a loading or error state first, then mount a component whose
```tsx
// UserPage.tsx
-import { Show } from 'solid-js'
-import { createQuery } from '@tanstack/solid-query'
+import { Errored, Loading, Show } from 'solid-js'
+import { useQuery } from '@tanstack/solid-query'
import { UserEditor } from './UserEditor'
import type { User } from './types'
export function UserPage(props: { userId: string }) {
- const userQuery = createQuery(() => ({
+ const userQuery = useQuery(() => ({
queryKey: ['user', props.userId],
queryFn: async (): Promise => {
const response = await fetch(`/api/users/${props.userId}`)
@@ -34,14 +33,13 @@ export function UserPage(props: { userId: string }) {
}))
return (
- Could not load the user.
}
- >
- Loading…}>
- {(user) => }
-
-
+ Could not load the user.}>
+ Loading…}>
+
+ {(user) => }
+
+
+
)
}
```
@@ -76,70 +74,10 @@ export function UserEditor(props: { user: User }) {
}
```
-This pattern is useful when no form state is needed during loading. The keyed
-`Show` recreates the editor when a different user object arrives.
-
-## Create the form before data arrives
-
-You can instead call `createForm` in the same component as `createQuery`.
-Provide a static, shape-complete fallback so `defaultValues` are never
-`undefined`.
-
-```tsx
-import { Show } from 'solid-js'
-import { createQuery } from '@tanstack/solid-query'
-import { createForm } from '@tanstack/solid-form'
-import type { User } from './types'
-
-const emptyUser: User = {
- firstName: '',
- lastName: '',
-}
-
-export function UserPage(props: { userId: string }) {
- const userQuery = createQuery(() => ({
- queryKey: ['user', props.userId],
- queryFn: async (): Promise => {
- const response = await fetch(`/api/users/${props.userId}`)
- return response.json()
- },
- }))
-
- const form = createForm(() => ({
- defaultValues: userQuery.data ?? emptyUser,
- onSubmit: async ({ value }) => {
- await fetch('/api/users', {
- method: 'PUT',
- headers: { 'content-type': 'application/json' },
- body: JSON.stringify(value),
- })
- },
- }))
-
- return (
- Could not load the user.}
- >
- Loading…}>
-
-
-
- )
-}
-```
-
-Because both integrations receive accessors, reading `userQuery.data` inside
-the form options accessor keeps the options reactive. When query data replaces
-the fallback, TanStack Form applies the new `defaultValues` to untouched fields
-while preserving fields the user has already touched.
+In Solid 2, query data is async: reading `userQuery.data` before it has loaded
+suspends to the nearest `Loading` boundary. The keyed `Show` creates the editor
+once the user has loaded, and recreates it when a different user object
+arrives.
This is the approach demonstrated by the repository's
`examples/solid/query-integration` example.
@@ -147,14 +85,12 @@ This is the approach demonstrated by the repository's
## Background refetches and record changes
`defaultValues` establish the form's baseline; they are not a fully controlled
-`values` prop. In the fallback pattern, later `defaultValues` updates use the
-same touched-field-preserving behavior.
+`values` prop.
If background refetches arrive while a user is editing, decide at the product
level whether to keep local edits, prompt before replacing them, or call
`form.reset(nextValues)` deliberately. Do not overwrite in-progress input merely
because a query refreshed.
-When switching to a different record, either recreate a keyed editor as in the
-first pattern or deliberately reset the existing form. Otherwise, touched
-values from the previous record can be preserved when the new defaults arrive.
+When switching to a different record, either recreate a keyed editor as above
+or deliberately reset the existing form.
diff --git a/docs/framework/solid/guides/validation.md b/docs/framework/solid/guides/validation.md
index c1bcd6a4d9..7ba85c411a 100644
--- a/docs/framework/solid/guides/validation.md
+++ b/docs/framework/solid/guides/validation.md
@@ -38,7 +38,7 @@ change and blur triggers.
onInput={(event) =>
field().handleChange(event.currentTarget.valueAsNumber)
}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
{(error) => {error.message} }
@@ -209,7 +209,7 @@ Use `watchFields` when one field's validity depends on another:
value={field().value}
onBlur={field().handleBlur}
onInput={(event) => field().handleChange(event.currentTarget.value)}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
)}
diff --git a/docs/framework/solid/quick-start.md b/docs/framework/solid/quick-start.md
index 4d645c76d1..9cb7845b1b 100644
--- a/docs/framework/solid/quick-start.md
+++ b/docs/framework/solid/quick-start.md
@@ -6,10 +6,11 @@ title: Quick Start
TanStack Form is a headless, type-safe form library. It owns form state and
validation while leaving markup, styling, and component choice to you.
-Install the Solid adapter:
+Install the Solid adapter. TanStack Form v2 for Solid requires Solid 2
+(`solid-js` and `@solidjs/web` 2.0):
```bash
-npm install @tanstack/solid-form
+npm install @tanstack/solid-form solid-js @solidjs/web
```
## Create a form
@@ -59,7 +60,7 @@ export function ProfileForm() {
onInput={(event) =>
field().handleChange(event.currentTarget.value)
}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
{(error) => {error.message} }
@@ -89,7 +90,7 @@ export function ProfileForm() {
onInput={(event) =>
field().handleChange(event.currentTarget.valueAsNumber)
}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
)}
diff --git a/docs/migrate-from-v1.md b/docs/migrate-from-v1.md
index e08030e2fa..350ff74857 100644
--- a/docs/migrate-from-v1.md
+++ b/docs/migrate-from-v1.md
@@ -58,6 +58,8 @@ This page is a starting checklist for migrating React apps from v1 to v2.
a CommonJS build and require Node.js 18 or newer.
- Upgrade React to version 18 or newer. The v2 React adapter no longer supports
React 17.
+- Upgrade Solid to version 2 when using the Solid adapter. The v2 Solid
+ adapter no longer supports Solid 1.
- Update CommonJS integrations to consume ESM. The v2 packages do not publish
a CommonJS build and require Node.js 18 or newer.
@@ -78,6 +80,21 @@ Form Composition relies on Vue 3.6 behavior to work correctly. Requiring it
from the start lets the Vue adapter support Form Composition without adding a
breaking minimum-version change later in the v2 release line.
+## Solid version
+
+The v2 Solid adapter requires Solid 2 (`solid-js` and `@solidjs/web` 2.0).
+Solid 1 is no longer supported, so upgrade Solid before migrating. The
+[Solid 2 docs](https://v2.solidjs.com) cover upgrading Solid itself. At the
+time of writing, Solid 2 is available as a release candidate.
+
+In Solid 2 code that uses the adapter:
+
+- Import `render` and the JSX types from `@solidjs/web` instead of
+ `solid-js/web`.
+- `useSelector` (and the deprecated `useStore` alias) is exported from
+ `@tanstack/solid-form` itself, so the adapter no longer depends on
+ `@tanstack/solid-store`.
+
## Package format
The v2 core, framework, devtools, and server-adapter packages publish ESM
diff --git a/docs/overview.md b/docs/overview.md
index 5a85cfb25b..c1f94d24a3 100644
--- a/docs/overview.md
+++ b/docs/overview.md
@@ -336,7 +336,7 @@ In the example below, you can see TanStack Form in action with the Solid framewo
```tsx title="App.tsx"
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { createForm } from '@tanstack/solid-form'
import { FieldInfo } from './FieldInfo.tsx'
@@ -398,7 +398,7 @@ function App() {
onInput={(event) =>
field().handleChange(event.currentTarget.value)
}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
>
@@ -418,7 +418,7 @@ function App() {
onInput={(event) =>
field().handleChange(event.currentTarget.value)
}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
>
diff --git a/examples/solid/array/package.json b/examples/solid/array/package.json
index 11c543804f..ae62ca62ae 100644
--- a/examples/solid/array/package.json
+++ b/examples/solid/array/package.json
@@ -9,12 +9,13 @@
"test:types": "tsc"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0",
"@tanstack/solid-form": "^2.0.0-alpha.3",
- "solid-js": "^1.9.13"
+ "solid-js": "^2.0.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0",
"typescript": "^6.0.2",
- "vite": "^8.2.1",
- "vite-plugin-solid": "^2.11.14"
+ "vite": "^8.2.1"
}
}
diff --git a/examples/solid/array/src/index.tsx b/examples/solid/array/src/index.tsx
index bd65e165fc..4eb57ba075 100644
--- a/examples/solid/array/src/index.tsx
+++ b/examples/solid/array/src/index.tsx
@@ -1,5 +1,5 @@
-import { For, Index, createMemo, createSignal } from 'solid-js'
-import { render } from 'solid-js/web'
+import { For, createMemo, createSignal } from 'solid-js'
+import { render } from '@solidjs/web'
import { createForm } from '@tanstack/solid-form'
import './index.css'
@@ -36,7 +36,7 @@ function ArrayForm(props: { items: Array }) {
{(array) => (
-
+
{(_, index) => (
{(field) => (
@@ -56,7 +56,7 @@ function ArrayForm(props: { items: Array }) {
)}
)}
-
+
)}
diff --git a/examples/solid/array/tsconfig.json b/examples/solid/array/tsconfig.json
index a2048f7ae9..b1dcd46bf1 100644
--- a/examples/solid/array/tsconfig.json
+++ b/examples/solid/array/tsconfig.json
@@ -3,7 +3,7 @@
"allowImportingTsExtensions": true,
"isolatedModules": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"moduleResolution": "Bundler",
diff --git a/examples/solid/array/vite.config.ts b/examples/solid/array/vite.config.ts
index 4095d9be50..6a1fe32b00 100644
--- a/examples/solid/array/vite.config.ts
+++ b/examples/solid/array/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [solid()],
diff --git a/examples/solid/basic-splitting-form/package.json b/examples/solid/basic-splitting-form/package.json
index 61c7f40898..e310310d9a 100644
--- a/examples/solid/basic-splitting-form/package.json
+++ b/examples/solid/basic-splitting-form/package.json
@@ -9,12 +9,13 @@
"test:types": "tsc"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0",
"@tanstack/solid-form": "^2.0.0-alpha.3",
- "solid-js": "^1.9.13"
+ "solid-js": "^2.0.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0",
"typescript": "^6.0.2",
- "vite": "^8.2.1",
- "vite-plugin-solid": "^2.11.14"
+ "vite": "^8.2.1"
}
}
diff --git a/examples/solid/basic-splitting-form/src/StringField.tsx b/examples/solid/basic-splitting-form/src/StringField.tsx
index 3712a29a38..277f80c07f 100644
--- a/examples/solid/basic-splitting-form/src/StringField.tsx
+++ b/examples/solid/basic-splitting-form/src/StringField.tsx
@@ -9,7 +9,7 @@ interface StringFieldProps {
export function StringField(props: StringFieldProps) {
return (
-
+
{props.label}
props.field().handleChange(event.currentTarget.value)
}
- aria-invalid={props.field().meta.isInvalid}
+ aria-invalid={props.field().meta.isInvalid ? 'true' : 'false'}
/>
diff --git a/examples/solid/basic-splitting-form/src/index.tsx b/examples/solid/basic-splitting-form/src/index.tsx
index 58e51a9503..76a1e23ad9 100644
--- a/examples/solid/basic-splitting-form/src/index.tsx
+++ b/examples/solid/basic-splitting-form/src/index.tsx
@@ -1,4 +1,4 @@
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { createForm } from '@tanstack/solid-form'
import { FormSection } from './FormSection'
import { FormSubmitButton } from './FormSubmitButton'
diff --git a/examples/solid/basic-splitting-form/tsconfig.json b/examples/solid/basic-splitting-form/tsconfig.json
index a2048f7ae9..b1dcd46bf1 100644
--- a/examples/solid/basic-splitting-form/tsconfig.json
+++ b/examples/solid/basic-splitting-form/tsconfig.json
@@ -3,7 +3,7 @@
"allowImportingTsExtensions": true,
"isolatedModules": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"moduleResolution": "Bundler",
diff --git a/examples/solid/basic-splitting-form/vite.config.ts b/examples/solid/basic-splitting-form/vite.config.ts
index 4095d9be50..6a1fe32b00 100644
--- a/examples/solid/basic-splitting-form/vite.config.ts
+++ b/examples/solid/basic-splitting-form/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [solid()],
diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json
index 00a4410459..c03bff7d26 100644
--- a/examples/solid/basic/package.json
+++ b/examples/solid/basic/package.json
@@ -9,12 +9,13 @@
"test:types": "tsc"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0",
"@tanstack/solid-form": "^2.0.0-alpha.3",
- "solid-js": "^1.9.13"
+ "solid-js": "^2.0.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0",
"typescript": "^6.0.2",
- "vite": "^8.2.1",
- "vite-plugin-solid": "^2.11.14"
+ "vite": "^8.2.1"
}
}
diff --git a/examples/solid/basic/src/index.tsx b/examples/solid/basic/src/index.tsx
index 9cc5ffb194..aa72c178ff 100644
--- a/examples/solid/basic/src/index.tsx
+++ b/examples/solid/basic/src/index.tsx
@@ -1,5 +1,5 @@
import { For } from 'solid-js'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { createForm } from '@tanstack/solid-form'
import type { Accessor } from 'solid-js'
import type { AnyFieldApi } from '@tanstack/solid-form'
@@ -75,7 +75,7 @@ function App() {
]}
>
{(field) => (
-
+
First Name
field().handleChange(event.currentTarget.value)
}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
@@ -92,7 +92,7 @@ function App() {
{(field) => (
-
+
Last Name
field().handleChange(event.currentTarget.value)
}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
diff --git a/examples/solid/basic/tsconfig.json b/examples/solid/basic/tsconfig.json
index a2048f7ae9..b1dcd46bf1 100644
--- a/examples/solid/basic/tsconfig.json
+++ b/examples/solid/basic/tsconfig.json
@@ -3,7 +3,7 @@
"allowImportingTsExtensions": true,
"isolatedModules": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"moduleResolution": "Bundler",
diff --git a/examples/solid/basic/vite.config.ts b/examples/solid/basic/vite.config.ts
index 4095d9be50..6a1fe32b00 100644
--- a/examples/solid/basic/vite.config.ts
+++ b/examples/solid/basic/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [solid()],
diff --git a/examples/solid/field-groups/package.json b/examples/solid/field-groups/package.json
index c04045301f..4a6ccb9a53 100644
--- a/examples/solid/field-groups/package.json
+++ b/examples/solid/field-groups/package.json
@@ -9,13 +9,14 @@
"test:types": "tsc"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0",
"@tanstack/solid-form": "^2.0.0-alpha.3",
- "solid-js": "^1.9.13",
+ "solid-js": "^2.0.0",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0",
"typescript": "^6.0.2",
- "vite": "^8.2.1",
- "vite-plugin-solid": "^2.11.14"
+ "vite": "^8.2.1"
}
}
diff --git a/examples/solid/field-groups/src/StringField.tsx b/examples/solid/field-groups/src/StringField.tsx
index 52e10a790b..d37c436004 100644
--- a/examples/solid/field-groups/src/StringField.tsx
+++ b/examples/solid/field-groups/src/StringField.tsx
@@ -10,7 +10,7 @@ interface StringFieldProps {
export function StringField(props: StringFieldProps) {
return (
{props.label}
@@ -21,7 +21,7 @@ export function StringField(props: StringFieldProps) {
onInput={(event) =>
props.field().handleChange(event.currentTarget.value)
}
- aria-invalid={props.field().meta.isInvalid}
+ aria-invalid={props.field().meta.isInvalid ? 'true' : 'false'}
/>
diff --git a/examples/solid/field-groups/src/fieldGroups/dateRange.tsx b/examples/solid/field-groups/src/fieldGroups/dateRange.tsx
index cd27d23d4e..2400aa5bbd 100644
--- a/examples/solid/field-groups/src/fieldGroups/dateRange.tsx
+++ b/examples/solid/field-groups/src/fieldGroups/dateRange.tsx
@@ -58,7 +58,7 @@ function DateField(props: {
}) {
return (
{props.label}
@@ -70,7 +70,7 @@ function DateField(props: {
onInput={(event) =>
props.field().handleChange(event.currentTarget.value)
}
- aria-invalid={props.field().meta.isInvalid}
+ aria-invalid={props.field().meta.isInvalid ? 'true' : 'false'}
/>
diff --git a/examples/solid/field-groups/src/index.tsx b/examples/solid/field-groups/src/index.tsx
index cd2791fe02..1382ed4988 100644
--- a/examples/solid/field-groups/src/index.tsx
+++ b/examples/solid/field-groups/src/index.tsx
@@ -1,5 +1,5 @@
import { For } from 'solid-js'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { createForm } from '@tanstack/solid-form'
import { DateRangeField } from './fieldGroups/dateRange'
import { LowerBoundField, UpperBoundField } from './fieldGroups/fieldBounds'
diff --git a/examples/solid/field-groups/tsconfig.json b/examples/solid/field-groups/tsconfig.json
index a2048f7ae9..b1dcd46bf1 100644
--- a/examples/solid/field-groups/tsconfig.json
+++ b/examples/solid/field-groups/tsconfig.json
@@ -3,7 +3,7 @@
"allowImportingTsExtensions": true,
"isolatedModules": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"moduleResolution": "Bundler",
diff --git a/examples/solid/field-groups/vite.config.ts b/examples/solid/field-groups/vite.config.ts
index 4095d9be50..6a1fe32b00 100644
--- a/examples/solid/field-groups/vite.config.ts
+++ b/examples/solid/field-groups/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [solid()],
diff --git a/examples/solid/large-form/package.json b/examples/solid/large-form/package.json
index 611ce784d8..c6ef701632 100644
--- a/examples/solid/large-form/package.json
+++ b/examples/solid/large-form/package.json
@@ -9,12 +9,13 @@
"test:types": "tsc"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0",
"@tanstack/solid-form": "^2.0.0-alpha.3",
- "solid-js": "^1.9.13"
+ "solid-js": "^2.0.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0",
"typescript": "^6.0.2",
- "vite": "^8.2.1",
- "vite-plugin-solid": "^2.11.14"
+ "vite": "^8.2.1"
}
}
diff --git a/examples/solid/large-form/src/App.tsx b/examples/solid/large-form/src/App.tsx
index b03975365d..da875a1103 100644
--- a/examples/solid/large-form/src/App.tsx
+++ b/examples/solid/large-form/src/App.tsx
@@ -1,10 +1,10 @@
-import { Suspense } from 'solid-js'
+import { Loading } from 'solid-js'
import { PeoplePage } from './features/people/page'
export default function App() {
return (
- Loading...}>
+ Loading...}>
-
+
)
}
diff --git a/examples/solid/large-form/src/components/text-fields.tsx b/examples/solid/large-form/src/components/text-fields.tsx
index 86129228d0..f6103df004 100644
--- a/examples/solid/large-form/src/components/text-fields.tsx
+++ b/examples/solid/large-form/src/components/text-fields.tsx
@@ -16,7 +16,7 @@ export default function TextField(props: {
props.field().handleChange(event.currentTarget.value)
}
onBlur={props.field().handleBlur}
- aria-invalid={props.field().meta.isInvalid}
+ aria-invalid={props.field().meta.isInvalid ? 'true' : 'false'}
/>
diff --git a/examples/solid/large-form/src/index.tsx b/examples/solid/large-form/src/index.tsx
index 842c72dd7d..d98fe8370b 100644
--- a/examples/solid/large-form/src/index.tsx
+++ b/examples/solid/large-form/src/index.tsx
@@ -1,4 +1,4 @@
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import App from './App'
render(() => , document.getElementById('root')!)
diff --git a/examples/solid/large-form/tsconfig.json b/examples/solid/large-form/tsconfig.json
index a2048f7ae9..b1dcd46bf1 100644
--- a/examples/solid/large-form/tsconfig.json
+++ b/examples/solid/large-form/tsconfig.json
@@ -3,7 +3,7 @@
"allowImportingTsExtensions": true,
"isolatedModules": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"moduleResolution": "Bundler",
diff --git a/examples/solid/large-form/vite.config.ts b/examples/solid/large-form/vite.config.ts
index 4095d9be50..6a1fe32b00 100644
--- a/examples/solid/large-form/vite.config.ts
+++ b/examples/solid/large-form/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [solid()],
diff --git a/examples/solid/multi-step-wizard/package.json b/examples/solid/multi-step-wizard/package.json
index 1519519c1c..5d434e8be6 100644
--- a/examples/solid/multi-step-wizard/package.json
+++ b/examples/solid/multi-step-wizard/package.json
@@ -9,13 +9,14 @@
"test:types": "tsc"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0",
"@tanstack/solid-form": "^2.0.0-alpha.3",
- "solid-js": "^1.9.13",
+ "solid-js": "^2.0.0",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0",
"typescript": "^6.0.2",
- "vite": "^8.2.1",
- "vite-plugin-solid": "^2.11.14"
+ "vite": "^8.2.1"
}
}
diff --git a/examples/solid/multi-step-wizard/src/components/text-fields.tsx b/examples/solid/multi-step-wizard/src/components/text-fields.tsx
index 86e37e46f7..4b8349f5a5 100644
--- a/examples/solid/multi-step-wizard/src/components/text-fields.tsx
+++ b/examples/solid/multi-step-wizard/src/components/text-fields.tsx
@@ -16,7 +16,7 @@ export function TextField(props: {
props.field().handleChange(event.currentTarget.value)
}
onBlur={props.field().handleBlur}
- aria-invalid={props.field().meta.isInvalid}
+ aria-invalid={props.field().meta.isInvalid ? 'true' : 'false'}
/>
diff --git a/examples/solid/multi-step-wizard/src/index.tsx b/examples/solid/multi-step-wizard/src/index.tsx
index 842c72dd7d..d98fe8370b 100644
--- a/examples/solid/multi-step-wizard/src/index.tsx
+++ b/examples/solid/multi-step-wizard/src/index.tsx
@@ -1,4 +1,4 @@
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import App from './App'
render(() => , document.getElementById('root')!)
diff --git a/examples/solid/multi-step-wizard/tsconfig.json b/examples/solid/multi-step-wizard/tsconfig.json
index a2048f7ae9..b1dcd46bf1 100644
--- a/examples/solid/multi-step-wizard/tsconfig.json
+++ b/examples/solid/multi-step-wizard/tsconfig.json
@@ -3,7 +3,7 @@
"allowImportingTsExtensions": true,
"isolatedModules": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"moduleResolution": "Bundler",
diff --git a/examples/solid/multi-step-wizard/vite.config.ts b/examples/solid/multi-step-wizard/vite.config.ts
index 4095d9be50..6a1fe32b00 100644
--- a/examples/solid/multi-step-wizard/vite.config.ts
+++ b/examples/solid/multi-step-wizard/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [solid()],
diff --git a/examples/solid/query-integration/package.json b/examples/solid/query-integration/package.json
index 567c9061da..270de762e0 100644
--- a/examples/solid/query-integration/package.json
+++ b/examples/solid/query-integration/package.json
@@ -9,13 +9,14 @@
"test:types": "tsc"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0",
"@tanstack/solid-form": "^2.0.0-alpha.3",
- "@tanstack/solid-query": "^5.89.0",
- "solid-js": "^1.9.13"
+ "@tanstack/solid-query": "^6.0.0-rc.5",
+ "solid-js": "^2.0.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0",
"typescript": "^6.0.2",
- "vite": "^8.2.1",
- "vite-plugin-solid": "^2.11.14"
+ "vite": "^8.2.1"
}
}
diff --git a/examples/solid/query-integration/src/App.tsx b/examples/solid/query-integration/src/App.tsx
index 9966d409a1..927517401e 100644
--- a/examples/solid/query-integration/src/App.tsx
+++ b/examples/solid/query-integration/src/App.tsx
@@ -1,9 +1,5 @@
-import { For, Show } from 'solid-js'
-import {
- createMutation,
- createQuery,
- keepPreviousData,
-} from '@tanstack/solid-query'
+import { For, Loading, Show } from 'solid-js'
+import { useMutation, useQuery } from '@tanstack/solid-query'
import { createForm } from '@tanstack/solid-form'
import { db, sleep } from './mock-db'
import type { Accessor } from 'solid-js'
@@ -30,127 +26,133 @@ function FieldInfo(props: { field: Accessor }) {
)
}
-const emptyUser: StoredUser = {
- firstName: '',
- lastName: '',
-}
-
export function App() {
- const userQuery = createQuery(() => ({
+ const userQuery = useQuery(() => ({
queryKey: ['data'],
queryFn: () => db.getData(),
- placeholderData: keepPreviousData,
}))
- const saveUserMutation = createMutation(() => ({
+ // Query data is async in Solid 2: reading it before it loads suspends to
+ // the nearest `Loading`. The editor is created once the user has loaded.
+ return (
+ Loading...}>
+
+ {(user) => (
+ userQuery.refetch()} />
+ )}
+
+
+ )
+}
+
+function UserEditor(props: {
+ user: StoredUser
+ onSaved: () => Promise
+}) {
+ const saveUserMutation = useMutation(() => ({
mutationFn: (value: StoredUser) => db.saveUser(value),
- onSuccess: async () => {
- await userQuery.refetch()
- },
+ onSuccess: () => props.onSaved(),
}))
const form = createForm(() => ({
- defaultValues: userQuery.data ?? emptyUser,
+ defaultValues: props.user,
onSubmit: async ({ formApi, value }) => {
- await saveUserMutation.mutateAsync(value)
+ await saveUserMutation.mutate(value)
formApi.reset(value)
},
errorVisibility: ({ fieldState }) => fieldState.meta.isTouched,
}))
return (
- Loading...}>
-
-
Query Integration Form Example
-
- !value
- ? 'A first name is required'
- : value.length < 3
- ? 'First name must be at least 3 characters'
- : undefined,
- triggers: ['change'],
+
+
Query Integration Form Example
+
+ !value
+ ? 'A first name is required'
+ : value.length < 3
+ ? 'First name must be at least 3 characters'
+ : undefined,
+ triggers: ['change'],
+ },
+ {
+ run: async ({ value }) => {
+ await sleep(1000)
+ return (
+ value.includes('error') && 'No "error" allowed in first name'
+ )
},
- {
- run: async ({ value }) => {
- await sleep(1000)
- return (
- value.includes('error') &&
- 'No "error" allowed in first name'
- )
- },
- triggers: ['change'],
- triggerDebounceMs: 500,
- },
- ]}
- >
- {(field) => (
-
- First Name:
-
- field().handleChange(event.currentTarget.value)
- }
- aria-invalid={field().meta.isInvalid}
- />
-
-
- )}
-
-
- {(field) => (
-
- Last Name:
-
- field().handleChange(event.currentTarget.value)
- }
- aria-invalid={field().meta.isInvalid}
- />
-
-
- )}
-
-
[state.canSubmit, state.isSubmitting] as const}
- >
- {(state) => (
- <>
-
- {state()[1] ? '...' : 'Submit'}
-
- {
- event.preventDefault()
- form.reset()
- }}
- >
- Reset
-
- >
- )}
-
-
-
-
+ triggers: ['change'],
+ triggerDebounceMs: 500,
+ },
+ ]}
+ >
+ {(field) => (
+
+ First Name:
+
+ field().handleChange(event.currentTarget.value)
+ }
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
+ />
+
+
+ )}
+
+
+ {(field) => (
+
+ Last Name:
+
+ field().handleChange(event.currentTarget.value)
+ }
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
+ />
+
+
+ )}
+
+
[state.canSubmit, state.isSubmitting] as const}
+ >
+ {(state) => (
+ <>
+
+ {state()[1] ? '...' : 'Submit'}
+
+ {
+ event.preventDefault()
+ form.reset()
+ }}
+ >
+ Reset
+
+ >
+ )}
+
+
+
)
}
diff --git a/examples/solid/query-integration/src/index.tsx b/examples/solid/query-integration/src/index.tsx
index 879b1ee7b4..7412aa125f 100644
--- a/examples/solid/query-integration/src/index.tsx
+++ b/examples/solid/query-integration/src/index.tsx
@@ -1,4 +1,4 @@
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { QueryClient, QueryClientProvider } from '@tanstack/solid-query'
import { App } from './App'
diff --git a/examples/solid/query-integration/tsconfig.json b/examples/solid/query-integration/tsconfig.json
index a2048f7ae9..b1dcd46bf1 100644
--- a/examples/solid/query-integration/tsconfig.json
+++ b/examples/solid/query-integration/tsconfig.json
@@ -3,7 +3,7 @@
"allowImportingTsExtensions": true,
"isolatedModules": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"moduleResolution": "Bundler",
diff --git a/examples/solid/query-integration/vite.config.ts b/examples/solid/query-integration/vite.config.ts
index 4095d9be50..6a1fe32b00 100644
--- a/examples/solid/query-integration/vite.config.ts
+++ b/examples/solid/query-integration/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [solid()],
diff --git a/examples/solid/simple/package.json b/examples/solid/simple/package.json
index d5babf4484..0185e4db2e 100644
--- a/examples/solid/simple/package.json
+++ b/examples/solid/simple/package.json
@@ -9,12 +9,13 @@
"test:types": "tsc"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0",
"@tanstack/solid-form": "^2.0.0-alpha.3",
- "solid-js": "^1.9.13"
+ "solid-js": "^2.0.0"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0",
"typescript": "^6.0.2",
- "vite": "^8.2.1",
- "vite-plugin-solid": "^2.11.14"
+ "vite": "^8.2.1"
}
}
diff --git a/examples/solid/simple/src/index.tsx b/examples/solid/simple/src/index.tsx
index 632132668a..f454f3acb8 100644
--- a/examples/solid/simple/src/index.tsx
+++ b/examples/solid/simple/src/index.tsx
@@ -1,5 +1,5 @@
import { For, Show } from 'solid-js'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { createForm } from '@tanstack/solid-form'
import type { Accessor } from 'solid-js'
import type { AnyFieldApi } from '@tanstack/solid-form'
@@ -82,7 +82,7 @@ function App() {
onInput={(event) =>
field().handleChange(event.currentTarget.value)
}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
>
@@ -102,7 +102,7 @@ function App() {
onInput={(event) =>
field().handleChange(event.currentTarget.value)
}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
>
diff --git a/examples/solid/simple/tsconfig.json b/examples/solid/simple/tsconfig.json
index a2048f7ae9..b1dcd46bf1 100644
--- a/examples/solid/simple/tsconfig.json
+++ b/examples/solid/simple/tsconfig.json
@@ -3,7 +3,7 @@
"allowImportingTsExtensions": true,
"isolatedModules": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"moduleResolution": "Bundler",
diff --git a/examples/solid/simple/vite.config.ts b/examples/solid/simple/vite.config.ts
index 4095d9be50..6a1fe32b00 100644
--- a/examples/solid/simple/vite.config.ts
+++ b/examples/solid/simple/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [solid()],
diff --git a/examples/solid/standard-schema/package.json b/examples/solid/standard-schema/package.json
index a05193b664..be38d3babc 100644
--- a/examples/solid/standard-schema/package.json
+++ b/examples/solid/standard-schema/package.json
@@ -9,16 +9,17 @@
"test:types": "tsc"
},
"dependencies": {
+ "@solidjs/web": "^2.0.0",
"@tanstack/solid-form": "^2.0.0-alpha.3",
"arktype": "^2.1.22",
"effect": "^3.17.14",
- "solid-js": "^1.9.13",
+ "solid-js": "^2.0.0",
"valibot": "^1.1.0",
"zod": "^4.4.3"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0",
"typescript": "^6.0.2",
- "vite": "^8.2.1",
- "vite-plugin-solid": "^2.11.14"
+ "vite": "^8.2.1"
}
}
diff --git a/examples/solid/standard-schema/src/index.tsx b/examples/solid/standard-schema/src/index.tsx
index c3d0e07258..353bd4b393 100644
--- a/examples/solid/standard-schema/src/index.tsx
+++ b/examples/solid/standard-schema/src/index.tsx
@@ -1,5 +1,5 @@
import { For, Show } from 'solid-js'
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
import { createForm } from '@tanstack/solid-form'
import { type } from 'arktype'
import { Schema as S } from 'effect'
@@ -114,7 +114,7 @@ function App() {
onInput={(event) =>
field().handleChange(event.currentTarget.value)
}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
>
@@ -134,7 +134,7 @@ function App() {
onInput={(event) =>
field().handleChange(event.currentTarget.value)
}
- aria-invalid={field().meta.isInvalid}
+ aria-invalid={field().meta.isInvalid ? 'true' : 'false'}
/>
>
diff --git a/examples/solid/standard-schema/tsconfig.json b/examples/solid/standard-schema/tsconfig.json
index a2048f7ae9..b1dcd46bf1 100644
--- a/examples/solid/standard-schema/tsconfig.json
+++ b/examples/solid/standard-schema/tsconfig.json
@@ -3,7 +3,7 @@
"allowImportingTsExtensions": true,
"isolatedModules": true,
"jsx": "preserve",
- "jsxImportSource": "solid-js",
+ "jsxImportSource": "@solidjs/web",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"moduleResolution": "Bundler",
diff --git a/examples/solid/standard-schema/vite.config.ts b/examples/solid/standard-schema/vite.config.ts
index 4095d9be50..6a1fe32b00 100644
--- a/examples/solid/standard-schema/vite.config.ts
+++ b/examples/solid/standard-schema/vite.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
export default defineConfig({
plugins: [solid()],
diff --git a/package.json b/package.json
index 5e1cae43d9..3a608c129e 100644
--- a/package.json
+++ b/package.json
@@ -81,6 +81,9 @@
"sherif": {
"ignorePackage": [
"@tanstack/form-example-react-expo"
+ ],
+ "ignoreDependency": [
+ "solid-js"
]
}
}
diff --git a/packages/solid-form/package.json b/packages/solid-form/package.json
index 9c2d8f3f99..a7ab748d27 100644
--- a/packages/solid-form/package.json
+++ b/packages/solid-form/package.json
@@ -42,14 +42,15 @@
],
"dependencies": {
"@tanstack/form-core": "workspace:*",
- "@tanstack/solid-store": "^0.11.1",
- "vite-plugin-solid": "^2.11.14"
+ "@tanstack/store": "^0.11.1"
},
"devDependencies": {
+ "@solidjs/vite-plugin": "^3.0.0",
+ "@solidjs/web": "^2.0.0",
"@types/node": "^25.0.7",
- "solid-js": "^1.9.13"
+ "solid-js": "^2.0.0"
},
"peerDependencies": {
- "solid-js": ">=1.9.5"
+ "solid-js": "^2.0.0"
}
}
diff --git a/packages/solid-form/src/AppForm/Components.lib.ts b/packages/solid-form/src/AppForm/Components.lib.ts
index 0a4c8c7657..f2f208a35b 100644
--- a/packages/solid-form/src/AppForm/Components.lib.ts
+++ b/packages/solid-form/src/AppForm/Components.lib.ts
@@ -1,4 +1,4 @@
-import { createComponent, mergeProps } from 'solid-js'
+import { createComponent, merge } from 'solid-js'
import { attachSolidFormComponents } from '../SolidFormApi.lib'
import { createArrayField, createField } from '../createField.lib'
import { FieldContext, FormContext } from './contexts.lib'
@@ -21,7 +21,7 @@ export function attachSolidAppFormComponents(
) as never as AnySolidAppFormApi
resultForm.AppForm = function AppForm(props) {
- return createComponent(FormContext.Provider, {
+ return createComponent(FormContext, {
value: resultForm as never,
get children() {
return props.children
@@ -32,11 +32,11 @@ export function attachSolidAppFormComponents(
resultForm.Field = function TanStackFormField(
props: SolidFormFieldProps,
) {
- const fieldOptions = mergeProps(props, { form })
+ const fieldOptions = merge(props, { form })
const fieldApi = createField(() => fieldOptions as never)
Object.assign(fieldApi, fieldComponents)
- return createComponent(FieldContext.Provider, {
+ return createComponent(FieldContext, {
value: fieldApi as never,
get children() {
return props.children(fieldApi as never)
@@ -47,11 +47,11 @@ export function attachSolidAppFormComponents(
resultForm.ArrayField = function TanStackFormArrayField(
props: SolidFormFieldProps,
) {
- const fieldOptions = mergeProps(props, { form })
+ const fieldOptions = merge(props, { form })
const fieldApi = createArrayField(() => fieldOptions as never)
Object.assign(fieldApi, fieldComponents)
- return createComponent(FieldContext.Provider, {
+ return createComponent(FieldContext, {
value: fieldApi as never,
get children() {
return props.children(fieldApi as never)
diff --git a/packages/solid-form/src/AppForm/contexts.lib.ts b/packages/solid-form/src/AppForm/contexts.lib.ts
index 0aab274178..a6c6add61b 100644
--- a/packages/solid-form/src/AppForm/contexts.lib.ts
+++ b/packages/solid-form/src/AppForm/contexts.lib.ts
@@ -1,27 +1,31 @@
import { createContext, useContext } from 'solid-js'
-import type { Accessor } from 'solid-js'
+import type { Accessor, Context } from 'solid-js'
import type { AnyInternalFieldApi } from '@tanstack/form-core/internals'
import type { InternalSolidFormApi } from '../SolidFormApi.lib'
export const FormContext = createContext()
export const FieldContext = createContext>()
-export function useFieldContext(): Accessor {
- const field = useContext(FieldContext)
- if (field === undefined) {
- throw new Error(
- 'TanStack Form: Field components must be used within a `form.Field` component.',
- )
+// Solid 2's `useContext` throws when no provider is found, so the lookup is
+// wrapped to keep TanStack Form's error messages.
+function readContext(context: Context, message: string): T {
+ try {
+ return useContext(context)
+ } catch {
+ throw new Error(message)
}
- return field
+}
+
+export function useFieldContext(): Accessor {
+ return readContext(
+ FieldContext,
+ 'TanStack Form: Field components must be used within a `form.Field` component.',
+ )
}
export function useFormContext(): InternalSolidFormApi {
- const form = useContext(FormContext)
- if (form === undefined) {
- throw new Error(
- 'TanStack Form: Form components must be used within a `form.AppForm` component.',
- )
- }
- return form
+ return readContext(
+ FormContext,
+ 'TanStack Form: Form components must be used within a `form.AppForm` component.',
+ )
}
diff --git a/packages/solid-form/src/AppForm/fieldComponentHelpers.lib.ts b/packages/solid-form/src/AppForm/fieldComponentHelpers.lib.ts
index e9210970bb..8a2e17658e 100644
--- a/packages/solid-form/src/AppForm/fieldComponentHelpers.lib.ts
+++ b/packages/solid-form/src/AppForm/fieldComponentHelpers.lib.ts
@@ -1,4 +1,4 @@
-import { createComponent } from 'solid-js'
+import { createComponent, merge } from 'solid-js'
import { useFieldContext } from './contexts.lib'
import type { Component } from 'solid-js'
@@ -9,10 +9,10 @@ export function wrapField(
fieldPropKey: string,
): AnyFieldComponent {
return function TanStackFormFieldWrapper(props) {
- return createComponent(Component, {
- ...props,
- [fieldPropKey]: useFieldContext(),
- })
+ return createComponent(
+ Component,
+ merge(props, { [fieldPropKey]: useFieldContext() }),
+ )
}
}
diff --git a/packages/solid-form/src/AppForm/getFormHookHelpers.public.ts b/packages/solid-form/src/AppForm/getFormHookHelpers.public.ts
index 3c40753048..9b7951e4e5 100644
--- a/packages/solid-form/src/AppForm/getFormHookHelpers.public.ts
+++ b/packages/solid-form/src/AppForm/getFormHookHelpers.public.ts
@@ -1,5 +1,5 @@
import { brandComponentFactory, wrapField } from './fieldComponentHelpers.lib'
-import type { Accessor, Component, JSX } from 'solid-js'
+import type { Accessor, Component, Element } from 'solid-js'
import type { FieldWithValue } from '@tanstack/form-core'
type ExactFieldBrand = {
@@ -33,14 +33,14 @@ type StrictInjectedFieldComponent<
TComponent extends AnyFieldComponent,
TProps = PropsOf,
TFieldPropKey extends FieldValuePropKeys = FieldValuePropKeys,
-> = ((props: PublicPropsReplacingField) => JSX.Element) &
+> = ((props: PublicPropsReplacingField) => Element) &
ExactFieldBrand>
type LooseInjectedFieldComponent<
TComponent extends AnyFieldComponent,
TProps = PropsOf,
TFieldPropKey extends FieldValuePropKeys = FieldValuePropKeys,
-> = ((props: PublicPropsReplacingField) => JSX.Element) &
+> = ((props: PublicPropsReplacingField) => Element) &
AcceptsFieldBrand>
type StrictBrandedFieldComponent = TComponent &
diff --git a/packages/solid-form/src/Components.public.ts b/packages/solid-form/src/Components.public.ts
index a191ad823b..501780cb25 100644
--- a/packages/solid-form/src/Components.public.ts
+++ b/packages/solid-form/src/Components.public.ts
@@ -14,7 +14,7 @@ import type {
ToFieldError,
ToFormGroupErrorTypes,
} from '@tanstack/form-core'
-import type { Accessor, Component, JSX } from 'solid-js'
+import type { Accessor, Component, Element } from 'solid-js'
type ExactFieldBrand = {
readonly __tanstackFieldExactType: TValue
@@ -74,7 +74,7 @@ export type SolidFieldApi<
interface SolidSubscribeProps {
selector: (state: TSourceData) => TSelected
when?: (selected: NoInfer) => boolean
- children: ((state: Accessor>) => JSX.Element) | JSX.Element
+ children: ((state: Accessor>) => Element) | Element
}
export type SolidFormSubscribeProps<
@@ -88,7 +88,7 @@ export type SolidFormSubscribeComponent<
TFormErrorTypes extends FormErrorTypes,
> = (
props: SolidFormSubscribeProps,
-) => JSX.Element
+) => Element
export interface SolidFormFieldProps<
TFieldData,
@@ -121,7 +121,7 @@ export interface SolidFormFieldProps<
TFormErrorTypes,
TFieldComponents
>,
- ) => JSX.Element
+ ) => Element
}
export interface SolidFormArrayFieldProps<
@@ -164,7 +164,7 @@ export interface SolidFormFieldComponent<
TFormErrorTypes,
TFieldComponents
>,
- ): JSX.Element
+ ): Element
}
export interface SolidFormArrayFieldComponent<
@@ -190,7 +190,7 @@ export interface SolidFormArrayFieldComponent<
TFormErrorTypes,
TFieldComponents
>,
- ): JSX.Element
+ ): Element
}
export type SolidFormGroupSubscribeProps<
@@ -207,7 +207,7 @@ export type SolidFormGroupSubscribeComponent<
TGroupErrorTypes extends FormErrorTypes,
> = (
props: SolidFormGroupSubscribeProps,
-) => JSX.Element
+) => Element
export interface SolidFormGroupFieldComponent<
TFormData,
@@ -234,7 +234,7 @@ export interface SolidFormGroupFieldComponent<
TFormErrorTypes,
TFieldComponents
>,
- ): JSX.Element
+ ): Element
}
export interface SolidFormGroupArrayFieldComponent<
@@ -262,7 +262,7 @@ export interface SolidFormGroupArrayFieldComponent<
TFormErrorTypes,
TFieldComponents
>,
- ): JSX.Element
+ ): Element
}
export interface SolidFormGroupApi<
@@ -351,7 +351,7 @@ export interface SolidFormGroupProps<
TFormErrorTypes,
TFieldComponents
>,
- ) => JSX.Element
+ ) => Element
}
export interface SolidFormGroupComponent<
@@ -372,7 +372,7 @@ export interface SolidFormGroupComponent<
TFormErrorTypes,
TFieldComponents
>,
- ): JSX.Element
+ ): Element
}
export interface SolidTanStackFormComponents<
diff --git a/packages/solid-form/src/FieldGroup/FieldGroupApi.public.ts b/packages/solid-form/src/FieldGroup/FieldGroupApi.public.ts
index 56fb75c5c0..e246ad7b12 100644
--- a/packages/solid-form/src/FieldGroup/FieldGroupApi.public.ts
+++ b/packages/solid-form/src/FieldGroup/FieldGroupApi.public.ts
@@ -9,12 +9,12 @@ import type {
FormState,
ValidationIssue,
} from '@tanstack/form-core'
-import type { Component, JSX } from 'solid-js'
+import type { Component, Element } from 'solid-js'
import type {
SolidFormFieldProps,
SolidFormSubscribeProps,
} from '../Components.public'
-import type { ReadonlyAtom } from '@tanstack/solid-store'
+import type { ReadonlyAtom } from '@tanstack/store'
export interface FieldGroupFieldComponent<
TFieldData,
@@ -35,7 +35,7 @@ export interface FieldGroupFieldComponent<
FormErrorTypes,
TFieldComponents
>,
- ): JSX.Element
+ ): Element
}
export interface FieldGroupArrayFieldComponent<
@@ -57,7 +57,7 @@ export interface FieldGroupArrayFieldComponent<
FormErrorTypes,
TFieldComponents
>,
- ): JSX.Element
+ ): Element
}
export type FieldGroupSubscribeProps = SolidFormSubscribeProps<
@@ -68,7 +68,7 @@ export type FieldGroupSubscribeProps = SolidFormSubscribeProps<
export type FieldGroupSubscribeComponent = (
props: FieldGroupSubscribeProps,
-) => JSX.Element
+) => Element
export interface FieldGroupApi<
TFieldData,
diff --git a/packages/solid-form/src/FieldGroup/withFields.lib.ts b/packages/solid-form/src/FieldGroup/withFields.lib.ts
index 712814dcfe..b642597ba5 100644
--- a/packages/solid-form/src/FieldGroup/withFields.lib.ts
+++ b/packages/solid-form/src/FieldGroup/withFields.lib.ts
@@ -3,7 +3,7 @@ import {
defineFieldGroupFieldsRuntime,
fieldGroupHelperRuntime,
} from '@tanstack/form-core/internals'
-import { createComponent, mergeProps, splitProps } from 'solid-js'
+import { createComponent, createMemo, merge, omit } from 'solid-js'
import type { Component } from 'solid-js'
import type { AnyFieldGroupApi } from './FieldGroupApi.public'
@@ -14,12 +14,12 @@ function attachSolidFieldGroupComponents(
const Field: Component = (props) =>
createComponent(
form.Field as Component,
- group._getFormFieldOptions(props, mergeProps),
+ group._getFormFieldOptions(props, merge),
)
const ArrayField: Component = (props) =>
createComponent(
form.ArrayField as Component,
- group._getFormFieldOptions(props, mergeProps),
+ group._getFormFieldOptions(props, merge),
)
const Subscribe: Component = (props) =>
createComponent(form.Subscribe as Component, props)
@@ -53,24 +53,31 @@ function withFieldsRuntime(
const fieldNames = Object.keys(fields)
return function FieldGroupComponent(props: any) {
- const [localProps, restProps] = splitProps(props, ['form', fieldsPropName])
- const form = localProps.form
- if (!form) {
- throw new Error('TanStack Form: Field groups must receive a `form` prop.')
- }
-
- const fieldGroupApi = attachSolidFieldGroupComponents(
- new InternalFieldGroupApi({
+ // A new field group api when the `form` prop changes.
+ const fieldGroupApi = createMemo(() => {
+ const form = props.form
+ if (!form) {
+ throw new Error(
+ 'TanStack Form: Field groups must receive a `form` prop.',
+ )
+ }
+ return attachSolidFieldGroupComponents(
+ new InternalFieldGroupApi({
+ form,
+ fieldNames,
+ getBindings: () => props[fieldsPropName],
+ }),
form,
- fieldNames,
- getBindings: () => localProps[fieldsPropName],
- }),
- form,
- )
+ )
+ })
return createComponent(
Component,
- mergeProps(restProps, { [fieldsPropName]: fieldGroupApi }),
+ merge(omit(props, 'form', fieldsPropName), {
+ get [fieldsPropName]() {
+ return fieldGroupApi()
+ },
+ }),
)
}
}
diff --git a/packages/solid-form/src/FieldGroup/withFields.public.ts b/packages/solid-form/src/FieldGroup/withFields.public.ts
index 81b50147f6..21c1597a62 100644
--- a/packages/solid-form/src/FieldGroup/withFields.public.ts
+++ b/packages/solid-form/src/FieldGroup/withFields.public.ts
@@ -8,7 +8,7 @@ import type {
FieldGroupHelper,
FormApi,
} from '@tanstack/form-core'
-import type { Component, JSX } from 'solid-js'
+import type { Component, Element } from 'solid-js'
import type { SolidTanStackFormComponents } from '../Components.public'
import type { FieldGroupApi } from './FieldGroupApi.public'
@@ -52,7 +52,7 @@ export type FieldGroupWithFieldsFn<
TProps extends object,
TFieldsPropName extends FieldGroupFieldsPropName,
>(
- Component: (props: TProps) => JSX.Element,
+ Component: (props: TProps) => Element,
fieldsPropName: TFieldsPropName,
) => (
props: Omit & {
@@ -62,7 +62,7 @@ export type FieldGroupWithFieldsFn<
TFormData,
TFieldsPropName
>,
-) => JSX.Element
+) => Element
export interface FieldGroupDefinition<
TFields extends FieldGroupFields,
diff --git a/packages/solid-form/src/SolidFormApi.lib.ts b/packages/solid-form/src/SolidFormApi.lib.ts
index 4c0ae80726..0913d5ba73 100644
--- a/packages/solid-form/src/SolidFormApi.lib.ts
+++ b/packages/solid-form/src/SolidFormApi.lib.ts
@@ -2,18 +2,19 @@ import {
InternalFormApi,
InternalFormGroupApi,
} from '@tanstack/form-core/internals'
-import { shallow, useSelector } from '@tanstack/solid-store'
+import { shallow } from '@tanstack/store'
import {
createComponent,
createMemo,
createRenderEffect,
createUniqueId,
- mergeProps,
+ merge,
onCleanup,
untrack,
} from 'solid-js'
import { Subscribe } from './Subscribe.public'
import { createArrayField, createField } from './createField.lib'
+import { useSelector } from './useSelector.public'
import type {
AnyInternalFormApi,
InternalFormGroupApi as InternalFormGroupApiType,
@@ -39,7 +40,7 @@ export function attachSolidFormComponents(
solidFormApi.Field = function TanStackFormField(
props: SolidFormFieldProps,
) {
- const fieldOptions = mergeProps(props, { form })
+ const fieldOptions = merge(props, { form })
const fieldApi = createField(() => fieldOptions as never)
if (fieldComponents !== null) Object.assign(fieldApi, fieldComponents)
@@ -49,7 +50,7 @@ export function attachSolidFormComponents(
solidFormApi.ArrayField = function TanStackFormArrayField(
props: SolidFormFieldProps,
) {
- const fieldOptions = mergeProps(props, { form })
+ const fieldOptions = merge(props, { form })
const fieldApi = createArrayField(() => fieldOptions as never)
if (fieldComponents !== null) Object.assign(fieldApi, fieldComponents)
@@ -61,19 +62,23 @@ export function attachSolidFormComponents(
) {
return createComponent(
Subscribe as Component,
- mergeProps(props, { source: solidFormApi.atom }),
+ merge(props, { source: solidFormApi.atom }),
)
}
solidFormApi.FormGroup = function TanStackFormGroup(
props: SolidFormGroupProps,
) {
+ // Spreading reads every prop, so the effect below tracks them all.
+ const groupOptions = () => ({ ...props, form }) as never
const group = attachSolidFormGroupComponents(
- new InternalFormGroupApi({ ...props, form } as never),
+ new InternalFormGroupApi(untrack(groupOptions)),
solidFormApi,
)
- createRenderEffect(() => group.update({ ...props, form } as never))
+ createRenderEffect(groupOptions, (next) => {
+ group.update(next)
+ })
group.mount()
onCleanup(() => group._cleanup())
@@ -85,7 +90,6 @@ export function attachSolidFormComponents(
state()
return group
},
- undefined,
{ equals: false },
)
@@ -122,21 +126,21 @@ function attachSolidFormGroupComponents(
resultGroup.Field = function Field(props) {
return createComponent(
form.Field as Component,
- group._getFormFieldOptions(props, mergeProps) as any,
+ group._getFormFieldOptions(props, merge) as any,
)
}
resultGroup.ArrayField = function ArrayField(props) {
return createComponent(
form.ArrayField as Component,
- group._getFormFieldOptions(props, mergeProps) as any,
+ group._getFormFieldOptions(props, merge) as any,
)
}
resultGroup.Subscribe = function GroupSubscribe(props) {
return createComponent(
Subscribe as Component,
- mergeProps(props, { source: group.atom }),
+ merge(props, { source: group.atom }),
)
}
@@ -164,8 +168,8 @@ export function createInternalForm(
}
const form = untrack(() => initializeFn(resolveOptions()))
- createRenderEffect(() => {
- form._update(resolveOptions() as never)
+ createRenderEffect(resolveOptions, (next) => {
+ form._update(next as never)
})
const unmount = form.mount()
diff --git a/packages/solid-form/src/Subscribe.public.ts b/packages/solid-form/src/Subscribe.public.ts
index b676f08978..7ed3194527 100644
--- a/packages/solid-form/src/Subscribe.public.ts
+++ b/packages/solid-form/src/Subscribe.public.ts
@@ -1,12 +1,8 @@
-import { shallow, useSelector } from '@tanstack/solid-store'
-import { createMemo } from 'solid-js'
-import type { Accessor, JSX } from 'solid-js'
-import type {
- Atom,
- ReadonlyAtom,
- ReadonlyStore,
- Store,
-} from '@tanstack/solid-store'
+import { shallow } from '@tanstack/store'
+import { createMemo, getOwner, runWithOwner, untrack } from 'solid-js'
+import { useSelector } from './useSelector.public'
+import type { Accessor, Element } from 'solid-js'
+import type { Atom, ReadonlyAtom, ReadonlyStore, Store } from '@tanstack/store'
export type SubscribeSource =
Atom | ReadonlyAtom | Store | ReadonlyStore
@@ -15,26 +11,37 @@ export interface SubscribeProps {
source: SubscribeSource
selector: (state: TSourceData) => TSelected
when?: (selected: NoInfer) => boolean
- children: ((state: Accessor>) => JSX.Element) | JSX.Element
+ children: ((state: Accessor>) => Element) | Element
}
/** Subscribe to a TanStack Store source and expose the selection as an accessor. */
export function Subscribe(
props: SubscribeProps,
-): JSX.Element {
- const selected = useSelector(props.source, props.selector, {
- compare: shallow,
- })
- let child: JSX.Element
+): Element {
+ // Re-subscribes when `source` or `selector` changes.
+ const selection = createMemo(() =>
+ useSelector(props.source, props.selector, { compare: shallow }),
+ )
+ const selected = () => selection()()
+ // The children are built once, under the component rather than the memo,
+ // so a later re-run of the memo doesn't dispose them.
+ const owner = getOwner()
+ let child: Element
let initialized = false
return createMemo(() => {
if (props.when?.(selected()) === false) return null
if (!initialized) {
const children = props.children
- child = typeof children === 'function' ? children(selected) : children
+ child =
+ typeof children === 'function'
+ ? // Rendered like a component body: reads in it warn, as in .
+ runWithOwner(owner, () =>
+ untrack(() => children(selected), ''),
+ )
+ : children
initialized = true
}
return child
- }) as unknown as JSX.Element
+ }) as unknown as Element
}
diff --git a/packages/solid-form/src/createField.lib.ts b/packages/solid-form/src/createField.lib.ts
index 513a002286..9a94a46157 100644
--- a/packages/solid-form/src/createField.lib.ts
+++ b/packages/solid-form/src/createField.lib.ts
@@ -1,10 +1,9 @@
-import { shallow } from '@tanstack/solid-store'
+import { shallow } from '@tanstack/store'
import {
createMemo,
createRenderEffect,
createSignal,
onCleanup,
- untrack,
} from 'solid-js'
import type { AnyFieldApi, FieldApiOptions } from '@tanstack/form-core'
import type {
@@ -31,20 +30,21 @@ function createFieldSelector(
selector: (field: AnyInternalFieldApi) => TSelected,
compare: (previous: TSelected, next: TSelected) => boolean,
): Accessor {
+ // Derived from the current field (re-selected when it changes); the
+ // subscription below writes atom changes.
const [selected, setSelected] = createSignal(
- selector(fieldApi()),
- { equals: compare },
+ () => selector(fieldApi()),
+ // Field atoms notify from wherever their state changes, which can be
+ // inside an owned scope such as an effect.
+ { equals: compare, ownedWrite: true },
)
- createRenderEffect(() => {
- const field = fieldApi()
- setSelected(() => selector(field))
-
+ createRenderEffect(fieldApi, (field) => {
const subscription = field.atom.subscribe(() => {
setSelected(() => selector(field))
})
- onCleanup(() => subscription.unsubscribe())
+ return () => subscription.unsubscribe()
})
return selected
@@ -53,38 +53,34 @@ function createFieldSelector(
function createInternalField(
options: Accessor,
): Accessor {
- const initialForm = untrack(options).form
+ const form = createMemo(() => options().form)
const [resetVersion, setResetVersion] = createSignal(
- initialForm._atoms.resetVersion.get(),
- )
- const resetSubscription = initialForm._atoms.resetVersion.subscribe(
- (version) => setResetVersion(version),
+ () => form()._atoms.resetVersion.get(),
+ { ownedWrite: true },
)
- onCleanup(() => resetSubscription.unsubscribe())
+ createRenderEffect(form, (current) => {
+ const subscription = current._atoms.resetVersion.subscribe((version) =>
+ setResetVersion(version),
+ )
+ return () => subscription.unsubscribe()
+ })
+ // Options only seed a new field api; an existing one is returned as is (same
+ // identity) and picks up option changes through `_update` below.
const fieldApi = createMemo(() => {
- const reactiveOptions = options()
- const form = reactiveOptions.form
- const name = reactiveOptions.name
void resetVersion()
-
- return form._getOrCreateFieldApi(
- {
- ...untrack(options),
- name,
- },
- 'field',
- )
+ return form()._getOrCreateFieldApi({ ...options() }, 'field')
})
- createRenderEffect(() => {
- fieldApi()._update(options(), 'field')
- })
+ createRenderEffect(
+ // Spreading reads every option, so a change to any of them is tracked.
+ () => [fieldApi(), { ...options() }] as const,
+ ([field, next]) => {
+ field._update(next, 'field')
+ },
+ )
- createRenderEffect(() => {
- const cleanup = fieldApi()._register()
- onCleanup(cleanup)
- })
+ createRenderEffect(fieldApi, (field) => field._register())
return fieldApi
}
@@ -107,7 +103,6 @@ export function createField(
state()
return fieldApi()
},
- undefined,
{ equals: false },
)
}
@@ -130,7 +125,6 @@ export function createArrayField(
arrayState()
return fieldApi()
},
- undefined,
{ equals: false },
)
}
diff --git a/packages/solid-form/src/index.ts b/packages/solid-form/src/index.ts
index 9ff6e01851..b60612ebba 100644
--- a/packages/solid-form/src/index.ts
+++ b/packages/solid-form/src/index.ts
@@ -1,5 +1,7 @@
export * from '@tanstack/form-core'
-export * from '@tanstack/solid-store'
+export * from '@tanstack/store'
+export { useSelector, useSelector as useStore } from './useSelector.public'
+export type { UseSelectorOptions } from './useSelector.public'
export * from './createForm.public'
export * from './formApiTypes.public'
diff --git a/packages/solid-form/src/useSelector.public.ts b/packages/solid-form/src/useSelector.public.ts
new file mode 100644
index 0000000000..04b291f9bd
--- /dev/null
+++ b/packages/solid-form/src/useSelector.public.ts
@@ -0,0 +1,44 @@
+import { createSignal, onCleanup } from 'solid-js'
+import type { Accessor } from 'solid-js'
+
+interface SelectionSource {
+ get: () => T
+ subscribe: (listener: (value: T) => void) => {
+ unsubscribe: () => void
+ }
+}
+
+export interface UseSelectorOptions {
+ compare?: (a: TSelected, b: TSelected) => boolean
+}
+
+/**
+ * Selects a slice of a TanStack Store and returns a Solid accessor that
+ * updates when the selection changes (by `===` unless `compare` is given).
+ * Omit the selector to read the whole state.
+ *
+ * A Solid 2 copy of `useSelector` from `@tanstack/solid-store`, so this
+ * package doesn't depend on a Solid 2 release of that package.
+ */
+export function useSelector>(
+ source: SelectionSource,
+ selector: (snapshot: TSource) => TSelected = (s) => s as unknown as TSelected,
+ options?: UseSelectorOptions,
+): Accessor {
+ // Derived: the selection is recomputed from the store's current state when
+ // a signal the selector reads changes, and written when the store notifies.
+ const [selected, setSelected] = createSignal(
+ () => selector(source.get()),
+ {
+ equals: options?.compare ?? ((a, b) => a === b),
+ // Stores notify synchronously from wherever `setState` runs, which can
+ // be inside an owned scope such as an effect.
+ ownedWrite: true,
+ },
+ )
+ const { unsubscribe } = source.subscribe((snapshot) => {
+ setSelected(() => selector(snapshot))
+ })
+ onCleanup(unsubscribe)
+ return selected
+}
diff --git a/packages/solid-form/tests/adapter.spec.tsx b/packages/solid-form/tests/adapter.spec.tsx
index 580c6f81ad..9737944451 100644
--- a/packages/solid-form/tests/adapter.spec.tsx
+++ b/packages/solid-form/tests/adapter.spec.tsx
@@ -1,5 +1,5 @@
-import { createRenderEffect, createSignal } from 'solid-js'
-import { render } from 'solid-js/web'
+import { createRenderEffect, createSignal, flush } from 'solid-js'
+import { render } from '@solidjs/web'
import { describe, expect, it, vi } from 'vitest'
import {
createForm,
@@ -8,10 +8,10 @@ import {
getFormHookHelpers,
useSelector,
} from '../src'
-import type { Accessor, JSX } from 'solid-js'
+import type { Accessor, Element } from 'solid-js'
import type { FieldWithValue } from '../src'
-function mount(Component: () => JSX.Element) {
+function mount(Component: () => Element) {
const container = document.createElement('div')
document.body.append(container)
const disposeRoot = render(Component, container)
@@ -60,6 +60,7 @@ describe('Solid adapter parity', () => {
)
change('Rodney')
+ flush()
expect(
container.querySelector('[data-testid="group-value"]')?.textContent,
@@ -106,6 +107,7 @@ describe('Solid adapter parity', () => {
const { dispose } = mount(() => )
change('A')
+ flush()
expect(listener).toHaveBeenCalledOnce()
dispose()
})
@@ -145,6 +147,7 @@ describe('Solid adapter parity', () => {
).toBe('guest.firstName:Tony')
showLastName()
+ flush()
expect(
container.querySelector('[data-testid="group-field"]')?.textContent,
@@ -189,10 +192,13 @@ describe('Solid adapter parity', () => {
const { dispose } = mount(() => )
change('First')
+ flush()
expect(firstListener).toHaveBeenCalledOnce()
useSecondListener()
+ flush()
change('Second')
+ flush()
expect(firstListener).toHaveBeenCalledOnce()
expect(secondListener).toHaveBeenCalledOnce()
@@ -295,10 +301,71 @@ describe('Solid adapter parity', () => {
const { container, dispose } = mount(() => )
expect(container.querySelector('[data-testid="visible"]')).toBeNull()
setVisible(true)
+ flush()
expect(container.querySelector('[data-testid="visible"]')).not.toBeNull()
dispose()
})
+ it('keeps Subscribe children reactive after the when predicate re-runs', () => {
+ let setCount!: (value: number) => void
+
+ function Component() {
+ const form = createForm(() => ({
+ defaultValues: { count: 1 },
+ }))
+ setCount = (value) => form.setFieldValue('count', value)
+
+ return (
+ state.values.count}
+ when={(count) => count > 0}
+ >
+ {(count) => {count()} }
+
+ )
+ }
+
+ const { container, dispose } = mount(() => )
+ const text = () =>
+ container.querySelector('[data-testid="count"]')?.textContent
+ expect(text()).toBe('1')
+ setCount(2)
+ flush()
+ expect(text()).toBe('2')
+ setCount(0)
+ flush()
+ expect(text()).toBeUndefined()
+ setCount(3)
+ flush()
+ expect(text()).toBe('3')
+ dispose()
+ })
+
+ it('follows a Subscribe selector that changes', () => {
+ const [field, setField] = createSignal<'first' | 'last'>('first')
+
+ function Component() {
+ const form = createForm(() => ({
+ defaultValues: { first: 'Ada', last: 'Lovelace' },
+ }))
+
+ return (
+ state.values[field()]}>
+ {(value) => {value()} }
+
+ )
+ }
+
+ const { container, dispose } = mount(() => )
+ const text = () =>
+ container.querySelector('[data-testid="value"]')?.textContent
+ expect(text()).toBe('Ada')
+ setField('last')
+ flush()
+ expect(text()).toBe('Lovelace')
+ dispose()
+ })
+
it('updates options without replacing or re-registering a field', () => {
const onMount = vi.fn()
const onUnmount = vi.fn()
@@ -329,6 +396,7 @@ describe('Solid adapter parity', () => {
const initialMounts = onMount.mock.calls.length
const initialUnmounts = onUnmount.mock.calls.length
update()
+ flush()
expect(onMount).toHaveBeenCalledTimes(initialMounts)
expect(onUnmount).toHaveBeenCalledTimes(initialUnmounts)
dispose()
@@ -350,8 +418,7 @@ describe('Solid adapter parity', () => {
<>
{(field) => {
- createRenderEffect(() => {
- field()
+ createRenderEffect(field, () => {
arrayAccessorRuns++
})
return {field().value.length}
@@ -370,8 +437,10 @@ describe('Solid adapter parity', () => {
const { dispose } = mount(() => )
const initialRuns = arrayAccessorRuns
changeChild('Updated')
+ flush()
expect(arrayAccessorRuns).toBe(initialRuns)
pushItem()
+ flush()
expect(arrayAccessorRuns).toBe(initialRuns + 1)
dispose()
})
@@ -391,6 +460,7 @@ describe('Solid adapter parity', () => {
const { container, dispose } = mount(() => )
reset()
+ flush()
expect(
container.querySelector('[data-testid="reset-value"]')?.textContent,
).toBe('Rodney')
@@ -441,6 +511,7 @@ describe('Solid reusable field groups', () => {
).toBe('name:Initial')
container.querySelector('button')?.click()
+ flush()
expect(
container.querySelector('[data-testid="logical-value"]')?.textContent,
@@ -462,6 +533,7 @@ describe('Solid reusable field groups', () => {
).toBe('profile.name:Initial')
container.querySelector('button')?.click()
+ flush()
expect(
container.querySelector('[data-testid="logical-value"]')?.textContent,
@@ -483,6 +555,7 @@ describe('Solid reusable field groups', () => {
const { container, dispose } = mount(() => )
showSecond()
+ flush()
expect(
container.querySelector('[data-testid="logical-field"]')?.textContent,
).toBe('second:Two')
diff --git a/packages/solid-form/tests/createForm.spec.tsx b/packages/solid-form/tests/createForm.spec.tsx
index c80f0a2bc6..54c27561c4 100644
--- a/packages/solid-form/tests/createForm.spec.tsx
+++ b/packages/solid-form/tests/createForm.spec.tsx
@@ -1,17 +1,16 @@
-import { createSignal } from 'solid-js'
-import { render } from 'solid-js/web'
+import { createSignal, flush } from 'solid-js'
+import { render } from '@solidjs/web'
import { describe, expect, expectTypeOf, it } from 'vitest'
import { createForm } from '../src'
import type { ValidationIssue } from '../src'
describe('Solid FormApi', () => {
it('should create a form from a Solid options accessor', () => {
+ const [name, setName] = createSignal('tony-hawk')
+
function Component() {
- const [name, setName] = createSignal('tony-hawk')
const form = createForm(() => ({ defaultValues: { name: name() } }))
- setName('rodney-mullen')
-
return (
state.values.name}>
{(value) => {value()} }
@@ -22,6 +21,13 @@ describe('Solid FormApi', () => {
const container = document.createElement('div')
const dispose = render(() => , container)
+ expect(container.querySelector('[data-testid="name"]')?.textContent).toBe(
+ 'tony-hawk',
+ )
+
+ setName('rodney-mullen')
+ flush()
+
expect(container.querySelector('[data-testid="name"]')?.textContent).toBe(
'rodney-mullen',
)
@@ -62,6 +68,7 @@ describe('Solid FormApi', () => {
)
change('new-value')
+ flush()
expect(input.value).toBe('new-value')
expect(container.querySelector('[data-testid="value"]')?.textContent).toBe(
diff --git a/packages/solid-form/tests/createFormHook.spec.tsx b/packages/solid-form/tests/createFormHook.spec.tsx
index 414299e27f..bc3f2da0c0 100644
--- a/packages/solid-form/tests/createFormHook.spec.tsx
+++ b/packages/solid-form/tests/createFormHook.spec.tsx
@@ -1,9 +1,10 @@
-import { render } from 'solid-js/web'
+import { flush } from 'solid-js'
+import { render } from '@solidjs/web'
import { describe, expect, it, vi } from 'vitest'
import { createFormHook } from '../src'
-import type { JSX } from 'solid-js'
+import type { Element } from 'solid-js'
-function mount(Component: () => JSX.Element) {
+function mount(Component: () => Element) {
const container = document.createElement('div')
document.body.append(container)
const disposeRoot = render(Component, container)
@@ -131,9 +132,13 @@ describe('createFormHook defaults', () => {
const view = mount(() => )
changeDirect()
+ flush()
changeDirectArray()
+ flush()
changeGrouped()
+ flush()
changeGroupedArray()
+ flush()
expect(formCalls).toEqual([
'default',
diff --git a/packages/solid-form/tsconfig.json b/packages/solid-form/tsconfig.json
index 6bb0fd9121..ce3ebb082c 100644
--- a/packages/solid-form/tsconfig.json
+++ b/packages/solid-form/tsconfig.json
@@ -2,7 +2,7 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"jsx": "preserve",
- "jsxImportSource": "solid-js"
+ "jsxImportSource": "@solidjs/web"
},
"include": ["src", "vitest.config.ts", "tests"],
"exclude": ["eslint.config.js"]
diff --git a/packages/solid-form/vitest.config.ts b/packages/solid-form/vitest.config.ts
index 3f677d94d1..a0e05123ce 100644
--- a/packages/solid-form/vitest.config.ts
+++ b/packages/solid-form/vitest.config.ts
@@ -1,5 +1,5 @@
import { defineConfig } from 'vitest/config'
-import solid from 'vite-plugin-solid'
+import solid from '@solidjs/vite-plugin'
import { playwright } from '@vitest/browser-playwright'
import packageJson from './package.json' with { type: 'json' }
@@ -10,7 +10,7 @@ export default defineConfig({
dir: './tests',
watch: false,
globals: true,
- // Override vite-plugin-solid's jsdom default; tests run in the browser.
+ // Override the Solid plugin's jsdom default; tests run in the browser.
environment: 'node',
browser: {
enabled: true,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3f5734f8e1..6ca2137f17 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -977,7 +977,7 @@ importers:
devDependencies:
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1011,7 +1011,7 @@ importers:
devDependencies:
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1167,7 +1167,7 @@ importers:
devDependencies:
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1201,7 +1201,7 @@ importers:
devDependencies:
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1232,7 +1232,7 @@ importers:
devDependencies:
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1334,7 +1334,7 @@ importers:
version: 4.3.3
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1374,7 +1374,7 @@ importers:
devDependencies:
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1402,7 +1402,7 @@ importers:
devDependencies:
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1442,7 +1442,7 @@ importers:
devDependencies:
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1469,7 +1469,7 @@ importers:
version: 1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
'@tanstack/react-start':
specifier: ^1.168.40
- version: 1.168.40(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
+ version: 1.168.40(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
react:
specifier: 19.2.8
version: 19.2.8
@@ -1482,7 +1482,7 @@ importers:
version: 4.3.3(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1528,7 +1528,7 @@ importers:
devDependencies:
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1604,7 +1604,7 @@ importers:
version: 0.7.2(@emnapi/core@2.0.0-alpha.3)(@emnapi/runtime@2.0.0-alpha.3)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
'@tanstack/react-devtools':
specifier: ^0.10.5
- version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@1.9.14)
+ version: 0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)
'@tanstack/react-form-devtools':
specifier: ^1.0.0-alpha.3
version: link:../../../packages/react-form-devtools
@@ -1626,167 +1626,194 @@ importers:
examples/solid/array:
dependencies:
+ '@solidjs/web':
+ specifier: ^2.0.0
+ version: 2.0.0(solid-js@2.0.0)
'@tanstack/solid-form':
specifier: ^2.0.0-alpha.3
version: link:../../../packages/solid-form
solid-js:
- specifier: ^1.9.13
- version: 1.9.14
+ specifier: ^2.0.0
+ version: 2.0.0
devDependencies:
+ '@solidjs/vite-plugin':
+ specifier: ^3.0.0
+ version: 3.0.0(@babel/core@8.0.1)(@solidjs/web@2.0.0(solid-js@2.0.0))(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
typescript:
specifier: ^6.0.2
version: 6.0.3
vite:
specifier: ^8.2.1
version: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
- vite-plugin-solid:
- specifier: ^2.11.14
- version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
examples/solid/basic:
dependencies:
+ '@solidjs/web':
+ specifier: ^2.0.0
+ version: 2.0.0(solid-js@2.0.0)
'@tanstack/solid-form':
specifier: ^2.0.0-alpha.3
version: link:../../../packages/solid-form
solid-js:
- specifier: ^1.9.13
- version: 1.9.14
+ specifier: ^2.0.0
+ version: 2.0.0
devDependencies:
+ '@solidjs/vite-plugin':
+ specifier: ^3.0.0
+ version: 3.0.0(@babel/core@8.0.1)(@solidjs/web@2.0.0(solid-js@2.0.0))(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
typescript:
specifier: ^6.0.2
version: 6.0.3
vite:
specifier: ^8.2.1
version: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
- vite-plugin-solid:
- specifier: ^2.11.14
- version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
examples/solid/basic-splitting-form:
dependencies:
+ '@solidjs/web':
+ specifier: ^2.0.0
+ version: 2.0.0(solid-js@2.0.0)
'@tanstack/solid-form':
specifier: ^2.0.0-alpha.3
version: link:../../../packages/solid-form
solid-js:
- specifier: ^1.9.13
- version: 1.9.14
+ specifier: ^2.0.0
+ version: 2.0.0
devDependencies:
+ '@solidjs/vite-plugin':
+ specifier: ^3.0.0
+ version: 3.0.0(@babel/core@8.0.1)(@solidjs/web@2.0.0(solid-js@2.0.0))(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
typescript:
specifier: ^6.0.2
version: 6.0.3
vite:
specifier: ^8.2.1
version: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
- vite-plugin-solid:
- specifier: ^2.11.14
- version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
examples/solid/field-groups:
dependencies:
+ '@solidjs/web':
+ specifier: ^2.0.0
+ version: 2.0.0(solid-js@2.0.0)
'@tanstack/solid-form':
specifier: ^2.0.0-alpha.3
version: link:../../../packages/solid-form
solid-js:
- specifier: ^1.9.13
- version: 1.9.14
+ specifier: ^2.0.0
+ version: 2.0.0
zod:
specifier: ^4.4.3
version: 4.4.3
devDependencies:
+ '@solidjs/vite-plugin':
+ specifier: ^3.0.0
+ version: 3.0.0(@babel/core@8.0.1)(@solidjs/web@2.0.0(solid-js@2.0.0))(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
typescript:
specifier: ^6.0.2
version: 6.0.3
vite:
specifier: ^8.2.1
version: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
- vite-plugin-solid:
- specifier: ^2.11.14
- version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
examples/solid/large-form:
dependencies:
+ '@solidjs/web':
+ specifier: ^2.0.0
+ version: 2.0.0(solid-js@2.0.0)
'@tanstack/solid-form':
specifier: ^2.0.0-alpha.3
version: link:../../../packages/solid-form
solid-js:
- specifier: ^1.9.13
- version: 1.9.14
+ specifier: ^2.0.0
+ version: 2.0.0
devDependencies:
+ '@solidjs/vite-plugin':
+ specifier: ^3.0.0
+ version: 3.0.0(@babel/core@8.0.1)(@solidjs/web@2.0.0(solid-js@2.0.0))(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
typescript:
specifier: ^6.0.2
version: 6.0.3
vite:
specifier: ^8.2.1
version: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
- vite-plugin-solid:
- specifier: ^2.11.14
- version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
examples/solid/multi-step-wizard:
dependencies:
+ '@solidjs/web':
+ specifier: ^2.0.0
+ version: 2.0.0(solid-js@2.0.0)
'@tanstack/solid-form':
specifier: ^2.0.0-alpha.3
version: link:../../../packages/solid-form
solid-js:
- specifier: ^1.9.13
- version: 1.9.14
+ specifier: ^2.0.0
+ version: 2.0.0
zod:
specifier: ^4.4.3
version: 4.4.3
devDependencies:
+ '@solidjs/vite-plugin':
+ specifier: ^3.0.0
+ version: 3.0.0(@babel/core@8.0.1)(@solidjs/web@2.0.0(solid-js@2.0.0))(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
typescript:
specifier: ^6.0.2
version: 6.0.3
vite:
specifier: ^8.2.1
version: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
- vite-plugin-solid:
- specifier: ^2.11.14
- version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
examples/solid/query-integration:
dependencies:
+ '@solidjs/web':
+ specifier: ^2.0.0
+ version: 2.0.0(solid-js@2.0.0)
'@tanstack/solid-form':
specifier: ^2.0.0-alpha.3
version: link:../../../packages/solid-form
'@tanstack/solid-query':
- specifier: ^5.89.0
- version: 5.101.4(solid-js@1.9.14)
+ specifier: ^6.0.0-rc.5
+ version: 6.0.0-rc.5(@solidjs/web@2.0.0(solid-js@2.0.0))(solid-js@2.0.0)
solid-js:
- specifier: ^1.9.13
- version: 1.9.14
+ specifier: ^2.0.0
+ version: 2.0.0
devDependencies:
+ '@solidjs/vite-plugin':
+ specifier: ^3.0.0
+ version: 3.0.0(@babel/core@8.0.1)(@solidjs/web@2.0.0(solid-js@2.0.0))(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
typescript:
specifier: ^6.0.2
version: 6.0.3
vite:
specifier: ^8.2.1
version: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
- vite-plugin-solid:
- specifier: ^2.11.14
- version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
examples/solid/simple:
dependencies:
+ '@solidjs/web':
+ specifier: ^2.0.0
+ version: 2.0.0(solid-js@2.0.0)
'@tanstack/solid-form':
specifier: ^2.0.0-alpha.3
version: link:../../../packages/solid-form
solid-js:
- specifier: ^1.9.13
- version: 1.9.14
+ specifier: ^2.0.0
+ version: 2.0.0
devDependencies:
+ '@solidjs/vite-plugin':
+ specifier: ^3.0.0
+ version: 3.0.0(@babel/core@8.0.1)(@solidjs/web@2.0.0(solid-js@2.0.0))(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
typescript:
specifier: ^6.0.2
version: 6.0.3
vite:
specifier: ^8.2.1
version: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
- vite-plugin-solid:
- specifier: ^2.11.14
- version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
examples/solid/standard-schema:
dependencies:
+ '@solidjs/web':
+ specifier: ^2.0.0
+ version: 2.0.0(solid-js@2.0.0)
'@tanstack/solid-form':
specifier: ^2.0.0-alpha.3
version: link:../../../packages/solid-form
@@ -1797,8 +1824,8 @@ importers:
specifier: ^3.17.14
version: 3.22.1
solid-js:
- specifier: ^1.9.13
- version: 1.9.14
+ specifier: ^2.0.0
+ version: 2.0.0
valibot:
specifier: ^1.1.0
version: 1.4.2(typescript@6.0.3)
@@ -1806,15 +1833,15 @@ importers:
specifier: ^4.4.3
version: 4.4.3
devDependencies:
+ '@solidjs/vite-plugin':
+ specifier: ^3.0.0
+ version: 3.0.0(@babel/core@8.0.1)(@solidjs/web@2.0.0(solid-js@2.0.0))(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
typescript:
specifier: ^6.0.2
version: 6.0.3
vite:
specifier: ^8.2.1
version: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
- vite-plugin-solid:
- specifier: ^2.11.14
- version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
examples/svelte/array:
dependencies:
@@ -2471,29 +2498,32 @@ importers:
'@tanstack/form-core':
specifier: workspace:*
version: link:../form-core
- '@tanstack/solid-store':
+ '@tanstack/store':
specifier: ^0.11.1
- version: 0.11.1(solid-js@1.9.14)
- vite-plugin-solid:
- specifier: ^2.11.14
- version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
+ version: 0.11.1
devDependencies:
+ '@solidjs/vite-plugin':
+ specifier: ^3.0.0
+ version: 3.0.0(@babel/core@8.0.1)(@solidjs/web@2.0.0(solid-js@2.0.0))(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
+ '@solidjs/web':
+ specifier: ^2.0.0
+ version: 2.0.0(solid-js@2.0.0)
'@types/node':
specifier: ^25.0.7
version: 25.9.5
solid-js:
- specifier: ^1.9.13
- version: 1.9.14
+ specifier: ^2.0.0
+ version: 2.0.0
packages/solid-form-devtools:
dependencies:
solid-js:
specifier: '>=1.9.7'
- version: 1.9.14
+ version: 2.0.0
devDependencies:
vite-plugin-solid:
specifier: ^2.11.14
- version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
+ version: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
packages/svelte-form:
dependencies:
@@ -3380,6 +3410,9 @@ packages:
'@emnapi/core@1.11.2':
resolution: {integrity: sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA==}
+ '@emnapi/core@1.11.3':
+ resolution: {integrity: sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==}
+
'@emnapi/core@1.4.5':
resolution: {integrity: sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==}
@@ -3413,6 +3446,9 @@ packages:
'@emnapi/wasi-threads@1.2.2':
resolution: {integrity: sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==}
+ '@emnapi/wasi-threads@1.2.3':
+ resolution: {integrity: sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==}
+
'@emnapi/wasi-threads@2.0.1':
resolution: {integrity: sha512-9DsSk+o5NBX0CCJT8s0EROGSGxjR/tKu6aBTaVyq+SjAEQH4XcdcRxPBRzsBLizTTJ49MJjF+jgu3qnO9GLQcQ==}
@@ -6664,6 +6700,71 @@ packages:
peerDependencies:
solid-js: ^1.6.12
+ '@solidjs/compiler-darwin-arm64@2.0.0':
+ resolution: {integrity: sha512-pPHERRXgCcsfCsaC8sgK94uVlp4WGUcHTfMeBiAfme2amQ7vFn7dpjSD3TIVKY4jeYQTKjIKOYP0c5mqIR1LeA==}
+ cpu: [arm64]
+ os: [darwin]
+
+ '@solidjs/compiler-darwin-x64@2.0.0':
+ resolution: {integrity: sha512-Ndwy+pQs8v6BIfaAbQ+weu9HGBTM40HFCyu0XV2qX7U5XC+o+3fc4O6+8ZZyUzl+qvT6XU+wh2bQ6MI2lV+KBQ==}
+ cpu: [x64]
+ os: [darwin]
+
+ '@solidjs/compiler-linux-arm64-gnu@2.0.0':
+ resolution: {integrity: sha512-H/R9SUmuqd4P/IuuXTlRM1LhgUWe2EjLP3iMUo+L4IO1rmOSqfMUZp9h52eQnDsOdoIZCaKsw+b0qC5WooxDlg==}
+ cpu: [arm64]
+ os: [linux]
+ libc: [glibc]
+
+ '@solidjs/compiler-linux-x64-gnu@2.0.0':
+ resolution: {integrity: sha512-gafr9+2bP2sv2hRAvDgzab0mpQi4MiyWrie9bfYjadsK7qZKJBeMzEQCLNd4dTYlgirCj6Frzu2pfET7+ZUyNQ==}
+ cpu: [x64]
+ os: [linux]
+ libc: [glibc]
+
+ '@solidjs/compiler-wasm32-wasi@2.0.0':
+ resolution: {integrity: sha512-JnF21DJ/jx5fghYKIB6ANihHMM4aWg4JFe5pFLGDvqSeURZJdJGjwyyxOv3siEMUdkBzVGHXotTsviTcRyB5hQ==}
+ engines: {node: '>=14.0.0'}
+
+ '@solidjs/compiler-win32-x64-msvc@2.0.0':
+ resolution: {integrity: sha512-RkiUXt/LmJ1lk1fECa/iDVGCOv3UiwW5ocZgkhpayUviTSrceFjFHhiM9sFXq0at3kHI7Z8awN6zTaF5IStDAQ==}
+ cpu: [x64]
+ os: [win32]
+
+ '@solidjs/compiler@2.0.0':
+ resolution: {integrity: sha512-Spgqz1+eojQ2pDl4yajnajIjX/kSusjTK/6mC6Fm7sAZ3YBI0yP4/epRR1hV08TU3YAH4xLBmZ6wjb1zC134Sw==}
+
+ '@solidjs/signals@2.0.0':
+ resolution: {integrity: sha512-jrcT6XTVvsYRpesRp0At/mSUnsWr6jiprK8C93Oat56B8n7X9BMSe58Rxl6qSZUhBN0L+sxm8GzeO7HdhBXvDw==}
+ engines: {node: '>=22.12.0'}
+
+ '@solidjs/vite-plugin@3.0.0':
+ resolution: {integrity: sha512-JXFEewd+vKxbAuqc2+gtf0cnsc4esDq+lax6KKGRvP3D5np49rhF1V6mCLtiOEfeVEcSrBP6MRlArObiTaCQfA==}
+ engines: {node: '>=22.12.0'}
+ peerDependencies:
+ '@babel/core': ^7.23.3 || ^8.0.0
+ '@solidjs/babel-plugin': ^2.0.0
+ '@solidjs/start-devtools': ^1.0.0-next.2
+ '@solidjs/web': ^2.0.0
+ '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.0.0 || ^7.0.0
+ solid-js: ^2.0.0
+ vite: ^8.0.0 || ^9.0.0
+ peerDependenciesMeta:
+ '@babel/core':
+ optional: true
+ '@solidjs/babel-plugin':
+ optional: true
+ '@solidjs/start-devtools':
+ optional: true
+ '@testing-library/jest-dom':
+ optional: true
+
+ '@solidjs/web@2.0.0':
+ resolution: {integrity: sha512-R0+JMCD6ukEXaID/sH5PVQe9bCIN9pRzJry+F6Sb6YvtlkAp9DEyVI7AeZYiV0cd6TSL98kpbCyLDiZnaAKGrA==}
+ engines: {node: '>=22.12.0'}
+ peerDependencies:
+ solid-js: ^2.0.0
+
'@standard-schema/spec@1.1.0':
resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
@@ -7035,15 +7136,11 @@ packages:
resolution: {integrity: sha512-hTWqJtqIFFdvuCl8WXNyrodp2L9zo2G37xKRrcVmVRWpAB2h+U1LuRAfS4tsFTiWOIoE/B+WDVFB8JpoEdw6jQ==}
engines: {node: '>=20.19'}
- '@tanstack/solid-query@5.101.4':
- resolution: {integrity: sha512-w+QNX4al4zkfOfO6FYILouPX3yAxLANvBNz0cZqaBrSRKfBP3qNC179wu/eS2w1asH+QqEeI0rR2/s7gRGxnFA==}
+ '@tanstack/solid-query@6.0.0-rc.5':
+ resolution: {integrity: sha512-O9lD2JRgaN2ZS4ROBPL6HLPbPJ4FvnUsVe7j6FSxhE3GI8a5ntZbAj5zrTtmny6rSzhdcBuMB38R53tHIuXJkw==}
peerDependencies:
- solid-js: ^1.6.0
-
- '@tanstack/solid-store@0.11.1':
- resolution: {integrity: sha512-wzJsiqqLHyQacqbYPT8dKNfhR00NNu743vGeWz2lEpOyE/R+6AYIfFLhXsCIT/Kb+KKiT1KDkB2/35DhLEGx8g==}
- peerDependencies:
- solid-js: ^1.6.0
+ '@solidjs/web': '>=2.0.0-rc.13 <3.0.0'
+ solid-js: '>=2.0.0-rc.13 <3.0.0'
'@tanstack/start-client-core@1.170.19':
resolution: {integrity: sha512-Tdr3djfTnIn5VcFjgtYI6DWcaD7aGP9rySe7TH1QPVcb29pyS3eGUy5sSt3tykD8Zbn9+lYsdiY7bzZadxJM+A==}
@@ -7650,133 +7747,157 @@ packages:
resolution: {integrity: sha512-rsYkGl2kOkDRsh1mxriYnk1qBS78vjlBJ3+T2XwtwKwqOliy2n+2Ae0EDxJ/uX1DZLm3KkBZarGO5isEnmHchA==}
cpu: [arm64]
os: [android]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-codegen/binding-darwin-arm64@0.8.4':
resolution: {integrity: sha512-tNLKzPF3FYmEcHSYvWp/LEpjHHAtDR13hwo6/gdCkYMi9x59CWn2obczKzWNe7kDor4/1AMZuJDEVRpFkTSefw==}
cpu: [arm64]
os: [darwin]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-codegen/binding-darwin-x64@0.8.4':
resolution: {integrity: sha512-tK7LWzXNb5JbZpnoCNHB0nEhPFss/LwwehM6m/f0oYDan+iZgFZXzdoy80JdE7dVxjTZDIhUNPx8X8xbIdaoxA==}
cpu: [x64]
os: [darwin]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-codegen/binding-freebsd-x64@0.8.4':
resolution: {integrity: sha512-5MUV4d7g2p5Hd8GiXW6ynTRgYjm4Dw4eM2gaWRZ4crkGetzNx+HlPxcEfGtVNPqH5Qaa4Z2REtzdsdgvaE6/Ng==}
cpu: [x64]
os: [freebsd]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-codegen/binding-linux-arm-gnu@0.8.4':
resolution: {integrity: sha512-g6LnHrR0Rfqq5cXs7olwR2+LlVDc876pw7Hh7YXbukVSiBxQkaxqsEO/trO25z2g99zWzgXwoYvQZ1TnwA2wEw==}
cpu: [arm]
os: [linux]
libc: [glibc]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-codegen/binding-linux-arm-musl@0.8.4':
resolution: {integrity: sha512-7XAPHrROPEFuJWXEGZeLZQN4xR8ENQ65+HSCtCHjSzCwGgnX53GUjM9ExVcHopV0a5g4vu57v2wwtyWIM5iNOQ==}
cpu: [arm]
os: [linux]
libc: [musl]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-codegen/binding-linux-arm64-gnu@0.8.4':
resolution: {integrity: sha512-fnBm7NLuuwFXy7F1vRIuyOc+RW9ADUjuCKVGY87Dj8jtr9XgESNrwb+B9VLSFY7nZ0rCdK/Sm1fBqJpI7eLdKQ==}
cpu: [arm64]
os: [linux]
libc: [glibc]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-codegen/binding-linux-arm64-musl@0.8.4':
resolution: {integrity: sha512-6vTw4ZHO9nm4SUkw36uG+UE6/qifZ0E8HIef7Mx/U/c2Zxu3JLBfXtU7U/NN2GMkDmcJkgwjXfpQoYw4Ch5Y1w==}
cpu: [arm64]
os: [linux]
libc: [musl]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-codegen/binding-linux-x64-gnu@0.8.4':
resolution: {integrity: sha512-+vuC3V3Lw+DB4oJgHV9pVDfQZlsZJnxmbdods7HzxgEALU3P5+czwdAcw3wfh7Ebabt0Ny8eLUb1k9RV5OB/+w==}
cpu: [x64]
os: [linux]
libc: [glibc]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-codegen/binding-linux-x64-musl@0.8.4':
resolution: {integrity: sha512-QH60PE4eZecmgNGa1/T1cKPhrfxt6ANtu4lrQ1FZ50F9b0GS9WjGmIjrfdSUeQa+f2Iqk3oEFSJdgVHBg1KPNg==}
cpu: [x64]
os: [linux]
libc: [musl]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-codegen/binding-win32-arm64@0.8.4':
resolution: {integrity: sha512-6r68c0nKZPIBRXZIBiD7zjlEukBR+xRxpTOVj4n1Fsjcdh4YbbJfjFfmIzdbo9jXR1xL+dPueDVdsRGOUH5MoQ==}
cpu: [arm64]
os: [win32]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-codegen/binding-win32-x64@0.8.4':
resolution: {integrity: sha512-i+BW77LPjNqe7Apq50J3OeEaVfga3G+eT2bKjb6bj4yO99fil/jnKb4ZDH4JLvby/Q7hRa6VicL2EZ7iS+ifzA==}
cpu: [x64]
os: [win32]
+ deprecated: yuku-codegen is pure JavaScript since 0.14
'@yuku-parser/binding-android-arm64@0.8.4':
resolution: {integrity: sha512-+HIMmv08Zrh9ugIAEMnKBMMePOl7CDxrjc8Vui1+GG2TJHM1yI1+3wo1pnXB6Nj2IiHugDkQw8ycUI6SA2EUkQ==}
cpu: [arm64]
os: [android]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-parser/binding-darwin-arm64@0.8.4':
resolution: {integrity: sha512-Elf/B/2m3OsyvxoQnBk8Dtu+9csHkzBNs5Yv9GbHjT3x0kVKNWjFusyZgm41VwxcPDqdpRi8tWxNX7OqXkmf/A==}
cpu: [arm64]
os: [darwin]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-parser/binding-darwin-x64@0.8.4':
resolution: {integrity: sha512-CjZuMoXnL5XUkVpDqh4WDPwpAw8CwmtHHnTerGkS45So/sNuwkXdyIAEqqIZfaLopi5W/V9NApAT2md9XizjsQ==}
cpu: [x64]
os: [darwin]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-parser/binding-freebsd-x64@0.8.4':
resolution: {integrity: sha512-ibLKORdz71iI4Vs+fyFgvwQ51P5XcxJIyQLa8cSEWqwptRdo+BTcZHIQEcZnFDPUuvmJ19RRH9CoiJdfhr7pZw==}
cpu: [x64]
os: [freebsd]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-parser/binding-linux-arm-gnu@0.8.4':
resolution: {integrity: sha512-Fo3r5fYhGDcFnl+KN+L9PgtiQPS4AIE1n1mG1o5jZ11p7g5yZ/1EjLFmSHAUsoXreun8KjTsFjEL7P1Sb93PZQ==}
cpu: [arm]
os: [linux]
libc: [glibc]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-parser/binding-linux-arm-musl@0.8.4':
resolution: {integrity: sha512-BEB31vUEgXPWf7WkoMPSzzJhpC/wWCBXyysRCCPsw47BJ/OtbQsvJbxX9fFDuSRLy3kbyIV/WbdUTgbQ9COxiw==}
cpu: [arm]
os: [linux]
libc: [musl]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-parser/binding-linux-arm64-gnu@0.8.4':
resolution: {integrity: sha512-xGLCRcHn9xVz7JVNyyKtiNJSf503qtUmih9XVSsghgzOmiKUMnHObs69OMMwXN3788tg1jsl11fNjjQlB8idMA==}
cpu: [arm64]
os: [linux]
libc: [glibc]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-parser/binding-linux-arm64-musl@0.8.4':
resolution: {integrity: sha512-3kNRi8NJT2q6FQRVCUFHIQ99+kXdi8cVJEEUi6+xtFqpMgNrZNnbgAj28ILsDC7zmclaU+v47eUCeJoKLSCbww==}
cpu: [arm64]
os: [linux]
libc: [musl]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-parser/binding-linux-x64-gnu@0.8.4':
resolution: {integrity: sha512-isi62oMy94Z3OXwGs2l2rkqRiRyqLmfHeTRHpA/uWZbsNhnm7IdVvkF7e7wHNKAtd5jwGzOqYSroxKv2fOm7Cw==}
cpu: [x64]
os: [linux]
libc: [glibc]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-parser/binding-linux-x64-musl@0.8.4':
resolution: {integrity: sha512-9RsEw2xYHqU/pjSRBTOupWN3sF8uz9stjJdARfz6o0llvF+yfrj5QHmTiocGGBeAI80fvKmDtr2RIQClUzAPcA==}
cpu: [x64]
os: [linux]
libc: [musl]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-parser/binding-win32-arm64@0.8.4':
resolution: {integrity: sha512-VEZHo9rEGOBKR20sA3vCO00aQvwWND5aLu7YxeX+YupMZJh9hd1f17AbClJN37Q2iL1PCHht+wDTOKX6tZYqXg==}
cpu: [arm64]
os: [win32]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-parser/binding-win32-x64@0.8.4':
resolution: {integrity: sha512-PeH3VzN1feGjPtDpVEAqf000fPT+nxtw/696LKp/5Z9RJi/MaXpB636QC+5QtrAPSoEnIkyEe+c+mq2QLZPWBA==}
cpu: [x64]
os: [win32]
+ deprecated: yuku-parser runs on yuku-core since 0.14
'@yuku-toolchain/types@0.8.4':
resolution: {integrity: sha512-p7JE8flrj7ijZ/qLjHi4UwKqMarMD6zumbKXhrjp2I2iLJOuTYiQyci2U36VlXcUlNyzsY7E/mLnKCHotbzJVw==}
@@ -12062,6 +12183,12 @@ packages:
peerDependencies:
seroval: ^1.0
+ seroval-plugins@1.8.0:
+ resolution: {integrity: sha512-96vBb12rDvPPwdKUgWw1op3fGq8AVBFOr0IllbnM72yR5J9WWXF18cQ4g1XfDO7HCyh2dt70P3XdtyRayP8FWg==}
+ engines: {node: '>=20'}
+ peerDependencies:
+ seroval: ^1.8.0
+
seroval@1.5.6:
resolution: {integrity: sha512-rVQVWjjSvlINzaQPZH5JFqsqEsIWdTxY3iJZCnTL/5gQbXIRooVZKI60tVCkOVfzcRPejboxO2t0P89dg5mQaA==}
engines: {node: '>=10'}
@@ -12070,6 +12197,10 @@ packages:
resolution: {integrity: sha512-mPT+SD2TrlB6wvte1KkYOYUkubaTbd6pZ/6Kk3C9nxzrHmCZyhxOO7XGAeL7f+yLKZglzGtM9odUVvg/EhO+vQ==}
engines: {node: '>=10'}
+ seroval@1.8.1:
+ resolution: {integrity: sha512-7z9x1flFYfZBz+LfDkXNfm5UIhZJ/97ASaV8Q1wctoVkeqVfv+tLPsWebeMXBNw6XprvwxDE5wC5Ylqmr+iSrA==}
+ engines: {node: '>=20'}
+
serve-static@1.16.3:
resolution: {integrity: sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==}
engines: {node: '>= 0.8.0'}
@@ -12245,6 +12376,10 @@ packages:
solid-js@1.9.14:
resolution: {integrity: sha512-sAEXC0Kk0S1EDg+8ysEWJDbYhA3RRoEjwuySUGlKIemeo0I5YZfOyumNjNs9Sv3y2nmhD+0rW66ag2HsMuQiGQ==}
+ solid-js@2.0.0:
+ resolution: {integrity: sha512-9zN4uH2OQeQAYbF4BmIzoaa+L5Hb8Dp6kkP6ZXobHQ1FZVICdmzREPDVDBJY7umzdAE8D6zbFfWhxGtagkyslA==}
+ engines: {node: '>=22.12.0'}
+
solid-refresh@0.6.3:
resolution: {integrity: sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA==}
peerDependencies:
@@ -14926,6 +15061,12 @@ snapshots:
'@emnapi/wasi-threads': 1.2.2
tslib: 2.8.1
+ '@emnapi/core@1.11.3':
+ dependencies:
+ '@emnapi/wasi-threads': 1.2.3
+ tslib: 2.8.1
+ optional: true
+
'@emnapi/core@1.4.5':
dependencies:
'@emnapi/wasi-threads': 1.0.4
@@ -14978,6 +15119,11 @@ snapshots:
dependencies:
tslib: 2.8.1
+ '@emnapi/wasi-threads@1.2.3':
+ dependencies:
+ tslib: 2.8.1
+ optional: true
+
'@emnapi/wasi-threads@2.0.1':
dependencies:
tslib: 2.8.1
@@ -16011,6 +16157,13 @@ snapshots:
'@tybys/wasm-util': 0.10.3
optional: true
+ '@napi-rs/wasm-runtime@1.2.2(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)':
+ dependencies:
+ '@emnapi/core': 1.11.3
+ '@emnapi/runtime': 1.11.3
+ '@tybys/wasm-util': 0.10.3
+ optional: true
+
'@napi-rs/wasm-runtime@1.2.2(@emnapi/core@2.0.0-alpha.3)(@emnapi/runtime@2.0.0-alpha.3)':
dependencies:
'@emnapi/core': 2.0.0-alpha.3
@@ -17768,6 +17921,11 @@ snapshots:
'@solid-primitives/utils': 6.4.1(solid-js@1.9.14)
solid-js: 1.9.14
+ '@solid-primitives/event-listener@2.4.6(solid-js@2.0.0)':
+ dependencies:
+ '@solid-primitives/utils': 6.4.1(solid-js@2.0.0)
+ solid-js: 2.0.0
+
'@solid-primitives/keyboard@1.3.7(solid-js@1.9.14)':
dependencies:
'@solid-primitives/event-listener': 2.4.6(solid-js@1.9.14)
@@ -17775,6 +17933,13 @@ snapshots:
'@solid-primitives/utils': 6.4.1(solid-js@1.9.14)
solid-js: 1.9.14
+ '@solid-primitives/keyboard@1.3.7(solid-js@2.0.0)':
+ dependencies:
+ '@solid-primitives/event-listener': 2.4.6(solid-js@2.0.0)
+ '@solid-primitives/rootless': 1.5.4(solid-js@2.0.0)
+ '@solid-primitives/utils': 6.4.1(solid-js@2.0.0)
+ solid-js: 2.0.0
+
'@solid-primitives/keyed@1.5.3(solid-js@1.9.14)':
dependencies:
solid-js: 1.9.14
@@ -17787,20 +17952,96 @@ snapshots:
'@solid-primitives/utils': 6.4.1(solid-js@1.9.14)
solid-js: 1.9.14
+ '@solid-primitives/resize-observer@2.2.0(solid-js@2.0.0)':
+ dependencies:
+ '@solid-primitives/event-listener': 2.4.6(solid-js@2.0.0)
+ '@solid-primitives/rootless': 1.5.4(solid-js@2.0.0)
+ '@solid-primitives/static-store': 0.1.4(solid-js@2.0.0)
+ '@solid-primitives/utils': 6.4.1(solid-js@2.0.0)
+ solid-js: 2.0.0
+
'@solid-primitives/rootless@1.5.4(solid-js@1.9.14)':
dependencies:
'@solid-primitives/utils': 6.4.1(solid-js@1.9.14)
solid-js: 1.9.14
+ '@solid-primitives/rootless@1.5.4(solid-js@2.0.0)':
+ dependencies:
+ '@solid-primitives/utils': 6.4.1(solid-js@2.0.0)
+ solid-js: 2.0.0
+
'@solid-primitives/static-store@0.1.4(solid-js@1.9.14)':
dependencies:
'@solid-primitives/utils': 6.4.1(solid-js@1.9.14)
solid-js: 1.9.14
+ '@solid-primitives/static-store@0.1.4(solid-js@2.0.0)':
+ dependencies:
+ '@solid-primitives/utils': 6.4.1(solid-js@2.0.0)
+ solid-js: 2.0.0
+
'@solid-primitives/utils@6.4.1(solid-js@1.9.14)':
dependencies:
solid-js: 1.9.14
+ '@solid-primitives/utils@6.4.1(solid-js@2.0.0)':
+ dependencies:
+ solid-js: 2.0.0
+
+ '@solidjs/compiler-darwin-arm64@2.0.0':
+ optional: true
+
+ '@solidjs/compiler-darwin-x64@2.0.0':
+ optional: true
+
+ '@solidjs/compiler-linux-arm64-gnu@2.0.0':
+ optional: true
+
+ '@solidjs/compiler-linux-x64-gnu@2.0.0':
+ optional: true
+
+ '@solidjs/compiler-wasm32-wasi@2.0.0':
+ dependencies:
+ '@emnapi/core': 1.11.3
+ '@emnapi/runtime': 1.11.3
+ '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+ optional: true
+
+ '@solidjs/compiler-win32-x64-msvc@2.0.0':
+ optional: true
+
+ '@solidjs/compiler@2.0.0':
+ optionalDependencies:
+ '@solidjs/compiler-darwin-arm64': 2.0.0
+ '@solidjs/compiler-darwin-x64': 2.0.0
+ '@solidjs/compiler-linux-arm64-gnu': 2.0.0
+ '@solidjs/compiler-linux-x64-gnu': 2.0.0
+ '@solidjs/compiler-wasm32-wasi': 2.0.0
+ '@solidjs/compiler-win32-x64-msvc': 2.0.0
+
+ '@solidjs/signals@2.0.0': {}
+
+ '@solidjs/vite-plugin@3.0.0(@babel/core@8.0.1)(@solidjs/web@2.0.0(solid-js@2.0.0))(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))':
+ dependencies:
+ '@ampproject/remapping': 2.3.0
+ '@solidjs/compiler': 2.0.0
+ '@solidjs/web': 2.0.0(solid-js@2.0.0)
+ magic-string: 0.30.21
+ merge-anything: 5.1.7
+ solid-js: 2.0.0
+ vite: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
+ vitefu: 1.1.3(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
+ optionalDependencies:
+ '@babel/core': 8.0.1
+ '@testing-library/jest-dom': 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1)
+
+ '@solidjs/web@2.0.0(solid-js@2.0.0)':
+ dependencies:
+ csstype: 3.2.3
+ seroval: 1.8.1
+ seroval-plugins: 1.8.0(seroval@1.8.1)
+ solid-js: 2.0.0
+
'@standard-schema/spec@1.1.0': {}
'@stylistic/eslint-plugin@5.10.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))':
@@ -17983,6 +18224,15 @@ snapshots:
transitivePeerDependencies:
- csstype
+ '@tanstack/devtools-ui@0.6.0(csstype@3.2.3)(solid-js@2.0.0)':
+ dependencies:
+ clsx: 2.1.1
+ dayjs: 1.11.21
+ goober: 2.1.19(csstype@3.2.3)
+ solid-js: 2.0.0
+ transitivePeerDependencies:
+ - csstype
+
'@tanstack/devtools-utils@0.5.1(@angular/core@22.1.1(@angular/compiler@22.1.1)(rxjs@7.8.2)(zone.js@0.16.2))(@types/react@19.2.18)(preact@10.29.8)(react@19.2.8)(solid-js@1.9.14)':
optionalDependencies:
'@angular/core': 22.1.1(@angular/compiler@22.1.1)(rxjs@7.8.2)(zone.js@0.16.2)
@@ -18039,6 +18289,22 @@ snapshots:
- csstype
- utf-8-validate
+ '@tanstack/devtools@0.13.0(csstype@3.2.3)(solid-js@2.0.0)':
+ dependencies:
+ '@solid-primitives/event-listener': 2.4.6(solid-js@2.0.0)
+ '@solid-primitives/keyboard': 1.3.7(solid-js@2.0.0)
+ '@solid-primitives/resize-observer': 2.2.0(solid-js@2.0.0)
+ '@tanstack/devtools-client': 0.0.8
+ '@tanstack/devtools-event-bus': 0.4.2
+ '@tanstack/devtools-ui': 0.6.0(csstype@3.2.3)(solid-js@2.0.0)
+ clsx: 2.1.1
+ goober: 2.1.19(csstype@3.2.3)
+ solid-js: 2.0.0
+ transitivePeerDependencies:
+ - bufferutil
+ - csstype
+ - utf-8-validate
+
'@tanstack/eslint-config@0.4.0(@typescript-eslint/utils@8.66.0(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3))(eslint-import-resolver-node@0.3.10(supports-color@7.2.0))(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3)':
dependencies:
'@eslint/js': 10.0.1(eslint@10.8.1(jiti@2.7.0)(supports-color@7.2.0))
@@ -18087,6 +18353,19 @@ snapshots:
- solid-js
- utf-8-validate
+ '@tanstack/react-devtools@0.10.9(@types/react-dom@19.2.4(@types/react@19.2.18))(@types/react@19.2.18)(csstype@3.2.3)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(solid-js@2.0.0)':
+ dependencies:
+ '@tanstack/devtools': 0.13.0(csstype@3.2.3)(solid-js@2.0.0)
+ '@types/react': 19.2.18
+ '@types/react-dom': 19.2.4(@types/react@19.2.18)
+ react: 19.2.8
+ react-dom: 19.2.8(react@19.2.8)
+ transitivePeerDependencies:
+ - bufferutil
+ - csstype
+ - solid-js
+ - utf-8-validate
+
'@tanstack/react-query@5.101.4(react@19.2.8)':
dependencies:
'@tanstack/query-core': 5.101.4
@@ -18109,14 +18388,14 @@ snapshots:
react: 19.2.8
react-dom: 19.2.8(react@19.2.8)
- '@tanstack/react-start-rsc@0.1.39(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))':
+ '@tanstack/react-start-rsc@0.1.39(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))':
dependencies:
'@tanstack/react-router': 1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
'@tanstack/router-core': 1.171.19
'@tanstack/router-utils': 1.162.2(supports-color@8.1.1)
'@tanstack/start-client-core': 1.170.19
'@tanstack/start-fn-stubs': 1.162.0
- '@tanstack/start-plugin-core': 1.171.31(@tanstack/react-router@1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
+ '@tanstack/start-plugin-core': 1.171.31(@tanstack/react-router@1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
'@tanstack/start-storage-context': 1.167.21
pathe: 2.0.3
react: 19.2.8
@@ -18181,15 +18460,15 @@ snapshots:
transitivePeerDependencies:
- crossws
- '@tanstack/react-start@1.168.40(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))':
+ '@tanstack/react-start@1.168.40(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))':
dependencies:
'@tanstack/react-router': 1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
'@tanstack/react-start-client': 1.168.21(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
- '@tanstack/react-start-rsc': 0.1.39(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
+ '@tanstack/react-start-rsc': 0.1.39(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(react-dom@19.2.8(react@19.2.8))(react@19.2.8)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
'@tanstack/react-start-server': 1.167.28(crossws@0.4.10(srvx@0.11.22))(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
'@tanstack/router-utils': 1.162.2(supports-color@8.1.1)
'@tanstack/start-client-core': 1.170.19
- '@tanstack/start-plugin-core': 1.171.31(@tanstack/react-router@1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
+ '@tanstack/start-plugin-core': 1.171.31(@tanstack/react-router@1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
'@tanstack/start-server-core': 1.169.23(crossws@0.4.10(srvx@0.11.22))
pathe: 2.0.3
react: 19.2.8
@@ -18311,7 +18590,7 @@ snapshots:
- supports-color
- unloader
- '@tanstack/router-plugin@1.168.27(@tanstack/react-router@1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))':
+ '@tanstack/router-plugin@1.168.27(@tanstack/react-router@1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))':
dependencies:
'@babel/core': 7.29.7(supports-color@8.1.1)
'@babel/template': 7.29.7
@@ -18325,7 +18604,7 @@ snapshots:
optionalDependencies:
'@tanstack/react-router': 1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8)
vite: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
- vite-plugin-solid: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
+ vite-plugin-solid: 2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
transitivePeerDependencies:
- '@farmfe/core'
- '@rspack/core'
@@ -18362,15 +18641,11 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@tanstack/solid-query@5.101.4(solid-js@1.9.14)':
+ '@tanstack/solid-query@6.0.0-rc.5(@solidjs/web@2.0.0(solid-js@2.0.0))(solid-js@2.0.0)':
dependencies:
+ '@solidjs/web': 2.0.0(solid-js@2.0.0)
'@tanstack/query-core': 5.101.4
- solid-js: 1.9.14
-
- '@tanstack/solid-store@0.11.1(solid-js@1.9.14)':
- dependencies:
- '@tanstack/store': 0.11.1
- solid-js: 1.9.14
+ solid-js: 2.0.0
'@tanstack/start-client-core@1.170.19':
dependencies:
@@ -18381,14 +18656,14 @@ snapshots:
'@tanstack/start-fn-stubs@1.162.0': {}
- '@tanstack/start-plugin-core@1.171.31(@tanstack/react-router@1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))':
+ '@tanstack/start-plugin-core@1.171.31(@tanstack/react-router@1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(crossws@0.4.10(srvx@0.11.22))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))':
dependencies:
'@babel/code-frame': 7.27.1
'@babel/core': 7.29.7(supports-color@8.1.1)
'@babel/types': 7.29.8
'@tanstack/router-core': 1.171.19
'@tanstack/router-generator': 1.167.25(supports-color@8.1.1)
- '@tanstack/router-plugin': 1.168.27(@tanstack/react-router@1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@1.9.14)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
+ '@tanstack/router-plugin': 1.168.27(@tanstack/react-router@1.170.23(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(esbuild@0.28.1)(rolldown@1.2.3)(rollup@4.62.4)(supports-color@8.1.1)(vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)))(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
'@tanstack/router-utils': 1.162.2(supports-color@8.1.1)
'@tanstack/start-server-core': 1.169.23(crossws@0.4.10(srvx@0.11.22))
exsolve: 1.1.1
@@ -20325,6 +20600,13 @@ snapshots:
optionalDependencies:
solid-js: 1.9.14
+ babel-preset-solid@1.9.12(@babel/core@7.29.7(supports-color@8.1.1))(solid-js@2.0.0):
+ dependencies:
+ '@babel/core': 7.29.7(supports-color@8.1.1)
+ babel-plugin-jsx-dom-expressions: 0.40.7(@babel/core@7.29.7(supports-color@8.1.1))
+ optionalDependencies:
+ solid-js: 2.0.0
+
balanced-match@1.0.2: {}
balanced-match@4.0.3: {}
@@ -25092,10 +25374,16 @@ snapshots:
dependencies:
seroval: 1.6.2
+ seroval-plugins@1.8.0(seroval@1.8.1):
+ dependencies:
+ seroval: 1.8.1
+
seroval@1.5.6: {}
seroval@1.6.2: {}
+ seroval@1.8.1: {}
+
serve-static@1.16.3(supports-color@8.1.1):
dependencies:
encodeurl: 2.0.0
@@ -25341,6 +25629,12 @@ snapshots:
seroval: 1.5.6
seroval-plugins: 1.5.6(seroval@1.5.6)
+ solid-js@2.0.0:
+ dependencies:
+ '@solidjs/signals': 2.0.0
+ seroval: 1.8.1
+ seroval-plugins: 1.8.0(seroval@1.8.1)
+
solid-refresh@0.6.3(solid-js@1.9.14)(supports-color@7.2.0):
dependencies:
'@babel/generator': 7.29.8
@@ -25360,6 +25654,15 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ solid-refresh@0.6.3(solid-js@2.0.0)(supports-color@8.1.1):
+ dependencies:
+ '@babel/generator': 7.29.8
+ '@babel/helper-module-imports': 7.29.7(supports-color@8.1.1)
+ '@babel/types': 7.29.8
+ solid-js: 2.0.0
+ transitivePeerDependencies:
+ - supports-color
+
source-map-js@1.2.1: {}
source-map-support@0.5.21:
@@ -26129,6 +26432,21 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ vite-plugin-solid@2.11.14(@testing-library/jest-dom@7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1))(solid-js@2.0.0)(supports-color@8.1.1)(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)):
+ dependencies:
+ '@babel/core': 7.29.7(supports-color@8.1.1)
+ '@types/babel__core': 7.20.5
+ babel-preset-solid: 1.9.12(@babel/core@7.29.7(supports-color@8.1.1))(solid-js@2.0.0)
+ merge-anything: 5.1.7
+ solid-js: 2.0.0
+ solid-refresh: 0.6.3(solid-js@2.0.0)(supports-color@8.1.1)
+ vite: 8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)
+ vitefu: 1.1.3(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0))
+ optionalDependencies:
+ '@testing-library/jest-dom': 7.0.1(@testing-library/dom@10.4.1)(vitest@5.0.1)
+ transitivePeerDependencies:
+ - supports-color
+
vite-prerender-plugin@0.5.13(vite@8.3.0(@types/node@25.9.5)(esbuild@0.28.1)(jiti@2.7.0)(less@4.8.1(supports-color@8.1.1))(sass@1.102.0)(terser@5.49.0)(yaml@2.9.0)):
dependencies:
kolorist: 1.8.0
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index cbc32f7bc4..d6af27f80b 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -31,3 +31,15 @@ allowBuilds:
sharp: false
minimumReleaseAgeExclude:
- '@tanstack/typedoc-config@0.3.4'
+ # Solid 2.0 stable: published 2026-11-17, less than 24 hours ago
+ - 'solid-js@2.0.0'
+ - '@solidjs/signals@2.0.0'
+ - '@solidjs/web@2.0.0'
+ - '@solidjs/vite-plugin@3.0.0'
+ - '@solidjs/compiler@2.0.0'
+ - '@solidjs/compiler-darwin-arm64@2.0.0'
+ - '@solidjs/compiler-darwin-x64@2.0.0'
+ - '@solidjs/compiler-linux-arm64-gnu@2.0.0'
+ - '@solidjs/compiler-linux-x64-gnu@2.0.0'
+ - '@solidjs/compiler-wasm32-wasi@2.0.0'
+ - '@solidjs/compiler-win32-x64-msvc@2.0.0'