From aa77921b82d86ba8c40dc96d4b9e19debe3a45ff Mon Sep 17 00:00:00 2001 From: bluwy Date: Wed, 10 Aug 2022 14:39:51 +0800 Subject: [PATCH] Format astro files --- .prettierrc | 5 +- package.json | 5 +- playground/astro/src/layouts/Layout.astro | 89 +++++++------ .../astro/src/pages/frames/basic/index.astro | 60 +++++---- playground/astro/src/pages/index.astro | 12 +- pnpm-lock.yaml | 121 ++++++++++++++++++ 6 files changed, 205 insertions(+), 87 deletions(-) diff --git a/.prettierrc b/.prettierrc index 83a8b29..bce6079 100644 --- a/.prettierrc +++ b/.prettierrc @@ -4,5 +4,8 @@ "singleQuote": true, "trailingComma": "none", "semi": false, - "plugins": ["./node_modules/prettier-plugin-svelte"] + "plugins": [ + "./node_modules/prettier-plugin-svelte", + "./node_modules/prettier-plugin-astro" + ] } \ No newline at end of file diff --git a/package.json b/package.json index 9a45f31..51a823b 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,12 @@ "private": true, "type": "module", "scripts": { - "lint": "prettier **/*.{js,ts,jsx,css,vue,svelte} --check --cache", - "format": "prettier **/*.{js,ts,jsx,css,vue,svelte} --write --cache" + "lint": "prettier **/*.{js,ts,jsx,css,md,vue,svelte,astro} --check --cache --ignore-path .gitignore", + "format": "prettier **/*.{js,ts,jsx,css,md,vue,svelte,astro} --write --cache --ignore-path .gitignore" }, "devDependencies": { "prettier": "^2.7.1", + "prettier-plugin-astro": "^0.4.1", "prettier-plugin-svelte": "^2.7.0", "svelte": "^3.49.0" }, diff --git a/playground/astro/src/layouts/Layout.astro b/playground/astro/src/layouts/Layout.astro index 0f0c627..c291666 100644 --- a/playground/astro/src/layouts/Layout.astro +++ b/playground/astro/src/layouts/Layout.astro @@ -1,52 +1,49 @@ + + + + whyframe astro + - - - - whyframe astro - + + + \ No newline at end of file + iframe[data-why] { + display: inline-block; + border: none; + box-shadow: 2.7px 3.2px 3.6px rgba(0, 0, 0, 0.024), + 7.5px 8.8px 10px rgba(0, 0, 0, 0.035), + 18.1px 21.1px 24.1px rgba(0, 0, 0, 0.046), + 60px 70px 80px rgba(0, 0, 0, 0.07); + border-radius: 0.4rem; + width: 400px; + min-height: 200px; + max-height: 400px; + background-color: white; + margin: 0.5rem; + } + + + diff --git a/playground/astro/src/pages/frames/basic/index.astro b/playground/astro/src/pages/frames/basic/index.astro index e87f47c..eb20195 100644 --- a/playground/astro/src/pages/frames/basic/index.astro +++ b/playground/astro/src/pages/frames/basic/index.astro @@ -9,41 +9,39 @@
+ createApp(document.getElementById('app')) + + p { + font-weight: 500; + } + diff --git a/playground/astro/src/pages/index.astro b/playground/astro/src/pages/index.astro index fe54eeb..26de06c 100644 --- a/playground/astro/src/pages/index.astro +++ b/playground/astro/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import Layout from '../layouts/Layout.astro'; -import Counter from '../components/Counter.svelte'; +import Layout from '../layouts/Layout.astro' +import Counter from '../components/Counter.svelte' const max = 10 --- @@ -9,12 +9,10 @@ const max = 10

Astro

