From a2f8c5d85ff15803f5cedf9148cd70ffc138ddef Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Sun, 15 Sep 2024 21:53:30 +0200
Subject: [PATCH 01/11] docs: fix Content Layer RFC Link (#12000)

---
 .changeset/healthy-donuts-yell.md  | 5 +++++
 packages/astro/src/@types/astro.ts | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/healthy-donuts-yell.md

diff --git a/.changeset/healthy-donuts-yell.md b/.changeset/healthy-donuts-yell.md
new file mode 100644
index 000000000000..ad9079541061
--- /dev/null
+++ b/.changeset/healthy-donuts-yell.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes an outdated link used to document Content Layer API
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 41a874871941..ac281481bf80 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -2279,7 +2279,7 @@ export interface AstroUserConfig {
 		 * export const collections = { countries };
 		 * ```
 		 *
-		 * For more advanced loading logic, you can define an object loader. This allows incremental updates and conditional loading while also giving full access to the data store. See the API in [the Content Layer API RFC](https://github.com/withastro/roadmap/blob/content-layer/proposals/0047-content-layer.md#loaders).
+		 * For more advanced loading logic, you can define an object loader. This allows incremental updates and conditional loading while also giving full access to the data store. See the API in [the Content Layer API RFC](https://github.com/withastro/roadmap/blob/content-layer/proposals/0050-content-layer.md#loaders).
 		 *
 		 * #### Migrating an existing content collection to use the Content Layer API
 		 *
@@ -2344,7 +2344,7 @@ export interface AstroUserConfig {
 		 *
 		 * #### Learn more
 		 *
-		 * For a complete overview and the full API reference, see [the Content Layer API RFC](https://github.com/withastro/roadmap/blob/content-layer/proposals/0047-content-layer.md) and [share your feedback](https://github.com/withastro/roadmap/pull/982).
+		 * For a complete overview and the full API reference, see [the Content Layer API RFC](https://github.com/withastro/roadmap/blob/content-layer/proposals/0050-content-layer.md) and [share your feedback](https://github.com/withastro/roadmap/pull/982).
 		 */
 		contentLayer?: boolean;
 	};

From b75bfc8cc41f5c631c10055b78670fdc26dff23a Mon Sep 17 00:00:00 2001
From: Johannes Spohr <johannes.spohr@carvia.de>
Date: Tue, 17 Sep 2024 14:54:49 +0200
Subject: [PATCH 02/11] Fix vue resetting state when using view transition
 persistence (#11946)

* Fix vue resetting state when using view transition persistence

* Avoid calling internal apis when forcing vue component update
---
 .changeset/five-walls-build.md                |  5 ++
 .../src/components/VueCounter.vue             | 12 +++--
 .../src/pages/island-vue-one.astro            | 11 +++++
 .../src/pages/island-vue-two.astro            | 11 +++++
 packages/astro/e2e/view-transitions.test.js   | 20 +++++++-
 packages/integrations/vue/client.js           | 46 +++++++++++++------
 6 files changed, 87 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/five-walls-build.md
 create mode 100644 packages/astro/e2e/fixtures/view-transitions/src/pages/island-vue-one.astro
 create mode 100644 packages/astro/e2e/fixtures/view-transitions/src/pages/island-vue-two.astro

diff --git a/.changeset/five-walls-build.md b/.changeset/five-walls-build.md
new file mode 100644
index 000000000000..41f89aa3e2e3
--- /dev/null
+++ b/.changeset/five-walls-build.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vue': patch
+---
+
+Fix vue islands keeping their state when using view transition persistence
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/components/VueCounter.vue b/packages/astro/e2e/fixtures/view-transitions/src/components/VueCounter.vue
index e75620aff455..e05cf6a1445f 100644
--- a/packages/astro/e2e/fixtures/view-transitions/src/components/VueCounter.vue
+++ b/packages/astro/e2e/fixtures/view-transitions/src/components/VueCounter.vue
@@ -1,8 +1,8 @@
 <template>
 	<div class="counter">
-		<button @click="subtract()">-</button>
-		<pre>{{ count }}</pre>
-		<button @click="add()">+</button>
+		<button @click="subtract()" class="decrement">-</button>
+		<pre>{{prefix}}{{ count }}</pre>
+		<button @click="add()" class="increment">+</button>
 	</div>
 	<div class="counter-message">
 		<slot />
@@ -12,6 +12,12 @@
 <script lang="ts">
 import { ref } from 'vue';
 export default {
+	props: {
+		prefix: {
+			type: String,
+			default: '',
+		},
+	},
 	setup() {
 		const count = ref(0);
 		const add = () => (count.value = count.value + 1);
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/island-vue-one.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-vue-one.astro
new file mode 100644
index 000000000000..b8ce5e48de4e
--- /dev/null
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-vue-one.astro
@@ -0,0 +1,11 @@
+---
+import Layout from '../components/Layout.astro';
+import Counter from '../components/VueCounter.vue';
+export const prerender = false;
+
+---
+<Layout>
+	<p id="island-one">Page 1</p>
+	<a id="click-two" href="/island-vue-two">go to 2</a>
+	<Counter prefix="AA" client:load transition:persist transition:name="counter" />
+</Layout>
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/island-vue-two.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-vue-two.astro
new file mode 100644
index 000000000000..5c688be79bab
--- /dev/null
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-vue-two.astro
@@ -0,0 +1,11 @@
+---
+import Layout from '../components/Layout.astro';
+import Counter from '../components/VueCounter.vue';
+export const prerender = false;
+
+---
+<Layout>
+	<p id="island-two">Page 2</p>
+	<a id="click-two" href="/island-vue-one">go to 1</a>
+	<Counter prefix="BB" client:load transition:persist transition:name="counter" />
+</Layout>
diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js
index 181994cfa930..f1ced26c7d6f 100644
--- a/packages/astro/e2e/view-transitions.test.js
+++ b/packages/astro/e2e/view-transitions.test.js
@@ -522,7 +522,7 @@ test.describe('View Transitions', () => {
 		expect(secondTime).toBeGreaterThanOrEqual(firstTime);
 	});
 
-	test('Islands can persist using transition:persist', async ({ page, astro }) => {
+	test('React Islands can persist using transition:persist', async ({ page, astro }) => {
 		// Go to page 1
 		await page.goto(astro.resolveUrl('/island-one'));
 		let cnt = page.locator('.counter pre');
@@ -544,6 +544,24 @@ test.describe('View Transitions', () => {
 		await expect(pageTitle).toHaveText('Island 2');
 	});
 
+	test('Vue Islands can persist using transition:persist', async ({ page, astro }) => {
+		// Go to page 1
+		await page.goto(astro.resolveUrl('/island-vue-one'));
+		let cnt = page.locator('.counter pre');
+		await expect(cnt).toHaveText('AA0');
+
+		await page.click('.increment');
+		await expect(cnt).toHaveText('AA1');
+
+		// Navigate to page 2
+		await page.click('#click-two');
+		const p = page.locator('#island-two');
+		await expect(p).toBeVisible();
+		cnt = page.locator('.counter pre');
+		// Count should remain, but the prefix should be updated
+		await expect(cnt).toHaveText('BB1');
+	});
+
 	test('transition:persist-props prevents props from changing', async ({ page, astro }) => {
 		// Go to page 1
 		await page.goto(astro.resolveUrl('/island-one?persist'));
diff --git a/packages/integrations/vue/client.js b/packages/integrations/vue/client.js
index 807f843fc930..58ee11d5c3d3 100644
--- a/packages/integrations/vue/client.js
+++ b/packages/integrations/vue/client.js
@@ -2,6 +2,9 @@ import { setup } from 'virtual:@astrojs/vue/app';
 import { Suspense, createApp, createSSRApp, h } from 'vue';
 import StaticHtml from './static-html.js';
 
+// keep track of already initialized apps, so we don't hydrate again for view transitions
+let appMap = new WeakMap();
+
 export default (element) =>
 	async (Component, props, slotted, { client }) => {
 		if (!element.hasAttribute('ssr')) return;
@@ -15,21 +18,36 @@ export default (element) =>
 
 		const isHydrate = client !== 'only';
 		const bootstrap = isHydrate ? createSSRApp : createApp;
-		const app = bootstrap({
-			name,
-			render() {
-				let content = h(Component, props, slots);
-				// related to https://github.com/withastro/astro/issues/6549
-				// if the component is async, wrap it in a Suspense component
-				if (isAsync(Component.setup)) {
-					content = h(Suspense, null, content);
-				}
-				return content;
-			},
-		});
-		await setup(app);
-		app.mount(element, isHydrate);
 
+		// keep a reference to the app, props and slots so we can update a running instance later
+		let appInstance = appMap.get(element);
+
+		if (!appInstance) {
+			appInstance = {
+				props,
+				slots,
+			};
+			const app = bootstrap({
+				name,
+				render() {
+					let content = h(Component, appInstance.props, appInstance.slots);
+					appInstance.component = this;
+					// related to https://github.com/withastro/astro/issues/6549
+					// if the component is async, wrap it in a Suspense component
+					if (isAsync(Component.setup)) {
+						content = h(Suspense, null, content);
+					}
+					return content;
+				},
+			});
+			await setup(app);
+			app.mount(element, isHydrate);
+			appMap.set(element, appInstance);
+		} else {
+			appInstance.props = props;
+			appInstance.slots = slots;
+			appInstance.component.$forceUpdate();
+		}
 		element.addEventListener('astro:unmount', () => app.unmount(), { once: true });
 	};
 

From 082f45094471d52e55c55d3291f541306d9388b1 Mon Sep 17 00:00:00 2001
From: Johannes Spohr <johannes.spohr@carvia.de>
Date: Tue, 17 Sep 2024 15:21:41 +0200
Subject: [PATCH 03/11] Fix SolidJS view transition state persistence (#11998)

* Fix SolidJS view transition state persistence

* Add changeset

---------

Co-authored-by: Martin Trapp <94928215+martrapp@users.noreply.github.com>
---
 .changeset/grumpy-bobcats-rush.md             |  5 ++
 .../view-transitions/astro.config.mjs         |  7 +-
 .../fixtures/view-transitions/package.json    |  4 +-
 .../src/components/solid/Counter.jsx          | 19 ++++++
 .../src/pages/island-solid-one.astro          | 11 +++
 .../src/pages/island-solid-two.astro          | 11 +++
 packages/astro/e2e/view-transitions.test.js   | 25 +++++++
 packages/integrations/solid/src/client.ts     | 67 ++++++++++++-------
 pnpm-lock.yaml                                |  6 ++
 9 files changed, 127 insertions(+), 28 deletions(-)
 create mode 100644 .changeset/grumpy-bobcats-rush.md
 create mode 100644 packages/astro/e2e/fixtures/view-transitions/src/components/solid/Counter.jsx
 create mode 100644 packages/astro/e2e/fixtures/view-transitions/src/pages/island-solid-one.astro
 create mode 100644 packages/astro/e2e/fixtures/view-transitions/src/pages/island-solid-two.astro

diff --git a/.changeset/grumpy-bobcats-rush.md b/.changeset/grumpy-bobcats-rush.md
new file mode 100644
index 000000000000..c8b147fa570c
--- /dev/null
+++ b/.changeset/grumpy-bobcats-rush.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/solid-js': patch
+---
+
+Fix view transition state persistence
diff --git a/packages/astro/e2e/fixtures/view-transitions/astro.config.mjs b/packages/astro/e2e/fixtures/view-transitions/astro.config.mjs
index b7cfd434abb4..f406b0e0cd72 100644
--- a/packages/astro/e2e/fixtures/view-transitions/astro.config.mjs
+++ b/packages/astro/e2e/fixtures/view-transitions/astro.config.mjs
@@ -1,6 +1,7 @@
 import nodejs from '@astrojs/node';
 import react from '@astrojs/react';
 import svelte from '@astrojs/svelte';
+import solidjs from '@astrojs/solid-js';
 import vue from '@astrojs/vue';
 import { defineConfig } from 'astro/config';
 
@@ -8,7 +9,11 @@ import { defineConfig } from 'astro/config';
 export default defineConfig({
 	output: 'hybrid',
 	adapter: nodejs({ mode: 'standalone' }),
-	integrations: [react(),vue(),svelte()],
+	integrations: [react( {
+		exclude: ['**/solid/**'],
+	}),vue(),svelte(),solidjs({
+		include: ['**/solid/**'],
+	})],
 	redirects: {
 		'/redirect-two': '/two',
 		'/redirect-external': 'http://example.com/',
diff --git a/packages/astro/e2e/fixtures/view-transitions/package.json b/packages/astro/e2e/fixtures/view-transitions/package.json
index 48cf30a9ae4b..08aae1afcf10 100644
--- a/packages/astro/e2e/fixtures/view-transitions/package.json
+++ b/packages/astro/e2e/fixtures/view-transitions/package.json
@@ -7,10 +7,12 @@
     "@astrojs/react": "workspace:*",
     "@astrojs/svelte": "workspace:*",
     "@astrojs/vue": "workspace:*",
+    "@astrojs/solid-js": "workspace:*",
     "astro": "workspace:*",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "svelte": "^4.2.19",
-    "vue": "^3.5.3"
+    "vue": "^3.5.3",
+    "solid-js": "^1.8.0"
   }
 }
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/components/solid/Counter.jsx b/packages/astro/e2e/fixtures/view-transitions/src/components/solid/Counter.jsx
new file mode 100644
index 000000000000..13c8dd1935d1
--- /dev/null
+++ b/packages/astro/e2e/fixtures/view-transitions/src/components/solid/Counter.jsx
@@ -0,0 +1,19 @@
+import {createSignal} from "solid-js";
+
+export default function Counter(props) {
+	const [count, setCount] = createSignal(0);
+	const add = () => setCount(count() + 1);
+	const subtract = () => setCount(count() - 1);
+
+	return (
+		<>
+			<div class="counter">
+				<button onClick={subtract} class="decrement">-</button>
+
+				<pre>{props.prefix ?? ''}{count()}{props.postfix ?? ""}</pre>
+				<button onClick={add} class="increment">+</button>
+			</div>
+			<div class="counter-message">{props.children}</div>
+		</>
+	);
+}
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/island-solid-one.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-solid-one.astro
new file mode 100644
index 000000000000..92a58eaa7ce0
--- /dev/null
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-solid-one.astro
@@ -0,0 +1,11 @@
+---
+import Layout from '../components/Layout.astro';
+import Counter from '../components/solid/Counter.jsx';
+export const prerender = false;
+
+---
+<Layout>
+	<p id="island-one">Page 1</p>
+	<a id="click-two" href="/island-solid-two">go to 2</a>
+	<Counter prefix="A" client:load transition:persist transition:name="counter" />
+</Layout>
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/island-solid-two.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-solid-two.astro
new file mode 100644
index 000000000000..3d17f32b3950
--- /dev/null
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-solid-two.astro
@@ -0,0 +1,11 @@
+---
+import Layout from '../components/Layout.astro';
+import Counter from '../components/solid/Counter.jsx';
+export const prerender = false;
+
+---
+<Layout>
+	<p id="island-two">Page 2</p>
+	<a id="click-one" href="/island-solid-one">go to 1</a>
+	<Counter prefix="B" postfix="!" client:load transition:persist transition:name="counter" />
+</Layout>
diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js
index f1ced26c7d6f..d5f78f1de08b 100644
--- a/packages/astro/e2e/view-transitions.test.js
+++ b/packages/astro/e2e/view-transitions.test.js
@@ -544,6 +544,31 @@ test.describe('View Transitions', () => {
 		await expect(pageTitle).toHaveText('Island 2');
 	});
 
+	test('Solid Islands can persist using transition:persist', async ({ page, astro }) => {
+		// Go to page 1
+		await page.goto(astro.resolveUrl('/island-solid-one'));
+		let cnt = page.locator('.counter pre');
+		await expect(cnt).toHaveText('A0');
+
+		await page.click('.increment');
+		await expect(cnt).toHaveText('A1');
+
+		// Navigate to page 2
+		await page.click('#click-two');
+		let p = page.locator('#island-two');
+		await expect(p).toBeVisible();
+		cnt = page.locator('.counter pre');
+		// Count should remain, but the prefix should be updated
+		await expect(cnt).toHaveText('B1!');
+
+		await page.click('#click-one');
+		p = page.locator('#island-one');
+		await expect(p).toBeVisible();
+		cnt = page.locator('.counter pre');
+		// Count should remain, but the postfix should be removed again (to test unsetting props)
+		await expect(cnt).toHaveText('A1');
+  });
+  
 	test('Vue Islands can persist using transition:persist', async ({ page, astro }) => {
 		// Go to page 1
 		await page.goto(astro.resolveUrl('/island-vue-one'));
diff --git a/packages/integrations/solid/src/client.ts b/packages/integrations/solid/src/client.ts
index a47c5310db23..f2020bb564b9 100644
--- a/packages/integrations/solid/src/client.ts
+++ b/packages/integrations/solid/src/client.ts
@@ -1,10 +1,12 @@
 import { Suspense } from 'solid-js';
+import { createStore, reconcile } from 'solid-js/store';
 import { createComponent, hydrate, render } from 'solid-js/web';
 
+const alreadyInitializedElements = new WeakMap<Element, any>();
+
 export default (element: HTMLElement) =>
 	(Component: any, props: any, slotted: any, { client }: { client: string }) => {
 		if (!element.hasAttribute('ssr')) return;
-
 		const isHydrate = client !== 'only';
 		const bootstrap = isHydrate ? hydrate : render;
 
@@ -32,31 +34,44 @@ export default (element: HTMLElement) =>
 
 		const { default: children, ...slots } = _slots;
 		const renderId = element.dataset.solidRenderId;
+		if (alreadyInitializedElements.has(element)) {
+			// update the mounted component
+			alreadyInitializedElements.get(element)!(
+				// reconcile will make sure to apply as little updates as possible, and also remove missing values w/o breaking reactivity
+				reconcile({
+					...props,
+					...slots,
+					children,
+				}),
+			);
+		} else {
+			const [store, setStore] = createStore({
+				...props,
+				...slots,
+				children,
+			});
+			// store the function to update the current mounted component
+			alreadyInitializedElements.set(element, setStore);
 
-		const dispose = bootstrap(
-			() => {
-				const inner = () =>
-					createComponent(Component, {
-						...props,
-						...slots,
-						children,
-					});
+			const dispose = bootstrap(
+				() => {
+					const inner = () => createComponent(Component, store);
 
-				if (isHydrate) {
-					return createComponent(Suspense, {
-						get children() {
-							return inner();
-						},
-					});
-				} else {
-					return inner();
-				}
-			},
-			element,
-			{
-				renderId,
-			},
-		);
-
-		element.addEventListener('astro:unmount', () => dispose(), { once: true });
+					if (isHydrate) {
+						return createComponent(Suspense, {
+							get children() {
+								return inner();
+							},
+						});
+					} else {
+						return inner();
+					}
+				},
+				element,
+				{
+					renderId,
+				},
+			);
+			element.addEventListener('astro:unmount', () => dispose(), { once: true });
+		}
 	};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6c5752503857..9acbdc8aa572 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1721,6 +1721,9 @@ importers:
       '@astrojs/react':
         specifier: workspace:*
         version: link:../../../../integrations/react
+      '@astrojs/solid-js':
+        specifier: workspace:*
+        version: link:../../../../integrations/solid
       '@astrojs/svelte':
         specifier: workspace:*
         version: link:../../../../integrations/svelte
@@ -1736,6 +1739,9 @@ importers:
       react-dom:
         specifier: ^18.3.1
         version: 18.3.1(react@18.3.1)
+      solid-js:
+        specifier: ^1.8.0
+        version: 1.8.22
       svelte:
         specifier: ^4.2.19
         version: 4.2.19

From daca9951f46b692f90e4760a9e285ef8accc7aaf Mon Sep 17 00:00:00 2001
From: Johannes Spohr <martrapp@users.noreply.github.com>
Date: Tue, 17 Sep 2024 13:22:35 +0000
Subject: [PATCH 04/11] [ci] format

---
 packages/astro/e2e/view-transitions.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js
index d5f78f1de08b..64e0e3b793ae 100644
--- a/packages/astro/e2e/view-transitions.test.js
+++ b/packages/astro/e2e/view-transitions.test.js
@@ -567,8 +567,8 @@ test.describe('View Transitions', () => {
 		cnt = page.locator('.counter pre');
 		// Count should remain, but the postfix should be removed again (to test unsetting props)
 		await expect(cnt).toHaveText('A1');
-  });
-  
+	});
+
 	test('Vue Islands can persist using transition:persist', async ({ page, astro }) => {
 		// Go to page 1
 		await page.goto(astro.resolveUrl('/island-vue-one'));

From a582cb61241b9c2a6f95900920145c055d5d6c12 Mon Sep 17 00:00:00 2001
From: Johannes Spohr <johannes.spohr@carvia.de>
Date: Tue, 17 Sep 2024 16:11:32 +0200
Subject: [PATCH 05/11] Fix Svelte view transition state persistence (#12006)

Co-authored-by: Martin Trapp <94928215+martrapp@users.noreply.github.com>
---
 .changeset/warm-birds-cheer.md                |  5 ++++
 .../src/components/SvelteCounter.svelte       |  7 +++--
 .../src/pages/island-svelte-one.astro         | 11 +++++++
 .../src/pages/island-svelte-two.astro         | 11 +++++++
 packages/astro/e2e/view-transitions.test.js   | 22 ++++++++++++--
 packages/integrations/svelte/client-v5.js     | 22 ++++++++++----
 packages/integrations/svelte/client.js        | 29 ++++++++++++-------
 7 files changed, 85 insertions(+), 22 deletions(-)
 create mode 100644 .changeset/warm-birds-cheer.md
 create mode 100644 packages/astro/e2e/fixtures/view-transitions/src/pages/island-svelte-one.astro
 create mode 100644 packages/astro/e2e/fixtures/view-transitions/src/pages/island-svelte-two.astro

diff --git a/.changeset/warm-birds-cheer.md b/.changeset/warm-birds-cheer.md
new file mode 100644
index 000000000000..84d25d272897
--- /dev/null
+++ b/.changeset/warm-birds-cheer.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/svelte': patch
+---
+
+Fix Svelte component view transition state persistence
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/components/SvelteCounter.svelte b/packages/astro/e2e/fixtures/view-transitions/src/components/SvelteCounter.svelte
index 6647a19ce7d0..669ee1a5afe7 100644
--- a/packages/astro/e2e/fixtures/view-transitions/src/components/SvelteCounter.svelte
+++ b/packages/astro/e2e/fixtures/view-transitions/src/components/SvelteCounter.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	let count = 0;
+	export let prefix = "";
 
 	function add() {
 		count += 1;
@@ -11,9 +12,9 @@
 </script>
 
 <div class="counter">
-	<button on:click={subtract}>-</button>
-	<pre>{count}</pre>
-	<button on:click={add}>+</button>
+	<button on:click={subtract} class="decrement">-</button>
+	<pre>{prefix}{count}</pre>
+	<button on:click={add} class="increment">+</button>
 </div>
 <div class="message">
 	<slot />
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/island-svelte-one.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-svelte-one.astro
new file mode 100644
index 000000000000..c60dfa9c9d10
--- /dev/null
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-svelte-one.astro
@@ -0,0 +1,11 @@
+---
+import Counter from '../components/SvelteCounter.svelte';
+import Layout from '../components/Layout.astro';
+export const prerender = false;
+
+---
+<Layout>
+	<p id="island-one">Page 1</p>
+	<a id="click-two" href="/island-svelte-two">go to 2</a>
+	<Counter prefix="A" client:load transition:persist transition:name="counter"/>
+</Layout>
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/island-svelte-two.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-svelte-two.astro
new file mode 100644
index 000000000000..63222bacbc39
--- /dev/null
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-svelte-two.astro
@@ -0,0 +1,11 @@
+---
+import Counter from '../components/SvelteCounter.svelte';
+import Layout from '../components/Layout.astro';
+export const prerender = false;
+
+---
+<Layout>
+	<p id="island-two">Page 2</p>
+	<a id="click-one" href="/island-svelte-one">go to 1</a>
+	<Counter prefix="B" client:load transition:persist transition:name="counter"/>
+</Layout>
diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js
index 64e0e3b793ae..a94c50d0363f 100644
--- a/packages/astro/e2e/view-transitions.test.js
+++ b/packages/astro/e2e/view-transitions.test.js
@@ -543,8 +543,8 @@ test.describe('View Transitions', () => {
 		const pageTitle = page.locator('.page');
 		await expect(pageTitle).toHaveText('Island 2');
 	});
-
-	test('Solid Islands can persist using transition:persist', async ({ page, astro }) => {
+  
+  test('Solid Islands can persist using transition:persist', async ({ page, astro }) => {
 		// Go to page 1
 		await page.goto(astro.resolveUrl('/island-solid-one'));
 		let cnt = page.locator('.counter pre');
@@ -569,6 +569,24 @@ test.describe('View Transitions', () => {
 		await expect(cnt).toHaveText('A1');
 	});
 
+  test('Svelte Islands can persist using transition:persist', async ({ page, astro }) => {
+		// Go to page 1
+		await page.goto(astro.resolveUrl('/island-svelte-one'));
+		let cnt = page.locator('.counter pre');
+		await expect(cnt).toHaveText('A0');
+
+		await page.click('.increment');
+		await expect(cnt).toHaveText('A1');
+
+		// Navigate to page 2
+		await page.click('#click-two');
+		let p = page.locator('#island-two');
+		await expect(p).toBeVisible();
+		cnt = page.locator('.counter pre');
+		// Count should remain, but the prefix should be updated
+		await expect(cnt).toHaveText('B1');
+	});
+  
 	test('Vue Islands can persist using transition:persist', async ({ page, astro }) => {
 		// Go to page 1
 		await page.goto(astro.resolveUrl('/island-vue-one'));
diff --git a/packages/integrations/svelte/client-v5.js b/packages/integrations/svelte/client-v5.js
index fda68ee54878..78bab3ea34b3 100644
--- a/packages/integrations/svelte/client-v5.js
+++ b/packages/integrations/svelte/client-v5.js
@@ -1,5 +1,7 @@
 import { createRawSnippet, hydrate, mount, unmount } from 'svelte';
 
+const existingApplications = new WeakMap();
+
 export default (element) => {
 	return async (Component, props, slotted, { client }) => {
 		if (!element.hasAttribute('ssr')) return;
@@ -21,15 +23,23 @@ export default (element) => {
 		}
 
 		const bootstrap = client !== 'only' ? hydrate : mount;
-
-		const component = bootstrap(Component, {
-			target: element,
-			props: {
+		if (existingApplications.has(element)) {
+			existingApplications.get(element).$set({
 				...props,
 				children,
 				$$slots,
-			},
-		});
+			});
+		} else {
+			const component = bootstrap(Component, {
+				target: element,
+				props: {
+					...props,
+					children,
+					$$slots,
+				},
+			});
+			existingApplications.set(element, component);
+		}
 
 		element.addEventListener('astro:unmount', () => unmount(component), { once: true });
 	};
diff --git a/packages/integrations/svelte/client.js b/packages/integrations/svelte/client.js
index 005bbe9da331..288c7a661b6f 100644
--- a/packages/integrations/svelte/client.js
+++ b/packages/integrations/svelte/client.js
@@ -3,6 +3,8 @@ const noop = () => {};
 let originalConsoleWarning;
 let consoleFilterRefs = 0;
 
+const existingApplications = new WeakMap();
+
 export default (element) => {
 	return (Component, props, slotted, { client }) => {
 		if (!element.hasAttribute('ssr')) return;
@@ -14,18 +16,23 @@ export default (element) => {
 		try {
 			if (import.meta.env.DEV) useConsoleFilter();
 
-			const component = new Component({
-				target: element,
-				props: {
-					...props,
-					$$slots: slots,
-					$$scope: { ctx: [] },
-				},
-				hydrate: client !== 'only',
-				$$inline: true,
-			});
+			if (existingApplications.has(element)) {
+				existingApplications.get(element).$set({ ...props, $$slots: slots, $$scope: { ctx: [] } });
+			} else {
+				const component = new Component({
+					target: element,
+					props: {
+						...props,
+						$$slots: slots,
+						$$scope: { ctx: [] },
+					},
+					hydrate: client !== 'only',
+					$$inline: true,
+				});
+				existingApplications.set(element, component);
 
-			element.addEventListener('astro:unmount', () => component.$destroy(), { once: true });
+				element.addEventListener('astro:unmount', () => component.$destroy(), { once: true });
+			}
 		} finally {
 			if (import.meta.env.DEV) finishUsingConsoleFilter();
 		}

From 00ea675409229048d52fe87aea256729aa4e89b9 Mon Sep 17 00:00:00 2001
From: Johannes Spohr <martrapp@users.noreply.github.com>
Date: Tue, 17 Sep 2024 14:12:42 +0000
Subject: [PATCH 06/11] [ci] format

---
 packages/astro/e2e/view-transitions.test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js
index a94c50d0363f..29f6d0e5efa2 100644
--- a/packages/astro/e2e/view-transitions.test.js
+++ b/packages/astro/e2e/view-transitions.test.js
@@ -543,8 +543,8 @@ test.describe('View Transitions', () => {
 		const pageTitle = page.locator('.page');
 		await expect(pageTitle).toHaveText('Island 2');
 	});
-  
-  test('Solid Islands can persist using transition:persist', async ({ page, astro }) => {
+
+	test('Solid Islands can persist using transition:persist', async ({ page, astro }) => {
 		// Go to page 1
 		await page.goto(astro.resolveUrl('/island-solid-one'));
 		let cnt = page.locator('.counter pre');
@@ -569,7 +569,7 @@ test.describe('View Transitions', () => {
 		await expect(cnt).toHaveText('A1');
 	});
 
-  test('Svelte Islands can persist using transition:persist', async ({ page, astro }) => {
+	test('Svelte Islands can persist using transition:persist', async ({ page, astro }) => {
 		// Go to page 1
 		await page.goto(astro.resolveUrl('/island-svelte-one'));
 		let cnt = page.locator('.counter pre');
@@ -586,7 +586,7 @@ test.describe('View Transitions', () => {
 		// Count should remain, but the prefix should be updated
 		await expect(cnt).toHaveText('B1');
 	});
-  
+
 	test('Vue Islands can persist using transition:persist', async ({ page, astro }) => {
 		// Go to page 1
 		await page.goto(astro.resolveUrl('/island-vue-one'));

From 0b59fe74d5922c572007572ddca8d11482e2fb5c Mon Sep 17 00:00:00 2001
From: Artem Zhirov <mail@azhirov.ru>
Date: Tue, 17 Sep 2024 19:23:48 +0500
Subject: [PATCH 07/11] Fix: prevent island re-rendering when using
 transition:persist (#11854) (#11915)

https://github.com/withastro/astro/issues/11854
---
 .changeset/seven-bees-love.md                    |  5 +++++
 packages/astro/src/transitions/swap-functions.ts | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/seven-bees-love.md

diff --git a/.changeset/seven-bees-love.md b/.changeset/seven-bees-love.md
new file mode 100644
index 000000000000..f1305c9822f6
--- /dev/null
+++ b/.changeset/seven-bees-love.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix: prevent island from re-rendering when using transition:persist (#11854)
diff --git a/packages/astro/src/transitions/swap-functions.ts b/packages/astro/src/transitions/swap-functions.ts
index e2d8557f5d50..c99de8d3df91 100644
--- a/packages/astro/src/transitions/swap-functions.ts
+++ b/packages/astro/src/transitions/swap-functions.ts
@@ -77,7 +77,11 @@ export function swapBodyElement(newElement: Element, oldElement: Element) {
 			// from the old page so that state is preserved.
 			newEl.replaceWith(el);
 			// For islands, copy over the props to allow them to re-render
-			if (newEl.localName === 'astro-island' && shouldCopyProps(el as HTMLElement)) {
+			if (
+				newEl.localName === 'astro-island' &&
+				shouldCopyProps(el as HTMLElement) &&
+				!isSameProps(el, newEl)
+			) {
 				el.setAttribute('ssr', '');
 				el.setAttribute('props', newEl.getAttribute('props')!);
 			}
@@ -133,6 +137,10 @@ const shouldCopyProps = (el: HTMLElement): boolean => {
 	return persistProps == null || persistProps === 'false';
 };
 
+const isSameProps = (oldEl: Element, newEl: Element) => {
+	return oldEl.getAttribute('props') === newEl.getAttribute('props');
+};
+
 export const swapFunctions = {
 	deselectScripts,
 	swapRootAttributes,

From dcd115892a23b17309347c13ce4d82af73d204b2 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Tue, 17 Sep 2024 18:19:22 -0400
Subject: [PATCH 08/11] Make @astrojs/tailwind compat with Astro 5 (#12018)

---
 .changeset/plenty-pandas-repeat.md          | 5 +++++
 packages/integrations/tailwind/package.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/plenty-pandas-repeat.md

diff --git a/.changeset/plenty-pandas-repeat.md b/.changeset/plenty-pandas-repeat.md
new file mode 100644
index 000000000000..64151e63e7ae
--- /dev/null
+++ b/.changeset/plenty-pandas-repeat.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/tailwind': patch
+---
+
+Make @astrojs/tailwind compat with Astro 5
diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index a9e16dd12491..42082a982502 100644
--- a/packages/integrations/tailwind/package.json
+++ b/packages/integrations/tailwind/package.json
@@ -44,7 +44,7 @@
     "vite": "^5.4.3"
   },
   "peerDependencies": {
-    "astro": "^3.0.0 || ^4.0.0",
+    "astro": "^3.0.0 || ^4.0.0 || ^5.0.0-beta.0",
     "tailwindcss": "^3.0.24"
   },
   "publishConfig": {

From 8214114a903850cdf9a13ef31a6b3096cced8847 Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:21:35 -0700
Subject: [PATCH 09/11] [ci] release (#12002)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/five-walls-build.md              |  5 --
 .changeset/grumpy-bobcats-rush.md           |  5 --
 .changeset/healthy-donuts-yell.md           |  5 --
 .changeset/plenty-pandas-repeat.md          |  5 --
 .changeset/seven-bees-love.md               |  5 --
 .changeset/warm-birds-cheer.md              |  5 --
 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-lit/package.json         |  2 +-
 examples/framework-multiple/package.json    |  8 +--
 examples/framework-preact/package.json      |  2 +-
 examples/framework-react/package.json       |  2 +-
 examples/framework-solid/package.json       |  4 +-
 examples/framework-svelte/package.json      |  4 +-
 examples/framework-vue/package.json         |  4 +-
 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/server-islands/package.json        |  4 +-
 examples/ssr/package.json                   |  4 +-
 examples/starlog/package.json               |  2 +-
 examples/toolbar-app/package.json           |  2 +-
 examples/view-transitions/package.json      |  4 +-
 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      |  4 +-
 examples/with-vitest/package.json           |  2 +-
 packages/astro/CHANGELOG.md                 |  8 +++
 packages/astro/package.json                 |  2 +-
 packages/integrations/solid/CHANGELOG.md    |  6 ++
 packages/integrations/solid/package.json    |  2 +-
 packages/integrations/svelte/CHANGELOG.md   |  6 ++
 packages/integrations/svelte/package.json   |  2 +-
 packages/integrations/tailwind/CHANGELOG.md |  6 ++
 packages/integrations/tailwind/package.json |  2 +-
 packages/integrations/vue/CHANGELOG.md      |  6 ++
 packages/integrations/vue/package.json      |  2 +-
 pnpm-lock.yaml                              | 80 ++++++++++-----------
 47 files changed, 117 insertions(+), 115 deletions(-)
 delete mode 100644 .changeset/five-walls-build.md
 delete mode 100644 .changeset/grumpy-bobcats-rush.md
 delete mode 100644 .changeset/healthy-donuts-yell.md
 delete mode 100644 .changeset/plenty-pandas-repeat.md
 delete mode 100644 .changeset/seven-bees-love.md
 delete mode 100644 .changeset/warm-birds-cheer.md

diff --git a/.changeset/five-walls-build.md b/.changeset/five-walls-build.md
deleted file mode 100644
index 41f89aa3e2e3..000000000000
--- a/.changeset/five-walls-build.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/vue': patch
----
-
-Fix vue islands keeping their state when using view transition persistence
diff --git a/.changeset/grumpy-bobcats-rush.md b/.changeset/grumpy-bobcats-rush.md
deleted file mode 100644
index c8b147fa570c..000000000000
--- a/.changeset/grumpy-bobcats-rush.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/solid-js': patch
----
-
-Fix view transition state persistence
diff --git a/.changeset/healthy-donuts-yell.md b/.changeset/healthy-donuts-yell.md
deleted file mode 100644
index ad9079541061..000000000000
--- a/.changeset/healthy-donuts-yell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes an outdated link used to document Content Layer API
diff --git a/.changeset/plenty-pandas-repeat.md b/.changeset/plenty-pandas-repeat.md
deleted file mode 100644
index 64151e63e7ae..000000000000
--- a/.changeset/plenty-pandas-repeat.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/tailwind': patch
----
-
-Make @astrojs/tailwind compat with Astro 5
diff --git a/.changeset/seven-bees-love.md b/.changeset/seven-bees-love.md
deleted file mode 100644
index f1305c9822f6..000000000000
--- a/.changeset/seven-bees-love.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fix: prevent island from re-rendering when using transition:persist (#11854)
diff --git a/.changeset/warm-birds-cheer.md b/.changeset/warm-birds-cheer.md
deleted file mode 100644
index 84d25d272897..000000000000
--- a/.changeset/warm-birds-cheer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/svelte': patch
----
-
-Fix Svelte component view transition state persistence
diff --git a/examples/basics/package.json b/examples/basics/package.json
index 5a98b09e9d36..3c70ccbe37b5 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index b73b0087ede3..d475063daed7 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^3.1.6",
     "@astrojs/rss": "^4.0.7",
     "@astrojs/sitemap": "^3.1.6",
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index c7eb2b45dee1..045b6b3d4180 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   },
   "peerDependencies": {
     "astro": "^4.0.0"
diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json
index 32501eb1e164..b8e831530cd0 100644
--- a/examples/container-with-vitest/package.json
+++ b/examples/container-with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "@astrojs/react": "^3.6.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 9c3da7834ece..25f352204964 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.4.0",
     "@types/alpinejs": "^3.13.10",
     "alpinejs": "^3.14.1",
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index a8025e392b02..b62f58678867 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^4.3.0",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "lit": "^3.2.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index 12dcbd7b6596..453d3aa1ae1f 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -13,12 +13,12 @@
   "dependencies": {
     "@astrojs/preact": "^3.5.3",
     "@astrojs/react": "^3.6.2",
-    "@astrojs/solid-js": "^4.4.1",
-    "@astrojs/svelte": "^5.7.0",
-    "@astrojs/vue": "^4.5.0",
+    "@astrojs/solid-js": "^4.4.2",
+    "@astrojs/svelte": "^5.7.1",
+    "@astrojs/vue": "^4.5.1",
     "@types/react": "^18.3.5",
     "@types/react-dom": "^18.3.0",
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "preact": "^10.23.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 99ad59c37708..c9c1616c7936 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.5.3",
     "@preact/signals": "^1.3.0",
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "preact": "^10.23.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index a9c2675bcb64..813a828af647 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.6.2",
     "@types/react": "^18.3.5",
     "@types/react-dom": "^18.3.0",
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index 774dd74befd6..f89ce7b595f4 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/solid-js": "^4.4.1",
-    "astro": "^4.15.6",
+    "@astrojs/solid-js": "^4.4.2",
+    "astro": "^4.15.7",
     "solid-js": "^1.8.22"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index 7fd20eff2aea..ec392f07aa17 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/svelte": "^5.7.0",
-    "astro": "^4.15.6",
+    "@astrojs/svelte": "^5.7.1",
+    "astro": "^4.15.7",
     "svelte": "^4.2.19"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index e1c419a8da7f..02bebcd11844 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^4.5.0",
-    "astro": "^4.15.6",
+    "@astrojs/vue": "^4.5.1",
+    "astro": "^4.15.7",
     "vue": "^3.5.3"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index e12108fe4aa4..c3a24df5ef3a 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.3.3",
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index 0de1e543dd42..586e27bd291f 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   },
   "peerDependencies": {
     "astro": "^4.0.0"
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index d6a484b2f91e..54fbca59c19a 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.3.3",
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "html-minifier": "^4.0.0"
   },
   "devDependencies": {
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index e84a14866f47..fd32e10b397f 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index 1a2e3ca2a4f7..6d4e39f20eb2 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index 164e52e45724..b2ac40a4e093 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   }
 }
diff --git a/examples/server-islands/package.json b/examples/server-islands/package.json
index f1e6dd40d07a..4deec7ee3ad0 100644
--- a/examples/server-islands/package.json
+++ b/examples/server-islands/package.json
@@ -12,12 +12,12 @@
   "devDependencies": {
     "@astrojs/node": "^8.3.3",
     "@astrojs/react": "^3.6.2",
-    "@astrojs/tailwind": "^5.1.0",
+    "@astrojs/tailwind": "^5.1.1",
     "@fortawesome/fontawesome-free": "^6.6.0",
     "@tailwindcss/forms": "^0.5.9",
     "@types/react": "^18.3.5",
     "@types/react-dom": "^18.3.0",
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "postcss": "^8.4.45",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index 2b6a36ea4e8e..c515a6369280 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -13,8 +13,8 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.3.3",
-    "@astrojs/svelte": "^5.7.0",
-    "astro": "^4.15.6",
+    "@astrojs/svelte": "^5.7.1",
+    "astro": "^4.15.7",
     "svelte": "^4.2.19"
   }
 }
diff --git a/examples/starlog/package.json b/examples/starlog/package.json
index 75b8cae54883..f13fdb2d7fb6 100644
--- a/examples/starlog/package.json
+++ b/examples/starlog/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "sass": "^1.78.0",
     "sharp": "^0.33.3"
   }
diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json
index b2b4124c6df8..ca6916b5f736 100644
--- a/examples/toolbar-app/package.json
+++ b/examples/toolbar-app/package.json
@@ -15,6 +15,6 @@
     "./app": "./dist/app.js"
   },
   "devDependencies": {
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
index ad54f95023fc..b62aac0d5a79 100644
--- a/examples/view-transitions/package.json
+++ b/examples/view-transitions/package.json
@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "devDependencies": {
-    "@astrojs/tailwind": "^5.1.0",
+    "@astrojs/tailwind": "^5.1.1",
     "@astrojs/node": "^8.3.3",
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index e5cb9c3f0271..4d78c73a2bb0 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.11.4",
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index f9bf06d5e133..d6722f56f133 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^5.2.0",
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index af964ce1d4a3..a58e802a19db 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.15.6"
+    "astro": "^4.15.7"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index db071dae8e80..8dfc7cf1e9cd 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^3.1.6",
     "@astrojs/preact": "^3.5.3",
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "preact": "^10.23.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index b20b2fa11e74..a8a862592565 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.5.3",
     "@nanostores/preact": "^0.5.2",
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "nanostores": "^0.11.3",
     "preact": "^10.23.2"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index c33d875663e1..f2df5d3e0475 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -12,9 +12,9 @@
   },
   "dependencies": {
     "@astrojs/mdx": "^3.1.6",
-    "@astrojs/tailwind": "^5.1.0",
+    "@astrojs/tailwind": "^5.1.1",
     "@types/canvas-confetti": "^1.6.4",
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "autoprefixer": "^10.4.20",
     "canvas-confetti": "^1.9.3",
     "postcss": "^8.4.45",
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index 6a2dfbce8732..03ace67a8255 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.15.6",
+    "astro": "^4.15.7",
     "vitest": "^2.0.5"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index f01187d74a29..da1a2688c504 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,13 @@
 # astro
 
+## 4.15.7
+
+### Patch Changes
+
+- [#12000](https://github.com/withastro/astro/pull/12000) [`a2f8c5d`](https://github.com/withastro/astro/commit/a2f8c5d85ff15803f5cedf9148cd70ffc138ddef) Thanks [@ArmandPhilippot](https://github.com/ArmandPhilippot)! - Fixes an outdated link used to document Content Layer API
+
+- [#11915](https://github.com/withastro/astro/pull/11915) [`0b59fe7`](https://github.com/withastro/astro/commit/0b59fe74d5922c572007572ddca8d11482e2fb5c) Thanks [@azhirov](https://github.com/azhirov)! - Fix: prevent island from re-rendering when using transition:persist (#11854)
+
 ## 4.15.6
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index d338b037ca45..a328cade8ecb 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.15.6",
+  "version": "4.15.7",
   "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/solid/CHANGELOG.md b/packages/integrations/solid/CHANGELOG.md
index bc1d135d065b..9f69e7e2f859 100644
--- a/packages/integrations/solid/CHANGELOG.md
+++ b/packages/integrations/solid/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/solid-js
 
+## 4.4.2
+
+### Patch Changes
+
+- [#11998](https://github.com/withastro/astro/pull/11998) [`082f450`](https://github.com/withastro/astro/commit/082f45094471d52e55c55d3291f541306d9388b1) Thanks [@johannesspohr](https://github.com/johannesspohr)! - Fix view transition state persistence
+
 ## 4.4.1
 
 ### Patch Changes
diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json
index 5320cc57e879..7a3cb6e1577a 100644
--- a/packages/integrations/solid/package.json
+++ b/packages/integrations/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/solid-js",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "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 44c3295eb477..88c18163314e 100644
--- a/packages/integrations/svelte/CHANGELOG.md
+++ b/packages/integrations/svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/svelte
 
+## 5.7.1
+
+### Patch Changes
+
+- [#12006](https://github.com/withastro/astro/pull/12006) [`a582cb6`](https://github.com/withastro/astro/commit/a582cb61241b9c2a6f95900920145c055d5d6c12) Thanks [@johannesspohr](https://github.com/johannesspohr)! - Fix Svelte component view transition state persistence
+
 ## 5.7.0
 
 ### Minor Changes
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index a4139d1949d5..7deb15ef8051 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/svelte",
-  "version": "5.7.0",
+  "version": "5.7.1",
   "description": "Use Svelte components within Astro",
   "type": "module",
   "types": "./dist/index.d.ts",
diff --git a/packages/integrations/tailwind/CHANGELOG.md b/packages/integrations/tailwind/CHANGELOG.md
index f796b10830a6..e03f094b2838 100644
--- a/packages/integrations/tailwind/CHANGELOG.md
+++ b/packages/integrations/tailwind/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/tailwind
 
+## 5.1.1
+
+### Patch Changes
+
+- [#12018](https://github.com/withastro/astro/pull/12018) [`dcd1158`](https://github.com/withastro/astro/commit/dcd115892a23b17309347c13ce4d82af73d204b2) Thanks [@matthewp](https://github.com/matthewp)! - Make @astrojs/tailwind compat with Astro 5
+
 ## 5.1.0
 
 ### Minor Changes
diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index 42082a982502..3e383437c0e1 100644
--- a/packages/integrations/tailwind/package.json
+++ b/packages/integrations/tailwind/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/tailwind",
   "description": "Use Tailwind CSS to style your Astro site",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/vue/CHANGELOG.md b/packages/integrations/vue/CHANGELOG.md
index fd9c71e04162..484162980f93 100644
--- a/packages/integrations/vue/CHANGELOG.md
+++ b/packages/integrations/vue/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/vue
 
+## 4.5.1
+
+### Patch Changes
+
+- [#11946](https://github.com/withastro/astro/pull/11946) [`b75bfc8`](https://github.com/withastro/astro/commit/b75bfc8cc41f5c631c10055b78670fdc26dff23a) Thanks [@johannesspohr](https://github.com/johannesspohr)! - Fix vue islands keeping their state when using view transition persistence
+
 ## 4.5.0
 
 ### Minor Changes
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index c7e937e4ba96..7a69a97a490a 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/vue",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "description": "Use Vue components within Astro",
   "type": "module",
   "types": "./dist/index.d.ts",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9acbdc8aa572..0340eec77434 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -116,7 +116,7 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/blog:
@@ -131,13 +131,13 @@ importers:
         specifier: ^3.1.6
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/component:
     devDependencies:
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/container-with-vitest:
@@ -146,7 +146,7 @@ importers:
         specifier: ^3.6.2
         version: link:../../packages/integrations/react
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       react:
         specifier: ^18.3.1
@@ -177,7 +177,7 @@ importers:
         specifier: ^3.14.1
         version: 3.14.1
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/framework-lit:
@@ -189,7 +189,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       lit:
         specifier: ^3.2.0
@@ -204,13 +204,13 @@ importers:
         specifier: ^3.6.2
         version: link:../../packages/integrations/react
       '@astrojs/solid-js':
-        specifier: ^4.4.1
+        specifier: ^4.4.2
         version: link:../../packages/integrations/solid
       '@astrojs/svelte':
-        specifier: ^5.7.0
+        specifier: ^5.7.1
         version: link:../../packages/integrations/svelte
       '@astrojs/vue':
-        specifier: ^4.5.0
+        specifier: ^4.5.1
         version: link:../../packages/integrations/vue
       '@types/react':
         specifier: ^18.3.5
@@ -219,7 +219,7 @@ importers:
         specifier: ^18.3.0
         version: 18.3.0
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       preact:
         specifier: ^10.23.2
@@ -249,7 +249,7 @@ importers:
         specifier: ^1.3.0
         version: 1.3.0(preact@10.23.2)
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       preact:
         specifier: ^10.23.2
@@ -267,7 +267,7 @@ importers:
         specifier: ^18.3.0
         version: 18.3.0
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       react:
         specifier: ^18.3.1
@@ -279,10 +279,10 @@ importers:
   examples/framework-solid:
     dependencies:
       '@astrojs/solid-js':
-        specifier: ^4.4.1
+        specifier: ^4.4.2
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.8.22
@@ -291,10 +291,10 @@ importers:
   examples/framework-svelte:
     dependencies:
       '@astrojs/svelte':
-        specifier: ^5.7.0
+        specifier: ^5.7.1
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.19
@@ -303,10 +303,10 @@ importers:
   examples/framework-vue:
     dependencies:
       '@astrojs/vue':
-        specifier: ^4.5.0
+        specifier: ^4.5.1
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       vue:
         specifier: ^3.5.3
@@ -318,13 +318,13 @@ importers:
         specifier: ^8.3.3
         version: 8.3.3(astro@packages+astro)
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/middleware:
@@ -333,7 +333,7 @@ importers:
         specifier: ^8.3.3
         version: 8.3.3(astro@packages+astro)
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       html-minifier:
         specifier: ^4.0.0
@@ -346,19 +346,19 @@ importers:
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/non-html-pages:
     dependencies:
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/server-islands:
@@ -370,7 +370,7 @@ importers:
         specifier: ^3.6.2
         version: link:../../packages/integrations/react
       '@astrojs/tailwind':
-        specifier: ^5.1.0
+        specifier: ^5.1.1
         version: link:../../packages/integrations/tailwind
       '@fortawesome/fontawesome-free':
         specifier: ^6.6.0
@@ -385,7 +385,7 @@ importers:
         specifier: ^18.3.0
         version: 18.3.0
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       postcss:
         specifier: ^8.4.45
@@ -406,10 +406,10 @@ importers:
         specifier: ^8.3.3
         version: 8.3.3(astro@packages+astro)
       '@astrojs/svelte':
-        specifier: ^5.7.0
+        specifier: ^5.7.1
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.19
@@ -418,7 +418,7 @@ importers:
   examples/starlog:
     dependencies:
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       sass:
         specifier: ^1.78.0
@@ -430,7 +430,7 @@ importers:
   examples/toolbar-app:
     devDependencies:
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/view-transitions:
@@ -439,10 +439,10 @@ importers:
         specifier: ^8.3.3
         version: 8.3.3(astro@packages+astro)
       '@astrojs/tailwind':
-        specifier: ^5.1.0
+        specifier: ^5.1.1
         version: link:../../packages/integrations/tailwind
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/with-markdoc:
@@ -451,7 +451,7 @@ importers:
         specifier: ^0.11.4
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/with-markdown-plugins:
@@ -460,7 +460,7 @@ importers:
         specifier: ^5.2.0
         version: link:../../packages/markdown/remark
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       hast-util-select:
         specifier: ^6.0.2
@@ -481,7 +481,7 @@ importers:
   examples/with-markdown-shiki:
     dependencies:
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
 
   examples/with-mdx:
@@ -493,7 +493,7 @@ importers:
         specifier: ^3.5.3
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       preact:
         specifier: ^10.23.2
@@ -508,7 +508,7 @@ importers:
         specifier: ^0.5.2
         version: 0.5.2(nanostores@0.11.3)(preact@10.23.2)
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.11.3
@@ -523,13 +523,13 @@ importers:
         specifier: ^3.1.6
         version: link:../../packages/integrations/mdx
       '@astrojs/tailwind':
-        specifier: ^5.1.0
+        specifier: ^5.1.1
         version: link:../../packages/integrations/tailwind
       '@types/canvas-confetti':
         specifier: ^1.6.4
         version: 1.6.4
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       autoprefixer:
         specifier: ^10.4.20
@@ -547,7 +547,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^4.15.6
+        specifier: ^4.15.7
         version: link:../../packages/astro
       vitest:
         specifier: ^2.0.5

From 53cb41e30ea5768bf33d9f6be608fb57d31b7b9e Mon Sep 17 00:00:00 2001
From: Matt Kane <m@mk.gg>
Date: Wed, 18 Sep 2024 15:15:51 +0100
Subject: [PATCH 10/11] fix: correctly handle head propagation in content layer
 deferred rendering (#12014)

* chore: run MDX tests against content layer

* Handle head propagation in deferred rendering

* Add changeset

* Update test
---
 .changeset/beige-points-search.md              |  5 +++++
 packages/astro/src/content/runtime.ts          | 13 ++++++-------
 .../content/vite-plugin-content-virtual-mod.ts |  8 ++++----
 .../integrations/mdx/test/css-head-mdx.test.js |  1 +
 .../css-head-mdx/src/components/UsingMdx.astro |  6 +++---
 .../css-head-mdx/src/content/config.ts         | 18 ++++++++++++++++++
 .../src/{content => data}/blog/_styles.css     |  0
 .../src/{content => data}/blog/using-mdx.mdx   |  0
 .../src/{content => data}/posts/test.mdx       |  0
 .../posts/using-component.mdx                  |  0
 .../css-head-mdx/src/pages/posts/[post].astro  |  8 ++++----
 11 files changed, 41 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/beige-points-search.md
 create mode 100644 packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/config.ts
 rename packages/integrations/mdx/test/fixtures/css-head-mdx/src/{content => data}/blog/_styles.css (100%)
 rename packages/integrations/mdx/test/fixtures/css-head-mdx/src/{content => data}/blog/using-mdx.mdx (100%)
 rename packages/integrations/mdx/test/fixtures/css-head-mdx/src/{content => data}/posts/test.mdx (100%)
 rename packages/integrations/mdx/test/fixtures/css-head-mdx/src/{content => data}/posts/using-component.mdx (100%)

diff --git a/.changeset/beige-points-search.md b/.changeset/beige-points-search.md
new file mode 100644
index 000000000000..ed79099720e9
--- /dev/null
+++ b/.changeset/beige-points-search.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes an issue where component styles were not correctly included in rendered MDX
diff --git a/packages/astro/src/content/runtime.ts b/packages/astro/src/content/runtime.ts
index 439d7e11e9cc..e446b3c93632 100644
--- a/packages/astro/src/content/runtime.ts
+++ b/packages/astro/src/content/runtime.ts
@@ -445,13 +445,12 @@ export async function renderEntry(
 		try {
 			// @ts-expect-error	virtual module
 			const { default: contentModules } = await import('astro:content-module-imports');
-			const module = contentModules.get(entry.filePath);
-			const deferredMod = await module();
-			return {
-				Content: deferredMod.Content,
-				headings: deferredMod.getHeadings?.() ?? [],
-				remarkPluginFrontmatter: deferredMod.frontmatter ?? {},
-			};
+			const renderEntryImport = contentModules.get(entry.filePath);
+			return render({
+				collection: '',
+				id: entry.id,
+				renderEntryImport,
+			});
 		} catch (e) {
 			// eslint-disable-next-line
 			console.error(e);
diff --git a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
index 6ffa37a4e1ec..d1a24004e4dd 100644
--- a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
+++ b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
@@ -82,12 +82,12 @@ export function astroContentVirtualModPlugin({
 				const [, query] = id.split('?');
 				const params = new URLSearchParams(query);
 				const fileName = params.get('fileName');
-				let importerPath = undefined;
+				let importPath = undefined;
 				if (fileName && URL.canParse(fileName, settings.config.root.toString())) {
-					importerPath = fileURLToPath(new URL(fileName, settings.config.root));
+					importPath = fileURLToPath(new URL(fileName, settings.config.root))
 				}
-				if (importerPath) {
-					return await this.resolve(importerPath);
+				if (importPath) {
+					return await this.resolve(`${importPath}?${CONTENT_RENDER_FLAG}`);					
 				}
 			}
 
diff --git a/packages/integrations/mdx/test/css-head-mdx.test.js b/packages/integrations/mdx/test/css-head-mdx.test.js
index 083348015c54..6e31d972d2de 100644
--- a/packages/integrations/mdx/test/css-head-mdx.test.js
+++ b/packages/integrations/mdx/test/css-head-mdx.test.js
@@ -15,6 +15,7 @@ describe('Head injection w/ MDX', () => {
 			integrations: [mdx()],
 			// test suite was authored when inlineStylesheets defaulted to never
 			build: { inlineStylesheets: 'never' },
+			experimental: { contentLayer: true }
 		});
 	});
 
diff --git a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/components/UsingMdx.astro b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/components/UsingMdx.astro
index 1804388b0524..3ef9d76390a2 100644
--- a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/components/UsingMdx.astro
+++ b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/components/UsingMdx.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 
-const launchWeek = await getEntryBySlug('blog', 'using-mdx');
-const { Content } = await launchWeek.render();
+const launchWeek = await getEntry('blog', 'using-mdx');
+const { Content } = await render(launchWeek);
 ---
 
 <Content />
diff --git a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/config.ts b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/config.ts
new file mode 100644
index 000000000000..2c8944d51092
--- /dev/null
+++ b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/config.ts
@@ -0,0 +1,18 @@
+import { defineCollection } from "astro:content";
+import { glob } from "astro/loaders"
+
+const posts = defineCollection({
+	loader: glob({
+		pattern: "*.mdx",
+		base: "src/data/posts",
+	})
+});
+
+const blog = defineCollection({
+	loader: glob({
+		pattern: "*.mdx",
+		base: "src/data/blog",
+	})
+});
+
+export const collections = { posts, blog };
diff --git a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/blog/_styles.css b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/data/blog/_styles.css
similarity index 100%
rename from packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/blog/_styles.css
rename to packages/integrations/mdx/test/fixtures/css-head-mdx/src/data/blog/_styles.css
diff --git a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/blog/using-mdx.mdx b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/data/blog/using-mdx.mdx
similarity index 100%
rename from packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/blog/using-mdx.mdx
rename to packages/integrations/mdx/test/fixtures/css-head-mdx/src/data/blog/using-mdx.mdx
diff --git a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/posts/test.mdx b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/data/posts/test.mdx
similarity index 100%
rename from packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/posts/test.mdx
rename to packages/integrations/mdx/test/fixtures/css-head-mdx/src/data/posts/test.mdx
diff --git a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/posts/using-component.mdx b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/data/posts/using-component.mdx
similarity index 100%
rename from packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/posts/using-component.mdx
rename to packages/integrations/mdx/test/fixtures/css-head-mdx/src/data/posts/using-component.mdx
diff --git a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/posts/[post].astro b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/posts/[post].astro
index 5afb5be92216..13a9e56dbf3f 100644
--- a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/posts/[post].astro
+++ b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/posts/[post].astro
@@ -1,17 +1,17 @@
 ---
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 import SmallCaps from '../../components/SmallCaps.astro';
 import Layout from '../../layouts/ContentLayout.astro';
 
 export async function getStaticPaths() {
   const entries = await getCollection('posts');
   return entries.map(entry => {
-    return {params: { post: entry.slug }, props: { entry },
-  }});
+    return { params: { post: entry.id }, props: { entry }};
+	});
 }
 
 const { entry } = Astro.props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 <Layout title="">
   <Content components={{ SmallCaps }} />

From 8d4eb95086ae79339764d02215f84f4f21b96edc Mon Sep 17 00:00:00 2001
From: Matt Kane <ascorbic@users.noreply.github.com>
Date: Wed, 18 Sep 2024 14:16:40 +0000
Subject: [PATCH 11/11] [ci] format

---
 packages/astro/src/content/vite-plugin-content-virtual-mod.ts | 4 ++--
 packages/integrations/mdx/test/css-head-mdx.test.js           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
index d1a24004e4dd..c370976a7ecb 100644
--- a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
+++ b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
@@ -84,10 +84,10 @@ export function astroContentVirtualModPlugin({
 				const fileName = params.get('fileName');
 				let importPath = undefined;
 				if (fileName && URL.canParse(fileName, settings.config.root.toString())) {
-					importPath = fileURLToPath(new URL(fileName, settings.config.root))
+					importPath = fileURLToPath(new URL(fileName, settings.config.root));
 				}
 				if (importPath) {
-					return await this.resolve(`${importPath}?${CONTENT_RENDER_FLAG}`);					
+					return await this.resolve(`${importPath}?${CONTENT_RENDER_FLAG}`);
 				}
 			}
 
diff --git a/packages/integrations/mdx/test/css-head-mdx.test.js b/packages/integrations/mdx/test/css-head-mdx.test.js
index 6e31d972d2de..4d4df5cec402 100644
--- a/packages/integrations/mdx/test/css-head-mdx.test.js
+++ b/packages/integrations/mdx/test/css-head-mdx.test.js
@@ -15,7 +15,7 @@ describe('Head injection w/ MDX', () => {
 			integrations: [mdx()],
 			// test suite was authored when inlineStylesheets defaulted to never
 			build: { inlineStylesheets: 'never' },
-			experimental: { contentLayer: true }
+			experimental: { contentLayer: true },
 		});
 	});