Skip to content

Commit 95d5802

Browse files
committed
Migrate UI configs to ESM; update UI package
Rename UI config files from .ts to .mjs (eslint.config, rsbuild.config, uno.config) to use ESM config modules. Simplify ESLint config by removing the Vitest plugin/config and unused comments. Remove several tsconfig variants (app/node/vitest) and update tsconfig.json accordingly. Adjust package.json: change build script to expose a separate build-only task, bump @types/node, and remove various testing/style dev deps. Update pnpm lockfile to reflect dependency changes.
1 parent b3732b7 commit 95d5802

9 files changed

Lines changed: 43 additions & 941 deletions
Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
import unocss from '@unocss/eslint-config/flat'
2-
import pluginVitest from '@vitest/eslint-plugin'
32
import skipFormatting from '@vue/eslint-config-prettier/skip-formatting'
43
import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript'
54
import pluginOxlint from 'eslint-plugin-oxlint'
65
import pluginVue from 'eslint-plugin-vue'
76
import { globalIgnores } from 'eslint/config'
87

9-
// To allow more languages other than `ts` in `.vue` files, uncomment the following lines:
10-
// import { configureVueProject } from '@vue/eslint-config-typescript'
11-
// configureVueProject({ scriptLangs: ['ts', 'tsx'] })
12-
// More info at https://github.com/vuejs/eslint-config-typescript/#advanced-setup
13-
148
export default defineConfigWithVueTs(
159
unocss,
1610

@@ -27,10 +21,6 @@ export default defineConfigWithVueTs(
2721
pluginVue.configs['flat/essential'],
2822
vueTsConfigs.recommended,
2923

30-
{
31-
...pluginVitest.configs.recommended,
32-
files: ['src/**/__tests__/*'],
33-
},
3424
...pluginOxlint.configs['flat/recommended'],
3525
skipFormatting,
3626
)

ui/package.json

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"type": "module",
33
"scripts": {
4-
"build-with-check": "run-p type-check \"build-only {@}\" --",
5-
"build": "rsbuild build",
4+
"build": "run-p type-check \"build-only {@}\" --",
5+
"build-only": "rsbuild build",
66
"dev": "rsbuild build --watch --env-mode=development",
77
"lint:oxlint": "oxlint . --fix -D correctness --ignore-path ../.gitignore",
88
"lint:eslint": "eslint . --fix",
@@ -36,29 +36,22 @@
3636
"@iconify-json/ri": "^1.2.10",
3737
"@rsbuild/core": "^2.0.6",
3838
"@rsbuild/plugin-sass": "^1.5.2",
39-
"@tsconfig/node20": "^20.1.9",
40-
"@types/jsdom": "^21.1.7",
41-
"@types/node": "^20.19.41",
39+
"@types/node": "^24.12.4",
4240
"@unocss/eslint-config": "^66.6.8",
4341
"@unocss/webpack": "^66.6.8",
44-
"@vitest/eslint-plugin": "^1.6.17",
4542
"@vue/eslint-config-prettier": "^10.2.0",
4643
"@vue/eslint-config-typescript": "^14.7.0",
47-
"@vue/test-utils": "^2.4.10",
4844
"@vue/tsconfig": "^0.7.0",
4945
"eslint": "^9.39.4",
5046
"eslint-plugin-oxlint": "^0.16.12",
5147
"eslint-plugin-vue": "~10.0.1",
52-
"jsdom": "^26.1.0",
5348
"npm-run-all2": "^7.0.2",
5449
"oxlint": "^0.16.12",
5550
"prettier": "^3.8.3",
5651
"prettier-plugin-organize-imports": "^4.3.0",
57-
"sass": "^1.99.0",
5852
"typescript": "~5.8.3",
5953
"unocss": "^66.6.8",
6054
"unplugin-icons": "^23.0.1",
61-
"vitest": "^4.1.6",
6255
"vue-tsc": "^3.2.9"
6356
},
6457
"packageManager": "pnpm@10.33.4"

ui/pnpm-lock.yaml

Lines changed: 29 additions & 869 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { rsbuildConfig } from '@halo-dev/ui-plugin-bundler-kit'
22
import { pluginSass } from '@rsbuild/plugin-sass'
33
import { UnoCSSRspackPlugin } from '@unocss/webpack/rspack'
44
import Icons from 'unplugin-icons/rspack'
5-
import type { RsbuildConfig } from '@rsbuild/core'
65

76
const MANIFEST_PATH = '../app/src/main/resources/plugin.yaml'
87
const OUT_DIR_PROD = './build/dist'
@@ -31,11 +30,11 @@ export default rsbuildConfig({
3130
plugins: [
3231
Icons({ compiler: 'vue3' }),
3332
UnoCSSRspackPlugin({
34-
configFile: './uno.config.ts',
33+
configFile: './uno.config.mjs',
3534
}),
3635
],
3736
},
3837
},
3938
}
4039
},
41-
}) as RsbuildConfig
40+
})

ui/tsconfig.app.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

ui/tsconfig.json

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
{
2-
"files": [],
3-
"references": [
4-
{
5-
"path": "./tsconfig.node.json"
6-
},
7-
{
8-
"path": "./tsconfig.app.json"
9-
},
10-
{
11-
"path": "./tsconfig.vitest.json"
2+
"extends": "@vue/tsconfig/tsconfig.dom.json",
3+
"include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
4+
"exclude": ["src/**/__tests__/*"],
5+
"compilerOptions": {
6+
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
7+
8+
"paths": {
9+
"@/*": ["./src/*"]
1210
}
13-
]
11+
}
1412
}

ui/tsconfig.node.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

ui/tsconfig.vitest.json

Lines changed: 0 additions & 11 deletions
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)