From b52b2bcfe1d533bae1428a8951958bb66e744256 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Mon, 11 Mar 2024 22:40:14 +0100 Subject: [PATCH] Update to Astro 4.5 --- package.json | 6 +- pnpm-lock.yaml | 118 ++++++++++++++++++++++++-------------- src/pages/dashboard.astro | 13 ++--- src/pages/login.astro | 12 ++-- 4 files changed, 87 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index 65f3b5e..184c4bf 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "ci": "pnpm run clean:dist && pnpm install && pnpm run i18n:sync && pnpm run build" }, "devDependencies": { - "@astrojs/svelte": "^5.0.3", + "@astrojs/svelte": "^5.2.0", "@astrojs/tailwind": "^5.1.0", "@astropub/icons": "^0.2.0", "@types/color": "^3.0.6", @@ -41,11 +41,11 @@ "typescript": "^5.3.3" }, "dependencies": { - "@astrojs/mdx": "^2.1.1", + "@astrojs/mdx": "^2.2.0", "@astrojs/sitemap": "^3.1.1", "@codemirror/lang-json": "^6.0.1", "@ddietr/codemirror-themes": "^1.4.2", - "astro": "^4.4.4", + "astro": "^4.5.1", "astro-i18n": "^2.2.4", "astro-robots-txt": "^1.0.0", "astro-seo": "^0.8.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 911591a..84bc439 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@astrojs/mdx': - specifier: ^2.1.1 - version: 2.1.1(astro@4.4.4) + specifier: ^2.2.0 + version: 2.2.0(astro@4.5.1) '@astrojs/sitemap': specifier: ^3.1.1 version: 3.1.1 @@ -18,8 +18,8 @@ dependencies: specifier: ^1.4.2 version: 1.4.2 astro: - specifier: ^4.4.4 - version: 4.4.4(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3) + specifier: ^4.5.1 + version: 4.5.1(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3) astro-i18n: specifier: ^2.2.4 version: 2.2.4(esbuild@0.19.12) @@ -77,14 +77,14 @@ dependencies: devDependencies: '@astrojs/svelte': - specifier: ^5.0.3 - version: 5.0.3(astro@4.4.4)(svelte@4.2.12)(typescript@5.3.3)(vite@5.1.4) + specifier: ^5.2.0 + version: 5.2.0(astro@4.5.1)(svelte@4.2.12)(typescript@5.3.3)(vite@5.1.4) '@astrojs/tailwind': specifier: ^5.1.0 - version: 5.1.0(astro@4.4.4)(tailwindcss@3.4.1) + version: 5.1.0(astro@4.5.1)(tailwindcss@3.4.1) '@astropub/icons': specifier: ^0.2.0 - version: 0.2.0(astro@4.4.4) + version: 0.2.0(astro@4.5.1) '@types/color': specifier: ^3.0.6 version: 3.0.6 @@ -181,8 +181,11 @@ packages: /@astrojs/compiler@2.6.0: resolution: {integrity: sha512-c74k8iGHL3DzkosSJ0tGcHIEBEiIfBhr7eadSaPyvWlVKaieDVzVs8OW1tnRSQyBsfMc8DZQ4RcN2KAcESD8UQ==} - /@astrojs/internal-helpers@0.2.1: - resolution: {integrity: sha512-06DD2ZnItMwUnH81LBLco3tWjcZ1lGU9rLCCBaeUCGYe9cI0wKyY2W3kDyoW1I6GmcWgt1fu+D1CTvz+FIKf8A==} + /@astrojs/compiler@2.7.0: + resolution: {integrity: sha512-XpC8MAaWjD1ff6/IfkRq/5k1EFj6zhCNqXRd5J43SVJEBj/Bsmizkm8N0xOYscGcDFQkRgEw6/eKnI5x/1l6aA==} + + /@astrojs/internal-helpers@0.3.0: + resolution: {integrity: sha512-tGmHvrhpzuz0JBHaJX8GywN9g4rldVNHtkoVDC3m/DdzBO70jGoVuc0uuNVglRYnsdwkbG0K02Iw3nOOR3/Y4g==} /@astrojs/language-server@2.7.5(typescript@5.3.3): resolution: {integrity: sha512-iMfZ3UaqTgIL+z/eUDOppRa1bGUAteWRihbWq5mGAgvr/hu384ZXUKJcqV3BBux0MBsRXwjxzrC2dJu9IpAaoA==} @@ -216,11 +219,13 @@ packages: - typescript dev: false - /@astrojs/markdown-remark@4.2.1: - resolution: {integrity: sha512-2RQBIwrq+2qPYtp99bH+eL5hfbK0BoxXla85lHsRpIX/IsGqFrPX6pXI2cbWPihBwGbKCdxS6uZNX2QerZWwpQ==} + /@astrojs/markdown-remark@4.3.0: + resolution: {integrity: sha512-iZOgYj/yNDvBRfKqkGuAvjeONhjQPq8Uk3HjyIgcTK5valq03NiUgSc5Ovq00yUVBeYJ/5EDx23c8xqtkkBlPw==} dependencies: '@astrojs/prism': 3.0.0 github-slugger: 2.0.0 + hast-util-from-html: 2.0.1 + hast-util-to-text: 4.0.0 import-meta-resolve: 4.0.0 mdast-util-definitions: 6.0.0 rehype-raw: 7.0.0 @@ -229,23 +234,25 @@ packages: remark-parse: 11.0.0 remark-rehype: 11.1.0 remark-smartypants: 2.1.0 - shikiji: 0.9.19 + shiki: 1.1.7 unified: 11.0.4 + unist-util-remove-position: 5.0.0 unist-util-visit: 5.0.0 + unist-util-visit-parents: 6.0.1 vfile: 6.0.1 transitivePeerDependencies: - supports-color - /@astrojs/mdx@2.1.1(astro@4.4.4): - resolution: {integrity: sha512-AgGFdE7HOGmoFooGvMSatkA9FiSKwyVW7ImHot/bXJ6uAbFfu6iG2ht18Cf1pT22Hda/6iSCGWusFvBv0/EnKQ==} + /@astrojs/mdx@2.2.0(astro@4.5.1): + resolution: {integrity: sha512-EkcCniYdGwsh9k5LknqRrz/UyOnMNXdRk7fgDAw/zUDKnm7zgQAG8hIx0FxG1L2IINxLfu7IcjgZb3f5TFpxKw==} engines: {node: '>=18.14.1'} peerDependencies: astro: ^4.0.0 dependencies: - '@astrojs/markdown-remark': 4.2.1 + '@astrojs/markdown-remark': 4.3.0 '@mdx-js/mdx': 3.0.1 acorn: 8.11.3 - astro: 4.4.4(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3) + astro: 4.5.1(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3) es-module-lexer: 1.4.1 estree-util-visit: 2.0.0 github-slugger: 2.0.0 @@ -275,30 +282,31 @@ packages: zod: 3.22.4 dev: false - /@astrojs/svelte@5.0.3(astro@4.4.4)(svelte@4.2.12)(typescript@5.3.3)(vite@5.1.4): - resolution: {integrity: sha512-6TUBRUxmsEczKPBT6oDUAfvzuFCmITuhZfKPT5ZtOOyj9XOVnEnj/Iobd3ajKUbpWNYX7qZVAd1KMkmJc1Nhsg==} + /@astrojs/svelte@5.2.0(astro@4.5.1)(svelte@4.2.12)(typescript@5.3.3)(vite@5.1.4): + resolution: {integrity: sha512-GmwbXks2WMkmAfl0rlPM/2gA1RtmZzjGV2mOceV3g7QNyjIsSYBPKrlEnSFnuR+YMvlAtWdbMFBsb3gtGxnTTg==} engines: {node: '>=18.14.1'} peerDependencies: astro: ^4.0.0 - svelte: ^4.0.0 || ^5.0.0-next.1 + svelte: ^4.0.0 || ^5.0.0-next.56 + typescript: ^5.3.3 dependencies: '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@4.2.12)(vite@5.1.4) - astro: 4.4.4(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3) + astro: 4.5.1(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3) svelte: 4.2.12 svelte2tsx: 0.6.27(svelte@4.2.12)(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color - - typescript - vite dev: true - /@astrojs/tailwind@5.1.0(astro@4.4.4)(tailwindcss@3.4.1): + /@astrojs/tailwind@5.1.0(astro@4.5.1)(tailwindcss@3.4.1): resolution: {integrity: sha512-BJoCDKuWhU9FT2qYg+fr6Nfb3qP4ShtyjXGHKA/4mHN94z7BGcmauQK23iy+YH5qWvTnhqkd6mQPQ1yTZTe9Ig==} peerDependencies: astro: ^3.0.0 || ^4.0.0 tailwindcss: ^3.0.24 dependencies: - astro: 4.4.4(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3) + astro: 4.5.1(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3) autoprefixer: 10.4.17(postcss@8.4.35) postcss: 8.4.35 postcss-load-config: 4.0.2(postcss@8.4.35) @@ -321,12 +329,12 @@ packages: transitivePeerDependencies: - supports-color - /@astropub/icons@0.2.0(astro@4.4.4): + /@astropub/icons@0.2.0(astro@4.5.1): resolution: {integrity: sha512-qM/ldW/9rVHULNOZgz/23Yzgm2r3Iy2JJ1FuvJB6sFU67n61o1ImuXdHiaWSNoEHubD+IUkD9WG0hbhINgszqA==} peerDependencies: astro: '*' dependencies: - astro: 4.4.4(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3) + astro: 4.5.1(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3) dev: true /@babel/code-frame@7.23.5: @@ -992,9 +1000,6 @@ packages: - supports-color dev: false - /@medv/finder@3.1.0: - resolution: {integrity: sha512-ojkXjR3K0Zz3jnCR80tqPL+0yvbZk/lEodb6RIVjLz7W8RVA2wrw8ym/CzCpXO9SYVUIKHFUpc7jvf8UKfIM3w==} - /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -1119,6 +1124,9 @@ packages: requiresBuild: true optional: true + /@shikijs/core@1.1.7: + resolution: {integrity: sha512-gTYLUIuD1UbZp/11qozD3fWpUTuMqPSf3svDMMrL0UmlGU7D9dPw/V1FonwAorCUJBltaaESxq90jrSjQyGixg==} + /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@4.2.12)(vite@5.1.4): resolution: {integrity: sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==} engines: {node: ^18.0.0 || >=20} @@ -1753,14 +1761,14 @@ packages: - typescript dev: false - /astro@4.4.4(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3): - resolution: {integrity: sha512-EZrDTN888w4sFKqavGsHu8jSaymyxNwnoqIq5NKlMG9WNU/Xn4Yn41pUdBuAOrgNzRp1NyXXhhV6GV1pN71V2Q==} + /astro@4.5.1(@types/node@20.11.20)(sass@1.71.1)(typescript@5.3.3): + resolution: {integrity: sha512-xqSBxeDZFUUgHl+npNwgoe6taTOCI8sJNwqWJaK3t/vcCHdfYJX00Tr9g43w/cYKPoTN4wKbNktbKYJZAbE3ZQ==} engines: {node: '>=18.14.1', npm: '>=6.14.0'} hasBin: true dependencies: - '@astrojs/compiler': 2.6.0 - '@astrojs/internal-helpers': 0.2.1 - '@astrojs/markdown-remark': 4.2.1 + '@astrojs/compiler': 2.7.0 + '@astrojs/internal-helpers': 0.3.0 + '@astrojs/markdown-remark': 4.3.0 '@astrojs/telemetry': 3.0.4 '@babel/core': 7.23.9 '@babel/generator': 7.23.6 @@ -1768,7 +1776,7 @@ packages: '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.9) '@babel/traverse': 7.23.9 '@babel/types': 7.23.9 - '@medv/finder': 3.1.0 + '@shikijs/core': 1.1.7 '@types/babel__core': 7.20.5 acorn: 8.11.3 aria-query: 5.3.0 @@ -1810,8 +1818,7 @@ packages: rehype: 13.0.1 resolve: 1.22.8 semver: 7.6.0 - shikiji: 0.9.19 - shikiji-core: 0.9.19 + shiki: 1.1.7 string-width: 7.1.0 strip-ansi: 7.1.0 tsconfck: 3.0.2(typescript@5.3.3) @@ -1822,6 +1829,7 @@ packages: which-pm: 2.1.1 yargs-parser: 21.1.1 zod: 3.22.4 + zod-to-json-schema: 3.22.4(zod@3.22.4) optionalDependencies: sharp: 0.32.6 transitivePeerDependencies: @@ -3332,6 +3340,11 @@ packages: vfile-location: 5.0.2 web-namespaces: 2.0.1 + /hast-util-is-element@3.0.0: + resolution: {integrity: sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==} + dependencies: + '@types/hast': 3.0.4 + /hast-util-parse-selector@4.0.0: resolution: {integrity: sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==} dependencies: @@ -3426,6 +3439,14 @@ packages: web-namespaces: 2.0.1 zwitch: 2.0.4 + /hast-util-to-text@4.0.0: + resolution: {integrity: sha512-EWiE1FSArNBPUo1cKWtzqgnuRQwEeQbQtnFJRYV1hb1BWDgrAlBU0ExptvZMM/KSA82cDpm2sFGf3Dmc5Mza3w==} + dependencies: + '@types/hast': 3.0.4 + '@types/unist': 3.0.2 + hast-util-is-element: 3.0.0 + unist-util-find-after: 5.0.0 + /hast-util-whitespace@3.0.0: resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==} dependencies: @@ -5669,13 +5690,10 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - /shikiji-core@0.9.19: - resolution: {integrity: sha512-AFJu/vcNT21t0e6YrfadZ+9q86gvPum6iywRyt1OtIPjPFe25RQnYJyxHQPMLKCCWA992TPxmEmbNcOZCAJclw==} - - /shikiji@0.9.19: - resolution: {integrity: sha512-Kw2NHWktdcdypCj1GkKpXH4o6Vxz8B8TykPlPuLHOGSV8VkhoCLcFOH4k19K4LXAQYRQmxg+0X/eM+m2sLhAkg==} + /shiki@1.1.7: + resolution: {integrity: sha512-9kUTMjZtcPH3i7vHunA6EraTPpPOITYTdA5uMrvsJRexktqP0s7P3s9HVK80b4pP42FRVe03D7fT3NmJv2yYhw==} dependencies: - shikiji-core: 0.9.19 + '@shikijs/core': 1.1.7 /side-channel@1.0.5: resolution: {integrity: sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==} @@ -6324,6 +6342,12 @@ packages: trough: 2.2.0 vfile: 6.0.1 + /unist-util-find-after@5.0.0: + resolution: {integrity: sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==} + dependencies: + '@types/unist': 3.0.2 + unist-util-is: 6.0.0 + /unist-util-is@5.2.1: resolution: {integrity: sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw==} dependencies: @@ -6356,7 +6380,6 @@ packages: dependencies: '@types/unist': 3.0.2 unist-util-visit: 5.0.0 - dev: false /unist-util-stringify-position@3.0.3: resolution: {integrity: sha512-k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg==} @@ -6795,6 +6818,13 @@ packages: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} + /zod-to-json-schema@3.22.4(zod@3.22.4): + resolution: {integrity: sha512-2Ed5dJ+n/O3cU383xSY28cuVi0BCQhF8nYqWU5paEpl7fVdqdAmiLdqLyfblbNdfOFwFfi/mqU4O1pwc60iBhQ==} + peerDependencies: + zod: ^3.22.4 + dependencies: + zod: 3.22.4 + /zod@3.22.4: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} diff --git a/src/pages/dashboard.astro b/src/pages/dashboard.astro index 2a66748..cb842cd 100644 --- a/src/pages/dashboard.astro +++ b/src/pages/dashboard.astro @@ -5,17 +5,14 @@ import {t} from "astro-i18n"; --- - \ No newline at end of file diff --git a/src/pages/login.astro b/src/pages/login.astro index d654e5d..14f89b0 100644 --- a/src/pages/login.astro +++ b/src/pages/login.astro @@ -7,17 +7,15 @@ import localBau from "@images/2023-10-08_20.43.43.png"; --- - Bau