michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Content collections: ignored underscore directories in file glob (#7268)

Browse source 
* fix: ignored underscore dirs in glob

* chore: changeset
This commit is contained in:
Ben Holmes 2023-06-02 07:54:50 -04:00 committed by GitHub
parent 6533041ce0
commit 9e7366567e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/rotten-pens-destroy.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix: ignore `.json` files within content collection directories starting with an `_` underscore.

24
packages/astro/src/content/vite-plugin-content-virtual-mod.ts
View file

@ -44,14 +44,21 @@ export function astroContentVirtualModPlugin({
)
.replace('@@CONTENT_DIR@@', relContentDir)
.replace(
'@@CONTENT_ENTRY_GLOB_PATH@@',
// [!_] = ignore files starting with "_"
`${relContentDir}**/[!_]*${getExtGlob(contentEntryExts)}`
"'@@CONTENT_ENTRY_GLOB_PATH@@'",
JSON.stringify(globWithUnderscoresIgnored(relContentDir, contentEntryExts))
)
.replace('@@DATA_ENTRY_GLOB_PATH@@', `${relContentDir}**/[!_]*${getExtGlob(dataEntryExts)}`)
.replace(
'@@RENDER_ENTRY_GLOB_PATH@@',
`${relContentDir}**/*${getExtGlob(/** Note: data collections excluded */ contentEntryExts)}`
"'@@DATA_ENTRY_GLOB_PATH@@'",
JSON.stringify(globWithUnderscoresIgnored(relContentDir, dataEntryExts))
)
.replace(
"'@@RENDER_ENTRY_GLOB_PATH@@'",
JSON.stringify(
globWithUnderscoresIgnored(
relContentDir,
/** Note: data collections excluded */ contentEntryExts
)
)
);
const astroContentVirtualModuleId = '\0' + VIRTUAL_MODULE_ID;
@ -189,3 +196,8 @@ const UnexpectedLookupMapError = new AstroError({
...AstroErrorData.UnknownContentCollectionError,
message: `Unexpected error while parsing content entry IDs and slugs.`,
});
function globWithUnderscoresIgnored(relContentDir: string, exts: string[]): string[] {
const extGlob = getExtGlob(exts);
return [`${relContentDir}/**/*${extGlob}`, `!**/_*/**${extGlob}`, `!**/_*${extGlob}`];
}