From 98d501bde6afe51fe2d3dabd0b6f761d9e590398 Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Fri, 8 Sep 2023 04:55:26 -0700 Subject: [PATCH 1/5] [ci] release (#8442) Co-authored-by: github-actions[bot] --- .changeset/cool-jokes-unite.md | 5 -- .changeset/cuddly-baboons-begin.md | 5 -- .changeset/curvy-dolls-thank.md | 5 -- .changeset/forty-hotels-itch.md | 5 -- .changeset/giant-cycles-marry.md | 5 -- .changeset/strong-colts-hang.md | 5 -- .changeset/stupid-olives-push.md | 5 -- .changeset/sweet-sheep-sell.md | 5 -- examples/basics/package.json | 2 +- examples/blog/package.json | 4 +- examples/component/package.json | 2 +- examples/deno/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-lit/package.json | 2 +- examples/framework-multiple/package.json | 8 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 4 +- examples/framework-solid/package.json | 4 +- examples/framework-svelte/package.json | 4 +- examples/framework-vue/package.json | 2 +- examples/hackernews/package.json | 2 +- examples/integration/package.json | 2 +- examples/middleware/package.json | 2 +- examples/minimal/package.json | 2 +- examples/non-html-pages/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 4 +- examples/with-markdoc/package.json | 2 +- examples/with-markdown-plugins/package.json | 4 +- examples/with-markdown-shiki/package.json | 2 +- examples/with-mdx/package.json | 4 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 4 +- examples/with-vite-plugin-pwa/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 11 +++ packages/astro/package.json | 2 +- packages/integrations/cloudflare/package.json | 2 +- packages/integrations/deno/package.json | 2 +- packages/integrations/markdoc/package.json | 2 +- packages/integrations/mdx/CHANGELOG.md | 10 +++ packages/integrations/mdx/package.json | 4 +- packages/integrations/netlify/package.json | 2 +- packages/integrations/node/package.json | 2 +- packages/integrations/react/CHANGELOG.md | 6 ++ packages/integrations/react/package.json | 2 +- packages/integrations/solid/CHANGELOG.md | 6 ++ packages/integrations/solid/package.json | 2 +- packages/integrations/svelte/CHANGELOG.md | 9 +++ packages/integrations/svelte/package.json | 4 +- packages/integrations/tailwind/package.json | 2 +- packages/integrations/vercel/CHANGELOG.md | 9 +++ packages/integrations/vercel/package.json | 4 +- packages/integrations/vue/package.json | 2 +- packages/markdown/remark/CHANGELOG.md | 11 +++ packages/markdown/remark/package.json | 4 +- pnpm-lock.yaml | 76 +++++++++---------- 57 files changed, 156 insertions(+), 134 deletions(-) delete mode 100644 .changeset/cool-jokes-unite.md delete mode 100644 .changeset/cuddly-baboons-begin.md delete mode 100644 .changeset/curvy-dolls-thank.md delete mode 100644 .changeset/forty-hotels-itch.md delete mode 100644 .changeset/giant-cycles-marry.md delete mode 100644 .changeset/strong-colts-hang.md delete mode 100644 .changeset/stupid-olives-push.md delete mode 100644 .changeset/sweet-sheep-sell.md diff --git a/.changeset/cool-jokes-unite.md b/.changeset/cool-jokes-unite.md deleted file mode 100644 index 57f0bedafd53..000000000000 --- a/.changeset/cool-jokes-unite.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/react': patch ---- - -Update `experimentalReactChildren` behavior to support void tags diff --git a/.changeset/cuddly-baboons-begin.md b/.changeset/cuddly-baboons-begin.md deleted file mode 100644 index bfb45dae0a47..000000000000 --- a/.changeset/cuddly-baboons-begin.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/markdown-remark': minor ---- - -Export remarkShiki and remarkPrism plugins diff --git a/.changeset/curvy-dolls-thank.md b/.changeset/curvy-dolls-thank.md deleted file mode 100644 index 47ea8ad322a3..000000000000 --- a/.changeset/curvy-dolls-thank.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Only transition between pages where both have ViewTransitions enabled diff --git a/.changeset/forty-hotels-itch.md b/.changeset/forty-hotels-itch.md deleted file mode 100644 index b13c6db35b5a..000000000000 --- a/.changeset/forty-hotels-itch.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/vercel': patch ---- - -Fix Astro's `domains` and `remotePatterns` not being used by Vercel when using Vercel Image Optimization diff --git a/.changeset/giant-cycles-marry.md b/.changeset/giant-cycles-marry.md deleted file mode 100644 index 284f8531b5bc..000000000000 --- a/.changeset/giant-cycles-marry.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/solid-js': patch ---- - -Fix hydration in Solid renderer diff --git a/.changeset/strong-colts-hang.md b/.changeset/strong-colts-hang.md deleted file mode 100644 index 90b822b41d42..000000000000 --- a/.changeset/strong-colts-hang.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"astro": patch ---- - -Fix "Cannot read properties of null" error in CLI code diff --git a/.changeset/stupid-olives-push.md b/.changeset/stupid-olives-push.md deleted file mode 100644 index 078e1c69bed5..000000000000 --- a/.changeset/stupid-olives-push.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/mdx': patch ---- - -Use exported remarkShiki and remarkPrism plugins from `@astrojs/markdown-remark` diff --git a/.changeset/sweet-sheep-sell.md b/.changeset/sweet-sheep-sell.md deleted file mode 100644 index 986a60478f60..000000000000 --- a/.changeset/sweet-sheep-sell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@astrojs/svelte': patch ---- - -Fix potential memory leak when component is unmounted diff --git a/examples/basics/package.json b/examples/basics/package.json index f732916c21a5..9971c85e6696 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.10" + "astro": "^3.0.11" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index e76a9055ac0d..cf2c9836847b 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -11,9 +11,9 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^1.0.2", + "@astrojs/mdx": "^1.0.3", "@astrojs/rss": "^3.0.0", "@astrojs/sitemap": "^3.0.0", - "astro": "^3.0.10" + "astro": "^3.0.11" } } diff --git a/examples/component/package.json b/examples/component/package.json index aa119f483c97..97f34feaaae9 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.0.10" + "astro": "^3.0.11" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/deno/package.json b/examples/deno/package.json index 5815e400e09a..ed59e5fce2d7 100644 --- a/examples/deno/package.json +++ b/examples/deno/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.10" + "astro": "^3.0.11" }, "devDependencies": { "@astrojs/deno": "^5.0.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 5f13afc74433..88e888ea4e84 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.3.0", "@types/alpinejs": "^3.7.2", "alpinejs": "^3.12.3", - "astro": "^3.0.10" + "astro": "^3.0.11" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index 054bb3c0b5b8..fa0fecccd2d1 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^3.0.0", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^3.0.10", + "astro": "^3.0.11", "lit": "^2.8.0" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index e590a485e098..916b5abd7d80 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -12,11 +12,11 @@ }, "dependencies": { "@astrojs/preact": "^3.0.0", - "@astrojs/react": "^3.0.1", - "@astrojs/solid-js": "^3.0.0", - "@astrojs/svelte": "^4.0.1", + "@astrojs/react": "^3.0.2", + "@astrojs/solid-js": "^3.0.1", + "@astrojs/svelte": "^4.0.2", "@astrojs/vue": "^3.0.0", - "astro": "^3.0.10", + "astro": "^3.0.11", "preact": "^10.17.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 1d9ed72a9ae9..da56557f41f1 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.0", "@preact/signals": "^1.2.1", - "astro": "^3.0.10", + "astro": "^3.0.11", "preact": "^10.17.1" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index db5754bb2d1d..0a059fd4330d 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -11,10 +11,10 @@ "astro": "astro" }, "dependencies": { - "@astrojs/react": "^3.0.1", + "@astrojs/react": "^3.0.2", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", - "astro": "^3.0.10", + "astro": "^3.0.11", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index e5d6ab7a987b..cd744d916b30 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,8 +11,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/solid-js": "^3.0.0", - "astro": "^3.0.10", + "@astrojs/solid-js": "^3.0.1", + "astro": "^3.0.11", "solid-js": "^1.7.11" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index f7104d2fc11e..72d1ad50f4d2 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -11,8 +11,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/svelte": "^4.0.1", - "astro": "^3.0.10", + "@astrojs/svelte": "^4.0.2", + "astro": "^3.0.11", "svelte": "^4.2.0" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index f92608783d7a..54d5954a4d93 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^3.0.0", - "astro": "^3.0.10", + "astro": "^3.0.11", "vue": "^3.3.4" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 2ebf73fdc5da..2665f5c2d488 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^6.0.0", - "astro": "^3.0.10" + "astro": "^3.0.11" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 5ec161e24ec3..b21c34403b56 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.0.10" + "astro": "^3.0.11" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index 79571c378e39..0cbe2a82d9b7 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^6.0.0", - "astro": "^3.0.10", + "astro": "^3.0.11", "html-minifier": "^4.0.0" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index b8e75bb6c42e..906ffba8f268 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.10" + "astro": "^3.0.11" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 7e796a00fe68..fa80a00b5b33 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.10" + "astro": "^3.0.11" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 43c0678cfc6d..e3950d46d5a0 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.10" + "astro": "^3.0.11" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 3fc520d83a2f..d196aa34fe65 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -13,8 +13,8 @@ }, "dependencies": { "@astrojs/node": "^6.0.0", - "@astrojs/svelte": "^4.0.1", - "astro": "^3.0.10", + "@astrojs/svelte": "^4.0.2", + "astro": "^3.0.11", "svelte": "^4.2.0" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 91549f22f20d..15186ccf6693 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.5.0", - "astro": "^3.0.10" + "astro": "^3.0.11" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index b26e87e27505..b4e783b605a1 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -11,8 +11,8 @@ "astro": "astro" }, "dependencies": { - "@astrojs/markdown-remark": "^3.0.0", - "astro": "^3.0.10", + "@astrojs/markdown-remark": "^3.1.0", + "astro": "^3.0.11", "hast-util-select": "^5.0.5", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.1.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 04fda8dcf274..0c8a6d40736d 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.10" + "astro": "^3.0.11" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 20f48cfcc8ad..5f908a53a674 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -11,9 +11,9 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^1.0.2", + "@astrojs/mdx": "^1.0.3", "@astrojs/preact": "^3.0.0", - "astro": "^3.0.10", + "astro": "^3.0.11", "preact": "^10.17.1" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 6f976aa7886f..ccf2b05df81f 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.0", "@nanostores/preact": "^0.5.0", - "astro": "^3.0.10", + "astro": "^3.0.11", "nanostores": "^0.9.3", "preact": "^10.17.1" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index b0f816abaa35..dd56620b78b7 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -11,10 +11,10 @@ "astro": "astro" }, "dependencies": { - "@astrojs/mdx": "^1.0.2", + "@astrojs/mdx": "^1.0.3", "@astrojs/tailwind": "^5.0.0", "@types/canvas-confetti": "^1.6.0", - "astro": "^3.0.10", + "astro": "^3.0.11", "autoprefixer": "^10.4.15", "canvas-confetti": "^1.6.0", "postcss": "^8.4.28", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 944c4dcbd4a3..99a78a6c3c9c 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.10", + "astro": "^3.0.11", "vite-plugin-pwa": "0.16.4", "workbox-window": "^7.0.0" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 2a24e8865145..21df37531e2d 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^3.0.10", + "astro": "^3.0.11", "vitest": "^0.34.2" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 5cb03114ecb8..b59f43bb721e 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,16 @@ # astro +## 3.0.11 + +### Patch Changes + +- [#8441](https://github.com/withastro/astro/pull/8441) [`f66053a1e`](https://github.com/withastro/astro/commit/f66053a1ea0a4e3bdb0b0df12bb1bf56e1ea2618) Thanks [@martrapp](https://github.com/martrapp)! - Only transition between pages where both have ViewTransitions enabled + +- [#8443](https://github.com/withastro/astro/pull/8443) [`0fa483283`](https://github.com/withastro/astro/commit/0fa483283e54c94f173838cd558dc0dbdd11e699) Thanks [@the-dijkstra](https://github.com/the-dijkstra)! - Fix "Cannot read properties of null" error in CLI code + +- Updated dependencies [[`f3f62a5a2`](https://github.com/withastro/astro/commit/f3f62a5a20f4881bb04f65f192df8e1ccf7fb601)]: + - @astrojs/markdown-remark@3.1.0 + ## 3.0.10 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 7db6c2767649..b50874d24dc7 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "3.0.10", + "version": "3.0.11", "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/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 6d231a3e6727..08df4acc3f29 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -45,7 +45,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^3.0.10" + "astro": "workspace:^3.0.11" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 843ac65ddc64..c5aae2fd423d 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -36,7 +36,7 @@ "esbuild": "^0.19.2" }, "peerDependencies": { - "astro": "workspace:^3.0.10" + "astro": "workspace:^3.0.11" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index 513c126115e0..76e836d84879 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -75,7 +75,7 @@ "zod": "3.21.1" }, "peerDependencies": { - "astro": "workspace:^3.0.10" + "astro": "workspace:^3.0.11" }, "devDependencies": { "@astrojs/markdown-remark": "workspace:*", diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md index 61144df435a9..ff9317c65b45 100644 --- a/packages/integrations/mdx/CHANGELOG.md +++ b/packages/integrations/mdx/CHANGELOG.md @@ -1,5 +1,15 @@ # @astrojs/mdx +## 1.0.3 + +### Patch Changes + +- [#8430](https://github.com/withastro/astro/pull/8430) [`f3f62a5a2`](https://github.com/withastro/astro/commit/f3f62a5a20f4881bb04f65f192df8e1ccf7fb601) Thanks [@bluwy](https://github.com/bluwy)! - Use exported remarkShiki and remarkPrism plugins from `@astrojs/markdown-remark` + +- Updated dependencies [[`f3f62a5a2`](https://github.com/withastro/astro/commit/f3f62a5a20f4881bb04f65f192df8e1ccf7fb601), [`f66053a1e`](https://github.com/withastro/astro/commit/f66053a1ea0a4e3bdb0b0df12bb1bf56e1ea2618), [`0fa483283`](https://github.com/withastro/astro/commit/0fa483283e54c94f173838cd558dc0dbdd11e699)]: + - @astrojs/markdown-remark@3.1.0 + - astro@3.0.11 + ## 1.0.2 ### Patch Changes diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index 5d9296f1ff4f..b3b3b71eb516 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/mdx", "description": "Add support for MDX pages in your Astro site", - "version": "1.0.2", + "version": "1.0.3", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -51,7 +51,7 @@ "vfile": "^5.3.7" }, "peerDependencies": { - "astro": "workspace:^3.0.10" + "astro": "workspace:^3.0.11" }, "devDependencies": { "@types/chai": "^4.3.5", diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index a4b5479299e5..af6a1f1ffd78 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -43,7 +43,7 @@ "esbuild": "^0.19.2" }, "peerDependencies": { - "astro": "workspace:^3.0.10" + "astro": "workspace:^3.0.11" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 22a795d1a515..8bade329465f 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -37,7 +37,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^3.0.10" + "astro": "workspace:^3.0.11" }, "devDependencies": { "@types/node": "^18.17.8", diff --git a/packages/integrations/react/CHANGELOG.md b/packages/integrations/react/CHANGELOG.md index cdd827987049..b304c6e77e0d 100644 --- a/packages/integrations/react/CHANGELOG.md +++ b/packages/integrations/react/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/react +## 3.0.2 + +### Patch Changes + +- [#8455](https://github.com/withastro/astro/pull/8455) [`85fe213fe`](https://github.com/withastro/astro/commit/85fe213fe0e8de3227ac80a41119800c374214f6) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Update `experimentalReactChildren` behavior to support void tags + ## 3.0.1 ### Patch Changes diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json index d74e97465592..8eabf545d458 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": "3.0.1", + "version": "3.0.2", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/solid/CHANGELOG.md b/packages/integrations/solid/CHANGELOG.md index 637816e38d26..0605898b6b7f 100644 --- a/packages/integrations/solid/CHANGELOG.md +++ b/packages/integrations/solid/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/solid-js +## 3.0.1 + +### Patch Changes + +- [#8365](https://github.com/withastro/astro/pull/8365) [`a525d5db1`](https://github.com/withastro/astro/commit/a525d5db1746ea6b79fced2a967b82c778320dbf) Thanks [@ryansolid](https://github.com/ryansolid)! - Fix hydration in Solid renderer + ## 3.0.0 ### Major Changes diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index 7dc79048e162..5fd37d31d3d3 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/solid-js", - "version": "3.0.0", + "version": "3.0.1", "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 12f1e38a6302..521cf21f67f3 100644 --- a/packages/integrations/svelte/CHANGELOG.md +++ b/packages/integrations/svelte/CHANGELOG.md @@ -1,5 +1,14 @@ # @astrojs/svelte +## 4.0.2 + +### Patch Changes + +- [#8448](https://github.com/withastro/astro/pull/8448) [`3f49aa97a`](https://github.com/withastro/astro/commit/3f49aa97ab8fb4bffe50da993cae0f0027c7692d) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Fix potential memory leak when component is unmounted + +- Updated dependencies [[`f66053a1e`](https://github.com/withastro/astro/commit/f66053a1ea0a4e3bdb0b0df12bb1bf56e1ea2618), [`0fa483283`](https://github.com/withastro/astro/commit/0fa483283e54c94f173838cd558dc0dbdd11e699)]: + - astro@3.0.11 + ## 4.0.1 ### Patch Changes diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 814bad39ddce..91fcf6f2017e 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/svelte", - "version": "4.0.1", + "version": "4.0.2", "description": "Use Svelte components within Astro", "type": "module", "types": "./dist/index.d.ts", @@ -48,7 +48,7 @@ "vite": "^4.4.9" }, "peerDependencies": { - "astro": "workspace:^3.0.10", + "astro": "workspace:^3.0.11", "svelte": "^3.55.0 || ^4.0.0" }, "engines": { diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index 3f88e6f6fcb8..ac971578e0fb 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -43,7 +43,7 @@ "vite": "^4.4.9" }, "peerDependencies": { - "astro": "workspace:^3.0.10", + "astro": "workspace:^3.0.11", "tailwindcss": "^3.0.24" } } diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md index 0906aa23dd44..b720696c8293 100644 --- a/packages/integrations/vercel/CHANGELOG.md +++ b/packages/integrations/vercel/CHANGELOG.md @@ -1,5 +1,14 @@ # @astrojs/vercel +## 4.0.5 + +### Patch Changes + +- [#8452](https://github.com/withastro/astro/pull/8452) [`7ea32c7fb`](https://github.com/withastro/astro/commit/7ea32c7fbf4fc74a3c0fa7319561243c4e262e99) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix Astro's `domains` and `remotePatterns` not being used by Vercel when using Vercel Image Optimization + +- Updated dependencies [[`f66053a1e`](https://github.com/withastro/astro/commit/f66053a1ea0a4e3bdb0b0df12bb1bf56e1ea2618), [`0fa483283`](https://github.com/withastro/astro/commit/0fa483283e54c94f173838cd558dc0dbdd11e699)]: + - astro@3.0.11 + ## 4.0.4 ### Patch Changes diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 47270df95f79..6cb7bfdce0b8 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": "4.0.4", + "version": "4.0.5", "type": "module", "author": "withastro", "license": "MIT", @@ -60,7 +60,7 @@ "web-vitals": "^3.4.0" }, "peerDependencies": { - "astro": "workspace:^3.0.10" + "astro": "workspace:^3.0.11" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.3", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index 276d019d25e5..80507269ca1b 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -56,7 +56,7 @@ "vue": "^3.3.4" }, "peerDependencies": { - "astro": "workspace:^3.0.10", + "astro": "workspace:^3.0.11", "vue": "^3.2.30" }, "engines": { diff --git a/packages/markdown/remark/CHANGELOG.md b/packages/markdown/remark/CHANGELOG.md index 73b618321e6f..13d1b95bb4c0 100644 --- a/packages/markdown/remark/CHANGELOG.md +++ b/packages/markdown/remark/CHANGELOG.md @@ -1,5 +1,16 @@ # @astrojs/markdown-remark +## 3.1.0 + +### Minor Changes + +- [#8430](https://github.com/withastro/astro/pull/8430) [`f3f62a5a2`](https://github.com/withastro/astro/commit/f3f62a5a20f4881bb04f65f192df8e1ccf7fb601) Thanks [@bluwy](https://github.com/bluwy)! - Export remarkShiki and remarkPrism plugins + +### Patch Changes + +- Updated dependencies [[`f66053a1e`](https://github.com/withastro/astro/commit/f66053a1ea0a4e3bdb0b0df12bb1bf56e1ea2618), [`0fa483283`](https://github.com/withastro/astro/commit/0fa483283e54c94f173838cd558dc0dbdd11e699)]: + - astro@3.0.11 + ## 3.0.0 ### Major Changes diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json index 2def0c9792a9..8710cce0854f 100644 --- a/packages/markdown/remark/package.json +++ b/packages/markdown/remark/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/markdown-remark", - "version": "3.0.0", + "version": "3.1.0", "type": "module", "author": "withastro", "license": "MIT", @@ -28,7 +28,7 @@ "test": "mocha --exit --timeout 20000" }, "peerDependencies": { - "astro": "workspace:^3.0.0" + "astro": "workspace:^3.0.11" }, "dependencies": { "@astrojs/prism": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 605f793ec119..faf79d75881c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,13 +125,13 @@ importers: examples/basics: dependencies: astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro examples/blog: dependencies: '@astrojs/mdx': - specifier: ^1.0.2 + specifier: ^1.0.3 version: link:../../packages/integrations/mdx '@astrojs/rss': specifier: ^3.0.0 @@ -140,19 +140,19 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/sitemap astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro examples/deno: dependencies: astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro devDependencies: '@astrojs/deno': @@ -171,7 +171,7 @@ importers: specifier: ^3.12.3 version: 3.12.3 astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro examples/framework-lit: @@ -183,7 +183,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro lit: specifier: ^2.8.0 @@ -195,19 +195,19 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/preact '@astrojs/react': - specifier: ^3.0.1 + specifier: ^3.0.2 version: link:../../packages/integrations/react '@astrojs/solid-js': - specifier: ^3.0.0 + specifier: ^3.0.1 version: link:../../packages/integrations/solid '@astrojs/svelte': - specifier: ^4.0.1 + specifier: ^4.0.2 version: link:../../packages/integrations/svelte '@astrojs/vue': specifier: ^3.0.0 version: link:../../packages/integrations/vue astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -237,7 +237,7 @@ importers: specifier: ^1.2.1 version: 1.2.1(preact@10.17.1) astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -246,7 +246,7 @@ importers: examples/framework-react: dependencies: '@astrojs/react': - specifier: ^3.0.1 + specifier: ^3.0.2 version: link:../../packages/integrations/react '@types/react': specifier: ^18.2.21 @@ -255,7 +255,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -267,10 +267,10 @@ importers: examples/framework-solid: dependencies: '@astrojs/solid-js': - specifier: ^3.0.0 + specifier: ^3.0.1 version: link:../../packages/integrations/solid astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro solid-js: specifier: ^1.7.11 @@ -279,10 +279,10 @@ importers: examples/framework-svelte: dependencies: '@astrojs/svelte': - specifier: ^4.0.1 + specifier: ^4.0.2 version: link:../../packages/integrations/svelte astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -294,7 +294,7 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/vue astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro vue: specifier: ^3.3.4 @@ -306,13 +306,13 @@ importers: specifier: ^6.0.0 version: link:../../packages/integrations/node astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro examples/middleware: @@ -321,7 +321,7 @@ importers: specifier: ^6.0.0 version: link:../../packages/integrations/node astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -330,19 +330,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro examples/ssr: @@ -351,10 +351,10 @@ importers: specifier: ^6.0.0 version: link:../../packages/integrations/node '@astrojs/svelte': - specifier: ^4.0.1 + specifier: ^4.0.2 version: link:../../packages/integrations/svelte astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -366,16 +366,16 @@ importers: specifier: ^0.5.0 version: link:../../packages/integrations/markdoc astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro examples/with-markdown-plugins: dependencies: '@astrojs/markdown-remark': - specifier: ^3.0.0 + specifier: ^3.1.0 version: link:../../packages/markdown/remark astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro hast-util-select: specifier: ^5.0.5 @@ -396,19 +396,19 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro examples/with-mdx: dependencies: '@astrojs/mdx': - specifier: ^1.0.2 + specifier: ^1.0.3 version: link:../../packages/integrations/mdx '@astrojs/preact': specifier: ^3.0.0 version: link:../../packages/integrations/preact astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -423,7 +423,7 @@ importers: specifier: ^0.5.0 version: 0.5.0(nanostores@0.9.3)(preact@10.17.1) astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro nanostores: specifier: ^0.9.3 @@ -435,7 +435,7 @@ importers: examples/with-tailwindcss: dependencies: '@astrojs/mdx': - specifier: ^1.0.2 + specifier: ^1.0.3 version: link:../../packages/integrations/mdx '@astrojs/tailwind': specifier: ^5.0.0 @@ -444,7 +444,7 @@ importers: specifier: ^1.6.0 version: 1.6.0 astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro autoprefixer: specifier: ^10.4.15 @@ -462,7 +462,7 @@ importers: examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.16.4 @@ -474,7 +474,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^3.0.10 + specifier: ^3.0.11 version: link:../../packages/astro vitest: specifier: ^0.34.2 From 50c0a803e37f89d83856c5b294abf1f0f9a16bd3 Mon Sep 17 00:00:00 2001 From: Erika <3019731+Princesseuh@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:58:37 +0200 Subject: [PATCH 2/5] refactor: move type utils into a single file (#8462) --- packages/astro/client.d.ts | 8 +++---- packages/astro/src/@types/astro.ts | 9 +------- packages/astro/src/assets/types.ts | 2 +- .../astro/src/runtime/server/serialize.ts | 3 +-- packages/astro/src/type-utils.ts | 21 +++++++++++++++++++ 5 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 packages/astro/src/type-utils.ts diff --git a/packages/astro/client.d.ts b/packages/astro/client.d.ts index 5d1cf745b0ab..90f06c72d067 100644 --- a/packages/astro/client.d.ts +++ b/packages/astro/client.d.ts @@ -57,17 +57,15 @@ declare module 'astro:assets' { Image: typeof import('./components/Image.astro').default; }; - type WithRequired = T & { [P in K]-?: T[P] }; - type Simplify = { [KeyType in keyof T]: T[KeyType] } & {}; - type ImgAttributes = WithRequired< + type ImgAttributes = import('./dist/type-utils.js').WithRequired< Omit, 'src' | 'width' | 'height'>, 'alt' >; - export type LocalImageProps = Simplify< + export type LocalImageProps = import('./dist/type-utils.js').Simplify< import('./dist/assets/types.js').LocalImageProps >; - export type RemoteImageProps = Simplify< + export type RemoteImageProps = import('./dist/type-utils.js').Simplify< import('./dist/assets/types.js').RemoteImageProps >; export const { getImage, getConfiguredImageService, imageConfig, Image }: AstroAssets; diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts index 73b652db696a..e99077d350fe 100644 --- a/packages/astro/src/@types/astro.ts +++ b/packages/astro/src/@types/astro.ts @@ -22,6 +22,7 @@ import type { AstroCookies } from '../core/cookies'; import type { ResponseWithEncoding } from '../core/endpoint/index.js'; import type { AstroIntegrationLogger, Logger, LoggerLevel } from '../core/logger/core'; import type { AstroComponentFactory, AstroComponentInstance } from '../runtime/server'; +import type { OmitIndexSignature, Simplify } from '../type-utils'; import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './../core/constants.js'; export { type AstroIntegrationLogger }; @@ -1725,14 +1726,6 @@ export interface Page { }; } -type OmitIndexSignature = { - // eslint-disable-next-line @typescript-eslint/ban-types - [KeyType in keyof ObjectType as {} extends Record - ? never - : KeyType]: ObjectType[KeyType]; -}; -// eslint-disable-next-line @typescript-eslint/ban-types -type Simplify = { [KeyType in keyof T]: T[KeyType] } & {}; export type PaginateFunction = < PaginateData, AdditionalPaginateProps extends Props, diff --git a/packages/astro/src/assets/types.ts b/packages/astro/src/assets/types.ts index ae74fc692a75..0bf740d573bc 100644 --- a/packages/astro/src/assets/types.ts +++ b/packages/astro/src/assets/types.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/ban-types */ +import type { WithRequired } from '../type-utils.js'; import type { VALID_INPUT_FORMATS, VALID_OUTPUT_FORMATS } from './consts.js'; import type { ImageService } from './services/service.js'; @@ -50,7 +51,6 @@ export interface GetImageResult { attributes: Record; } -type WithRequired = T & { [P in K]-?: T[P] }; type ImageSharedProps = T & { /** * Width of the image, the value of this property will be used to assign the `width` property on the final `img` element. diff --git a/packages/astro/src/runtime/server/serialize.ts b/packages/astro/src/runtime/server/serialize.ts index 479552260573..b52c9e2156d9 100644 --- a/packages/astro/src/runtime/server/serialize.ts +++ b/packages/astro/src/runtime/server/serialize.ts @@ -1,6 +1,5 @@ import type { AstroComponentMetadata } from '../../@types/astro'; - -type ValueOf = T[keyof T]; +import type { ValueOf } from '../../type-utils'; const PROP_TYPE = { Value: 0, diff --git a/packages/astro/src/type-utils.ts b/packages/astro/src/type-utils.ts new file mode 100644 index 000000000000..926b0349d5c9 --- /dev/null +++ b/packages/astro/src/type-utils.ts @@ -0,0 +1,21 @@ +/* eslint-disable @typescript-eslint/ban-types */ +// Q: Why is this not in @types? +// A: `@types` is for types that are part of the public API. This is just a bunch of utilities we use throughout the codebase. (Mostly by Erika) + +// Merge all the intersection of a type into one type. This is useful for making tooltips better in the editor for complex types +// Ex: The Image component props are a merge of all the properties that can be on an `img` tag and our props, in the editor +// this results in a very opaque type that just says `ImgAttributes & ImageComponentProps`. With this, all the props shows. +export type Simplify = { [KeyType in keyof T]: T[KeyType] } & {}; + +// Mark certain properties of a type as required. Think of it like "This type, with those specific properties required" +export type WithRequired = T & { [P in K]-?: T[P] }; + +// Name is pretty self descriptive, but it removes the index signature of an object +export type OmitIndexSignature = { + [KeyType in keyof ObjectType as {} extends Record + ? never + : KeyType]: ObjectType[KeyType]; +}; + +// Similar to `keyof`, gets the type of all the values of an object +export type ValueOf = T[keyof T]; From 7eea37a075c6abb1de715de76d1911ff41e8ab13 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Fri, 8 Sep 2023 22:00:07 +0800 Subject: [PATCH 3/5] Fix multi-layout head injection (#8449) * Fix multi-layout head injection * Tracing fix * Improved walk * Upgrade the compiler version --------- Co-authored-by: Nate Moore --- .changeset/orange-cheetahs-happen.md | 5 ++++ packages/astro/package.json | 2 +- packages/astro/src/vite-plugin-astro/index.ts | 2 +- packages/astro/src/vite-plugin-head/index.ts | 28 ++++++++++++++++--- .../test/units/dev/head-injection.test.js | 25 ++++++++++++----- pnpm-lock.yaml | 8 +++--- 6 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 .changeset/orange-cheetahs-happen.md diff --git a/.changeset/orange-cheetahs-happen.md b/.changeset/orange-cheetahs-happen.md new file mode 100644 index 000000000000..2a0ff291b8b5 --- /dev/null +++ b/.changeset/orange-cheetahs-happen.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fix multi-layout head injection diff --git a/packages/astro/package.json b/packages/astro/package.json index b50874d24dc7..6eb2e6643239 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -119,7 +119,7 @@ "test:e2e:match": "playwright test -g" }, "dependencies": { - "@astrojs/compiler": "^2.0.1", + "@astrojs/compiler": "^2.1.0", "@astrojs/internal-helpers": "workspace:*", "@astrojs/markdown-remark": "workspace:*", "@astrojs/telemetry": "workspace:*", diff --git a/packages/astro/src/vite-plugin-astro/index.ts b/packages/astro/src/vite-plugin-astro/index.ts index 371ae9657d17..abeade65e2dd 100644 --- a/packages/astro/src/vite-plugin-astro/index.ts +++ b/packages/astro/src/vite-plugin-astro/index.ts @@ -154,7 +154,7 @@ export default function astro({ settings, logger }: AstroPluginOptions): vite.Pl hydratedComponents: transformResult.hydratedComponents, scripts: transformResult.scripts, containsHead: transformResult.containsHead, - propagation: 'none', + propagation: transformResult.propagation ? 'self' : 'none', pageOptions: {}, }; diff --git a/packages/astro/src/vite-plugin-head/index.ts b/packages/astro/src/vite-plugin-head/index.ts index ca95a334e2a2..ae49e7401c73 100644 --- a/packages/astro/src/vite-plugin-head/index.ts +++ b/packages/astro/src/vite-plugin-head/index.ts @@ -58,6 +58,15 @@ export default function configHeadVitePlugin(): vite.Plugin { propagateMetadata.call(this, id, 'containsHead', true); } + if(info && getAstroMetadata(info)?.propagation === 'self') { + const mod = server.moduleGraph.getModuleById(id); + for (const parent of mod?.importers ?? []) { + if(parent.id) { + propagateMetadata.call(this, parent.id, 'propagation', 'in-tree'); + } + } + } + if (injectExp.test(source)) { propagateMetadata.call(this, id, 'propagation', 'in-tree'); } @@ -91,10 +100,21 @@ export function astroHeadBuildPlugin(internals: BuildInternals): AstroBuildPlugi const modinfo = this.getModuleInfo(id); // tag in the tree - if (modinfo && getAstroMetadata(modinfo)?.containsHead) { - for (const [pageInfo] of getTopLevelPages(id, this)) { - let metadata = getOrCreateMetadata(pageInfo.id); - metadata.containsHead = true; + if(modinfo) { + const meta = getAstroMetadata(modinfo); + if(meta?.containsHead) { + for (const [pageInfo] of getTopLevelPages(id, this)) { + let metadata = getOrCreateMetadata(pageInfo.id); + metadata.containsHead = true; + } + } + if(meta?.propagation === 'self') { + for (const [info] of walkParentInfos(id, this)) { + let metadata = getOrCreateMetadata(info.id); + if(metadata.propagation !== 'self') { + metadata.propagation = 'in-tree'; + } + } } } diff --git a/packages/astro/test/units/dev/head-injection.test.js b/packages/astro/test/units/dev/head-injection.test.js index 566e7ab48c06..967ad87255e9 100644 --- a/packages/astro/test/units/dev/head-injection.test.js +++ b/packages/astro/test/units/dev/head-injection.test.js @@ -123,27 +123,38 @@ describe('head injection', () => { }); } `.trim(), + '/src/components/Content.astro': ` + --- + import { renderEntry } from '../common/head.js'; + const ExtraHead = renderEntry(); + --- + + `, + '/src/components/Inner.astro': ` + --- + import Content from './Content.astro'; + --- + + `, '/src/components/Layout.astro': ` - --- - import { renderEntry } from '../common/head.js'; - const ExtraHead = renderEntry(); - --- Normal head stuff - + `, '/src/pages/index.astro': ` --- import Layout from '../components/Layout.astro'; + import Inner from '../components/Inner.astro'; ---

Test page

+ `, }, @@ -168,8 +179,8 @@ describe('head injection', () => { const html = await text(); const $ = cheerio.load(html); - expect($('link[rel=stylesheet][href="/some/fake/styles.css"]')).to.have.a.lengthOf(1); - expect($('#other')).to.have.a.lengthOf(1); + expect($('link[rel=stylesheet][href="/some/fake/styles.css"]')).to.have.a.lengthOf(1, 'found inner link'); + expect($('#other')).to.have.a.lengthOf(1, 'Found the #other div'); } ); }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index faf79d75881c..970dba5633be 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -483,8 +483,8 @@ importers: packages/astro: dependencies: '@astrojs/compiler': - specifier: ^2.0.1 - version: 2.0.1 + specifier: ^2.1.0 + version: 2.1.0 '@astrojs/internal-helpers': specifier: workspace:* version: link:../internal-helpers @@ -5180,8 +5180,8 @@ packages: resolution: {integrity: sha512-o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw==} dev: true - /@astrojs/compiler@2.0.1: - resolution: {integrity: sha512-DfBR7Cf+tOgQ4n7TIgTtU5x5SEA/08DNshpEPcT+91A0KbBlmUOYMBM/O6qAaHkmVo1KIoXQYhAmfdTT1zx9PQ==} + /@astrojs/compiler@2.1.0: + resolution: {integrity: sha512-Mp+qrNhly+27bL/Zq8lGeUY+YrdoU0eDfIlAeGIPrzt0PnI/jGpvPUdCaugv4zbCrDkOUScFfcbeEiYumrdJnw==} dev: false /@astrojs/language-server@2.3.0(prettier-plugin-astro@0.12.0)(prettier@3.0.3)(typescript@5.1.6): From b65e84d888cf0821c6125190927fdbf4945b1769 Mon Sep 17 00:00:00 2001 From: matthewp Date: Fri, 8 Sep 2023 14:02:12 +0000 Subject: [PATCH 4/5] [ci] format --- packages/astro/src/vite-plugin-head/index.ts | 12 ++++++------ packages/astro/test/units/dev/head-injection.test.js | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/astro/src/vite-plugin-head/index.ts b/packages/astro/src/vite-plugin-head/index.ts index ae49e7401c73..9b0a7fb55929 100644 --- a/packages/astro/src/vite-plugin-head/index.ts +++ b/packages/astro/src/vite-plugin-head/index.ts @@ -58,10 +58,10 @@ export default function configHeadVitePlugin(): vite.Plugin { propagateMetadata.call(this, id, 'containsHead', true); } - if(info && getAstroMetadata(info)?.propagation === 'self') { + if (info && getAstroMetadata(info)?.propagation === 'self') { const mod = server.moduleGraph.getModuleById(id); for (const parent of mod?.importers ?? []) { - if(parent.id) { + if (parent.id) { propagateMetadata.call(this, parent.id, 'propagation', 'in-tree'); } } @@ -100,18 +100,18 @@ export function astroHeadBuildPlugin(internals: BuildInternals): AstroBuildPlugi const modinfo = this.getModuleInfo(id); // tag in the tree - if(modinfo) { + if (modinfo) { const meta = getAstroMetadata(modinfo); - if(meta?.containsHead) { + if (meta?.containsHead) { for (const [pageInfo] of getTopLevelPages(id, this)) { let metadata = getOrCreateMetadata(pageInfo.id); metadata.containsHead = true; } } - if(meta?.propagation === 'self') { + if (meta?.propagation === 'self') { for (const [info] of walkParentInfos(id, this)) { let metadata = getOrCreateMetadata(info.id); - if(metadata.propagation !== 'self') { + if (metadata.propagation !== 'self') { metadata.propagation = 'in-tree'; } } diff --git a/packages/astro/test/units/dev/head-injection.test.js b/packages/astro/test/units/dev/head-injection.test.js index 967ad87255e9..9b38feae6267 100644 --- a/packages/astro/test/units/dev/head-injection.test.js +++ b/packages/astro/test/units/dev/head-injection.test.js @@ -179,7 +179,10 @@ describe('head injection', () => { const html = await text(); const $ = cheerio.load(html); - expect($('link[rel=stylesheet][href="/some/fake/styles.css"]')).to.have.a.lengthOf(1, 'found inner link'); + expect($('link[rel=stylesheet][href="/some/fake/styles.css"]')).to.have.a.lengthOf( + 1, + 'found inner link' + ); expect($('#other')).to.have.a.lengthOf(1, 'Found the #other div'); } ); From 0a2567c288bc2a3ccc92afd643944c9a4e6d604b Mon Sep 17 00:00:00 2001 From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com> Date: Fri, 8 Sep 2023 07:08:35 -0700 Subject: [PATCH 5/5] [ci] release (#8465) Co-authored-by: github-actions[bot] --- .changeset/orange-cheetahs-happen.md | 5 -- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/deno/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/hackernews/package.json | 2 +- examples/integration/package.json | 2 +- examples/middleware/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/with-markdoc/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 | 6 +++ packages/astro/package.json | 2 +- packages/integrations/cloudflare/package.json | 2 +- packages/integrations/deno/package.json | 2 +- packages/integrations/markdoc/package.json | 2 +- packages/integrations/mdx/package.json | 2 +- packages/integrations/netlify/package.json | 2 +- packages/integrations/node/package.json | 2 +- packages/integrations/svelte/package.json | 2 +- packages/integrations/tailwind/package.json | 2 +- packages/integrations/vercel/package.json | 2 +- packages/integrations/vue/package.json | 2 +- pnpm-lock.yaml | 54 +++++++++---------- 41 files changed, 71 insertions(+), 70 deletions(-) delete mode 100644 .changeset/orange-cheetahs-happen.md diff --git a/.changeset/orange-cheetahs-happen.md b/.changeset/orange-cheetahs-happen.md deleted file mode 100644 index 2a0ff291b8b5..000000000000 --- a/.changeset/orange-cheetahs-happen.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Fix multi-layout head injection diff --git a/examples/basics/package.json b/examples/basics/package.json index 9971c85e6696..d3f7c6b75ec0 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.11" + "astro": "^3.0.12" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index cf2c9836847b..1ce63f5b788f 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -14,6 +14,6 @@ "@astrojs/mdx": "^1.0.3", "@astrojs/rss": "^3.0.0", "@astrojs/sitemap": "^3.0.0", - "astro": "^3.0.11" + "astro": "^3.0.12" } } diff --git a/examples/component/package.json b/examples/component/package.json index 97f34feaaae9..1bc40f01eb4d 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.0.11" + "astro": "^3.0.12" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/deno/package.json b/examples/deno/package.json index ed59e5fce2d7..ea81225796f4 100644 --- a/examples/deno/package.json +++ b/examples/deno/package.json @@ -10,7 +10,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.11" + "astro": "^3.0.12" }, "devDependencies": { "@astrojs/deno": "^5.0.0" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 88e888ea4e84..bcdba561c33f 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -14,6 +14,6 @@ "@astrojs/alpinejs": "^0.3.0", "@types/alpinejs": "^3.7.2", "alpinejs": "^3.12.3", - "astro": "^3.0.11" + "astro": "^3.0.12" } } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index fa0fecccd2d1..c8f18413140f 100644 --- a/examples/framework-lit/package.json +++ b/examples/framework-lit/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/lit": "^3.0.0", "@webcomponents/template-shadowroot": "^0.2.1", - "astro": "^3.0.11", + "astro": "^3.0.12", "lit": "^2.8.0" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 916b5abd7d80..0f8905159c8b 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -16,7 +16,7 @@ "@astrojs/solid-js": "^3.0.1", "@astrojs/svelte": "^4.0.2", "@astrojs/vue": "^3.0.0", - "astro": "^3.0.11", + "astro": "^3.0.12", "preact": "^10.17.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index da56557f41f1..fdc06847a963 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.0", "@preact/signals": "^1.2.1", - "astro": "^3.0.11", + "astro": "^3.0.12", "preact": "^10.17.1" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 0a059fd4330d..997d69646935 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -14,7 +14,7 @@ "@astrojs/react": "^3.0.2", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", - "astro": "^3.0.11", + "astro": "^3.0.12", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index cd744d916b30..36e41d672b05 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/solid-js": "^3.0.1", - "astro": "^3.0.11", + "astro": "^3.0.12", "solid-js": "^1.7.11" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 72d1ad50f4d2..46937ad43860 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/svelte": "^4.0.2", - "astro": "^3.0.11", + "astro": "^3.0.12", "svelte": "^4.2.0" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 54d5954a4d93..e24bcdad3a0f 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/vue": "^3.0.0", - "astro": "^3.0.11", + "astro": "^3.0.12", "vue": "^3.3.4" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 2665f5c2d488..c089ca0f7cce 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/node": "^6.0.0", - "astro": "^3.0.11" + "astro": "^3.0.12" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index b21c34403b56..30e91060a83a 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^3.0.11" + "astro": "^3.0.12" }, "peerDependencies": { "astro": "^2.0.0-beta.0" diff --git a/examples/middleware/package.json b/examples/middleware/package.json index 0cbe2a82d9b7..853b33a71ce5 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@astrojs/node": "^6.0.0", - "astro": "^3.0.11", + "astro": "^3.0.12", "html-minifier": "^4.0.0" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 906ffba8f268..8bfc5c2b587f 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.11" + "astro": "^3.0.12" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index fa80a00b5b33..be1e1267212f 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.11" + "astro": "^3.0.12" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index e3950d46d5a0..a1ac1e58d0f0 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.11" + "astro": "^3.0.12" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index d196aa34fe65..3913a580d2b0 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -14,7 +14,7 @@ "dependencies": { "@astrojs/node": "^6.0.0", "@astrojs/svelte": "^4.0.2", - "astro": "^3.0.11", + "astro": "^3.0.12", "svelte": "^4.2.0" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index 15186ccf6693..494b73978f79 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.5.0", - "astro": "^3.0.11" + "astro": "^3.0.12" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index b4e783b605a1..1178116646aa 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/markdown-remark": "^3.1.0", - "astro": "^3.0.11", + "astro": "^3.0.12", "hast-util-select": "^5.0.5", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.1.0", diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json index 0c8a6d40736d..51e1bf968ff1 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -11,6 +11,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.11" + "astro": "^3.0.12" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 5f908a53a674..0d1557720bab 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/mdx": "^1.0.3", "@astrojs/preact": "^3.0.0", - "astro": "^3.0.11", + "astro": "^3.0.12", "preact": "^10.17.1" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index ccf2b05df81f..e3156bef851e 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/preact": "^3.0.0", "@nanostores/preact": "^0.5.0", - "astro": "^3.0.11", + "astro": "^3.0.12", "nanostores": "^0.9.3", "preact": "^10.17.1" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index dd56620b78b7..40a85f4fc2d5 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -14,7 +14,7 @@ "@astrojs/mdx": "^1.0.3", "@astrojs/tailwind": "^5.0.0", "@types/canvas-confetti": "^1.6.0", - "astro": "^3.0.11", + "astro": "^3.0.12", "autoprefixer": "^10.4.15", "canvas-confetti": "^1.6.0", "postcss": "^8.4.28", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index 99a78a6c3c9c..fa0b6cde6897 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -11,7 +11,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^3.0.11", + "astro": "^3.0.12", "vite-plugin-pwa": "0.16.4", "workbox-window": "^7.0.0" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 21df37531e2d..9f08447933fe 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^3.0.11", + "astro": "^3.0.12", "vitest": "^0.34.2" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index b59f43bb721e..d737825bfd1d 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,11 @@ # astro +## 3.0.12 + +### Patch Changes + +- [#8449](https://github.com/withastro/astro/pull/8449) [`7eea37a07`](https://github.com/withastro/astro/commit/7eea37a075c6abb1de715de76d1911ff41e8ab13) Thanks [@matthewp](https://github.com/matthewp)! - Fix multi-layout head injection + ## 3.0.11 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 6eb2e6643239..34e3b7aa9caf 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "3.0.11", + "version": "3.0.12", "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/cloudflare/package.json b/packages/integrations/cloudflare/package.json index 08df4acc3f29..e00078a65835 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -45,7 +45,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^3.0.11" + "astro": "workspace:^3.0.12" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index c5aae2fd423d..d958d2e46621 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -36,7 +36,7 @@ "esbuild": "^0.19.2" }, "peerDependencies": { - "astro": "workspace:^3.0.11" + "astro": "workspace:^3.0.12" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index 76e836d84879..ec01e6efb75e 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -75,7 +75,7 @@ "zod": "3.21.1" }, "peerDependencies": { - "astro": "workspace:^3.0.11" + "astro": "workspace:^3.0.12" }, "devDependencies": { "@astrojs/markdown-remark": "workspace:*", diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index b3b3b71eb516..cf6dda33e0fd 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -51,7 +51,7 @@ "vfile": "^5.3.7" }, "peerDependencies": { - "astro": "workspace:^3.0.11" + "astro": "workspace:^3.0.12" }, "devDependencies": { "@types/chai": "^4.3.5", diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index af6a1f1ffd78..84e42bb14523 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -43,7 +43,7 @@ "esbuild": "^0.19.2" }, "peerDependencies": { - "astro": "workspace:^3.0.11" + "astro": "workspace:^3.0.12" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index 8bade329465f..dbc29449eb28 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -37,7 +37,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^3.0.11" + "astro": "workspace:^3.0.12" }, "devDependencies": { "@types/node": "^18.17.8", diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 91fcf6f2017e..1e09788dc0c0 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -48,7 +48,7 @@ "vite": "^4.4.9" }, "peerDependencies": { - "astro": "workspace:^3.0.11", + "astro": "workspace:^3.0.12", "svelte": "^3.55.0 || ^4.0.0" }, "engines": { diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index ac971578e0fb..df95bc59da5e 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -43,7 +43,7 @@ "vite": "^4.4.9" }, "peerDependencies": { - "astro": "workspace:^3.0.11", + "astro": "workspace:^3.0.12", "tailwindcss": "^3.0.24" } } diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 6cb7bfdce0b8..de6b929be31d 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -60,7 +60,7 @@ "web-vitals": "^3.4.0" }, "peerDependencies": { - "astro": "workspace:^3.0.11" + "astro": "workspace:^3.0.12" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.3", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index 80507269ca1b..08213949dd34 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -56,7 +56,7 @@ "vue": "^3.3.4" }, "peerDependencies": { - "astro": "workspace:^3.0.11", + "astro": "workspace:^3.0.12", "vue": "^3.2.30" }, "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 970dba5633be..8ab3a4d0ae4f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,7 +125,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro examples/blog: @@ -140,19 +140,19 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/sitemap astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro examples/deno: dependencies: astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro devDependencies: '@astrojs/deno': @@ -171,7 +171,7 @@ importers: specifier: ^3.12.3 version: 3.12.3 astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro examples/framework-lit: @@ -183,7 +183,7 @@ importers: specifier: ^0.2.1 version: 0.2.1 astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro lit: specifier: ^2.8.0 @@ -207,7 +207,7 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/vue astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -237,7 +237,7 @@ importers: specifier: ^1.2.1 version: 1.2.1(preact@10.17.1) astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -255,7 +255,7 @@ importers: specifier: ^18.2.7 version: 18.2.7 astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro react: specifier: ^18.2.0 @@ -270,7 +270,7 @@ importers: specifier: ^3.0.1 version: link:../../packages/integrations/solid astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro solid-js: specifier: ^1.7.11 @@ -282,7 +282,7 @@ importers: specifier: ^4.0.2 version: link:../../packages/integrations/svelte astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -294,7 +294,7 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/vue astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro vue: specifier: ^3.3.4 @@ -306,13 +306,13 @@ importers: specifier: ^6.0.0 version: link:../../packages/integrations/node astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro examples/middleware: @@ -321,7 +321,7 @@ importers: specifier: ^6.0.0 version: link:../../packages/integrations/node astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro html-minifier: specifier: ^4.0.0 @@ -330,19 +330,19 @@ importers: examples/minimal: dependencies: astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro examples/non-html-pages: dependencies: astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro examples/ssr: @@ -354,7 +354,7 @@ importers: specifier: ^4.0.2 version: link:../../packages/integrations/svelte astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro svelte: specifier: ^4.2.0 @@ -366,7 +366,7 @@ importers: specifier: ^0.5.0 version: link:../../packages/integrations/markdoc astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro examples/with-markdown-plugins: @@ -375,7 +375,7 @@ importers: specifier: ^3.1.0 version: link:../../packages/markdown/remark astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro hast-util-select: specifier: ^5.0.5 @@ -396,7 +396,7 @@ importers: examples/with-markdown-shiki: dependencies: astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro examples/with-mdx: @@ -408,7 +408,7 @@ importers: specifier: ^3.0.0 version: link:../../packages/integrations/preact astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro preact: specifier: ^10.17.1 @@ -423,7 +423,7 @@ importers: specifier: ^0.5.0 version: 0.5.0(nanostores@0.9.3)(preact@10.17.1) astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro nanostores: specifier: ^0.9.3 @@ -444,7 +444,7 @@ importers: specifier: ^1.6.0 version: 1.6.0 astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro autoprefixer: specifier: ^10.4.15 @@ -462,7 +462,7 @@ importers: examples/with-vite-plugin-pwa: dependencies: astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro vite-plugin-pwa: specifier: 0.16.4 @@ -474,7 +474,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^3.0.11 + specifier: ^3.0.12 version: link:../../packages/astro vitest: specifier: ^0.34.2