From c25deb21d607d7de1f35cc6a3acb98f0f91ab34e Mon Sep 17 00:00:00 2001
From: Brendan Allan <brendonovich@outlook.com>
Date: Wed, 10 Jul 2024 12:28:38 +0800
Subject: [PATCH] chore: build solid-form for source, esm & cjs

---
 packages/solid-form/package.json        | 20 ++++++++++++--------
 packages/solid-form/tsconfig.build.json |  2 +-
 packages/solid-form/vite.config.ts      | 13 +++++++++++--
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/packages/solid-form/package.json b/packages/solid-form/package.json
index 04751f66b..dfe6c2b04 100644
--- a/packages/solid-form/package.json
+++ b/packages/solid-form/package.json
@@ -27,21 +27,25 @@
     "test:lib": "vitest",
     "test:lib:dev": "pnpm run test:lib --watch",
     "test:build": "publint --strict",
-    "build": "tsc -p tsconfig.build.json"
+    "build": "vite build && tsc -p tsconfig.build.json"
   },
   "type": "module",
-  "types": "dist/index.d.ts",
-  "main": "dist/index.jsx",
-  "module": "dist/index.jsx",
+  "types": "dist/esm/index.d.ts",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
   "exports": {
     ".": {
       "solid": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.jsx"
+        "types": "./dist/source/index.d.ts",
+        "default": "./dist/source/index.jsx"
       },
       "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.jsx"
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.cts",
+        "default": "./dist/cjs/index.cjs"
       }
     },
     "./package.json": "./package.json"
diff --git a/packages/solid-form/tsconfig.build.json b/packages/solid-form/tsconfig.build.json
index 1fe6972f2..14414d318 100644
--- a/packages/solid-form/tsconfig.build.json
+++ b/packages/solid-form/tsconfig.build.json
@@ -5,7 +5,7 @@
     "jsxImportSource": "solid-js",
     "moduleResolution": "Bundler",
     "rootDir": "src",
-    "outDir": "dist",
+    "outDir": "dist/source",
     "noEmit": false,
     "declaration": true,
     "sourceMap": true,
diff --git a/packages/solid-form/vite.config.ts b/packages/solid-form/vite.config.ts
index 4783c542d..14ab01c19 100644
--- a/packages/solid-form/vite.config.ts
+++ b/packages/solid-form/vite.config.ts
@@ -1,8 +1,9 @@
-import { defineConfig } from 'vitest/config'
+import { defineConfig, mergeConfig } from 'vitest/config'
+import { tanstackViteConfig } from '@tanstack/config/vite'
 import solid from 'vite-plugin-solid'
 import packageJson from './package.json'
 
-export default defineConfig({
+const config = defineConfig({
   plugins: [solid()],
   test: {
     name: packageJson.name,
@@ -14,3 +15,11 @@ export default defineConfig({
     typecheck: { enabled: true },
   },
 })
+
+export default mergeConfig(
+  config,
+  tanstackViteConfig({
+    entry: ['./src/index.tsx'],
+    srcDir: './src',
+  }),
+)