Merge branch 'main' into add-multiple-cdn-v2

* main:
  [ci] release (withastro#10337)
  Revert bad release (withastro#10336)
  [ci] release (withastro#10332)
  add missing changeset (withastro#10335)
  [ci] set `--tag` on release (withastro#10323)
  [ci] format
  add back data loss confirmation handling (withastro#10330)
  [ci] format
  fix(rendering): allow render instructions to propagate while rendering slots (withastro#10316)
  [ci] format
  fix: fixed an error in the vue component editor (withastro#10293)
  chore(vercel): update @vercel/nft (withastro#10305)
  Update turbo test dependsOn (withastro#10329)
  Add minimal @astrojs/db readme (withastro#10331)

examples/basics/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   }
 }

examples/blog/package.json

@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^2.1.1",
     "@astrojs/rss": "^4.0.5",
     "@astrojs/sitemap": "^3.1.1",
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   }
 }

examples/component/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

examples/framework-alpine/package.json

@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.4.0",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   }
 }

examples/framework-lit/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^4.0.1",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "lit": "^3.1.2"
   }
 }

examples/framework-multiple/package.json

@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^4.0.1",
     "@astrojs/svelte": "^5.2.0",
     "@astrojs/vue": "^4.0.8",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

examples/framework-preact/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.1.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "preact": "^10.19.2"
   }
 }

examples/framework-react/package.json

@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.10",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/framework-solid/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^4.0.1",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "solid-js": "^1.8.5"
   }
 }

examples/framework-svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.2.0",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "svelte": "^4.2.5"
   }
 }

examples/framework-vue/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.0.8",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "vue": "^3.3.8"
   }
 }

examples/hackernews/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.2.3",
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   }
 }

examples/integration/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

examples/middleware/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.2.3",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "html-minifier": "^4.0.0"
   },
   "devDependencies": {

examples/minimal/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   }
 }

examples/non-html-pages/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   }
 }

examples/portfolio/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   }
 }

examples/ssr/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^8.2.3",
     "@astrojs/svelte": "^5.2.0",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "svelte": "^4.2.5"
   }
 }

examples/starlog/package.json

@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "sass": "^1.69.5",
     "sharp": "^0.32.6"
   }

examples/view-transitions/package.json

@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.1.0",
     "@astrojs/node": "^8.2.3",
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   }
 }

examples/with-markdoc/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.9.1",
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   }
 }

examples/with-markdown-plugins/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.2.1",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",

examples/with-markdown-shiki/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.4.11"
+    "astro": "^4.4.12"
   }
 }

examples/with-mdx/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.1.1",
     "@astrojs/preact": "^3.1.1",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "preact": "^10.19.2"
   }
 }

examples/with-nanostores/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.1.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }

examples/with-tailwindcss/package.json

@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^2.1.1",
     "@astrojs/tailwind": "^5.1.0",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",

examples/with-vitest/package.json

@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.4.11",
+    "astro": "^4.4.12",
     "vitest": "^1.3.1"
   }
 }

package.json

@@ -69,7 +69,7 @@
     "prettier": "^3.1.0",
     "prettier-plugin-astro": "^0.12.2",
     "tiny-glob": "^0.2.9",
