Merge branch 'main' into next

5 files changed, 13 insertions, 16 deletions

diff --git a/.changeset/afraid-candles-hear.md b/.changeset/afraid-candles-hear.md
deleted file mode 100644
index 1e0441e4f..000000000
--- a/.changeset/afraid-candles-hear.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Adds missing filePath property on content layer entries
diff --git a/.changeset/fifty-squids-build.md b/.changeset/fifty-squids-build.md
deleted file mode 100644
index cc0678a56..000000000
--- a/.changeset/fifty-squids-build.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-View transitions: Fixes Astro's fade animation to prevent flashing during morph transitions.
diff --git a/.changeset/lemon-flowers-tease.md b/.changeset/lemon-flowers-tease.md
deleted file mode 100644
index e4b2b3f5f..000000000
--- a/.changeset/lemon-flowers-tease.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes injected endpoint `prerender` option detection
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 4094e4731..72e4f87b1 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -228,6 +228,17 @@
 ### Patch Changes
 
 - [#11974](https://github.com/withastro/astro/pull/11974) [`60211de`](https://github.com/withastro/astro/commit/60211defbfb2992ba17d1369e71c146d8928b09a) Thanks [@ascorbic](https://github.com/ascorbic)! - Exports the `RenderResult` type
+## 4.15.10
+
+### Patch Changes
+
+- [#12084](https://github.com/withastro/astro/pull/12084) [`12dae50`](https://github.com/withastro/astro/commit/12dae50c776474748a80cb65c8bf1c67f0825cb0) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Adds missing filePath property on content layer entries
+
+- [#12046](https://github.com/withastro/astro/pull/12046) [`d7779df`](https://github.com/withastro/astro/commit/d7779dfae7bc00ff94b1e4596ff5b4897f65aabe) Thanks [@martrapp](https://github.com/martrapp)! - View transitions: Fixes Astro's fade animation to prevent flashing during morph transitions.
+
+- [#12043](https://github.com/withastro/astro/pull/12043) [`1720c5b`](https://github.com/withastro/astro/commit/1720c5b1d2bfd106ad065833823aed622bee09bc) Thanks [@bluwy](https://github.com/bluwy)! - Fixes injected endpoint `prerender` option detection
+
+- [#12095](https://github.com/withastro/astro/pull/12095) [`76c5fbd`](https://github.com/withastro/astro/commit/76c5fbd6f3a8d41367f1d7033278d133d518213b) Thanks [@TheOtterlord](https://github.com/TheOtterlord)! - Fix installing non-stable versions of integrations with `astro add`
 
 ## 4.15.9
 
diff --git a/packages/astro/src/cli/add/index.ts b/packages/astro/src/cli/add/index.ts
index fdaae94ff..313f4f89a 100644
--- a/packages/astro/src/cli/add/index.ts
+++ b/packages/astro/src/cli/add/index.ts
@@ -604,7 +604,8 @@ async function resolveRangeToInstallSpecifier(name: string, range: string): Prom
 	if (versions instanceof Error) return name;
 	// Filter out any prerelease versions, but fallback if there are no stable versions
 	const stableVersions = versions.filter((v) => !v.includes('-'));
-	const maxStable = maxSatisfying(stableVersions.length !== 0 ? stableVersions : versions, range);
+	const maxStable = maxSatisfying(stableVersions, range) ?? maxSatisfying(versions, range);
+	if (!maxStable) return name;
 	return `${name}@^${maxStable}`;
 }