From 6bd13851d9568d5d68be8742bc4481a3fa27e036 Mon Sep 17 00:00:00 2001 From: Frost-ZX Date: Sun, 19 Jul 2026 17:15:00 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=20prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.prettierignore | 6 --- app/.prettierrc.yaml | 4 -- app/.vscode/settings.json | 12 +----- app/README.md | 4 -- app/eslint.config.mjs | 22 +++++----- app/package.json | 3 -- app/pnpm-lock.yaml | 88 --------------------------------------- 7 files changed, 13 insertions(+), 126 deletions(-) delete mode 100644 app/.prettierignore delete mode 100644 app/.prettierrc.yaml diff --git a/app/.prettierignore b/app/.prettierignore deleted file mode 100644 index 9c6b791..0000000 --- a/app/.prettierignore +++ /dev/null @@ -1,6 +0,0 @@ -out -dist -pnpm-lock.yaml -LICENSE.md -tsconfig.json -tsconfig.*.json diff --git a/app/.prettierrc.yaml b/app/.prettierrc.yaml deleted file mode 100644 index 35893b3..0000000 --- a/app/.prettierrc.yaml +++ /dev/null @@ -1,4 +0,0 @@ -singleQuote: true -semi: false -printWidth: 100 -trailingComma: none diff --git a/app/.vscode/settings.json b/app/.vscode/settings.json index 4c05394..0967ef4 100644 --- a/app/.vscode/settings.json +++ b/app/.vscode/settings.json @@ -1,11 +1 @@ -{ - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - } -} +{} diff --git a/app/README.md b/app/README.md index 56df592..aa01f59 100644 --- a/app/README.md +++ b/app/README.md @@ -2,10 +2,6 @@ An Electron application with Vue -## Recommended IDE Setup - -- [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) - ## Project Setup ### Install diff --git a/app/eslint.config.mjs b/app/eslint.config.mjs index 40ca4e8..16e1413 100644 --- a/app/eslint.config.mjs +++ b/app/eslint.config.mjs @@ -1,10 +1,11 @@ import eslintConfig from '@electron-toolkit/eslint-config' -import eslintConfigPrettier from '@electron-toolkit/eslint-config-prettier' import eslintPluginVue from 'eslint-plugin-vue' import vueParser from 'vue-eslint-parser' export default [ - { ignores: ['**/node_modules', '**/dist', '**/out'] }, + { + ignores: ['**/node_modules', '**/dist', '**/out'], + }, eslintConfig, ...eslintPluginVue.configs['flat/recommended'], { @@ -13,18 +14,19 @@ export default [ parser: vueParser, parserOptions: { ecmaFeatures: { - jsx: true + jsx: true, }, - extraFileExtensions: ['.vue'] - } - } + extraFileExtensions: ['.vue'], + }, + }, }, { files: ['**/*.{js,jsx,vue}'], rules: { + 'vue/multi-word-component-names': 'off', + 'vue/multiline-html-element-content-newline': 'off', 'vue/require-default-prop': 'off', - 'vue/multi-word-component-names': 'off' - } + 'vue/singleline-html-element-content-newline': 'off', + }, }, - eslintConfigPrettier -] +]; diff --git a/app/package.json b/app/package.json index fd4e53e..9f1c941 100644 --- a/app/package.json +++ b/app/package.json @@ -6,7 +6,6 @@ "author": "example.com", "homepage": "https://electron-vite.org", "scripts": { - "format": "prettier --write .", "lint": "eslint --cache .", "start": "electron-vite preview", "dev": "electron-vite dev", @@ -24,7 +23,6 @@ }, "devDependencies": { "@electron-toolkit/eslint-config": "^2.1.0", - "@electron-toolkit/eslint-config-prettier": "^3.0.0", "@vitejs/plugin-vue": "^6.0.2", "electron": "^39.2.6", "electron-builder": "^26.0.12", @@ -32,7 +30,6 @@ "eslint": "^9.39.1", "eslint-plugin-vue": "^10.6.2", "naive-ui": "^2.44.1", - "prettier": "^3.7.4", "vite": "^7.2.6", "vue": "^3.5.25", "vue-eslint-parser": "^10.2.0" diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 2365ceb..0ffed17 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -21,9 +21,6 @@ importers: '@electron-toolkit/eslint-config': specifier: ^2.1.0 version: 2.1.0(eslint@9.39.5(jiti@2.7.0)) - '@electron-toolkit/eslint-config-prettier': - specifier: ^3.0.0 - version: 3.0.0(eslint@9.39.5(jiti@2.7.0))(prettier@3.9.5) '@vitejs/plugin-vue': specifier: ^6.0.2 version: 6.0.8(vite@7.3.6(@types/node@26.1.1)(jiti@2.7.0))(vue@3.5.39) @@ -45,9 +42,6 @@ importers: naive-ui: specifier: ^2.44.1 version: 2.44.1(vue@3.5.39) - prettier: - specifier: ^3.7.4 - version: 3.9.5 vite: specifier: ^7.2.6 version: 7.3.6(@types/node@26.1.1)(jiti@2.7.0) @@ -151,12 +145,6 @@ packages: peerDependencies: vue: ^3.0.11 - '@electron-toolkit/eslint-config-prettier@3.0.0': - resolution: {integrity: sha512-YapmIOVkbYdHLuTa+ad1SAVtcqYL9A/SJsc7cxQokmhcwAwonGevNom37jBf9slXegcZ/Slh01I/JARG1yhNFw==} - peerDependencies: - eslint: '>= 9.0.0' - prettier: '>= 3.0.0' - '@electron-toolkit/eslint-config@2.1.0': resolution: {integrity: sha512-F/r45x5wDHs8r2RSkXwcrMYo9X4lkc/W+ZTlWzOzjXn7ncirMqVo256BCAogeNBWIxd24ePsSwmJXELiQZUZUg==} peerDependencies: @@ -638,10 +626,6 @@ packages: resolution: {integrity: sha512-ODOov0sGMJMf3jPonOkgGqPknTsu+DdQ7kD++gz8aI+aFMOMHFbWAA2taqXXVTdP+OTOQR/znGvSpmkeI0WTYQ==} engines: {node: '>=14.18.0'} - '@pkgr/core@0.3.6': - resolution: {integrity: sha512-SEeaJLb3qBNF/OaXnaR1NmmBbFYk1zC0ZH/52fATcRPLFg/p791YrcyFFy44Bo9sLaGuSuLp5Q6axbb/O+v/RA==} - engines: {node: ^14.18.0 || >=16.0.0} - '@rolldown/pluginutils@1.0.1': resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==} @@ -1285,26 +1269,6 @@ packages: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} - eslint-config-prettier@10.1.8: - resolution: {integrity: sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==} - hasBin: true - peerDependencies: - eslint: '>=7.0.0' - - eslint-plugin-prettier@5.5.6: - resolution: {integrity: sha512-ifetmTcxWfz+4qRW3pH/ujdTq2jQIj59AxJMIN26K5avYgU8dxycUETQonWiW+wPrYXA0j3Try0l1CnwVQtDqQ==} - engines: {node: ^14.18.0 || >=16.0.0} - peerDependencies: - '@types/eslint': '>=8.0.0' - eslint: '>=8.0.0' - eslint-config-prettier: '>= 7.0.0 <10.0.0 || >=10.1.0' - prettier: '>=3.0.0' - peerDependenciesMeta: - '@types/eslint': - optional: true - eslint-config-prettier: - optional: true - eslint-plugin-vue@10.9.2: resolution: {integrity: sha512-4g7ZP3pYcuqd7Zp0pzUKcos0W+RkjBz4EGdhJ92FcYk6v03Ti/GK5NwjgsjxHK+98eXDbHeK7VtX1az7/8doZA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -1398,9 +1362,6 @@ packages: fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - fast-diff@1.3.0: - resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} - fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} @@ -1929,15 +1890,6 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - prettier-linter-helpers@1.0.1: - resolution: {integrity: sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==} - engines: {node: '>=6.0.0'} - - prettier@3.9.5: - resolution: {integrity: sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg==} - engines: {node: '>=14'} - hasBin: true - proc-log@6.1.0: resolution: {integrity: sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==} engines: {node: ^20.17.0 || >=22.9.0} @@ -2148,10 +2100,6 @@ packages: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} - synckit@0.11.13: - resolution: {integrity: sha512-eNRKgb3z66Yp3D2CixVujOUvXLFUTij/zVnV8KRyvFdQwpz7I5DS8UfRkTeLzb64u+dkzDSdelE24izu+zSSUg==} - engines: {node: ^14.18.0 || >=16.0.0} - tar@7.5.20: resolution: {integrity: sha512-9FcyK4PA6+WbzlTM9WhQm6vB5W7cP7dUiPsv1g7YDwEQnQ1CGpK3MGlKk/ITVWMk05kHZuBhmVhiv8LZoy/PFQ==} engines: {node: '>=18'} @@ -2511,15 +2459,6 @@ snapshots: dependencies: vue: 3.5.39 - '@electron-toolkit/eslint-config-prettier@3.0.0(eslint@9.39.5(jiti@2.7.0))(prettier@3.9.5)': - dependencies: - eslint: 9.39.5(jiti@2.7.0) - eslint-config-prettier: 10.1.8(eslint@9.39.5(jiti@2.7.0)) - eslint-plugin-prettier: 5.5.6(eslint-config-prettier@10.1.8(eslint@9.39.5(jiti@2.7.0)))(eslint@9.39.5(jiti@2.7.0))(prettier@3.9.5) - prettier: 3.9.5 - transitivePeerDependencies: - - '@types/eslint' - '@electron-toolkit/eslint-config@2.1.0(eslint@9.39.5(jiti@2.7.0))': dependencies: '@eslint/js': 9.39.5 @@ -2911,8 +2850,6 @@ snapshots: tslib: 2.8.1 webcrypto-core: 1.9.2 - '@pkgr/core@0.3.6': {} - '@rolldown/pluginutils@1.0.1': {} '@rollup/rollup-android-arm-eabi@4.62.2': @@ -3642,19 +3579,6 @@ snapshots: escape-string-regexp@4.0.0: {} - eslint-config-prettier@10.1.8(eslint@9.39.5(jiti@2.7.0)): - dependencies: - eslint: 9.39.5(jiti@2.7.0) - - eslint-plugin-prettier@5.5.6(eslint-config-prettier@10.1.8(eslint@9.39.5(jiti@2.7.0)))(eslint@9.39.5(jiti@2.7.0))(prettier@3.9.5): - dependencies: - eslint: 9.39.5(jiti@2.7.0) - prettier: 3.9.5 - prettier-linter-helpers: 1.0.1 - synckit: 0.11.13 - optionalDependencies: - eslint-config-prettier: 10.1.8(eslint@9.39.5(jiti@2.7.0)) - eslint-plugin-vue@10.9.2(eslint@9.39.5(jiti@2.7.0))(vue-eslint-parser@10.4.1(eslint@9.39.5(jiti@2.7.0))): dependencies: '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.5(jiti@2.7.0)) @@ -3771,8 +3695,6 @@ snapshots: fast-deep-equal@3.1.3: {} - fast-diff@1.3.0: {} - fast-json-stable-stringify@2.1.0: {} fast-levenshtein@2.0.6: {} @@ -4330,12 +4252,6 @@ snapshots: prelude-ls@1.2.1: {} - prettier-linter-helpers@1.0.1: - dependencies: - fast-diff: 1.3.0 - - prettier@3.9.5: {} - proc-log@6.1.0: {} process-nextick-args@2.0.1: {} @@ -4558,10 +4474,6 @@ snapshots: dependencies: has-flag: 4.0.0 - synckit@0.11.13: - dependencies: - '@pkgr/core': 0.3.6 - tar@7.5.20: dependencies: '@isaacs/fs-minipass': 4.0.1