diff --git a/.prettierrc b/.prettierrc index 98f91a0..042b6cc 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,8 @@ { - "plugins": ["prettier-plugin-tailwindcss"], + "plugins": [ + "prettier-plugin-organize-imports", + "prettier-plugin-tailwindcss" + ], "semi": false, "singleQuote": true } diff --git a/package.json b/package.json index 390ad65..35933e2 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "ky": "^0.33.3", "lint-staged": "^14.0.1", "prettier": "^3.0.2", + "prettier-plugin-organize-imports": "^3.2.3", "prettier-plugin-tailwindcss": "^0.5.3", "solid-apexcharts": "^0.3.2", "solid-devtools": "^0.27.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1f565c2..33b2431 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -74,9 +74,12 @@ dependencies: prettier: specifier: ^3.0.2 version: 3.0.2 + prettier-plugin-organize-imports: + specifier: ^3.2.3 + version: 3.2.3(prettier@3.0.2)(typescript@5.2.2) prettier-plugin-tailwindcss: specifier: ^0.5.3 - version: 0.5.3(prettier@3.0.2) + version: 0.5.3(prettier-plugin-organize-imports@3.2.3)(prettier@3.0.2) solid-apexcharts: specifier: ^0.3.2 version: 0.3.2(apexcharts@3.42.0)(solid-js@1.7.11) @@ -3844,7 +3847,27 @@ packages: source-map-js: 1.0.2 dev: false - /prettier-plugin-tailwindcss@0.5.3(prettier@3.0.2): + /prettier-plugin-organize-imports@3.2.3(prettier@3.0.2)(typescript@5.2.2): + resolution: + { + integrity: sha512-KFvk8C/zGyvUaE3RvxN2MhCLwzV6OBbFSkwZ2OamCrs9ZY4i5L77jQ/w4UmUr+lqX8qbaqVq6bZZkApn+IgJSg==, + } + peerDependencies: + '@volar/vue-language-plugin-pug': ^1.0.4 + '@volar/vue-typescript': ^1.0.4 + prettier: '>=2.0' + typescript: '>=2.9' + peerDependenciesMeta: + '@volar/vue-language-plugin-pug': + optional: true + '@volar/vue-typescript': + optional: true + dependencies: + prettier: 3.0.2 + typescript: 5.2.2 + dev: false + + /prettier-plugin-tailwindcss@0.5.3(prettier-plugin-organize-imports@3.2.3)(prettier@3.0.2): resolution: { integrity: sha512-M5K80V21yM+CTm/FEFYRv9/9LyInYbCSXpIoPAKMm8zy89IOwdiA2e4JVbcO7tvRtAQWz32zdj7/WKcsmFyAVg==, @@ -3900,6 +3923,7 @@ packages: optional: true dependencies: prettier: 3.0.2 + prettier-plugin-organize-imports: 3.2.3(prettier@3.0.2)(typescript@5.2.2) dev: false /prettier@3.0.2: diff --git a/src/pages/Config.tsx b/src/pages/Config.tsx index 1bc5a4d..89b7c78 100644 --- a/src/pages/Config.tsx +++ b/src/pages/Config.tsx @@ -1,9 +1,9 @@ -import { useRequest } from '~/signals' -import { For, onMount } from 'solid-js' -import type { Config as IConfig } from '~/types' -import { z } from 'zod' -import { validator } from '@felte/validator-zod' import { createForm } from '@felte/solid' +import { validator } from '@felte/validator-zod' +import { For, onMount } from 'solid-js' +import { z } from 'zod' +import { useRequest } from '~/signals' +import type { Config as IConfig } from '~/types' const schema = z.object({ port: z.number(),