From 99744b7af069ec4973cc60e56ca76221b0080cd4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 23 May 2023 19:43:14 +0000 Subject: [PATCH] [ci] release --- .changeset/good-parrots-work.md | 5 ----- .changeset/tiny-phones-reply.md | 7 ------- packages/astro/CHANGELOG.md | 8 ++++++++ packages/astro/package.json | 2 +- packages/astro/src/core/render/result.ts | 11 +++++------ packages/astro/src/runtime/server/render/slot.ts | 4 +++- packages/astro/test/set-html.test.js | 4 ++-- packages/integrations/cloudflare/package.json | 2 +- packages/integrations/deno/package.json | 2 +- packages/integrations/image/package.json | 2 +- packages/integrations/markdoc/CHANGELOG.md | 9 +++++++++ packages/integrations/markdoc/package.json | 4 ++-- packages/integrations/mdx/CHANGELOG.md | 6 ++++++ 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 +- 20 files changed, 46 insertions(+), 34 deletions(-) delete mode 100644 .changeset/good-parrots-work.md delete mode 100644 .changeset/tiny-phones-reply.md diff --git a/.changeset/good-parrots-work.md b/.changeset/good-parrots-work.md deleted file mode 100644 index 7a58bac96a5a9..0000000000000 --- a/.changeset/good-parrots-work.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -fix a bug when Fragment is as a slot diff --git a/.changeset/tiny-phones-reply.md b/.changeset/tiny-phones-reply.md deleted file mode 100644 index c2e23791445d3..0000000000000 --- a/.changeset/tiny-phones-reply.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@astrojs/markdoc': patch -'@astrojs/mdx': patch -'astro': patch ---- - -Fix: revert Markdoc asset bleed changes. Production build issues were discovered that deserve a different fix. diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index f441601af3b07..9710862db886d 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,13 @@ # astro +## 2.5.5 + +### Patch Changes + +- [#6832](https://github.com/withastro/astro/pull/6832) [`904131aec`](https://github.com/withastro/astro/commit/904131aec3bacb2824ad60457a45772eba27b5ab) Thanks [@wulinsheng123](https://github.com/wulinsheng123)! - fix a bug when Fragment is as a slot + +- [#7178](https://github.com/withastro/astro/pull/7178) [`57e65d247`](https://github.com/withastro/astro/commit/57e65d247f67de61bcc3a585c2254feb61ed2e74) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix: revert Markdoc asset bleed changes. Production build issues were discovered that deserve a different fix. + ## 2.5.4 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 636328c0dbad0..40020f303aa0a 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "2.5.4", + "version": "2.5.5", "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/astro/src/core/render/result.ts b/packages/astro/src/core/render/result.ts index 22ca5bc809fcc..968a04980d995 100644 --- a/packages/astro/src/core/render/result.ts +++ b/packages/astro/src/core/render/result.ts @@ -111,12 +111,11 @@ class Slots { // Astro const expression = getFunctionExpression(component); if (expression) { - const slot = async () => isHTMLString(await expression) ? expression : expression(...args) - return await renderSlotToString(result, slot).then((res) =>{ - return res != null ? String(res) : res - } - - ); + const slot = async () => + isHTMLString(await expression) ? expression : expression(...args); + return await renderSlotToString(result, slot).then((res) => { + return res != null ? String(res) : res; + }); } // JSX if (typeof component === 'function') { diff --git a/packages/astro/src/runtime/server/render/slot.ts b/packages/astro/src/runtime/server/render/slot.ts index 1dfe2f5d962f0..09a8ff39c44f3 100644 --- a/packages/astro/src/runtime/server/render/slot.ts +++ b/packages/astro/src/runtime/server/render/slot.ts @@ -7,7 +7,9 @@ import { renderChild } from './any.js'; type RenderTemplateResult = ReturnType; export type ComponentSlots = Record; -export type ComponentSlotValue = (result: SSRResult) => RenderTemplateResult | Promise; +export type ComponentSlotValue = ( + result: SSRResult +) => RenderTemplateResult | Promise; const slotString = Symbol.for('astro:slot-string'); diff --git a/packages/astro/test/set-html.test.js b/packages/astro/test/set-html.test.js index dab80d48cfaac..caffb3fda8496 100644 --- a/packages/astro/test/set-html.test.js +++ b/packages/astro/test/set-html.test.js @@ -40,7 +40,7 @@ describe('set:html', () => { expect(res.status).to.equal(200); let html = await res.text(); expect(html).include('Test'); - }) + }); }); describe('Build', () => { @@ -87,6 +87,6 @@ describe('set:html', () => { it('test Fragment when Fragment is as a slot', async () => { let res = await fixture.readFile('/children/index.html'); expect(res).include('Test'); - }) + }); }); }); diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json index b5ce85abbd01d..2c298a270a765 100644 --- a/packages/integrations/cloudflare/package.json +++ b/packages/integrations/cloudflare/package.json @@ -42,7 +42,7 @@ "tiny-glob": "^0.2.9" }, "peerDependencies": { - "astro": "workspace:^2.5.4" + "astro": "workspace:^2.5.5" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json index 1774352cf9d3a..fc0402570ca18 100644 --- a/packages/integrations/deno/package.json +++ b/packages/integrations/deno/package.json @@ -36,7 +36,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.5.4" + "astro": "workspace:^2.5.5" }, "devDependencies": { "astro": "workspace:*", diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json index e9d7abefd0211..76fd1b6331886 100644 --- a/packages/integrations/image/package.json +++ b/packages/integrations/image/package.json @@ -62,7 +62,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.5.4", + "astro": "workspace:^2.5.5", "sharp": ">=0.31.0" }, "peerDependenciesMeta": { diff --git a/packages/integrations/markdoc/CHANGELOG.md b/packages/integrations/markdoc/CHANGELOG.md index ad8b7fb57e4e3..d2233ff6081bf 100644 --- a/packages/integrations/markdoc/CHANGELOG.md +++ b/packages/integrations/markdoc/CHANGELOG.md @@ -1,5 +1,14 @@ # @astrojs/markdoc +## 0.2.3 + +### Patch Changes + +- [#7178](https://github.com/withastro/astro/pull/7178) [`57e65d247`](https://github.com/withastro/astro/commit/57e65d247f67de61bcc3a585c2254feb61ed2e74) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix: revert Markdoc asset bleed changes. Production build issues were discovered that deserve a different fix. + +- Updated dependencies [[`904131aec`](https://github.com/withastro/astro/commit/904131aec3bacb2824ad60457a45772eba27b5ab), [`57e65d247`](https://github.com/withastro/astro/commit/57e65d247f67de61bcc3a585c2254feb61ed2e74)]: + - astro@2.5.5 + ## 0.2.2 ### Patch Changes diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json index 38a584cc5231d..f031c8f6ca254 100644 --- a/packages/integrations/markdoc/package.json +++ b/packages/integrations/markdoc/package.json @@ -1,7 +1,7 @@ { "name": "@astrojs/markdoc", "description": "Add support for Markdoc pages in your Astro site", - "version": "0.2.2", + "version": "0.2.3", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", @@ -47,7 +47,7 @@ "zod": "^3.17.3" }, "peerDependencies": { - "astro": "workspace:^2.5.4" + "astro": "workspace:^2.5.5" }, "devDependencies": { "@astrojs/markdown-remark": "^2.2.1", diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md index 7f7ff251b0bb3..72df6c84b5d39 100644 --- a/packages/integrations/mdx/CHANGELOG.md +++ b/packages/integrations/mdx/CHANGELOG.md @@ -1,5 +1,11 @@ # @astrojs/mdx +## 0.19.4 + +### Patch Changes + +- [#7178](https://github.com/withastro/astro/pull/7178) [`57e65d247`](https://github.com/withastro/astro/commit/57e65d247f67de61bcc3a585c2254feb61ed2e74) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix: revert Markdoc asset bleed changes. Production build issues were discovered that deserve a different fix. + ## 0.19.3 ### Patch Changes diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index a3308dc552786..4e06bea89e507 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": "0.19.3", + "version": "0.19.4", "type": "module", "types": "./dist/index.d.ts", "author": "withastro", diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json index 259f20d0f8f10..c2d908812e9e9 100644 --- a/packages/integrations/netlify/package.json +++ b/packages/integrations/netlify/package.json @@ -42,7 +42,7 @@ "esbuild": "^0.15.18" }, "peerDependencies": { - "astro": "workspace:^2.5.4" + "astro": "workspace:^2.5.5" }, "devDependencies": { "@netlify/edge-functions": "^2.0.0", diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json index f77b2f923a547..dc06d92d0d237 100644 --- a/packages/integrations/node/package.json +++ b/packages/integrations/node/package.json @@ -38,7 +38,7 @@ "server-destroy": "^1.0.1" }, "peerDependencies": { - "astro": "workspace:^2.5.4" + "astro": "workspace:^2.5.5" }, "devDependencies": { "@types/send": "^0.17.1", diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index aeea203f42c04..9c1ff3efa6f76 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -48,7 +48,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.5.4", + "astro": "workspace:^2.5.5", "svelte": "^3.54.0" }, "engines": { diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json index 7ba0a1acb3063..7290a24f0e323 100644 --- a/packages/integrations/tailwind/package.json +++ b/packages/integrations/tailwind/package.json @@ -44,7 +44,7 @@ "vite": "^4.3.1" }, "peerDependencies": { - "astro": "workspace:^2.5.4", + "astro": "workspace:^2.5.5", "tailwindcss": "^3.0.24" }, "pnpm": { diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json index 9c2fc6eb1af13..56265f199c822 100644 --- a/packages/integrations/vercel/package.json +++ b/packages/integrations/vercel/package.json @@ -59,7 +59,7 @@ "web-vitals": "^3.1.1" }, "peerDependencies": { - "astro": "workspace:^2.5.4" + "astro": "workspace:^2.5.5" }, "devDependencies": { "@types/set-cookie-parser": "^2.4.2", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index 790b46fc20e0d..1c077b1179044 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -56,7 +56,7 @@ "vue": "^3.2.37" }, "peerDependencies": { - "astro": "workspace:^2.5.4", + "astro": "workspace:^2.5.5", "vue": "^3.2.30" }, "engines": {