- \ No newline at end of file + diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0550613..024786c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,10 +9,12 @@ importers: .: specifiers: prettier: ^2.7.1 + prettier-plugin-astro: ^0.4.1 prettier-plugin-svelte: ^2.7.0 svelte: ^3.49.0 devDependencies: prettier: 2.7.1 + prettier-plugin-astro: 0.4.1 prettier-plugin-svelte: 2.7.0_o3ioganyptcsrh6x4hnxvjkpqi svelte: 3.49.0 @@ -324,6 +326,10 @@ packages: '@jridgewell/trace-mapping': 0.3.14 dev: true + /@astrojs/compiler/0.19.0: + resolution: {integrity: sha512-8nvyxZTfCXLyRmYfTttpJT6EPhfBRg0/q4J/Jj3/pNPLzp+vs05ZdktsY6QxAREaOMAnNEtSqcrB4S5DsXOfRg==} + dev: true + /@astrojs/compiler/0.23.1: resolution: {integrity: sha512-KsoDrASGwTKZoWXbjy8SlIeoDv7y1OfBJtHVLuPuzhConA8e0SZpGzFqIuVRfG4bhisSTptZLDQZ7oxwgPv2jA==} dev: false @@ -845,6 +851,18 @@ packages: - supports-color dev: true + /@pkgr/utils/2.3.0: + resolution: {integrity: sha512-7dIJ9CRVzBnqyEl7diUHPUFJf/oty2SeoVzcMocc5PeOUDK9KGzvgIBjGRRzzlRDaOjh3ADwH0WeibQvi3ls2Q==} + engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} + dependencies: + cross-spawn: 7.0.3 + is-glob: 4.0.3 + open: 8.4.0 + picocolors: 1.0.0 + tiny-glob: 0.2.9 + tslib: 2.4.0 + dev: true + /@polka/url/1.0.0-next.21: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: true @@ -1401,6 +1419,15 @@ packages: safe-buffer: 5.1.2 dev: true + /cross-spawn/7.0.3: + resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} + engines: {node: '>= 8'} + dependencies: + path-key: 3.1.1 + shebang-command: 2.0.0 + which: 2.0.2 + dev: true + /csstype/2.6.20: resolution: {integrity: sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==} @@ -1421,6 +1448,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /define-lazy-prop/2.0.0: + resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} + engines: {node: '>=8'} + dev: true + /delegates/1.0.0: resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} dev: true @@ -1810,6 +1842,12 @@ packages: has: 1.0.3 dev: true + /is-docker/2.2.1: + resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} + engines: {node: '>=8'} + hasBin: true + dev: true + /is-extglob/2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} @@ -1837,6 +1875,17 @@ packages: engines: {node: '>=12.13'} dev: true + /is-wsl/2.2.0: + resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} + engines: {node: '>=8'} + dependencies: + is-docker: 2.2.1 + dev: true + + /isexe/2.0.0: + resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} + dev: true + /js-tokens/4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -2013,11 +2062,25 @@ packages: wrappy: 1.0.2 dev: true + /open/8.4.0: + resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==} + engines: {node: '>=12'} + dependencies: + define-lazy-prop: 2.0.0 + is-docker: 2.2.1 + is-wsl: 2.2.0 + dev: true + /path-is-absolute/1.0.1: resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} engines: {node: '>=0.10.0'} dev: true + /path-key/3.1.1: + resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} + engines: {node: '>=8'} + dev: true + /path-parse/1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: true @@ -2041,6 +2104,16 @@ packages: /preact/10.10.1: resolution: {integrity: sha512-cXljG59ylGtSLismoLojXPAGvnh2ipQr3BYz9KZQr+1sdASCT+sR/v8dSMDS96xGCdtln2wHfAHCnLJK+XcBNg==} + /prettier-plugin-astro/0.4.1: + resolution: {integrity: sha512-AvYyg4WDnhmqH5S85EFgJAMU20p1lLypVt4sn4tuGW+lnPfWr70SaHZD9gevx20o3FnALgZxDu1enFSkN/MSwQ==} + engines: {node: ^14.15.0 || >=16.0.0, npm: '>=6.14.0'} + dependencies: + '@astrojs/compiler': 0.19.0 + prettier: 2.7.1 + sass-formatter: 0.7.5 + synckit: 0.7.3 + dev: true + /prettier-plugin-svelte/2.7.0_o3ioganyptcsrh6x4hnxvjkpqi: resolution: {integrity: sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==} peerDependencies: @@ -2138,6 +2211,10 @@ packages: fsevents: 2.3.2 dev: true + /s.color/0.0.15: + resolution: {integrity: sha512-AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA==} + dev: true + /sade/1.8.1: resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==} engines: {node: '>=6'} @@ -2153,6 +2230,12 @@ packages: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} dev: true + /sass-formatter/0.7.5: + resolution: {integrity: sha512-NKFP8ddjhUYi6A/iD1cEtzkEs91U61kzqe3lY9SVNuvX7LGc88xnEN0mmsWL7Ol//YTi2GL/ol7b9XZ2+hgXuA==} + dependencies: + suf-log: 2.5.3 + dev: true + /scheduler/0.23.0: resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} dependencies: @@ -2180,6 +2263,18 @@ packages: resolution: {integrity: sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==} dev: true + /shebang-command/2.0.0: + resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} + engines: {node: '>=8'} + dependencies: + shebang-regex: 3.0.0 + dev: true + + /shebang-regex/3.0.0: + resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} + engines: {node: '>=8'} + dev: true + /shiki/0.10.1: resolution: {integrity: sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==} dependencies: @@ -2248,6 +2343,12 @@ packages: ansi-regex: 5.0.1 dev: true + /suf-log/2.5.3: + resolution: {integrity: sha512-KvC8OPjzdNOe+xQ4XWJV2whQA0aM1kGVczMQ8+dStAO6KfEB140JEVQ9dE76ONZ0/Ylf67ni4tILPJB41U0eow==} + dependencies: + s.color: 0.0.15 + dev: true + /supports-color/5.5.0: resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'} @@ -2274,6 +2375,14 @@ packages: engines: {node: '>= 8'} dev: true + /synckit/0.7.3: + resolution: {integrity: sha512-jNroMv7Juy+mJ/CHW5H6TzsLWpa1qck6sCHbkv8YTur+irSq2PjbvmGnm2gy14BUQ6jF33vyR4DPssHqmqsDQw==} + engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} + dependencies: + '@pkgr/utils': 2.3.0 + tslib: 2.4.0 + dev: true + /tar/6.1.11: resolution: {integrity: sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==} engines: {node: '>= 10'} @@ -2317,6 +2426,10 @@ packages: resolution: {integrity: sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==} dev: true + /tslib/2.4.0: + resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} + dev: true + /ufo/0.8.5: resolution: {integrity: sha512-e4+UtA5IRO+ha6hYklwj6r7BjiGMxS0O+UaSg9HbaTefg4kMkzj4tXzEBajRR+wkxf+golgAWKzLbytCUDMJAA==} dev: true @@ -2465,6 +2578,14 @@ packages: webidl-conversions: 3.0.1 dev: true + /which/2.0.2: + resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} + engines: {node: '>= 8'} + hasBin: true + dependencies: + isexe: 2.0.0 + dev: true + /wide-align/1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} dependencies: