diff --git a/.changeset/curly-experts-think.md b/.changeset/curly-experts-think.md deleted file mode 100644 index 8696703e7259..000000000000 --- a/.changeset/curly-experts-think.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Improved error messages descriptions and hints to be more informative diff --git a/.changeset/fifty-olives-end.md b/.changeset/fifty-olives-end.md deleted file mode 100644 index 393418e66be1..000000000000 --- a/.changeset/fifty-olives-end.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/image': patch ---- - -Share fallback img src with source of Picture component diff --git a/.changeset/good-ghosts-attack.md b/.changeset/good-ghosts-attack.md deleted file mode 100644 index c4a8404b2c5d..000000000000 --- a/.changeset/good-ghosts-attack.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Allow dynamic segments in injected routes diff --git a/.changeset/heavy-kangaroos-sin.md b/.changeset/heavy-kangaroos-sin.md deleted file mode 100644 index 65dce57a3674..000000000000 --- a/.changeset/heavy-kangaroos-sin.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/mdx': patch ---- - -Preserve code element node `data.meta` in `properties.metastring` for rehype syntax highlighters, like `rehype-pretty-code`` diff --git a/.changeset/plenty-eyes-develop.md b/.changeset/plenty-eyes-develop.md deleted file mode 100644 index 74073721bf49..000000000000 --- a/.changeset/plenty-eyes-develop.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'astro': patch ---- - -404 when not using subpath for items in public in dev - -Previously if using a base like `base: '/subpath/` you could load things from the root, which would break in prod. Now you must include the subpath. diff --git a/.changeset/spotty-planes-fix.md b/.changeset/spotty-planes-fix.md deleted file mode 100644 index c764a4860a9f..000000000000 --- a/.changeset/spotty-planes-fix.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Update Astro language-server to 0.28.3 diff --git a/examples/basics/README.md b/examples/basics/README.md index bea634937867..8252739a4a0d 100644 --- a/examples/basics/README.md +++ b/examples/basics/README.md @@ -1,6 +1,7 @@ # Welcome to [Astro](https://astro.build) [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/basics) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/basics) > πŸ§‘β€πŸš€ **Seasoned astronaut?** Delete this file. Have fun! diff --git a/examples/basics/package.json b/examples/basics/package.json index c8389b9b3c16..e9db32394498 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" } } diff --git a/examples/blog/README.md b/examples/blog/README.md index 32934f6ef280..3fa19109c347 100644 --- a/examples/blog/README.md +++ b/examples/blog/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template blog ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/blog) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/blog) > πŸ§‘β€πŸš€ **Seasoned astronaut?** Delete this file. Have fun! diff --git a/examples/blog/package.json b/examples/blog/package.json index 640e416a0c0d..435363a40b8c 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -11,8 +11,8 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", - "@astrojs/mdx": "^0.11.5", + "astro": "^1.6.7", + "@astrojs/mdx": "^0.11.6", "@astrojs/rss": "^1.0.3", "@astrojs/sitemap": "^1.0.0" } diff --git a/examples/component/README.md b/examples/component/README.md index 91540eae4d07..7675f5f7f79f 100644 --- a/examples/component/README.md +++ b/examples/component/README.md @@ -7,6 +7,7 @@ npm create astro@latest -- --template component ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/non-html-pages) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/non-html-pages) ## πŸš€ Project Structure diff --git a/examples/component/package.json b/examples/component/package.json index ca7887ad0849..62cf8e4c0c41 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,9 +15,9 @@ ], "scripts": {}, "devDependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" }, "peerDependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" } } diff --git a/examples/deno/README.md b/examples/deno/README.md index 9a7d7da61cd4..99ef50b59f4d 100644 --- a/examples/deno/README.md +++ b/examples/deno/README.md @@ -1,6 +1,7 @@ # Welcome to [Astro](https://astro.build) -[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/basics) +[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/deno) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/deno) > πŸ§‘β€πŸš€ **Seasoned astronaut?** Delete this file. Have fun! diff --git a/examples/deno/package.json b/examples/deno/package.json index e3ce7523bc5d..e77712d07776 100644 --- a/examples/deno/package.json +++ b/examples/deno/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" }, "devDependencies": { "@astrojs/deno": "^2.0.0" diff --git a/examples/docs/README.md b/examples/docs/README.md index 68bed033c8e2..810bdfa84311 100644 --- a/examples/docs/README.md +++ b/examples/docs/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template docs ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/docs) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/docs) ![docs](https://user-images.githubusercontent.com/4677417/186189283-0831b9ab-d6b9-485d-8955-3057e532ab31.png) diff --git a/examples/docs/package.json b/examples/docs/package.json index acb5d86b9341..1487c8ea4282 100644 --- a/examples/docs/package.json +++ b/examples/docs/package.json @@ -12,7 +12,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "preact": "^10.7.3", "react": "^18.1.0", "react-dom": "^18.1.0", diff --git a/examples/framework-alpine/README.md b/examples/framework-alpine/README.md index b87682b77a61..559aa0ebd28e 100644 --- a/examples/framework-alpine/README.md +++ b/examples/framework-alpine/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template framework-alpine ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/framework-alpine) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/framework-alpine) This example showcases Astro working with [AlpineJS](https://alpinejs.dev/). diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 0142663938c2..4966b73da111 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "alpinejs": "^3.10.2", "@astrojs/alpinejs": "^0.1.2", "@types/alpinejs": "^3.7.0" diff --git a/examples/framework-lit/README.md b/examples/framework-lit/README.md index 5f84b5db54bf..c1dfebbd2f6d 100644 --- a/examples/framework-lit/README.md +++ b/examples/framework-lit/README.md @@ -5,5 +5,6 @@ npm create astro@latest -- --template framework-lit ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/framework-lit) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/framework-lit) This example showcases Astro working with [Lit](https://lit.dev/). \ No newline at end of file diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index bf4a72957ddd..f9c52f3f71ea 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "lit": "^2.2.5", "@astrojs/lit": "^1.0.0", "@webcomponents/template-shadowroot": "^0.1.0" diff --git a/examples/framework-multiple/README.md b/examples/framework-multiple/README.md index dc3e6d3de432..89efd74ae050 100644 --- a/examples/framework-multiple/README.md +++ b/examples/framework-multiple/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template framework-multiple ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/framework-multiple) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/framework-multiple) This example showcases Astro's built-in support for multiple frameworks ([React](https://reactjs.org), [Preact](https://preactjs.com), [Svelte](https://svelte.dev), and [Vue (`v3.x`)](https://v3.vuejs.org/)). diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 7bbae4ff24f7..2ae47810f8f9 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "preact": "^10.7.3", "react": "^18.1.0", "react-dom": "^18.1.0", diff --git a/examples/framework-preact/README.md b/examples/framework-preact/README.md index 2ba528e71f63..9adc4881c685 100644 --- a/examples/framework-preact/README.md +++ b/examples/framework-preact/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template framework-preact ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/framework-preact) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/framework-preact) This example showcases Astro working with [Preact](https://preactjs.com). diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 0ed034b2923d..0188c47b2532 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "preact": "^10.7.3", "@astrojs/preact": "^1.2.0", "@preact/signals": "^1.1.0" diff --git a/examples/framework-react/README.md b/examples/framework-react/README.md index 1bcf52dcb320..0df421989f50 100644 --- a/examples/framework-react/README.md +++ b/examples/framework-react/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template framework-react ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/framework-react) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/framework-react) This example showcases Astro working with [React](https://reactjs.org/). diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index f375e7d75b12..938e97ab4cd4 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "react": "^18.1.0", "react-dom": "^18.1.0", "@astrojs/react": "^1.2.2", diff --git a/examples/framework-solid/README.md b/examples/framework-solid/README.md index 932ef0699f34..b68f558cf360 100644 --- a/examples/framework-solid/README.md +++ b/examples/framework-solid/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template framework-solid ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/framework-solid) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/framework-solid) This example showcases Astro working with [Solid](https://www.solidjs.com/). diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 58341e3e5d46..a0b6c4bb3085 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "solid-js": "^1.4.3", "@astrojs/solid-js": "^1.2.2" } diff --git a/examples/framework-svelte/README.md b/examples/framework-svelte/README.md index 6ef399f484b1..4b873b0ddbf9 100644 --- a/examples/framework-svelte/README.md +++ b/examples/framework-svelte/README.md @@ -5,5 +5,6 @@ npm create astro@latest -- --template framework-svelte ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/framework-svelte) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/framework-svelte) This example showcases Astro working with [Svelte](https://svelte.dev/). diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 2b0201fe37ee..7695783b4523 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -13,6 +13,6 @@ "dependencies": { "svelte": "^3.48.0", "@astrojs/svelte": "^1.0.2", - "astro": "^1.6.5" + "astro": "^1.6.7" } } diff --git a/examples/framework-vue/README.md b/examples/framework-vue/README.md index 34761e72fbac..40c39838febb 100644 --- a/examples/framework-vue/README.md +++ b/examples/framework-vue/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template framework-vue ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/framework-vue) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/framework-vue) This example showcases Astro working with [Vue](https://v3.vuejs.org/). diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 9442c0aa5886..21c2cf9248bc 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "vue": "^3.2.37", "@astrojs/vue": "^1.2.1" } diff --git a/examples/hackernews/README.md b/examples/hackernews/README.md index aeb16745ab51..718369e87a80 100644 --- a/examples/hackernews/README.md +++ b/examples/hackernews/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template hackernews ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/hackernews) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/hackernews) > πŸ§‘β€πŸš€ **Seasoned astronaut?** Delete this file. Have fun! diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 5e5bd817666e..10282c2e28d2 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -13,6 +13,6 @@ }, "dependencies": { "@astrojs/node": "^3.0.0", - "astro": "^1.6.5" + "astro": "^1.6.7" } } diff --git a/examples/integration/README.md b/examples/integration/README.md index 6d0c85462dfd..eeeb5afa52ad 100644 --- a/examples/integration/README.md +++ b/examples/integration/README.md @@ -7,6 +7,7 @@ npm create astro@latest -- --template integration ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/integration) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/integration) ## πŸš€ Project Structure diff --git a/examples/integration/package.json b/examples/integration/package.json index e96199b4d559..100ca1dddad5 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,9 +15,9 @@ ], "scripts": {}, "devDependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" }, "peerDependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" } } diff --git a/examples/minimal/README.md b/examples/minimal/README.md index da4f712f6bc4..097699e77e7e 100644 --- a/examples/minimal/README.md +++ b/examples/minimal/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template minimal ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/minimal) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/minimal) > πŸ§‘β€πŸš€ **Seasoned astronaut?** Delete this file. Have fun! diff --git a/examples/minimal/astro.config.mjs b/examples/minimal/astro.config.mjs index 42a2cfb42960..882e6515a67e 100644 --- a/examples/minimal/astro.config.mjs +++ b/examples/minimal/astro.config.mjs @@ -1,7 +1,4 @@ import { defineConfig } from 'astro/config'; // https://astro.build/config -export default defineConfig({ - srcDir: '.', - root: '.', -}); +export default defineConfig({}); diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 2d27f7e210db..856660c40a99 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" } } diff --git a/examples/non-html-pages/README.md b/examples/non-html-pages/README.md index 8419813dbfd5..d8d77463b9fc 100644 --- a/examples/non-html-pages/README.md +++ b/examples/non-html-pages/README.md @@ -9,6 +9,7 @@ npm create astro@latest -- --template non-html-pages ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/non-html-pages) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/non-html-pages) > πŸ§‘β€πŸš€ **Seasoned astronaut?** Delete this file. Have fun! diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index f77e0150e734..616abe19e243 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" } } diff --git a/examples/portfolio/README.md b/examples/portfolio/README.md index 68d211132112..8e714f300596 100644 --- a/examples/portfolio/README.md +++ b/examples/portfolio/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template portfolio ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/portfolio) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/portfolio) > πŸ§‘β€πŸš€ **Seasoned astronaut?** Delete this file. Have fun! diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 523ddfb6aef8..b2d603782084 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index d50b9459e1aa..cae69b4bb4d7 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -12,7 +12,7 @@ "server": "node dist/server/entry.mjs" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "svelte": "^3.48.0", "@astrojs/svelte": "^1.0.2", "@astrojs/node": "^3.0.0", diff --git a/examples/with-markdown-plugins/README.md b/examples/with-markdown-plugins/README.md index 2d0b359bdd89..83d12f3f477c 100644 --- a/examples/with-markdown-plugins/README.md +++ b/examples/with-markdown-plugins/README.md @@ -5,5 +5,6 @@ npm create astro@latest -- --template with-markdown-plugins ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/with-markdown-plugins) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/with-markdown-plugins) This example showcases Astro's [built-in Markdown support](https://docs.astro.build/en/guides/markdown-content/) with additional, user-provided plugins. diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 205e514972f4..bf9b6e329d5d 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "@astrojs/markdown-remark": "^1.1.3", "hast-util-select": "5.0.1", "rehype-autolink-headings": "^6.1.1", diff --git a/examples/with-markdown-shiki/README.md b/examples/with-markdown-shiki/README.md index 83596fa5fc68..b22ad2ac530c 100644 --- a/examples/with-markdown-shiki/README.md +++ b/examples/with-markdown-shiki/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template with-markdown-shiki ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/with-markdown-shiki) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/with-markdown-shiki) This example showcases Astro's [built-in Markdown support](https://docs.astro.build/en/guides/markdown-content/). diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index d58bf44b7012..438c8aeb9131 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" } } diff --git a/examples/with-mdx/README.md b/examples/with-mdx/README.md index 8930cd95fea7..49ddf947a0dc 100644 --- a/examples/with-mdx/README.md +++ b/examples/with-mdx/README.md @@ -5,5 +5,6 @@ npm create astro@latest -- --template with-mdx ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/with-mdx) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/with-mdx) This example showcases using [`@astrojs/mdx`](https://www.npmjs.com/package/@astrojs/mdx) to author content using [MDX](https://mdxjs.com/). diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 64467669f343..db6c0f7b2bf3 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -11,9 +11,9 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "preact": "^10.6.5", "@astrojs/preact": "^1.2.0", - "@astrojs/mdx": "^0.11.5" + "@astrojs/mdx": "^0.11.6" } } diff --git a/examples/with-nanostores/README.md b/examples/with-nanostores/README.md index c8851fad1996..9297bb608c3c 100644 --- a/examples/with-nanostores/README.md +++ b/examples/with-nanostores/README.md @@ -5,5 +5,6 @@ npm create astro@latest -- --template with-nanostores ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/with-nanostores) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/with-nanostores) This example showcases using [`nanostores`](https://github.com/nanostores/nanostores) to provide shared state between components of any framework. [**Read our documentation on sharing state**](https://docs.astro.build/en/core-concepts/sharing-state/) for a complete breakdown of this project, along with guides to use React, Vue, Svelte, or Solid! diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index f242f7d4ab08..d98f16c64be0 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "preact": "^10.7.3", "@astrojs/preact": "^1.2.0", "nanostores": "^0.5.12", diff --git a/examples/with-tailwindcss/README.md b/examples/with-tailwindcss/README.md index 896727736d07..afa665b75c07 100644 --- a/examples/with-tailwindcss/README.md +++ b/examples/with-tailwindcss/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template with-tailwindcss ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/with-tailwindcss) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/with-tailwindcss) Astro comes with [Tailwind](https://tailwindcss.com) support out of the box. This example showcases how to style your Astro project with Tailwind. diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 1a8176cbbc6d..d1640fbf6686 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -11,10 +11,10 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^0.11.5", + "@astrojs/mdx": "^0.11.6", "@astrojs/tailwind": "^2.1.2", "@types/canvas-confetti": "^1.4.3", - "astro": "^1.6.5", + "astro": "^1.6.7", "autoprefixer": "^10.4.7", "canvas-confetti": "^1.5.1", "postcss": "^8.4.14", diff --git a/examples/with-vite-plugin-pwa/README.md b/examples/with-vite-plugin-pwa/README.md index 4b5d54f95aa2..7abd4e9ea61e 100644 --- a/examples/with-vite-plugin-pwa/README.md +++ b/examples/with-vite-plugin-pwa/README.md @@ -5,6 +5,7 @@ npm create astro@latest -- --template with-vite-plugin-pwa ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/with-vite-plugin-pwa) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/with-vite-plugin-pwa) > πŸ§‘β€πŸš€ **Seasoned astronaut?** Delete this file. Have fun! diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 0a47fdd7532a..e9d1234338bd 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "vite-plugin-pwa": "0.11.11", "workbox-window": "^6.5.3" } diff --git a/examples/with-vitest/README.md b/examples/with-vitest/README.md index 97a375dda323..94b63ee4ecef 100644 --- a/examples/with-vitest/README.md +++ b/examples/with-vitest/README.md @@ -5,5 +5,6 @@ npm create astro@latest -- --template with-vitest ``` [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/with-vitest) +[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/with-vitest) This example showcases Astro working with [Vitest](https://vitest.dev/). diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index c67d6447c366..684df61df505 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^1.6.5", + "astro": "^1.6.7", "vitest": "^0.20.3" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 3fe64f0e4db1..8cb24f54f4f0 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,31 @@ # astro +## 1.6.7 + +### Patch Changes + +- [#5353](https://github.com/withastro/astro/pull/5353) [`b3d936ac2`](https://github.com/withastro/astro/commit/b3d936ac248c0b939ff830023d75694398094341) Thanks [@matthewp](https://github.com/matthewp)! - Updated the CSS naming algorithm to prevent clashes + +- [#5294](https://github.com/withastro/astro/pull/5294) [`ae41f25e1`](https://github.com/withastro/astro/commit/ae41f25e10a3fb1e5ad72c979ebe27fe55071de3) Thanks [@mrienstra](https://github.com/mrienstra)! - Consistent Markdown frontmatter typing (`MarkdownAstroData["frontmatter"]` in particular was `object` before) + +## 1.6.6 + +### Patch Changes + +- [#5316](https://github.com/withastro/astro/pull/5316) [`a780f2595`](https://github.com/withastro/astro/commit/a780f2595db86a773be0be1fefcbd9cbab2e8fc2) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Improved error messages descriptions and hints to be more informative + +- [#5331](https://github.com/withastro/astro/pull/5331) [`688f8e4bc`](https://github.com/withastro/astro/commit/688f8e4bc1d8a284ee3d29f6122dbdebc02310ff) Thanks [@matthewp](https://github.com/matthewp)! - Allow dynamic segments in injected routes + +- [#5330](https://github.com/withastro/astro/pull/5330) [`7e19e8b30`](https://github.com/withastro/astro/commit/7e19e8b30d0b411d69eb7d9c1de9dc304f084b37) Thanks [@matthewp](https://github.com/matthewp)! - Prevent jsx throws from hanging server + +- [#5328](https://github.com/withastro/astro/pull/5328) [`bcd0f8f8c`](https://github.com/withastro/astro/commit/bcd0f8f8c4c27d19296ec08d7bf7d8f5047d583e) Thanks [@matthewp](https://github.com/matthewp)! - 404 when not using subpath for items in public in dev + + Previously if using a base like `base: '/subpath/` you could load things from the root, which would break in prod. Now you must include the subpath. + +- [#5339](https://github.com/withastro/astro/pull/5339) [`03a8f89d5`](https://github.com/withastro/astro/commit/03a8f89d5ff79f43f4025fda0c93fd3c85482412) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Upgrade `@astrojs/compiler` to latest + +- [#5327](https://github.com/withastro/astro/pull/5327) [`0dcdc6fb1`](https://github.com/withastro/astro/commit/0dcdc6fb1e6160c8a225a65c4810f565e2b673b5) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Update Astro language-server to 0.28.3 + ## 1.6.5 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 104b174da637..729bf019f2e4 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "1.6.5", + "version": "1.6.7", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", @@ -100,7 +100,7 @@ "test:e2e:match": "playwright test -g" }, "dependencies": { - "@astrojs/compiler": "^0.29.5", + "@astrojs/compiler": "^0.29.11", "@astrojs/language-server": "^0.28.3", "@astrojs/markdown-remark": "^1.1.3", "@astrojs/telemetry": "^1.0.1", @@ -188,6 +188,7 @@ "astro-scripts": "workspace:*", "chai": "^4.3.6", "cheerio": "^1.0.0-rc.11", + "eol": "^0.9.1", "memfs": "^3.4.7", "mocha": "^9.2.2", "node-fetch": "^3.2.5", @@ -198,8 +199,7 @@ "remark-code-titles": "^0.1.2", "sass": "^1.52.2", "srcset-parse": "^1.1.0", - "unified": "^10.1.2", - "eol": "^0.9.1" + "unified": "^10.1.2" }, "engines": { "node": "^14.18.0 || >=16.12.0", diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index bf91d6e4d367..d24b194c8c6d 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -1005,6 +1005,8 @@ export interface MarkdownInstance> { default: AstroComponentFactory; } +type MD = MarkdownInstance>; + export interface MDXInstance> extends Omit, 'rawContent' | 'compiledContent'> { /** MDX does not support rawContent! If you need to read the Markdown contents to calculate values (ex. reading time), we suggest injecting frontmatter via remark plugins. Learn more on our docs: https://docs.astro.build/en/guides/integrations-guide/mdx/#inject-frontmatter-via-remark-or-rehype-plugins */ @@ -1083,9 +1085,7 @@ export interface ManifestData { } export interface MarkdownParserResponse extends MarkdownRenderingResult { - frontmatter: { - [key: string]: any; - }; + frontmatter: MD['frontmatter']; } /** @@ -1410,7 +1410,9 @@ export interface SSRResult { _metadata: SSRMetadata; } -export type MarkdownAstroData = { frontmatter: object }; +export type MarkdownAstroData = { + frontmatter: MD['frontmatter']; +}; /* Preview server stuff */ export interface PreviewServer { diff --git a/packages/astro/src/core/build/css-asset-name.ts b/packages/astro/src/core/build/css-asset-name.ts new file mode 100644 index 000000000000..225dd12aa309 --- /dev/null +++ b/packages/astro/src/core/build/css-asset-name.ts @@ -0,0 +1,77 @@ +import type { GetModuleInfo } from 'rollup'; + +import crypto from 'crypto'; +import npath from 'path'; +import { AstroSettings } from '../../@types/astro'; +import { viteID } from '../util.js'; +import { getTopLevelPages } from './graph.js'; + +// The short name for when the hash can be included +// We could get rid of this and only use the createSlugger implementation, but this creates +// slightly prettier names. +export function shortHashedName(id: string, ctx: { getModuleInfo: GetModuleInfo }): string { + const parents = Array.from(getTopLevelPages(id, ctx)); + const firstParentId = parents[0]?.[0].id; + const firstParentName = firstParentId ? npath.parse(firstParentId).name : 'index'; + + const hash = crypto.createHash('sha256'); + for (const [page] of parents) { + hash.update(page.id, 'utf-8'); + } + const h = hash.digest('hex').slice(0, 8); + const proposedName = firstParentName + '.' + h; + return proposedName; +} + +export function createSlugger(settings: AstroSettings) { + const pagesDir = viteID(new URL('./pages', settings.config.srcDir)); + const map = new Map>(); + const sep = '-'; + return function (id: string, ctx: { getModuleInfo: GetModuleInfo }): string { + const parents = Array.from(getTopLevelPages(id, ctx)); + const allParentsKey = parents + .map(([page]) => page.id) + .sort() + .join('-'); + const firstParentId = parents[0]?.[0].id || 'index'; + + // Use the last two segments, for ex /docs/index + let dir = firstParentId; + let key = ''; + let i = 0; + while (i < 2) { + if (dir === pagesDir) { + break; + } + + const name = npath.parse(npath.basename(dir)).name; + key = key.length ? name + sep + key : name; + dir = npath.dirname(dir); + i++; + } + + // Keep track of how many times this was used. + let name = key; + + // The map keeps track of how many times a key, like `pages_index` is used as the name. + // If the same key is used more than once we increment a number so it becomes `pages-index-1`. + // This guarantees that it stays unique, without sacrificing pretty names. + if (!map.has(key)) { + map.set(key, new Map([[allParentsKey, 0]])); + } else { + const inner = map.get(key)!; + if (inner.has(allParentsKey)) { + const num = inner.get(allParentsKey)!; + if (num > 0) { + name = name + sep + num; + } + } else { + const num = inner.size; + inner.set(allParentsKey, num); + name = name + sep + num; + } + } + + return name; + }; +} diff --git a/packages/astro/src/core/build/vite-plugin-css.ts b/packages/astro/src/core/build/vite-plugin-css.ts index 347786ea5340..eb4f6f3ac0f8 100644 --- a/packages/astro/src/core/build/vite-plugin-css.ts +++ b/packages/astro/src/core/build/vite-plugin-css.ts @@ -2,12 +2,12 @@ import type { GetModuleInfo } from 'rollup'; import type { BuildInternals } from './internal'; import type { PageBuildData, StaticBuildOptions } from './types'; -import crypto from 'crypto'; import esbuild from 'esbuild'; -import npath from 'path'; import { Plugin as VitePlugin, ResolvedConfig } from 'vite'; import { isCSSRequest } from '../render/util.js'; -import { getTopLevelPages, moduleIsTopLevelPage, walkParentInfos } from './graph.js'; + +import * as assetName from './css-asset-name.js'; +import { moduleIsTopLevelPage, walkParentInfos } from './graph.js'; import { eachPageData, getPageDataByViteID, @@ -28,20 +28,6 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] let resolvedConfig: ResolvedConfig; - function createNameForParentPages(id: string, ctx: { getModuleInfo: GetModuleInfo }): string { - const parents = Array.from(getTopLevelPages(id, ctx)); - const firstParentId = parents[0]?.[0].id; - const firstParentName = firstParentId ? npath.parse(firstParentId).name : 'index'; - - const hash = crypto.createHash('sha256'); - for (const [page] of parents) { - hash.update(page.id, 'utf-8'); - } - const h = hash.digest('hex').slice(0, 8); - const proposedName = firstParentName + '.' + h; - return proposedName; - } - function* getParentClientOnlys( id: string, ctx: { getModuleInfo: GetModuleInfo } @@ -57,6 +43,11 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] outputOptions(outputOptions) { const manualChunks = outputOptions.manualChunks || Function.prototype; + const assetFileNames = outputOptions.assetFileNames; + const namingIncludesHash = assetFileNames?.toString().includes('[hash]'); + const createNameForParentPages = namingIncludesHash + ? assetName.shortHashedName + : assetName.createSlugger(settings); outputOptions.manualChunks = function (id, ...args) { // Defer to user-provided `manualChunks`, if it was provided. if (typeof manualChunks == 'object') { diff --git a/packages/astro/src/jsx-runtime/index.ts b/packages/astro/src/jsx-runtime/index.ts index bbef1f2f529e..86d96494a891 100644 --- a/packages/astro/src/jsx-runtime/index.ts +++ b/packages/astro/src/jsx-runtime/index.ts @@ -7,7 +7,7 @@ export interface AstroVNode { [Renderer]: string; [AstroJSX]: boolean; type: string | ((...args: any) => any); - props: Record; + props: Record; } const toSlotName = (slotAttr: string) => slotAttr; diff --git a/packages/astro/src/runtime/server/hydration.ts b/packages/astro/src/runtime/server/hydration.ts index 24552cf30eea..07a42445b12d 100644 --- a/packages/astro/src/runtime/server/hydration.ts +++ b/packages/astro/src/runtime/server/hydration.ts @@ -23,14 +23,14 @@ export interface HydrationMetadata { interface ExtractedProps { isPage: boolean; hydration: HydrationMetadata | null; - props: Record; + props: Record; } // Used to extract the directives, aka `client:load` information about a component. // Finds these special props and removes them from what gets passed into the component. export function extractDirectives( displayName: string, - inputProps: Record + inputProps: Record ): ExtractedProps { let extracted: ExtractedProps = { isPage: false, @@ -105,6 +105,9 @@ export function extractDirectives( extracted.props[key] = value; } } + for (const sym of Object.getOwnPropertySymbols(inputProps)) { + extracted.props[sym] = inputProps[sym]; + } return extracted; } diff --git a/packages/astro/src/runtime/server/jsx.ts b/packages/astro/src/runtime/server/jsx.ts index 05efe2b31beb..8b976b2e8485 100644 --- a/packages/astro/src/runtime/server/jsx.ts +++ b/packages/astro/src/runtime/server/jsx.ts @@ -1,6 +1,6 @@ /* eslint-disable no-console */ import { SSRResult } from '../../@types/astro.js'; -import { AstroJSX, isVNode } from '../../jsx-runtime/index.js'; +import { AstroJSX, AstroVNode, isVNode } from '../../jsx-runtime/index.js'; import { escapeHTML, HTMLString, @@ -15,7 +15,26 @@ import type { ComponentIterable } from './render/component'; const ClientOnlyPlaceholder = 'astro-client-only'; -const skipAstroJSXCheck = new WeakSet(); +class Skip { + count: number; + constructor(public vnode: AstroVNode) { + this.count = 0; + } + + increment() { + this.count++; + } + + haveNoTried() { + return this.count === 0; + } + + isCompleted() { + return this.count > 2; + } + static symbol = Symbol('astro:jsx:skip'); +} + let originalConsoleError: any; let consoleFilterRefs = 0; @@ -37,6 +56,23 @@ export async function renderJSX(result: SSRResult, vnode: any): Promise { (await Promise.all(vnode.map((v: any) => renderJSX(result, v)))).join('') ); } + + // Extract the skip from the props, if we've already attempted a previous render + let skip: Skip; + if (vnode.props) { + if (vnode.props[Skip.symbol]) { + skip = vnode.props[Skip.symbol]; + } else { + skip = new Skip(vnode); + } + } else { + skip = new Skip(vnode); + } + + return renderJSXVNode(result, vnode, skip); +} + +async function renderJSXVNode(result: SSRResult, vnode: AstroVNode, skip: Skip): Promise { if (isVNode(vnode)) { switch (true) { case !vnode.type: { @@ -68,25 +104,35 @@ Did you forget to import the component or is it possible there is a typo?`); if (vnode.type) { if (typeof vnode.type === 'function' && (vnode.type as any)['astro:renderer']) { - skipAstroJSXCheck.add(vnode.type); + skip.increment(); } if (typeof vnode.type === 'function' && vnode.props['server:root']) { const output = await vnode.type(vnode.props ?? {}); return await renderJSX(result, output); } - if (typeof vnode.type === 'function' && !skipAstroJSXCheck.has(vnode.type)) { - useConsoleFilter(); - try { - const output = await vnode.type(vnode.props ?? {}); - if (output && output[AstroJSX]) { - return await renderJSX(result, output); - } else if (!output) { - return await renderJSX(result, output); + if (typeof vnode.type === 'function') { + if (skip.haveNoTried() || skip.isCompleted()) { + useConsoleFilter(); + try { + const output = await vnode.type(vnode.props ?? {}); + let renderResult: any; + if (output && output[AstroJSX]) { + renderResult = await renderJSXVNode(result, output, skip); + return renderResult; + } else if (!output) { + renderResult = await renderJSXVNode(result, output, skip); + return renderResult; + } + } catch (e: unknown) { + if (skip.isCompleted()) { + throw e; + } + skip.increment(); + } finally { + finishUsingConsoleFilter(); } - } catch (e) { - skipAstroJSXCheck.add(vnode.type); - } finally { - finishUsingConsoleFilter(); + } else { + skip.increment(); } } @@ -128,6 +174,7 @@ Did you forget to import the component or is it possible there is a typo?`); } await Promise.all(slotPromises); + props[Skip.symbol] = skip; let output: ComponentIterable; if (vnode.type === ClientOnlyPlaceholder && vnode.props['client:only']) { output = await renderComponent( diff --git a/packages/astro/src/vite-plugin-astro-server/base.ts b/packages/astro/src/vite-plugin-astro-server/base.ts index 4fad19a2b7cc..7be3acb9f1fa 100644 --- a/packages/astro/src/vite-plugin-astro-server/base.ts +++ b/packages/astro/src/vite-plugin-astro-server/base.ts @@ -2,7 +2,7 @@ import type * as vite from 'vite'; import type { AstroSettings } from '../@types/astro'; import * as fs from 'fs'; -import { LogOptions } from '../core/logger/core.js'; +import { LogOptions, warn } from '../core/logger/core.js'; import notFoundTemplate, { subpathNotUsedTemplate } from '../template/4xx.js'; import { log404 } from './common.js'; import { writeHtmlResponse } from './response.js'; @@ -13,7 +13,8 @@ export function baseMiddleware( ): vite.Connect.NextHandleFunction { const { config } = settings; const site = config.site ? new URL(config.base, config.site) : undefined; - const devRoot = site ? site.pathname : new URL(config.base, 'http://localhost').pathname; + const devRootURL = new URL(config.base, 'http://localhost'); + const devRoot = site ? site.pathname : devRootURL.pathname; return function devBaseMiddleware(req, res, next) { const url = req.url!; @@ -46,9 +47,16 @@ export function baseMiddleware( const publicPath = new URL('.' + req.url, config.publicDir); fs.stat(publicPath, (_err, stats) => { if (stats) { - log404(logging, pathname); - const html = subpathNotUsedTemplate(devRoot, pathname); - return writeHtmlResponse(res, 404, html); + const expectedLocation = new URL('.' + url, devRootURL).pathname; + warn( + logging, + 'dev', + `Requests for items in your public folder must also include your base. ${url} should be ${expectedLocation}. Omitting the base will break in production.` + ); + res.writeHead(301, { + Location: expectedLocation, + }); + res.end(); } else { next(); } diff --git a/packages/astro/test/astro-css-bundling.test.js b/packages/astro/test/astro-css-bundling.test.js index 1c470c0ef55b..a039a94d4545 100644 --- a/packages/astro/test/astro-css-bundling.test.js +++ b/packages/astro/test/astro-css-bundling.test.js @@ -19,42 +19,91 @@ const UNEXPECTED_CSS = [ ]; describe('CSS Bundling', function () { + /** @type {import('./test-utils').Fixture} */ let fixture; - before(async () => { - fixture = await loadFixture({ - root: './fixtures/astro-css-bundling/', + describe('defaults', () => { + before(async () => { + fixture = await loadFixture({ + root: './fixtures/astro-css-bundling/', + }); + await fixture.build({ mode: 'production' }); }); - await fixture.build({ mode: 'production' }); - }); - it('Bundles CSS', async () => { - const builtCSS = new Set(); + it('Bundles CSS', async () => { + const builtCSS = new Set(); - // for all HTML files… - for (const [filepath, css] of Object.entries(EXPECTED_CSS)) { - const html = await fixture.readFile(filepath); - const $ = cheerio.load(html); + // for all HTML files… + for (const [filepath, css] of Object.entries(EXPECTED_CSS)) { + const html = await fixture.readFile(filepath); + const $ = cheerio.load(html); - // test 1: assert new bundled CSS is present - for (const href of css) { - const link = $(`link[rel="stylesheet"][href^="${href}"]`); - expect(link.length).to.be.greaterThanOrEqual(1); - const outHref = link.attr('href'); - builtCSS.add(outHref.startsWith('../') ? outHref.slice(2) : outHref); - } + // test 1: assert new bundled CSS is present + for (const href of css) { + const link = $(`link[rel="stylesheet"][href^="${href}"]`); + expect(link.length).to.be.greaterThanOrEqual(1); + const outHref = link.attr('href'); + builtCSS.add(outHref.startsWith('../') ? outHref.slice(2) : outHref); + } - // test 2: assert old CSS was removed - for (const href of UNEXPECTED_CSS) { - const link = $(`link[rel="stylesheet"][href="${href}"]`); - expect(link).to.have.lengthOf(0); - } + // test 2: assert old CSS was removed + for (const href of UNEXPECTED_CSS) { + const link = $(`link[rel="stylesheet"][href="${href}"]`); + expect(link).to.have.lengthOf(0); + } - // test 3: assert all bundled CSS was built and contains CSS - for (const url of builtCSS.keys()) { - const bundledCss = await fixture.readFile(url); - expect(bundledCss).to.be.ok; + // test 3: assert all bundled CSS was built and contains CSS + for (const url of builtCSS.keys()) { + const bundledCss = await fixture.readFile(url); + expect(bundledCss).to.be.ok; + } } - } + }); + + it('there are 4 css files', async () => { + const dir = await fixture.readdir('/assets'); + expect(dir).to.have.a.lengthOf(4); + }); + + it('CSS includes hashes', async () => { + const [firstFound] = await fixture.readdir('/assets'); + expect(firstFound).to.match(/[a-z]+\.[0-9a-z]{8}\.css/); + }); + }); + + describe('using custom assetFileNames config', () => { + before(async () => { + fixture = await loadFixture({ + root: './fixtures/astro-css-bundling/', + + vite: { + build: { + rollupOptions: { + output: { + assetFileNames: 'assets/[name][extname]', + entryFileNames: '[name].js', + }, + }, + }, + }, + }); + await fixture.build({ mode: 'production' }); + }); + + it('there are 4 css files', async () => { + const dir = await fixture.readdir('/assets'); + expect(dir).to.have.a.lengthOf(4); + }); + + it('CSS does not include hashes hashes', async () => { + const [firstFound] = await fixture.readdir('/assets'); + expect(firstFound).to.not.match(/[a-z]+\.[0-9a-z]{8}\.css/); + }); + + it('there are 2 index named CSS files', async () => { + const dir = await fixture.readdir('/assets'); + const indexNamedFiles = dir.filter((name) => name.startsWith('index')); + expect(indexNamedFiles).to.have.a.lengthOf(2); + }); }); }); diff --git a/packages/astro/test/astro-directives.test.js b/packages/astro/test/astro-directives.test.js index be2a4e5e45ba..7f47ff60f8bc 100644 --- a/packages/astro/test/astro-directives.test.js +++ b/packages/astro/test/astro-directives.test.js @@ -36,7 +36,8 @@ describe('Directives', async () => { const html = await fixture.readFile('/define-vars/index.html'); const $ = cheerio.load(html); - expect($('style')).to.have.lengthOf(2); + // All styles should be bundled + expect($('style')).to.have.lengthOf(0); // Inject style attribute on top-level element in page expect($('html').attr('style').toString()).to.include('--bg: white;'); diff --git a/packages/astro/test/units/dev/dev.test.js b/packages/astro/test/units/dev/dev.test.js index ad3fba650eb3..eddc14c5dd5b 100644 --- a/packages/astro/test/units/dev/dev.test.js +++ b/packages/astro/test/units/dev/dev.test.js @@ -187,7 +187,8 @@ describe('dev container', () => { container.handle(r.req, r.res); await r.done; - expect(r.res.statusCode).to.equal(404); + expect(r.res.statusCode).to.equal(301); + expect(r.res.getHeader('location')).to.equal('/sub/test.txt'); } ); }); diff --git a/packages/astro/test/units/render/jsx.test.js b/packages/astro/test/units/render/jsx.test.js index 5cafd582c1f6..a34b6b53b525 100644 --- a/packages/astro/test/units/render/jsx.test.js +++ b/packages/astro/test/units/render/jsx.test.js @@ -1,6 +1,11 @@ import { expect } from 'chai'; -import { createComponent, render, renderSlot } from '../../../dist/runtime/server/index.js'; +import { + createComponent, + render, + renderComponent, + renderSlot, +} from '../../../dist/runtime/server/index.js'; import { jsx } from '../../../dist/jsx-runtime/index.js'; import { createBasicEnvironment, @@ -90,5 +95,25 @@ describe('core/render', () => { '

works

works

' ); }); + + it('Errors in JSX components are raised', async () => { + const Component = createAstroJSXComponent(() => { + throw new Error('uh oh'); + }); + + const Page = createComponent((result, _props) => { + return render`
${renderComponent(result, 'Component', Component, {})}
`; + }); + + const ctx = createRenderContext({ request: new Request('http://example.com/') }); + const response = await renderPage(createAstroModule(Page), ctx, env); + + try { + await response.text(); + expect(false).to.equal(true, 'should not have been successful'); + } catch (err) { + expect(err.message).to.equal('uh oh'); + } + }); }); }); diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 66c05bba1006..1463d0e542d4 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -37,7 +37,7 @@ "esbuild": "^0.14.42" }, "peerDependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 966b651ef42d..0ee8cb2133d7 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -32,7 +32,7 @@ "esbuild": "^0.14.43" }, "peerDependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/image/CHANGELOG.md b/packages/integrations/image/CHANGELOG.md index 42256f146032..cc05d06b809b 100644 --- a/packages/integrations/image/CHANGELOG.md +++ b/packages/integrations/image/CHANGELOG.md @@ -1,5 +1,17 @@ # @astrojs/image +## 0.11.4 + +### Patch Changes + +- [#5360](https://github.com/withastro/astro/pull/5360) [`20e60c6e0`](https://github.com/withastro/astro/commit/20e60c6e0857f7b6938494df6027e8c1ad74cdc1) Thanks [@matthewp](https://github.com/matthewp)! - Fixes regression with local builds + +## 0.11.3 + +### Patch Changes + +- [#5324](https://github.com/withastro/astro/pull/5324) [`dc00ca464`](https://github.com/withastro/astro/commit/dc00ca464865feccd3760b54e0ccc58dbc1e804d) Thanks [@bluwy](https://github.com/bluwy)! - Share fallback img src with source of Picture component + ## 0.11.2 ### Patch Changes diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index 5e6ee1584d9e..0baaeeae0e09 100644 --- a/packages/integrations/image/package.json +++ b/packages/integrations/image/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/image", "description": "Load and transform images in your Astro site.", - "version": "0.11.2", + "version": "0.11.4", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/image/src/index.ts b/packages/integrations/image/src/index.ts index 60e5e167900a..e3770d5e91e9 100644 --- a/packages/integrations/image/src/index.ts +++ b/packages/integrations/image/src/index.ts @@ -11,12 +11,6 @@ export { getPicture } from './lib/get-picture.js'; const PKG_NAME = '@astrojs/image'; const ROUTE_PATTERN = '/_image'; -const UNSUPPORTED_ADAPTERS = new Set([ - '@astrojs/cloudflare', - '@astrojs/deno', - '@astrojs/netlify/edge-functions', - '@astrojs/vercel/edge', -]); interface BuildConfig { client: URL; @@ -106,13 +100,6 @@ export default function integration(options: IntegrationOptions = {}): AstroInte _buildConfig = config.build; }, 'astro:build:start': ({ buildConfig }) => { - const adapterName = _config.adapter?.name; - if (adapterName && UNSUPPORTED_ADAPTERS.has(adapterName)) { - throw new Error( - `@astrojs/image is not supported with the ${adapterName} adapter. Please choose a Node.js compatible adapter.` - ); - } - // Backwards compat if (needsBuildConfig) { _buildConfig = buildConfig; diff --git a/packages/integrations/image/src/loaders/squoosh.ts b/packages/integrations/image/src/loaders/squoosh.ts index 5d71cdb7fbce..87d6e26ec1ad 100644 --- a/packages/integrations/image/src/loaders/squoosh.ts +++ b/packages/integrations/image/src/loaders/squoosh.ts @@ -3,12 +3,11 @@ import { red } from 'kleur/colors'; import { error } from '../utils/logger.js'; import { metadata } from '../utils/metadata.js'; import { isRemoteImage } from '../utils/paths.js'; +import { processBuffer } from '../vendor/squoosh/image-pool.js'; import type { Operation } from '../vendor/squoosh/image.js'; import type { OutputFormat, TransformOptions } from './index.js'; import { BaseSSRService } from './index.js'; -const imagePoolModulePromise = import('../vendor/squoosh/image-pool.js'); - class SquooshService extends BaseSSRService { async processAvif(image: any, transform: TransformOptions) { const encodeOptions = transform.quality @@ -113,7 +112,7 @@ class SquooshService extends BaseSSRService { }); throw new Error(`Unknown image output: "${transform.format}" used for ${transform.src}`); } - const { processBuffer } = await imagePoolModulePromise; + const data = await processBuffer(inputBuffer, operations, transform.format, transform.quality); return { diff --git a/packages/integrations/image/src/vendor/squoosh/image-pool.ts b/packages/integrations/image/src/vendor/squoosh/image-pool.ts index e19215397c89..d29245fb40dc 100644 --- a/packages/integrations/image/src/vendor/squoosh/image-pool.ts +++ b/packages/integrations/image/src/vendor/squoosh/image-pool.ts @@ -1,6 +1,5 @@ import { isMainThread } from 'node:worker_threads'; import { cpus } from 'os'; -import { fileURLToPath } from 'url'; import type { OutputFormat } from '../../loaders/index.js'; import execOnce from '../../utils/execOnce.js'; import WorkerPool from '../../utils/workerPool.js'; @@ -13,7 +12,7 @@ const getWorker = execOnce( // There will be at most 7 workers needed since each worker will take // at least 1 operation type. Math.max(1, Math.min(cpus().length - 1, 7)), - fileURLToPath(import.meta.url) + './node_modules/@astrojs/image/dist/vendor/squoosh/image-pool.js' ); } ) diff --git a/packages/integrations/image/src/vite-plugin-astro-image.ts b/packages/integrations/image/src/vite-plugin-astro-image.ts index 1381ecde1719..04f2303414d7 100644 --- a/packages/integrations/image/src/vite-plugin-astro-image.ts +++ b/packages/integrations/image/src/vite-plugin-astro-image.ts @@ -113,27 +113,6 @@ export function createPlugin(config: AstroConfig, options: Required { - for (const name of Object.keys(chunk.modules)) { - if (name.endsWith('vendor/squoosh/image-pool.js')) { - return '[name].[hash].mjs'; - } - } - - if (typeof chunkFileNames === 'function') { - return chunkFileNames.call(this, chunk); - } - - return chunkFileNames!; - }; - } - }, async renderChunk(code) { const assetUrlRE = /__ASTRO_IMAGE_ASSET__([a-z\d]{8})__(?:_(.*?)__)?/g; diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md index 62ecd2391047..1ec6bf704eb5 100644 --- a/packages/integrations/mdx/CHANGELOG.md +++ b/packages/integrations/mdx/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/mdx +## 0.11.6 + +### Patch Changes + +- [#5335](https://github.com/withastro/astro/pull/5335) [`dca762cf7`](https://github.com/withastro/astro/commit/dca762cf734a657d8f126fd6958892b6163a4f67) Thanks [@bluwy](https://github.com/bluwy)! - Preserve code element node `data.meta` in `properties.metastring` for rehype syntax highlighters, like `rehype-pretty-code`` + ## 0.11.5 ### Patch Changes diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index 44189f4e3204..41ff139ce095 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/mdx", "description": "Use MDX within Astro", - "version": "0.11.5", + "version": "0.11.6", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index bcf2c24031b5..60bedb9a15df 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -34,7 +34,7 @@ "send": "^0.18.0" }, "peerDependencies": { - "astro": "^1.6.5" + "astro": "^1.6.7" }, "devDependencies": { "@types/send": "^0.17.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index faae2174ae54..abdbf0d87729 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -61,16 +61,16 @@ importers: examples/basics: specifiers: - astro: ^1.6.5 + astro: ^1.6.7 dependencies: astro: link:../../packages/astro examples/blog: specifiers: - '@astrojs/mdx': ^0.11.5 + '@astrojs/mdx': ^0.11.6 '@astrojs/rss': ^1.0.3 '@astrojs/sitemap': ^1.0.0 - astro: ^1.6.5 + astro: ^1.6.7 dependencies: '@astrojs/mdx': link:../../packages/integrations/mdx '@astrojs/rss': link:../../packages/astro-rss @@ -79,14 +79,14 @@ importers: examples/component: specifiers: - astro: ^1.6.5 + astro: ^1.6.7 devDependencies: astro: link:../../packages/astro examples/deno: specifiers: '@astrojs/deno': ^2.0.0 - astro: ^1.6.5 + astro: ^1.6.7 dependencies: astro: link:../../packages/astro devDependencies: @@ -102,7 +102,7 @@ importers: '@types/node': ^18.0.0 '@types/react': ^17.0.45 '@types/react-dom': ^18.0.0 - astro: ^1.6.5 + astro: ^1.6.7 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -125,7 +125,7 @@ importers: '@astrojs/alpinejs': ^0.1.2 '@types/alpinejs': ^3.7.0 alpinejs: ^3.10.2 - astro: ^1.6.5 + astro: ^1.6.7 dependencies: '@astrojs/alpinejs': link:../../packages/integrations/alpinejs '@types/alpinejs': 3.7.1 @@ -136,7 +136,7 @@ importers: specifiers: '@astrojs/lit': ^1.0.0 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.6.5 + astro: ^1.6.7 lit: ^2.2.5 dependencies: '@astrojs/lit': link:../../packages/integrations/lit @@ -151,7 +151,7 @@ importers: '@astrojs/solid-js': ^1.2.2 '@astrojs/svelte': ^1.0.2 '@astrojs/vue': ^1.2.1 - astro: ^1.6.5 + astro: ^1.6.7 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -169,14 +169,14 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 examples/framework-preact: specifiers: '@astrojs/preact': ^1.2.0 '@preact/signals': ^1.1.0 - astro: ^1.6.5 + astro: ^1.6.7 preact: ^10.7.3 dependencies: '@astrojs/preact': link:../../packages/integrations/preact @@ -189,7 +189,7 @@ importers: '@astrojs/react': ^1.2.2 '@types/react': ^18.0.10 '@types/react-dom': ^18.0.5 - astro: ^1.6.5 + astro: ^1.6.7 react: ^18.1.0 react-dom: ^18.1.0 dependencies: @@ -203,7 +203,7 @@ importers: examples/framework-solid: specifiers: '@astrojs/solid-js': ^1.2.2 - astro: ^1.6.5 + astro: ^1.6.7 solid-js: ^1.4.3 dependencies: '@astrojs/solid-js': link:../../packages/integrations/solid @@ -213,52 +213,52 @@ importers: examples/framework-svelte: specifiers: '@astrojs/svelte': ^1.0.2 - astro: ^1.6.5 + astro: ^1.6.7 svelte: ^3.48.0 dependencies: '@astrojs/svelte': link:../../packages/integrations/svelte astro: link:../../packages/astro - svelte: 3.52.0 + svelte: 3.53.0 examples/framework-vue: specifiers: '@astrojs/vue': ^1.2.1 - astro: ^1.6.5 + astro: ^1.6.7 vue: ^3.2.37 dependencies: '@astrojs/vue': link:../../packages/integrations/vue astro: link:../../packages/astro - vue: 3.2.41 + vue: 3.2.44 examples/hackernews: specifiers: '@astrojs/node': ^3.0.0 - astro: ^1.6.5 + astro: ^1.6.7 dependencies: '@astrojs/node': link:../../packages/integrations/node astro: link:../../packages/astro examples/integration: specifiers: - astro: ^1.6.5 + astro: ^1.6.7 devDependencies: astro: link:../../packages/astro examples/minimal: specifiers: - astro: ^1.6.5 + astro: ^1.6.7 dependencies: astro: link:../../packages/astro examples/non-html-pages: specifiers: - astro: ^1.6.5 + astro: ^1.6.7 dependencies: astro: link:../../packages/astro examples/portfolio: specifiers: - astro: ^1.6.5 + astro: ^1.6.7 dependencies: astro: link:../../packages/astro @@ -266,7 +266,7 @@ importers: specifiers: '@astrojs/node': ^3.0.0 '@astrojs/svelte': ^1.0.2 - astro: ^1.6.5 + astro: ^1.6.7 concurrently: ^7.2.1 svelte: ^3.48.0 unocss: ^0.15.6 @@ -276,14 +276,14 @@ importers: '@astrojs/svelte': link:../../packages/integrations/svelte astro: link:../../packages/astro concurrently: 7.5.0 - svelte: 3.52.0 + svelte: 3.53.0 unocss: 0.15.6 vite-imagetools: 4.0.11 examples/with-markdown-plugins: specifiers: '@astrojs/markdown-remark': ^1.1.3 - astro: ^1.6.5 + astro: ^1.6.7 hast-util-select: 5.0.1 rehype-autolink-headings: ^6.1.1 rehype-slug: ^5.0.1 @@ -300,15 +300,15 @@ importers: examples/with-markdown-shiki: specifiers: - astro: ^1.6.5 + astro: ^1.6.7 dependencies: astro: link:../../packages/astro examples/with-mdx: specifiers: - '@astrojs/mdx': ^0.11.5 + '@astrojs/mdx': ^0.11.6 '@astrojs/preact': ^1.2.0 - astro: ^1.6.5 + astro: ^1.6.7 preact: ^10.6.5 dependencies: '@astrojs/mdx': link:../../packages/integrations/mdx @@ -320,7 +320,7 @@ importers: specifiers: '@astrojs/preact': ^1.2.0 '@nanostores/preact': ^0.1.3 - astro: ^1.6.5 + astro: ^1.6.7 nanostores: ^0.5.12 preact: ^10.7.3 dependencies: @@ -332,10 +332,10 @@ importers: examples/with-tailwindcss: specifiers: - '@astrojs/mdx': ^0.11.5 + '@astrojs/mdx': ^0.11.6 '@astrojs/tailwind': ^2.1.2 '@types/canvas-confetti': ^1.4.3 - astro: ^1.6.5 + astro: ^1.6.7 autoprefixer: ^10.4.7 canvas-confetti: ^1.5.1 postcss: ^8.4.14 @@ -348,11 +348,11 @@ importers: autoprefixer: 10.4.13_postcss@8.4.18 canvas-confetti: 1.6.0 postcss: 8.4.18 - tailwindcss: 3.2.2_postcss@8.4.18 + tailwindcss: 3.2.3_postcss@8.4.18 examples/with-vite-plugin-pwa: specifiers: - astro: ^1.6.5 + astro: ^1.6.7 vite-plugin-pwa: 0.11.11 workbox-window: ^6.5.3 dependencies: @@ -362,7 +362,7 @@ importers: examples/with-vitest: specifiers: - astro: ^1.6.5 + astro: ^1.6.7 vitest: ^0.20.3 dependencies: astro: link:../../packages/astro @@ -370,7 +370,7 @@ importers: packages/astro: specifiers: - '@astrojs/compiler': ^0.29.5 + '@astrojs/compiler': ^0.29.11 '@astrojs/language-server': ^0.28.3 '@astrojs/markdown-remark': ^1.1.3 '@astrojs/telemetry': ^1.0.1 @@ -469,13 +469,13 @@ importers: yargs-parser: ^21.0.1 zod: ^3.17.3 dependencies: - '@astrojs/compiler': 0.29.9 + '@astrojs/compiler': 0.29.11 '@astrojs/language-server': 0.28.3 '@astrojs/markdown-remark': link:../markdown/remark '@astrojs/telemetry': link:../telemetry '@astrojs/webapi': link:../webapi '@babel/core': 7.20.2 - '@babel/generator': 7.20.3 + '@babel/generator': 7.20.4 '@babel/parser': 7.20.3 '@babel/plugin-transform-react-jsx': 7.19.0_@babel+core@7.20.2 '@babel/traverse': 7.20.1 @@ -526,7 +526,7 @@ importers: typescript: 4.8.4 unist-util-visit: 4.1.1 vfile: 5.3.5 - vite: 3.2.3_sass@1.56.0 + vite: 3.2.3_sass@1.56.1 vitefu: 0.2.0_vite@3.2.3 yargs-parser: 21.1.1 zod: 3.19.1 @@ -565,7 +565,7 @@ importers: rehype-slug: 5.1.0 rehype-toc: 3.0.2 remark-code-titles: 0.1.2 - sass: 1.56.0 + sass: 1.56.1 srcset-parse: 1.1.0 unified: 10.1.2 @@ -621,7 +621,7 @@ importers: dependencies: '@astrojs/vue': link:../../../../integrations/vue astro: link:../../.. - vue: 3.2.41 + vue: 3.2.44 packages/astro/e2e/fixtures/client-only: specifiers: @@ -642,8 +642,8 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 devDependencies: '@astrojs/preact': link:../../../../integrations/preact '@astrojs/react': link:../../../../integrations/react @@ -688,7 +688,7 @@ importers: sass: ^1.52.2 dependencies: astro: link:../../.. - sass: 1.56.0 + sass: 1.56.1 packages/astro/e2e/fixtures/errors: specifiers: @@ -715,8 +715,8 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 packages/astro/e2e/fixtures/hydration-race: specifiers: @@ -770,8 +770,8 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 devDependencies: '@astrojs/lit': link:../../../../integrations/lit '@astrojs/preact': link:../../../../integrations/preact @@ -813,8 +813,8 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 devDependencies: '@astrojs/preact': link:../../../../integrations/preact '@astrojs/react': link:../../../../integrations/react @@ -842,8 +842,8 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 devDependencies: '@astrojs/preact': link:../../../../integrations/preact '@astrojs/react': link:../../../../integrations/react @@ -871,8 +871,8 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 devDependencies: '@astrojs/preact': link:../../../../integrations/preact '@astrojs/react': link:../../../../integrations/react @@ -900,8 +900,8 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 devDependencies: '@astrojs/preact': link:../../../../integrations/preact '@astrojs/react': link:../../../../integrations/react @@ -929,8 +929,8 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 devDependencies: '@astrojs/preact': link:../../../../integrations/preact '@astrojs/react': link:../../../../integrations/react @@ -958,8 +958,8 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 devDependencies: '@astrojs/preact': link:../../../../integrations/preact '@astrojs/react': link:../../../../integrations/react @@ -1056,7 +1056,7 @@ importers: '@astrojs/mdx': link:../../../../integrations/mdx '@astrojs/svelte': link:../../../../integrations/svelte astro: link:../../.. - svelte: 3.52.0 + svelte: 3.53.0 packages/astro/e2e/fixtures/tailwindcss: specifiers: @@ -1070,7 +1070,7 @@ importers: astro: link:../../.. autoprefixer: 10.4.13_postcss@8.4.18 postcss: 8.4.18 - tailwindcss: 3.2.2_postcss@8.4.18 + tailwindcss: 3.2.3_postcss@8.4.18 packages/astro/e2e/fixtures/ts-resolution: specifiers: @@ -1094,7 +1094,7 @@ importers: '@astrojs/mdx': link:../../../../integrations/mdx '@astrojs/vue': link:../../../../integrations/vue astro: link:../../.. - vue: 3.2.41 + vue: 3.2.44 packages/astro/test/benchmark/simple: specifiers: @@ -1121,8 +1121,8 @@ importers: astro: link:../../.. react: 18.2.0 react-dom: 18.2.0_react@18.2.0 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 packages/astro/test/fixtures/alias: specifiers: @@ -1132,7 +1132,7 @@ importers: dependencies: '@astrojs/svelte': link:../../../../integrations/svelte astro: link:../../.. - svelte: 3.52.0 + svelte: 3.53.0 packages/astro/test/fixtures/alias-tsconfig: specifiers: @@ -1142,7 +1142,7 @@ importers: dependencies: '@astrojs/svelte': link:../../../../integrations/svelte astro: link:../../.. - svelte: 3.52.0 + svelte: 3.53.0 packages/astro/test/fixtures/api-routes: specifiers: @@ -1211,8 +1211,8 @@ importers: '@astrojs/vue': link:../../../../integrations/vue astro: link:../../.. preact: 10.11.2 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 packages/astro/test/fixtures/astro-class-list: specifiers: @@ -1236,7 +1236,7 @@ importers: astro: link:../../.. react: 18.2.0 react-dom: 18.2.0_react@18.2.0 - svelte: 3.52.0 + svelte: 3.53.0 packages/astro/test/fixtures/astro-client-only/pkg: specifiers: {} @@ -1297,7 +1297,7 @@ importers: astro: link:../../.. react: 18.2.0 react-dom: 18.2.0_react@18.2.0 - svelte: 3.52.0 + svelte: 3.53.0 packages/astro/test/fixtures/astro-envs: specifiers: @@ -1307,7 +1307,7 @@ importers: dependencies: '@astrojs/vue': link:../../../../integrations/vue astro: link:../../.. - vue: 3.2.41 + vue: 3.2.44 packages/astro/test/fixtures/astro-expr: specifiers: @@ -1733,8 +1733,8 @@ importers: '@astrojs/vue': link:../../../../integrations/vue astro: link:../../.. preact: 10.11.2 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 packages/astro/test/fixtures/fontsource-package: specifiers: @@ -1847,8 +1847,8 @@ importers: react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 devDependencies: '@astrojs/preact': link:../../../../integrations/preact '@astrojs/react': link:../../../../integrations/react @@ -1885,7 +1885,7 @@ importers: '@astrojs/svelte': link:../../../../integrations/svelte astro: link:../../.. preact: 10.11.2 - svelte: 3.52.0 + svelte: 3.53.0 packages/astro/test/fixtures/legacy-build: specifiers: @@ -1977,8 +1977,8 @@ importers: autoprefixer: 10.4.13_postcss@8.4.18 postcss: 8.4.18 solid-js: 1.6.1 - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 devDependencies: postcss-preset-env: 7.8.2_postcss@8.4.18 @@ -2048,7 +2048,7 @@ importers: astro: link:../../.. react: 18.2.0 react-dom: 18.2.0_react@18.2.0 - vue: 3.2.41 + vue: 3.2.44 packages/astro/test/fixtures/react-jsx-export: specifiers: @@ -2151,7 +2151,7 @@ importers: '@astrojs/mdx': link:../../../../integrations/mdx '@astrojs/svelte': link:../../../../integrations/svelte astro: link:../../.. - svelte: 3.52.0 + svelte: 3.53.0 packages/astro/test/fixtures/slots-vue: specifiers: @@ -2163,7 +2163,7 @@ importers: '@astrojs/mdx': link:../../../../integrations/mdx '@astrojs/vue': link:../../../../integrations/vue astro: link:../../.. - vue: 3.2.41 + vue: 3.2.44 packages/astro/test/fixtures/solid-component: specifiers: @@ -2366,7 +2366,7 @@ importers: dependencies: '@astrojs/svelte': link:../../../../integrations/svelte astro: link:../../.. - svelte: 3.52.0 + svelte: 3.53.0 packages/astro/test/fixtures/tailwindcss: specifiers: @@ -2382,7 +2382,7 @@ importers: astro: link:../../.. autoprefixer: 10.4.13_postcss@8.4.18 postcss: 8.4.18 - tailwindcss: 3.2.2_postcss@8.4.18 + tailwindcss: 3.2.3_postcss@8.4.18 packages/astro/test/fixtures/third-party-astro: specifiers: @@ -2418,7 +2418,7 @@ importers: dependencies: '@astrojs/vue': link:../../../../integrations/vue astro: link:../../.. - vue: 3.2.41 + vue: 3.2.44 packages/astro/test/fixtures/vue-jsx: specifiers: @@ -2428,7 +2428,7 @@ importers: dependencies: '@astrojs/vue': link:../../../../integrations/vue astro: link:../../.. - vue: 3.2.41 + vue: 3.2.44 packages/astro/test/fixtures/vue-with-multi-renderer: specifiers: @@ -2441,8 +2441,8 @@ importers: '@astrojs/svelte': link:../../../../integrations/svelte '@astrojs/vue': link:../../../../integrations/vue astro: link:../../.. - svelte: 3.52.0 - vue: 3.2.41 + svelte: 3.53.0 + vue: 3.2.44 packages/astro/test/fixtures/with-endpoint-routes: specifiers: @@ -2755,7 +2755,7 @@ importers: cheerio: 1.0.0-rc.12 lit: 2.4.1 mocha: 9.2.2 - sass: 1.56.0 + sass: 1.56.1 packages/integrations/mdx: specifiers: @@ -3135,14 +3135,14 @@ importers: svelte2tsx: ^0.5.11 vite: ^3.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 1.1.0_svelte@3.52.0+vite@3.2.3 + '@sveltejs/vite-plugin-svelte': 1.1.0_svelte@3.53.0+vite@3.2.3 postcss-load-config: 3.1.4 - svelte-preprocess: 4.10.7_pmwall27st3tiaqmx3ffy3cd34 - svelte2tsx: 0.5.20_svelte@3.52.0 + svelte-preprocess: 4.10.7_ddyxnro7q4t7jafmacky4t23xi + svelte2tsx: 0.5.20_svelte@3.53.0 devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts - svelte: 3.52.0 + svelte: 3.53.0 vite: 3.2.3 packages/integrations/tailwind: @@ -3160,7 +3160,7 @@ importers: devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts - tailwindcss: 3.2.2_postcss@8.4.18 + tailwindcss: 3.2.3_postcss@8.4.18 packages/integrations/turbolinks: specifiers: @@ -3213,10 +3213,10 @@ importers: vite: ^3.0.0 vue: ^3.2.37 dependencies: - '@vitejs/plugin-vue': 3.2.0_vite@3.2.3+vue@3.2.41 - '@vitejs/plugin-vue-jsx': 2.1.1_vite@3.2.3+vue@3.2.41 + '@vitejs/plugin-vue': 3.2.0_vite@3.2.3+vue@3.2.44 + '@vitejs/plugin-vue-jsx': 2.1.1_vite@3.2.3+vue@3.2.44 '@vue/babel-plugin-jsx': 1.1.1 - '@vue/compiler-sfc': 3.2.41 + '@vue/compiler-sfc': 3.2.44 devDependencies: '@types/chai': 4.3.4 astro: link:../../astro @@ -3225,7 +3225,7 @@ importers: linkedom: 0.14.19 mocha: 9.2.2 vite: 3.2.3 - vue: 3.2.41 + vue: 3.2.44 packages/integrations/vue/test/fixtures/app-entrypoint: specifiers: @@ -3273,7 +3273,7 @@ importers: '@astrojs/svelte': link:../../../../../integrations/svelte astro: link:../../../../../astro preact: 10.11.2 - svelte: 3.52.0 + svelte: 3.53.0 packages/markdown/component/test/fixtures/astro-markdown-plugins: specifiers: @@ -3534,7 +3534,7 @@ importers: esbuild: 0.14.54 globby: 12.2.0 kleur: 4.1.5 - svelte: 3.52.0 + svelte: 3.53.0 tar: 6.1.12 devDependencies: tsconfig-resolver: 3.0.1 @@ -3837,8 +3837,8 @@ packages: sisteransi: 1.0.5 dev: false - /@astrojs/compiler/0.29.9: - resolution: {integrity: sha512-/oMQ0z3CJzGg6sv51tQTiHf/ETVsEu8ObN9OA7zs937dQx9Uo4SToYfdw3C4hf6olrLiADuDUsbkKSRe6fLSgA==} + /@astrojs/compiler/0.29.11: + resolution: {integrity: sha512-iNJMknLhALllV69eSsdDK9o+xEPOiOaCKN9Sv5VK33cbOmcRI8ICFaUN8lMIQnVSXWyKFvX1o9w08PivJ24NfQ==} /@astrojs/language-server/0.28.3: resolution: {integrity: sha512-fPovAX/X46eE2w03jNRMpQ7W9m2mAvNt4Ay65lD9wl1Z5vIQYxlg7Enp9qP225muTr4jSVB5QiLumFJmZMAaVA==} @@ -3902,7 +3902,7 @@ packages: dependencies: '@ampproject/remapping': 2.2.0 '@babel/code-frame': 7.18.6 - '@babel/generator': 7.20.3 + '@babel/generator': 7.20.4 '@babel/helper-compilation-targets': 7.20.0_@babel+core@7.20.2 '@babel/helper-module-transforms': 7.20.2 '@babel/helpers': 7.20.1 @@ -3919,8 +3919,8 @@ packages: - supports-color dev: false - /@babel/generator/7.20.3: - resolution: {integrity: sha512-Wl5ilw2UD1+ZYprHVprxHZJCFeBWlzZYOovE4SDYLZnqCOD11j+0QzNeEWKLLTWM7nixrZEh7vNIyb76MyJg3A==} + /@babel/generator/7.20.4: + resolution: {integrity: sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.20.2 @@ -5286,7 +5286,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.18.6 - '@babel/generator': 7.20.3 + '@babel/generator': 7.20.4 '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-function-name': 7.19.0 '@babel/helper-hoist-variables': 7.18.6 @@ -9441,7 +9441,7 @@ packages: string.prototype.matchall: 4.0.8 dev: false - /@sveltejs/vite-plugin-svelte/1.1.0_svelte@3.52.0+vite@3.2.3: + /@sveltejs/vite-plugin-svelte/1.1.0_svelte@3.53.0+vite@3.2.3: resolution: {integrity: sha512-cFRfEdztubtj1c/rYh7ArK7XCfFJn6wG6+J8/e9amFsKtEJILovoBrK0/mxt1AjPQg0vaX+fHPKvhx+q8mTPaQ==} engines: {node: ^14.18.0 || >= 16} peerDependencies: @@ -9458,8 +9458,8 @@ packages: deepmerge: 4.2.2 kleur: 4.1.5 magic-string: 0.26.7 - svelte: 3.52.0 - svelte-hmr: 0.15.0_svelte@3.52.0 + svelte: 3.53.0 + svelte-hmr: 0.15.0_svelte@3.53.0 vite: 3.2.3 transitivePeerDependencies: - supports-color @@ -9488,7 +9488,7 @@ packages: /@types/alpinejs/3.7.1: resolution: {integrity: sha512-gzwyuHXH/meGQQhurMGWlZgMQxe18lMOoSPd7X6CvGoDelHte9EsU7SpTIoRu8yYir0tbHDeaSMdX9LeQz/QtA==} dependencies: - '@vue/reactivity': 3.2.41 + '@vue/reactivity': 3.2.44 dev: false /@types/babel__core/7.1.20: @@ -10121,7 +10121,7 @@ packages: - supports-color dev: false - /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.41: + /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.3+vue@3.2.44: resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -10135,12 +10135,12 @@ packages: '@babel/plugin-transform-typescript': 7.20.2_@babel+core@7.20.2 '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.20.2 vite: 3.2.3 - vue: 3.2.41 + vue: 3.2.44 transitivePeerDependencies: - supports-color dev: false - /@vitejs/plugin-vue/3.2.0_vite@3.2.3+vue@3.2.41: + /@vitejs/plugin-vue/3.2.0_vite@3.2.3+vue@3.2.44: resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -10151,7 +10151,7 @@ packages: optional: true dependencies: vite: 3.2.3 - vue: 3.2.41 + vue: 3.2.44 dev: false /@vscode/emmet-helper/2.8.4: @@ -10203,46 +10203,46 @@ packages: - supports-color dev: false - /@vue/compiler-core/3.2.41: - resolution: {integrity: sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==} + /@vue/compiler-core/3.2.44: + resolution: {integrity: sha512-TwzeVSnaklb8wIvMtwtkPkt9wnU+XD70xJ7N9+eIHtjKAG7OoZttm+14ZL6vWOL+2RcMtSZ+cYH+gvkUqsrmSQ==} dependencies: '@babel/parser': 7.20.3 - '@vue/shared': 3.2.41 + '@vue/shared': 3.2.44 estree-walker: 2.0.2 source-map: 0.6.1 - /@vue/compiler-dom/3.2.41: - resolution: {integrity: sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==} + /@vue/compiler-dom/3.2.44: + resolution: {integrity: sha512-wPDR+gOn2Qi7SudPJ+gE62vuO/aKXIiIFALvHpztXmDdbAHGy3CDfmBgOGchTgTlSeDJHe9olEMkgOdmyXTjUg==} dependencies: - '@vue/compiler-core': 3.2.41 - '@vue/shared': 3.2.41 + '@vue/compiler-core': 3.2.44 + '@vue/shared': 3.2.44 - /@vue/compiler-sfc/3.2.41: - resolution: {integrity: sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==} + /@vue/compiler-sfc/3.2.44: + resolution: {integrity: sha512-8cFZcUWlrtnfM/GlRwYJdlfgbEOy0OZ/osLDU3h/wJu24HuYAc7QIML1USaKqiZzkjOaTd4y8mvYvcWXq3o5dA==} dependencies: '@babel/parser': 7.20.3 - '@vue/compiler-core': 3.2.41 - '@vue/compiler-dom': 3.2.41 - '@vue/compiler-ssr': 3.2.41 - '@vue/reactivity-transform': 3.2.41 - '@vue/shared': 3.2.41 + '@vue/compiler-core': 3.2.44 + '@vue/compiler-dom': 3.2.44 + '@vue/compiler-ssr': 3.2.44 + '@vue/reactivity-transform': 3.2.44 + '@vue/shared': 3.2.44 estree-walker: 2.0.2 magic-string: 0.25.9 postcss: 8.4.18 source-map: 0.6.1 - /@vue/compiler-ssr/3.2.41: - resolution: {integrity: sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==} + /@vue/compiler-ssr/3.2.44: + resolution: {integrity: sha512-tAkUFLgvxds3l5KPyAH77OIYrEeLngNYQfWA9GocHiy2nlyajjqAH/Jq93Bq29Y20GeJzblmRp9DVYCVkJ5Rsw==} dependencies: - '@vue/compiler-dom': 3.2.41 - '@vue/shared': 3.2.41 + '@vue/compiler-dom': 3.2.44 + '@vue/shared': 3.2.44 - /@vue/reactivity-transform/3.2.41: - resolution: {integrity: sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A==} + /@vue/reactivity-transform/3.2.44: + resolution: {integrity: sha512-WGbEiXaS2qAOTS9Z3kKk2Nk4bi8OUl73Sih+h0XV9RTUATnaJSEQedveHUDQnHyXiZwyBMKosrxJg8aThHO/rw==} dependencies: '@babel/parser': 7.20.3 - '@vue/compiler-core': 3.2.41 - '@vue/shared': 3.2.41 + '@vue/compiler-core': 3.2.44 + '@vue/shared': 3.2.44 estree-walker: 2.0.2 magic-string: 0.25.9 @@ -10252,39 +10252,39 @@ packages: '@vue/shared': 3.1.5 dev: false - /@vue/reactivity/3.2.41: - resolution: {integrity: sha512-9JvCnlj8uc5xRiQGZ28MKGjuCoPhhTwcoAdv3o31+cfGgonwdPNuvqAXLhlzu4zwqavFEG5tvaoINQEfxz+l6g==} + /@vue/reactivity/3.2.44: + resolution: {integrity: sha512-Fe0s52fTsPl+RSdvoqUZ3HRKlaVsKhIh1mea5EWOedFvZCjnymzlj3YC1wZMxi89qXRFSdEASVA/BWUGypk0Ig==} dependencies: - '@vue/shared': 3.2.41 + '@vue/shared': 3.2.44 - /@vue/runtime-core/3.2.41: - resolution: {integrity: sha512-0LBBRwqnI0p4FgIkO9q2aJBBTKDSjzhnxrxHYengkAF6dMOjeAIZFDADAlcf2h3GDALWnblbeprYYpItiulSVQ==} + /@vue/runtime-core/3.2.44: + resolution: {integrity: sha512-uwEV1cttL33k2dC+CNGYhKEYqGejT9KmgQ+4n/LmYUfZ1Gorl8F32DlIX+1pANyGHL1tBAisqHDxKyQBp2oBNA==} dependencies: - '@vue/reactivity': 3.2.41 - '@vue/shared': 3.2.41 + '@vue/reactivity': 3.2.44 + '@vue/shared': 3.2.44 - /@vue/runtime-dom/3.2.41: - resolution: {integrity: sha512-U7zYuR1NVIP8BL6jmOqmapRAHovEFp7CSw4pR2FacqewXNGqZaRfHoNLQsqQvVQ8yuZNZtxSZy0FFyC70YXPpA==} + /@vue/runtime-dom/3.2.44: + resolution: {integrity: sha512-LDzNwXpU/nSpxrLk5jS0bfStgt88msgsgFzj6vHrl7es3QktIrCGybQS5CB/p/TO0q98iAiYtEVmi+Lej7Vgjg==} dependencies: - '@vue/runtime-core': 3.2.41 - '@vue/shared': 3.2.41 + '@vue/runtime-core': 3.2.44 + '@vue/shared': 3.2.44 csstype: 2.6.21 - /@vue/server-renderer/3.2.41_vue@3.2.41: - resolution: {integrity: sha512-7YHLkfJdTlsZTV0ae5sPwl9Gn/EGr2hrlbcS/8naXm2CDpnKUwC68i1wGlrYAfIgYWL7vUZwk2GkYLQH5CvFig==} + /@vue/server-renderer/3.2.44_vue@3.2.44: + resolution: {integrity: sha512-3+ArN07UgOAdbGKIp3uVqeC3bnR3J324QNjPR6vxHbLrTlkibFv8QNled/ux3fVq0KDCkVVKGOKB2V4sCIYOgg==} peerDependencies: - vue: 3.2.41 + vue: 3.2.44 dependencies: - '@vue/compiler-ssr': 3.2.41 - '@vue/shared': 3.2.41 - vue: 3.2.41 + '@vue/compiler-ssr': 3.2.44 + '@vue/shared': 3.2.44 + vue: 3.2.44 /@vue/shared/3.1.5: resolution: {integrity: sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA==} dev: false - /@vue/shared/3.2.41: - resolution: {integrity: sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==} + /@vue/shared/3.2.44: + resolution: {integrity: sha512-mGZ44bnn0zpZ36nXtxbrBPno43yr96wjQE1dBEKS1Sieugt27HS4OGZVBRIgsdGzosB7vqZAvu0ttu1FDVdolA==} /@webcomponents/template-shadowroot/0.1.0: resolution: {integrity: sha512-ry84Vft6xtRBbd4M/ptRodbOLodV5AD15TYhyRghCRgIcJJKmYmJ2v2BaaWxygENwh6Uq3zTfGPmlckKT/GXsQ==} @@ -10486,8 +10486,8 @@ packages: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} dev: true - /array-iterate/1.1.4: - resolution: {integrity: sha512-sNRaPGh9nnmdC8Zf+pT3UqP8rnWj5Hf9wiFGsX3wUQ2yVSIhO2ShFwCoceIPpB41QF6i2OEmrHmCo36xronCVA==} + /array-iterate/2.0.1: + resolution: {integrity: sha512-I1jXZMjAgCMmxT4qxXfPXa6SthSoE8h6gkSI9BGGNv8mP8G/v0blc+qFnZu6K42vTOiuME596QaLO0TP3Lk0xg==} dev: false /array-timsort/1.0.3: @@ -14902,10 +14902,6 @@ packages: engines: {node: '>= 0.4.0'} dev: true - /nlcst-to-string/2.0.4: - resolution: {integrity: sha512-3x3jwTd6UPG7vi5k4GEzvxJ5rDA7hVUIRNHPblKuMVP9Z3xmlsd9cgLcpAMkc5uPOBna82EeshROFhsPkbnTZg==} - dev: false - /nlcst-to-string/3.1.0: resolution: {integrity: sha512-Y8HQWKw/zrHTCnu2zcFBN1dV6vN0NUG7s5fkEj380G8tF3R+vA2KG+tDl2QoHVQCTHGHVXwoni2RQkDSFQb1PA==} dependencies: @@ -15274,12 +15270,12 @@ packages: lines-and-columns: 1.2.4 dev: true - /parse-latin/5.0.0: - resolution: {integrity: sha512-Ht+4/+AUySMS5HKGAiQpBmkFsHSoGrj6Y83flLCa5OIBdtsVkO3UD4OtboJ0O0vZiOznH02x8qlwg9KLUVXuNg==} + /parse-latin/5.0.1: + resolution: {integrity: sha512-b/K8ExXaWC9t34kKeDV8kGXBkXZ1HCSAZRYE7HR14eA1GlXX5L8iWhs8USJNhQU9q5ci413jCKF0gOyovvyRBg==} dependencies: - nlcst-to-string: 2.0.4 - unist-util-modify-children: 2.0.0 - unist-util-visit-children: 1.1.4 + nlcst-to-string: 3.1.0 + unist-util-modify-children: 3.0.0 + unist-util-visit-children: 2.0.0 dev: false /parse-numeric-range/1.3.0: @@ -15882,7 +15878,7 @@ packages: resolution: {integrity: sha512-ehCUx7MqHWvkHwUmxxAWLsL35pFaCTM5YXQ8xjG/1W6dY2yBhvEks+2aCfjeI5zmMrZNCXkiMQtpznSlLSLrxw==} engines: {node: ^14.15.0 || >=16.0.0, npm: '>=6.14.0'} dependencies: - '@astrojs/compiler': 0.29.9 + '@astrojs/compiler': 0.29.11 prettier: 2.7.1 sass-formatter: 0.7.5 synckit: 0.8.4 @@ -16405,7 +16401,7 @@ packages: resolution: {integrity: sha512-5MrD1tuebzO8ppsja5eEu+ZbBeUNCjoEarn70tkXOS7Bdsdf6tNahsv2bY0Z8VooFF6cw7/6S+d3yI/TMlMVVQ==} dependencies: '@types/nlcst': 1.0.0 - parse-latin: 5.0.0 + parse-latin: 5.0.1 unherit: 3.0.0 unified: 10.1.2 dev: false @@ -16565,8 +16561,8 @@ packages: dependencies: suf-log: 2.5.3 - /sass/1.56.0: - resolution: {integrity: sha512-WFJ9XrpkcnqZcYuLRJh5qiV6ibQOR4AezleeEjTjMsCocYW59dEG19U3fwTTXxzi2Ed3yjPBp727hbbj53pHFw==} + /sass/1.56.1: + resolution: {integrity: sha512-VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ==} engines: {node: '>=12.0.0'} hasBin: true dependencies: @@ -17130,16 +17126,16 @@ packages: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - /svelte-hmr/0.15.0_svelte@3.52.0: + /svelte-hmr/0.15.0_svelte@3.53.0: resolution: {integrity: sha512-Aw21SsyoohyVn4yiKXWPNCSW2DQNH/76kvUnE9kpt4h9hcg9tfyQc6xshx9hzgMfGF0kVx0EGD8oBMWSnATeOg==} engines: {node: ^12.20 || ^14.13.1 || >= 16} peerDependencies: svelte: '>=3.19.0' dependencies: - svelte: 3.52.0 + svelte: 3.53.0 dev: false - /svelte-preprocess/4.10.7_pmwall27st3tiaqmx3ffy3cd34: + /svelte-preprocess/4.10.7_ddyxnro7q4t7jafmacky4t23xi: resolution: {integrity: sha512-sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw==} engines: {node: '>= 9.11.2'} requiresBuild: true @@ -17187,14 +17183,14 @@ packages: postcss-load-config: 3.1.4 sorcery: 0.10.0 strip-indent: 3.0.0 - svelte: 3.52.0 + svelte: 3.53.0 dev: false - /svelte/3.52.0: - resolution: {integrity: sha512-FxcnEUOAVfr10vDU5dVgJN19IvqeHQCS1zfe8vayTfis9A2t5Fhx+JDe5uv/C3j//bB1umpLJ6quhgs9xyUbCQ==} + /svelte/3.53.0: + resolution: {integrity: sha512-QwR6zwpcdpz5OqybIHlghM+qP2qKbzsKQuU9npgAmnI6zoTDIcjbcseUZA0AJGbotorltpQ0f413euKK4w+Piw==} engines: {node: '>= 8'} - /svelte2tsx/0.5.20_svelte@3.52.0: + /svelte2tsx/0.5.20_svelte@3.53.0: resolution: {integrity: sha512-yNHmN/uoAnJ7d1XqVohiNA6TMFOxibHyEddUAHVt1PiLXtbwAJF3WaGYlg8QbOdoXzOVsVNCAlqRUIdULUm+OA==} peerDependencies: svelte: ^3.24 @@ -17205,7 +17201,7 @@ packages: dependencies: dedent-js: 1.0.1 pascal-case: 3.1.2 - svelte: 3.52.0 + svelte: 3.53.0 dev: false /svg-tags/1.0.0: @@ -17219,8 +17215,8 @@ packages: '@pkgr/utils': 2.3.1 tslib: 2.4.1 - /tailwindcss/3.2.2_postcss@8.4.18: - resolution: {integrity: sha512-c2GtSdqg+harR4QeoTmex0Ngfg8IIHNeLQH5yr2B9uZbZR1Xt1rYbjWOWTcj3YLTZhrmZnPowoQDbSRFyZHQ5Q==} + /tailwindcss/3.2.3_postcss@8.4.18: + resolution: {integrity: sha512-Xt9D4PK4zuuQCEB8bwK9JUCKmTgUwyac/6b0/42Vqhgl6YJkep+Wf5wq+5uXYfmrupdAD0YY2NY1hyZp1HjRrg==} engines: {node: '>=12.13.0'} hasBin: true peerDependencies: @@ -17762,10 +17758,11 @@ packages: '@types/unist': 2.0.6 dev: false - /unist-util-modify-children/2.0.0: - resolution: {integrity: sha512-HGrj7JQo9DwZt8XFsX8UD4gGqOsIlCih9opG6Y+N11XqkBGKzHo8cvDi+MfQQgiZ7zXRUiQREYHhjOBHERTMdg==} + /unist-util-modify-children/3.0.0: + resolution: {integrity: sha512-cbDbx+4BeR4UzJXzvOgw6M/b69dKiaezt3gvN3ZbaJnGr0q719GKQCkMhdjPQiOBH6DnQ7TfHZs2aPY3vOkPyg==} dependencies: - array-iterate: 1.1.4 + '@types/unist': 2.0.6 + array-iterate: 2.0.1 dev: false /unist-util-position-from-estree/1.1.1: @@ -17801,8 +17798,10 @@ packages: dependencies: '@types/unist': 2.0.6 - /unist-util-visit-children/1.1.4: - resolution: {integrity: sha512-sA/nXwYRCQVRwZU2/tQWUqJ9JSFM1X3x7JIOsIgSzrFHcfVt6NkzDtKzyxg2cZWkCwGF9CO8x4QNZRJRMK8FeQ==} + /unist-util-visit-children/2.0.0: + resolution: {integrity: sha512-n8CvdoeexGn6EkAa865Wp9SFFuS1IKf1j0vMoEwHHfA5f48gJPK6rwS/s/P+ouRDfAklQaiBQtlloX3KadUrww==} + dependencies: + '@types/unist': 2.0.6 dev: false /unist-util-visit-parents/2.1.2: @@ -18098,7 +18097,7 @@ packages: fsevents: 2.3.2 dev: false - /vite/3.2.3_sass@1.56.0: + /vite/3.2.3_sass@1.56.1: resolution: {integrity: sha512-h8jl1TZ76eGs3o2dIBSsvXDLb1m/Ec1iej8ZMdz+PsaFUsftZeWe2CZOI3qogEsMNaywc17gu0q6cQDzh/weCQ==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -18127,7 +18126,7 @@ packages: postcss: 8.4.18 resolve: 1.22.1 rollup: 2.79.1 - sass: 1.56.0 + sass: 1.56.1 optionalDependencies: fsevents: 2.3.2 dev: false @@ -18149,7 +18148,7 @@ packages: vite: optional: true dependencies: - vite: 3.2.3_sass@1.56.0 + vite: 3.2.3_sass@1.56.1 dev: false /vitest/0.20.3: @@ -18271,14 +18270,14 @@ packages: resolution: {integrity: sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==} dev: false - /vue/3.2.41: - resolution: {integrity: sha512-uuuvnrDXEeZ9VUPljgHkqB5IaVO8SxhPpqF2eWOukVrBnRBx2THPSGQBnVRt0GrIG1gvCmFXMGbd7FqcT1ixNQ==} + /vue/3.2.44: + resolution: {integrity: sha512-nyNtFDh+0TpRgYCUVfPD1mJ9PpIsCPXaOF4DeGNIT5vQ4X23ykflGq3Sy2P+tEt1/pQZxZnAysuRKwyhNj+Cjw==} dependencies: - '@vue/compiler-dom': 3.2.41 - '@vue/compiler-sfc': 3.2.41 - '@vue/runtime-dom': 3.2.41 - '@vue/server-renderer': 3.2.41_vue@3.2.41 - '@vue/shared': 3.2.41 + '@vue/compiler-dom': 3.2.44 + '@vue/compiler-sfc': 3.2.44 + '@vue/runtime-dom': 3.2.44 + '@vue/server-renderer': 3.2.44_vue@3.2.44 + '@vue/shared': 3.2.44 /wcwidth/1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}