diff --git a/nx.json b/nx.json
index fbc68106d..c922c643a 100644
--- a/nx.json
+++ b/nx.json
@@ -1,7 +1,7 @@
 {
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "defaultBase": "main",
-  "neverConnectToCloud": true,
+  "nxCloudAccessToken": "OTI3Y2U3NGQtYzQ3ZC00ZmE3LWJjZWQtYTYxOTEyNmNiN2IyfHJlYWQtb25seQ==",
   "useInferencePlugins": false,
   "parallel": 5,
   "namedInputs": {
diff --git a/packages/solid-form/package.json b/packages/solid-form/package.json
index a9e256e4d..ecec8f33f 100644
--- a/packages/solid-form/package.json
+++ b/packages/solid-form/package.json
@@ -24,25 +24,24 @@
     "test:lib": "vitest",
     "test:lib:dev": "pnpm run test:lib --watch",
     "test:build": "publint --strict",
-    "build": "vite build"
+    "build": "tsc -p tsconfig.build.json"
   },
   "files": [
     "dist",
     "src"
   ],
   "type": "module",
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/cjs/index.cjs",
-  "module": "dist/esm/index.js",
+  "types": "dist/index.d.ts",
+  "module": "dist/index.js",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/esm/index.d.ts",
-        "default": "./dist/esm/index.js"
+      "solid": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
       },
-      "require": {
-        "types": "./dist/cjs/index.d.cts",
-        "default": "./dist/cjs/index.cjs"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
       }
     },
     "./package.json": "./package.json"
diff --git a/packages/solid-form/tsconfig.build.json b/packages/solid-form/tsconfig.build.json
new file mode 100644
index 000000000..fb799aeb7
--- /dev/null
+++ b/packages/solid-form/tsconfig.build.json
@@ -0,0 +1,18 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "jsx": "preserve",
+    "jsxImportSource": "solid-js",
+    "moduleResolution": "Bundler",
+    "paths": {
+      "@tanstack/form-core": ["../../form-core/src"]
+    },
+    "outDir": "dist",
+    "noEmit": false,
+    "declaration": true,
+    "rootDir": "src",
+    "sourceMap": true
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
+  "exclude": ["src/tests/**"]
+}