Skip to content

Commit 21954ff

Browse files
committed
Updated ESLint.
1 parent bd9623e commit 21954ff

26 files changed

+477
-423
lines changed

.eslintrc.cjs

-23
This file was deleted.

electron.vite.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default defineConfig({
3838
],
3939
server: {
4040
fs: {
41-
allow: [join(__dirname, '..')]
41+
allow: [join(import.meta.dirname, '..')]
4242
}
4343
}
4444
}

eslint.config.js

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// @ts-check
2+
3+
import eslint from '@eslint/js'
4+
import skipFormatting from '@vue/eslint-config-prettier/skip-formatting'
5+
import vueTsEslintConfig from '@vue/eslint-config-typescript'
6+
import pluginVue from 'eslint-plugin-vue'
7+
import tseslint from 'typescript-eslint'
8+
import vueParser from 'vue-eslint-parser'
9+
10+
export default [
11+
...pluginVue.configs['flat/essential'],
12+
eslint.configs.recommended,
13+
skipFormatting,
14+
...tseslint.configs.strictTypeChecked,
15+
...tseslint.configs.stylisticTypeChecked,
16+
...vueTsEslintConfig(),
17+
{
18+
languageOptions: {
19+
parser: vueParser,
20+
parserOptions: {
21+
parser: {
22+
ts: tseslint.parser
23+
},
24+
projectService: {
25+
allowDefaultProject: ['res/*.js', 'src/renderer/*.js', '*.js']
26+
},
27+
tsconfigRootDir: import.meta.dirname
28+
}
29+
}
30+
},
31+
{
32+
name: 'app/files-to-lint',
33+
files: ['**/*.{js,ts,vue}']
34+
},
35+
{
36+
name: 'app/files-to-ignore',
37+
ignores: ['out/**']
38+
}
39+
]

package.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"dev:web": "(cd ./src/renderer && vite dev)",
2929
"format": "prettier --write . && clang-format -i src/libopencor/src/*",
3030
"format:check": "prettier --check . && clang-format --dry-run -Werror src/libopencor/src/*",
31-
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
31+
"lint": "eslint --fix .",
3232
"package": "pnpm build && electron-builder",
3333
"package:linux": "pnpm build && electron-builder --linux",
3434
"package:mac": "pnpm build && electron-builder --mac",
@@ -50,15 +50,13 @@
5050
"primevue": "^4.2.5"
5151
},
5252
"devDependencies": {
53-
"@electron-toolkit/eslint-config": "^1.0.2",
54-
"@electron-toolkit/eslint-config-ts": "^2.0.0",
5553
"@electron-toolkit/tsconfig": "^1.0.1",
54+
"@eslint/js": "^9.17.0",
5655
"@primevue/auto-import-resolver": "^4.2.5",
57-
"@rushstack/eslint-patch": "^1.10.4",
5856
"@types/node": "^22.10.5",
5957
"@vitejs/plugin-vue": "^5.2.1",
60-
"@vue/eslint-config-prettier": "^9.0.0",
61-
"@vue/eslint-config-typescript": "^13.0.0",
58+
"@vue/eslint-config-prettier": "^10.1.0",
59+
"@vue/eslint-config-typescript": "^14.2.0",
6260
"@vue/tsconfig": "^0.5.1",
6361
"@wasm-fmt/clang-format": "^19.1.6",
6462
"autoprefixer": "^10.4.20",
@@ -67,7 +65,7 @@
6765
"electron-builder": "^25.1.8",
6866
"electron-builder-squirrel-windows": "^25.1.8",
6967
"electron-vite": "^2.3.0",
70-
"eslint": "^8.57.1",
68+
"eslint": "^9.17.0",
7169
"eslint-plugin-vue": "^9.32.0",
7270
"node-addon-api": "^8.3.0",
7371
"postcss": "^8.4.49",
@@ -76,6 +74,7 @@
7674
"tailwindcss": "^3.4.17",
7775
"tailwindcss-primeui": "^0.3.4",
7876
"typescript": "^5.7.2",
77+
"typescript-eslint": "^8.19.0",
7978
"unplugin-vue-components": "^0.27.5",
8079
"vite": "^5.4.11",
8180
"vue": "^3.5.13",

0 commit comments

Comments
 (0)