From 9cf9745d49aab0fba9b0aaaf533c07d08f23e013 Mon Sep 17 00:00:00 2001 From: liding Date: Sat, 12 Oct 2024 21:04:57 +0800 Subject: [PATCH] Format all code using prettier. --- .prettierrc.mjs | 12 +++ .vscode/settings.json | 11 +++ package-lock.json | 62 +++++++++++++- package.json | 2 + src/components/Footer.astro | 1 + src/components/HTMLCommonHead.astro | 2 +- src/components/Nav.astro | 1 + .../article/CollectionSummary.astro | 14 ++-- .../article/article_body/ArticleBody.astro | 17 ++-- src/components/tool/ToolNav.astro | 19 ++--- .../unit_conversion/DataUnitConversion.vue | 80 ++++++++++--------- .../UnitConversionWrapper.astro | 2 +- .../unit_conversion/WeightUnitConversion.vue | 50 ++++++------ src/layouts/DefaultLayout.astro | 4 +- src/pages/article/blog/[...blog].astro | 2 +- src/pages/article/note/[...note].astro | 2 +- .../translation/[...translation].astro | 2 +- src/styles/global.css | 17 +++- 18 files changed, 199 insertions(+), 101 deletions(-) create mode 100644 .prettierrc.mjs create mode 100644 .vscode/settings.json diff --git a/.prettierrc.mjs b/.prettierrc.mjs new file mode 100644 index 0000000..aa2deee --- /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/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..a6d1c00 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,11 @@ +{ + "[json]": { + "editor.tabSize": 2 + }, + "[javascript]": { + "editor.tabSize": 2 + }, + "[typescript]": { + "editor.tabSize": 2 + } +} diff --git a/package-lock.json b/package-lock.json index c65cb9b..1c894e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,8 @@ "astro": "^4.9.2", "bignumber.js": "^9.1.2", "pinyin-pro": "^3.22.0", + "prettier": "^3.3.3", + "prettier-plugin-astro": "^0.14.1", "remark-toc": "^9.0.0", "typescript": "^5.4.5", "vue": "^3.4.29" @@ -58,9 +60,10 @@ } }, "node_modules/@astrojs/compiler": { - "version": "2.8.0", - "resolved": "https://registry.npmmirror.com/@astrojs/compiler/-/compiler-2.8.0.tgz", - "integrity": "sha512-yrpD1WRGqsJwANaDIdtHo+YVjvIOFAjC83lu5qENIgrafwZcJgSXDuwVMXOgok4tFzpeKLsFQ6c3FoUdloLWBQ==" + "version": "2.10.3", + "resolved": "https://registry.npmmirror.com/@astrojs/compiler/-/compiler-2.10.3.tgz", + "integrity": "sha512-bL/O7YBxsFt55YHU021oL+xz+B/9HvGNId3F9xURN16aeqDK9juHGktdkCSXz+U4nqFACq6ZFvWomOzhV+zfPw==", + "license": "MIT" }, "node_modules/@astrojs/internal-helpers": { "version": "0.4.0", @@ -5400,6 +5403,35 @@ "node": ">=8.15" } }, + "node_modules/prettier": { + "version": "3.3.3", + "resolved": "https://registry.npmmirror.com/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-plugin-astro": { + "version": "0.14.1", + "resolved": "https://registry.npmmirror.com/prettier-plugin-astro/-/prettier-plugin-astro-0.14.1.tgz", + "integrity": "sha512-RiBETaaP9veVstE4vUwSIcdATj6dKmXljouXc/DDNwBSPTp8FRkLGDSGFClKsAFeeg+13SB0Z1JZvbD76bigJw==", + "license": "MIT", + "dependencies": { + "@astrojs/compiler": "^2.9.1", + "prettier": "^3.0.0", + "sass-formatter": "^0.7.6" + }, + "engines": { + "node": "^14.15.0 || >=16.0.0" + } + }, "node_modules/prismjs": { "version": "1.29.0", "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz", @@ -6114,6 +6146,21 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/s.color": { + "version": "0.0.15", + "resolved": "https://registry.npmmirror.com/s.color/-/s.color-0.0.15.tgz", + "integrity": "sha512-AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA==", + "license": "MIT" + }, + "node_modules/sass-formatter": { + "version": "0.7.9", + "resolved": "https://registry.npmmirror.com/sass-formatter/-/sass-formatter-0.7.9.tgz", + "integrity": "sha512-CWZ8XiSim+fJVG0cFLStwDvft1VI7uvXdCNJYXhDvowiv+DsbD1nXLiQ4zrE5UBvj5DWZJ93cwN0NX5PMsr1Pw==", + "license": "MIT", + "dependencies": { + "suf-log": "^2.5.3" + } + }, "node_modules/sax": { "version": "1.4.1", "resolved": "https://registry.npmmirror.com/sax/-/sax-1.4.1.tgz", @@ -6395,6 +6442,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/suf-log": { + "version": "2.5.3", + "resolved": "https://registry.npmmirror.com/suf-log/-/suf-log-2.5.3.tgz", + "integrity": "sha512-KvC8OPjzdNOe+xQ4XWJV2whQA0aM1kGVczMQ8+dStAO6KfEB140JEVQ9dE76ONZ0/Ylf67ni4tILPJB41U0eow==", + "license": "MIT", + "dependencies": { + "s.color": "0.0.15" + } + }, "node_modules/superjson": { "version": "2.2.1", "resolved": "https://registry.npmmirror.com/superjson/-/superjson-2.2.1.tgz", diff --git a/package.json b/package.json index 69f7e5e..063bc7a 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,8 @@ "astro": "^4.9.2", "bignumber.js": "^9.1.2", "pinyin-pro": "^3.22.0", + "prettier": "^3.3.3", + "prettier-plugin-astro": "^0.14.1", "remark-toc": "^9.0.0", "typescript": "^5.4.5", "vue": "^3.4.29" diff --git a/src/components/Footer.astro b/src/components/Footer.astro index f831500..cf39222 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -1,4 +1,5 @@ --- + ---
diff --git a/src/components/HTMLCommonHead.astro b/src/components/HTMLCommonHead.astro index b98a5a0..414ce53 100644 --- a/src/components/HTMLCommonHead.astro +++ b/src/components/HTMLCommonHead.astro @@ -7,7 +7,7 @@ const { title } = Astro.props; - + {title} diff --git a/src/components/Nav.astro b/src/components/Nav.astro index 132f924..10278b6 100644 --- a/src/components/Nav.astro +++ b/src/components/Nav.astro @@ -1,4 +1,5 @@ --- + ---