diff --git a/.prettierrc.json b/.prettierrc.json index 31e8b1b..a8daaaf 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,6 +1,7 @@ { "plugins": [ "prettier-plugin-astro", + "prettier-plugin-astro-organize-imports", "prettier-plugin-organize-imports", "prettier-plugin-tailwindcss" ], diff --git a/package.json b/package.json index 6c0c1bd..0c4e85b 100644 --- a/package.json +++ b/package.json @@ -88,6 +88,7 @@ "postcss-nesting": "^12.0.1", "prettier": "^3.0.3", "prettier-plugin-astro": "^0.12.0", + "prettier-plugin-astro-organize-imports": "^0.4.3", "prettier-plugin-organize-imports": "^3.2.3", "prettier-plugin-tailwindcss": "^0.5.4", "rollup": "^3.29.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0aceada..992feb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -215,6 +215,9 @@ devDependencies: prettier-plugin-astro: specifier: ^0.12.0 version: 0.12.0 + prettier-plugin-astro-organize-imports: + specifier: ^0.4.3 + version: 0.4.3(prettier-plugin-astro@0.12.0)(prettier-plugin-tailwindcss@0.5.4)(prettier@3.0.3) prettier-plugin-organize-imports: specifier: ^3.2.3 version: 3.2.3(prettier@3.0.3)(typescript@5.2.2) @@ -294,6 +297,10 @@ packages: /@astrojs/compiler@2.0.1: resolution: {integrity: sha512-DfBR7Cf+tOgQ4n7TIgTtU5x5SEA/08DNshpEPcT+91A0KbBlmUOYMBM/O6qAaHkmVo1KIoXQYhAmfdTT1zx9PQ==} + /@astrojs/compiler@2.7.0: + resolution: {integrity: sha512-XpC8MAaWjD1ff6/IfkRq/5k1EFj6zhCNqXRd5J43SVJEBj/Bsmizkm8N0xOYscGcDFQkRgEw6/eKnI5x/1l6aA==} + dev: true + /@astrojs/internal-helpers@0.2.0: resolution: {integrity: sha512-NQ4ppp1CM0HNkKbJNM4saVSfmUYzGlRalF6wx7F6T/MYHYSWGuojY89/oFTy4t8VlOGUCUijlsVNNeziWaUo5g==} dev: false @@ -14885,6 +14892,26 @@ packages: fast-diff: 1.3.0 dev: true + /prettier-plugin-astro-organize-imports@0.4.3(prettier-plugin-astro@0.12.0)(prettier-plugin-tailwindcss@0.5.4)(prettier@3.0.3): + resolution: {integrity: sha512-TvCeGLGOz/QWjHUz2+XFcm8xj899WemvL1tquQTBsL1q9hbMPkEaxzcPILzd2nNDLE7AUqcYVq4cOm9RjTp+2g==} + engines: {node: '>=16.0.0', pnpm: '>=8.6.0'} + peerDependencies: + prettier: ^3.0 + prettier-plugin-astro: '*' + prettier-plugin-tailwindcss: '*' + peerDependenciesMeta: + prettier-plugin-astro: + optional: true + prettier-plugin-tailwindcss: + optional: true + dependencies: + '@astrojs/compiler': 2.7.0 + prettier: 3.0.3 + prettier-plugin-astro: 0.12.0 + prettier-plugin-tailwindcss: 0.5.4(prettier-plugin-astro@0.12.0)(prettier-plugin-organize-imports@3.2.3)(prettier@3.0.3) + typescript: 5.4.2 + dev: true + /prettier-plugin-astro@0.12.0: resolution: {integrity: sha512-8E+9YQR6/5CPZJs8XsfBw579zrwZkc0Wb7x0fRVm/51JC8Iys4lBw4ecV8fHwpbQnzve86TUa4fJ08BJzqfWnA==} engines: {node: ^14.15.0 || >=16.0.0} @@ -17354,6 +17381,12 @@ packages: hasBin: true dev: true + /typescript@5.4.2: + resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} + engines: {node: '>=14.17'} + hasBin: true + dev: true + /uglify-js@3.17.4: resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==} engines: {node: '>=0.8.0'} diff --git a/tailwind.config.cjs b/tailwind.config.cjs index 1d32511..c3812c1 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -156,5 +156,9 @@ module.exports = { }, }, }, - plugins: [require('tailwindcss-logical'), require('tailwindcss-opentype')], + plugins: [ + require('tailwindcss-logical'), + require('tailwindcss-opentype'), + 'prettier-plugin-tailwindcss', + ], };