WIP: feat(solid-form): support Solid 2 beta

examples/solid/array/package.json

@@ -10,11 +10,12 @@
   },
   "dependencies": {
     "@tanstack/solid-form": "^1.33.0",
-    "solid-js": "^1.9.9"
+    "solid-js": "2.0.0-beta.15"
   },
   "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"
   }
 }

examples/solid/array/src/index.tsx

@@ -1,8 +1,8 @@
 /* @refresh reload */
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
 
 import { createForm } from '@tanstack/solid-form'
-import { Index, Show } from 'solid-js'
+import { Repeat, Show } from 'solid-js'
 
 function App() {
   const form = createForm(() => ({
@@ -26,8 +26,8 @@ function App() {
             <div>
               <Show when={field().state.value.length > 0}>
                 {/* Do not change this to For or the test will fail */}
-                <Index each={field().state.value}>
-                  {(_, i) => (
+                <Repeat count={field().state.value.length}>
+                  {(i) => (
                     <form.Field name={`people[${i}].name`}>
                       {(subField) => (
                         <div>
@@ -44,7 +44,7 @@ function App() {
                       )}
                     </form.Field>
                   )}
-                </Index>
+                </Repeat>
               </Show>
 
               <button

examples/solid/array/tsconfig.json

@@ -13,7 +13,7 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "jsxImportSource": "@solidjs/web",
 
     /* Linting */
     "strict": true,

examples/solid/devtools/package.json

@@ -9,14 +9,15 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-devtools": "^0.7.7",
+    "@tanstack/solid-devtools": "^0.8.2",
     "@tanstack/solid-form": "^1.33.0",
     "@tanstack/solid-form-devtools": "workspace:*",
-    "solid-js": "^1.9.9"
+    "solid-js": "2.0.0-beta.15"
   },
   "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"
   }
 }

examples/solid/devtools/src/index.tsx

@@ -1,5 +1,5 @@
 // lib
-import { render } from 'solid-js/web'
+import { render } from '@solidjs/web'
 
 import { TanStackDevtools } from '@tanstack/solid-devtools'
 import { formDevtoolsPlugin } from '@tanstack/solid-form-devtools'

examples/solid/devtools/tsconfig.json

@@ -13,7 +13,7 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "jsxImportSource": "@solidjs/web",
 
     /* Linting */
     "strict": true,

examples/solid/large-form/package.json

@@ -10,11 +10,12 @@
   },
   "dependencies": {
     "@tanstack/solid-form": "^1.33.0",
-    "solid-js": "^1.9.9"
+    "solid-js": "2.0.0-beta.15"
   },
   "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"
   }
 }

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.tsx'
 
 export default function App() {
   return (
-    <Suspense fallback={<p>Loading...</p>}>
+    <Loading fallback={<p>Loading...</p>}>
       <PeoplePage />
-    </Suspense>
+    </Loading>
   )
 }

examples/solid/large-form/src/components/text-fields.tsx

@@ -17,7 +17,7 @@ export default function TextField(props: { label: string }) {
         />
       </label>
       <For each={errors()}>
-        {(error) => <div style={{ color: 'red' }}>{error}</div>}
+        {(error) => <div style={{ color: 'red' }}>{error()}</div>}
       </For>
     </div>
   )

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')

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,

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"
   }
 }

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() {

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,

examples/solid/simple/package.json

@@ -10,11 +10,12 @@
   },
   "dependencies": {
     "@tanstack/solid-form": "^1.33.0",
-    "solid-js": "^1.9.9"
+    "solid-js": "2.0.0-beta.15"
   },
   "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"
   }
 }

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'

examples/solid/simple/tsconfig.json

@@ -13,7 +13,7 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "jsxImportSource": "@solidjs/web",
 
     /* Linting */
     "strict": true,

examples/solid/standard-schema/package.json

@@ -14,13 +14,14 @@
     "effect": "^3.17.14",
     "react": "19.1.0",
     "react-dom": "19.1.0",
-    "solid-js": "^1.9.9",
+    "solid-js": "2.0.0-beta.15",
     "valibot": "^1.1.0",
     "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"
   }
 }

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'
 

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,

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",

packages/solid-form-devtools/package.json

@@ -58,6 +58,7 @@
     "@tanstack/form-devtools": "workspace:*"
   },
   "devDependencies": {
+    "solid-js": "^1.9.9",
     "vite-plugin-solid": "^2.11.8"
   }
 }

packages/solid-form/package.json

@@ -31,21 +31,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"
@@ -57,14 +57,16 @@
   ],
   "dependencies": {
     "@tanstack/form-core": "workspace:*",
-    "@tanstack/solid-store": "^0.11.0"
+    "@tanstack/solid-store": "^0.9.1"
   },
   "devDependencies": {
-    "solid-js": "^1.9.9",
+    "@solidjs/testing-library": "1.0.0-beta.2",
+    "@solidjs/web": "2.0.0-beta.15",
+    "solid-js": "2.0.0-beta.15",
     "vite": "^7.2.2",
-    "vite-plugin-solid": "^2.11.8"
+    "vite-plugin-solid": "3.0.0-next.5"
   },
   "peerDependencies": {
-    "solid-js": ">=1.9.9"
+    "solid-js": ">=2.0.0-beta.15 <2.0.0-experimental.0"
   }
 }