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

Improve content collection error message for empty folders (#7118)

Browse source
This commit is contained in:
Erika 2023-05-19 13:53:46 +02:00 committed by GitHub
parent 2b9a25beaf
commit 3257dd2890
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/tasty-geese-fix.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix unnecessary warning showing on start when a collection folder was empty. The warning was also enhanced to add more information about possible causes.

26
packages/astro/src/content/types-generator.ts
View file

@ -101,15 +101,21 @@ export async function createContentTypesGenerator({
readdir: fs.readdir.bind(fs),
readdirSync: fs.readdirSync.bind(fs),
},
onlyFiles: false,
objectMode: true,
});
const entries = globResult
.map((e) => new URL(e, contentPaths.contentDir))
.filter(
// Config loading handled first. Avoid running twice.
(e) => !e.href.startsWith(contentPaths.config.url.href)
);
for (const entry of entries) {
events.push({ type: { name: 'add', entry }, opts: { logLevel: 'warn' } });
for (const entry of globResult) {
const entryURL = new URL(entry.path, contentPaths.contentDir);
if (entryURL.href.startsWith(contentPaths.config.url.href)) continue;
if (entry.dirent.isFile()) {
events.push({
type: { name: 'add', entry: entryURL },
opts: { logLevel: 'warn' },
});
} else if (entry.dirent.isDirectory()) {
events.push({ type: { name: 'addDir', entry: entryURL }, opts: { logLevel: 'warn' } });
}
}
await runEvents();
return { typesGenerated: true };
@ -503,9 +509,9 @@ function warnNonexistentCollections({
warn(
logging,
'content',
`${JSON.stringify(
`The ${JSON.stringify(
configuredCollection
)} is not a collection. Check your content config for typos.`
)} collection does not have an associated folder in your \`content\` directory. Make sure the folder exists, or check your content config for typos.`
);
}
}