Merge branch 'withastro:main' into main

withastro · Aug 1, 2023 · 081134c · 081134c
2 parents 525a32e + e1e958a
commit 081134c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.changeset/yellow-insects-tell.md b/.changeset/yellow-insects-tell.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix: ignore `.json` files nested in subdirectories within content collection directories starting with an `_` underscore.
diff --git a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
@@ -213,7 +213,7 @@ function globWithUnderscoresIgnored(relContentDir: string, exts: string[]): stri
 	const contentDir = appendForwardSlash(relContentDir);
 	return [
 		`${contentDir}**/*${extGlob}`,
-		`!${contentDir}**/_*/**${extGlob}`,
+		`!${contentDir}**/_*/**/*${extGlob}`,
 		`!${contentDir}**/_*${extGlob}`,
 	];
 }
diff --git a/...tures/content-collections/src/content/with-schema-config/_ignore/ignore/file.md b/...tures/content-collections/src/content/with-schema-config/_ignore/ignore/file.md