From 71b029b073302fa1873b33f4acdfdeb54a240cdc Mon Sep 17 00:00:00 2001 From: Marsn3 Date: Fri, 28 Mar 2025 06:07:54 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20refactor:=20Switch=20formatter?= =?UTF-8?q?=20to=20prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/eslint.config.ts | 22 +++---- src/frontend/index.html | 8 +-- src/frontend/package.json | 10 ++- src/frontend/pnpm-lock.yaml | 66 +++++++++++++++++++- src/frontend/src/App.vue | 44 ++++++------- src/frontend/src/components/stats.vue | 4 +- src/frontend/src/main.ts | 8 +-- src/frontend/src/types/global.ts | 90 +++++++++++++-------------- src/frontend/tsconfig.app.json | 15 +---- src/frontend/vite.config.ts | 20 +++--- 10 files changed, 169 insertions(+), 118 deletions(-) diff --git a/src/frontend/eslint.config.ts b/src/frontend/eslint.config.ts index 2db585e..aab6828 100644 --- a/src/frontend/eslint.config.ts +++ b/src/frontend/eslint.config.ts @@ -1,7 +1,7 @@ -import pluginVue from 'eslint-plugin-vue' -import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript' -import oxlint from 'eslint-plugin-oxlint' -import skipFormatting from '@vue/eslint-config-prettier/skip-formatting' +import pluginVue from "eslint-plugin-vue"; +import { defineConfigWithVueTs, vueTsConfigs } from "@vue/eslint-config-typescript"; +import oxlint from "eslint-plugin-oxlint"; +import skipFormatting from "@vue/eslint-config-prettier/skip-formatting"; // To allow more languages other than `ts` in `.vue` files, uncomment the following lines: // import { configureVueProject } from '@vue/eslint-config-typescript' @@ -10,17 +10,17 @@ import skipFormatting from '@vue/eslint-config-prettier/skip-formatting' export default defineConfigWithVueTs( { - name: 'app/files-to-lint', - files: ['**/*.{ts,mts,tsx,vue}'], + name: "app/files-to-lint", + files: ["**/*.{ts,mts,tsx,vue}"], }, { - name: 'app/files-to-ignore', - ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**'], + name: "app/files-to-ignore", + ignores: ["**/dist/**", "**/dist-ssr/**", "**/coverage/**"], }, - pluginVue.configs['flat/essential'], + pluginVue.configs["flat/essential"], vueTsConfigs.recommended, - oxlint.configs['flat/recommended'], + oxlint.configs["flat/recommended"], skipFormatting, -) +); diff --git a/src/frontend/index.html b/src/frontend/index.html index 9e5fc8f..9d30802 100644 --- a/src/frontend/index.html +++ b/src/frontend/index.html @@ -1,9 +1,9 @@ - + - - - + + + Vite App diff --git a/src/frontend/package.json b/src/frontend/package.json index 84cbeb3..15d4d92 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -20,6 +20,11 @@ "tailwindcss": "^4.0.9", "vue": "^3.5.13" }, + "prettier": { + "plugins": [ + "tailwindcss" + ] + }, "devDependencies": { "@tsconfig/node22": "^22.0.0", "@types/node": "^22.10.7", @@ -28,13 +33,14 @@ "@vue/eslint-config-typescript": "^14.3.0", "@vue/tsconfig": "^0.7.0", "daisyui": "^5.0.6", - "eslint": "^9.18.0", + "eslint": "^9.20.1", "eslint-plugin-oxlint": "^0.15.6", "eslint-plugin-vue": "^9.32.0", "jiti": "^2.4.2", "npm-run-all2": "^7.0.2", "oxlint": "^0.15.6", - "prettier": "^3.4.2", + "prettier": "^3.5.0", + "prettier-plugin-tailwindcss": "^0.6.11", "typescript": "~5.7.3", "vite": "^6.0.11", "vite-plugin-vue-devtools": "^7.7.0", diff --git a/src/frontend/pnpm-lock.yaml b/src/frontend/pnpm-lock.yaml index ec9a6f3..be4879e 100644 --- a/src/frontend/pnpm-lock.yaml +++ b/src/frontend/pnpm-lock.yaml @@ -43,7 +43,7 @@ importers: specifier: ^5.0.6 version: 5.0.6 eslint: - specifier: ^9.18.0 + specifier: ^9.20.1 version: 9.20.1(jiti@2.4.2) eslint-plugin-oxlint: specifier: ^0.15.6 @@ -61,8 +61,11 @@ importers: specifier: ^0.15.6 version: 0.15.10 prettier: - specifier: ^3.4.2 + specifier: ^3.5.0 version: 3.5.0 + prettier-plugin-tailwindcss: + specifier: ^0.6.11 + version: 0.6.11(prettier@3.5.0) typescript: specifier: ~5.7.3 version: 5.7.3 @@ -1555,6 +1558,61 @@ packages: resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} engines: {node: '>=6.0.0'} + prettier-plugin-tailwindcss@0.6.11: + resolution: {integrity: sha512-YxaYSIvZPAqhrrEpRtonnrXdghZg1irNg4qrjboCXrpybLWVs55cW2N3juhspVJiO0JBvYJT8SYsJpc8OQSnsA==} + engines: {node: '>=14.21.3'} + peerDependencies: + '@ianvs/prettier-plugin-sort-imports': '*' + '@prettier/plugin-pug': '*' + '@shopify/prettier-plugin-liquid': '*' + '@trivago/prettier-plugin-sort-imports': '*' + '@zackad/prettier-plugin-twig': '*' + prettier: ^3.0 + prettier-plugin-astro: '*' + prettier-plugin-css-order: '*' + prettier-plugin-import-sort: '*' + prettier-plugin-jsdoc: '*' + prettier-plugin-marko: '*' + prettier-plugin-multiline-arrays: '*' + prettier-plugin-organize-attributes: '*' + prettier-plugin-organize-imports: '*' + prettier-plugin-sort-imports: '*' + prettier-plugin-style-order: '*' + prettier-plugin-svelte: '*' + peerDependenciesMeta: + '@ianvs/prettier-plugin-sort-imports': + optional: true + '@prettier/plugin-pug': + optional: true + '@shopify/prettier-plugin-liquid': + optional: true + '@trivago/prettier-plugin-sort-imports': + optional: true + '@zackad/prettier-plugin-twig': + optional: true + prettier-plugin-astro: + optional: true + prettier-plugin-css-order: + optional: true + prettier-plugin-import-sort: + optional: true + prettier-plugin-jsdoc: + optional: true + prettier-plugin-marko: + optional: true + prettier-plugin-multiline-arrays: + optional: true + prettier-plugin-organize-attributes: + optional: true + prettier-plugin-organize-imports: + optional: true + prettier-plugin-sort-imports: + optional: true + prettier-plugin-style-order: + optional: true + prettier-plugin-svelte: + optional: true + prettier@3.5.0: resolution: {integrity: sha512-quyMrVt6svPS7CjQ9gKb3GLEX/rl3BCL2oa/QkNcXv4YNVBC9olt3s+H7ukto06q7B1Qz46PbrKLO34PR6vXcA==} engines: {node: '>=14'} @@ -3265,6 +3323,10 @@ snapshots: dependencies: fast-diff: 1.3.0 + prettier-plugin-tailwindcss@0.6.11(prettier@3.5.0): + dependencies: + prettier: 3.5.0 + prettier@3.5.0: {} pretty-ms@9.2.0: diff --git a/src/frontend/src/App.vue b/src/frontend/src/App.vue index 577b037..da39e3c 100644 --- a/src/frontend/src/App.vue +++ b/src/frontend/src/App.vue @@ -1,23 +1,21 @@