update based on code review

withastro · Feb 6, 2023 · 9df9d3a · 9df9d3a
1 parent b44f4de
commit 9df9d3a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -21,7 +21,7 @@ export interface PageBuildData {
 	route: RouteData;
 	moduleSpecifier: string;
 	css: Map<string, { depth: number; order: number }>;
-	contentCollectionCss: Map<string, Set<string>>;
+	propagatedStyles: Map<string, Set<string>>;
 	propagatedScripts: Map<string, Set<string>>;
 	hoistedScript: { type: 'inline' | 'external'; value: string } | undefined;
 }