Merge branch 'main' into sitemap-xsl

withastro · Oct 1, 2024 · f1b4f08 · f1b4f08
2 parents c261600 + 76c5fbd
commit f1b4f08
Show file tree

Hide file tree

Showing 6 changed files with 198 additions and 180 deletions.
diff --git a/.changeset/afraid-candles-hear.md b/.changeset/afraid-candles-hear.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Adds missing filePath property on content layer entries
diff --git a/.changeset/real-nails-tan.md b/.changeset/real-nails-tan.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix installing non-stable versions of integrations with `astro add`
diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -136,7 +136,7 @@
     "acorn": "^8.12.1",
     "aria-query": "^5.3.2",
     "axobject-query": "^4.1.0",
-    "boxen": "7.1.1",
+    "boxen": "8.0.1",
     "ci-info": "^4.0.0",
     "clsx": "^2.1.1",
     "common-ancestor-path": "^1.0.1",

diff --git a/packages/astro/src/cli/add/index.ts b/packages/astro/src/cli/add/index.ts
@@ -608,7 +608,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}`;
 }
 

diff --git a/packages/astro/src/content/types-generator.ts b/packages/astro/src/content/types-generator.ts
@@ -497,7 +497,7 @@ async function writeContentFiles({
 				contentTypesStr += `};\n`;
 				break;
 			case CONTENT_LAYER_TYPE:
-				dataTypesStr += `${collectionKey}: Record<string, {\n  id: string;\n  collection: ${collectionKey};\n  data: ${dataType};\n  rendered?: RenderedContent \n}>;\n`;
+				dataTypesStr += `${collectionKey}: Record<string, {\n  id: string;\n  collection: ${collectionKey};\n  data: ${dataType};\n  rendered?: RenderedContent;\n  filePath?: string \n}>;\n`;
 				break;
 			case 'data':
 				if (collectionEntryKeys.length === 0) {