Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-01-20 22:12:38 -05:00
Code Issues Activity

fix: do not generate a stub for content types (#12909)

Browse source
This commit is contained in:
Florian Lefebvre 2025-01-06 16:11:34 +01:00 • committed by GitHub
parent 96dade6778
commit 011fa0f00c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/great-hotels-reply.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes a case where `astro:content` types would be erased when restarting the dev server

10
packages/astro/src/core/sync/index.ts
View file

@ -150,17 +150,15 @@ export async function syncInternal({
settings.timer.end('Sync content layer');
} else {
const paths = getContentPaths(settings.config, fs);
// Content is synced after writeFiles. That means references are not created
// To work around it, we create a stub so the reference is created and content
// sync will override the empty file
if (
paths.config.exists ||
// Legacy collections don't require a config file
(settings.config.legacy?.collections && fs.existsSync(paths.contentDir))
) {
// We only create the reference, without a stub to avoid overriding the
// already generated types
settings.injectedTypes.push({
filename: CONTENT_TYPES_FILE,
content: '',
});
}
}
@ -182,7 +180,9 @@ function writeInjectedTypes(settings: AstroSettings, fs: typeof fsMod) {
for (const { filename, content } of settings.injectedTypes) {
const filepath = fileURLToPath(new URL(filename, settings.dotAstroDir));
fs.mkdirSync(dirname(filepath), { recursive: true });
fs.writeFileSync(filepath, content, 'utf-8');
if (content) {
fs.writeFileSync(filepath, content, 'utf-8');
}
references.push(normalizePath(relative(fileURLToPath(settings.dotAstroDir), filepath)));
}

3
packages/astro/src/types/astro.ts
View file

@ -64,7 +64,8 @@ export interface AstroSettings {
latestAstroVersion: string | undefined;
serverIslandMap: NonNullable<SSRManifest['serverIslandMap']>;
serverIslandNameMap: NonNullable<SSRManifest['serverIslandNameMap']>;
injectedTypes: Array<InjectedType>;
// This makes content optional. Internal only so it's not optional on InjectedType
injectedTypes: Array<Omit<InjectedType, 'content'> & Partial<Pick<InjectedType, 'content'>>>;
/**
* Determine if the build output should be a static, dist folder or a adapter-based server output
* undefined when unknown