Fixes for tests in environment branch

.changeset/wet-lines-wear.md

@@ -0,0 +1,7 @@
+---
+'astro': major
+---
+
+Remove astro:ssr-manifest module
+
+The `astro:ssr-manifest` module was created to allow integrations to access the manifest. It's no longer used by any integrations and is not used by Astro internally, so has been removed.

packages/astro/dev-only.d.ts

@@ -79,3 +79,8 @@ declare module 'virtual:astro:dev-css' {
 	import type { ImportedDevStyles } from './src/types/astro.js';
 	export const css: Set<ImportedDevStyles>;
 }
+
+declare module 'virtual:astro:dev-css-all' {
+	import type { ImportedDevStyles } from './src/types/astro.js';
+	export const devCSSMap: Map<string, () => Promise<{ css: Set<ImportedDevStyles> }>>;
+}

packages/astro/src/assets/utils/node.ts

@@ -96,7 +96,7 @@ export async function emitImageMetadata(
 	Object.defineProperty(emittedImage, 'fsPath', {
 		enumerable: false,
 		writable: false,
-		value: id,
+		value: fileURLToNormalizedPath(url),
 	});
 
 	// Build

packages/astro/src/content/vite-plugin-content-assets.ts

@@ -18,6 +18,7 @@ import {
 	STYLES_PLACEHOLDER,
 } from './consts.js';
 import { hasContentFlag } from './utils.js';
+import { joinPaths, prependForwardSlash, slash } from '@astrojs/internal-helpers/path';
 
 export function astroContentAssetPropagationPlugin({
 	settings,
@@ -194,6 +195,7 @@ async function getStylesForURL(
  * with actual styles from propagatedStylesMap.
  */
 export async function contentAssetsBuildPostHook(
+	base: string,
 	internals: BuildInternals,
 	{
 		ssrOutputs,
@@ -233,7 +235,7 @@ export async function contentAssetsBuildPostHook(
 				// links. Refactor this away in the future.
 				for (const value of entryCss) {
 					if (value.type === 'inline') entryStyles.add(value.content);
-					if (value.type === 'external') entryLinks.add(value.src);
+					if (value.type === 'external') entryLinks.add(prependForwardSlash(joinPaths(base, slash(value.src))));
 				}
 			}
 		}

packages/astro/src/core/app/dev/pipeline.ts

@@ -1,11 +1,10 @@
-import type { ComponentInstance } from '../../../types/astro.js';
+import type { ComponentInstance, ImportedDevStyle } from '../../../types/astro.js';
 import type {
 	DevToolbarMetadata,
 	RewritePayload,
 	RouteData,
 	SSRElement,
 } from '../../../types/public/index.js';
-import { getDevCSSModuleName } from '../../../vite-plugin-css/util.js';
 import { type HeadElements, Pipeline, type TryRewriteResult } from '../../base-pipeline.js';
 import { ASTRO_VERSION } from '../../constants.js';
 import { createModuleScriptElement, createStylesheetElementSet } from '../../render/ssr-element.js';
@@ -93,7 +92,16 @@ export class DevPipeline extends Pipeline {
 			scripts.add({ props: {}, children });
 		}
 
-		const { css } = await import(getDevCSSModuleName(routeData.component));
+		const { devCSSMap } = await import('virtual:astro:dev-css-all');
+
+		const importer = devCSSMap.get(routeData.component);
+		let css = new Set<ImportedDevStyle>();
+		if(importer) {
+			const cssModule = await importer();
+			css = cssModule.css;				
+		} else {
+			this.logger.warn('assets', `Unable to find CSS for ${routeData.component}. This is likely a bug in Astro.`);
+		}
 
 		// Pass framework CSS in as style tags to be appended to the page.
 		for (const { id, url: src, content } of css) {

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

@@ -9,6 +9,7 @@ import {
 	prepareAssetsGenerationEnv,
 } from '../../assets/build/generate.js';
 import {
+	collapseDuplicateTrailingSlashes,
 	isRelativePath,
 	joinPaths,
 	removeLeadingForwardSlash,
@@ -470,7 +471,7 @@ function getUrlForPath(
 	}
 	let buildPathname: string;
 	if (pathname === '/' || pathname === '') {
-		buildPathname = base;
+		buildPathname = collapseDuplicateTrailingSlashes(base + ending, trailingSlash !== 'never');
 	} else if (routeType === 'endpoint') {
 		const buildPathRelative = removeLeadingForwardSlash(pathname);
 		buildPathname = joinPaths(base, buildPathRelative);

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

@@ -1,7 +1,6 @@
 import type { SSRResult } from '../../types/public/internal.js';
 import { prependForwardSlash, removeFileExtension } from '../path.js';
 import { viteID } from '../util.js';
-import { makePageDataKey } from './plugins/util.js';
 import type { PageBuildData, StylesheetAsset, ViteID } from './types.js';
 
 export interface BuildInternals {
@@ -203,24 +202,6 @@ export function* getPageDatasByClientOnlyID(
 	}
 }
 
-/**
- * From its route and component, get the page data from the build internals.
- * @param internals Build Internals with all the pages
- * @param route The route of the page, used to identify the page
- * @param component The component of the page, used to identify the page
- */
-export function getPageData(
-	internals: BuildInternals,
-	route: string,
-	component: string,
-): PageBuildData | undefined {
-	let pageData = internals.pagesByKeys.get(makePageDataKey(route, component));
-	if (pageData) {
-		return pageData;
-	}
-	return undefined;
-}
-
 export function getPageDataByViteID(
 	internals: BuildInternals,
 	viteid: ViteID,
@@ -239,55 +220,3 @@ export function hasPrerenderedPages(internals: BuildInternals) {
 	}
 	return false;
 }
-
-interface OrderInfo {
-	depth: number;
-	order: number;
-}
-
-/**
- * Sort a page's CSS by depth. A higher depth means that the CSS comes from shared subcomponents.
- * A lower depth means it comes directly from the top-level page.
- * Can be used to sort stylesheets so that shared rules come first
- * and page-specific rules come after.
- */
-export function cssOrder(a: OrderInfo, b: OrderInfo) {
-	let depthA = a.depth,
-		depthB = b.depth,
-		orderA = a.order,
-		orderB = b.order;
-
-	if (orderA === -1 && orderB >= 0) {
-		return 1;
-	} else if (orderB === -1 && orderA >= 0) {
-		return -1;
-	} else if (orderA > orderB) {
-		return 1;
-	} else if (orderA < orderB) {
-		return -1;
-	} else {
-		if (depthA === -1) {
-			return -1;
-		} else if (depthB === -1) {
-			return 1;
-		} else {
-			return depthA > depthB ? -1 : 1;
-		}
-	}
-}
-
-export function mergeInlineCss(
-	acc: Array<StylesheetAsset>,
-	current: StylesheetAsset,
-): Array<StylesheetAsset> {
-	const lastAdded = acc.at(acc.length - 1);
-	const lastWasInline = lastAdded?.type === 'inline';
-	const currentIsInline = current?.type === 'inline';
-	if (lastWasInline && currentIsInline) {
-		const merged = { type: 'inline' as const, content: lastAdded.content + current.content };
-		acc[acc.length - 1] = merged;
-		return acc;
-	}
-	acc.push(current);
-	return acc;
-}

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

@@ -2,22 +2,21 @@ import type { ComponentInstance } from '../../types/astro.js';
 import type { RewritePayload } from '../../types/public/common.js';
 import type { RouteData, SSRElement, SSRResult } from '../../types/public/internal.js';
 import {
-	VIRTUAL_PAGE_MODULE_ID,
 	VIRTUAL_PAGE_RESOLVED_MODULE_ID,
 } from '../../vite-plugin-pages/const.js';
 import { getVirtualModulePageName } from '../../vite-plugin-pages/util.js';
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from '../../vite-plugin-scripts/index.js';
 import { createConsoleLogger } from '../app/index.js';
 import type { SSRManifest } from '../app/types.js';
 import type { TryRewriteResult } from '../base-pipeline.js';
-import { RedirectSinglePageBuiltModule } from '../redirects/index.js';
-import { Pipeline } from '../render/index.js';
+import { RedirectSinglePageBuiltModule } from '../redirects/component.js';
+import { Pipeline } from '../base-pipeline.js';
 import { createAssetLink, createStylesheetElementSet } from '../render/ssr-element.js';
 import { createDefaultRoutes } from '../routing/default.js';
 import { getFallbackRoute, routeIsFallback, routeIsRedirect } from '../routing/helpers.js';
 import { findRouteToRewrite } from '../routing/rewrite.js';
-import { getOutDirWithinCwd } from './common.js';
-import { type BuildInternals, cssOrder, getPageData, mergeInlineCss } from './internal.js';
+import type { BuildInternals } from './internal.js';
+import { cssOrder, mergeInlineCss, getPageData } from './runtime.js';
 import type { SinglePageBuiltModule, StaticBuildOptions } from './types.js';
 
 /**
@@ -31,10 +30,6 @@ export class BuildPipeline extends Pipeline {
 		return 'BuildPipeline';
 	}
 
-	#componentsInterner: WeakMap<RouteData, SinglePageBuiltModule> = new WeakMap<
-		RouteData,
-		SinglePageBuiltModule
-	>();
 	/**
 	 * This cache is needed to map a single `RouteData` to its file path.
 	 * @private
@@ -62,13 +57,6 @@ export class BuildPipeline extends Pipeline {
 		return this.internals;
 	}
 
-	get outFolder() {
-		const settings = this.getSettings();
-		return settings.buildOutput === 'server'
-			? settings.config.build.server
-			: getOutDirWithinCwd(settings.config.outDir);
-	}
-
 	private constructor(
 		readonly manifest: SSRManifest,
 		readonly defaultRoutes = createDefaultRoutes(manifest),
@@ -151,6 +139,7 @@ export class BuildPipeline extends Pipeline {
 				});
 			}
 		}
+
 		return { scripts, styles, links };
 	}
 
@@ -265,81 +254,6 @@ export class BuildPipeline extends Pipeline {
 		const componentInstance = await this.getComponentByRoute(routeData);
 		return { routeData, componentInstance, newUrl, pathname };
 	}
-
-	async retrieveSsrEntry(route: RouteData, filePath: string): Promise<SinglePageBuiltModule> {
-		if (this.#componentsInterner.has(route)) {
-			// SAFETY: it is checked inside the if
-			return this.#componentsInterner.get(route)!;
-		}
-
-		let entry;
-		if (routeIsRedirect(route)) {
-			entry = await this.#getEntryForRedirectRoute(route, this.outFolder);
-		} else if (routeIsFallback(route)) {
-			entry = await this.#getEntryForFallbackRoute(route, this.outFolder);
-		} else {
-			const ssrEntryURLPage = createEntryURL(filePath, this.outFolder);
-			entry = await import(ssrEntryURLPage.toString());
-		}
-		this.#componentsInterner.set(route, entry);
-		return entry;
-	}
-
-	async #getEntryForFallbackRoute(
-		route: RouteData,
-		outFolder: URL,
-	): Promise<SinglePageBuiltModule> {
-		const internals = this.getInternals();
-		if (route.type !== 'fallback') {
-			throw new Error(`Expected a redirect route.`);
-		}
-
-		// Retrieve the route where we should fall back
-		let fallbackRoute = getFallbackRoute(route, this.manifest.routes);
-
-		if (fallbackRoute) {
-			const filePath = getEntryFilePath(internals, fallbackRoute);
-			if (filePath) {
-				const url = createEntryURL(filePath, outFolder);
-				const ssrEntryPage: SinglePageBuiltModule = await import(url.toString());
-				return ssrEntryPage;
-			}
-		}
-
-		return RedirectSinglePageBuiltModule;
-	}
-
-	async #getEntryForRedirectRoute(
-		route: RouteData,
-		outFolder: URL,
-	): Promise<SinglePageBuiltModule> {
-		const internals = this.getInternals();
-		if (route.type !== 'redirect') {
-			throw new Error(`Expected a redirect route.`);
-		}
-		if (route.redirectRoute) {
-			const filePath = getEntryFilePath(internals, route.redirectRoute);
-			if (filePath) {
-				const url = createEntryURL(filePath, outFolder);
-				const ssrEntryPage: SinglePageBuiltModule = await import(url.toString());
-				return ssrEntryPage;
-			}
-		}
-
-		return RedirectSinglePageBuiltModule;
-	}
-}
-
-function createEntryURL(filePath: string, outFolder: URL) {
-	return new URL('./' + filePath + `?time=${Date.now()}`, outFolder);
-}
-
-/**
- * For a given pageData, returns the entry file path—aka a resolved virtual module in our internals' specifiers.
- */
-function getEntryFilePath(internals: BuildInternals, pageData: RouteData) {
-	const id = '\x00' + getVirtualModulePageName(VIRTUAL_PAGE_MODULE_ID, pageData.component);
-	return internals.entrySpecifierToBundleMap.get(id);
 }
 
 function i18nHasFallback(manifest: SSRManifest): boolean {

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

@@ -41,6 +41,8 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
 	const pagesToCss: Record<string, Record<string, { order: number; depth: number }>> = {};
 	// Map of module Ids (usually something like `/Users/...blog.mdx?astroPropagatedAssets`) to its imported CSS
 	const moduleIdToPropagatedCss: Record<string, Set<string>> = {};
+	// Keep track of CSS that has been bundled to avoid duplication between ssr and prerender.
+	const cssModulesInBundles = new Set();
 
 	const cssBuildPlugin: VitePlugin = {
 		name: 'astro:rollup-plugin-build-css',
@@ -49,6 +51,21 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
 			return environment.name === 'client' || environment.name === 'ssr' || environment.name === 'prerender';
 		},
 
+		transform(_code, id) {
+			if(isCSSRequest(id)) {
+				// In prerender, don't rebundle CSS that was already bundled in SSR.
+				// Return an empty string here to prevent it.
+				if(this.environment.name === 'prerender') {
+					if(cssModulesInBundles.has(id)) {
+						return {
+							code: ''
+						}
+					}
+				}
+				cssModulesInBundles.add(id);
+			}
+		},
+
 		async generateBundle(_outputOptions, bundle) {
 			// Collect CSS modules that were bundled during SSR build for deduplication in client build
 			if (this.environment?.name === 'ssr' || this.environment?.name === 'prerender') {
@@ -114,6 +131,9 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
 
 				// For this CSS chunk, walk parents until you find a page. Add the CSS to that page.
 				for (const id of Object.keys(chunk.modules)) {
+					// Only walk up for dependencies that are CSS
+					if(!isCSSRequest(id)) continue;
+
 					const parentModuleInfos = getParentExtendedModuleInfos(id, this, hasAssetPropagationFlag);
 					for (const { info: pageInfo, depth, order } of parentModuleInfos) {
 						if (hasAssetPropagationFlag(pageInfo.id)) {
@@ -187,6 +207,13 @@ function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
 				)
 					return;
 
+				// Delete empty CSS chunks. In prerender these are likely duplicates
+				// from SSR.
+				if(stylesheet.source.length === 0) {
+					delete bundle[id];
+					return;
+				}
+
 				const toBeInlined =
 					inlineConfig === 'always'
 						? true

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

@@ -31,7 +31,8 @@ import { encodeKey } from '../../encryption.js';
 import { fileExtension, joinPaths, prependForwardSlash } from '../../path.js';
 import { DEFAULT_COMPONENTS } from '../../routing/default.js';
 import { getOutFile, getOutFolder } from '../common.js';
-import { type BuildInternals, cssOrder, mergeInlineCss } from '../internal.js';
+import type { BuildInternals } from '../internal.js';
+import { cssOrder, mergeInlineCss } from '../runtime.js';
 import type { StaticBuildOptions } from '../types.js';
 import { makePageDataKey } from './util.js';