fix(page-data): add key to allPages

packages/astro/src/core/build/internal.ts

@@ -45,7 +45,7 @@ export interface BuildInternals {
 	/**
 	 * A map for page-specific information.
 	 */
-	pagesByComponent: Map<string, PageBuildData>;
+	pagesByKeys: Map<string, PageBuildData>;
 
 	/**
 	 * A map for page-specific output.
@@ -125,7 +125,7 @@ export function createBuildInternals(): BuildInternals {
 		inlinedScripts: new Map(),
 		entrySpecifierToBundleMap: new Map<string, string>(),
 		pageToBundleMap: new Map<string, string>(),
-		pagesByComponent: new Map(),
+		pagesByKeys: new Map(),
 		pageOptionsByPage: new Map(),
 		pagesByViteID: new Map(),
 		pagesByClientOnly: new Map(),
@@ -151,7 +151,7 @@ export function trackPageData(
 	componentURL: URL
 ): void {
 	pageData.moduleSpecifier = componentModuleId;
-	internals.pagesByComponent.set(component, pageData);
+	internals.pagesByKeys.set(pageData.key, pageData);
 	internals.pagesByViteID.set(viteID(componentURL), pageData);
 }
 
@@ -223,8 +223,9 @@ export function getPageDataByComponent(
 	internals: BuildInternals,
 	component: string
 ): PageBuildData | undefined {
-	if (internals.pagesByComponent.has(component)) {
-		return internals.pagesByComponent.get(component);
+	// TODO: Refactor that
+	if (internals.pagesByKeys.has(component)) {
+		return internals.pagesByKeys.get(component);
 	}
 	return undefined;
 }
@@ -243,44 +244,8 @@ export function hasPageDataByViteID(internals: BuildInternals, viteid: ViteID):
 	return internals.pagesByViteID.has(viteid);
 }
 
-export function* eachPageData(internals: BuildInternals) {
-	yield* internals.pagesByComponent.values();
-}
-
-export function* eachPageFromAllPages(allPages: AllPagesData): Generator<[string, PageBuildData]> {
-	for (const [path, pageData] of Object.entries(allPages)) {
-		yield [path, pageData];
-	}
-}
-
-export function* eachPageDataFromEntryPoint(
-	internals: BuildInternals
-): Generator<[PageBuildData, string]> {
-	for (const [entrypoint, filePath] of internals.entrySpecifierToBundleMap) {
-		// virtual pages can be emitted with different prefixes:
-		// - the classic way are pages emitted with prefix ASTRO_PAGE_RESOLVED_MODULE_ID -> plugin-pages
-		// - pages emitted using `build.split`, in this case pages are emitted with prefix RESOLVED_SPLIT_MODULE_ID
-		if (
-			entrypoint.includes(ASTRO_PAGE_RESOLVED_MODULE_ID) ||
-			entrypoint.includes(RESOLVED_SPLIT_MODULE_ID)
-		) {
-			const [, pageName] = entrypoint.split(':');
-			const pageData = internals.pagesByComponent.get(
-				`${pageName.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, '.')}`
-			);
-			if (!pageData) {
-				throw new Error(
-					"Build failed. Astro couldn't find the emitted page from " + pageName + ' pattern'
-				);
-			}
-
-			yield [pageData, filePath];
-		}
-	}
-}
-
 export function hasPrerenderedPages(internals: BuildInternals) {
-	for (const pageData of eachPageData(internals)) {
+	for (const pageData of internals.pagesByKeys.values()) {
 		if (pageData.route.prerender) {
 			return true;
 		}

packages/astro/src/core/build/page-data.ts

@@ -35,6 +35,8 @@ export async function collectPagesData(
 	// and is then cached across all future SSR builds. In the past, we've had trouble
 	// with parallelized builds without guaranteeing that this is called first.
 	for (const route of manifest.routes) {
+		// Generate a unique key to identify each page in the build process.
+		const key = `${route.route}_${route.component}`;
 		// static route:
 		if (route.pathname) {
 			const routeCollectionLogTimeout = setInterval(() => {
@@ -47,8 +49,8 @@ export async function collectPagesData(
 				clearInterval(routeCollectionLogTimeout);
 			}, 10000);
 			builtPaths.add(route.pathname);
-
-			allPages[route.component] = {
+			allPages[key] = {
+				key: key,
 				component: route.component,
 				route,
 				moduleSpecifier: '',
@@ -72,8 +74,8 @@ export async function collectPagesData(
 			continue;
 		}
 		// dynamic route:
-
-		allPages[route.component] = {
+		allPages[key] = {
+			key: key,
 			component: route.component,
 			route,
 			moduleSpecifier: '',

packages/astro/src/core/build/pipeline.ts

@@ -180,13 +180,13 @@ export class BuildPipeline extends Pipeline {
 		for (const [entrypoint, filePath] of this.internals.entrySpecifierToBundleMap) {
 			// virtual pages can be emitted with different prefixes:
 			// - the classic way are pages emitted with prefix ASTRO_PAGE_RESOLVED_MODULE_ID -> plugin-pages
-			// - pages emitted using `build.split`, in this case pages are emitted with prefix RESOLVED_SPLIT_MODULE_ID
+			// - pages emitted using `functionPerRoute`, in this case pages are emitted with prefix RESOLVED_SPLIT_MODULE_ID
 			if (
 				entrypoint.includes(ASTRO_PAGE_RESOLVED_MODULE_ID) ||
 				entrypoint.includes(RESOLVED_SPLIT_MODULE_ID)
 			) {
 				const [, pageName] = entrypoint.split(':');
-				const pageData = this.internals.pagesByComponent.get(
+				const pageData = this.internals.pagesByKeys.get(
 					`${pageName.replace(ASTRO_PAGE_EXTENSION_POST_PATTERN, '.')}`
 				);
 				if (!pageData) {
@@ -199,9 +199,9 @@ export class BuildPipeline extends Pipeline {
 			}
 		}
 
-		for (const [path, pageData] of this.internals.pagesByComponent.entries()) {
+		for (const pageData of this.internals.pagesByKeys.values()) {
 			if (routeIsRedirect(pageData.route)) {
-				pages.set(pageData, path);
+				pages.set(pageData, pageData.component);
 			} else if (
 				routeIsFallback(pageData.route) &&
 				(i18nHasFallback(this.config) ||
@@ -213,7 +213,10 @@ export class BuildPipeline extends Pipeline {
 				// The values of the map are the actual `.mjs` files that are generated during the build
 
 				// Here, we take the component path and transform it in the virtual module name
-				const moduleSpecifier = getVirtualModulePageNameFromPath(ASTRO_PAGE_MODULE_ID, path);
+				const moduleSpecifier = getVirtualModulePageNameFromPath(
+					ASTRO_PAGE_MODULE_ID,
+					pageData.component
+				);
 				// We retrieve the original JS module
 				const filePath = this.internals.entrySpecifierToBundleMap.get(moduleSpecifier);
 				if (filePath) {

packages/astro/src/core/build/plugins/plugin-css.ts

@@ -15,7 +15,6 @@ import {
 	moduleIsTopLevelPage,
 } from '../graph.js';
 import {
-	eachPageData,
 	getPageDataByViteID,
 	getPageDatasByClientOnlyID,
 	getPageDatasByHoistedScriptId,
@@ -214,7 +213,7 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
 				(chunk) => chunk.type === 'asset' && chunk.name === 'style.css'
 			);
 			if (cssChunk === undefined) return;
-			for (const pageData of eachPageData(internals)) {
+			for (const pageData of internals.pagesByKeys.values()) {
 				const cssToInfoMap = (pagesToCss[pageData.moduleSpecifier] ??= {});
 				cssToInfoMap[cssChunk.fileName] = { depth: -1, order: -1 };
 			}
@@ -251,7 +250,7 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
 					? { type: 'inline', content: stylesheet.source }
 					: { type: 'external', src: stylesheet.fileName };
 
-				const pages = Array.from(eachPageData(internals));
+				const pages = Array.from(internals.pagesByKeys.values());
 				let sheetAddedToPage = false;
 
 				pages.forEach((pageData) => {

packages/astro/src/core/build/plugins/plugin-manifest.ts

@@ -189,7 +189,10 @@ function buildManifest(
 	}
 
 	for (const route of opts.manifest.routes) {
-		const pageData = internals.pagesByComponent.get(route.component);
+		let pageData;
+		for (const page of internals.pagesByKeys.values()) {
+			if (page.route.route == route.route) pageData = page;
+		}
 		if (route.prerender || !pageData) continue;
 		const scripts: SerializedRouteInfo['scripts'] = [];
 		if (pageData.hoistedScript) {

packages/astro/src/core/build/plugins/plugin-pages.ts

@@ -1,7 +1,7 @@
 import type { Plugin as VitePlugin } from 'vite';
 import { routeIsRedirect } from '../../redirects/index.js';
 import { addRollupInput } from '../add-rollup-input.js';
-import { type BuildInternals, eachPageFromAllPages } from '../internal.js';
+import { type BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
 import type { StaticBuildOptions } from '../types.js';
 import { RENDERERS_MODULE_ID } from './plugin-renderers.js';
@@ -22,11 +22,11 @@ function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): V
 			if (opts.settings.config.output === 'static') {
 				const inputs = new Set<string>();
 
-				for (const [path, pageData] of eachPageFromAllPages(opts.allPages)) {
+				for (const pageData of Object.values(opts.allPages)) {
 					if (routeIsRedirect(pageData.route)) {
 						continue;
 					}
-					inputs.add(getVirtualModulePageNameFromPath(ASTRO_PAGE_MODULE_ID, path));
+					inputs.add(getVirtualModulePageNameFromPath(ASTRO_PAGE_MODULE_ID, pageData.component));
 				}
 
 				return addRollupInput(options, Array.from(inputs));
@@ -42,7 +42,9 @@ function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): V
 				const imports: string[] = [];
 				const exports: string[] = [];
 				const pageName = getPathFromVirtualModulePageName(ASTRO_PAGE_RESOLVED_MODULE_ID, id);
-				const pageData = internals.pagesByComponent.get(pageName);
+				// TODO: Change that
+				// const pageData = internals.pagesByKeys.get(pageName);
+				const pageData = tmp(internals.pagesByKeys, pageName);
 				if (pageData) {
 					const resolvedPage = await this.resolve(pageData.moduleSpecifier);
 					if (resolvedPage) {
@@ -72,3 +74,12 @@ export function pluginPages(opts: StaticBuildOptions, internals: BuildInternals)
 		},
 	};
 }
+
+/**
+ * TMP: This is a temporary function to get the page data from the pagesByKeys map.
+ */
+function tmp(pagesByKeys: Map<string, any>, pageName: string) {
+	for (const pages of pagesByKeys.values()) {
+		if (pages.component == pageName) return pages;
+	}
+}

packages/astro/src/core/build/plugins/plugin-ssr.ts

@@ -7,7 +7,6 @@ import { isServerLikeOutput } from '../../../prerender/utils.js';
 import { routeIsRedirect } from '../../redirects/index.js';
 import { addRollupInput } from '../add-rollup-input.js';
 import type { BuildInternals } from '../internal.js';
-import { eachPageFromAllPages } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
 import type { StaticBuildOptions } from '../types.js';
 import { SSR_MANIFEST_VIRTUAL_MODULE_ID } from './plugin-manifest.js';
@@ -44,18 +43,21 @@ function vitePluginSSR(
 				let i = 0;
 				const pageMap: string[] = [];
 
-				for (const [path, pageData] of eachPageFromAllPages(allPages)) {
+				for (const pageData of Object.values(allPages)) {
 					if (routeIsRedirect(pageData.route)) {
 						continue;
 					}
-					const virtualModuleName = getVirtualModulePageNameFromPath(ASTRO_PAGE_MODULE_ID, path);
+					const virtualModuleName = getVirtualModulePageNameFromPath(
+						ASTRO_PAGE_MODULE_ID,
+						pageData.component
+					);
 					let module = await this.resolve(virtualModuleName);
 					if (module) {
 						const variable = `_page${i}`;
 						// we need to use the non-resolved ID in order to resolve correctly the virtual module
 						imports.push(`const ${variable} = () => import("${virtualModuleName}");`);
 
-						const pageData2 = internals.pagesByComponent.get(path);
+						const pageData2 = internals.pagesByKeys.get(pageData.key);
 						if (pageData2) {
 							pageMap.push(`[${JSON.stringify(pageData2.component)}, ${variable}]`);
 						}
@@ -147,11 +149,11 @@ function vitePluginSSRSplit(
 			if (functionPerRouteEnabled) {
 				const inputs = new Set<string>();
 
-				for (const [path, pageData] of eachPageFromAllPages(options.allPages)) {
+				for (const pageData of Object.values(options.allPages)) {
 					if (routeIsRedirect(pageData.route)) {
 						continue;
 					}
-					inputs.add(getVirtualModulePageNameFromPath(SPLIT_MODULE_ID, path));
+					inputs.add(getVirtualModulePageNameFromPath(SPLIT_MODULE_ID, pageData.component));
 				}
 
 				return addRollupInput(opts, Array.from(inputs));
@@ -293,8 +295,8 @@ function storeEntryPoint(
 	fileName: string
 ) {
 	const componentPath = getPathFromVirtualModulePageName(RESOLVED_SPLIT_MODULE_ID, moduleKey);
-	for (const [page, pageData] of eachPageFromAllPages(options.allPages)) {
-		if (componentPath == page) {
+	for (const pageData of Object.values(options.allPages)) {
+		if (componentPath == pageData.component) {
 			const publicPath = fileURLToPath(options.settings.config.build.server);
 			internals.entryPoints.set(pageData.route, pathToFileURL(join(publicPath, fileName)));
 		}

packages/astro/src/core/build/static-build.ts

@@ -9,11 +9,7 @@ import * as vite from 'vite';
 import type { RouteData } from '../../@types/astro.js';
 import { PROPAGATED_ASSET_FLAG } from '../../content/consts.js';
 import { hasAnyContentFlag } from '../../content/utils.js';
-import {
-	type BuildInternals,
-	createBuildInternals,
-	eachPageData,
-} from '../../core/build/internal.js';
+import { type BuildInternals, createBuildInternals } from '../../core/build/internal.js';
 import { emptyDir, removeEmptyDirs } from '../../core/fs/index.js';
 import { appendForwardSlash, prependForwardSlash, removeFileExtension } from '../../core/path.js';
 import { isModeServerWithNoAdapter } from '../../core/util.js';
@@ -37,7 +33,6 @@ import { encodeName, getTimeStat, viteBuildReturnToRollupOutputs } from './util.
 
 export async function viteBuild(opts: StaticBuildOptions) {
 	const { allPages, settings } = opts;
-
 	// Make sure we have an adapter before building
 	if (isModeServerWithNoAdapter(opts.settings)) {
 		throw new AstroError(AstroErrorData.NoAdapterInstalled);
@@ -46,17 +41,18 @@ export async function viteBuild(opts: StaticBuildOptions) {
 	settings.timer.start('SSR build');
 
 	// The pages to be built for rendering purposes.
+	// (comment above may be outdated ?)
 	const pageInput = new Set<string>();
 
 	// Build internals needed by the CSS plugin
 	const internals = createBuildInternals();
 
-	for (const [component, pageData] of Object.entries(allPages)) {
-		const astroModuleURL = new URL('./' + component, settings.config.root);
-		const astroModuleId = prependForwardSlash(component);
+	for (const pageData of Object.values(allPages)) {
+		const astroModuleURL = new URL('./' + pageData.component, settings.config.root);
+		const astroModuleId = prependForwardSlash(pageData.component);
 
 		// Track the page data in internals
-		trackPageData(internals, component, pageData, astroModuleId, astroModuleURL);
+		trackPageData(internals, pageData.component, pageData, astroModuleId, astroModuleURL);
 
 		if (!routeIsRedirect(pageData.route)) {
 			pageInput.add(astroModuleId);
@@ -73,7 +69,6 @@ export async function viteBuild(opts: StaticBuildOptions) {
 	// Register plugins
 	const container = createPluginContainer(opts, internals);
 	registerAllPlugins(container);
-
 	// Build your project (SSR application code, assets, client JS, etc.)
 	const ssrTime = performance.now();
 	opts.logger.info('build', `Building ${settings.config.output} entrypoints...`);
@@ -271,7 +266,7 @@ async function ssrBuild(
 
 	const updatedViteBuildConfig = await runHookBuildSetup({
 		config: settings.config,
-		pages: internals.pagesByComponent,
+		pages: internals.pagesByKeys,
 		vite: viteBuildConfig,
 		target: 'server',
 		logger: opts.logger,
@@ -332,7 +327,7 @@ async function clientBuild(
 
 	await runHookBuildSetup({
 		config: settings.config,
-		pages: internals.pagesByComponent,
+		pages: internals.pagesByKeys,
 		vite: viteBuildConfig,
 		target: 'client',
 		logger: opts.logger,
@@ -373,7 +368,7 @@ async function cleanStaticOutput(
 	ssrOutputChunkNames: string[]
 ) {
 	const allStaticFiles = new Set();
-	for (const pageData of eachPageData(internals)) {
+	for (const pageData of internals.pagesByKeys.values()) {
 		if (pageData.route.prerender && !pageData.hasSharedModules) {
 			const { moduleSpecifier } = pageData;
 			const pageBundleId = internals.pageToBundleMap.get(moduleSpecifier);

packages/astro/src/core/build/types.ts

@@ -21,6 +21,7 @@ export type StylesheetAsset =
 	| { type: 'external'; src: string };
 
 export interface PageBuildData {
+	key: string;
 	component: ComponentPath;
 	route: RouteData;
 	moduleSpecifier: string;