diff --git a/.eslintrc.yml b/.eslintrc.yml index 32106c9..d13f9e9 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -25,16 +25,16 @@ rules: react/jsx-filename-extension: [2, { 'extensions': ['.jsx', '.tsx'] }] react/require-default-props: 'off' '@typescript-eslint/explicit-function-return-type': 'off' - '@typescript-eslint/no-floating-promises': 'off' unicorn/filename-case: ['error', { 'case': 'kebabCase' }] 'require-await': 'error' settings: - 'import/resolver': + import/resolver: alias: map: - [ - ['~/components', './src/components'], - ['~/pages', './src/pages'], - ['~/services', './src/services'], - ] + - - '~/components' + - './src/components' + - - '~/pages' + - './src/pages' + - - '~/services' + - './src/services' extensions: ['.ts', '.js', '.jsx', '.ts', '.tsx', '.json'] diff --git a/.prettierrc.yml b/.prettierrc.yml index 0176969..d215ee6 100644 --- a/.prettierrc.yml +++ b/.prettierrc.yml @@ -1 +1,3 @@ singleQuote: true +plugins: + - prettier-plugin-tailwindcss diff --git a/package.json b/package.json index 8015479..7cc00e5 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,8 @@ "msw": "^1.3.3", "postcss": "^8.4.31", "postcss-nesting": "12.0.1", - "prettier": "3.2.5", + "prettier": "3.3.3", + "prettier-plugin-tailwindcss": "^0.6.6", "standard-version": "^9.5.0", "storybook": "^8.0.10", "storybook-addon-react-router-v6": "~2.0.15", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9b32577..5a025a2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -154,8 +154,11 @@ importers: specifier: 12.0.1 version: 12.0.1(postcss@8.4.31) prettier: - specifier: 3.2.5 - version: 3.2.5 + specifier: 3.3.3 + version: 3.3.3 + prettier-plugin-tailwindcss: + specifier: ^0.6.6 + version: 0.6.6(prettier@3.3.3) standard-version: specifier: ^9.5.0 version: 9.5.0 @@ -6433,13 +6436,68 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} + prettier-plugin-tailwindcss@0.6.6: + resolution: {integrity: sha512-OPva5S7WAsPLEsOuOWXATi13QrCKACCiIonFgIR6V4lYv4QLp++UXVhZSzRbZxXGimkQtQT86CC6fQqTOybGng==} + 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-melody': '*' + 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-melody': + 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@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} hasBin: true - prettier@3.2.5: - resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} + prettier@3.3.3: + resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} engines: {node: '>=14'} hasBin: true @@ -7323,8 +7381,8 @@ packages: tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} - tslib@2.6.3: - resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==} + tslib@2.7.0: + resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==} tsutils@3.21.0: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} @@ -10365,7 +10423,7 @@ snapshots: jscodeshift: 0.15.2(@babel/preset-env@7.24.5(@babel/core@7.24.5)) leven: 3.1.0 ora: 5.4.1 - prettier: 3.2.5 + prettier: 3.3.3 prompts: 2.4.2 read-pkg-up: 7.0.1 semver: 7.6.0 @@ -10408,7 +10466,7 @@ snapshots: globby: 11.1.0 jscodeshift: 0.15.2(@babel/preset-env@7.24.5(@babel/core@7.24.5)) lodash: 4.17.21 - prettier: 3.2.5 + prettier: 3.3.3 recast: 0.23.6 tiny-invariant: 1.3.3 transitivePeerDependencies: @@ -14191,7 +14249,7 @@ snapshots: dependencies: copy-anything: 2.0.6 parse-node-version: 1.0.1 - tslib: 2.6.3 + tslib: 2.7.0 optionalDependencies: errno: 0.1.8 graceful-fs: 4.2.11 @@ -15386,9 +15444,13 @@ snapshots: prelude-ls@1.2.1: {} + prettier-plugin-tailwindcss@0.6.6(prettier@3.3.3): + dependencies: + prettier: 3.3.3 + prettier@2.8.8: {} - prettier@3.2.5: {} + prettier@3.3.3: {} pretty-bytes@5.6.0: {} @@ -16412,7 +16474,7 @@ snapshots: tslib@2.6.2: {} - tslib@2.6.3: {} + tslib@2.7.0: {} tsutils@3.21.0(typescript@5.2.2): dependencies: diff --git a/src/components/Header.tsx b/src/components/Header.tsx index 8b782a3..8b7bf91 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -9,16 +9,16 @@ function Header() { }, []); return ( -