diff --git a/packages/astro/src/content/vite-plugin-content-assets.ts b/packages/astro/src/content/vite-plugin-content-assets.ts index bfaa02150a76..7610d9f9d0db 100644 --- a/packages/astro/src/content/vite-plugin-content-assets.ts +++ b/packages/astro/src/content/vite-plugin-content-assets.ts @@ -110,7 +110,7 @@ export function astroConfigBuildPlugin(options: StaticBuildOptions, internals: B const pageData = getPageDataByViteID(internals, pageViteID); if (!pageData) continue; - const _entryCss = pageData.contentCollectionCss?.get(id); + const _entryCss = pageData.propagatedStyles?.get(id); const _entryScripts = pageData.propagatedScripts?.get(id); if(_entryCss) { for(const value of _entryCss) { diff --git a/packages/astro/src/core/build/graph.ts b/packages/astro/src/core/build/graph.ts index 29a0429b3b89..a0ae053d5f1a 100644 --- a/packages/astro/src/core/build/graph.ts +++ b/packages/astro/src/core/build/graph.ts @@ -41,9 +41,8 @@ export function moduleIsTopLevelPage(info: ModuleInfo): boolean { export function* getTopLevelPages( id: string, ctx: { getModuleInfo: GetModuleInfo }, - walkUntil?: (importer: string) => boolean ): Generator<[ModuleInfo, number, number], void, unknown> { - for (const res of walkParentInfos(id, ctx, walkUntil)) { + for (const res of walkParentInfos(id, ctx)) { if (moduleIsTopLevelPage(res[0])) { yield res; } diff --git a/packages/astro/src/core/build/page-data.ts b/packages/astro/src/core/build/page-data.ts index 1504234f5af5..71de5da4b91d 100644 --- a/packages/astro/src/core/build/page-data.ts +++ b/packages/astro/src/core/build/page-data.ts @@ -54,7 +54,7 @@ export async function collectPagesData( route, moduleSpecifier: '', css: new Map(), - contentCollectionCss: new Map(), + propagatedStyles: new Map(), propagatedScripts: new Map(), hoistedScript: undefined, }; @@ -77,7 +77,7 @@ export async function collectPagesData( route, moduleSpecifier: '', css: new Map(), - contentCollectionCss: new Map(), + propagatedStyles: new Map(), propagatedScripts: new Map(), hoistedScript: undefined, }; diff --git a/packages/astro/src/core/build/plugins/plugin-css.ts b/packages/astro/src/core/build/plugins/plugin-css.ts index acd59746a9df..0d57cfb5e668 100644 --- a/packages/astro/src/core/build/plugins/plugin-css.ts +++ b/packages/astro/src/core/build/plugins/plugin-css.ts @@ -176,8 +176,8 @@ export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] if (pageData) { for (const css of meta.importedCss) { const existingCss = - pageData.contentCollectionCss.get(pageInfo.id) ?? new Set(); - pageData.contentCollectionCss.set( + pageData.propagatedStyles.get(pageInfo.id) ?? new Set(); + pageData.propagatedStyles.set( pageInfo.id, new Set([...existingCss, css]) ); diff --git a/packages/astro/src/core/build/types.ts b/packages/astro/src/core/build/types.ts index 9f28d70f4614..f34089bc1914 100644 --- a/packages/astro/src/core/build/types.ts +++ b/packages/astro/src/core/build/types.ts @@ -21,7 +21,7 @@ export interface PageBuildData { route: RouteData; moduleSpecifier: string; css: Map; - contentCollectionCss: Map>; + propagatedStyles: Map>; propagatedScripts: Map>; hoistedScript: { type: 'inline' | 'external'; value: string } | undefined; }