chore: Tidy up solid-form build, use tsc for lit-form (#762)

lachlancollins · web-flow · commit 34cb249a0313 · 2024-06-20T13:42:24.000+10:00
diff --git a/packages/angular-form/tsconfig.json b/packages/angular-form/tsconfig.json
@@ -11,7 +11,6 @@
     "experimentalDecorators": true,
     "moduleResolution": "node",
     "module": "ES2022",
-    "types": ["vitest/globals"],
     "paths": {
       "@tanstack/form-core": ["../form-core/src"]
     }
diff --git a/packages/lit-form/.eslintrc.cjs b/packages/lit-form/.eslintrc.cjs
@@ -5,7 +5,7 @@ const config = {
   extends: ['plugin:react/recommended', 'plugin:react-hooks/recommended'],
   parserOptions: {
     tsconfigRootDir: __dirname,
-    project: './tsconfig.eslint.json',
+    project: './tsconfig.json',
   },
   rules: {
     'react/jsx-key': ['error', { checkFragmentShorthand: true }],
diff --git a/packages/lit-form/package.json b/packages/lit-form/package.json
@@ -18,25 +18,21 @@
     "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",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "exports": {
     ".": {
       "import": {
-        "types": "./dist/esm/index.d.ts",
-        "default": "./dist/esm/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/index.d.cts",
-        "default": "./dist/cjs/index.cjs"
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
       }
     },
     "./package.json": "./package.json"
diff --git a/packages/lit-form/tests/simple.test.ts b/packages/lit-form/tests/simple.test.ts
@@ -1,6 +1,7 @@
 /// <reference lib="dom" />
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import '@testing-library/jest-dom'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 import { TestForm, sampleData } from './simple'
 
 window.customElements.define('test-form', TestForm)
diff --git a/packages/lit-form/tests/simple.ts b/packages/lit-form/tests/simple.ts
@@ -1,6 +1,6 @@
 import { LitElement, html } from 'lit'
-import { TanStackFormController } from '../index.js'
-import type { FieldApi, FormOptions } from '../index.js'
+import { TanStackFormController } from '../src/index.js'
+import type { FieldApi, FormOptions } from '../src/index.js'
 
 interface Employee {
   firstName: string
diff --git a/packages/lit-form/tsconfig.build.json b/packages/lit-form/tsconfig.build.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "moduleResolution": "Bundler",
+    "rootDir": "src",
+    "outDir": "dist",
+    "noEmit": false,
+    "declaration": true,
+    "sourceMap": true
+  },
+  "include": ["src"]
+}
diff --git a/packages/lit-form/tsconfig.eslint.json b/packages/lit-form/tsconfig.eslint.json
diff --git a/packages/lit-form/tsconfig.json b/packages/lit-form/tsconfig.json
@@ -1,12 +1,7 @@
 {
-  "composite": true,
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "lib": ["DOM"],
-    "outDir": "./build/lib",
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "types": ["vitest/globals"]
+    "moduleResolution": "Bundler"
   },
-  "include": ["src"]
+  "include": ["src", "tests", ".eslintrc.cjs", "vite.config.ts"]
 }
diff --git a/packages/lit-form/vite.config.ts b/packages/lit-form/vite.config.ts
@@ -1,22 +1,14 @@
-import { defineConfig, mergeConfig } from 'vitest/config'
-import { tanstackBuildConfig } from '@tanstack/config/build'
+import { defineConfig } from 'vitest/config'
+import packageJson from './package.json'
 
-const config = defineConfig({
+export default defineConfig({
   test: {
-    name: 'lit-form',
-    dir: './src',
+    name: packageJson.name,
+    dir: './tests',
     watch: false,
     environment: 'jsdom',
     globals: true,
     coverage: { enabled: true, provider: 'istanbul', include: ['src/**/*'] },
     typecheck: { enabled: true },
   },
 })
-export default mergeConfig(
-  config,
-  tanstackBuildConfig({
-    entry: './src/index.ts',
-    srcDir: './src',
-    exclude: ['./src/tests'],
-  }),
-)
diff --git a/packages/solid-form/package.json b/packages/solid-form/package.json
@@ -32,6 +32,7 @@
   ],
   "type": "module",
   "types": "dist/index.d.ts",
+  "main": "dist/index.js",
   "module": "dist/index.js",
   "exports": {
     ".": {
diff --git a/packages/solid-form/tests/createField.test-d.tsx b/packages/solid-form/tests/createField.test-d.tsx
@@ -1,5 +1,5 @@
 import { assertType, it } from 'vitest'
-import { createForm } from '../createForm'
+import { createForm } from '../src/createForm'
 
 it('should type state.value properly', () => {
   function Comp() {
diff --git a/packages/solid-form/tests/createField.test.tsx b/packages/solid-form/tests/createField.test.tsx
@@ -1,9 +1,9 @@
 import { describe, expect, it, vi } from 'vitest'
 import { render, waitFor } from '@solidjs/testing-library'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 import '@testing-library/jest-dom/vitest'
-import { Index, Show, createEffect } from 'solid-js'
-import { createForm } from '../index'
+import { Index, Show } from 'solid-js'
+import { createForm } from '../src/index'
 import { sleep } from './utils'
 
 const user = userEvent.setup()
diff --git a/packages/solid-form/tests/createForm.test.tsx b/packages/solid-form/tests/createForm.test.tsx
@@ -1,8 +1,8 @@
 import { describe, expect, it, vi } from 'vitest'
 import { render, screen, waitFor } from '@solidjs/testing-library'
-import userEvent from '@testing-library/user-event'
+import { userEvent } from '@testing-library/user-event'
 import { Show, createSignal, onCleanup } from 'solid-js'
-import { createForm } from '../index'
+import { createForm } from '../src/index'
 import { sleep } from './utils'
 import type { ValidationErrorMap } from '@tanstack/form-core'
 
diff --git a/packages/solid-form/tests/utils.ts b/packages/solid-form/tests/utils.ts
diff --git a/packages/solid-form/tsconfig.build.json b/packages/solid-form/tsconfig.build.json
@@ -4,15 +4,14 @@
     "jsx": "preserve",
     "jsxImportSource": "solid-js",
     "moduleResolution": "Bundler",
-    "paths": {
-      "@tanstack/form-core": ["../../form-core/src"]
-    },
+    "rootDir": "src",
     "outDir": "dist",
     "noEmit": false,
     "declaration": true,
-    "rootDir": "src",
-    "sourceMap": true
+    "sourceMap": true,
+    "paths": {
+      "@tanstack/form-core": ["../../form-core/src"]
+    }
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx"],
-  "exclude": ["src/tests/**"]
+  "include": ["src"]
 }
diff --git a/packages/solid-form/tsconfig.json b/packages/solid-form/tsconfig.json
@@ -9,8 +9,8 @@
     }
   },
   "include": [
-    "src/**/*.ts",
-    "src/**/*.tsx",
+    "src",
+    "tests",
     ".eslintrc.cjs",
     "test-setup.ts",
     "vite.config.ts"
diff --git a/packages/solid-form/tsconfig.legacy.json b/packages/solid-form/tsconfig.legacy.json
@@ -8,6 +8,5 @@
       "@tanstack/form-core": ["../form-core/src"]
     }
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx"],
-  "exclude": ["src/tests/**"]
+  "include": ["src"]
 }
diff --git a/packages/solid-form/vite.config.ts b/packages/solid-form/vite.config.ts
@@ -1,25 +1,16 @@
-import { defineConfig, mergeConfig } from 'vitest/config'
-import { tanstackBuildConfig } from '@tanstack/config/build'
+import { defineConfig } from 'vitest/config'
 import solid from 'vite-plugin-solid'
+import packageJson from './package.json'
 
-const config = defineConfig({
+export default defineConfig({
   plugins: [solid()],
   test: {
-    name: 'solid-form',
-    dir: './src',
+    name: packageJson.name,
+    dir: './tests',
     watch: false,
     environment: 'jsdom',
     setupFiles: ['test-setup.ts'],
     coverage: { enabled: true, provider: 'istanbul', include: ['src/**/*'] },
     typecheck: { enabled: true },
   },
 })
-
-export default mergeConfig(
-  config,
-  tanstackBuildConfig({
-    entry: './src/index.ts',
-    srcDir: './src',
-    exclude: ['./src/tests'],
-  }),
-)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`"experimentalDecorators": true,`
`12`	`12`	`"moduleResolution": "node",`
`13`	`13`	`"module": "ES2022",`
`14`		`- "types": ["vitest/globals"],`
`15`	`14`	`"paths": {`
`16`	`15`	`"@tanstack/form-core": ["../form-core/src"]`
`17`	`16`	`}`