diff --git a/.prettierrc.mjs b/.prettierrc.mjs new file mode 100644 index 00000000..aa2deeec --- /dev/null +++ b/.prettierrc.mjs @@ -0,0 +1,12 @@ +/** @type {import("prettier").Config} */ +export default { + plugins: ['prettier-plugin-astro'], + overrides: [ + { + files: '*.astro', + options: { + parser: 'astro', + }, + }, + ], +}; \ No newline at end of file diff --git a/package.json b/package.json index 196e14fe..7982e6ab 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,8 @@ "@types/mdast": "^4.0.4", "@types/sanitize-html": "^2.11.0", "photoswipe": "^5.4.4", + "prettier": "^3.3.3", + "prettier-plugin-astro": "^0.14.1", "remark-github-admonitions-to-directives": "^1.0.5", "sass": "^1.77.8", "stylus": "^0.63.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bad8cb1c..7b181066 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,7 +14,7 @@ importers: dependencies: '@astrojs/check': specifier: ^0.8.3 - version: 0.8.3(typescript@5.5.4) + version: 0.8.3(prettier-plugin-astro@0.14.1)(prettier@3.3.3)(typescript@5.5.4) '@astrojs/rss': specifier: ^4.0.7 version: 4.0.7 @@ -145,6 +145,12 @@ importers: photoswipe: specifier: ^5.4.4 version: 5.4.4 + prettier: + specifier: ^3.3.3 + version: 3.3.3 + prettier-plugin-astro: + specifier: ^0.14.1 + version: 0.14.1 remark-github-admonitions-to-directives: specifier: ^1.0.5 version: 1.0.5 @@ -3806,11 +3812,20 @@ packages: resolution: {integrity: sha512-gYBeFTZLu055D8Vv3cSPox/0iTPtkzxpLroSYYA7WXgRi31WCJ51Uyl8ZiPeUUjyvs2MBzK+S8v9JVUgHU/Sqw==} engines: {node: '>=18.12'} + prettier-plugin-astro@0.14.1: + resolution: {integrity: sha512-RiBETaaP9veVstE4vUwSIcdATj6dKmXljouXc/DDNwBSPTp8FRkLGDSGFClKsAFeeg+13SB0Z1JZvbD76bigJw==} + engines: {node: ^14.15.0 || >=16.0.0} + prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} hasBin: true + prettier@3.3.3: + resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} + engines: {node: '>=14'} + hasBin: true + pretty-bytes@3.0.1: resolution: {integrity: sha512-eb7ZAeUTgfh294cElcu51w+OTRp/6ItW758LjwJSK72LDevcuJn0P4eD71PLMDGPwwatXmAmYHTkzvpKlJE3ow==} engines: {node: '>=0.10.0'} @@ -4029,6 +4044,9 @@ packages: run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} + 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'} @@ -4050,6 +4068,9 @@ packages: sanitize-html@2.13.0: resolution: {integrity: sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==} + sass-formatter@0.7.9: + resolution: {integrity: sha512-CWZ8XiSim+fJVG0cFLStwDvft1VI7uvXdCNJYXhDvowiv+DsbD1nXLiQ4zrE5UBvj5DWZJ93cwN0NX5PMsr1Pw==} + sass@1.77.8: resolution: {integrity: sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==} engines: {node: '>=14.0.0'} @@ -4257,6 +4278,9 @@ packages: engines: {node: '>=16 || 14 >=14.17'} hasBin: true + suf-log@2.5.3: + resolution: {integrity: sha512-KvC8OPjzdNOe+xQ4XWJV2whQA0aM1kGVczMQ8+dStAO6KfEB140JEVQ9dE76ONZ0/Ylf67ni4tILPJB41U0eow==} + supports-color@2.0.0: resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==} engines: {node: '>=0.8.0'} @@ -4716,9 +4740,9 @@ snapshots: '@antfu/utils@0.7.10': {} - '@astrojs/check@0.8.3(typescript@5.5.4)': + '@astrojs/check@0.8.3(prettier-plugin-astro@0.14.1)(prettier@3.3.3)(typescript@5.5.4)': dependencies: - '@astrojs/language-server': 2.12.8(typescript@5.5.4) + '@astrojs/language-server': 2.12.8(prettier-plugin-astro@0.14.1)(prettier@3.3.3)(typescript@5.5.4) chokidar: 3.6.0 fast-glob: 3.3.2 kleur: 4.1.5 @@ -4732,7 +4756,7 @@ snapshots: '@astrojs/internal-helpers@0.4.1': {} - '@astrojs/language-server@2.12.8(typescript@5.5.4)': + '@astrojs/language-server@2.12.8(prettier-plugin-astro@0.14.1)(prettier@3.3.3)(typescript@5.5.4)': dependencies: '@astrojs/compiler': 2.9.2 '@jridgewell/sourcemap-codec': 1.5.0 @@ -4746,11 +4770,14 @@ snapshots: volar-service-css: 0.0.59(@volar/language-service@2.4.0-alpha.18) volar-service-emmet: 0.0.59(@volar/language-service@2.4.0-alpha.18) volar-service-html: 0.0.59(@volar/language-service@2.4.0-alpha.18) - volar-service-prettier: 0.0.59(@volar/language-service@2.4.0-alpha.18) + volar-service-prettier: 0.0.59(@volar/language-service@2.4.0-alpha.18)(prettier@3.3.3) volar-service-typescript: 0.0.59(@volar/language-service@2.4.0-alpha.18) volar-service-typescript-twoslash-queries: 0.0.59(@volar/language-service@2.4.0-alpha.18) vscode-html-languageservice: 5.3.0 vscode-uri: 3.0.8 + optionalDependencies: + prettier: 3.3.3 + prettier-plugin-astro: 0.14.1 transitivePeerDependencies: - typescript @@ -9030,8 +9057,16 @@ snapshots: find-yarn-workspace-root2: 1.2.16 which-pm: 3.0.0 + prettier-plugin-astro@0.14.1: + dependencies: + '@astrojs/compiler': 2.9.2 + prettier: 3.3.3 + sass-formatter: 0.7.9 + prettier@2.8.8: {} + prettier@3.3.3: {} + pretty-bytes@3.0.1: dependencies: number-is-nan: 1.0.1 @@ -9371,6 +9406,8 @@ snapshots: dependencies: queue-microtask: 1.2.3 + s.color@0.0.15: {} + sade@1.8.1: dependencies: mri: 1.2.0 @@ -9401,6 +9438,10 @@ snapshots: parse-srcset: 1.0.2 postcss: 8.4.40 + sass-formatter@0.7.9: + dependencies: + suf-log: 2.5.3 + sass@1.77.8: dependencies: chokidar: 3.6.0 @@ -9648,6 +9689,10 @@ snapshots: pirates: 4.0.6 ts-interface-checker: 0.1.13 + suf-log@2.5.3: + dependencies: + s.color: 0.0.15 + supports-color@2.0.0: {} supports-color@5.5.0: @@ -9999,11 +10044,12 @@ snapshots: optionalDependencies: '@volar/language-service': 2.4.0-alpha.18 - volar-service-prettier@0.0.59(@volar/language-service@2.4.0-alpha.18): + volar-service-prettier@0.0.59(@volar/language-service@2.4.0-alpha.18)(prettier@3.3.3): dependencies: vscode-uri: 3.0.8 optionalDependencies: '@volar/language-service': 2.4.0-alpha.18 + prettier: 3.3.3 volar-service-typescript-twoslash-queries@0.0.59(@volar/language-service@2.4.0-alpha.18): dependencies: