From b8d3b79f2d3c05b2b9c4512fc5a33c3663592174 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 23 Dec 2024 12:22:20 +0000 Subject: [PATCH] [ci] release --- .changeset/afraid-sloths-shake.md | 5 --- .changeset/six-pumpkins-act.md | 7 ---- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/container-with-vitest/package.json | 2 +- examples/framework-alpine/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/minimal/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/starlog/package.json | 2 +- examples/toolbar-app/package.json | 2 +- examples/with-markdoc/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 10 +++++ packages/astro/e2e/server-islands.test.js | 2 +- packages/astro/package.json | 2 +- pnpm-lock.yaml | 46 ++++++++++----------- 29 files changed, 58 insertions(+), 60 deletions(-) delete mode 100644 .changeset/afraid-sloths-shake.md delete mode 100644 .changeset/six-pumpkins-act.md diff --git a/.changeset/afraid-sloths-shake.md b/.changeset/afraid-sloths-shake.md deleted file mode 100644 index 98c8efb37206..000000000000 --- a/.changeset/afraid-sloths-shake.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Improves warning logs for invalid content collection configuration diff --git a/.changeset/six-pumpkins-act.md b/.changeset/six-pumpkins-act.md deleted file mode 100644 index 9221af960c90..000000000000 --- a/.changeset/six-pumpkins-act.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'astro': patch ---- - -Fixes server islands failing to check content-type header under certain circumstances - -Sometimes a reverse proxy or similar service might modify the content-type header to include the charset or other parameters in the media type of the response. This previously wasn't handled by the client-side server island script and thus removed the script without actually placing the requested content in the DOM. This fix makes it so the script checks if the header starts with the proper content type instead of exactly matching `text/html`, so the following will still be considered a valid header: `text/html; charset=utf-8` diff --git a/examples/basics/package.json b/examples/basics/package.json index 29f536a91776..96ceb34cf394 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.1.1" + "astro": "^5.1.2" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 0538835ff8fe..db049aaf2bbb 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -13,6 +13,6 @@ "@astrojs/mdx": "^4.0.3", "@astrojs/rss": "^4.0.10", "@astrojs/sitemap": "^3.2.1", - "astro": "^5.1.1" + "astro": "^5.1.2" } } diff --git a/examples/component/package.json b/examples/component/package.json index df9279109768..ba56521e9947 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^5.1.1" + "astro": "^5.1.2" }, "peerDependencies": { "astro": "^4.0.0 || ^5.0.0" diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json index 5b4f585c106f..0110b6d61a2b 100644 --- a/examples/container-with-vitest/package.json +++ b/examples/container-with-vitest/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/react": "^4.1.2", - "astro": "^5.1.1", + "astro": "^5.1.2", "react": "^18.3.1", "react-dom": "^18.3.1", "vitest": "^2.1.6" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index be9d3d508135..5c37865faeb3 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -13,6 +13,6 @@ "@astrojs/alpinejs": "^0.4.1", "@types/alpinejs": "^3.13.10", "alpinejs": "^3.14.3", - "astro": "^5.1.1" + "astro": "^5.1.2" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index a27f2f768e0f..b2e9bd516f5e 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -17,7 +17,7 @@ "@astrojs/vue": "^5.0.3", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "astro": "^5.1.1", + "astro": "^5.1.2", "preact": "^10.24.3", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 9324cd468ad8..edc3e416e504 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/preact": "^4.0.1", "@preact/signals": "^1.3.0", - "astro": "^5.1.1", + "astro": "^5.1.2", "preact": "^10.24.3" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 302f913df9d5..44b0422a75fc 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -13,7 +13,7 @@ "@astrojs/react": "^4.1.2", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "astro": "^5.1.1", + "astro": "^5.1.2", "react": "^18.3.1", "react-dom": "^18.3.1" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 441f87862590..6dba36f6b6ea 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@astrojs/solid-js": "^5.0.1", - "astro": "^5.1.1", + "astro": "^5.1.2", "solid-js": "^1.9.3" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 81e9384d7614..46e74930e473 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@astrojs/svelte": "^7.0.2", - "astro": "^5.1.1", + "astro": "^5.1.2", "svelte": "^5.1.16" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 188a50ac3fe9..19f6552de5c9 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@astrojs/vue": "^5.0.3", - "astro": "^5.1.1", + "astro": "^5.1.2", "vue": "^3.5.12" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 072de4d9c7d3..2c99aa89505c 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -11,6 +11,6 @@ }, "dependencies": { "@astrojs/node": "^9.0.0", - "astro": "^5.1.1" + "astro": "^5.1.2" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index ea4d31d073a3..fda557091a12 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^5.1.1" + "astro": "^5.1.2" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 7201226830a3..f2e095503328 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.1.1" + "astro": "^5.1.2" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index e6a446b37f8a..8278c8cf7019 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.1.1" + "astro": "^5.1.2" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index e11f39cfc47e..1126a0b0adf8 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/node": "^9.0.0", "@astrojs/svelte": "^7.0.2", - "astro": "^5.1.1", + "astro": "^5.1.2", "svelte": "^5.1.16" } } diff --git a/examples/starlog/package.json b/examples/starlog/package.json index e4cf48a61ae8..a6d6a329f05a 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -9,7 +9,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.1.1", + "astro": "^5.1.2", "sass": "^1.80.6", "sharp": "^0.33.3" } diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json index 7b410422e90d..4066ffd9380f 100644 --- a/examples/toolbar-app/package.json +++ b/examples/toolbar-app/package.json @@ -15,6 +15,6 @@ "./app": "./dist/app.js" }, "devDependencies": { - "astro": "^5.1.1" + "astro": "^5.1.2" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index f306bf9a4caa..777bb94666c6 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -11,6 +11,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.12.4", - "astro": "^5.1.1" + "astro": "^5.1.2" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 147ade9a2621..7fddbaf91497 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/mdx": "^4.0.3", "@astrojs/preact": "^4.0.1", - "astro": "^5.1.1", + "astro": "^5.1.2", "preact": "^10.24.3" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index b23842a5dac3..7759b2e847c7 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/preact": "^4.0.1", "@nanostores/preact": "^0.5.2", - "astro": "^5.1.1", + "astro": "^5.1.2", "nanostores": "^0.11.3", "preact": "^10.24.3" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 1e4a7a32b3a5..320a7bb58272 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -13,7 +13,7 @@ "@astrojs/mdx": "^4.0.3", "@astrojs/tailwind": "^5.1.4", "@types/canvas-confetti": "^1.6.4", - "astro": "^5.1.1", + "astro": "^5.1.2", "autoprefixer": "^10.4.20", "canvas-confetti": "^1.9.3", "postcss": "^8.4.49", diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 22b719e87dbf..9ac5a136d1f8 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -11,7 +11,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^5.1.1", + "astro": "^5.1.2", "vitest": "^2.1.6" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index 6c5552feb57a..ba2b9a9533d3 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,15 @@ # astro +## 5.1.2 + +### Patch Changes + +- [#12798](https://github.com/withastro/astro/pull/12798) [`7b0cb85`](https://github.com/withastro/astro/commit/7b0cb852f6336c0f9cc65bd044864004e759d810) Thanks [@ascorbic](https://github.com/ascorbic)! - Improves warning logs for invalid content collection configuration + +- [#12810](https://github.com/withastro/astro/pull/12810) [`70a9f0b`](https://github.com/withastro/astro/commit/70a9f0b984638c21a4da1d83b7d5a5c9940bb693) Thanks [@louisescher](https://github.com/louisescher)! - Fixes server islands failing to check content-type header under certain circumstances + + Sometimes a reverse proxy or similar service might modify the content-type header to include the charset or other parameters in the media type of the response. This previously wasn't handled by the client-side server island script and thus removed the script without actually placing the requested content in the DOM. This fix makes it so the script checks if the header starts with the proper content type instead of exactly matching `text/html`, so the following will still be considered a valid header: `text/html; charset=utf-8` + ## 5.1.1 ### Patch Changes diff --git a/packages/astro/e2e/server-islands.test.js b/packages/astro/e2e/server-islands.test.js index a877212bc084..dd764eb84d67 100644 --- a/packages/astro/e2e/server-islands.test.js +++ b/packages/astro/e2e/server-islands.test.js @@ -44,7 +44,7 @@ test.describe('Server islands', () => { await expect(el).toHaveText('test'); }); - test("content-type header with media type still allows the island to be displayed", async ({ + test('content-type header with media type still allows the island to be displayed', async ({ page, astro, }) => { diff --git a/packages/astro/package.json b/packages/astro/package.json index 7eebf46763e3..958b72c98d14 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "5.1.1", + "version": "5.1.2", "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 93eee8980c9c..b40f13eb5d3e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -142,7 +142,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro examples/blog: @@ -157,13 +157,13 @@ importers: specifier: ^3.2.1 version: link:../../packages/integrations/sitemap astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro examples/container-with-vitest: @@ -172,7 +172,7 @@ importers: specifier: ^4.1.2 version: link:../../packages/integrations/react astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -203,7 +203,7 @@ importers: specifier: ^3.14.3 version: 3.14.3 astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro examples/framework-multiple: @@ -230,7 +230,7 @@ importers: specifier: ^18.3.1 version: 18.3.1 astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro preact: specifier: ^10.24.3 @@ -260,7 +260,7 @@ importers: specifier: ^1.3.0 version: 1.3.0(preact@10.24.3) astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro preact: specifier: ^10.24.3 @@ -278,7 +278,7 @@ importers: specifier: ^18.3.1 version: 18.3.1 astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -293,7 +293,7 @@ importers: specifier: ^5.0.1 version: link:../../packages/integrations/solid astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro solid-js: specifier: ^1.9.3 @@ -305,7 +305,7 @@ importers: specifier: ^7.0.2 version: link:../../packages/integrations/svelte astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro svelte: specifier: ^5.1.16 @@ -317,7 +317,7 @@ importers: specifier: ^5.0.3 version: link:../../packages/integrations/vue astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro vue: specifier: ^3.5.12 @@ -329,25 +329,25 @@ importers: specifier: ^9.0.0 version: 9.0.0(astro@packages+astro) astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro examples/minimal: dependencies: astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro examples/ssr: @@ -359,7 +359,7 @@ importers: specifier: ^7.0.2 version: link:../../packages/integrations/svelte astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro svelte: specifier: ^5.1.16 @@ -368,7 +368,7 @@ importers: examples/starlog: dependencies: astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro sass: specifier: ^1.80.6 @@ -380,7 +380,7 @@ importers: examples/toolbar-app: devDependencies: astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro examples/with-markdoc: @@ -389,7 +389,7 @@ importers: specifier: ^0.12.4 version: link:../../packages/integrations/markdoc astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro examples/with-mdx: @@ -401,7 +401,7 @@ importers: specifier: ^4.0.1 version: link:../../packages/integrations/preact astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro preact: specifier: ^10.24.3 @@ -416,7 +416,7 @@ importers: specifier: ^0.5.2 version: 0.5.2(nanostores@0.11.3)(preact@10.24.3) astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro nanostores: specifier: ^0.11.3 @@ -437,7 +437,7 @@ importers: specifier: ^1.6.4 version: 1.6.4 astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro autoprefixer: specifier: ^10.4.20 @@ -455,7 +455,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^5.1.1 + specifier: ^5.1.2 version: link:../../packages/astro vitest: specifier: ^2.1.6