diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index b4bfed3..0000000 --- a/.prettierrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "plugins": ["prettier-plugin-tailwindcss"] -} diff --git a/.prettierrc.mjs b/.prettierrc.mjs new file mode 100644 index 0000000..0c62418 --- /dev/null +++ b/.prettierrc.mjs @@ -0,0 +1,12 @@ +/** @type {import("prettier").Config} */ +export default { + plugins: ["prettier-plugin-tailwindcss", 'prettier-plugin-astro'], + overrides: [ + { + files: '*.astro', + options: { + parser: 'astro', + }, + }, +], +} diff --git a/package.json b/package.json index bc70bd7..868a83d 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ }, "devDependencies": { "prettier": "^3.1.1", + "prettier-plugin-astro": "^0.12.2", "prettier-plugin-tailwindcss": "^0.5.9" } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bfa0001..2fd89f0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,7 +7,7 @@ settings: dependencies: '@astrojs/check': specifier: ^0.3.1 - version: 0.3.1(prettier@3.1.1)(typescript@5.3.2) + version: 0.3.1(prettier-plugin-astro@0.12.2)(prettier@3.1.1)(typescript@5.3.2) '@astrojs/tailwind': specifier: ^5.0.4 version: 5.0.4(astro@3.6.3)(tailwindcss@3.4.0) @@ -25,9 +25,12 @@ devDependencies: prettier: specifier: ^3.1.1 version: 3.1.1 + prettier-plugin-astro: + specifier: ^0.12.2 + version: 0.12.2 prettier-plugin-tailwindcss: specifier: ^0.5.9 - version: 0.5.9(prettier@3.1.1) + version: 0.5.9(prettier-plugin-astro@0.12.2)(prettier@3.1.1) packages: @@ -44,13 +47,13 @@ packages: '@jridgewell/trace-mapping': 0.3.20 dev: false - /@astrojs/check@0.3.1(prettier@3.1.1)(typescript@5.3.2): + /@astrojs/check@0.3.1(prettier-plugin-astro@0.12.2)(prettier@3.1.1)(typescript@5.3.2): resolution: {integrity: sha512-3LjEUvh7Z4v9NPokaqKMXQ0DwnSXfmtcyAuWVTjNt9yzjv54SxykobV5CTOB3TIko+Rqg59ejamJBxaJN6fvkw==} hasBin: true peerDependencies: typescript: ^5.0.0 dependencies: - '@astrojs/language-server': 2.5.2(prettier@3.1.1)(typescript@5.3.2) + '@astrojs/language-server': 2.5.2(prettier-plugin-astro@0.12.2)(prettier@3.1.1)(typescript@5.3.2) chokidar: 3.5.3 fast-glob: 3.3.2 kleur: 4.1.5 @@ -61,6 +64,9 @@ packages: - prettier-plugin-astro dev: false + /@astrojs/compiler@1.8.2: + resolution: {integrity: sha512-o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw==} + /@astrojs/compiler@2.3.2: resolution: {integrity: sha512-jkY7bCVxl27KeZsSxIZ+pqACe+g8VQUdTiSJRj/sXYdIaZlW3ZMq4qF2M17P/oDt3LBq0zLNwQr4Cb7fSpRGxQ==} dev: false @@ -69,7 +75,7 @@ packages: resolution: {integrity: sha512-06DD2ZnItMwUnH81LBLco3tWjcZ1lGU9rLCCBaeUCGYe9cI0wKyY2W3kDyoW1I6GmcWgt1fu+D1CTvz+FIKf8A==} dev: false - /@astrojs/language-server@2.5.2(prettier@3.1.1)(typescript@5.3.2): + /@astrojs/language-server@2.5.2(prettier-plugin-astro@0.12.2)(prettier@3.1.1)(typescript@5.3.2): resolution: {integrity: sha512-O5SMzoQ65wSxA1KygreI9UJYmHpgt15bSYBxceHwqX7OCDM4Ek8mr6mZn45LGDtwM3dp1uup7kp8exfRPwIFbA==} hasBin: true peerDependencies: @@ -92,6 +98,7 @@ packages: fast-glob: 3.3.2 muggle-string: 0.3.1 prettier: 3.1.1 + prettier-plugin-astro: 0.12.2 volar-service-css: 0.0.16(@volar/language-service@1.10.10) volar-service-emmet: 0.0.16(@volar/language-service@1.10.10) volar-service-html: 0.0.16(@volar/language-service@1.10.10) @@ -3220,7 +3227,15 @@ packages: which-pm: 2.0.0 dev: false - /prettier-plugin-tailwindcss@0.5.9(prettier@3.1.1): + /prettier-plugin-astro@0.12.2: + resolution: {integrity: sha512-1OXSEht27zrnX7rCa0bEpLdspeumFW4hnj4+JzPuG5bRlSOAhD0rbXBNZfRD9q0Qbr00EcCcnjd6k6M8q+GfTA==} + engines: {node: ^14.15.0 || >=16.0.0} + dependencies: + '@astrojs/compiler': 1.8.2 + prettier: 3.1.1 + sass-formatter: 0.7.8 + + /prettier-plugin-tailwindcss@0.5.9(prettier-plugin-astro@0.12.2)(prettier@3.1.1): resolution: {integrity: sha512-9x3t1s2Cjbut2QiP+O0mDqV3gLXTe2CgRlQDgucopVkUdw26sQi53p/q4qvGxMLBDfk/dcTV57Aa/zYwz9l8Ew==} engines: {node: '>=14.21.3'} peerDependencies: @@ -3270,6 +3285,7 @@ packages: optional: true dependencies: prettier: 3.1.1 + prettier-plugin-astro: 0.12.2 dev: true /prettier@3.1.1: @@ -3510,6 +3526,9 @@ packages: queue-microtask: 1.2.3 dev: false + /s.color@0.0.15: + resolution: {integrity: sha512-AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA==} + /sade@1.8.1: resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==} engines: {node: '>=6'} @@ -3525,6 +3544,11 @@ packages: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: false + /sass-formatter@0.7.8: + resolution: {integrity: sha512-7fI2a8THglflhhYis7k06eUf92VQuJoXzEs2KRP0r1bluFxKFvLx0Ns7c478oYGM0fPfrr846ZRWVi2MAgHt9Q==} + dependencies: + suf-log: 2.5.3 + /sax@1.3.0: resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==} dev: false @@ -3752,6 +3776,11 @@ packages: ts-interface-checker: 0.1.13 dev: false + /suf-log@2.5.3: + resolution: {integrity: sha512-KvC8OPjzdNOe+xQ4XWJV2whQA0aM1kGVczMQ8+dStAO6KfEB140JEVQ9dE76ONZ0/Ylf67ni4tILPJB41U0eow==} + dependencies: + s.color: 0.0.15 + /supports-color@5.5.0: resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'}