feat: more relax types for merging

Author: coderwyd

.github/workflows/ci.yml

@@ -31,25 +31,3 @@ jobs:
 
       - name: Lint
         run: nr lint
-
-  typecheck:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2
-
-      - name: Set node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-
-      - name: Setup
-        run: npm i -g @antfu/ni
-
-      - name: Install
-        run: nci
-
-      - name: Typecheck
-        run: nr typecheck

.gitignore

@@ -82,3 +82,5 @@ _fixtures
 
 .temp
 .history
+
+src/typegen.d.ts

eslint.config.js

@@ -1,12 +1,10 @@
-import 'tsx'
-import { createRequire } from 'node:module'
+import JITI from 'jiti'
 
-const require = createRequire(import.meta.url)
-require('sucrase/register')
-
-const { defineConfig } = require('./src/index.ts')
-
-// import { defineConfig } from './dist/index.js'
+const jiti = JITI(import.meta.url)
+/**
+ * @type {import('./src').default}
+ */
+const { defineConfig } = jiti('./src')
 
 export default defineConfig(
   {

package.json

@@ -37,10 +37,11 @@
     "node": ">=16.14.0"
   },
   "scripts": {
-    "build": "tsup",
-    "dev": "tsup --format esm,cjs --watch & eslint-flat-config-viewer",
+    "build": "nr typegen && tsup",
+    "dev": "tsup --format esm,cjs --watch & npx @eslint/config-inspector",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
+    "typegen": "tsx scripts/typegen.ts",
     "prepack": "nr build",
     "prepare": "simple-git-hooks",
     "release": "bumpp && pnpm publish",
@@ -76,11 +77,7 @@
     }
   },
   "dependencies": {
-    "@antfu/eslint-define-config": "1.23.0-2",
-    "@antfu/install-pkg": "^0.3.1",
-    "@eslint-types/jsdoc": "48.2.1",
-    "@eslint-types/typescript-eslint": "^7.2.0",
-    "@eslint-types/unicorn": "^51.0.1",
+    "@antfu/install-pkg": "^0.3.2",
     "@toml-tools/parser": "^1.0.0",
     "@typescript-eslint/eslint-plugin": "^7.4.0",
     "@typescript-eslint/parser": "^7.4.0",
@@ -89,7 +86,7 @@
     "eslint-plugin-antfu": "^2.1.2",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import-x": "^0.4.4",
-    "eslint-plugin-jsdoc": "^48.2.1",
+    "eslint-plugin-jsdoc": "^48.2.2",
     "eslint-plugin-jsonc": "^2.14.1",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-no-only-tests": "^3.1.0",
@@ -98,8 +95,9 @@
     "eslint-plugin-tailwindcss": "^3.15.1",
     "eslint-plugin-unicorn": "^51.0.1",
     "eslint-plugin-unused-imports": "^3.1.0",
-    "eslint-plugin-vitest": "^0.4.0",
+    "eslint-plugin-vitest": "^0.4.1",
     "eslint-plugin-vue": "^9.24.0",
+    "eslint-typegen": "^0.2.0",
     "globals": "^15.0.0",
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^0.5.0",
@@ -113,25 +111,26 @@
   },
   "devDependencies": {
     "@antfu/ni": "^0.21.12",
+    "@eslint/config-inspector": "^0.1.0",
     "@types/eslint": "^8.56.6",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.12.2",
     "@types/prompts": "^2.4.9",
     "@types/yargs": "^17.0.32",
-    "@unocss/eslint-plugin": "^0.58.7",
+    "@unocss/eslint-plugin": "^0.58.8",
     "bumpp": "^9.4.0",
     "eslint": "9.0.0-rc.0",
-    "eslint-flat-config-viewer": "^0.1.14",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
-    "eslint-plugin-svelte": "^2.35.1",
+    "eslint-plugin-svelte": "2.36.0-next.13",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
     "lint-staged": "^15.2.2",
     "rimraf": "^5.0.5",
     "simple-git-hooks": "^2.11.1",
+    "svelte": "^4.2.12",
     "svelte-eslint-parser": "^0.33.1",
     "tsup": "^8.0.2",
     "tsx": "^4.7.1",