-    "turbo": "^1.10.12",
+    "turbo": "^1.12.4",
     "typescript": "~5.2.2"
   },
   "pnpm": {

packages/astro/CHANGELOG.md

@@ -1,5 +1,11 @@
 # astro
 
+## 4.4.12
+
+### Patch Changes
+
+- [#10336](https://github.com/withastro/astro/pull/10336) [`f2e60a96754ed1d86001fe4d5d3a0c0ef657408d`](https://github.com/withastro/astro/commit/f2e60a96754ed1d86001fe4d5d3a0c0ef657408d) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Fixes an issue where slotting interactive components within a "client:only" component prevented all component code in the page from running.
+
 ## 4.4.11
 
 ### Patch Changes

packages/astro/e2e/fixtures/nested-in-react/src/pages/nested-in-only.astro

@@ -0,0 +1,17 @@
+---
+import ReactCounter from '../components/react/ReactCounter.jsx';
+---
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width" />
+		<link rel="icon" type="image/x-icon" href="/favicon.ico" />
+	</head>
+	<body>
+		<main>
+			<ReactCounter id="react-counter" client:only="react">
+				<Fragment><ReactCounter id="react-counter-nested" client:only="react" children/></Fragment>
+			</ReactCounter>
+		</main>
+	</body>
+</html>

packages/astro/e2e/nested-in-react.test.js

@@ -114,4 +114,14 @@ test.describe('Nested Frameworks in React', () => {
 
 		await expect(count, 'count incremented by 1').toHaveText('1');
 	});
+
+	test('React counter nested in client:only component', async ({ astro, page }) => {
+		await page.goto(astro.resolveUrl('/nested-in-only'));
+
+		const counter = page.locator('#react-counter');
+		await expect(counter, 'component is visible').toBeVisible();
+
+		const count = counter.locator('#react-counter-count');
+		await expect(count).toBeVisible();
+	});
 });

packages/astro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.4.11",
+  "version": "4.4.12",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

packages/astro/src/runtime/server/render/slot.ts

@@ -52,8 +52,15 @@ export async function renderSlotToString(
 	let instructions: null | RenderInstruction[] = null;
 	const temporaryDestination: RenderDestination = {
 		write(chunk) {
-			if (chunk instanceof Response) return;
-			if (typeof chunk === 'object' && 'type' in chunk && typeof chunk.type === 'string') {
+			// if the chunk is already a SlotString, we concatenate
+			if (chunk instanceof SlotString) {
+				content += chunk;
+				if (chunk.instructions) {
+					instructions ??= [];
+					instructions.push(...chunk.instructions);
+				}
+			} else if (chunk instanceof Response) return;
+			else if (typeof chunk === 'object' && 'type' in chunk && typeof chunk.type === 'string') {
 				if (instructions === null) {
 					instructions = [];
 				}

packages/db/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @astrojs/db
 
+## 0.6.2
+
+### Patch Changes
+
+- [#10336](https://github.com/withastro/astro/pull/10336) [`f2e60a96754ed1d86001fe4d5d3a0c0ef657408d`](https://github.com/withastro/astro/commit/f2e60a96754ed1d86001fe4d5d3a0c0ef657408d) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Add back confirmation handling on verify and push
+
 ## 0.6.1
 
 ### Patch Changes

packages/db/README.md

@@ -0,0 +1,38 @@
+# @astrojs/db (experimental) 💿
+
+This **[Astro integration][astro-integration]** enables the usage of [SQLite](https://www.sqlite.org/) in Astro Projects.
+
+## Documentation
+
+Read the [`@astrojs/db` docs][docs]
+
+## Support
+
+- Get help in the [Astro Discord][discord]. Post questions in our `#support` forum, or visit our dedicated `#dev` channel to discuss current development and more!
+
+- Check our [Astro Integration Documentation][astro-integration] for more on integrations.
+
+- Submit bug reports and feature requests as [GitHub issues][issues].
+
+## Contributing
+
+This package is maintained by Astro's Core team. You're welcome to submit an issue or PR! These links will help you get started:
+
+- [Contributor Manual][contributing]
+- [Code of Conduct][coc]
+- [Community Guide][community]
+
+## License
+
+MIT
+
+Copyright (c) 2023–present [Astro][astro]
+
+[astro]: https://astro.build/
+[docs]: https://docs.astro.build/en/guides/integrations-guide/db/
+[contributing]: https://github.com/withastro/astro/blob/main/CONTRIBUTING.md
+[coc]: https://github.com/withastro/.github/blob/main/CODE_OF_CONDUCT.md
+[community]: https://github.com/withastro/.github/blob/main/COMMUNITY_GUIDE.md
+[discord]: https://astro.build/chat/
+[issues]: https://github.com/withastro/astro/issues
+[astro-integration]: https://docs.astro.build/en/guides/integrations-guide/

packages/db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -74,6 +74,7 @@
     "open": "^10.0.3",
     "ora": "^7.0.1",
     "prompts": "^2.4.2",
+    "strip-ansi": "^7.1.0",
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4"
   },