From 977f6131771c77e3ecd0b94f2d5ce594ed2ea295 Mon Sep 17 00:00:00 2001 From: Brenley Dueck Date: Sat, 11 Apr 2026 17:09:23 -0500 Subject: [PATCH 1/4] feat(solid-form): support Solid 2 beta 6 Update the package runtime, tests, and Vite test setup for the Solid 2 beta API surface so solid-form can build and test against beta 6. --- packages/solid-form/package.json | 8 +- packages/solid-form/src/createField.tsx | 49 ++- packages/solid-form/src/createFieldGroup.tsx | 25 +- packages/solid-form/src/createForm.tsx | 12 +- packages/solid-form/src/createFormHook.tsx | 26 +- .../solid-form/tests/createField.test.tsx | 14 +- packages/solid-form/tests/createForm.test.tsx | 23 +- .../solid-form/tests/createFormHook.test.tsx | 9 +- packages/solid-form/tests/testing-library.ts | 66 ++++ packages/solid-form/vite.config.ts | 10 + pnpm-lock.yaml | 343 +++++++++++++----- 11 files changed, 426 insertions(+), 159 deletions(-) create mode 100644 packages/solid-form/tests/testing-library.ts diff --git a/packages/solid-form/package.json b/packages/solid-form/package.json index 8fff897a8..453f1d03a 100644 --- a/packages/solid-form/package.json +++ b/packages/solid-form/package.json @@ -59,11 +59,13 @@ "@tanstack/solid-store": "^0.9.1" }, "devDependencies": { - "solid-js": "^1.9.9", + "@solidjs/web": "2.0.0-beta.6", + "@testing-library/dom": "^10.4.0", + "solid-js": "2.0.0-beta.6", "vite": "^7.2.2", - "vite-plugin-solid": "^2.11.8" + "vite-plugin-solid": "3.0.0-next.4" }, "peerDependencies": { - "solid-js": ">=1.9.9" + "solid-js": ">=2.0.0-beta.6 <2.0.0-experimental.0" } } diff --git a/packages/solid-form/src/createField.tsx b/packages/solid-form/src/createField.tsx index 504564b03..f90a1ed63 100644 --- a/packages/solid-form/src/createField.tsx +++ b/packages/solid-form/src/createField.tsx @@ -1,10 +1,9 @@ import { FieldApi } from '@tanstack/form-core' import { createComponent, - createComputed, + createRenderEffect, createSignal, - onCleanup, - onMount, + onSettled, } from 'solid-js' import { useStore } from '@tanstack/solid-store' import type { @@ -254,12 +253,16 @@ function makeFieldReactive< const [field, setField] = createSignal(fieldApi, { equals: false }) // Handle shallow comparison to make sure that Derived doesn't create a new setField call every time const store = useStore(fieldApi.store, (store) => store) - // Run before initial render - createComputed(() => { - // Use the store to track dependencies - store() - setField(fieldApi) - }) + createRenderEffect( + () => { + // Use the store to track dependencies + store() + return fieldApi + }, + (nextFieldApi) => { + setField(() => nextFieldApi) + }, + ) return field } @@ -346,25 +349,35 @@ export function createField< let mounted = false // Instantiates field meta and removes it when unrendered - onMount(() => { + onSettled(() => { + api.update(opts()) const cleanupFn = api.mount() mounted = true - onCleanup(() => { - cleanupFn() + return () => { mounted = false - }) + cleanupFn() + } }) /** * fieldApi.update should not have any side effects. Think of it like a `useRef` * that we need to keep updated every render with the most up-to-date information. * - * createComputed to make sure this effect runs before render effects + * createRenderEffect keeps the api options in sync before user effects run. */ - createComputed(() => { - if (!mounted) return - api.update(opts()) - }) + createRenderEffect( + () => { + const nextOptions = opts() + return mounted ? nextOptions : undefined + }, + (options) => { + if (options) { + api.update(options) + } + + return undefined + }, + ) return makeFieldReactive< TParentData, diff --git a/packages/solid-form/src/createFieldGroup.tsx b/packages/solid-form/src/createFieldGroup.tsx index 0310dd9d9..6f38ea269 100644 --- a/packages/solid-form/src/createFieldGroup.tsx +++ b/packages/solid-form/src/createFieldGroup.tsx @@ -1,6 +1,6 @@ import { FieldGroupApi, functionalUpdate } from '@tanstack/form-core' import { useStore } from '@tanstack/solid-store' -import { onCleanup, onMount } from 'solid-js' +import { onSettled } from 'solid-js' import type { Component, JSX, ParentProps } from 'solid-js' import type { DeepKeysOfType, @@ -194,26 +194,25 @@ export function createFieldGroup< > = api as never extendedApi.AppForm = (appFormProps) => - extendedApi.AppField = (props) => ( - - ) - extendedApi.Field = (props) => ( - - ) + extendedApi.AppField = (props) => { + const fieldOptions = () => api.getFormFieldOptions(props) + return + } + extendedApi.Field = (props) => { + const fieldOptions = () => api.getFormFieldOptions(props) + return + } extendedApi.Subscribe = (props) => { const data = useStore(api.store, props.selector) return functionalUpdate(props.children, data()) as Element } - let mounted = false - onMount(() => { + onSettled(() => { const cleanupFn = api.mount() - mounted = true - onCleanup(() => { + return () => { cleanupFn() - mounted = false - }) + } }) return Object.assign(extendedApi, { diff --git a/packages/solid-form/src/createForm.tsx b/packages/solid-form/src/createForm.tsx index 383014c09..fe79e1de7 100644 --- a/packages/solid-form/src/createForm.tsx +++ b/packages/solid-form/src/createForm.tsx @@ -1,5 +1,5 @@ import { FormApi, functionalUpdate } from '@tanstack/form-core' -import { createComputed, onMount } from 'solid-js' +import { createRenderEffect, onSettled } from 'solid-js' import { useStore } from '@tanstack/solid-store' import { Field, createField } from './createField' import type { @@ -239,13 +239,19 @@ export function createForm< extendedApi.Subscribe = (props) => functionalUpdate(props.children, useStore(api.store, props.selector)) - onMount(api.mount) + onSettled(api.mount) /** * formApi.update should not have any side effects. Think of it like a `useRef` * that we need to keep updated every render with the most up-to-date information. */ - createComputed(() => api.update(opts?.())) + createRenderEffect( + () => opts?.(), + (options) => { + api.update(options) + return undefined + }, + ) return extendedApi } diff --git a/packages/solid-form/src/createFormHook.tsx b/packages/solid-form/src/createFormHook.tsx index a86afab24..8b61679b3 100644 --- a/packages/solid-form/src/createFormHook.tsx +++ b/packages/solid-form/src/createFormHook.tsx @@ -1,8 +1,8 @@ import { createComponent, createContext, - mergeProps, - splitProps, + merge, + omit, useContext, } from 'solid-js' import { createFieldGroup } from './createFieldGroup' @@ -351,26 +351,18 @@ export function createFormHook< const AppForm = ((formProps) => { return ( - - {formProps.children} - + {formProps.children} ) }) as Component const AppField = ((_props) => { - const [childProps, fieldProps] = splitProps(_props, ['children']) + const fieldProps = omit(_props, 'children') return ( {(field) => ( - - {createComponent( - () => - childProps.children( - Object.assign(field, opts.fieldComponents), - ), - {}, - )} - + + {_props.children(Object.assign(field, opts.fieldComponents))} + )} ) @@ -472,7 +464,7 @@ export function createFormHook< return (innerProps) => createComponent( render as Component, - mergeProps(props ?? {}, innerProps), + props ? merge(props, innerProps) : innerProps, ) } @@ -560,7 +552,7 @@ export function createFormHook< const fieldGroupApi = createFieldGroup(() => fieldGroupProps) return createComponent( render as Component, - mergeProps(props ?? {}, innerProps, { group: fieldGroupApi as any }), + merge(props ?? {}, innerProps, { group: fieldGroupApi as any }), ) } } diff --git a/packages/solid-form/tests/createField.test.tsx b/packages/solid-form/tests/createField.test.tsx index df2b444a1..9d824776c 100644 --- a/packages/solid-form/tests/createField.test.tsx +++ b/packages/solid-form/tests/createField.test.tsx @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest' import { render, waitFor } from '@solidjs/testing-library' import { userEvent } from '@testing-library/user-event' -import { Index, Show } from 'solid-js' +import { Repeat, Show } from 'solid-js' import { createForm } from '../src/index' import { sleep } from './utils' @@ -402,8 +402,8 @@ describe('createField', () => {
0}> {/* Do not change this to For or the test will fail */} - - {(_, i) => { + + {(i) => { return ( {(subField) => ( @@ -430,7 +430,7 @@ describe('createField', () => { ) }} - +
- - {(_, index) => ( + + {(index) => ( {(field) => (
@@ -573,7 +573,7 @@ describe('createForm', () => { )} )} - +
)} @@ -610,10 +610,9 @@ describe('createForm', () => { {(arrayField) => ( // This unit test provides different result based on - // using For vs. Index. Unit test both - // once that's fixed. - - {(_, i) => ( + // Keep index-based array field rendering covered. + + {(i) => ( {(field) => { expect(field().name).toBe(`foo[${i}].name`) @@ -622,7 +621,7 @@ describe('createForm', () => { }} )} - + )}
) diff --git a/examples/solid/large-form/src/index.tsx b/examples/solid/large-form/src/index.tsx index f764172a5..6813299d3 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.tsx' const root = document.getElementById('root') diff --git a/examples/solid/simple/package.json b/examples/solid/simple/package.json index a25d32ac4..ccc85d4c2 100644 --- a/examples/solid/simple/package.json +++ b/examples/solid/simple/package.json @@ -10,11 +10,12 @@ }, "dependencies": { "@tanstack/solid-form": "^1.29.0", - "solid-js": "^1.9.9" + "solid-js": "2.0.0-beta.6" }, "devDependencies": { + "@solidjs/web": "2.0.0-beta.6", "typescript": "5.8.2", "vite": "^7.2.2", - "vite-plugin-solid": "^2.11.8" + "vite-plugin-solid": "3.0.0-next.4" } } diff --git a/examples/solid/simple/src/index.tsx b/examples/solid/simple/src/index.tsx index e74faded7..68308a771 100644 --- a/examples/solid/simple/src/index.tsx +++ b/examples/solid/simple/src/index.tsx @@ -1,5 +1,5 @@ /* @refresh reload */ -import { render } from 'solid-js/web' +import { render } from '@solidjs/web' import { createForm } from '@tanstack/solid-form' import type { AnyFieldApi } from '@tanstack/solid-form' diff --git a/examples/solid/standard-schema/package.json b/examples/solid/standard-schema/package.json index c1cbf0afb..71fd96fd5 100644 --- a/examples/solid/standard-schema/package.json +++ b/examples/solid/standard-schema/package.json @@ -14,13 +14,14 @@ "effect": "^3.17.14", "react": "^19.0.0", "react-dom": "^19.0.0", - "solid-js": "^1.9.9", + "solid-js": "2.0.0-beta.6", "valibot": "^1.1.0", "zod": "^3.25.76" }, "devDependencies": { + "@solidjs/web": "2.0.0-beta.6", "typescript": "5.8.2", "vite": "^7.2.2", - "vite-plugin-solid": "^2.11.8" + "vite-plugin-solid": "3.0.0-next.4" } } diff --git a/examples/solid/standard-schema/src/index.tsx b/examples/solid/standard-schema/src/index.tsx index db7533c6f..659bd445d 100644 --- a/examples/solid/standard-schema/src/index.tsx +++ b/examples/solid/standard-schema/src/index.tsx @@ -1,5 +1,5 @@ /* @refresh reload */ -import { render } from 'solid-js/web' +import { render } from '@solidjs/web' import { createForm } from '@tanstack/solid-form' diff --git a/packages/solid-form-devtools/package.json b/packages/solid-form-devtools/package.json index a8c0b5384..eb16641a1 100644 --- a/packages/solid-form-devtools/package.json +++ b/packages/solid-form-devtools/package.json @@ -51,13 +51,15 @@ "build": "vite build" }, "peerDependencies": { - "solid-js": ">=1.9.7" + "solid-js": ">=2.0.0-beta.6 <2.0.0-experimental.0" }, "dependencies": { "@tanstack/devtools-utils": "^0.4.0", "@tanstack/form-devtools": "workspace:*" }, "devDependencies": { - "vite-plugin-solid": "^2.11.8" + "@solidjs/web": "2.0.0-beta.6", + "solid-js": "2.0.0-beta.6", + "vite-plugin-solid": "3.0.0-next.4" } } diff --git a/packages/solid-form/package.json b/packages/solid-form/package.json index 453f1d03a..908b036f9 100644 --- a/packages/solid-form/package.json +++ b/packages/solid-form/package.json @@ -30,21 +30,21 @@ }, "type": "module", "types": "dist/esm/index.d.ts", - "main": "dist/cjs/index.cjs", - "module": "dist/esm/index.js", + "main": "dist/cjs/packages/solid-form/src/index.cjs", + "module": "dist/esm/packages/solid-form/src/index.js", "exports": { ".": { "solid": { - "types": "./dist/source/index.d.ts", - "default": "./dist/source/index.jsx" + "types": "./dist/source/solid-form/src/index.d.ts", + "default": "./dist/source/solid-form/src/index.jsx" }, "import": { "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" + "default": "./dist/esm/packages/solid-form/src/index.js" }, "require": { "types": "./dist/cjs/index.d.cts", - "default": "./dist/cjs/index.cjs" + "default": "./dist/cjs/packages/solid-form/src/index.cjs" } }, "./package.json": "./package.json" diff --git a/packages/solid-form/src/createField.tsx b/packages/solid-form/src/createField.tsx index f90a1ed63..8dbbf90e4 100644 --- a/packages/solid-form/src/createField.tsx +++ b/packages/solid-form/src/createField.tsx @@ -1,8 +1,9 @@ import { FieldApi } from '@tanstack/form-core' import { createComponent, + createMemo, createRenderEffect, - createSignal, + omit, onSettled, } from 'solid-js' import { useStore } from '@tanstack/solid-store' @@ -250,20 +251,17 @@ function makeFieldReactive< TFormOnServer, TParentSubmitMeta > { - const [field, setField] = createSignal(fieldApi, { equals: false }) // Handle shallow comparison to make sure that Derived doesn't create a new setField call every time const store = useStore(fieldApi.store, (store) => store) - createRenderEffect( + return createMemo( () => { // Use the store to track dependencies store() return fieldApi }, - (nextFieldApi) => { - setField(() => nextFieldApi) - }, + undefined, + { equals: false }, ) - return field } export function createField< @@ -818,8 +816,7 @@ export function Field< TFormOnServer, TParentSubmitMeta >(() => { - const { children, ...fieldOptions } = props - return fieldOptions + return omit(props, 'children') }) return <>{createComponent(() => props.children(fieldApi), {})} diff --git a/packages/solid-form/src/createFieldGroup.tsx b/packages/solid-form/src/createFieldGroup.tsx index 6f38ea269..9c037360f 100644 --- a/packages/solid-form/src/createFieldGroup.tsx +++ b/packages/solid-form/src/createFieldGroup.tsx @@ -193,16 +193,18 @@ export function createFieldGroup< TFormComponents > = api as never - extendedApi.AppForm = (appFormProps) => - extendedApi.AppField = (props) => { + extendedApi.AppForm = (appFormProps: any) => ( + + ) + extendedApi.AppField = (props: any) => { const fieldOptions = () => api.getFormFieldOptions(props) return } - extendedApi.Field = (props) => { + extendedApi.Field = (props: any) => { const fieldOptions = () => api.getFormFieldOptions(props) return } - extendedApi.Subscribe = (props) => { + extendedApi.Subscribe = (props: any) => { const data = useStore(api.store, props.selector) return functionalUpdate(props.children, data()) as Element diff --git a/packages/solid-form/src/createForm.tsx b/packages/solid-form/src/createForm.tsx index fe79e1de7..66437b947 100644 --- a/packages/solid-form/src/createForm.tsx +++ b/packages/solid-form/src/createForm.tsx @@ -230,13 +230,13 @@ export function createForm< TSubmitMeta > = api as never - extendedApi.Field = (props) => - extendedApi.createField = (props) => + extendedApi.Field = (props: any) => + extendedApi.createField = (props: any) => createField(() => { return { ...props(), form: api } }) as never - extendedApi.useStore = (selector) => useStore(api.store, selector) - extendedApi.Subscribe = (props) => + extendedApi.useStore = (selector: any) => useStore(api.store, selector) + extendedApi.Subscribe = (props: any) => functionalUpdate(props.children, useStore(api.store, props.selector)) onSettled(api.mount) diff --git a/packages/solid-form/src/createFormHook.tsx b/packages/solid-form/src/createFormHook.tsx index 8b61679b3..8bde70b22 100644 --- a/packages/solid-form/src/createFormHook.tsx +++ b/packages/solid-form/src/createFormHook.tsx @@ -359,7 +359,7 @@ export function createFormHook< const fieldProps = omit(_props, 'children') return ( - {(field) => ( + {(field: any) => ( {_props.children(Object.assign(field, opts.fieldComponents))} diff --git a/packages/solid-form/tsconfig.build.json b/packages/solid-form/tsconfig.build.json index 14414d318..0414eef0b 100644 --- a/packages/solid-form/tsconfig.build.json +++ b/packages/solid-form/tsconfig.build.json @@ -4,13 +4,12 @@ "jsx": "preserve", "jsxImportSource": "solid-js", "moduleResolution": "Bundler", - "rootDir": "src", "outDir": "dist/source", "noEmit": false, "declaration": true, "sourceMap": true, "paths": { - "@tanstack/form-core": ["../../form-core/src"] + "@tanstack/form-core": ["../form-core/src"] } }, "include": ["src"] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 51eea5049..a1dcbc31a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -944,9 +944,12 @@ importers: specifier: ^1.29.0 version: link:../../../packages/solid-form solid-js: - specifier: ^1.9.9 - version: 1.9.11 + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6 devDependencies: + '@solidjs/web': + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6) typescript: specifier: 5.8.2 version: 5.8.2 @@ -954,14 +957,14 @@ importers: specifier: ^7.2.2 version: 7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1) vite-plugin-solid: - specifier: ^2.11.8 - version: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.11)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) + specifier: 3.0.0-next.4 + version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.6)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) examples/solid/devtools: dependencies: '@tanstack/solid-devtools': - specifier: ^0.7.7 - version: 0.7.7(csstype@3.1.3)(solid-js@1.9.11) + specifier: ^0.8.2 + version: 0.8.2(csstype@3.1.3)(solid-js@2.0.0-beta.6) '@tanstack/solid-form': specifier: ^1.29.0 version: link:../../../packages/solid-form @@ -969,9 +972,12 @@ importers: specifier: workspace:* version: link:../../../packages/solid-form-devtools solid-js: - specifier: ^1.9.9 - version: 1.9.11 + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6 devDependencies: + '@solidjs/web': + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6) typescript: specifier: 5.8.2 version: 5.8.2 @@ -979,8 +985,8 @@ importers: specifier: ^7.2.2 version: 7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1) vite-plugin-solid: - specifier: ^2.11.8 - version: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.11)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) + specifier: 3.0.0-next.4 + version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.6)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) examples/solid/large-form: dependencies: @@ -988,9 +994,12 @@ importers: specifier: ^1.29.0 version: link:../../../packages/solid-form solid-js: - specifier: ^1.9.9 - version: 1.9.11 + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6 devDependencies: + '@solidjs/web': + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6) typescript: specifier: 5.8.2 version: 5.8.2 @@ -998,8 +1007,8 @@ importers: specifier: ^7.2.2 version: 7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1) vite-plugin-solid: - specifier: ^2.11.8 - version: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.11)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) + specifier: 3.0.0-next.4 + version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.6)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) examples/solid/simple: dependencies: @@ -1007,9 +1016,12 @@ importers: specifier: ^1.29.0 version: link:../../../packages/solid-form solid-js: - specifier: ^1.9.9 - version: 1.9.11 + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6 devDependencies: + '@solidjs/web': + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6) typescript: specifier: 5.8.2 version: 5.8.2 @@ -1017,8 +1029,8 @@ importers: specifier: ^7.2.2 version: 7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1) vite-plugin-solid: - specifier: ^2.11.8 - version: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.11)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) + specifier: 3.0.0-next.4 + version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.6)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) examples/solid/standard-schema: dependencies: @@ -1038,8 +1050,8 @@ importers: specifier: ^19.0.0 version: 19.1.0(react@19.1.0) solid-js: - specifier: ^1.9.9 - version: 1.9.11 + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6 valibot: specifier: ^1.1.0 version: 1.1.0(typescript@5.8.2) @@ -1047,6 +1059,9 @@ importers: specifier: ^3.25.76 version: 3.25.76 devDependencies: + '@solidjs/web': + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6) typescript: specifier: 5.8.2 version: 5.8.2 @@ -1054,8 +1069,8 @@ importers: specifier: ^7.2.2 version: 7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1) vite-plugin-solid: - specifier: ^2.11.8 - version: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.11)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) + specifier: 3.0.0-next.4 + version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.6)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) examples/svelte/array: dependencies: @@ -1319,10 +1334,10 @@ importers: dependencies: '@tanstack/devtools-ui': specifier: ^0.5.1 - version: 0.5.1(csstype@3.1.3)(solid-js@1.9.11) + version: 0.5.1(csstype@3.1.3)(solid-js@2.0.0-beta.6) '@tanstack/devtools-utils': specifier: ^0.4.0 - version: 0.4.0(@types/react@19.1.6)(react@19.1.0)(solid-js@1.9.11)(vue@3.5.16(typescript@5.9.3)) + version: 0.4.0(@types/react@19.1.6)(react@19.1.0)(solid-js@2.0.0-beta.6)(vue@3.5.16(typescript@5.9.3)) '@tanstack/form-core': specifier: workspace:* version: link:../form-core @@ -1338,10 +1353,10 @@ importers: devDependencies: rolldown-plugin-solid: specifier: ^0.2.1 - version: 0.2.1(rolldown@1.0.0-rc.8)(solid-js@1.9.11) + version: 0.2.1(rolldown@1.0.0-rc.8)(solid-js@2.0.0-beta.6) solid-js: - specifier: ^1.9.9 - version: 1.9.11 + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6 tsdown: specifier: ^0.21.1 version: 0.21.1(oxc-resolver@11.15.0)(publint@0.3.15)(typescript@5.9.3) @@ -1349,8 +1364,8 @@ importers: specifier: ^7.2.2 version: 7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1) vite-plugin-solid: - specifier: ^2.11.8 - version: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.11)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) + specifier: 3.0.0-next.4 + version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.6)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) packages/lit-form: dependencies: @@ -1540,17 +1555,20 @@ importers: dependencies: '@tanstack/devtools-utils': specifier: ^0.4.0 - version: 0.4.0(@types/react@19.1.6)(react@19.1.0)(solid-js@1.9.11)(vue@3.5.16(typescript@5.9.3)) + version: 0.4.0(@types/react@19.1.6)(react@19.1.0)(solid-js@2.0.0-beta.6)(vue@3.5.16(typescript@5.9.3)) '@tanstack/form-devtools': specifier: workspace:* version: link:../form-devtools - solid-js: - specifier: '>=1.9.7' - version: 1.9.11 devDependencies: + '@solidjs/web': + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6) + solid-js: + specifier: 2.0.0-beta.6 + version: 2.0.0-beta.6 vite-plugin-solid: - specifier: ^2.11.8 - version: 2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.11)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) + specifier: 3.0.0-next.4 + version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.6(@solidjs/signals@0.13.11)(solid-js@2.0.0-beta.6))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.6)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) packages/svelte-form: dependencies: @@ -4966,36 +4984,18 @@ packages: '@angular/common': '>=19.0.0' '@angular/core': '>=19.0.0' - '@tanstack/devtools-client@0.0.3': - resolution: {integrity: sha512-kl0r6N5iIL3t9gGDRAv55VRM3UIyMKVH83esRGq7xBjYsRLe/BeCIN2HqrlJkObUXQMKhy7i8ejuGOn+bDqDBw==} - engines: {node: '>=18'} - '@tanstack/devtools-client@0.0.6': resolution: {integrity: sha512-f85ZJXJnDIFOoykG/BFIixuAevJovCvJF391LPs6YjBAPhGYC50NWlx1y4iF/UmK5/cCMx+/JqI5SBOz7FanQQ==} engines: {node: '>=18'} - '@tanstack/devtools-event-bus@0.3.2': - resolution: {integrity: sha512-yJT2As/drc+Epu0nsqCsJaKaLcaNGufiNxSlp/+/oeTD0jsBxF9/PJBfh66XVpYXkKr97b8689mSu7QMef0Rrw==} - engines: {node: '>=18'} - '@tanstack/devtools-event-bus@0.4.1': resolution: {integrity: sha512-cNnJ89Q021Zf883rlbBTfsaxTfi2r73/qejGtyTa7ksErF3hyDyAq1aTbo5crK9dAL7zSHh9viKY1BtMls1QOA==} engines: {node: '>=18'} - '@tanstack/devtools-event-client@0.3.5': - resolution: {integrity: sha512-RL1f5ZlfZMpghrCIdzl6mLOFLTuhqmPNblZgBaeKfdtk5rfbjykurv+VfYydOFXj0vxVIoA2d/zT7xfD7Ph8fw==} - engines: {node: '>=18'} - '@tanstack/devtools-event-client@0.4.1': resolution: {integrity: sha512-GRxmPw4OHZ2oZeIEUkEwt/NDvuEqzEYRAjzUVMs+I0pd4C7k1ySOiuJK2CqF+K/yEAR3YZNkW3ExrpDarh9Vwg==} engines: {node: '>=18'} - '@tanstack/devtools-ui@0.4.3': - resolution: {integrity: sha512-7QshnQIHifURyMwl/qmYm4KDpsf8UJrJ8BUu+YvPx35RJBe2EO5qHPsefzWh6MlG/dUdVMBxP9nPqchESyuNFg==} - engines: {node: '>=18'} - peerDependencies: - solid-js: '>=1.9.7' - '@tanstack/devtools-ui@0.5.0': resolution: {integrity: sha512-nNZ14054n31fWB61jtWhZYLRdQ3yceCE3G/RINoINUB0RqIGZAIm9DnEDwOTAOfqt4/a/D8vNk8pJu6RQUp74g==} engines: {node: '>=18'} @@ -5036,9 +5036,10 @@ packages: peerDependencies: solid-js: '>=1.9.7' - '@tanstack/devtools@0.6.21': - resolution: {integrity: sha512-j8cCmrOz7wu4G4jJ2ZZCo3fIGGDMygSQVPZDtyFylKtKC5i88Hnu6YioODP6I+0mbn9Qvr4eWgPHEONXAViXeA==} + '@tanstack/devtools@0.11.2': + resolution: {integrity: sha512-K8+tsBx+ptTLqqd4dOF10B6laj1g+XYImqYZL9n0jBINGaT+sOf17PKV9pbBt8kdbZeIGsHaJ5OZWCyZoHqN4A==} engines: {node: '>=18'} + hasBin: true peerDependencies: solid-js: '>=1.9.7' @@ -5155,8 +5156,8 @@ packages: resolution: {integrity: sha512-2sWxq70T+dOEUlE3sHlXjEPhaFZfdPYlWTSkHchWXrFGw2YOAa+hzD6L9wHMjGDQezYd03ue8tQlHG+9Jzbzgw==} engines: {node: '>=12'} - '@tanstack/solid-devtools@0.7.7': - resolution: {integrity: sha512-+0bI+ohQs5RSjBqBAdtGNhpjmNLhT30TAz5J9h69b7WoqLl0tsmtOcqea6wme+4CQ1FOj+coAvtbnS8J23100g==} + '@tanstack/solid-devtools@0.8.2': + resolution: {integrity: sha512-tzHF9rNPd9mO5vCArBkVABNe3qs+hvocra4LyRi/aFZC/0leLtD/TpXGnYx4IjDixTqkMCv3PLaG0HTwI5sdnw==} engines: {node: '>=18'} peerDependencies: solid-js: '>=1.9.7' @@ -6080,11 +6081,6 @@ packages: '@babel/core': ^7.12.0 webpack: '>=5.61.0' - babel-plugin-jsx-dom-expressions@0.39.8: - resolution: {integrity: sha512-/MVOIIjonylDXnrWmG23ZX82m9mtKATsVHB7zYlPfDR9Vdd/NBE48if+wv27bSkBtyO7EPMUlcUc4J63QwuACQ==} - peerDependencies: - '@babel/core': ^7.20.12 - babel-plugin-jsx-dom-expressions@0.40.5: resolution: {integrity: sha512-8TFKemVLDYezqqv4mWz+PhRrkryTzivTGu0twyLrOkVZ0P63COx2Y04eVsUjFlwSOXui1z3P3Pn209dokWnirg==} peerDependencies: @@ -6126,11 +6122,6 @@ packages: solid-js: optional: true - babel-preset-solid@1.9.6: - resolution: {integrity: sha512-HXTK9f93QxoH8dYn1M2mJdOlWgMsR88Lg/ul6QCZGkNTktjTE5HAf93YxQumHoCudLEtZrU1cFCMFOVho6GqFg==} - peerDependencies: - '@babel/core': ^7.0.0 - babel-preset-solid@2.0.0-beta.6: resolution: {integrity: sha512-NPWm13Wzsao8UBmlI1nfTABwBFUo5yalYYTdH6Wc8yJB/2sX4RGrqvMaVFhBtmiBf1l2r8fKszBvKtJ4tCTzbw==} peerDependencies: @@ -14663,23 +14654,11 @@ snapshots: '@sinclair/typebox@0.34.41': {} - '@solid-primitives/event-listener@2.4.3(solid-js@1.9.11)': - dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 - '@solid-primitives/event-listener@2.4.3(solid-js@2.0.0-beta.6)': dependencies: '@solid-primitives/utils': 6.3.2(solid-js@2.0.0-beta.6) solid-js: 2.0.0-beta.6 - '@solid-primitives/keyboard@1.3.3(solid-js@1.9.11)': - dependencies: - '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.11) - '@solid-primitives/rootless': 1.5.2(solid-js@1.9.11) - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 - '@solid-primitives/keyboard@1.3.3(solid-js@2.0.0-beta.6)': dependencies: '@solid-primitives/event-listener': 2.4.3(solid-js@2.0.0-beta.6) @@ -14687,14 +14666,6 @@ snapshots: '@solid-primitives/utils': 6.3.2(solid-js@2.0.0-beta.6) solid-js: 2.0.0-beta.6 - '@solid-primitives/resize-observer@2.1.3(solid-js@1.9.11)': - dependencies: - '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.11) - '@solid-primitives/rootless': 1.5.2(solid-js@1.9.11) - '@solid-primitives/static-store': 0.1.2(solid-js@1.9.11) - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 - '@solid-primitives/resize-observer@2.1.3(solid-js@2.0.0-beta.6)': dependencies: '@solid-primitives/event-listener': 2.4.3(solid-js@2.0.0-beta.6) @@ -14703,30 +14674,16 @@ snapshots: '@solid-primitives/utils': 6.3.2(solid-js@2.0.0-beta.6) solid-js: 2.0.0-beta.6 - '@solid-primitives/rootless@1.5.2(solid-js@1.9.11)': - dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 - '@solid-primitives/rootless@1.5.2(solid-js@2.0.0-beta.6)': dependencies: '@solid-primitives/utils': 6.3.2(solid-js@2.0.0-beta.6) solid-js: 2.0.0-beta.6 - '@solid-primitives/static-store@0.1.2(solid-js@1.9.11)': - dependencies: - '@solid-primitives/utils': 6.3.2(solid-js@1.9.11) - solid-js: 1.9.11 - '@solid-primitives/static-store@0.1.2(solid-js@2.0.0-beta.6)': dependencies: '@solid-primitives/utils': 6.3.2(solid-js@2.0.0-beta.6) solid-js: 2.0.0-beta.6 - '@solid-primitives/utils@6.3.2(solid-js@1.9.11)': - dependencies: - solid-js: 1.9.11 - '@solid-primitives/utils@6.3.2(solid-js@2.0.0-beta.6)': dependencies: solid-js: 2.0.0-beta.6 @@ -14864,21 +14821,10 @@ snapshots: '@tanstack/store': 0.9.1 tslib: 2.8.1 - '@tanstack/devtools-client@0.0.3': - dependencies: - '@tanstack/devtools-event-client': 0.3.5 - '@tanstack/devtools-client@0.0.6': dependencies: '@tanstack/devtools-event-client': 0.4.1 - '@tanstack/devtools-event-bus@0.3.2': - dependencies: - ws: 8.18.3 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - '@tanstack/devtools-event-bus@0.4.1': dependencies: ws: 8.18.3 @@ -14886,18 +14832,8 @@ snapshots: - bufferutil - utf-8-validate - '@tanstack/devtools-event-client@0.3.5': {} - '@tanstack/devtools-event-client@0.4.1': {} - '@tanstack/devtools-ui@0.4.3(csstype@3.1.3)(solid-js@1.9.11)': - dependencies: - clsx: 2.1.1 - goober: 2.1.18(csstype@3.1.3) - solid-js: 1.9.11 - transitivePeerDependencies: - - csstype - '@tanstack/devtools-ui@0.5.0(csstype@3.1.3)(solid-js@2.0.0-beta.6)': dependencies: clsx: 2.1.1 @@ -14907,12 +14843,12 @@ snapshots: transitivePeerDependencies: - csstype - '@tanstack/devtools-ui@0.5.1(csstype@3.1.3)(solid-js@1.9.11)': + '@tanstack/devtools-ui@0.5.1(csstype@3.1.3)(solid-js@2.0.0-beta.6)': dependencies: clsx: 2.1.1 dayjs: 1.11.19 goober: 2.1.18(csstype@3.1.3) - solid-js: 1.9.11 + solid-js: 2.0.0-beta.6 transitivePeerDependencies: - csstype @@ -14923,6 +14859,13 @@ snapshots: solid-js: 1.9.11 vue: 3.5.16(typescript@5.9.3) + '@tanstack/devtools-utils@0.4.0(@types/react@19.1.6)(react@19.1.0)(solid-js@2.0.0-beta.6)(vue@3.5.16(typescript@5.9.3))': + optionalDependencies: + '@types/react': 19.1.6 + react: 19.1.0 + solid-js: 2.0.0-beta.6 + vue: 3.5.16(typescript@5.9.3) + '@tanstack/devtools@0.10.11(csstype@3.1.3)(solid-js@2.0.0-beta.6)': dependencies: '@solid-primitives/event-listener': 2.4.3(solid-js@2.0.0-beta.6) @@ -14939,17 +14882,17 @@ snapshots: - csstype - utf-8-validate - '@tanstack/devtools@0.6.21(csstype@3.1.3)(solid-js@1.9.11)': + '@tanstack/devtools@0.11.2(csstype@3.1.3)(solid-js@2.0.0-beta.6)': dependencies: - '@solid-primitives/event-listener': 2.4.3(solid-js@1.9.11) - '@solid-primitives/keyboard': 1.3.3(solid-js@1.9.11) - '@solid-primitives/resize-observer': 2.1.3(solid-js@1.9.11) - '@tanstack/devtools-client': 0.0.3 - '@tanstack/devtools-event-bus': 0.3.2 - '@tanstack/devtools-ui': 0.4.3(csstype@3.1.3)(solid-js@1.9.11) + '@solid-primitives/event-listener': 2.4.3(solid-js@2.0.0-beta.6) + '@solid-primitives/keyboard': 1.3.3(solid-js@2.0.0-beta.6) + '@solid-primitives/resize-observer': 2.1.3(solid-js@2.0.0-beta.6) + '@tanstack/devtools-client': 0.0.6 + '@tanstack/devtools-event-bus': 0.4.1 + '@tanstack/devtools-ui': 0.5.1(csstype@3.1.3)(solid-js@2.0.0-beta.6) clsx: 2.1.1 goober: 2.1.18(csstype@3.1.3) - solid-js: 1.9.11 + solid-js: 2.0.0-beta.6 transitivePeerDependencies: - bufferutil - csstype @@ -15152,10 +15095,10 @@ snapshots: - supports-color - vite - '@tanstack/solid-devtools@0.7.7(csstype@3.1.3)(solid-js@1.9.11)': + '@tanstack/solid-devtools@0.8.2(csstype@3.1.3)(solid-js@2.0.0-beta.6)': dependencies: - '@tanstack/devtools': 0.6.21(csstype@3.1.3)(solid-js@1.9.11) - solid-js: 1.9.11 + '@tanstack/devtools': 0.11.2(csstype@3.1.3)(solid-js@2.0.0-beta.6) + solid-js: 2.0.0-beta.6 transitivePeerDependencies: - bufferutil - csstype @@ -16320,16 +16263,6 @@ snapshots: find-up: 5.0.0 webpack: 5.101.2(@swc/core@1.13.5)(esbuild@0.25.9) - babel-plugin-jsx-dom-expressions@0.39.8(@babel/core@7.28.3): - dependencies: - '@babel/core': 7.28.3 - '@babel/helper-module-imports': 7.18.6 - '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.3) - '@babel/types': 7.28.5 - html-entities: 2.3.3 - parse5: 7.3.0 - validate-html-nesting: 1.2.2 - babel-plugin-jsx-dom-expressions@0.40.5(@babel/core@7.28.5): dependencies: '@babel/core': 7.28.5 @@ -16383,17 +16316,12 @@ snapshots: dependencies: '@babel/types': 7.28.2 - babel-preset-solid@1.9.10(@babel/core@7.28.5)(solid-js@1.9.11): + babel-preset-solid@1.9.10(@babel/core@7.28.5)(solid-js@2.0.0-beta.6): dependencies: '@babel/core': 7.28.5 babel-plugin-jsx-dom-expressions: 0.40.5(@babel/core@7.28.5) optionalDependencies: - solid-js: 1.9.11 - - babel-preset-solid@1.9.6(@babel/core@7.28.3): - dependencies: - '@babel/core': 7.28.3 - babel-plugin-jsx-dom-expressions: 0.39.8(@babel/core@7.28.3) + solid-js: 2.0.0-beta.6 babel-preset-solid@2.0.0-beta.6(@babel/core@7.28.5)(solid-js@2.0.0-beta.6): dependencies: @@ -20451,13 +20379,13 @@ snapshots: transitivePeerDependencies: - oxc-resolver - rolldown-plugin-solid@0.2.1(rolldown@1.0.0-rc.8)(solid-js@1.9.11): + rolldown-plugin-solid@0.2.1(rolldown@1.0.0-rc.8)(solid-js@2.0.0-beta.6): dependencies: '@babel/core': 7.28.5 '@babel/preset-typescript': 7.27.1(@babel/core@7.28.5) - babel-preset-solid: 1.9.10(@babel/core@7.28.5)(solid-js@1.9.11) + babel-preset-solid: 1.9.10(@babel/core@7.28.5)(solid-js@2.0.0-beta.6) rolldown: 1.0.0-rc.8 - solid-js: 1.9.11 + solid-js: 2.0.0-beta.6 transitivePeerDependencies: - supports-color @@ -20903,6 +20831,7 @@ snapshots: csstype: 3.1.3 seroval: 1.5.1 seroval-plugins: 1.5.1(seroval@1.5.1) + optional: true solid-js@2.0.0-beta.6: dependencies: @@ -20911,20 +20840,11 @@ snapshots: seroval: 1.5.1 seroval-plugins: 1.5.1(seroval@1.5.1) - solid-refresh@0.6.3(solid-js@1.9.11): - dependencies: - '@babel/generator': 7.28.3 - '@babel/helper-module-imports': 7.27.1 - '@babel/types': 7.28.2 - solid-js: 1.9.11 - transitivePeerDependencies: - - supports-color - solid-refresh@0.6.3(solid-js@2.0.0-beta.6): dependencies: - '@babel/generator': 7.28.3 + '@babel/generator': 7.29.1 '@babel/helper-module-imports': 7.27.1 - '@babel/types': 7.28.2 + '@babel/types': 7.29.0 solid-js: 2.0.0-beta.6 transitivePeerDependencies: - supports-color @@ -21735,26 +21655,11 @@ snapshots: dependencies: vite: 7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1) - vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@1.9.11)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)): - dependencies: - '@babel/core': 7.28.3 - '@types/babel__core': 7.20.5 - babel-preset-solid: 1.9.6(@babel/core@7.28.3) - merge-anything: 5.1.7 - solid-js: 1.9.11 - solid-refresh: 0.6.3(solid-js@1.9.11) - vite: 7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1) - vitefu: 1.1.1(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)) - optionalDependencies: - '@testing-library/jest-dom': 6.9.1 - transitivePeerDependencies: - - supports-color - vite-plugin-solid@2.11.10(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.6)(vite@7.2.2(@types/node@24.1.0)(jiti@2.6.1)(less@4.4.0)(sass@1.90.0)(sugarss@5.0.1(postcss@8.5.6))(terser@5.43.1)(tsx@4.19.4)(yaml@2.8.1)): dependencies: - '@babel/core': 7.28.3 + '@babel/core': 7.28.5 '@types/babel__core': 7.20.5 - babel-preset-solid: 1.9.6(@babel/core@7.28.3) + babel-preset-solid: 1.9.10(@babel/core@7.28.5)(solid-js@2.0.0-beta.6) merge-anything: 5.1.7 solid-js: 2.0.0-beta.6 solid-refresh: 0.6.3(solid-js@2.0.0-beta.6) From c08c8f659a492fc054cf65b0411a77319e81029b Mon Sep 17 00:00:00 2001 From: Brenley Dueck Date: Fri, 26 Jun 2026 19:23:39 -0500 Subject: [PATCH 3/4] chore(solid): bump vite-plugin-solid to 3.0.0-next.5 Co-Authored-By: Claude Opus 4.8 --- examples/solid/array/package.json | 2 +- examples/solid/devtools/package.json | 2 +- examples/solid/large-form/package.json | 2 +- examples/solid/simple/package.json | 2 +- examples/solid/standard-schema/package.json | 2 +- packages/solid-form/package.json | 2 +- pnpm-lock.yaml | 56 ++++++++++----------- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/examples/solid/array/package.json b/examples/solid/array/package.json index 3edbe40e5..c6197cb64 100644 --- a/examples/solid/array/package.json +++ b/examples/solid/array/package.json @@ -16,6 +16,6 @@ "@solidjs/web": "2.0.0-beta.15", "typescript": "5.9.3", "vite": "^7.2.2", - "vite-plugin-solid": "3.0.0-next.4" + "vite-plugin-solid": "3.0.0-next.5" } } diff --git a/examples/solid/devtools/package.json b/examples/solid/devtools/package.json index bc0e33495..0906cec70 100644 --- a/examples/solid/devtools/package.json +++ b/examples/solid/devtools/package.json @@ -18,6 +18,6 @@ "@solidjs/web": "2.0.0-beta.15", "typescript": "5.9.3", "vite": "^7.2.2", - "vite-plugin-solid": "3.0.0-next.4" + "vite-plugin-solid": "3.0.0-next.5" } } diff --git a/examples/solid/large-form/package.json b/examples/solid/large-form/package.json index 28327b022..0598c7ef4 100644 --- a/examples/solid/large-form/package.json +++ b/examples/solid/large-form/package.json @@ -16,6 +16,6 @@ "@solidjs/web": "2.0.0-beta.15", "typescript": "5.9.3", "vite": "^7.2.2", - "vite-plugin-solid": "3.0.0-next.4" + "vite-plugin-solid": "3.0.0-next.5" } } diff --git a/examples/solid/simple/package.json b/examples/solid/simple/package.json index 5e82c92ad..99de44841 100644 --- a/examples/solid/simple/package.json +++ b/examples/solid/simple/package.json @@ -16,6 +16,6 @@ "@solidjs/web": "2.0.0-beta.15", "typescript": "5.9.3", "vite": "^7.2.2", - "vite-plugin-solid": "3.0.0-next.4" + "vite-plugin-solid": "3.0.0-next.5" } } diff --git a/examples/solid/standard-schema/package.json b/examples/solid/standard-schema/package.json index a5b6f417c..ab5dcbfcc 100644 --- a/examples/solid/standard-schema/package.json +++ b/examples/solid/standard-schema/package.json @@ -22,6 +22,6 @@ "@solidjs/web": "2.0.0-beta.15", "typescript": "5.9.3", "vite": "^7.2.2", - "vite-plugin-solid": "3.0.0-next.4" + "vite-plugin-solid": "3.0.0-next.5" } } diff --git a/packages/solid-form/package.json b/packages/solid-form/package.json index be9b497c6..4910e133f 100644 --- a/packages/solid-form/package.json +++ b/packages/solid-form/package.json @@ -64,7 +64,7 @@ "@testing-library/dom": "^10.4.0", "solid-js": "2.0.0-beta.15", "vite": "^7.2.2", - "vite-plugin-solid": "3.0.0-next.4" + "vite-plugin-solid": "3.0.0-next.5" }, "peerDependencies": { "solid-js": ">=2.0.0-beta.15 <2.0.0-experimental.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b4934a8d0..123b75bab 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1106,7 +1106,7 @@ importers: version: 1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-start': specifier: ^1.134.9 - version: 1.168.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) + version: 1.168.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) '@tanstack/react-store': specifier: ^0.11.0 version: 0.11.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0) @@ -1228,8 +1228,8 @@ importers: specifier: ^7.2.2 version: 7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0) vite-plugin-solid: - specifier: 3.0.0-next.4 - version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) + specifier: 3.0.0-next.5 + version: 3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) examples/solid/devtools: dependencies: @@ -1256,8 +1256,8 @@ importers: specifier: ^7.2.2 version: 7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0) vite-plugin-solid: - specifier: 3.0.0-next.4 - version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) + specifier: 3.0.0-next.5 + version: 3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) examples/solid/large-form: dependencies: @@ -1278,8 +1278,8 @@ importers: specifier: ^7.2.2 version: 7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0) vite-plugin-solid: - specifier: 3.0.0-next.4 - version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) + specifier: 3.0.0-next.5 + version: 3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) examples/solid/multi-step-wizard: dependencies: @@ -1322,8 +1322,8 @@ importers: specifier: ^7.2.2 version: 7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0) vite-plugin-solid: - specifier: 3.0.0-next.4 - version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) + specifier: 3.0.0-next.5 + version: 3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) examples/solid/standard-schema: dependencies: @@ -1362,8 +1362,8 @@ importers: specifier: ^7.2.2 version: 7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0) vite-plugin-solid: - specifier: 3.0.0-next.4 - version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) + specifier: 3.0.0-next.5 + version: 3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) examples/svelte/array: dependencies: @@ -1812,7 +1812,7 @@ importers: devDependencies: '@tanstack/react-start': specifier: ^1.134.9 - version: 1.168.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) + version: 1.168.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) '@types/react': specifier: ~19.1.0 version: 19.1.17 @@ -1840,7 +1840,7 @@ importers: devDependencies: '@tanstack/react-start': specifier: ^1.134.9 - version: 1.168.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) + version: 1.168.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) '@types/react': specifier: ~19.1.0 version: 19.1.17 @@ -1871,7 +1871,7 @@ importers: devDependencies: '@tanstack/react-start': specifier: ^1.134.9 - version: 1.168.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) + version: 1.168.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) '@types/react': specifier: ~19.1.0 version: 19.1.17 @@ -1916,8 +1916,8 @@ importers: specifier: ^7.2.2 version: 7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0) vite-plugin-solid: - specifier: 3.0.0-next.4 - version: 3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) + specifier: 3.0.0-next.5 + version: 3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) packages/solid-form-devtools: dependencies: @@ -13876,8 +13876,8 @@ packages: '@testing-library/jest-dom': optional: true - vite-plugin-solid@3.0.0-next.4: - resolution: {integrity: sha512-6t2oUJs5H7UtFxw3tM/EC2mxHmzeOtMlnPI/HFkzDqy1XaDuGjbdhggSi7KbuhP0mWM7I+IktPDlu4SWuCFPKw==} + vite-plugin-solid@3.0.0-next.5: + resolution: {integrity: sha512-hcn3mzevQDv6Oyo/Zv5LXdOrlWwKGeGVxNhc9fUq3AcN9aO6KABy52yq5cvnPDo3qaxmvOJVbNS1H4V5rx7AQg==} peerDependencies: '@solidjs/web': '>=2.0.0-beta.0 <2.0.0-experimental.0' '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.* @@ -19916,7 +19916,7 @@ snapshots: react: 19.1.0 react-dom: 19.1.0(react@19.1.0) - '@tanstack/react-start-rsc@0.1.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15))': + '@tanstack/react-start-rsc@0.1.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15))': dependencies: '@tanstack/react-router': 1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-start-server': 1.167.9(react-dom@19.1.0(react@19.1.0))(react@19.1.0) @@ -19924,7 +19924,7 @@ snapshots: '@tanstack/router-utils': 1.162.1 '@tanstack/start-client-core': 1.170.4 '@tanstack/start-fn-stubs': 1.162.0 - '@tanstack/start-plugin-core': 1.171.6(@tanstack/react-router@1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) + '@tanstack/start-plugin-core': 1.171.6(@tanstack/react-router@1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) '@tanstack/start-server-core': 1.169.4 '@tanstack/start-storage-context': 1.167.8 pathe: 2.0.3 @@ -19950,15 +19950,15 @@ snapshots: transitivePeerDependencies: - crossws - '@tanstack/react-start@1.168.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15))': + '@tanstack/react-start@1.168.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15))': dependencies: '@tanstack/react-router': 1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-start-client': 1.168.4(react-dom@19.1.0(react@19.1.0))(react@19.1.0) - '@tanstack/react-start-rsc': 0.1.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) + '@tanstack/react-start-rsc': 0.1.13(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) '@tanstack/react-start-server': 1.167.9(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/router-utils': 1.162.1 '@tanstack/start-client-core': 1.170.4 - '@tanstack/start-plugin-core': 1.171.6(@tanstack/react-router@1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) + '@tanstack/start-plugin-core': 1.171.6(@tanstack/react-router@1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) '@tanstack/start-server-core': 1.169.4 pathe: 2.0.3 react: 19.1.0 @@ -20007,7 +20007,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@tanstack/router-plugin@1.168.11(@tanstack/react-router@1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15))': + '@tanstack/router-plugin@1.168.11(@tanstack/react-router@1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15))': dependencies: '@babel/core': 7.29.7 '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.7) @@ -20025,7 +20025,7 @@ snapshots: optionalDependencies: '@tanstack/react-router': 1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0) vite: 7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0) - vite-plugin-solid: 3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) + vite-plugin-solid: 3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) webpack: 5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15) transitivePeerDependencies: - supports-color @@ -20067,7 +20067,7 @@ snapshots: '@tanstack/start-fn-stubs@1.162.0': {} - '@tanstack/start-plugin-core@1.171.6(@tanstack/react-router@1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15))': + '@tanstack/start-plugin-core@1.171.6(@tanstack/react-router@1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15))': dependencies: '@babel/code-frame': 7.27.1 '@babel/core': 7.29.7 @@ -20075,7 +20075,7 @@ snapshots: '@rolldown/pluginutils': 1.0.1 '@tanstack/router-core': 1.171.6 '@tanstack/router-generator': 1.167.10 - '@tanstack/router-plugin': 1.168.11(@tanstack/react-router@1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) + '@tanstack/router-plugin': 1.168.11(@tanstack/react-router@1.170.8(react-dom@19.1.0(react@19.1.0))(react@19.1.0))(vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)))(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0))(webpack@5.105.2(@swc/core@1.15.40)(lightningcss@1.32.0)(postcss@8.5.15)) '@tanstack/router-utils': 1.162.1 '@tanstack/start-client-core': 1.170.4 '@tanstack/start-server-core': 1.169.4 @@ -28873,7 +28873,7 @@ snapshots: transitivePeerDependencies: - supports-color - vite-plugin-solid@3.0.0-next.4(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)): + vite-plugin-solid@3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)): dependencies: '@babel/core': 7.29.7 '@solidjs/web': 2.0.0-beta.15(solid-js@2.0.0-beta.15) From 1db6f685b80ee087aa725b89a7dd16ec7e5ded39 Mon Sep 17 00:00:00 2001 From: Brenley Dueck Date: Fri, 26 Jun 2026 19:58:33 -0500 Subject: [PATCH 4/4] fix(solid): adopt testing-library v2, keep devtools on v1, finish example beta migration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - solid-form: use @solidjs/testing-library@1.0.0-beta.2 (Solid 2 support) instead of the local testing-library shim; drop the now-unused vite alias and @testing-library/dom devDep. - Keep the Solid-based devtools chain (@tanstack/devtools, @tanstack/devtools-ui) on Solid v1 via a packageExtensions pin on @tanstack/react-devtools — these import `solid-js/web`, which no longer exists in Solid 2, so bundling them in (e.g. React) examples broke against the beta hoisted for solid-form. - sherif: ignore the intentional solid-js / vite-plugin-solid version splits (Solid v1 devtools vs Solid 2 beta solid-form/examples) and remove the dead root @solidjs/testing-library devDep. - Migrate the remaining solid examples to Solid 2 beta.15: jsxImportSource -> @solidjs/web for the beta examples, and bring multi-step-wizard onto beta (solid-js, @solidjs/web, vite-plugin-solid, and `solid-js/web` -> @solidjs/web). Co-Authored-By: Claude Opus 4.8 --- examples/solid/array/tsconfig.json | 2 +- examples/solid/devtools/tsconfig.json | 2 +- examples/solid/large-form/tsconfig.json | 2 +- examples/solid/multi-step-wizard/package.json | 5 +- .../solid/multi-step-wizard/src/index.tsx | 2 +- .../solid/multi-step-wizard/tsconfig.json | 2 +- examples/solid/simple/tsconfig.json | 2 +- examples/solid/standard-schema/tsconfig.json | 2 +- package.json | 3 +- packages/solid-form/package.json | 2 +- packages/solid-form/tests/testing-library.ts | 66 ---------- packages/solid-form/vite.config.ts | 10 -- pnpm-lock.yaml | 116 +++++++++++------- pnpm-workspace.yaml | 13 ++ 14 files changed, 100 insertions(+), 129 deletions(-) delete mode 100644 packages/solid-form/tests/testing-library.ts diff --git a/examples/solid/array/tsconfig.json b/examples/solid/array/tsconfig.json index 576a7f010..26e9875fe 100644 --- a/examples/solid/array/tsconfig.json +++ b/examples/solid/array/tsconfig.json @@ -13,7 +13,7 @@ "isolatedModules": true, "noEmit": true, "jsx": "preserve", - "jsxImportSource": "solid-js", + "jsxImportSource": "@solidjs/web", /* Linting */ "strict": true, diff --git a/examples/solid/devtools/tsconfig.json b/examples/solid/devtools/tsconfig.json index 576a7f010..26e9875fe 100644 --- a/examples/solid/devtools/tsconfig.json +++ b/examples/solid/devtools/tsconfig.json @@ -13,7 +13,7 @@ "isolatedModules": true, "noEmit": true, "jsx": "preserve", - "jsxImportSource": "solid-js", + "jsxImportSource": "@solidjs/web", /* Linting */ "strict": true, diff --git a/examples/solid/large-form/tsconfig.json b/examples/solid/large-form/tsconfig.json index 5e559e80f..2d91c4727 100644 --- a/examples/solid/large-form/tsconfig.json +++ b/examples/solid/large-form/tsconfig.json @@ -12,7 +12,7 @@ "isolatedModules": true, "noEmit": true, "jsx": "preserve", - "jsxImportSource": "solid-js", + "jsxImportSource": "@solidjs/web", /* Linting */ "strict": true, "noUnusedLocals": true, diff --git a/examples/solid/multi-step-wizard/package.json b/examples/solid/multi-step-wizard/package.json index 61eef3612..487180e81 100644 --- a/examples/solid/multi-step-wizard/package.json +++ b/examples/solid/multi-step-wizard/package.json @@ -10,12 +10,13 @@ }, "dependencies": { "@tanstack/solid-form": "^1.33.0", - "solid-js": "^1.9.9", + "solid-js": "2.0.0-beta.15", "zod": "^3.25.76" }, "devDependencies": { + "@solidjs/web": "2.0.0-beta.15", "typescript": "5.9.3", "vite": "^7.2.2", - "vite-plugin-solid": "^2.11.8" + "vite-plugin-solid": "3.0.0-next.5" } } diff --git a/examples/solid/multi-step-wizard/src/index.tsx b/examples/solid/multi-step-wizard/src/index.tsx index 88bb10c6c..0743af72c 100644 --- a/examples/solid/multi-step-wizard/src/index.tsx +++ b/examples/solid/multi-step-wizard/src/index.tsx @@ -1,5 +1,5 @@ /* @refresh reload */ -import { render } from 'solid-js/web' +import { render } from '@solidjs/web' import { WizardPage } from './features/wizard/page.tsx' function App() { diff --git a/examples/solid/multi-step-wizard/tsconfig.json b/examples/solid/multi-step-wizard/tsconfig.json index 576a7f010..26e9875fe 100644 --- a/examples/solid/multi-step-wizard/tsconfig.json +++ b/examples/solid/multi-step-wizard/tsconfig.json @@ -13,7 +13,7 @@ "isolatedModules": true, "noEmit": true, "jsx": "preserve", - "jsxImportSource": "solid-js", + "jsxImportSource": "@solidjs/web", /* Linting */ "strict": true, diff --git a/examples/solid/simple/tsconfig.json b/examples/solid/simple/tsconfig.json index 576a7f010..26e9875fe 100644 --- a/examples/solid/simple/tsconfig.json +++ b/examples/solid/simple/tsconfig.json @@ -13,7 +13,7 @@ "isolatedModules": true, "noEmit": true, "jsx": "preserve", - "jsxImportSource": "solid-js", + "jsxImportSource": "@solidjs/web", /* Linting */ "strict": true, diff --git a/examples/solid/standard-schema/tsconfig.json b/examples/solid/standard-schema/tsconfig.json index 850d4bf2e..36a794c18 100644 --- a/examples/solid/standard-schema/tsconfig.json +++ b/examples/solid/standard-schema/tsconfig.json @@ -13,7 +13,7 @@ "isolatedModules": true, "noEmit": true, "jsx": "preserve", - "jsxImportSource": "solid-js", + "jsxImportSource": "@solidjs/web", /* Linting */ "strict": true, diff --git a/package.json b/package.json index 190c8dc88..02c172e64 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "test:pr": "nx affected --targets=test:sherif,test:knip,test:docs,test:eslint,test:lib,test:types,test:build,build", "test:ci": "nx run-many --targets=test:sherif,test:knip,test:docs,test:eslint,test:lib,test:types,test:build,build", "test:eslint": "nx affected --target=test:eslint", - "test:sherif": "sherif", + "test:sherif": "sherif --ignore-dependency solid-js --ignore-dependency vite-plugin-solid", "test:lib": "nx affected --target=test:lib --exclude=examples/**", "test:lib:dev": "pnpm run test:lib && nx watch --all -- pnpm run test:lib", "test:build": "nx affected --target=test:build --exclude=examples/**", @@ -44,7 +44,6 @@ "@changesets/changelog-github": "^0.7.0", "@changesets/cli": "^2.29.8", "@eslint-react/eslint-plugin": "^1.53.1", - "@solidjs/testing-library": "^0.8.10", "@tanstack/eslint-config": "0.3.2", "@tanstack/typedoc-config": "0.3.1", "@tanstack/vite-config": "0.4.1", diff --git a/packages/solid-form/package.json b/packages/solid-form/package.json index 4910e133f..636db7e00 100644 --- a/packages/solid-form/package.json +++ b/packages/solid-form/package.json @@ -60,8 +60,8 @@ "@tanstack/solid-store": "^0.9.1" }, "devDependencies": { + "@solidjs/testing-library": "1.0.0-beta.2", "@solidjs/web": "2.0.0-beta.15", - "@testing-library/dom": "^10.4.0", "solid-js": "2.0.0-beta.15", "vite": "^7.2.2", "vite-plugin-solid": "3.0.0-next.5" diff --git a/packages/solid-form/tests/testing-library.ts b/packages/solid-form/tests/testing-library.ts deleted file mode 100644 index 0cfc6e126..000000000 --- a/packages/solid-form/tests/testing-library.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { getQueriesForElement, prettyDOM } from '@testing-library/dom' -import { createComponent, flush } from 'solid-js' -import { render as solidRender } from '@solidjs/web' -import type { JSX } from '@solidjs/web' - -export * from '@testing-library/dom' - -type RenderRef = { - container: HTMLElement - dispose: () => void -} - -const mountedContainers = new Set() - -export function render( - ui: () => JSX.Element, - options: { - container?: HTMLElement - baseElement?: HTMLElement - queries?: Parameters[1] - } = {}, -) { - const baseElement = options.baseElement ?? document.body - const container = - options.container ?? baseElement.appendChild(document.createElement('div')) - - const dispose = solidRender(() => createComponent(ui, {}), container) - flush() - mountedContainers.add({ container, dispose }) - - const queryHelpers = getQueriesForElement(container, options.queries) - - return { - asFragment: () => container.innerHTML, - baseElement, - container, - debug: ( - el: Element | Element[] = baseElement, - maxLength?: number, - debugOptions?: Parameters[2], - ) => { - if (Array.isArray(el)) { - el.forEach((entry) => - console.log(prettyDOM(entry, maxLength, debugOptions)), - ) - return - } - - console.log(prettyDOM(el, maxLength, debugOptions)) - }, - unmount: dispose, - ...queryHelpers, - } -} - -export function cleanup() { - for (const ref of Array.from(mountedContainers)) { - ref.dispose() - - if (ref.container.parentNode === document.body) { - document.body.removeChild(ref.container) - } - - mountedContainers.delete(ref) - } -} diff --git a/packages/solid-form/vite.config.ts b/packages/solid-form/vite.config.ts index 7ad6ee711..048f2cc9f 100644 --- a/packages/solid-form/vite.config.ts +++ b/packages/solid-form/vite.config.ts @@ -1,20 +1,10 @@ import { defineConfig, mergeConfig } from 'vitest/config' import { tanstackViteConfig } from '@tanstack/vite-config' -import { fileURLToPath } from 'node:url' import solid from 'vite-plugin-solid' import packageJson from './package.json' -const testingLibraryPath = fileURLToPath( - new URL('./tests/testing-library.ts', import.meta.url), -) - const config = defineConfig({ plugins: [solid()], - resolve: { - alias: [ - { find: '@solidjs/testing-library', replacement: testingLibraryPath }, - ], - }, test: { name: packageJson.name, dir: './tests', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 123b75bab..51cf0ed60 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,6 +7,8 @@ settings: overrides: tinyexec: 1.1.2 +packageExtensionsChecksum: sha256-F5ECc7d4wZ4SbP237XjDNyllF0wv/027WoVN7cTmcfM= + importers: .: @@ -20,9 +22,6 @@ importers: '@eslint-react/eslint-plugin': specifier: ^1.53.1 version: 1.53.1(eslint@9.36.0(jiti@2.7.0))(ts-api-utils@2.5.0(typescript@5.9.3))(typescript@5.9.3) - '@solidjs/testing-library': - specifier: ^0.8.10 - version: 0.8.10(solid-js@2.0.0-beta.15) '@tanstack/eslint-config': specifier: 0.3.2 version: 0.3.2(@typescript-eslint/utils@8.59.4(eslint@9.36.0(jiti@2.7.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.10)(eslint@9.36.0(jiti@2.7.0))(typescript@5.9.3) @@ -531,7 +530,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -593,7 +592,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -624,7 +623,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -655,7 +654,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -795,7 +794,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -826,7 +825,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -860,7 +859,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -959,7 +958,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -1036,7 +1035,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -1079,7 +1078,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -1119,7 +1118,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -1186,7 +1185,7 @@ importers: devDependencies: '@tanstack/react-devtools': specifier: ^0.9.7 - version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15) + version: 0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) '@tanstack/react-form-devtools': specifier: ^0.2.29 version: link:../../../packages/react-form-devtools @@ -1287,12 +1286,15 @@ importers: specifier: ^1.33.0 version: link:../../../packages/solid-form solid-js: - specifier: ^1.9.9 - version: 1.9.13 + specifier: 2.0.0-beta.15 + version: 2.0.0-beta.15 zod: specifier: ^3.25.76 version: 3.25.76 devDependencies: + '@solidjs/web': + specifier: 2.0.0-beta.15 + version: 2.0.0-beta.15(solid-js@2.0.0-beta.15) typescript: specifier: 5.9.3 version: 5.9.3 @@ -1300,8 +1302,8 @@ importers: specifier: ^7.2.2 version: 7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0) vite-plugin-solid: - specifier: ^2.11.8 - version: 2.11.12(@testing-library/jest-dom@6.9.1)(solid-js@1.9.13)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) + specifier: 3.0.0-next.5 + version: 3.0.0-next.5(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(@testing-library/jest-dom@6.9.1)(solid-js@2.0.0-beta.15)(vite@7.3.3(@types/node@24.12.4)(jiti@2.7.0)(less@4.6.4)(lightningcss@1.32.0)(sass@1.100.0)(sugarss@5.0.1(postcss@8.5.15))(terser@5.48.0)(yaml@2.9.0)) examples/solid/simple: dependencies: @@ -1903,12 +1905,12 @@ importers: specifier: ^0.9.1 version: 0.9.3(solid-js@2.0.0-beta.15) devDependencies: + '@solidjs/testing-library': + specifier: 1.0.0-beta.2 + version: 1.0.0-beta.2(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(solid-js@2.0.0-beta.15) '@solidjs/web': specifier: 2.0.0-beta.15 version: 2.0.0-beta.15(solid-js@2.0.0-beta.15) - '@testing-library/dom': - specifier: ^10.4.0 - version: 10.4.1 solid-js: specifier: 2.0.0-beta.15 version: 2.0.0-beta.15 @@ -6407,15 +6409,12 @@ packages: '@solidjs/signals@2.0.0-beta.15': resolution: {integrity: sha512-lw4a4frNajnmVjILbyfrgJ4ksqU+YKhkepZ8glKK9Q68O3zq7W8qDLOtsz5v1mt0o3TB11/rozJFpgMTmnYegg==} - '@solidjs/testing-library@0.8.10': - resolution: {integrity: sha512-qdeuIerwyq7oQTIrrKvV0aL9aFeuwTd86VYD3afdq5HYEwoox1OBTJy4y8A3TFZr8oAR0nujYgCzY/8wgHGfeQ==} + '@solidjs/testing-library@1.0.0-beta.2': + resolution: {integrity: sha512-TLhQ5IUT/fdDfqa4X2rkQWB28Y+zEwi6mK/TVTeiQlEHG63eK2jfgwNYf2NtQoPh2c3ihLilsCzxABiSTP3JoQ==} engines: {node: '>= 14'} peerDependencies: - '@solidjs/router': '>=0.9.0' - solid-js: '>=1.0.0' - peerDependenciesMeta: - '@solidjs/router': - optional: true + '@solidjs/web': '>=2.0.0' + solid-js: '>=2.0.0' '@solidjs/web@2.0.0-beta.15': resolution: {integrity: sha512-+LvmzzN5CHxQ+TeCGgA8DKuB8S4t0EHVlmDUlAp4hkLnh7My3ZGuKYHKWsFMd8w08nPgF6LdBZkH+c5iNcmcSA==} @@ -19589,11 +19588,23 @@ snapshots: dependencies: '@sinonjs/commons': 3.0.1 + '@solid-primitives/event-listener@2.4.5(solid-js@1.9.13)': + dependencies: + '@solid-primitives/utils': 6.4.0(solid-js@1.9.13) + solid-js: 1.9.13 + '@solid-primitives/event-listener@2.4.5(solid-js@2.0.0-beta.15)': dependencies: '@solid-primitives/utils': 6.4.0(solid-js@2.0.0-beta.15) solid-js: 2.0.0-beta.15 + '@solid-primitives/keyboard@1.3.5(solid-js@1.9.13)': + dependencies: + '@solid-primitives/event-listener': 2.4.5(solid-js@1.9.13) + '@solid-primitives/rootless': 1.5.3(solid-js@1.9.13) + '@solid-primitives/utils': 6.4.0(solid-js@1.9.13) + solid-js: 1.9.13 + '@solid-primitives/keyboard@1.3.5(solid-js@2.0.0-beta.15)': dependencies: '@solid-primitives/event-listener': 2.4.5(solid-js@2.0.0-beta.15) @@ -19601,6 +19612,14 @@ snapshots: '@solid-primitives/utils': 6.4.0(solid-js@2.0.0-beta.15) solid-js: 2.0.0-beta.15 + '@solid-primitives/resize-observer@2.1.5(solid-js@1.9.13)': + dependencies: + '@solid-primitives/event-listener': 2.4.5(solid-js@1.9.13) + '@solid-primitives/rootless': 1.5.3(solid-js@1.9.13) + '@solid-primitives/static-store': 0.1.3(solid-js@1.9.13) + '@solid-primitives/utils': 6.4.0(solid-js@1.9.13) + solid-js: 1.9.13 + '@solid-primitives/resize-observer@2.1.5(solid-js@2.0.0-beta.15)': dependencies: '@solid-primitives/event-listener': 2.4.5(solid-js@2.0.0-beta.15) @@ -19609,24 +19628,39 @@ snapshots: '@solid-primitives/utils': 6.4.0(solid-js@2.0.0-beta.15) solid-js: 2.0.0-beta.15 + '@solid-primitives/rootless@1.5.3(solid-js@1.9.13)': + dependencies: + '@solid-primitives/utils': 6.4.0(solid-js@1.9.13) + solid-js: 1.9.13 + '@solid-primitives/rootless@1.5.3(solid-js@2.0.0-beta.15)': dependencies: '@solid-primitives/utils': 6.4.0(solid-js@2.0.0-beta.15) solid-js: 2.0.0-beta.15 + '@solid-primitives/static-store@0.1.3(solid-js@1.9.13)': + dependencies: + '@solid-primitives/utils': 6.4.0(solid-js@1.9.13) + solid-js: 1.9.13 + '@solid-primitives/static-store@0.1.3(solid-js@2.0.0-beta.15)': dependencies: '@solid-primitives/utils': 6.4.0(solid-js@2.0.0-beta.15) solid-js: 2.0.0-beta.15 + '@solid-primitives/utils@6.4.0(solid-js@1.9.13)': + dependencies: + solid-js: 1.9.13 + '@solid-primitives/utils@6.4.0(solid-js@2.0.0-beta.15)': dependencies: solid-js: 2.0.0-beta.15 '@solidjs/signals@2.0.0-beta.15': {} - '@solidjs/testing-library@0.8.10(solid-js@2.0.0-beta.15)': + '@solidjs/testing-library@1.0.0-beta.2(@solidjs/web@2.0.0-beta.15(solid-js@2.0.0-beta.15))(solid-js@2.0.0-beta.15)': dependencies: + '@solidjs/web': 2.0.0-beta.15(solid-js@2.0.0-beta.15) '@testing-library/dom': 10.4.1 solid-js: 2.0.0-beta.15 @@ -19782,12 +19816,12 @@ snapshots: '@tanstack/devtools-event-client@0.5.0': {} - '@tanstack/devtools-ui@0.5.0(csstype@3.2.3)(solid-js@2.0.0-beta.15)': + '@tanstack/devtools-ui@0.5.0(csstype@3.2.3)(solid-js@1.9.13)': dependencies: clsx: 2.1.1 dayjs: 1.11.20 goober: 2.1.19(csstype@3.2.3) - solid-js: 2.0.0-beta.15 + solid-js: 1.9.13 transitivePeerDependencies: - csstype @@ -19817,17 +19851,17 @@ snapshots: solid-js: 1.9.13 vue: 3.5.34(typescript@5.9.3) - '@tanstack/devtools@0.10.14(csstype@3.2.3)(solid-js@2.0.0-beta.15)': + '@tanstack/devtools@0.10.14(csstype@3.2.3)(solid-js@1.9.13)': dependencies: - '@solid-primitives/event-listener': 2.4.5(solid-js@2.0.0-beta.15) - '@solid-primitives/keyboard': 1.3.5(solid-js@2.0.0-beta.15) - '@solid-primitives/resize-observer': 2.1.5(solid-js@2.0.0-beta.15) + '@solid-primitives/event-listener': 2.4.5(solid-js@1.9.13) + '@solid-primitives/keyboard': 1.3.5(solid-js@1.9.13) + '@solid-primitives/resize-observer': 2.1.5(solid-js@1.9.13) '@tanstack/devtools-client': 0.0.6 '@tanstack/devtools-event-bus': 0.4.1 - '@tanstack/devtools-ui': 0.5.0(csstype@3.2.3)(solid-js@2.0.0-beta.15) + '@tanstack/devtools-ui': 0.5.0(csstype@3.2.3)(solid-js@1.9.13) clsx: 2.1.1 goober: 2.1.19(csstype@3.2.3) - solid-js: 2.0.0-beta.15 + solid-js: 1.9.13 transitivePeerDependencies: - bufferutil - csstype @@ -19881,17 +19915,17 @@ snapshots: '@tanstack/query-core@5.100.14': {} - '@tanstack/react-devtools@0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(solid-js@2.0.0-beta.15)': + '@tanstack/react-devtools@0.9.13(@types/react-dom@19.2.3(@types/react@19.1.17))(@types/react@19.1.17)(csstype@3.2.3)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)': dependencies: - '@tanstack/devtools': 0.10.14(csstype@3.2.3)(solid-js@2.0.0-beta.15) + '@tanstack/devtools': 0.10.14(csstype@3.2.3)(solid-js@1.9.13) '@types/react': 19.1.17 '@types/react-dom': 19.2.3(@types/react@19.1.17) react: 19.1.0 react-dom: 19.1.0(react@19.1.0) + solid-js: 1.9.13 transitivePeerDependencies: - bufferutil - csstype - - solid-js - utf-8-validate '@tanstack/react-query@5.100.14(react@19.1.0)': diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 76a3449cc..4bbbbf1b8 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -15,6 +15,19 @@ trustPolicyExclude: # Too young to use currently, upgrade in a few days overrides: { 'tinyexec': '1.1.2' } +# Keep the Solid-based devtools chain on Solid v1: `@tanstack/devtools` and +# `@tanstack/devtools-ui` import `solid-js/web`, which no longer exists in +# Solid 2. Their `solid-js` peer is `>=1.9.7`, which the 2.0.0-beta.x used by +# solid-form also satisfies, so with auto-install-peers pnpm would resolve the +# devtools' peer to the beta and break any (e.g. React) example that bundles +# them. `@tanstack/react-devtools` (the dependent that pulls in `@tanstack/ +# devtools`) declares no solid-js itself, so we pin one to v1 here; that makes +# the `@tanstack/devtools` peer — and its whole Solid subtree — resolve to v1. +packageExtensions: + '@tanstack/react-devtools': + dependencies: + solid-js: '^1.9.9' + packages: - packages/** - examples/angular/**