From 63d43e175453b946e2460f46af581384b77cee23 Mon Sep 17 00:00:00 2001 From: Sarah Rainsberger Date: Tue, 9 Aug 2022 11:09:16 -0300 Subject: [PATCH 01/16] remove errant remaining details tags (#4212) --- packages/integrations/image/README.md | 2 +- packages/integrations/mdx/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/integrations/image/README.md b/packages/integrations/image/README.md index b2496b5e3985..d0c7630fb521 100644 --- a/packages/integrations/image/README.md +++ b/packages/integrations/image/README.md @@ -338,7 +338,7 @@ const imageUrl = 'https://www.google.com/images/branding/googlelogo/2x/googlelog ``` -### Responsive pictures +### Responsive pictures The `` component can be used to automatically build a `` with multiple sizes and formats. Check out [MDN](https://developer.mozilla.org/en-US/docs/Learn/HTML/Multimedia_and_embedding/Responsive_images#art_direction) for a deep dive into responsive images and art direction. diff --git a/packages/integrations/mdx/README.md b/packages/integrations/mdx/README.md index d7d27d039f93..cd795c3fb2c5 100644 --- a/packages/integrations/mdx/README.md +++ b/packages/integrations/mdx/README.md @@ -323,7 +323,7 @@ export default { } ``` -### rehypePlugins +### rehypePlugins [Rehype plugins](https://github.com/rehypejs/rehype/blob/main/doc/plugins.md) allow you to transform the HTML that your Markdown generates. We recommend checking the [Remark plugin](https://github.com/remarkjs/remark/blob/main/doc/plugins.md) catalog first _before_ considering rehype plugins, since most users want to transform their Markdown syntax instead. If HTML transforms are what you need, we encourage you to browse [awesome-rehype](https://github.com/rehypejs/awesome-rehype) for a full curated list of plugins! From 9f067dca27ba539c274ad282b744bafff684da81 Mon Sep 17 00:00:00 2001 From: Nate Moore Date: Tue, 9 Aug 2022 11:10:25 -0500 Subject: [PATCH 02/16] Astro 1.0.0 (#4214) * chore: remove changesets patch * chore: add changesets * chore: version packages * chore: normalize formatting * chore: update lockfile * chore: fix codeblocks * Update packages/astro/CHANGELOG.md Co-authored-by: Sarah Rainsberger * Update packages/astro/CHANGELOG.md Co-authored-by: Sarah Rainsberger * Update packages/astro/CHANGELOG.md Co-authored-by: Sarah Rainsberger * chore: fixup code samples * chore: move v0.25 message out of note Co-authored-by: Nate Moore Co-authored-by: Sarah Rainsberger --- examples/basics/package.json | 2 +- examples/blog/package.json | 4 +- examples/component/demo/package.json | 2 +- examples/component/package.json | 2 +- examples/docs/package.json | 6 +- examples/env-vars/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 4 +- examples/framework-multiple/package.json | 12 +- examples/framework-preact/package.json | 4 +- examples/framework-react/package.json | 4 +- examples/framework-solid/package.json | 4 +- examples/framework-svelte/package.json | 4 +- examples/framework-vue/package.json | 4 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 4 +- examples/ssr/package.json | 6 +- examples/subpath/package.json | 4 +- examples/with-markdown-plugins/package.json | 4 +- examples/with-markdown-shiki/package.json | 4 +- examples/with-mdx/package.json | 6 +- examples/with-nanostores/package.json | 4 +- examples/with-tailwindcss/package.json | 4 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- package.json | 4 +- packages/astro-prism/CHANGELOG.md | 8 ++ packages/astro-prism/package.json | 2 +- packages/astro-rss/CHANGELOG.md | 8 ++ packages/astro-rss/package.json | 2 +- packages/astro/CHANGELOG.md | 86 ++++++++---- packages/astro/package.json | 8 +- packages/create-astro/CHANGELOG.md | 8 ++ packages/create-astro/package.json | 2 +- packages/integrations/cloudflare/CHANGELOG.md | 10 +- packages/integrations/cloudflare/package.json | 2 +- packages/integrations/deno/CHANGELOG.md | 8 ++ packages/integrations/deno/package.json | 2 +- packages/integrations/lit/CHANGELOG.md | 8 ++ packages/integrations/lit/package.json | 2 +- packages/integrations/mdx/CHANGELOG.md | 7 + packages/integrations/mdx/package.json | 4 +- packages/integrations/netlify/CHANGELOG.md | 13 ++ packages/integrations/netlify/package.json | 4 +- packages/integrations/node/CHANGELOG.md | 13 ++ packages/integrations/node/package.json | 4 +- packages/integrations/partytown/CHANGELOG.md | 8 ++ packages/integrations/partytown/package.json | 2 +- packages/integrations/preact/CHANGELOG.md | 8 ++ packages/integrations/preact/package.json | 2 +- packages/integrations/react/CHANGELOG.md | 8 ++ packages/integrations/react/package.json | 2 +- packages/integrations/sitemap/CHANGELOG.md | 8 ++ packages/integrations/sitemap/package.json | 2 +- packages/integrations/solid/CHANGELOG.md | 8 ++ packages/integrations/solid/package.json | 2 +- packages/integrations/svelte/CHANGELOG.md | 8 ++ packages/integrations/svelte/package.json | 2 +- packages/integrations/tailwind/CHANGELOG.md | 8 ++ packages/integrations/tailwind/package.json | 2 +- packages/integrations/vercel/CHANGELOG.md | 13 ++ packages/integrations/vercel/package.json | 4 +- packages/integrations/vue/CHANGELOG.md | 8 ++ packages/integrations/vue/package.json | 2 +- packages/markdown/component/CHANGELOG.md | 8 ++ packages/markdown/component/package.json | 2 +- packages/markdown/remark/CHANGELOG.md | 13 ++ packages/markdown/remark/package.json | 4 +- packages/telemetry/CHANGELOG.md | 8 ++ packages/telemetry/package.json | 2 +- packages/webapi/CHANGELOG.md | 8 ++ packages/webapi/package.json | 2 +- ...ngesets__assemble-release-plan@5.1.3.patch | 14 -- pnpm-lock.yaml | 126 +++++++++--------- scripts/CHANGELOG.md | 7 + scripts/package.json | 2 +- 77 files changed, 406 insertions(+), 192 deletions(-) delete mode 100644 patches/@changesets__assemble-release-plan@5.1.3.patch diff --git a/examples/basics/package.json b/examples/basics/package.json index b61df5774ceb..ae8810318cda 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0-rc.8" + "astro": "^1.0.0" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index b5b226e3c610..3574c1718c87 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/preact": "^0.5.2", - "astro": "^1.0.0-rc.8" + "@astrojs/preact": "^1.0.0", + "astro": "^1.0.0" }, "dependencies": { "preact": "^10.7.3" diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json index d6f626f62695..7a0ea3ca7b9d 100644 --- a/examples/component/demo/package.json +++ b/examples/component/demo/package.json @@ -11,6 +11,6 @@ }, "devDependencies": { "@example/my-component": "workspace:*", - "astro": "^1.0.0-rc.8" + "astro": "^1.0.0" } } diff --git a/examples/component/package.json b/examples/component/package.json index c0238b55f724..ee4684ec4ded 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -8,6 +8,6 @@ "serve": "astro --root demo preview" }, "devDependencies": { - "astro": "^1.0.0-rc.8" + "astro": "^1.0.0" } } diff --git a/examples/docs/package.json b/examples/docs/package.json index f73684921738..7439a843bb0c 100644 --- a/examples/docs/package.json +++ b/examples/docs/package.json @@ -19,8 +19,8 @@ "react-dom": "^18.1.0" }, "devDependencies": { - "@astrojs/preact": "^0.5.2", - "@astrojs/react": "^0.4.3", - "astro": "^1.0.0-rc.8" + "@astrojs/preact": "^1.0.0", + "@astrojs/react": "^1.0.0", + "astro": "^1.0.0" } } diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json index 173616afd80b..4dee55a6dea7 100644 --- a/examples/env-vars/package.json +++ b/examples/env-vars/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0-rc.8" + "astro": "^1.0.0" } } diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 2b6616eb549e..ba26b4f5fdba 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@types/alpinejs": "^3.7.0", - "astro": "^1.0.0-rc.8" + "astro": "^1.0.0" }, "dependencies": { "alpinejs": "^3.10.2" diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index dc7aa4c8d1db..5ab433f422ce 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/lit": "^0.3.2", - "astro": "^1.0.0-rc.8" + "@astrojs/lit": "^1.0.0", + "astro": "^1.0.0" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index b38169b49386..88090bb3dd8f 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -10,12 +10,12 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/preact": "^0.5.2", - "@astrojs/react": "^0.4.3", - "@astrojs/solid-js": "^0.4.1", - "@astrojs/svelte": "^0.5.1", - "@astrojs/vue": "^0.5.0", - "astro": "^1.0.0-rc.8" + "@astrojs/preact": "^1.0.0", + "@astrojs/react": "^1.0.0", + "@astrojs/solid-js": "^1.0.0", + "@astrojs/svelte": "^1.0.0", + "@astrojs/vue": "^1.0.0", + "astro": "^1.0.0" }, "dependencies": { "preact": "^10.7.3", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 83a9da67059b..130351e7ec09 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/preact": "^0.5.2", - "astro": "^1.0.0-rc.8" + "@astrojs/preact": "^1.0.0", + "astro": "^1.0.0" }, "dependencies": { "preact": "^10.7.3" diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index b5ffc59aa9f3..3dcd62de47ec 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -10,10 +10,10 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/react": "^0.4.3", + "@astrojs/react": "^1.0.0", "@types/react": "^18.0.10", "@types/react-dom": "^18.0.5", - "astro": "^1.0.0-rc.8" + "astro": "^1.0.0" }, "dependencies": { "react": "^18.1.0", diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index a71d3317f65f..c7492fff34fb 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/solid-js": "^0.4.1", - "astro": "^1.0.0-rc.8" + "@astrojs/solid-js": "^1.0.0", + "astro": "^1.0.0" }, "dependencies": { "solid-js": "^1.4.3" diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 69593b183bbf..439de97c076b 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/svelte": "^0.5.1", - "astro": "^1.0.0-rc.8" + "@astrojs/svelte": "^1.0.0", + "astro": "^1.0.0" }, "dependencies": { "svelte": "^3.48.0" diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index dff2e066e9a8..3012ed2f284c 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/vue": "^0.5.0", - "astro": "^1.0.0-rc.8" + "@astrojs/vue": "^1.0.0", + "astro": "^1.0.0" }, "dependencies": { "vue": "^3.2.37" diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 3b5a1b3d505f..a9e317792781 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0-rc.8" + "astro": "^1.0.0" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index cf8dee3aad36..270e6d074dd4 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0-rc.8" + "astro": "^1.0.0" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 8b32a6b50f75..12d2f338aea8 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/preact": "^0.5.2", - "astro": "^1.0.0-rc.8", + "@astrojs/preact": "^1.0.0", + "astro": "^1.0.0", "sass": "^1.52.2" }, "dependencies": { diff --git a/examples/ssr/package.json b/examples/ssr/package.json index ba357abdc3dc..549da23417ca 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -11,9 +11,9 @@ "server": "node server/server.mjs" }, "devDependencies": { - "@astrojs/node": "^0.2.1", - "@astrojs/svelte": "^0.5.1", - "astro": "^1.0.0-rc.8", + "@astrojs/node": "^1.0.0", + "@astrojs/svelte": "^1.0.0", + "astro": "^1.0.0", "concurrently": "^7.2.1", "lightcookie": "^1.0.25", "unocss": "^0.15.6", diff --git a/examples/subpath/package.json b/examples/subpath/package.json index 9851c452f8d4..14fe1204cc8f 100644 --- a/examples/subpath/package.json +++ b/examples/subpath/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/react": "^0.4.3", - "astro": "^1.0.0-rc.8" + "@astrojs/react": "^1.0.0", + "astro": "^1.0.0" }, "dependencies": { "react": "^18.1.0", diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index e12a9436ef9a..2085838d47f5 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/markdown-remark": "^0.14.1", - "astro": "^1.0.0-rc.8", + "@astrojs/markdown-remark": "^1.0.0", + "astro": "^1.0.0", "hast-util-select": "5.0.1", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.0.1", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index fadaf0e7f51c..112eedb4c53f 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/markdown-remark": "^0.14.1", - "astro": "^1.0.0-rc.8" + "@astrojs/markdown-remark": "^1.0.0", + "astro": "^1.0.0" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 36efe4fd49a9..558b8f2bdc44 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -10,9 +10,9 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/mdx": "^0.8.0", - "@astrojs/preact": "^0.5.2", - "astro": "^1.0.0-rc.8", + "@astrojs/mdx": "^0.8.1", + "@astrojs/preact": "^1.0.0", + "astro": "^1.0.0", "preact": "^10.6.5" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index f500563fc410..de962c70f4cd 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -15,7 +15,7 @@ "preact": "^10.7.3" }, "devDependencies": { - "@astrojs/preact": "^0.5.2", - "astro": "^1.0.0-rc.8" + "@astrojs/preact": "^1.0.0", + "astro": "^1.0.0" } } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index efc5d4d36ad7..1391a72aea2f 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -10,8 +10,8 @@ "astro": "astro" }, "devDependencies": { - "@astrojs/tailwind": "^0.2.5", - "astro": "^1.0.0-rc.8", + "@astrojs/tailwind": "^1.0.0", + "astro": "^1.0.0", "autoprefixer": "^10.4.7", "canvas-confetti": "^1.5.1", "postcss": "^8.4.14", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 397a78a82c56..b4c4e61acf9a 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0-rc.8", + "astro": "^1.0.0", "vite-plugin-pwa": "0.11.11", "workbox-window": "^6.5.3" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 1b0de0de8882..4da833516a08 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "devDependencies": { - "astro": "^1.0.0-rc.8", + "astro": "^1.0.0", "vitest": "^0.20.3" } } diff --git a/package.json b/package.json index 0c97dfba2408..a0927ac46f3c 100644 --- a/package.json +++ b/package.json @@ -65,15 +65,13 @@ ] }, "patchedDependencies": { - "@changesets/cli@2.23.0": "patches/@changesets__cli@2.23.0.patch", - "@changesets/assemble-release-plan@5.1.3": "patches/@changesets__assemble-release-plan@5.1.3.patch" + "@changesets/cli@2.23.0": "patches/@changesets__cli@2.23.0.patch" } }, "dependencies": { "@astrojs/webapi": "workspace:*" }, "devDependencies": { - "@changesets/assemble-release-plan": "5.1.3", "@changesets/changelog-github": "0.4.4", "@changesets/cli": "2.23.0", "@octokit/action": "^3.18.1", diff --git a/packages/astro-prism/CHANGELOG.md b/packages/astro-prism/CHANGELOG.md index 7055f1da4448..250d3b05d68e 100644 --- a/packages/astro-prism/CHANGELOG.md +++ b/packages/astro-prism/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/prism +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.7.0 ### Minor Changes diff --git a/packages/astro-prism/package.json b/packages/astro-prism/package.json index 2892e8c24a35..651213a7a1f2 100644 --- a/packages/astro-prism/package.json +++ b/packages/astro-prism/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/prism", - "version": "0.7.0", + "version": "1.0.0", "description": "Supports Prism highlighting in Astro projects", "author": "withastro", "type": "module", diff --git a/packages/astro-rss/CHANGELOG.md b/packages/astro-rss/CHANGELOG.md index d1d879b1f5aa..8a63c896a7e1 100644 --- a/packages/astro-rss/CHANGELOG.md +++ b/packages/astro-rss/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/rss +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.2.2 ### Patch Changes diff --git a/packages/astro-rss/package.json b/packages/astro-rss/package.json index c95242f0ae16..dbf50908a470 100644 --- a/packages/astro-rss/package.json +++ b/packages/astro-rss/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/rss", "description": "Add RSS feeds to your Astro projects", - "version": "0.2.2", + "version": "1.0.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 1a39a4bcb925..2b4d4bca0144 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,39 @@ # astro +## 1.0.0 + +> Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + +> **Note** +> If you need help migrating an existing Astro project to the new Astro v1.0, check out our updated [Migration Guide](https://docs.astro.build/en/migrate/) and [full documentation website](https://docs.astro.build/). + +### Features + +Astro v1.0 includes a few new features and improvements since our original beta announcement back in April, including: + +- [SSR Builds](https://docs.astro.build/en/guides/server-side-rendering/): Server output is now stable and available for production use. +- [Image Optimization](https://docs.astro.build/en/guides/integrations-guide/image/): New `` and `` components available with [`@astrojs/image`](https://docs.astro.build/en/guides/integrations-guide/image/). +- [MDX Support](https://docs.astro.build/en/guides/integrations-guide/mdx/): A standard syntax for mixing UI components in Markdown is available with [`@astrojs/mdx`](https://docs.astro.build/en/guides/integrations-guide/mdx/). +- [Vite 3.0](https://vitejs.dev/blog/announcing-vite3.html): An upgrade to our internal build engine, Vite. + +### Breaking Changes + +- `Astro.canonicalURL` has been deprecated. Please use [`Astro.url`](https://docs.astro.build/en/reference/api-reference/#astrourl) to construct your own canonical URL. +- [CSS Specificity](https://developer.mozilla.org/en-US/docs/Web/CSS/Specificity) is now preserved for scoped styles. See the [migration guide](https://docs.astro.build/en/migrate/#changed-scoped-css-specificity) for more details. + > **Warning** + > Please visually inspect your site output to make sure everything is styled as expected. If not, find your scoped style and increase the selector specificity manually to match the old behavior. +- Components and JSX in Markdown has been deprecated. For long-term support you should migrate to the [`@astrojs/mdx`](https://docs.astro.build/en/guides/integrations-guide/mdx/) integration. See the [migration guide](https://docs.astro.build/en/migrate/#deprecated-components-and-jsx-in-markdown) for more details. +- The previously deprecated `` component has been removed. It is now available as a separate package, [`@astrojs/markdown-component`](https://github.com/withastro/astro/tree/main/packages/markdown/component). + +If you are coming from v0.25 or earlier, make sure you have read and followed the [v0.26 Migration Guide](https://docs.astro.build/en/migrate/#migrate-to-v026), which contained several major breaking changes. + +### Patch Changes + +- Updated dependencies [[`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308)]: + - @astrojs/markdown-remark@1.0.0 + - @astrojs/telemetry@1.0.0 + - @astrojs/webapi@1.0.0 + ## 1.0.0-rc.8 ### Patch Changes @@ -416,7 +450,17 @@ The **Astro v1.0.0 Release Candidate** comes includes new features, tons of bug Astro supports streaming in its templates. Any time Astro encounters an async boundary it will stream out HTML that occurs before it. For example: ```astro - + --- + import LoadTodos from '../components/LoadTodos.astro'; + --- + + + App + + + + + ``` In this arbtrary example Astro will streaming out the `` section and everything else until it encounters `` and then stop. LoadTodos, which is also an Astro component will stream its contents as well; stopping and waiting at any other asynchronous components. @@ -424,7 +468,15 @@ The **Astro v1.0.0 Release Candidate** comes includes new features, tons of bug As part of this Astro also now supports async iterables within its templates. This means you can do this: ```astro - +
    + {(async function* () { + for (const number of numbers) { + await wait(1000); + yield
  • Number: {number}
    • ; + yield '\n'; + } + })()} +
``` Which will stream out `
  • `s one at a time, waiting a second between each. @@ -2565,7 +2617,9 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve This change adds support for hoisted scripts, allowing you to bundle scripts together for a page and hoist them to the top (in the head): ```astro - + ``` - Updated dependencies [5d2ea578] @@ -2607,10 +2661,6 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve - f9cd0310: Improve schema validation using zod - efb41f22: Add `` component for JavaScript-free client-side debugging. - ```astro - - ``` - ## 0.19.2 ### Patch Changes @@ -2658,11 +2708,7 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve ``` - The above will be sent to the browser as-is and the browser will resolve it relative to the current **page**. If you want it to be resolved relative to the .astro file you are working in, use `Astro.resolve`: - - ```astro - - ``` + The above will be sent to the browser as-is and the browser will resolve it relative to the current **page**. If you want it to be resolved relative to the .astro file you are working in, use `Astro.resolve`. - 239065e2: Adds support for client:only hydrator @@ -2749,10 +2795,6 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve The above will be sent to the browser as-is and the browser will resolve it relative to the current **page**. If you want it to be resolved relative to the .astro file you are working in, use `Astro.resolve`: - ```astro - - ``` - ## 0.19.0-next.2 ### Patch Changes @@ -3077,22 +3119,14 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve - 1b73f95: Only show the buildOptions.site notice if not already set - fb78b76: Improve error handling for unsupported Node versions -- d93f768: Add support for components defined in Frontmatter. Previously, the following code would throw an error. Now it is officially supported! - - ```astro - - ``` +- d93f768: Add support for components defined in Frontmatter. ## 0.17.1 ### Patch Changes - 1e01251: Fixes bug with React renderer that would not hydrate correctly -- 42a6ace: Add support for components defined in Frontmatter. Previously, the following code would throw an error. Now it is officially supported! - - ```astro - - ``` +- 42a6ace: Add support for components defined in Frontmatter. - Updated dependencies [1e01251] - @astrojs/renderer-react@0.1.5 diff --git a/packages/astro/package.json b/packages/astro/package.json index d5309f60a234..6d985aa3f55d 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "1.0.0-rc.8", + "version": "1.0.0", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", @@ -88,9 +88,9 @@ "dependencies": { "@astrojs/compiler": "^0.23.1", "@astrojs/language-server": "^0.20.0", - "@astrojs/markdown-remark": "^0.14.1", - "@astrojs/telemetry": "^0.4.1", - "@astrojs/webapi": "^0.12.0", + "@astrojs/markdown-remark": "^1.0.0", + "@astrojs/telemetry": "^1.0.0", + "@astrojs/webapi": "^1.0.0", "@babel/core": "^7.18.2", "@babel/generator": "^7.18.2", "@babel/parser": "^7.18.4", diff --git a/packages/create-astro/CHANGELOG.md b/packages/create-astro/CHANGELOG.md index c12d8328bcee..7205cd47187f 100644 --- a/packages/create-astro/CHANGELOG.md +++ b/packages/create-astro/CHANGELOG.md @@ -1,5 +1,13 @@ # create-astro +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.15.1 ### Patch Changes diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json index 410823d9ea73..aee43f7267b3 100644 --- a/packages/create-astro/package.json +++ b/packages/create-astro/package.json @@ -1,6 +1,6 @@ { "name": "create-astro", - "version": "0.15.1", + "version": "1.0.0", "type": "module", "author": "withastro", "license": "MIT", diff --git a/packages/integrations/cloudflare/CHANGELOG.md b/packages/integrations/cloudflare/CHANGELOG.md index ee8eba2d4ab3..9280f7081f01 100644 --- a/packages/integrations/cloudflare/CHANGELOG.md +++ b/packages/integrations/cloudflare/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/cloudflare +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.5.0 ### Minor Changes @@ -50,7 +58,7 @@ The new `Astro.clientAddress` property allows you to get the IP address of the requested user. ```astro - +
    Your address {Astro.clientAddress}
    ``` This property is only available when building for SSR, and only if the adapter you are using supports providing the IP address. If you attempt to access the property in a SSG app it will throw an error. diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index c254ada381aa..1c13bdbefde5 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/cloudflare", "description": "Deploy your site to cloudflare pages functions", - "version": "0.5.0", + "version": "1.0.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/deno/CHANGELOG.md b/packages/integrations/deno/CHANGELOG.md index c0046c185748..3f53001c0775 100644 --- a/packages/integrations/deno/CHANGELOG.md +++ b/packages/integrations/deno/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/node +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.2.0 ### Minor Changes diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 5c9867677f62..8975789c475d 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/deno", "description": "Deploy your site to a Deno server", - "version": "0.2.0", + "version": "1.0.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/lit/CHANGELOG.md b/packages/integrations/lit/CHANGELOG.md index dc79672b1c7b..7290c5b3ddfa 100644 --- a/packages/integrations/lit/CHANGELOG.md +++ b/packages/integrations/lit/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/lit +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.3.2 ### Patch Changes diff --git a/packages/integrations/lit/package.json b/packages/integrations/lit/package.json index 41c449cb1cd3..fd4bb461a27a 100644 --- a/packages/integrations/lit/package.json +++ b/packages/integrations/lit/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/lit", - "version": "0.3.2", + "version": "1.0.0", "description": "Use Lit components within Astro", "type": "module", "types": "./dist/index.d.ts", diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md index 51fa24d84ced..c8e389628f53 100644 --- a/packages/integrations/mdx/CHANGELOG.md +++ b/packages/integrations/mdx/CHANGELOG.md @@ -1,5 +1,12 @@ # @astrojs/mdx +## 0.8.1 + +### Patch Changes + +- Updated dependencies [[`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308)]: + - @astrojs/prism@1.0.0 + ## 0.8.0 ### Minor Changes diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index abe28af6b0b5..3aca2ea277a3 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.8.0", + "version": "0.8.1", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -29,7 +29,7 @@ "test": "mocha --exit --timeout 20000" }, "dependencies": { - "@astrojs/prism": "^0.7.0", + "@astrojs/prism": "^1.0.0", "@mdx-js/mdx": "^2.1.2", "@mdx-js/rollup": "^2.1.1", "acorn": "^8.8.0", diff --git a/packages/integrations/netlify/CHANGELOG.md b/packages/integrations/netlify/CHANGELOG.md index b714cc9ea319..d34f97f6455c 100644 --- a/packages/integrations/netlify/CHANGELOG.md +++ b/packages/integrations/netlify/CHANGELOG.md @@ -1,5 +1,18 @@ # @astrojs/netlify +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + +### Patch Changes + +- Updated dependencies [[`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308)]: + - @astrojs/webapi@1.0.0 + ## 0.5.0 ### Minor Changes diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 2a0eadf6a733..92571797af9c 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/netlify", "description": "Deploy your site to Netlify", - "version": "0.5.0", + "version": "1.0.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -33,7 +33,7 @@ "test": "npm run test-fn" }, "dependencies": { - "@astrojs/webapi": "^0.12.0", + "@astrojs/webapi": "^1.0.0", "esbuild": "^0.14.43" }, "devDependencies": { diff --git a/packages/integrations/node/CHANGELOG.md b/packages/integrations/node/CHANGELOG.md index 633450dd5021..f162da9205e9 100644 --- a/packages/integrations/node/CHANGELOG.md +++ b/packages/integrations/node/CHANGELOG.md @@ -1,5 +1,18 @@ # @astrojs/node +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + +### Patch Changes + +- Updated dependencies [[`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308)]: + - @astrojs/webapi@1.0.0 + ## 0.2.1 ### Patch Changes diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 6b1b5c43022c..0301c4665e89 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/node", "description": "Deploy your site to a Node.js server", - "version": "0.2.1", + "version": "1.0.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -28,7 +28,7 @@ "test": "mocha --exit --timeout 20000 test/" }, "dependencies": { - "@astrojs/webapi": "^0.12.0" + "@astrojs/webapi": "^1.0.0" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/partytown/CHANGELOG.md b/packages/integrations/partytown/CHANGELOG.md index 769bef9126c4..5112fc488c12 100644 --- a/packages/integrations/partytown/CHANGELOG.md +++ b/packages/integrations/partytown/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/partytown +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.1.9 ### Patch Changes diff --git a/packages/integrations/partytown/package.json b/packages/integrations/partytown/package.json index 93f82b38245d..66517c8d5051 100644 --- a/packages/integrations/partytown/package.json +++ b/packages/integrations/partytown/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/partytown", "description": "Astro + Partytown integration", - "version": "0.1.9", + "version": "1.0.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/preact/CHANGELOG.md b/packages/integrations/preact/CHANGELOG.md index de3416c679d4..b2c7cfe416fc 100644 --- a/packages/integrations/preact/CHANGELOG.md +++ b/packages/integrations/preact/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/preact +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.5.2 ### Patch Changes diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json index 597c4c63eac2..114d09c218a6 100644 --- a/packages/integrations/preact/package.json +++ b/packages/integrations/preact/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/preact", "description": "Use Preact components within Astro", - "version": "0.5.2", + "version": "1.0.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/react/CHANGELOG.md b/packages/integrations/react/CHANGELOG.md index 2c035b871094..92eea29b3925 100644 --- a/packages/integrations/react/CHANGELOG.md +++ b/packages/integrations/react/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/react +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.4.3 ### Patch Changes diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json index b9b1ec71e8f4..02df926c6130 100644 --- a/packages/integrations/react/package.json +++ b/packages/integrations/react/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/react", "description": "Use React components within Astro", - "version": "0.4.3", + "version": "1.0.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/sitemap/CHANGELOG.md b/packages/integrations/sitemap/CHANGELOG.md index 81e8a13ee12a..d72d371dcf5c 100644 --- a/packages/integrations/sitemap/CHANGELOG.md +++ b/packages/integrations/sitemap/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/sitemap +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.3.0 ### Minor Changes diff --git a/packages/integrations/sitemap/package.json b/packages/integrations/sitemap/package.json index 51096c82296c..33f650b561e6 100644 --- a/packages/integrations/sitemap/package.json +++ b/packages/integrations/sitemap/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/sitemap", "description": "Generate a sitemap for Astro", - "version": "0.3.0", + "version": "1.0.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/solid/CHANGELOG.md b/packages/integrations/solid/CHANGELOG.md index ac7adc649f22..2dabd75d26a4 100644 --- a/packages/integrations/solid/CHANGELOG.md +++ b/packages/integrations/solid/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/solid-js +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.4.1 ### Patch Changes diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index eff11804b019..b69175007a57 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/solid-js", - "version": "0.4.1", + "version": "1.0.0", "description": "Use Solid components within Astro", "type": "module", "types": "./dist/index.d.ts", diff --git a/packages/integrations/svelte/CHANGELOG.md b/packages/integrations/svelte/CHANGELOG.md index 9507fc9ac9b9..6dca1811fd16 100644 --- a/packages/integrations/svelte/CHANGELOG.md +++ b/packages/integrations/svelte/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/svelte +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.5.1 ### Patch Changes diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 6b966fd38dbc..2d8fc9964201 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/svelte", - "version": "0.5.1", + "version": "1.0.0", "description": "Use Svelte components within Astro", "type": "module", "types": "./dist/index.d.ts", diff --git a/packages/integrations/tailwind/CHANGELOG.md b/packages/integrations/tailwind/CHANGELOG.md index ff2085bed3bf..2300e468b84f 100644 --- a/packages/integrations/tailwind/CHANGELOG.md +++ b/packages/integrations/tailwind/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/tailwind +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.2.5 ### Patch Changes diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index 0338976087b9..8bf845110c79 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/tailwind", "description": "Tailwind + Astro Integrations", - "version": "0.2.5", + "version": "1.0.0", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md index 0f68e00351c6..69871113b5bf 100644 --- a/packages/integrations/vercel/CHANGELOG.md +++ b/packages/integrations/vercel/CHANGELOG.md @@ -1,5 +1,18 @@ # @astrojs/vercel +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + +### Patch Changes + +- Updated dependencies [[`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308)]: + - @astrojs/webapi@1.0.0 + ## 0.4.0 ### Minor Changes diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 563da1050af0..332e702972d0 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/vercel", "description": "Deploy your site to Vercel", - "version": "0.4.0", + "version": "1.0.0", "type": "module", "author": "withastro", "license": "MIT", @@ -43,7 +43,7 @@ "test": "mocha --exit --timeout 20000 test/" }, "dependencies": { - "@astrojs/webapi": "^0.12.0", + "@astrojs/webapi": "^1.0.0", "@vercel/nft": "^0.18.2" }, "devDependencies": { diff --git a/packages/integrations/vue/CHANGELOG.md b/packages/integrations/vue/CHANGELOG.md index 5aac294d7e9b..7dba68ad0749 100644 --- a/packages/integrations/vue/CHANGELOG.md +++ b/packages/integrations/vue/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/vue +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.5.0 ### Minor Changes diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index 74a4118e9ea0..fc9e56d4fba0 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/vue", - "version": "0.5.0", + "version": "1.0.0", "description": "Use Vue components within Astro", "type": "module", "types": "./dist/index.d.ts", diff --git a/packages/markdown/component/CHANGELOG.md b/packages/markdown/component/CHANGELOG.md index 7e181e8a7d2f..d803ed813e86 100644 --- a/packages/markdown/component/CHANGELOG.md +++ b/packages/markdown/component/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/markdown-component +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.2.1 ### Patch Changes diff --git a/packages/markdown/component/package.json b/packages/markdown/component/package.json index 242b54bd318b..7236f0b44143 100644 --- a/packages/markdown/component/package.json +++ b/packages/markdown/component/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/markdown-component", - "version": "0.2.1", + "version": "1.0.0", "type": "module", "author": "withastro", "license": "MIT", diff --git a/packages/markdown/remark/CHANGELOG.md b/packages/markdown/remark/CHANGELOG.md index 7745d9a72023..5e689f8ce6c9 100644 --- a/packages/markdown/remark/CHANGELOG.md +++ b/packages/markdown/remark/CHANGELOG.md @@ -1,5 +1,18 @@ # @astrojs/markdown-remark +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + +### Patch Changes + +- Updated dependencies [[`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308)]: + - @astrojs/prism@1.0.0 + ## 0.14.1 ### Patch Changes diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json index cd3d2414ce04..7573e833d71e 100644 --- a/packages/markdown/remark/package.json +++ b/packages/markdown/remark/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/markdown-remark", - "version": "0.14.1", + "version": "1.0.0", "type": "module", "author": "withastro", "license": "MIT", @@ -25,7 +25,7 @@ }, "dependencies": { "@astrojs/micromark-extension-mdx-jsx": "^1.0.3", - "@astrojs/prism": "^0.7.0", + "@astrojs/prism": "^1.0.0", "acorn": "^8.7.1", "acorn-jsx": "^5.3.2", "github-slugger": "^1.4.0", diff --git a/packages/telemetry/CHANGELOG.md b/packages/telemetry/CHANGELOG.md index 6dc4ea56e713..e632bd87d723 100644 --- a/packages/telemetry/CHANGELOG.md +++ b/packages/telemetry/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/telemetry +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.4.1 ### Patch Changes diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 67971f843221..6faa09098eda 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/telemetry", - "version": "0.4.1", + "version": "1.0.0", "type": "module", "types": "./dist/types/index.d.ts", "author": "withastro", diff --git a/packages/webapi/CHANGELOG.md b/packages/webapi/CHANGELOG.md index df341b3afcca..bb83795ef52f 100644 --- a/packages/webapi/CHANGELOG.md +++ b/packages/webapi/CHANGELOG.md @@ -1,5 +1,13 @@ # @astrojs/webapi +## 1.0.0 + +### Major Changes + +- [`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308) - > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). + + **No breaking changes**. This package is now officially stable and compatible with `astro@1.0.0`! + ## 0.12.0 ### Minor Changes diff --git a/packages/webapi/package.json b/packages/webapi/package.json index 4148783178f7..1d8727c25677 100644 --- a/packages/webapi/package.json +++ b/packages/webapi/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/webapi", "description": "Use Web APIs in Node", - "version": "0.12.0", + "version": "1.0.0", "type": "module", "exports": { ".": { diff --git a/patches/@changesets__assemble-release-plan@5.1.3.patch b/patches/@changesets__assemble-release-plan@5.1.3.patch deleted file mode 100644 index 177ca9abec65..000000000000 --- a/patches/@changesets__assemble-release-plan@5.1.3.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/dist/assemble-release-plan.cjs.dev.js b/dist/assemble-release-plan.cjs.dev.js -index f05ea74cd2a76884ed8a754e821775003af63764..de0b7fe8d53ffad29cae2de145042b9b8376625c 100644 ---- a/dist/assemble-release-plan.cjs.dev.js -+++ b/dist/assemble-release-plan.cjs.dev.js -@@ -65,6 +65,9 @@ function incrementVersion(release, preInfo) { - } - - let version = semver.inc(release.oldVersion, release.type); -+ if (release.name === 'astro') { -+ version = semver.inc(release.oldVersion, 'prerelease'); -+ } - - if (preInfo !== undefined && preInfo.state.mode !== "exit") { - let preVersion = preInfo.preVersions.get(release.name); \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cc8dd7753d46..6b77dc333403 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,16 +6,12 @@ patchedDependencies: '@changesets/cli@2.23.0': hash: kcozqtpxuwjzskw6zg5royevn4 path: patches/@changesets__cli@2.23.0.patch - '@changesets/assemble-release-plan@5.1.3': - hash: t3ywtunilq53oqooixy7kemkoi - path: patches/@changesets__assemble-release-plan@5.1.3.patch importers: .: specifiers: '@astrojs/webapi': workspace:* - '@changesets/assemble-release-plan': 5.1.3 '@changesets/changelog-github': 0.4.4 '@changesets/cli': 2.23.0 '@octokit/action': ^3.18.1 @@ -38,7 +34,6 @@ importers: dependencies: '@astrojs/webapi': link:packages/webapi devDependencies: - '@changesets/assemble-release-plan': 5.1.3_t3ywtunilq53oqooixy7kemkoi '@changesets/changelog-github': 0.4.4 '@changesets/cli': 2.23.0_kcozqtpxuwjzskw6zg5royevn4 '@octokit/action': 3.18.1 @@ -61,14 +56,14 @@ importers: examples/basics: specifiers: - astro: ^1.0.0-rc.8 + astro: ^1.0.0 devDependencies: astro: link:../../packages/astro examples/blog: specifiers: - '@astrojs/preact': ^0.5.2 - astro: ^1.0.0-rc.8 + '@astrojs/preact': ^1.0.0 + astro: ^1.0.0 preact: ^10.7.3 dependencies: preact: 10.10.1 @@ -78,14 +73,14 @@ importers: examples/component: specifiers: - astro: ^1.0.0-rc.8 + astro: ^1.0.0 devDependencies: astro: link:../../packages/astro examples/component/demo: specifiers: '@example/my-component': workspace:* - astro: ^1.0.0-rc.8 + astro: ^1.0.0 devDependencies: '@example/my-component': link:../packages/my-component astro: link:../../../packages/astro @@ -96,12 +91,12 @@ importers: examples/docs: specifiers: '@algolia/client-search': ^4.13.1 - '@astrojs/preact': ^0.5.2 - '@astrojs/react': ^0.4.3 + '@astrojs/preact': ^1.0.0 + '@astrojs/react': ^1.0.0 '@docsearch/css': ^3.1.0 '@docsearch/react': ^3.1.0 '@types/react': ^17.0.45 - astro: ^1.0.0-rc.8 + astro: ^1.0.0 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -120,7 +115,7 @@ importers: examples/env-vars: specifiers: - astro: ^1.0.0-rc.8 + astro: ^1.0.0 devDependencies: astro: link:../../packages/astro @@ -128,7 +123,7 @@ importers: specifiers: '@types/alpinejs': ^3.7.0 alpinejs: ^3.10.2 - astro: ^1.0.0-rc.8 + astro: ^1.0.0 dependencies: alpinejs: 3.10.3 devDependencies: @@ -137,9 +132,9 @@ importers: examples/framework-lit: specifiers: - '@astrojs/lit': ^0.3.2 + '@astrojs/lit': ^1.0.0 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.0.0-rc.8 + astro: ^1.0.0 lit: ^2.2.5 dependencies: '@webcomponents/template-shadowroot': 0.1.0 @@ -150,12 +145,12 @@ importers: examples/framework-multiple: specifiers: - '@astrojs/preact': ^0.5.2 - '@astrojs/react': ^0.4.3 - '@astrojs/solid-js': ^0.4.1 - '@astrojs/svelte': ^0.5.1 - '@astrojs/vue': ^0.5.0 - astro: ^1.0.0-rc.8 + '@astrojs/preact': ^1.0.0 + '@astrojs/react': ^1.0.0 + '@astrojs/solid-js': ^1.0.0 + '@astrojs/svelte': ^1.0.0 + '@astrojs/vue': ^1.0.0 + astro: ^1.0.0 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -179,8 +174,8 @@ importers: examples/framework-preact: specifiers: - '@astrojs/preact': ^0.5.2 - astro: ^1.0.0-rc.8 + '@astrojs/preact': ^1.0.0 + astro: ^1.0.0 preact: ^10.7.3 dependencies: preact: 10.10.1 @@ -190,10 +185,10 @@ importers: examples/framework-react: specifiers: - '@astrojs/react': ^0.4.3 + '@astrojs/react': ^1.0.0 '@types/react': ^18.0.10 '@types/react-dom': ^18.0.5 - astro: ^1.0.0-rc.8 + astro: ^1.0.0 react: ^18.1.0 react-dom: ^18.1.0 dependencies: @@ -207,8 +202,8 @@ importers: examples/framework-solid: specifiers: - '@astrojs/solid-js': ^0.4.1 - astro: ^1.0.0-rc.8 + '@astrojs/solid-js': ^1.0.0 + astro: ^1.0.0 solid-js: ^1.4.3 dependencies: solid-js: 1.4.8 @@ -218,8 +213,8 @@ importers: examples/framework-svelte: specifiers: - '@astrojs/svelte': ^0.5.1 - astro: ^1.0.0-rc.8 + '@astrojs/svelte': ^1.0.0 + astro: ^1.0.0 svelte: ^3.48.0 dependencies: svelte: 3.49.0 @@ -229,8 +224,8 @@ importers: examples/framework-vue: specifiers: - '@astrojs/vue': ^0.5.0 - astro: ^1.0.0-rc.8 + '@astrojs/vue': ^1.0.0 + astro: ^1.0.0 vue: ^3.2.37 dependencies: vue: 3.2.37 @@ -240,20 +235,20 @@ importers: examples/minimal: specifiers: - astro: ^1.0.0-rc.8 + astro: ^1.0.0 devDependencies: astro: link:../../packages/astro examples/non-html-pages: specifiers: - astro: ^1.0.0-rc.8 + astro: ^1.0.0 devDependencies: astro: link:../../packages/astro examples/portfolio: specifiers: - '@astrojs/preact': ^0.5.2 - astro: ^1.0.0-rc.8 + '@astrojs/preact': ^1.0.0 + astro: ^1.0.0 preact: ^10.7.3 sass: ^1.52.2 dependencies: @@ -265,9 +260,9 @@ importers: examples/ssr: specifiers: - '@astrojs/node': ^0.2.1 - '@astrojs/svelte': ^0.5.1 - astro: ^1.0.0-rc.8 + '@astrojs/node': ^1.0.0 + '@astrojs/svelte': ^1.0.0 + astro: ^1.0.0 concurrently: ^7.2.1 lightcookie: ^1.0.25 svelte: ^3.48.0 @@ -286,8 +281,8 @@ importers: examples/subpath: specifiers: - '@astrojs/react': ^0.4.3 - astro: ^1.0.0-rc.8 + '@astrojs/react': ^1.0.0 + astro: ^1.0.0 react: ^18.1.0 react-dom: ^18.1.0 dependencies: @@ -299,8 +294,8 @@ importers: examples/with-markdown-plugins: specifiers: - '@astrojs/markdown-remark': ^0.14.1 - astro: ^1.0.0-rc.8 + '@astrojs/markdown-remark': ^1.0.0 + astro: ^1.0.0 hast-util-select: 5.0.1 rehype-autolink-headings: ^6.1.1 rehype-slug: ^5.0.1 @@ -317,17 +312,17 @@ importers: examples/with-markdown-shiki: specifiers: - '@astrojs/markdown-remark': ^0.14.1 - astro: ^1.0.0-rc.8 + '@astrojs/markdown-remark': ^1.0.0 + astro: ^1.0.0 devDependencies: '@astrojs/markdown-remark': link:../../packages/markdown/remark astro: link:../../packages/astro examples/with-mdx: specifiers: - '@astrojs/mdx': ^0.8.0 - '@astrojs/preact': ^0.5.2 - astro: ^1.0.0-rc.8 + '@astrojs/mdx': ^0.8.1 + '@astrojs/preact': ^1.0.0 + astro: ^1.0.0 preact: ^10.6.5 devDependencies: '@astrojs/mdx': link:../../packages/integrations/mdx @@ -337,9 +332,9 @@ importers: examples/with-nanostores: specifiers: - '@astrojs/preact': ^0.5.2 + '@astrojs/preact': ^1.0.0 '@nanostores/preact': ^0.1.3 - astro: ^1.0.0-rc.8 + astro: ^1.0.0 nanostores: ^0.5.12 preact: ^10.7.3 dependencies: @@ -352,8 +347,8 @@ importers: examples/with-tailwindcss: specifiers: - '@astrojs/tailwind': ^0.2.5 - astro: ^1.0.0-rc.8 + '@astrojs/tailwind': ^1.0.0 + astro: ^1.0.0 autoprefixer: ^10.4.7 canvas-confetti: ^1.5.1 postcss: ^8.4.14 @@ -368,7 +363,7 @@ importers: examples/with-vite-plugin-pwa: specifiers: - astro: ^1.0.0-rc.8 + astro: ^1.0.0 vite-plugin-pwa: 0.11.11 workbox-window: ^6.5.3 devDependencies: @@ -378,7 +373,7 @@ importers: examples/with-vitest: specifiers: - astro: ^1.0.0-rc.8 + astro: ^1.0.0 vitest: ^0.20.3 devDependencies: astro: link:../../packages/astro @@ -388,9 +383,9 @@ importers: specifiers: '@astrojs/compiler': ^0.23.1 '@astrojs/language-server': ^0.20.0 - '@astrojs/markdown-remark': ^0.14.1 - '@astrojs/telemetry': ^0.4.1 - '@astrojs/webapi': ^0.12.0 + '@astrojs/markdown-remark': ^1.0.0 + '@astrojs/telemetry': ^1.0.0 + '@astrojs/webapi': ^1.0.0 '@babel/core': ^7.18.2 '@babel/generator': ^7.18.2 '@babel/parser': ^7.18.4 @@ -2189,7 +2184,7 @@ importers: packages/integrations/mdx: specifiers: - '@astrojs/prism': ^0.7.0 + '@astrojs/prism': ^1.0.0 '@mdx-js/mdx': ^2.1.2 '@mdx-js/rollup': ^2.1.1 '@types/chai': ^4.3.1 @@ -2278,7 +2273,7 @@ importers: packages/integrations/netlify: specifiers: - '@astrojs/webapi': ^0.12.0 + '@astrojs/webapi': ^1.0.0 '@netlify/edge-handler-types': ^0.34.1 '@netlify/functions': ^1.0.0 '@types/node': ^14.18.20 @@ -2327,7 +2322,7 @@ importers: packages/integrations/node: specifiers: - '@astrojs/webapi': ^0.12.0 + '@astrojs/webapi': ^1.0.0 astro: workspace:* astro-scripts: workspace:* node-mocks-http: ^1.11.0 @@ -2503,7 +2498,7 @@ importers: packages/integrations/vercel: specifiers: - '@astrojs/webapi': ^0.12.0 + '@astrojs/webapi': ^1.0.0 '@vercel/nft': ^0.18.2 astro: workspace:* astro-scripts: workspace:* @@ -2644,7 +2639,7 @@ importers: packages/markdown/remark: specifiers: '@astrojs/micromark-extension-mdx-jsx': ^1.0.3 - '@astrojs/prism': ^0.7.0 + '@astrojs/prism': ^1.0.0 '@types/chai': ^4.3.1 '@types/github-slugger': ^1.3.0 '@types/hast': ^2.3.4 @@ -4483,7 +4478,7 @@ packages: semver: 5.7.1 dev: true - /@changesets/assemble-release-plan/5.1.3_t3ywtunilq53oqooixy7kemkoi: + /@changesets/assemble-release-plan/5.1.3: resolution: {integrity: sha512-I+TTkUoqvxBEuDLoJfJYKDXIJ+nyiTbVJ8KGhpXEsLq4N/ms/AStSbouJwF2d/p3cB+RCPr5+gXh31GSN4kA7w==} dependencies: '@babel/runtime': 7.18.9 @@ -4493,7 +4488,6 @@ packages: '@manypkg/get-packages': 1.1.3 semver: 5.7.1 dev: true - patched: true /@changesets/assemble-release-plan/5.2.0: resolution: {integrity: sha512-ewY24PEbSec2eKX0+KM7eyENA2hUUp6s4LF9p/iBxTtc+TX2Xbx5rZnlLKZkc8tpuQ3PZbyjLFXWhd1PP6SjCg==} @@ -4528,7 +4522,7 @@ packages: dependencies: '@babel/runtime': 7.18.9 '@changesets/apply-release-plan': 6.0.4 - '@changesets/assemble-release-plan': 5.1.3_t3ywtunilq53oqooixy7kemkoi + '@changesets/assemble-release-plan': 5.1.3 '@changesets/changelog-git': 0.1.12 '@changesets/config': 2.1.1 '@changesets/errors': 0.1.4 diff --git a/scripts/CHANGELOG.md b/scripts/CHANGELOG.md index 64a69307a037..ecf83aa51270 100644 --- a/scripts/CHANGELOG.md +++ b/scripts/CHANGELOG.md @@ -1,5 +1,12 @@ # astro-scripts +## 0.0.7 + +### Patch Changes + +- Updated dependencies [[`04ad44563`](https://github.com/withastro/astro/commit/04ad445632c67bdd60c1704e1e0dcbcaa27b9308)]: + - @astrojs/webapi@1.0.0 + ## 0.0.6 ### Patch Changes diff --git a/scripts/package.json b/scripts/package.json index a2bc0e70c0f6..f8b6658b9a0f 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -1,6 +1,6 @@ { "name": "astro-scripts", - "version": "0.0.6", + "version": "0.0.7", "private": true, "type": "module", "main": "./index.js", From a4f24266c0ca262df7c4e040a6fbb3559747b43a Mon Sep 17 00:00:00 2001 From: natemoo-re Date: Tue, 9 Aug 2022 16:12:27 +0000 Subject: [PATCH 03/16] [ci] format --- packages/astro/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 2b4d4bca0144..4d648c570139 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -453,6 +453,7 @@ The **Astro v1.0.0 Release Candidate** comes includes new features, tons of bug --- import LoadTodos from '../components/LoadTodos.astro'; --- + App From b5ef1c2113693523f10479d472e855ab9c41395d Mon Sep 17 00:00:00 2001 From: Ben Holmes Date: Tue, 9 Aug 2022 18:18:34 -0500 Subject: [PATCH 04/16] [MD] Add `rawContent` and `compiledContent` to MD layout props (#4222) * fix: add subs for astro.source and astro.html * fix: define "source" property * test: raw and compiled content from layout * chore: changeset Co-authored-by: bholmesdev --- .changeset/warm-socks-exercise.md | 5 +++++ .../astro/src/vite-plugin-markdown/index.ts | 20 ++++++++++++++++- packages/astro/test/astro-markdown.test.js | 22 +++++++++++++++++++ .../astro-markdown/src/layouts/Base.astro | 4 ++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 .changeset/warm-socks-exercise.md diff --git a/.changeset/warm-socks-exercise.md b/.changeset/warm-socks-exercise.md new file mode 100644 index 000000000000..f776943130c9 --- /dev/null +++ b/.changeset/warm-socks-exercise.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Add rawContent and compiledContent to MD layout props diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts index 3279e573c1fd..d025d669da76 100644 --- a/packages/astro/src/vite-plugin-markdown/index.ts +++ b/packages/astro/src/vite-plugin-markdown/index.ts @@ -92,10 +92,28 @@ export default function markdown({ config, logging }: AstroPluginOptions): Plugi throw new Error('The "astro" property is no longer supported! To access "headings" from your layout, try using "Astro.props.headings."') } }); + Object.defineProperty(content.astro, 'html', { + get() { + throw new Error('The "astro" property is no longer supported! To access "html" from your layout, try using "Astro.props.compiledContent()."') + } + }); + Object.defineProperty(content.astro, 'source', { + get() { + throw new Error('The "astro" property is no longer supported! To access "source" from your layout, try using "Astro.props.rawContent()."') + } + }); const contentFragment = h(Fragment, { 'set:html': html }); return ${ layout - ? `h(Layout, { content, frontmatter: content, headings: getHeadings(), 'server:root': true, children: contentFragment })` + ? `h(Layout, { + content, + frontmatter: content, + headings: getHeadings(), + rawContent, + compiledContent, + 'server:root': true, + children: contentFragment + })` : `contentFragment` }; } diff --git a/packages/astro/test/astro-markdown.test.js b/packages/astro/test/astro-markdown.test.js index cf0e7a0ac665..c326bb5486fd 100644 --- a/packages/astro/test/astro-markdown.test.js +++ b/packages/astro/test/astro-markdown.test.js @@ -89,6 +89,28 @@ describe('Astro Markdown', () => { expect(headingSlugs).to.contain('section-2'); }); + it('Passes compiled content to layout via "compiledContent" prop', async () => { + const html = await fixture.readFile('/with-layout/index.html'); + const $ = cheerio.load(html); + + const compiledContent = $('[data-compiled-content]'); + + expect(fixLineEndings(compiledContent.text()).trim()).to.equal( + `

    Section 1

    \n

    Section 2

    ` + ); + }); + + it('Passes raw content to layout via "rawContent" prop', async () => { + const html = await fixture.readFile('/with-layout/index.html'); + const $ = cheerio.load(html); + + const rawContent = $('[data-raw-content]'); + + expect(fixLineEndings(rawContent.text()).trim()).to.equal( + `## Section 1\n\n## Section 2` + ); + }); + it('Exposes getHeadings() on glob imports', async () => { const { headings } = JSON.parse(await fixture.readFile('/headings-glob.json')); diff --git a/packages/astro/test/fixtures/astro-markdown/src/layouts/Base.astro b/packages/astro/test/fixtures/astro-markdown/src/layouts/Base.astro index e4fa7560acf9..64817bad9ecc 100644 --- a/packages/astro/test/fixtures/astro-markdown/src/layouts/Base.astro +++ b/packages/astro/test/fixtures/astro-markdown/src/layouts/Base.astro @@ -3,6 +3,8 @@ const { content = { title: "content didn't work" }, frontmatter = { title: "frontmatter didn't work" }, headings = [], + compiledContent = () => '', + rawContent = () => '', } = Astro.props; --- @@ -18,6 +20,8 @@ const {

    {content.title}

    {frontmatter.title}

    +

    {compiledContent()}

    +

    {rawContent()}

    Layout rendered!

      {headings.map(heading =>
    • {heading.slug}
      • )} From e09692459a485a886dec81bea12ec36c15dbd83d Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Tue, 9 Aug 2022 23:20:54 +0000 Subject: [PATCH 05/16] [ci] format --- packages/astro/test/astro-markdown.test.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/astro/test/astro-markdown.test.js b/packages/astro/test/astro-markdown.test.js index c326bb5486fd..0f0833365522 100644 --- a/packages/astro/test/astro-markdown.test.js +++ b/packages/astro/test/astro-markdown.test.js @@ -106,9 +106,7 @@ describe('Astro Markdown', () => { const rawContent = $('[data-raw-content]'); - expect(fixLineEndings(rawContent.text()).trim()).to.equal( - `## Section 1\n\n## Section 2` - ); + expect(fixLineEndings(rawContent.text()).trim()).to.equal(`## Section 1\n\n## Section 2`); }); it('Exposes getHeadings() on glob imports', async () => { From d4ad40987589299fb3a94aed8700caed29cfbb35 Mon Sep 17 00:00:00 2001 From: "Fred K. Bot" <108291165+fredkbot@users.noreply.github.com> Date: Tue, 9 Aug 2022 16:25:15 -0700 Subject: [PATCH 06/16] [ci] release (#4223) Co-authored-by: github-actions[bot] --- .changeset/warm-socks-exercise.md | 5 -- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/demo/package.json | 2 +- examples/component/package.json | 2 +- examples/docs/package.json | 2 +- examples/env-vars/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/subpath/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 31 ++++-------- packages/astro/package.json | 2 +- pnpm-lock.yaml | 52 ++++++++++----------- 30 files changed, 61 insertions(+), 81 deletions(-) delete mode 100644 .changeset/warm-socks-exercise.md diff --git a/.changeset/warm-socks-exercise.md b/.changeset/warm-socks-exercise.md deleted file mode 100644 index f776943130c9..000000000000 --- a/.changeset/warm-socks-exercise.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Add rawContent and compiledContent to MD layout props diff --git a/examples/basics/package.json b/examples/basics/package.json index ae8810318cda..b9e02f62d382 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 3574c1718c87..281a1ea315b8 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "preact": "^10.7.3" diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json index 7a0ea3ca7b9d..4d8af4e8b8e0 100644 --- a/examples/component/demo/package.json +++ b/examples/component/demo/package.json @@ -11,6 +11,6 @@ }, "devDependencies": { "@example/my-component": "workspace:*", - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/component/package.json b/examples/component/package.json index ee4684ec4ded..863bd4b568d9 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -8,6 +8,6 @@ "serve": "astro --root demo preview" }, "devDependencies": { - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/docs/package.json b/examples/docs/package.json index 7439a843bb0c..06fc1a556a6a 100644 --- a/examples/docs/package.json +++ b/examples/docs/package.json @@ -21,6 +21,6 @@ "devDependencies": { "@astrojs/preact": "^1.0.0", "@astrojs/react": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json index 4dee55a6dea7..9e05dab8ac96 100644 --- a/examples/env-vars/package.json +++ b/examples/env-vars/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index ba26b4f5fdba..8ef09e8ee14b 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@types/alpinejs": "^3.7.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "alpinejs": "^3.10.2" diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 5ab433f422ce..9e6b4ab6a4fb 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/lit": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 88090bb3dd8f..fe78e3a60939 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -15,7 +15,7 @@ "@astrojs/solid-js": "^1.0.0", "@astrojs/svelte": "^1.0.0", "@astrojs/vue": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "preact": "^10.7.3", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 130351e7ec09..866635ee93a7 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "preact": "^10.7.3" diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 3dcd62de47ec..ce1af197d9b0 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -13,7 +13,7 @@ "@astrojs/react": "^1.0.0", "@types/react": "^18.0.10", "@types/react-dom": "^18.0.5", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "react": "^18.1.0", diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index c7492fff34fb..bb070711c951 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/solid-js": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "solid-js": "^1.4.3" diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 439de97c076b..27e337fbf1f3 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/svelte": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "svelte": "^3.48.0" diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 3012ed2f284c..64d6f0b3664d 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/vue": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "vue": "^3.2.37" diff --git a/examples/minimal/package.json b/examples/minimal/package.json index a9e317792781..529dcfa67f2a 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 270e6d074dd4..d1fbc949bb77 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 12d2f338aea8..8b47ea2d210c 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.0", + "astro": "^1.0.1", "sass": "^1.52.2" }, "dependencies": { diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 549da23417ca..c14725f11e60 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@astrojs/node": "^1.0.0", "@astrojs/svelte": "^1.0.0", - "astro": "^1.0.0", + "astro": "^1.0.1", "concurrently": "^7.2.1", "lightcookie": "^1.0.25", "unocss": "^0.15.6", diff --git a/examples/subpath/package.json b/examples/subpath/package.json index 14fe1204cc8f..e6b8c5dbda91 100644 --- a/examples/subpath/package.json +++ b/examples/subpath/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/react": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "react": "^18.1.0", diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 2085838d47f5..d796b7955d48 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^1.0.0", - "astro": "^1.0.0", + "astro": "^1.0.1", "hast-util-select": "5.0.1", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.0.1", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 112eedb4c53f..4bd2d86808ad 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 558b8f2bdc44..ffae9fee152c 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -12,7 +12,7 @@ "devDependencies": { "@astrojs/mdx": "^0.8.1", "@astrojs/preact": "^1.0.0", - "astro": "^1.0.0", + "astro": "^1.0.1", "preact": "^10.6.5" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index de962c70f4cd..30b1347eadc4 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -16,6 +16,6 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 1391a72aea2f..d95e2d609654 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/tailwind": "^1.0.0", - "astro": "^1.0.0", + "astro": "^1.0.1", "autoprefixer": "^10.4.7", "canvas-confetti": "^1.5.1", "postcss": "^8.4.14", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index b4c4e61acf9a..5a8323eb74aa 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0", + "astro": "^1.0.1", "vite-plugin-pwa": "0.11.11", "workbox-window": "^6.5.3" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 4da833516a08..aa56c5eccfff 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "devDependencies": { - "astro": "^1.0.0", + "astro": "^1.0.1", "vitest": "^0.20.3" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 4d648c570139..fef7fd7167d9 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,11 @@ # astro +## 1.0.1 + +### Patch Changes + +- [#4222](https://github.com/withastro/astro/pull/4222) [`b5ef1c211`](https://github.com/withastro/astro/commit/b5ef1c2113693523f10479d472e855ab9c41395d) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Add rawContent and compiledContent to MD layout props + ## 1.0.0 > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). @@ -450,18 +456,7 @@ The **Astro v1.0.0 Release Candidate** comes includes new features, tons of bug Astro supports streaming in its templates. Any time Astro encounters an async boundary it will stream out HTML that occurs before it. For example: ```astro - --- - import LoadTodos from '../components/LoadTodos.astro'; - --- - - - App - - - - - ``` In this arbtrary example Astro will streaming out the `` section and everything else until it encounters `` and then stop. LoadTodos, which is also an Astro component will stream its contents as well; stopping and waiting at any other asynchronous components. @@ -469,15 +464,7 @@ The **Astro v1.0.0 Release Candidate** comes includes new features, tons of bug As part of this Astro also now supports async iterables within its templates. This means you can do this: ```astro -
        - {(async function* () { - for (const number of numbers) { - await wait(1000); - yield
      • Number: {number}
        • ; - yield '\n'; - } - })()} -
      + ``` Which will stream out `
    • `s one at a time, waiting a second between each. @@ -2618,9 +2605,7 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve This change adds support for hoisted scripts, allowing you to bundle scripts together for a page and hoist them to the top (in the head): ```astro - + ``` - Updated dependencies [5d2ea578] diff --git a/packages/astro/package.json b/packages/astro/package.json index 6d985aa3f55d..36e017eeb1b5 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "1.0.0", + "version": "1.0.1", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b77dc333403..a45019341c60 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,14 +56,14 @@ importers: examples/basics: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: astro: link:../../packages/astro examples/blog: specifiers: '@astrojs/preact': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.7.3 dependencies: preact: 10.10.1 @@ -73,14 +73,14 @@ importers: examples/component: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: astro: link:../../packages/astro examples/component/demo: specifiers: '@example/my-component': workspace:* - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: '@example/my-component': link:../packages/my-component astro: link:../../../packages/astro @@ -96,7 +96,7 @@ importers: '@docsearch/css': ^3.1.0 '@docsearch/react': ^3.1.0 '@types/react': ^17.0.45 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -115,7 +115,7 @@ importers: examples/env-vars: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: astro: link:../../packages/astro @@ -123,7 +123,7 @@ importers: specifiers: '@types/alpinejs': ^3.7.0 alpinejs: ^3.10.2 - astro: ^1.0.0 + astro: ^1.0.1 dependencies: alpinejs: 3.10.3 devDependencies: @@ -134,7 +134,7 @@ importers: specifiers: '@astrojs/lit': ^1.0.0 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.0.0 + astro: ^1.0.1 lit: ^2.2.5 dependencies: '@webcomponents/template-shadowroot': 0.1.0 @@ -150,7 +150,7 @@ importers: '@astrojs/solid-js': ^1.0.0 '@astrojs/svelte': ^1.0.0 '@astrojs/vue': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -175,7 +175,7 @@ importers: examples/framework-preact: specifiers: '@astrojs/preact': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.7.3 dependencies: preact: 10.10.1 @@ -188,7 +188,7 @@ importers: '@astrojs/react': ^1.0.0 '@types/react': ^18.0.10 '@types/react-dom': ^18.0.5 - astro: ^1.0.0 + astro: ^1.0.1 react: ^18.1.0 react-dom: ^18.1.0 dependencies: @@ -203,7 +203,7 @@ importers: examples/framework-solid: specifiers: '@astrojs/solid-js': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 solid-js: ^1.4.3 dependencies: solid-js: 1.4.8 @@ -214,7 +214,7 @@ importers: examples/framework-svelte: specifiers: '@astrojs/svelte': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 svelte: ^3.48.0 dependencies: svelte: 3.49.0 @@ -225,7 +225,7 @@ importers: examples/framework-vue: specifiers: '@astrojs/vue': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 vue: ^3.2.37 dependencies: vue: 3.2.37 @@ -235,20 +235,20 @@ importers: examples/minimal: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: astro: link:../../packages/astro examples/non-html-pages: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: astro: link:../../packages/astro examples/portfolio: specifiers: '@astrojs/preact': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.7.3 sass: ^1.52.2 dependencies: @@ -262,7 +262,7 @@ importers: specifiers: '@astrojs/node': ^1.0.0 '@astrojs/svelte': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 concurrently: ^7.2.1 lightcookie: ^1.0.25 svelte: ^3.48.0 @@ -282,7 +282,7 @@ importers: examples/subpath: specifiers: '@astrojs/react': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 react: ^18.1.0 react-dom: ^18.1.0 dependencies: @@ -295,7 +295,7 @@ importers: examples/with-markdown-plugins: specifiers: '@astrojs/markdown-remark': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 hast-util-select: 5.0.1 rehype-autolink-headings: ^6.1.1 rehype-slug: ^5.0.1 @@ -313,7 +313,7 @@ importers: examples/with-markdown-shiki: specifiers: '@astrojs/markdown-remark': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: '@astrojs/markdown-remark': link:../../packages/markdown/remark astro: link:../../packages/astro @@ -322,7 +322,7 @@ importers: specifiers: '@astrojs/mdx': ^0.8.1 '@astrojs/preact': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.6.5 devDependencies: '@astrojs/mdx': link:../../packages/integrations/mdx @@ -334,7 +334,7 @@ importers: specifiers: '@astrojs/preact': ^1.0.0 '@nanostores/preact': ^0.1.3 - astro: ^1.0.0 + astro: ^1.0.1 nanostores: ^0.5.12 preact: ^10.7.3 dependencies: @@ -348,7 +348,7 @@ importers: examples/with-tailwindcss: specifiers: '@astrojs/tailwind': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 autoprefixer: ^10.4.7 canvas-confetti: ^1.5.1 postcss: ^8.4.14 @@ -363,7 +363,7 @@ importers: examples/with-vite-plugin-pwa: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 vite-plugin-pwa: 0.11.11 workbox-window: ^6.5.3 devDependencies: @@ -373,7 +373,7 @@ importers: examples/with-vitest: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 vitest: ^0.20.3 devDependencies: astro: link:../../packages/astro From fe3b423982faa87c106e6a072bb14cb0a6678064 Mon Sep 17 00:00:00 2001 From: Masataka Yakura Date: Wed, 10 Aug 2022 08:28:48 +0900 Subject: [PATCH 07/16] Markdown component: fix package name in readme.md (#4208) * Markdown component: fix package name in readme.md readme says it's `@astrojs/markdown`, but package name is actually `@astrojs/markdown-component`. * Create dry-deers-vanish.md * Update dry-deers-vanish.md Co-authored-by: Nate Moore Co-authored-by: Fred K. Schott --- .changeset/dry-deers-vanish.md | 5 +++++ packages/markdown/component/readme.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/dry-deers-vanish.md diff --git a/.changeset/dry-deers-vanish.md b/.changeset/dry-deers-vanish.md new file mode 100644 index 000000000000..7245dcd76d2b --- /dev/null +++ b/.changeset/dry-deers-vanish.md @@ -0,0 +1,5 @@ +--- +"@astrojs/markdown-component": patch +--- + +README update diff --git a/packages/markdown/component/readme.md b/packages/markdown/component/readme.md index aa48e274d4bb..1eae678d7d9a 100644 --- a/packages/markdown/component/readme.md +++ b/packages/markdown/component/readme.md @@ -1,4 +1,4 @@ -# @astrojs/markdown +# @astrojs/markdown-component This package brings legacy support for the `` component to all Astro projects. From 92aa6a75eac274942e438de06df71f8261fdbcc2 Mon Sep 17 00:00:00 2001 From: Alexandre Desroches <69808183+alex-drocks@users.noreply.github.com> Date: Tue, 9 Aug 2022 19:29:07 -0400 Subject: [PATCH 08/16] Updated @astrojs/image README.md missing formats prop as subtitle (#4221) * Update README.md Added missing subtitle for `formats` prop of the component * Create fast-drinks-visit.md Co-authored-by: Fred K. Schott --- .changeset/fast-drinks-visit.md | 5 +++++ packages/integrations/image/README.md | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 .changeset/fast-drinks-visit.md diff --git a/.changeset/fast-drinks-visit.md b/.changeset/fast-drinks-visit.md new file mode 100644 index 000000000000..8853f3dcf117 --- /dev/null +++ b/.changeset/fast-drinks-visit.md @@ -0,0 +1,5 @@ +--- +"@astrojs/image": patch +--- + +README update diff --git a/packages/integrations/image/README.md b/packages/integrations/image/README.md index d0c7630fb521..c3cc8efb6634 100644 --- a/packages/integrations/image/README.md +++ b/packages/integrations/image/README.md @@ -228,6 +228,8 @@ A `string` can be provided in the form of `{width}:{height}`, ex: `16:9` or `3:4 A `number` can also be provided, useful when the aspect ratio is calculated at build time. This can be an inline number such as `1.777` or inlined as a JSX expression like `aspectRatio={16/9}`. +#### formats +

      **Type:** `Array<'avif' | 'jpeg' | 'png' | 'webp'>`
      From 3a7f2385eadadb21794a06c86b7fa20b83b2f8f8 Mon Sep 17 00:00:00 2001 From: "Fred K. Schott" Date: Tue, 9 Aug 2022 17:28:02 -0700 Subject: [PATCH 09/16] Revert "[ci] release (#4223)" This reverts commit d4ad40987589299fb3a94aed8700caed29cfbb35. --- .changeset/warm-socks-exercise.md | 5 ++ examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/demo/package.json | 2 +- examples/component/package.json | 2 +- examples/docs/package.json | 2 +- examples/env-vars/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/subpath/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 31 ++++++++---- packages/astro/package.json | 2 +- pnpm-lock.yaml | 52 ++++++++++----------- 30 files changed, 81 insertions(+), 61 deletions(-) create mode 100644 .changeset/warm-socks-exercise.md diff --git a/.changeset/warm-socks-exercise.md b/.changeset/warm-socks-exercise.md new file mode 100644 index 000000000000..f776943130c9 --- /dev/null +++ b/.changeset/warm-socks-exercise.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Add rawContent and compiledContent to MD layout props diff --git a/examples/basics/package.json b/examples/basics/package.json index b9e02f62d382..ae8810318cda 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.1" + "astro": "^1.0.0" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 281a1ea315b8..3574c1718c87 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.1" + "astro": "^1.0.0" }, "dependencies": { "preact": "^10.7.3" diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json index 4d8af4e8b8e0..7a0ea3ca7b9d 100644 --- a/examples/component/demo/package.json +++ b/examples/component/demo/package.json @@ -11,6 +11,6 @@ }, "devDependencies": { "@example/my-component": "workspace:*", - "astro": "^1.0.1" + "astro": "^1.0.0" } } diff --git a/examples/component/package.json b/examples/component/package.json index 863bd4b568d9..ee4684ec4ded 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -8,6 +8,6 @@ "serve": "astro --root demo preview" }, "devDependencies": { - "astro": "^1.0.1" + "astro": "^1.0.0" } } diff --git a/examples/docs/package.json b/examples/docs/package.json index 06fc1a556a6a..7439a843bb0c 100644 --- a/examples/docs/package.json +++ b/examples/docs/package.json @@ -21,6 +21,6 @@ "devDependencies": { "@astrojs/preact": "^1.0.0", "@astrojs/react": "^1.0.0", - "astro": "^1.0.1" + "astro": "^1.0.0" } } diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json index 9e05dab8ac96..4dee55a6dea7 100644 --- a/examples/env-vars/package.json +++ b/examples/env-vars/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.1" + "astro": "^1.0.0" } } diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 8ef09e8ee14b..ba26b4f5fdba 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@types/alpinejs": "^3.7.0", - "astro": "^1.0.1" + "astro": "^1.0.0" }, "dependencies": { "alpinejs": "^3.10.2" diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 9e6b4ab6a4fb..5ab433f422ce 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/lit": "^1.0.0", - "astro": "^1.0.1" + "astro": "^1.0.0" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index fe78e3a60939..88090bb3dd8f 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -15,7 +15,7 @@ "@astrojs/solid-js": "^1.0.0", "@astrojs/svelte": "^1.0.0", "@astrojs/vue": "^1.0.0", - "astro": "^1.0.1" + "astro": "^1.0.0" }, "dependencies": { "preact": "^10.7.3", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 866635ee93a7..130351e7ec09 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.1" + "astro": "^1.0.0" }, "dependencies": { "preact": "^10.7.3" diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index ce1af197d9b0..3dcd62de47ec 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -13,7 +13,7 @@ "@astrojs/react": "^1.0.0", "@types/react": "^18.0.10", "@types/react-dom": "^18.0.5", - "astro": "^1.0.1" + "astro": "^1.0.0" }, "dependencies": { "react": "^18.1.0", diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index bb070711c951..c7492fff34fb 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/solid-js": "^1.0.0", - "astro": "^1.0.1" + "astro": "^1.0.0" }, "dependencies": { "solid-js": "^1.4.3" diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 27e337fbf1f3..439de97c076b 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/svelte": "^1.0.0", - "astro": "^1.0.1" + "astro": "^1.0.0" }, "dependencies": { "svelte": "^3.48.0" diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 64d6f0b3664d..3012ed2f284c 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/vue": "^1.0.0", - "astro": "^1.0.1" + "astro": "^1.0.0" }, "dependencies": { "vue": "^3.2.37" diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 529dcfa67f2a..a9e317792781 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.1" + "astro": "^1.0.0" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index d1fbc949bb77..270e6d074dd4 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.1" + "astro": "^1.0.0" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 8b47ea2d210c..12d2f338aea8 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.1", + "astro": "^1.0.0", "sass": "^1.52.2" }, "dependencies": { diff --git a/examples/ssr/package.json b/examples/ssr/package.json index c14725f11e60..549da23417ca 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@astrojs/node": "^1.0.0", "@astrojs/svelte": "^1.0.0", - "astro": "^1.0.1", + "astro": "^1.0.0", "concurrently": "^7.2.1", "lightcookie": "^1.0.25", "unocss": "^0.15.6", diff --git a/examples/subpath/package.json b/examples/subpath/package.json index e6b8c5dbda91..14fe1204cc8f 100644 --- a/examples/subpath/package.json +++ b/examples/subpath/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/react": "^1.0.0", - "astro": "^1.0.1" + "astro": "^1.0.0" }, "dependencies": { "react": "^18.1.0", diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index d796b7955d48..2085838d47f5 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^1.0.0", - "astro": "^1.0.1", + "astro": "^1.0.0", "hast-util-select": "5.0.1", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.0.1", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 4bd2d86808ad..112eedb4c53f 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^1.0.0", - "astro": "^1.0.1" + "astro": "^1.0.0" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index ffae9fee152c..558b8f2bdc44 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -12,7 +12,7 @@ "devDependencies": { "@astrojs/mdx": "^0.8.1", "@astrojs/preact": "^1.0.0", - "astro": "^1.0.1", + "astro": "^1.0.0", "preact": "^10.6.5" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 30b1347eadc4..de962c70f4cd 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -16,6 +16,6 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.1" + "astro": "^1.0.0" } } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index d95e2d609654..1391a72aea2f 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/tailwind": "^1.0.0", - "astro": "^1.0.1", + "astro": "^1.0.0", "autoprefixer": "^10.4.7", "canvas-confetti": "^1.5.1", "postcss": "^8.4.14", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 5a8323eb74aa..b4c4e61acf9a 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.1", + "astro": "^1.0.0", "vite-plugin-pwa": "0.11.11", "workbox-window": "^6.5.3" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index aa56c5eccfff..4da833516a08 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "devDependencies": { - "astro": "^1.0.1", + "astro": "^1.0.0", "vitest": "^0.20.3" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index fef7fd7167d9..4d648c570139 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,11 +1,5 @@ # astro -## 1.0.1 - -### Patch Changes - -- [#4222](https://github.com/withastro/astro/pull/4222) [`b5ef1c211`](https://github.com/withastro/astro/commit/b5ef1c2113693523f10479d472e855ab9c41395d) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Add rawContent and compiledContent to MD layout props - ## 1.0.0 > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). @@ -456,7 +450,18 @@ The **Astro v1.0.0 Release Candidate** comes includes new features, tons of bug Astro supports streaming in its templates. Any time Astro encounters an async boundary it will stream out HTML that occurs before it. For example: ```astro + --- + import LoadTodos from '../components/LoadTodos.astro'; + --- + + + App + + + + + ``` In this arbtrary example Astro will streaming out the `` section and everything else until it encounters `` and then stop. LoadTodos, which is also an Astro component will stream its contents as well; stopping and waiting at any other asynchronous components. @@ -464,7 +469,15 @@ The **Astro v1.0.0 Release Candidate** comes includes new features, tons of bug As part of this Astro also now supports async iterables within its templates. This means you can do this: ```astro - +

        + {(async function* () { + for (const number of numbers) { + await wait(1000); + yield
      • Number: {number}
        • ; + yield '\n'; + } + })()} +
      ``` Which will stream out `
    • `s one at a time, waiting a second between each. @@ -2605,7 +2618,9 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve This change adds support for hoisted scripts, allowing you to bundle scripts together for a page and hoist them to the top (in the head): ```astro - + ``` - Updated dependencies [5d2ea578] diff --git a/packages/astro/package.json b/packages/astro/package.json index 36e017eeb1b5..6d985aa3f55d 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "1.0.1", + "version": "1.0.0", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a45019341c60..6b77dc333403 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,14 +56,14 @@ importers: examples/basics: specifiers: - astro: ^1.0.1 + astro: ^1.0.0 devDependencies: astro: link:../../packages/astro examples/blog: specifiers: '@astrojs/preact': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 preact: ^10.7.3 dependencies: preact: 10.10.1 @@ -73,14 +73,14 @@ importers: examples/component: specifiers: - astro: ^1.0.1 + astro: ^1.0.0 devDependencies: astro: link:../../packages/astro examples/component/demo: specifiers: '@example/my-component': workspace:* - astro: ^1.0.1 + astro: ^1.0.0 devDependencies: '@example/my-component': link:../packages/my-component astro: link:../../../packages/astro @@ -96,7 +96,7 @@ importers: '@docsearch/css': ^3.1.0 '@docsearch/react': ^3.1.0 '@types/react': ^17.0.45 - astro: ^1.0.1 + astro: ^1.0.0 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -115,7 +115,7 @@ importers: examples/env-vars: specifiers: - astro: ^1.0.1 + astro: ^1.0.0 devDependencies: astro: link:../../packages/astro @@ -123,7 +123,7 @@ importers: specifiers: '@types/alpinejs': ^3.7.0 alpinejs: ^3.10.2 - astro: ^1.0.1 + astro: ^1.0.0 dependencies: alpinejs: 3.10.3 devDependencies: @@ -134,7 +134,7 @@ importers: specifiers: '@astrojs/lit': ^1.0.0 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.0.1 + astro: ^1.0.0 lit: ^2.2.5 dependencies: '@webcomponents/template-shadowroot': 0.1.0 @@ -150,7 +150,7 @@ importers: '@astrojs/solid-js': ^1.0.0 '@astrojs/svelte': ^1.0.0 '@astrojs/vue': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -175,7 +175,7 @@ importers: examples/framework-preact: specifiers: '@astrojs/preact': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 preact: ^10.7.3 dependencies: preact: 10.10.1 @@ -188,7 +188,7 @@ importers: '@astrojs/react': ^1.0.0 '@types/react': ^18.0.10 '@types/react-dom': ^18.0.5 - astro: ^1.0.1 + astro: ^1.0.0 react: ^18.1.0 react-dom: ^18.1.0 dependencies: @@ -203,7 +203,7 @@ importers: examples/framework-solid: specifiers: '@astrojs/solid-js': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 solid-js: ^1.4.3 dependencies: solid-js: 1.4.8 @@ -214,7 +214,7 @@ importers: examples/framework-svelte: specifiers: '@astrojs/svelte': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 svelte: ^3.48.0 dependencies: svelte: 3.49.0 @@ -225,7 +225,7 @@ importers: examples/framework-vue: specifiers: '@astrojs/vue': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 vue: ^3.2.37 dependencies: vue: 3.2.37 @@ -235,20 +235,20 @@ importers: examples/minimal: specifiers: - astro: ^1.0.1 + astro: ^1.0.0 devDependencies: astro: link:../../packages/astro examples/non-html-pages: specifiers: - astro: ^1.0.1 + astro: ^1.0.0 devDependencies: astro: link:../../packages/astro examples/portfolio: specifiers: '@astrojs/preact': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 preact: ^10.7.3 sass: ^1.52.2 dependencies: @@ -262,7 +262,7 @@ importers: specifiers: '@astrojs/node': ^1.0.0 '@astrojs/svelte': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 concurrently: ^7.2.1 lightcookie: ^1.0.25 svelte: ^3.48.0 @@ -282,7 +282,7 @@ importers: examples/subpath: specifiers: '@astrojs/react': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 react: ^18.1.0 react-dom: ^18.1.0 dependencies: @@ -295,7 +295,7 @@ importers: examples/with-markdown-plugins: specifiers: '@astrojs/markdown-remark': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 hast-util-select: 5.0.1 rehype-autolink-headings: ^6.1.1 rehype-slug: ^5.0.1 @@ -313,7 +313,7 @@ importers: examples/with-markdown-shiki: specifiers: '@astrojs/markdown-remark': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 devDependencies: '@astrojs/markdown-remark': link:../../packages/markdown/remark astro: link:../../packages/astro @@ -322,7 +322,7 @@ importers: specifiers: '@astrojs/mdx': ^0.8.1 '@astrojs/preact': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 preact: ^10.6.5 devDependencies: '@astrojs/mdx': link:../../packages/integrations/mdx @@ -334,7 +334,7 @@ importers: specifiers: '@astrojs/preact': ^1.0.0 '@nanostores/preact': ^0.1.3 - astro: ^1.0.1 + astro: ^1.0.0 nanostores: ^0.5.12 preact: ^10.7.3 dependencies: @@ -348,7 +348,7 @@ importers: examples/with-tailwindcss: specifiers: '@astrojs/tailwind': ^1.0.0 - astro: ^1.0.1 + astro: ^1.0.0 autoprefixer: ^10.4.7 canvas-confetti: ^1.5.1 postcss: ^8.4.14 @@ -363,7 +363,7 @@ importers: examples/with-vite-plugin-pwa: specifiers: - astro: ^1.0.1 + astro: ^1.0.0 vite-plugin-pwa: 0.11.11 workbox-window: ^6.5.3 devDependencies: @@ -373,7 +373,7 @@ importers: examples/with-vitest: specifiers: - astro: ^1.0.1 + astro: ^1.0.0 vitest: ^0.20.3 devDependencies: astro: link:../../packages/astro From 74528a19734bd870a65b232be23c633cc278eba5 Mon Sep 17 00:00:00 2001 From: "Fred K. Bot" <108291165+fredkbot@users.noreply.github.com> Date: Tue, 9 Aug 2022 17:31:06 -0700 Subject: [PATCH 10/16] [ci] release (#4224) Co-authored-by: github-actions[bot] --- .changeset/dry-deers-vanish.md | 5 -- .changeset/fast-drinks-visit.md | 5 -- .changeset/warm-socks-exercise.md | 5 -- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/demo/package.json | 2 +- examples/component/package.json | 2 +- examples/docs/package.json | 2 +- examples/env-vars/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/subpath/package.json | 2 +- examples/with-markdown-plugins/package.json | 2 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 31 ++++-------- packages/astro/package.json | 2 +- packages/integrations/image/CHANGELOG.md | 6 +++ packages/integrations/image/package.json | 2 +- packages/markdown/component/CHANGELOG.md | 14 +++--- packages/markdown/component/package.json | 2 +- pnpm-lock.yaml | 52 ++++++++++----------- 36 files changed, 77 insertions(+), 99 deletions(-) delete mode 100644 .changeset/dry-deers-vanish.md delete mode 100644 .changeset/fast-drinks-visit.md delete mode 100644 .changeset/warm-socks-exercise.md diff --git a/.changeset/dry-deers-vanish.md b/.changeset/dry-deers-vanish.md deleted file mode 100644 index 7245dcd76d2b..000000000000 --- a/.changeset/dry-deers-vanish.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@astrojs/markdown-component": patch ---- - -README update diff --git a/.changeset/fast-drinks-visit.md b/.changeset/fast-drinks-visit.md deleted file mode 100644 index 8853f3dcf117..000000000000 --- a/.changeset/fast-drinks-visit.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@astrojs/image": patch ---- - -README update diff --git a/.changeset/warm-socks-exercise.md b/.changeset/warm-socks-exercise.md deleted file mode 100644 index f776943130c9..000000000000 --- a/.changeset/warm-socks-exercise.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Add rawContent and compiledContent to MD layout props diff --git a/examples/basics/package.json b/examples/basics/package.json index ae8810318cda..b9e02f62d382 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 3574c1718c87..281a1ea315b8 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "preact": "^10.7.3" diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json index 7a0ea3ca7b9d..4d8af4e8b8e0 100644 --- a/examples/component/demo/package.json +++ b/examples/component/demo/package.json @@ -11,6 +11,6 @@ }, "devDependencies": { "@example/my-component": "workspace:*", - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/component/package.json b/examples/component/package.json index ee4684ec4ded..863bd4b568d9 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -8,6 +8,6 @@ "serve": "astro --root demo preview" }, "devDependencies": { - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/docs/package.json b/examples/docs/package.json index 7439a843bb0c..06fc1a556a6a 100644 --- a/examples/docs/package.json +++ b/examples/docs/package.json @@ -21,6 +21,6 @@ "devDependencies": { "@astrojs/preact": "^1.0.0", "@astrojs/react": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json index 4dee55a6dea7..9e05dab8ac96 100644 --- a/examples/env-vars/package.json +++ b/examples/env-vars/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index ba26b4f5fdba..8ef09e8ee14b 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@types/alpinejs": "^3.7.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "alpinejs": "^3.10.2" diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 5ab433f422ce..9e6b4ab6a4fb 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/lit": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "@webcomponents/template-shadowroot": "^0.1.0", diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 88090bb3dd8f..fe78e3a60939 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -15,7 +15,7 @@ "@astrojs/solid-js": "^1.0.0", "@astrojs/svelte": "^1.0.0", "@astrojs/vue": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "preact": "^10.7.3", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 130351e7ec09..866635ee93a7 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "preact": "^10.7.3" diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 3dcd62de47ec..ce1af197d9b0 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -13,7 +13,7 @@ "@astrojs/react": "^1.0.0", "@types/react": "^18.0.10", "@types/react-dom": "^18.0.5", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "react": "^18.1.0", diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index c7492fff34fb..bb070711c951 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/solid-js": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "solid-js": "^1.4.3" diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 439de97c076b..27e337fbf1f3 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/svelte": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "svelte": "^3.48.0" diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 3012ed2f284c..64d6f0b3664d 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/vue": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "vue": "^3.2.37" diff --git a/examples/minimal/package.json b/examples/minimal/package.json index a9e317792781..529dcfa67f2a 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 270e6d074dd4..d1fbc949bb77 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 12d2f338aea8..8b47ea2d210c 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.0", + "astro": "^1.0.1", "sass": "^1.52.2" }, "dependencies": { diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 549da23417ca..c14725f11e60 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@astrojs/node": "^1.0.0", "@astrojs/svelte": "^1.0.0", - "astro": "^1.0.0", + "astro": "^1.0.1", "concurrently": "^7.2.1", "lightcookie": "^1.0.25", "unocss": "^0.15.6", diff --git a/examples/subpath/package.json b/examples/subpath/package.json index 14fe1204cc8f..e6b8c5dbda91 100644 --- a/examples/subpath/package.json +++ b/examples/subpath/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/react": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" }, "dependencies": { "react": "^18.1.0", diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 2085838d47f5..d796b7955d48 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^1.0.0", - "astro": "^1.0.0", + "astro": "^1.0.1", "hast-util-select": "5.0.1", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.0.1", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 112eedb4c53f..4bd2d86808ad 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ }, "devDependencies": { "@astrojs/markdown-remark": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 558b8f2bdc44..ffae9fee152c 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -12,7 +12,7 @@ "devDependencies": { "@astrojs/mdx": "^0.8.1", "@astrojs/preact": "^1.0.0", - "astro": "^1.0.0", + "astro": "^1.0.1", "preact": "^10.6.5" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index de962c70f4cd..30b1347eadc4 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -16,6 +16,6 @@ }, "devDependencies": { "@astrojs/preact": "^1.0.0", - "astro": "^1.0.0" + "astro": "^1.0.1" } } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 1391a72aea2f..d95e2d609654 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@astrojs/tailwind": "^1.0.0", - "astro": "^1.0.0", + "astro": "^1.0.1", "autoprefixer": "^10.4.7", "canvas-confetti": "^1.5.1", "postcss": "^8.4.14", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index b4c4e61acf9a..5a8323eb74aa 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "devDependencies": { - "astro": "^1.0.0", + "astro": "^1.0.1", "vite-plugin-pwa": "0.11.11", "workbox-window": "^6.5.3" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 4da833516a08..aa56c5eccfff 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "devDependencies": { - "astro": "^1.0.0", + "astro": "^1.0.1", "vitest": "^0.20.3" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 4d648c570139..e3907ecc3b74 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,11 @@ # astro +## 1.0.1 + +### Patch Changes + +- [`3a7f2385e`](https://github.com/withastro/astro/commit/3a7f2385eadadb21794a06c86b7fa20b83b2f8f8) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Add rawContent and compiledContent to MD layout props + ## 1.0.0 > Astro v1.0 is out! Read the [official announcement post](https://astro.build/blog/astro-1/). @@ -450,18 +456,7 @@ The **Astro v1.0.0 Release Candidate** comes includes new features, tons of bug Astro supports streaming in its templates. Any time Astro encounters an async boundary it will stream out HTML that occurs before it. For example: ```astro - --- - import LoadTodos from '../components/LoadTodos.astro'; - --- - - - App - - - - - ``` In this arbtrary example Astro will streaming out the `` section and everything else until it encounters `` and then stop. LoadTodos, which is also an Astro component will stream its contents as well; stopping and waiting at any other asynchronous components. @@ -469,15 +464,7 @@ The **Astro v1.0.0 Release Candidate** comes includes new features, tons of bug As part of this Astro also now supports async iterables within its templates. This means you can do this: ```astro -
        - {(async function* () { - for (const number of numbers) { - await wait(1000); - yield
      • Number: {number}
        • ; - yield '\n'; - } - })()} -
      + ``` Which will stream out `
    • `s one at a time, waiting a second between each. @@ -2618,9 +2605,7 @@ For convenience, you may now also move your `astro.config.js` file to a top-leve This change adds support for hoisted scripts, allowing you to bundle scripts together for a page and hoist them to the top (in the head): ```astro - + ``` - Updated dependencies [5d2ea578] diff --git a/packages/astro/package.json b/packages/astro/package.json index 6d985aa3f55d..36e017eeb1b5 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "1.0.0", + "version": "1.0.1", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/packages/integrations/image/CHANGELOG.md b/packages/integrations/image/CHANGELOG.md index be20b3a66cc6..2f4c233223c4 100644 --- a/packages/integrations/image/CHANGELOG.md +++ b/packages/integrations/image/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/image +## 0.3.3 + +### Patch Changes + +- [#4221](https://github.com/withastro/astro/pull/4221) [`92aa6a75e`](https://github.com/withastro/astro/commit/92aa6a75eac274942e438de06df71f8261fdbcc2) Thanks [@alex-drocks](https://github.com/alex-drocks)! - README update + ## 0.3.2 ### Patch Changes diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index 241777cd0678..5955717b6bbc 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.3.2", + "version": "0.3.3", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/markdown/component/CHANGELOG.md b/packages/markdown/component/CHANGELOG.md index d803ed813e86..cd7b8fb9d516 100644 --- a/packages/markdown/component/CHANGELOG.md +++ b/packages/markdown/component/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/markdown-component +## 1.0.1 + +### Patch Changes + +- [#4208](https://github.com/withastro/astro/pull/4208) [`fe3b42398`](https://github.com/withastro/astro/commit/fe3b423982faa87c106e6a072bb14cb0a6678064) Thanks [@myakura](https://github.com/myakura)! - README update + ## 1.0.0 ### Major Changes @@ -38,15 +44,11 @@ This change moves the Markdown component into its own package where it will be maintained separately. All that needs to change from a user's perspective is the import statement: ```astro - --- - import { Markdown } from 'astro/components'; - --- + ``` Becomes: ```astro - --- - import Markdown from '@astrojs/markdown-component'; - --- + ``` diff --git a/packages/markdown/component/package.json b/packages/markdown/component/package.json index 7236f0b44143..b7878d02718c 100644 --- a/packages/markdown/component/package.json +++ b/packages/markdown/component/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/markdown-component", - "version": "1.0.0", + "version": "1.0.1", "type": "module", "author": "withastro", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b77dc333403..a45019341c60 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,14 +56,14 @@ importers: examples/basics: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: astro: link:../../packages/astro examples/blog: specifiers: '@astrojs/preact': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.7.3 dependencies: preact: 10.10.1 @@ -73,14 +73,14 @@ importers: examples/component: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: astro: link:../../packages/astro examples/component/demo: specifiers: '@example/my-component': workspace:* - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: '@example/my-component': link:../packages/my-component astro: link:../../../packages/astro @@ -96,7 +96,7 @@ importers: '@docsearch/css': ^3.1.0 '@docsearch/react': ^3.1.0 '@types/react': ^17.0.45 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -115,7 +115,7 @@ importers: examples/env-vars: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: astro: link:../../packages/astro @@ -123,7 +123,7 @@ importers: specifiers: '@types/alpinejs': ^3.7.0 alpinejs: ^3.10.2 - astro: ^1.0.0 + astro: ^1.0.1 dependencies: alpinejs: 3.10.3 devDependencies: @@ -134,7 +134,7 @@ importers: specifiers: '@astrojs/lit': ^1.0.0 '@webcomponents/template-shadowroot': ^0.1.0 - astro: ^1.0.0 + astro: ^1.0.1 lit: ^2.2.5 dependencies: '@webcomponents/template-shadowroot': 0.1.0 @@ -150,7 +150,7 @@ importers: '@astrojs/solid-js': ^1.0.0 '@astrojs/svelte': ^1.0.0 '@astrojs/vue': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.7.3 react: ^18.1.0 react-dom: ^18.1.0 @@ -175,7 +175,7 @@ importers: examples/framework-preact: specifiers: '@astrojs/preact': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.7.3 dependencies: preact: 10.10.1 @@ -188,7 +188,7 @@ importers: '@astrojs/react': ^1.0.0 '@types/react': ^18.0.10 '@types/react-dom': ^18.0.5 - astro: ^1.0.0 + astro: ^1.0.1 react: ^18.1.0 react-dom: ^18.1.0 dependencies: @@ -203,7 +203,7 @@ importers: examples/framework-solid: specifiers: '@astrojs/solid-js': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 solid-js: ^1.4.3 dependencies: solid-js: 1.4.8 @@ -214,7 +214,7 @@ importers: examples/framework-svelte: specifiers: '@astrojs/svelte': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 svelte: ^3.48.0 dependencies: svelte: 3.49.0 @@ -225,7 +225,7 @@ importers: examples/framework-vue: specifiers: '@astrojs/vue': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 vue: ^3.2.37 dependencies: vue: 3.2.37 @@ -235,20 +235,20 @@ importers: examples/minimal: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: astro: link:../../packages/astro examples/non-html-pages: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: astro: link:../../packages/astro examples/portfolio: specifiers: '@astrojs/preact': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.7.3 sass: ^1.52.2 dependencies: @@ -262,7 +262,7 @@ importers: specifiers: '@astrojs/node': ^1.0.0 '@astrojs/svelte': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 concurrently: ^7.2.1 lightcookie: ^1.0.25 svelte: ^3.48.0 @@ -282,7 +282,7 @@ importers: examples/subpath: specifiers: '@astrojs/react': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 react: ^18.1.0 react-dom: ^18.1.0 dependencies: @@ -295,7 +295,7 @@ importers: examples/with-markdown-plugins: specifiers: '@astrojs/markdown-remark': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 hast-util-select: 5.0.1 rehype-autolink-headings: ^6.1.1 rehype-slug: ^5.0.1 @@ -313,7 +313,7 @@ importers: examples/with-markdown-shiki: specifiers: '@astrojs/markdown-remark': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 devDependencies: '@astrojs/markdown-remark': link:../../packages/markdown/remark astro: link:../../packages/astro @@ -322,7 +322,7 @@ importers: specifiers: '@astrojs/mdx': ^0.8.1 '@astrojs/preact': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 preact: ^10.6.5 devDependencies: '@astrojs/mdx': link:../../packages/integrations/mdx @@ -334,7 +334,7 @@ importers: specifiers: '@astrojs/preact': ^1.0.0 '@nanostores/preact': ^0.1.3 - astro: ^1.0.0 + astro: ^1.0.1 nanostores: ^0.5.12 preact: ^10.7.3 dependencies: @@ -348,7 +348,7 @@ importers: examples/with-tailwindcss: specifiers: '@astrojs/tailwind': ^1.0.0 - astro: ^1.0.0 + astro: ^1.0.1 autoprefixer: ^10.4.7 canvas-confetti: ^1.5.1 postcss: ^8.4.14 @@ -363,7 +363,7 @@ importers: examples/with-vite-plugin-pwa: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 vite-plugin-pwa: 0.11.11 workbox-window: ^6.5.3 devDependencies: @@ -373,7 +373,7 @@ importers: examples/with-vitest: specifiers: - astro: ^1.0.0 + astro: ^1.0.1 vitest: ^0.20.3 devDependencies: astro: link:../../packages/astro From e918b3883e156a0de2148517b619a2cf451917d2 Mon Sep 17 00:00:00 2001 From: Mayank <9084735+mayank99@users.noreply.github.com> Date: Wed, 10 Aug 2022 00:29:51 -0400 Subject: [PATCH 11/16] feat: Support `-y` in `astro add` (#4225) --- .changeset/two-ducks-end.md | 5 +++++ packages/astro/src/core/add/index.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/two-ducks-end.md diff --git a/.changeset/two-ducks-end.md b/.changeset/two-ducks-end.md new file mode 100644 index 000000000000..737b992c931a --- /dev/null +++ b/.changeset/two-ducks-end.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +`astro add` now supports `-y` diff --git a/packages/astro/src/core/add/index.ts b/packages/astro/src/core/add/index.ts index d6ee73791a49..24025b0556f3 100644 --- a/packages/astro/src/core/add/index.ts +++ b/packages/astro/src/core/add/index.ts @@ -701,7 +701,7 @@ function parseIntegrationName(spec: string) { } async function askToContinue({ flags }: { flags: yargs.Arguments }): Promise { - if (flags.yes) return true; + if (flags.yes || flags.y) return true; const response = await prompts({ type: 'confirm', From 9703f6f8f30c72f03074a450965d46db49b4255a Mon Sep 17 00:00:00 2001 From: "Fred K. Bot" <108291165+fredkbot@users.noreply.github.com> Date: Wed, 10 Aug 2022 06:26:20 -0700 Subject: [PATCH 12/16] [ci] update lockfile (#4233) Co-authored-by: FredKSchott --- pnpm-lock.yaml | 381 ++++++++++++++++++++++++------------------------- 1 file changed, 185 insertions(+), 196 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a45019341c60..05a830826405 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -37,10 +37,10 @@ importers: '@changesets/changelog-github': 0.4.4 '@changesets/cli': 2.23.0_kcozqtpxuwjzskw6zg5royevn4 '@octokit/action': 3.18.1 - '@typescript-eslint/eslint-plugin': 5.32.0_iosr3hrei2tubxveewluhu5lhy - '@typescript-eslint/parser': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq + '@typescript-eslint/eslint-plugin': 5.33.0_njno5y7ry2l2lcmiu4tywxkwnq + '@typescript-eslint/parser': 5.33.0_qugx7qdu5zevzvxaiqyxfiwquq del: 6.1.1 - esbuild: 0.14.53 + esbuild: 0.14.54 eslint: 8.21.0 eslint-config-prettier: 8.5.0_eslint@8.21.0 eslint-plugin-no-only-tests: 2.6.0 @@ -66,7 +66,7 @@ importers: astro: ^1.0.1 preact: ^10.7.3 dependencies: - preact: 10.10.1 + preact: 10.10.2 devDependencies: '@astrojs/preact': link:../../packages/integrations/preact astro: link:../../packages/astro @@ -105,7 +105,7 @@ importers: '@docsearch/css': 3.2.0 '@docsearch/react': 3.2.0_h2q7ltx4sqgye5xvrbnj7n2sfm '@types/react': 17.0.48 - preact: 10.10.1 + preact: 10.10.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 devDependencies: @@ -158,7 +158,7 @@ importers: svelte: ^3.48.0 vue: ^3.2.37 dependencies: - preact: 10.10.1 + preact: 10.10.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.4.8 @@ -178,7 +178,7 @@ importers: astro: ^1.0.1 preact: ^10.7.3 dependencies: - preact: 10.10.1 + preact: 10.10.2 devDependencies: '@astrojs/preact': link:../../packages/integrations/preact astro: link:../../packages/astro @@ -252,11 +252,11 @@ importers: preact: ^10.7.3 sass: ^1.52.2 dependencies: - preact: 10.10.1 + preact: 10.10.2 devDependencies: '@astrojs/preact': link:../../packages/integrations/preact astro: link:../../packages/astro - sass: 1.54.3 + sass: 1.54.4 examples/ssr: specifiers: @@ -328,7 +328,7 @@ importers: '@astrojs/mdx': link:../../packages/integrations/mdx '@astrojs/preact': link:../../packages/integrations/preact astro: link:../../packages/astro - preact: 10.10.1 + preact: 10.10.2 examples/with-nanostores: specifiers: @@ -338,9 +338,9 @@ importers: nanostores: ^0.5.12 preact: ^10.7.3 dependencies: - '@nanostores/preact': 0.1.3_yvb6ohlypojrr2hxfrgghirh7m + '@nanostores/preact': 0.1.3_z4mvjyyleisrwt5v7ggr6qblaa nanostores: 0.5.13 - preact: 10.10.1 + preact: 10.10.2 devDependencies: '@astrojs/preact': link:../../packages/integrations/preact astro: link:../../packages/astro @@ -485,7 +485,7 @@ importers: diff: 5.1.0 eol: 0.9.1 es-module-lexer: 0.10.5 - esbuild: 0.14.53 + esbuild: 0.14.54 execa: 6.1.0 fast-glob: 3.2.11 github-slugger: 1.4.0 @@ -516,9 +516,9 @@ importers: tsconfig-resolver: 3.0.1 unist-util-visit: 4.1.0 vfile: 5.3.4 - vite: 3.0.4_sass@1.54.3 + vite: 3.0.4_sass@1.54.4 yargs-parser: 21.1.1 - zod: 3.17.10 + zod: 3.18.0 devDependencies: '@playwright/test': 1.24.2 '@types/babel__core': 7.1.19 @@ -545,7 +545,7 @@ importers: chai: 4.3.6 cheerio: 1.0.0-rc.12 mocha: 9.2.2 - sass: 1.54.3 + sass: 1.54.4 srcset-parse: 1.1.0 packages/astro-prism: @@ -603,7 +603,7 @@ importers: svelte: ^3.48.0 vue: ^3.2.37 dependencies: - preact: 10.10.1 + preact: 10.10.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.4.8 @@ -637,7 +637,7 @@ importers: sass: ^1.52.2 dependencies: astro: link:../../.. - sass: 1.54.3 + sass: 1.54.4 packages/astro/e2e/fixtures/errors: specifiers: @@ -691,7 +691,7 @@ importers: dependencies: '@webcomponents/template-shadowroot': 0.1.0 lit: 2.2.8 - preact: 10.10.1 + preact: 10.10.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.4.8 @@ -721,7 +721,7 @@ importers: svelte: ^3.48.0 vue: ^3.2.37 dependencies: - preact: 10.10.1 + preact: 10.10.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.4.8 @@ -750,7 +750,7 @@ importers: svelte: ^3.48.0 vue: ^3.2.37 dependencies: - preact: 10.10.1 + preact: 10.10.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.4.8 @@ -779,7 +779,7 @@ importers: svelte: ^3.48.0 vue: ^3.2.37 dependencies: - preact: 10.10.1 + preact: 10.10.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.4.8 @@ -808,7 +808,7 @@ importers: svelte: ^3.48.0 vue: ^3.2.37 dependencies: - preact: 10.10.1 + preact: 10.10.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.4.8 @@ -837,7 +837,7 @@ importers: svelte: ^3.48.0 vue: ^3.2.37 dependencies: - preact: 10.10.1 + preact: 10.10.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.4.8 @@ -866,7 +866,7 @@ importers: svelte: ^3.48.0 vue: ^3.2.36 dependencies: - preact: 10.10.1 + preact: 10.10.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.4.8 @@ -907,7 +907,7 @@ importers: dependencies: '@astrojs/preact': link:../../../../integrations/preact astro: link:../../.. - preact: 10.10.1 + preact: 10.10.2 packages/astro/e2e/fixtures/preact-component: specifiers: @@ -919,7 +919,7 @@ importers: '@astrojs/mdx': link:../../../../integrations/mdx '@astrojs/preact': link:../../../../integrations/preact astro: link:../../.. - preact: 10.10.1 + preact: 10.10.2 packages/astro/e2e/fixtures/react-component: specifiers: @@ -1567,7 +1567,7 @@ importers: svelte: ^3.48.0 vue: ^3.2.36 dependencies: - preact: 10.10.1 + preact: 10.10.2 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 solid-js: 1.4.8 @@ -2057,7 +2057,7 @@ importers: esbuild: ^0.14.42 wrangler: ^2.0.23 dependencies: - esbuild: 0.14.53 + esbuild: 0.14.54 devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts @@ -2085,7 +2085,7 @@ importers: astro-scripts: workspace:* esbuild: ^0.14.43 dependencies: - esbuild: 0.14.53 + esbuild: 0.14.54 devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts @@ -2180,7 +2180,7 @@ importers: astro: link:../../astro astro-scripts: link:../../../scripts cheerio: 1.0.0-rc.12 - sass: 1.54.3 + sass: 1.54.4 packages/integrations/mdx: specifiers: @@ -2282,7 +2282,7 @@ importers: esbuild: ^0.14.43 dependencies: '@astrojs/webapi': link:../../webapi - esbuild: 0.14.53 + esbuild: 0.14.54 devDependencies: '@netlify/edge-handler-types': 0.34.1 '@netlify/functions': 1.0.0 @@ -2367,11 +2367,11 @@ importers: '@babel/core': 7.18.10 '@babel/plugin-transform-react-jsx': 7.18.10_@babel+core@7.18.10 babel-plugin-module-resolver: 4.1.0 - preact-render-to-string: 5.2.1_preact@10.10.1 + preact-render-to-string: 5.2.1_preact@10.10.2 devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts - preact: 10.10.1 + preact: 10.10.2 packages/integrations/prefetch: specifiers: @@ -2429,7 +2429,7 @@ importers: zod: ^3.17.3 dependencies: sitemap: 7.1.1 - zod: 3.17.10 + zod: 3.18.0 devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts @@ -2458,11 +2458,11 @@ importers: svelte2tsx: ^0.5.11 vite: ^3.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 1.0.1_svelte@3.49.0+vite@3.0.4 + '@sveltejs/vite-plugin-svelte': 1.0.1_svelte@3.49.0+vite@3.0.5 postcss-load-config: 3.1.4 svelte-preprocess: 4.10.7_k3vaqsyrx2lfvza3vdeafxime4 svelte2tsx: 0.5.13_svelte@3.49.0 - vite: 3.0.4 + vite: 3.0.5 devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts @@ -2525,8 +2525,8 @@ importers: vite: ^3.0.0 vue: ^3.2.37 dependencies: - '@vitejs/plugin-vue': 3.0.1_vite@3.0.4+vue@3.2.37 - vite: 3.0.4 + '@vitejs/plugin-vue': 3.0.1_vite@3.0.5+vue@3.2.37 + vite: 3.0.5 devDependencies: astro: link:../../astro astro-scripts: link:../../../scripts @@ -2795,7 +2795,7 @@ importers: '@astrojs/webapi': link:../packages/webapi adm-zip: 0.5.9 arg: 5.0.2 - esbuild: 0.14.53 + esbuild: 0.14.54 globby: 12.2.0 kleur: 4.1.5 svelte: 3.49.0 @@ -4478,17 +4478,6 @@ packages: semver: 5.7.1 dev: true - /@changesets/assemble-release-plan/5.1.3: - resolution: {integrity: sha512-I+TTkUoqvxBEuDLoJfJYKDXIJ+nyiTbVJ8KGhpXEsLq4N/ms/AStSbouJwF2d/p3cB+RCPr5+gXh31GSN4kA7w==} - dependencies: - '@babel/runtime': 7.18.9 - '@changesets/errors': 0.1.4 - '@changesets/get-dependents-graph': 1.3.3 - '@changesets/types': 5.1.0 - '@manypkg/get-packages': 1.1.3 - semver: 5.7.1 - dev: true - /@changesets/assemble-release-plan/5.2.0: resolution: {integrity: sha512-ewY24PEbSec2eKX0+KM7eyENA2hUUp6s4LF9p/iBxTtc+TX2Xbx5rZnlLKZkc8tpuQ3PZbyjLFXWhd1PP6SjCg==} dependencies: @@ -4522,7 +4511,7 @@ packages: dependencies: '@babel/runtime': 7.18.9 '@changesets/apply-release-plan': 6.0.4 - '@changesets/assemble-release-plan': 5.1.3 + '@changesets/assemble-release-plan': 5.2.0 '@changesets/changelog-git': 0.1.12 '@changesets/config': 2.1.1 '@changesets/errors': 0.1.4 @@ -4878,8 +4867,8 @@ packages: rollup-plugin-node-polyfills: 0.2.1 dev: true - /@esbuild/linux-loong64/0.14.53: - resolution: {integrity: sha512-W2dAL6Bnyn4xa/QRSU3ilIK4EzD5wgYXKXJiS1HDF5vU3675qc2bvFyLwbUcdmssDveyndy7FbitrCoiV/eMLg==} + /@esbuild/linux-loong64/0.14.54: + resolution: {integrity: sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -5316,7 +5305,7 @@ packages: - utf-8-validate dev: true - /@nanostores/preact/0.1.3_yvb6ohlypojrr2hxfrgghirh7m: + /@nanostores/preact/0.1.3_z4mvjyyleisrwt5v7ggr6qblaa: resolution: {integrity: sha512-uiX1ned0LrzASot+sPUjyJzr8Js3pX075omazgsSdLf0zPp4ss8xwTiuNh5FSKigTSQEVqZFiS+W8CnHIrX62A==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} peerDependencies: @@ -5324,7 +5313,7 @@ packages: preact: '>=10.0.0' dependencies: nanostores: 0.5.13 - preact: 10.10.1 + preact: 10.10.2 dev: false /@netlify/edge-handler-types/0.34.1: @@ -5491,7 +5480,7 @@ packages: engines: {node: '>=14'} hasBin: true dependencies: - '@types/node': 18.6.4 + '@types/node': 18.6.5 playwright-core: 1.24.2 dev: true @@ -8370,7 +8359,7 @@ packages: string.prototype.matchall: 4.0.7 dev: true - /@sveltejs/vite-plugin-svelte/1.0.1_svelte@3.49.0+vite@3.0.4: + /@sveltejs/vite-plugin-svelte/1.0.1_svelte@3.49.0+vite@3.0.5: resolution: {integrity: sha512-PorCgUounn0VXcpeJu+hOweZODKmGuLHsLomwqSj+p26IwjjGffmYQfVHtiTWq+NqaUuuHWWG7vPge6UFw4Aeg==} engines: {node: ^14.18.0 || >= 16} peerDependencies: @@ -8390,7 +8379,7 @@ packages: magic-string: 0.26.2 svelte: 3.49.0 svelte-hmr: 0.14.12_svelte@3.49.0 - vite: 3.0.4 + vite: 3.0.5 transitivePeerDependencies: - supports-color dev: false @@ -8473,7 +8462,7 @@ packages: /@types/connect/3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 18.6.4 + '@types/node': 18.6.5 dev: true /@types/debug/4.1.7: @@ -8520,7 +8509,7 @@ packages: /@types/etag/1.8.1: resolution: {integrity: sha512-bsKkeSqN7HYyYntFRAmzcwx/dKW4Wa+KVMTInANlI72PWLQmOpZu96j0OqHZGArW4VQwCmJPteQlXaUDeOB0WQ==} dependencies: - '@types/node': 18.6.4 + '@types/node': 18.6.5 dev: true /@types/extend/3.0.1: @@ -8535,7 +8524,7 @@ packages: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 3.0.5 - '@types/node': 18.6.4 + '@types/node': 18.6.5 dev: true /@types/hast/2.3.4: @@ -8619,8 +8608,8 @@ packages: resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} dev: false - /@types/node/18.6.4: - resolution: {integrity: sha512-I4BD3L+6AWiUobfxZ49DlU43gtI+FTHSv9pE2Zekg6KjMpre4ByusaljW3vYSLJrvQ1ck1hUaeVu8HVlY3vzHg==} + /@types/node/18.6.5: + resolution: {integrity: sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==} /@types/normalize-package-data/2.4.1: resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} @@ -8644,7 +8633,7 @@ packages: /@types/prompts/2.0.14: resolution: {integrity: sha512-HZBd99fKxRWpYCErtm2/yxUZv6/PBI9J7N4TNFffl5JbrYMHBwF25DjQGTW3b3jmXq+9P6/8fCIb2ee57BFfYA==} dependencies: - '@types/node': 18.6.4 + '@types/node': 18.6.5 dev: true /@types/prop-types/15.7.5: @@ -8694,13 +8683,13 @@ packages: resolution: {integrity: sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==} dependencies: '@types/glob': 7.2.0 - '@types/node': 18.6.4 + '@types/node': 18.6.5 dev: true /@types/sass/1.43.1: resolution: {integrity: sha512-BPdoIt1lfJ6B7rw35ncdwBZrAssjcwzI5LByIrYs+tpXlj/CAkuVdRsgZDdP4lq5EjyWzwxZCqAoFyHKFwp32g==} dependencies: - '@types/node': 18.6.4 + '@types/node': 18.6.5 dev: false /@types/sax/1.2.4: @@ -8720,13 +8709,13 @@ packages: resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} dependencies: '@types/mime': 1.3.2 - '@types/node': 18.6.4 + '@types/node': 18.6.5 dev: true /@types/sharp/0.30.5: resolution: {integrity: sha512-EhO29617AIBqxoVtpd1qdBanWpspk/kD2B6qTFRJ31Q23Rdf+DNU1xlHSwtqvwq1vgOqBwq1i38SX+HGCymIQg==} dependencies: - '@types/node': 18.6.4 + '@types/node': 18.6.5 dev: true /@types/stack-trace/0.0.29: @@ -8759,8 +8748,8 @@ packages: resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} dev: true - /@typescript-eslint/eslint-plugin/5.32.0_iosr3hrei2tubxveewluhu5lhy: - resolution: {integrity: sha512-CHLuz5Uz7bHP2WgVlvoZGhf0BvFakBJKAD/43Ty0emn4wXWv5k01ND0C0fHcl/Im8Td2y/7h44E9pca9qAu2ew==} + /@typescript-eslint/eslint-plugin/5.33.0_njno5y7ry2l2lcmiu4tywxkwnq: + resolution: {integrity: sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -8770,10 +8759,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq - '@typescript-eslint/scope-manager': 5.32.0 - '@typescript-eslint/type-utils': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq - '@typescript-eslint/utils': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq + '@typescript-eslint/parser': 5.33.0_qugx7qdu5zevzvxaiqyxfiwquq + '@typescript-eslint/scope-manager': 5.33.0 + '@typescript-eslint/type-utils': 5.33.0_qugx7qdu5zevzvxaiqyxfiwquq + '@typescript-eslint/utils': 5.33.0_qugx7qdu5zevzvxaiqyxfiwquq debug: 4.3.4 eslint: 8.21.0 functional-red-black-tree: 1.0.1 @@ -8786,8 +8775,8 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.32.0_qugx7qdu5zevzvxaiqyxfiwquq: - resolution: {integrity: sha512-IxRtsehdGV9GFQ35IGm5oKKR2OGcazUoiNBxhRV160iF9FoyuXxjY+rIqs1gfnd+4eL98OjeGnMpE7RF/NBb3A==} + /@typescript-eslint/parser/5.33.0_qugx7qdu5zevzvxaiqyxfiwquq: + resolution: {integrity: sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -8796,9 +8785,9 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.32.0 - '@typescript-eslint/types': 5.32.0 - '@typescript-eslint/typescript-estree': 5.32.0_typescript@4.7.4 + '@typescript-eslint/scope-manager': 5.33.0 + '@typescript-eslint/types': 5.33.0 + '@typescript-eslint/typescript-estree': 5.33.0_typescript@4.7.4 debug: 4.3.4 eslint: 8.21.0 typescript: 4.7.4 @@ -8806,16 +8795,16 @@ packages: - supports-color dev: true - /@typescript-eslint/scope-manager/5.32.0: - resolution: {integrity: sha512-KyAE+tUON0D7tNz92p1uetRqVJiiAkeluvwvZOqBmW9z2XApmk5WSMV9FrzOroAcVxJZB3GfUwVKr98Dr/OjOg==} + /@typescript-eslint/scope-manager/5.33.0: + resolution: {integrity: sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.32.0 - '@typescript-eslint/visitor-keys': 5.32.0 + '@typescript-eslint/types': 5.33.0 + '@typescript-eslint/visitor-keys': 5.33.0 dev: true - /@typescript-eslint/type-utils/5.32.0_qugx7qdu5zevzvxaiqyxfiwquq: - resolution: {integrity: sha512-0gSsIhFDduBz3QcHJIp3qRCvVYbqzHg8D6bHFsDMrm0rURYDj+skBK2zmYebdCp+4nrd9VWd13egvhYFJj/wZg==} + /@typescript-eslint/type-utils/5.33.0_qugx7qdu5zevzvxaiqyxfiwquq: + resolution: {integrity: sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '*' @@ -8824,7 +8813,7 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/utils': 5.32.0_qugx7qdu5zevzvxaiqyxfiwquq + '@typescript-eslint/utils': 5.33.0_qugx7qdu5zevzvxaiqyxfiwquq debug: 4.3.4 eslint: 8.21.0 tsutils: 3.21.0_typescript@4.7.4 @@ -8833,13 +8822,13 @@ packages: - supports-color dev: true - /@typescript-eslint/types/5.32.0: - resolution: {integrity: sha512-EBUKs68DOcT/EjGfzywp+f8wG9Zw6gj6BjWu7KV/IYllqKJFPlZlLSYw/PTvVyiRw50t6wVbgv4p9uE2h6sZrQ==} + /@typescript-eslint/types/5.33.0: + resolution: {integrity: sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.32.0_typescript@4.7.4: - resolution: {integrity: sha512-ZVAUkvPk3ITGtCLU5J4atCw9RTxK+SRc6hXqLtllC2sGSeMFWN+YwbiJR9CFrSFJ3w4SJfcWtDwNb/DmUIHdhg==} + /@typescript-eslint/typescript-estree/5.33.0_typescript@4.7.4: + resolution: {integrity: sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -8847,8 +8836,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.32.0 - '@typescript-eslint/visitor-keys': 5.32.0 + '@typescript-eslint/types': 5.33.0 + '@typescript-eslint/visitor-keys': 5.33.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -8859,16 +8848,16 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.32.0_qugx7qdu5zevzvxaiqyxfiwquq: - resolution: {integrity: sha512-W7lYIAI5Zlc5K082dGR27Fczjb3Q57ECcXefKU/f0ajM5ToM0P+N9NmJWip8GmGu/g6QISNT+K6KYB+iSHjXCQ==} + /@typescript-eslint/utils/5.33.0_qugx7qdu5zevzvxaiqyxfiwquq: + resolution: {integrity: sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: '@types/json-schema': 7.0.11 - '@typescript-eslint/scope-manager': 5.32.0 - '@typescript-eslint/types': 5.32.0 - '@typescript-eslint/typescript-estree': 5.32.0_typescript@4.7.4 + '@typescript-eslint/scope-manager': 5.33.0 + '@typescript-eslint/types': 5.33.0 + '@typescript-eslint/typescript-estree': 5.33.0_typescript@4.7.4 eslint: 8.21.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.21.0 @@ -8877,11 +8866,11 @@ packages: - typescript dev: true - /@typescript-eslint/visitor-keys/5.32.0: - resolution: {integrity: sha512-S54xOHZgfThiZ38/ZGTgB2rqx51CMJ5MCfVT2IplK4Q7hgzGfe0nLzLCcenDnc/cSjP568hdeKfeDcBgqNHD/g==} + /@typescript-eslint/visitor-keys/5.33.0: + resolution: {integrity: sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.32.0 + '@typescript-eslint/types': 5.33.0 eslint-visitor-keys: 3.3.0 dev: true @@ -9029,7 +9018,7 @@ packages: - supports-color dev: false - /@vitejs/plugin-vue/3.0.1_vite@3.0.4+vue@3.2.37: + /@vitejs/plugin-vue/3.0.1_vite@3.0.5+vue@3.2.37: resolution: {integrity: sha512-Ll9JgxG7ONIz/XZv3dssfoMUDu9qAnlJ+km+pBA0teYSXzwPCIzS/e1bmwNYl5dcQGs677D21amgfYAnzMl17A==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -9039,7 +9028,7 @@ packages: vite: optional: true dependencies: - vite: 3.0.4 + vite: 3.0.5 vue: 3.2.37 dev: false @@ -9050,7 +9039,7 @@ packages: jsonc-parser: 2.3.1 vscode-languageserver-textdocument: 1.0.5 vscode-languageserver-types: 3.17.2 - vscode-nls: 5.0.1 + vscode-nls: 5.1.0 vscode-uri: 2.1.2 dev: false @@ -9415,7 +9404,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.21.3 - caniuse-lite: 1.0.30001374 + caniuse-lite: 1.0.30001375 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -9611,8 +9600,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001374 - electron-to-chromium: 1.4.211 + caniuse-lite: 1.0.30001375 + electron-to-chromium: 1.4.213 node-releases: 2.0.6 update-browserslist-db: 1.0.5_browserslist@4.21.3 @@ -9693,8 +9682,8 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} - /caniuse-lite/1.0.30001374: - resolution: {integrity: sha512-mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw==} + /caniuse-lite/1.0.30001375: + resolution: {integrity: sha512-kWIMkNzLYxSvnjy0hL8w1NOaWNr2rn39RTAVyIwcw8juu60bZDWiF1/loOYANzjtJmy6qPgNmn38ro5Pygagdw==} /canvas-confetti/1.5.1: resolution: {integrity: sha512-Ncz+oZJP6OvY7ti4E1slxVlyAV/3g7H7oQtcCDXgwGgARxPnwYY9PW5Oe+I8uvspYNtuHviAdgA0LfcKFWJfpg==} @@ -10413,8 +10402,8 @@ packages: jake: 10.8.5 dev: true - /electron-to-chromium/1.4.211: - resolution: {integrity: sha512-BZSbMpyFQU0KBJ1JG26XGeFI3i4op+qOYGxftmZXFZoHkhLgsSv4DHDJfl8ogII3hIuzGt51PaZ195OVu0yJ9A==} + /electron-to-chromium/1.4.213: + resolution: {integrity: sha512-+3DbGHGOCHTVB/Ms63bGqbyC1b8y7Fk86+7ltssB8NQrZtSCvZG6eooSl9U2Q0yw++fL2DpHKOdTU0NVEkFObg==} /emmet/2.3.6: resolution: {integrity: sha512-pLS4PBPDdxuUAmw7Me7+TcHbykTsBKN/S9XJbUOMFQrNv9MoshzyMFK/R57JBm94/6HSL4vHnDeEmxlC82NQ4A==} @@ -10518,8 +10507,8 @@ packages: dev: true optional: true - /esbuild-android-64/0.14.53: - resolution: {integrity: sha512-fIL93sOTnEU+NrTAVMIKiAw0YH22HWCAgg4N4Z6zov2t0kY9RAJ50zY9ZMCQ+RT6bnOfDt8gCTnt/RaSNA2yRA==} + /esbuild-android-64/0.14.54: + resolution: {integrity: sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -10535,8 +10524,8 @@ packages: dev: true optional: true - /esbuild-android-arm64/0.14.53: - resolution: {integrity: sha512-PC7KaF1v0h/nWpvlU1UMN7dzB54cBH8qSsm7S9mkwFA1BXpaEOufCg8hdoEI1jep0KeO/rjZVWrsH8+q28T77A==} + /esbuild-android-arm64/0.14.54: + resolution: {integrity: sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -10552,8 +10541,8 @@ packages: dev: true optional: true - /esbuild-darwin-64/0.14.53: - resolution: {integrity: sha512-gE7P5wlnkX4d4PKvLBUgmhZXvL7lzGRLri17/+CmmCzfncIgq8lOBvxGMiQ4xazplhxq+72TEohyFMZLFxuWvg==} + /esbuild-darwin-64/0.14.54: + resolution: {integrity: sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -10569,8 +10558,8 @@ packages: dev: true optional: true - /esbuild-darwin-arm64/0.14.53: - resolution: {integrity: sha512-otJwDU3hnI15Q98PX4MJbknSZ/WSR1I45il7gcxcECXzfN4Mrpft5hBDHXNRnCh+5858uPXBXA1Vaz2jVWLaIA==} + /esbuild-darwin-arm64/0.14.54: + resolution: {integrity: sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -10586,8 +10575,8 @@ packages: dev: true optional: true - /esbuild-freebsd-64/0.14.53: - resolution: {integrity: sha512-WkdJa8iyrGHyKiPF4lk0MiOF87Q2SkE+i+8D4Cazq3/iqmGPJ6u49je300MFi5I2eUsQCkaOWhpCVQMTKGww2w==} + /esbuild-freebsd-64/0.14.54: + resolution: {integrity: sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -10603,8 +10592,8 @@ packages: dev: true optional: true - /esbuild-freebsd-arm64/0.14.53: - resolution: {integrity: sha512-9T7WwCuV30NAx0SyQpw8edbKvbKELnnm1FHg7gbSYaatH+c8WJW10g/OdM7JYnv7qkimw2ZTtSA+NokOLd2ydQ==} + /esbuild-freebsd-arm64/0.14.54: + resolution: {integrity: sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -10620,8 +10609,8 @@ packages: dev: true optional: true - /esbuild-linux-32/0.14.53: - resolution: {integrity: sha512-VGanLBg5en2LfGDgLEUxQko2lqsOS7MTEWUi8x91YmsHNyzJVT/WApbFFx3MQGhkf+XdimVhpyo5/G0PBY91zg==} + /esbuild-linux-32/0.14.54: + resolution: {integrity: sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -10637,8 +10626,8 @@ packages: dev: true optional: true - /esbuild-linux-64/0.14.53: - resolution: {integrity: sha512-pP/FA55j/fzAV7N9DF31meAyjOH6Bjuo3aSKPh26+RW85ZEtbJv9nhoxmGTd9FOqjx59Tc1ZbrJabuiXlMwuZQ==} + /esbuild-linux-64/0.14.54: + resolution: {integrity: sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -10654,8 +10643,8 @@ packages: dev: true optional: true - /esbuild-linux-arm/0.14.53: - resolution: {integrity: sha512-/u81NGAVZMopbmzd21Nu/wvnKQK3pT4CrvQ8BTje1STXcQAGnfyKgQlj3m0j2BzYbvQxSy+TMck4TNV2onvoPA==} + /esbuild-linux-arm/0.14.54: + resolution: {integrity: sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -10671,8 +10660,8 @@ packages: dev: true optional: true - /esbuild-linux-arm64/0.14.53: - resolution: {integrity: sha512-GDmWITT+PMsjCA6/lByYk7NyFssW4Q6in32iPkpjZ/ytSyH+xeEx8q7HG3AhWH6heemEYEWpTll/eui3jwlSnw==} + /esbuild-linux-arm64/0.14.54: + resolution: {integrity: sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -10688,8 +10677,8 @@ packages: dev: true optional: true - /esbuild-linux-mips64le/0.14.53: - resolution: {integrity: sha512-d6/XHIQW714gSSp6tOOX2UscedVobELvQlPMkInhx1NPz4ThZI9uNLQ4qQJHGBGKGfu+rtJsxM4NVHLhnNRdWQ==} + /esbuild-linux-mips64le/0.14.54: + resolution: {integrity: sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -10705,8 +10694,8 @@ packages: dev: true optional: true - /esbuild-linux-ppc64le/0.14.53: - resolution: {integrity: sha512-ndnJmniKPCB52m+r6BtHHLAOXw+xBCWIxNnedbIpuREOcbSU/AlyM/2dA3BmUQhsHdb4w3amD5U2s91TJ3MzzA==} + /esbuild-linux-ppc64le/0.14.54: + resolution: {integrity: sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -10722,8 +10711,8 @@ packages: dev: true optional: true - /esbuild-linux-riscv64/0.14.53: - resolution: {integrity: sha512-yG2sVH+QSix6ct4lIzJj329iJF3MhloLE6/vKMQAAd26UVPVkhMFqFopY+9kCgYsdeWvXdPgmyOuKa48Y7+/EQ==} + /esbuild-linux-riscv64/0.14.54: + resolution: {integrity: sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -10739,8 +10728,8 @@ packages: dev: true optional: true - /esbuild-linux-s390x/0.14.53: - resolution: {integrity: sha512-OCJlgdkB+XPYndHmw6uZT7jcYgzmx9K+28PVdOa/eLjdoYkeAFvH5hTwX4AXGLZLH09tpl4bVsEtvuyUldaNCg==} + /esbuild-linux-s390x/0.14.54: + resolution: {integrity: sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -10756,8 +10745,8 @@ packages: dev: true optional: true - /esbuild-netbsd-64/0.14.53: - resolution: {integrity: sha512-gp2SB+Efc7MhMdWV2+pmIs/Ja/Mi5rjw+wlDmmbIn68VGXBleNgiEZG+eV2SRS0kJEUyHNedDtwRIMzaohWedQ==} + /esbuild-netbsd-64/0.14.54: + resolution: {integrity: sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -10773,8 +10762,8 @@ packages: dev: true optional: true - /esbuild-openbsd-64/0.14.53: - resolution: {integrity: sha512-eKQ30ZWe+WTZmteDYg8S+YjHV5s4iTxeSGhJKJajFfQx9TLZJvsJX0/paqwP51GicOUruFpSUAs2NCc0a4ivQQ==} + /esbuild-openbsd-64/0.14.54: + resolution: {integrity: sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -10790,8 +10779,8 @@ packages: dev: true optional: true - /esbuild-sunos-64/0.14.53: - resolution: {integrity: sha512-OWLpS7a2FrIRukQqcgQqR1XKn0jSJoOdT+RlhAxUoEQM/IpytS3FXzCJM6xjUYtpO5GMY0EdZJp+ur2pYdm39g==} + /esbuild-sunos-64/0.14.54: + resolution: {integrity: sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -10807,8 +10796,8 @@ packages: dev: true optional: true - /esbuild-windows-32/0.14.53: - resolution: {integrity: sha512-m14XyWQP5rwGW0tbEfp95U6A0wY0DYPInWBB7D69FAXUpBpBObRoGTKRv36lf2RWOdE4YO3TNvj37zhXjVL5xg==} + /esbuild-windows-32/0.14.54: + resolution: {integrity: sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -10824,8 +10813,8 @@ packages: dev: true optional: true - /esbuild-windows-64/0.14.53: - resolution: {integrity: sha512-s9skQFF0I7zqnQ2K8S1xdLSfZFsPLuOGmSx57h2btSEswv0N0YodYvqLcJMrNMXh6EynOmWD7rz+0rWWbFpIHQ==} + /esbuild-windows-64/0.14.54: + resolution: {integrity: sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -10841,8 +10830,8 @@ packages: dev: true optional: true - /esbuild-windows-arm64/0.14.53: - resolution: {integrity: sha512-E+5Gvb+ZWts+00T9II6wp2L3KG2r3iGxByqd/a1RmLmYWVsSVUjkvIxZuJ3hYTIbhLkH5PRwpldGTKYqVz0nzQ==} + /esbuild-windows-arm64/0.14.54: + resolution: {integrity: sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -10877,33 +10866,33 @@ packages: esbuild-windows-arm64: 0.14.51 dev: true - /esbuild/0.14.53: - resolution: {integrity: sha512-ohO33pUBQ64q6mmheX1mZ8mIXj8ivQY/L4oVuAshr+aJI+zLl+amrp3EodrUNDNYVrKJXGPfIHFGhO8slGRjuw==} + /esbuild/0.14.54: + resolution: {integrity: sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/linux-loong64': 0.14.53 - esbuild-android-64: 0.14.53 - esbuild-android-arm64: 0.14.53 - esbuild-darwin-64: 0.14.53 - esbuild-darwin-arm64: 0.14.53 - esbuild-freebsd-64: 0.14.53 - esbuild-freebsd-arm64: 0.14.53 - esbuild-linux-32: 0.14.53 - esbuild-linux-64: 0.14.53 - esbuild-linux-arm: 0.14.53 - esbuild-linux-arm64: 0.14.53 - esbuild-linux-mips64le: 0.14.53 - esbuild-linux-ppc64le: 0.14.53 - esbuild-linux-riscv64: 0.14.53 - esbuild-linux-s390x: 0.14.53 - esbuild-netbsd-64: 0.14.53 - esbuild-openbsd-64: 0.14.53 - esbuild-sunos-64: 0.14.53 - esbuild-windows-32: 0.14.53 - esbuild-windows-64: 0.14.53 - esbuild-windows-arm64: 0.14.53 + '@esbuild/linux-loong64': 0.14.54 + esbuild-android-64: 0.14.54 + esbuild-android-arm64: 0.14.54 + esbuild-darwin-64: 0.14.54 + esbuild-darwin-arm64: 0.14.54 + esbuild-freebsd-64: 0.14.54 + esbuild-freebsd-arm64: 0.14.54 + esbuild-linux-32: 0.14.54 + esbuild-linux-64: 0.14.54 + esbuild-linux-arm: 0.14.54 + esbuild-linux-arm64: 0.14.54 + esbuild-linux-mips64le: 0.14.54 + esbuild-linux-ppc64le: 0.14.54 + esbuild-linux-riscv64: 0.14.54 + esbuild-linux-s390x: 0.14.54 + esbuild-netbsd-64: 0.14.54 + esbuild-openbsd-64: 0.14.54 + esbuild-sunos-64: 0.14.54 + esbuild-windows-32: 0.14.54 + esbuild-windows-64: 0.14.54 + esbuild-windows-arm64: 0.14.54 /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -14453,17 +14442,17 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 - /preact-render-to-string/5.2.1_preact@10.10.1: + /preact-render-to-string/5.2.1_preact@10.10.2: resolution: {integrity: sha512-Wp3ner1aIVBpKg02C4AoLdBiw4kNaiFSYHr4wUF+fR7FWKAQzNri+iPfPp31sEhAtBfWoJrSxiEFzd5wp5zCgQ==} peerDependencies: preact: '>=10' dependencies: - preact: 10.10.1 + preact: 10.10.2 pretty-format: 3.8.0 dev: false - /preact/10.10.1: - resolution: {integrity: sha512-cXljG59ylGtSLismoLojXPAGvnh2ipQr3BYz9KZQr+1sdASCT+sR/v8dSMDS96xGCdtln2wHfAHCnLJK+XcBNg==} + /preact/10.10.2: + resolution: {integrity: sha512-GUXSsfwq4NKhlLYY5ctfNE0IjFk7Xo4952yPI8yMkXdhzeQmQ+FahZITe7CeHXMPyKBVQ8SoCmGNIy9TSOdhgQ==} /preact/10.6.6: resolution: {integrity: sha512-dgxpTFV2vs4vizwKohYKkk7g7rmp1wOOcfd4Tz3IB3Wi+ivZzsn/SpeKJhRENSE+n8sUfsAl4S3HiCVT923ABw==} @@ -15185,8 +15174,8 @@ packages: suf-log: 2.5.3 dev: true - /sass/1.54.3: - resolution: {integrity: sha512-fLodey5Qd41Pxp/Tk7Al97sViYwF/TazRc5t6E65O7JOk4XF8pzwIW7CvCxYVOfJFFI/1x5+elDyBIixrp+zrw==} + /sass/1.54.4: + resolution: {integrity: sha512-3tmF16yvnBwtlPrNBHw/H907j8MlOX8aTBnlNX1yrKx24RKcJGPyLhFUwkoKBKesR3unP93/2z14Ll8NicwQUA==} engines: {node: '>=12.0.0'} hasBin: true dependencies: @@ -16050,7 +16039,7 @@ packages: engines: {node: '>=12'} hasBin: true dependencies: - esbuild: 0.14.53 + esbuild: 0.14.54 dev: false /tsutils/3.21.0_typescript@4.7.4: @@ -16591,7 +16580,7 @@ packages: - supports-color dev: true - /vite/3.0.4: + /vite/3.0.4_sass@1.54.4: resolution: {integrity: sha512-NU304nqnBeOx2MkQnskBQxVsa0pRAH5FphokTGmyy8M3oxbvw7qAXts2GORxs+h/2vKsD+osMhZ7An6yK6F1dA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -16610,15 +16599,17 @@ packages: terser: optional: true dependencies: - esbuild: 0.14.53 + esbuild: 0.14.54 postcss: 8.4.16 resolve: 1.22.1 rollup: 2.77.2 + sass: 1.54.4 optionalDependencies: fsevents: 2.3.2 + dev: false - /vite/3.0.4_sass@1.54.3: - resolution: {integrity: sha512-NU304nqnBeOx2MkQnskBQxVsa0pRAH5FphokTGmyy8M3oxbvw7qAXts2GORxs+h/2vKsD+osMhZ7An6yK6F1dA==} + /vite/3.0.5: + resolution: {integrity: sha512-bRvrt9Tw8EGW4jj64aYFTnVg134E8hgDxyl/eEHnxiGqYk7/pTPss6CWlurqPOUzqvEoZkZ58Ws+Iu8MB87iMA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -16636,14 +16627,12 @@ packages: terser: optional: true dependencies: - esbuild: 0.14.53 + esbuild: 0.14.54 postcss: 8.4.16 resolve: 1.22.1 rollup: 2.77.2 - sass: 1.54.3 optionalDependencies: fsevents: 2.3.2 - dev: false /vitest/0.20.3: resolution: {integrity: sha512-cXMjTbZxBBUUuIF3PUzEGPLJWtIMeURBDXVxckSHpk7xss4JxkiiWh5cnIlfGyfJne2Ii3QpbiRuFL5dMJtljw==} @@ -16672,13 +16661,13 @@ packages: dependencies: '@types/chai': 4.3.3 '@types/chai-subset': 1.3.3 - '@types/node': 18.6.4 + '@types/node': 18.6.5 chai: 4.3.6 debug: 4.3.4 local-pkg: 0.4.2 tinypool: 0.2.4 tinyspy: 1.0.0 - vite: 3.0.4 + vite: 3.0.5 transitivePeerDependencies: - less - sass @@ -16701,7 +16690,7 @@ packages: dependencies: vscode-languageserver-textdocument: 1.0.5 vscode-languageserver-types: 3.17.2 - vscode-nls: 5.0.1 + vscode-nls: 5.1.0 vscode-uri: 3.0.3 dev: false @@ -16710,7 +16699,7 @@ packages: dependencies: vscode-languageserver-textdocument: 1.0.5 vscode-languageserver-types: 3.17.2 - vscode-nls: 5.0.1 + vscode-nls: 5.1.0 vscode-uri: 3.0.3 dev: false @@ -16741,8 +16730,8 @@ packages: vscode-languageserver-protocol: 3.17.2 dev: false - /vscode-nls/5.0.1: - resolution: {integrity: sha512-hHQV6iig+M21lTdItKPkJAaWrxALQb/nqpVffakO4knJOh3DrU2SXOMzUzNgo1eADPzu3qSsJY1weCzvR52q9A==} + /vscode-nls/5.1.0: + resolution: {integrity: sha512-37Ha44QrLFwR2IfSSYdOArzUvOyoWbOYTwQC+wS0NfqKjhW7s0WQ1lMy5oJXgSZy9sAiZS5ifELhbpXodeMR8w==} dev: false /vscode-oniguruma/1.6.2: @@ -17200,8 +17189,8 @@ packages: stack-trace: 0.0.10 dev: true - /zod/3.17.10: - resolution: {integrity: sha512-IHXnQYQuOOOL/XgHhgl8YjNxBHi3xX0mVcHmqsvJgcxKkEczPshoWdxqyFwsARpf41E0v9U95WUROqsHHxt0UQ==} + /zod/3.18.0: + resolution: {integrity: sha512-gwTm8RfUCe8l9rDwN5r2A17DkAa8Ez4Yl4yXqc5VqeGaXaJahzYYXbTwvhroZi0SNBqTwh/bKm2N0mpCzuw4bA==} dev: false /zwitch/2.0.2: From dcc2480d9df651a58e78fe441bcf592d6ecf83d0 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Wed, 10 Aug 2022 22:05:07 +0800 Subject: [PATCH 13/16] Skip mod.d.ts in format:ci (#4235) --- packages/webapi/mod.d.ts | 3 ++- packages/webapi/run/build.js | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/webapi/mod.d.ts b/packages/webapi/mod.d.ts index a3c49dc5c406..88a2a5f52004 100644 --- a/packages/webapi/mod.d.ts +++ b/packages/webapi/mod.d.ts @@ -1,5 +1,6 @@ +// organize-imports-ignore export { pathToPosix } from './lib/utils'; -export { AbortController, AbortSignal, alert, atob, Blob, btoa, ByteLengthQueuingStrategy, cancelAnimationFrame, cancelIdleCallback, CanvasRenderingContext2D, CharacterData, clearTimeout, Comment, CountQueuingStrategy, CSSStyleSheet, CustomElementRegistry, CustomEvent, Document, DocumentFragment, DOMException, Element, Event, EventTarget, fetch, File, FormData, Headers, HTMLBodyElement, HTMLCanvasElement, HTMLDivElement, HTMLDocument, HTMLElement, HTMLHeadElement, HTMLHtmlElement, HTMLImageElement, HTMLSpanElement, HTMLStyleElement, HTMLTemplateElement, HTMLUnknownElement, Image, ImageData, IntersectionObserver, MediaQueryList, MutationObserver, Node, NodeFilter, NodeIterator, OffscreenCanvas, ReadableByteStreamController, ReadableStream, ReadableStreamBYOBReader, ReadableStreamBYOBRequest, ReadableStreamDefaultController, ReadableStreamDefaultReader, Request, requestAnimationFrame, requestIdleCallback, ResizeObserver, Response, setTimeout, ShadowRoot, structuredClone, StyleSheet, Text, TransformStream, TreeWalker, URLPattern, Window, WritableStream, WritableStreamDefaultController, WritableStreamDefaultWriter } from './mod.js'; +export { AbortController, AbortSignal, alert, atob, Blob, btoa, ByteLengthQueuingStrategy, cancelAnimationFrame, cancelIdleCallback, CanvasRenderingContext2D, CharacterData, clearTimeout, Comment, CountQueuingStrategy, CSSStyleSheet, CustomElementRegistry, CustomEvent, Document, DocumentFragment, DOMException, Element, Event, EventTarget, fetch, File, FormData, Headers, HTMLBodyElement, HTMLCanvasElement, HTMLDivElement, HTMLDocument, HTMLElement, HTMLHeadElement, HTMLHtmlElement, HTMLImageElement, HTMLSpanElement, HTMLStyleElement, HTMLTemplateElement, HTMLUnknownElement, Image, ImageData, IntersectionObserver, MediaQueryList, MutationObserver, Node, NodeFilter, NodeIterator, OffscreenCanvas, ReadableByteStreamController, ReadableStream, ReadableStreamBYOBReader, ReadableStreamBYOBRequest, ReadableStreamDefaultController, ReadableStreamDefaultReader, Request, requestAnimationFrame, requestIdleCallback, ResizeObserver, Response, setTimeout, ShadowRoot, structuredClone, StyleSheet, Text, TransformStream, TreeWalker, URLPattern, Window, WritableStream, WritableStreamDefaultController, WritableStreamDefaultWriter, } from './mod.js'; export declare const polyfill: { (target: any, options?: PolyfillOptions): any; internals(target: any, name: string): any; diff --git a/packages/webapi/run/build.js b/packages/webapi/run/build.js index 754e7950a881..d81f5e609017 100644 --- a/packages/webapi/run/build.js +++ b/packages/webapi/run/build.js @@ -221,9 +221,10 @@ async function build() { writeFile( 'mod.d.ts', - modDTS - .replace('\n//# sourceMappingURL=polyfill.d.ts.map', '') - .replace('ponyfill.js', 'mod.js') + '// organize-imports-ignore\n' + + modDTS + .replace('\n//# sourceMappingURL=polyfill.d.ts.map', '') + .replace('ponyfill.js', 'mod.js') ) writeFile( 'apply.js', From c38e7f1890ba5bc97ddacee91ea196bcfc7652e6 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Wed, 10 Aug 2022 22:06:02 +0800 Subject: [PATCH 14/16] Remove dev server during build (#4234) --- .changeset/silly-chairs-pretend.md | 5 ++ packages/astro/src/core/build/index.ts | 53 ++++++---------------- packages/astro/src/core/build/page-data.ts | 6 --- packages/astro/src/core/errors.ts | 9 ++-- 4 files changed, 26 insertions(+), 47 deletions(-) create mode 100644 .changeset/silly-chairs-pretend.md diff --git a/.changeset/silly-chairs-pretend.md b/.changeset/silly-chairs-pretend.md new file mode 100644 index 000000000000..0b0175cc7f6f --- /dev/null +++ b/.changeset/silly-chairs-pretend.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Remove dev server during build diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts index 782f6652ee1e..154a77a7ad89 100644 --- a/packages/astro/src/core/build/index.ts +++ b/packages/astro/src/core/build/index.ts @@ -5,7 +5,6 @@ import type { LogOptions } from '../logger/core'; import fs from 'fs'; import * as colors from 'kleur/colors'; import { performance } from 'perf_hooks'; -import * as vite from 'vite'; import { runHookBuildDone, runHookBuildStart, @@ -18,7 +17,6 @@ import { debug, info, levels, timerMessage } from '../logger/core.js'; import { apply as applyPolyfill } from '../polyfill.js'; import { RouteCache } from '../render/route-cache.js'; import { createRouteManifest } from '../routing/index.js'; -import { createSafeError } from '../util.js'; import { collectPagesData } from './page-data.js'; import { staticBuild } from './static-build.js'; import { getTimeStat } from './util.js'; @@ -64,7 +62,6 @@ class AstroBuilder { debug('build', 'Initial setup...'); const { logging } = this; this.timer.init = performance.now(); - this.timer.viteStart = performance.now(); this.config = await runHookConfigSetup({ config: this.config, command: 'build' }); this.manifest = createRouteManifest({ config: this.config }, this.logging); @@ -80,20 +77,11 @@ class AstroBuilder { { astroConfig: this.config, logging, mode: 'build' } ); await runHookConfigDone({ config: this.config }); - const viteServer = await vite.createServer(viteConfig); - debug('build', timerMessage('Vite started', this.timer.viteStart)); - return { viteConfig, viteServer }; + return { viteConfig }; } /** Run the build logic. build() is marked private because usage should go through ".run()" */ - private async build({ - viteConfig, - viteServer, - }: { - viteConfig: ViteConfigWithSSR; - viteServer: vite.ViteDevServer; - }) { - const { origin } = this; + private async build({ viteConfig }: { viteConfig: ViteConfigWithSSR }) { const buildConfig: BuildConfig = { client: new URL('./client/', this.config.outDir), server: new URL('./server/', this.config.outDir), @@ -111,10 +99,6 @@ class AstroBuilder { astroConfig: this.config, logging: this.logging, manifest: this.manifest, - origin, - routeCache: this.routeCache, - viteServer, - ssr: this.config.output === 'server', }); debug('build', timerMessage('All pages loaded', this.timer.loadStart)); @@ -131,24 +115,18 @@ class AstroBuilder { colors.dim(`Completed in ${getTimeStat(this.timer.init, performance.now())}.`) ); - try { - await staticBuild({ - allPages, - astroConfig: this.config, - logging: this.logging, - manifest: this.manifest, - mode: this.mode, - origin: this.origin, - pageNames, - routeCache: this.routeCache, - viteConfig, - buildConfig, - }); - } catch (err: unknown) { - // If the build doesn't complete, still shutdown the Vite server so the process doesn't hang. - await viteServer.close(); - throw err; - } + await staticBuild({ + allPages, + astroConfig: this.config, + logging: this.logging, + manifest: this.manifest, + mode: this.mode, + origin: this.origin, + pageNames, + routeCache: this.routeCache, + viteConfig, + buildConfig, + }); // Write any additionally generated assets to disk. this.timer.assetsStart = performance.now(); @@ -162,7 +140,6 @@ class AstroBuilder { debug('build', timerMessage('Additional assets copied', this.timer.assetsStart)); // You're done! Time to clean up. - await viteServer.close(); await runHookBuildDone({ config: this.config, buildConfig, @@ -186,7 +163,7 @@ class AstroBuilder { try { await this.build(setupData); } catch (_err) { - throw fixViteErrorMessage(createSafeError(_err), setupData.viteServer); + throw fixViteErrorMessage(_err); } } diff --git a/packages/astro/src/core/build/page-data.ts b/packages/astro/src/core/build/page-data.ts index 97c6a2915e50..5de8804c4ee7 100644 --- a/packages/astro/src/core/build/page-data.ts +++ b/packages/astro/src/core/build/page-data.ts @@ -1,4 +1,3 @@ -import type { ViteDevServer } from 'vite'; import type { AstroConfig, ManifestData } from '../../@types/astro'; import type { LogOptions } from '../logger/core'; import { info } from '../logger/core.js'; @@ -6,16 +5,11 @@ import type { AllPagesData } from './types'; import * as colors from 'kleur/colors'; import { debug } from '../logger/core.js'; -import { RouteCache } from '../render/route-cache.js'; export interface CollectPagesDataOptions { astroConfig: AstroConfig; logging: LogOptions; manifest: ManifestData; - origin: string; - routeCache: RouteCache; - viteServer: ViteDevServer; - ssr: boolean; } export interface CollectPagesDataResult { diff --git a/packages/astro/src/core/errors.ts b/packages/astro/src/core/errors.ts index 13eec5cb8739..f7ddd1f9f9c4 100644 --- a/packages/astro/src/core/errors.ts +++ b/packages/astro/src/core/errors.ts @@ -42,11 +42,14 @@ export function cleanErrorStack(stack: string) { .join('\n'); } -/** Update the error message to correct any vite-isms that we don't want to expose to the user. */ -export function fixViteErrorMessage(_err: unknown, server: ViteDevServer, filePath?: URL) { +/** + * Update the error message to correct any vite-isms that we don't want to expose to the user. + * The `server` is required if the error may come from `server.ssrLoadModule()`. + */ +export function fixViteErrorMessage(_err: unknown, server?: ViteDevServer, filePath?: URL) { const err = createSafeError(_err); // Vite will give you better stacktraces, using sourcemaps. - server.ssrFixStacktrace(err); + server?.ssrFixStacktrace(err); // Fix: Astro.glob() compiles to import.meta.glob() by the time Vite sees it, // so we need to update this error message in case it originally came from Astro.glob(). if (err.message === 'import.meta.glob() can only accept string literals.') { From f8e3853394c2f2f48fac4b5eb2284e1960e59a13 Mon Sep 17 00:00:00 2001 From: Bjorn Lu Date: Wed, 10 Aug 2022 22:22:10 +0800 Subject: [PATCH 15/16] Fix preact compat support for libraries (#4213) Co-authored-by: Matthew Phillips --- .changeset/tall-eels-wink.md | 5 +++ .changeset/tall-walls-visit.md | 5 +++ packages/astro/package.json | 2 +- .../preact-compat-component/astro.config.mjs | 7 ++++ .../preact-compat-component/package.json | 11 +++++ .../packages/react-lib/index.js | 5 +++ .../packages/react-lib/package.json | 9 ++++ .../src/components/Counter.jsx | 19 +++++++++ .../src/pages/index.astro | 12 ++++++ .../test/preact-compat-component.test.js | 41 +++++++++++++++++++ packages/integrations/preact/src/index.ts | 9 +++- pnpm-lock.yaml | 32 +++++++++++---- 12 files changed, 148 insertions(+), 9 deletions(-) create mode 100644 .changeset/tall-eels-wink.md create mode 100644 .changeset/tall-walls-visit.md create mode 100644 packages/astro/test/fixtures/preact-compat-component/astro.config.mjs create mode 100644 packages/astro/test/fixtures/preact-compat-component/package.json create mode 100644 packages/astro/test/fixtures/preact-compat-component/packages/react-lib/index.js create mode 100644 packages/astro/test/fixtures/preact-compat-component/packages/react-lib/package.json create mode 100644 packages/astro/test/fixtures/preact-compat-component/src/components/Counter.jsx create mode 100644 packages/astro/test/fixtures/preact-compat-component/src/pages/index.astro create mode 100644 packages/astro/test/preact-compat-component.test.js diff --git a/.changeset/tall-eels-wink.md b/.changeset/tall-eels-wink.md new file mode 100644 index 000000000000..af06792c7edf --- /dev/null +++ b/.changeset/tall-eels-wink.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Bump Vite to 3.0.5 diff --git a/.changeset/tall-walls-visit.md b/.changeset/tall-walls-visit.md new file mode 100644 index 000000000000..9168d09d8a85 --- /dev/null +++ b/.changeset/tall-walls-visit.md @@ -0,0 +1,5 @@ +--- +'@astrojs/preact': patch +--- + +Fix compat support for libraries diff --git a/packages/astro/package.json b/packages/astro/package.json index 36e017eeb1b5..f6cf58e689ca 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -138,7 +138,7 @@ "tsconfig-resolver": "^3.0.1", "unist-util-visit": "^4.1.0", "vfile": "^5.3.2", - "vite": "3.0.4", + "vite": "3.0.5", "yargs-parser": "^21.0.1", "zod": "^3.17.3" }, diff --git a/packages/astro/test/fixtures/preact-compat-component/astro.config.mjs b/packages/astro/test/fixtures/preact-compat-component/astro.config.mjs new file mode 100644 index 000000000000..58361989c9bd --- /dev/null +++ b/packages/astro/test/fixtures/preact-compat-component/astro.config.mjs @@ -0,0 +1,7 @@ +import { defineConfig } from 'astro/config'; +import preact from '@astrojs/preact'; + +// https://astro.build/config +export default defineConfig({ + integrations: [preact({ compat: true })], +}); \ No newline at end of file diff --git a/packages/astro/test/fixtures/preact-compat-component/package.json b/packages/astro/test/fixtures/preact-compat-component/package.json new file mode 100644 index 000000000000..9cef449cc829 --- /dev/null +++ b/packages/astro/test/fixtures/preact-compat-component/package.json @@ -0,0 +1,11 @@ +{ + "name": "@test/preact-compat-component", + "version": "0.0.0", + "private": true, + "dependencies": { + "@astrojs/preact": "workspace:*", + "@test/react-lib": "workspace:*", + "astro": "workspace:*", + "preact": "^10.10.1" + } +} diff --git a/packages/astro/test/fixtures/preact-compat-component/packages/react-lib/index.js b/packages/astro/test/fixtures/preact-compat-component/packages/react-lib/index.js new file mode 100644 index 000000000000..22fb55f10567 --- /dev/null +++ b/packages/astro/test/fixtures/preact-compat-component/packages/react-lib/index.js @@ -0,0 +1,5 @@ +import { useState } from "react"; + +export function useSpecialState(initialState) { + return useState(initialState); +} \ No newline at end of file diff --git a/packages/astro/test/fixtures/preact-compat-component/packages/react-lib/package.json b/packages/astro/test/fixtures/preact-compat-component/packages/react-lib/package.json new file mode 100644 index 000000000000..651d1c90e3a1 --- /dev/null +++ b/packages/astro/test/fixtures/preact-compat-component/packages/react-lib/package.json @@ -0,0 +1,9 @@ +{ + "name": "@test/react-lib", + "version": "0.0.0", + "private": true, + "type": "module", + "dependencies": { + "react": "^18.2.0" + } +} diff --git a/packages/astro/test/fixtures/preact-compat-component/src/components/Counter.jsx b/packages/astro/test/fixtures/preact-compat-component/src/components/Counter.jsx new file mode 100644 index 000000000000..bfdf5bed15a8 --- /dev/null +++ b/packages/astro/test/fixtures/preact-compat-component/src/components/Counter.jsx @@ -0,0 +1,19 @@ +/** @jsxImportSource preact */ +import { useSpecialState } from '@test/react-lib' + +export default function Counter({ children }) { + const [count, setCount] = useSpecialState(0); + const add = () => setCount((i) => i + 1); + const subtract = () => setCount((i) => i - 1); + + return ( + <> +
      + + 
      {count}
      + +
      +
      {children}
      + + ); +} diff --git a/packages/astro/test/fixtures/preact-compat-component/src/pages/index.astro b/packages/astro/test/fixtures/preact-compat-component/src/pages/index.astro new file mode 100644 index 000000000000..d28a4fff55ab --- /dev/null +++ b/packages/astro/test/fixtures/preact-compat-component/src/pages/index.astro @@ -0,0 +1,12 @@ +--- +import Counter from '../components/Counter.jsx'; +--- + + + + Preact compat component + + + + + \ No newline at end of file diff --git a/packages/astro/test/preact-compat-component.test.js b/packages/astro/test/preact-compat-component.test.js new file mode 100644 index 000000000000..f0cd9e45fec9 --- /dev/null +++ b/packages/astro/test/preact-compat-component.test.js @@ -0,0 +1,41 @@ +import { expect } from 'chai'; +import * as cheerio from 'cheerio'; +import { loadFixture } from './test-utils.js'; + +describe('Preact compat component', () => { + describe('Development', () => { + let fixture; + + before(async () => { + fixture = await loadFixture({ + root: './fixtures/preact-compat-component/', + }); + await fixture.startDevServer(); + }); + + it('Can load Counter', async () => { + const html = await fixture.fetch('/').then((res) => res.text()); + const $ = cheerio.load(html); + + expect($('#counter-text').text()).to.be.eq('0'); + }); + }); + + describe('Build', () => { + let fixture; + + before(async () => { + fixture = await loadFixture({ + root: './fixtures/preact-compat-component/', + }); + await fixture.build(); + }); + + it('Can load Counter', async () => { + const html = await fixture.readFile('/index.html'); + const $ = cheerio.load(html); + + expect($('#counter-text').text()).to.be.eq('0'); + }); + }); +}); diff --git a/packages/integrations/preact/src/index.ts b/packages/integrations/preact/src/index.ts index 67a972475db2..5c5ed0363aff 100644 --- a/packages/integrations/preact/src/index.ts +++ b/packages/integrations/preact/src/index.ts @@ -78,8 +78,15 @@ function getViteConfiguration(compat?: boolean): ViteUserConfig { { find: 'react-dom', replacement: 'preact/compat' }, { find: 'react/jsx-runtime', replacement: 'preact/jsx-runtime' }, ], - dedupe: ['preact/compat'], + dedupe: ['preact/compat', 'preact'], }; + // noExternal React entrypoints to be bundled, resolved, and aliased by Vite + viteConfig.ssr!.noExternal = [ + 'react', + 'react-dom', + 'react-dom/test-utils', + 'react/jsx-runtime', + ]; } return viteConfig; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 05a830826405..4736948d78f0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -460,7 +460,7 @@ importers: tsconfig-resolver: ^3.0.1 unist-util-visit: ^4.1.0 vfile: ^5.3.2 - vite: 3.0.4 + vite: 3.0.5 yargs-parser: ^21.0.1 zod: ^3.17.3 dependencies: @@ -516,7 +516,7 @@ importers: tsconfig-resolver: 3.0.1 unist-util-visit: 4.1.0 vfile: 5.3.4 - vite: 3.0.4_sass@1.54.4 + vite: 3.0.5_sass@1.54.4 yargs-parser: 21.1.1 zod: 3.18.0 devDependencies: @@ -1666,6 +1666,24 @@ importers: devDependencies: postcss-preset-env: 7.7.2_postcss@8.4.16 + packages/astro/test/fixtures/preact-compat-component: + specifiers: + '@astrojs/preact': workspace:* + '@test/react-lib': workspace:* + astro: workspace:* + preact: ^10.10.1 + dependencies: + '@astrojs/preact': link:../../../../integrations/preact + '@test/react-lib': link:packages/react-lib + astro: link:../../.. + preact: 10.10.2 + + packages/astro/test/fixtures/preact-compat-component/packages/react-lib: + specifiers: + react: ^18.2.0 + dependencies: + react: 18.2.0 + packages/astro/test/fixtures/preact-component: specifiers: '@astrojs/preact': workspace:* @@ -16580,8 +16598,8 @@ packages: - supports-color dev: true - /vite/3.0.4_sass@1.54.4: - resolution: {integrity: sha512-NU304nqnBeOx2MkQnskBQxVsa0pRAH5FphokTGmyy8M3oxbvw7qAXts2GORxs+h/2vKsD+osMhZ7An6yK6F1dA==} + /vite/3.0.5: + resolution: {integrity: sha512-bRvrt9Tw8EGW4jj64aYFTnVg134E8hgDxyl/eEHnxiGqYk7/pTPss6CWlurqPOUzqvEoZkZ58Ws+Iu8MB87iMA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -16603,12 +16621,10 @@ packages: postcss: 8.4.16 resolve: 1.22.1 rollup: 2.77.2 - sass: 1.54.4 optionalDependencies: fsevents: 2.3.2 - dev: false - /vite/3.0.5: + /vite/3.0.5_sass@1.54.4: resolution: {integrity: sha512-bRvrt9Tw8EGW4jj64aYFTnVg134E8hgDxyl/eEHnxiGqYk7/pTPss6CWlurqPOUzqvEoZkZ58Ws+Iu8MB87iMA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -16631,8 +16647,10 @@ packages: postcss: 8.4.16 resolve: 1.22.1 rollup: 2.77.2 + sass: 1.54.4 optionalDependencies: fsevents: 2.3.2 + dev: false /vitest/0.20.3: resolution: {integrity: sha512-cXMjTbZxBBUUuIF3PUzEGPLJWtIMeURBDXVxckSHpk7xss4JxkiiWh5cnIlfGyfJne2Ii3QpbiRuFL5dMJtljw==} From 58941e93c396bf35becc7431e1743afbaad6dd69 Mon Sep 17 00:00:00 2001 From: StefanGussner Date: Wed, 10 Aug 2022 21:08:12 +0200 Subject: [PATCH 16/16] Update code samples to match release version (#4241) As I learned from a support Thread on Discord, the tagName convention was dropped during the beta period. Instead you need to export the class and use it in astro file. I updated the code samples on this page accordingly. --- packages/integrations/lit/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/integrations/lit/README.md b/packages/integrations/lit/README.md index 49b6b4b9eb84..a6abc0ee51a3 100644 --- a/packages/integrations/lit/README.md +++ b/packages/integrations/lit/README.md @@ -68,9 +68,9 @@ __`src/components/my-element.js`__ ```js import { LitElement, html } from 'lit'; -export const tagName = 'my-element'; +const tagName = 'my-element'; -class MyElement extends LitElement { +export class MyElement extends LitElement { render() { return html`

      Hello world! From my-element

      `; } @@ -87,10 +87,10 @@ __`src/pages/index.astro`__ ```astro --- -import '../components/my-element.js'; +import {MyElement} from '../components/my-element.js'; --- - + ``` > Note that Lit requires browser globals such as `HTMLElement` and `customElements` to be present. For this reason the Lit renderer shims the server with these globals so Lit can run. You *might* run into libraries that work incorrectly because of this. @@ -103,10 +103,10 @@ Hydration is also handled automatically. You can use the same hydration directiv ```astro --- -import '../components/my-element.js'; +import {MyElement} from '../components/my-element.js'; --- - + ``` The above will only load the element's JavaScript when the user has scrolled it into view. Since it is server rendered they will not see any jank; it will load and hydrate transparently.