Merge branch 'main' into next

Author: florian-lefebvre

.changeset/dark-chicken-sleep.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes a case where build's `process.env` would be inlined in the server output

.changeset/rich-tips-kick.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Improves fallbacks generation when using the experimental Fonts API

packages/astro/src/assets/fonts/implementations/font-metrics-resolver.ts

@@ -20,10 +20,14 @@ function filterRequiredMetrics({
 	};
 }
 
-// Source: https://github.com/unjs/fontaine/blob/f00f84032c5d5da72c8798eae4cd68d3ddfbf340/src/css.ts#L7
-function toPercentage(value: number, fractionDigits = 4) {
-	const percentage = value * 100;
-	return `${+percentage.toFixed(fractionDigits)}%`;
+// Source: https://github.com/seek-oss/capsize/blob/b752693428b45994442433f7e3476ca4e3e3c507/packages/core/src/round.ts
+function round(value: number) {
+	return parseFloat(value.toFixed(4));
+}
+
+// Source: https://github.com/seek-oss/capsize/blob/b752693428b45994442433f7e3476ca4e3e3c507/packages/core/src/createFontStack.ts#L5
+function toPercentString(value: number) {
+	return `${round(value * 100)}%`;
 }
 
 export function createCapsizeFontMetricsResolver({
@@ -40,7 +44,8 @@ export function createCapsizeFontMetricsResolver({
 			cache[name] ??= filterRequiredMetrics(await fromBuffer(await fontFetcher.fetch(input)));
 			return cache[name];
 		},
-		// Source: https://github.com/unjs/fontaine/blob/f00f84032c5d5da72c8798eae4cd68d3ddfbf340/src/css.ts#L170
+		// Adapted from Capsize
+		// Source: https://github.com/seek-oss/capsize/blob/b752693428b45994442433f7e3476ca4e3e3c507/packages/core/src/createFontStack.ts
 		generateFontFace({
 			metrics,
 			fallbackMetrics,
@@ -51,7 +56,11 @@ export function createCapsizeFontMetricsResolver({
 			// Calculate size adjust
 			const preferredFontXAvgRatio = metrics.xWidthAvg / metrics.unitsPerEm;
 			const fallbackFontXAvgRatio = fallbackMetrics.xWidthAvg / fallbackMetrics.unitsPerEm;
-			const sizeAdjust = preferredFontXAvgRatio / fallbackFontXAvgRatio;
+
+			const sizeAdjust =
+				preferredFontXAvgRatio && fallbackFontXAvgRatio
+					? preferredFontXAvgRatio / fallbackFontXAvgRatio
+					: 1;
 
 			const adjustedEmSquare = metrics.unitsPerEm * sizeAdjust;
 
@@ -60,13 +69,27 @@ export function createCapsizeFontMetricsResolver({
 			const descentOverride = Math.abs(metrics.descent) / adjustedEmSquare;
 			const lineGapOverride = metrics.lineGap / adjustedEmSquare;
 
+			// Calculate metric overrides for fallback font
+			const fallbackAscentOverride = fallbackMetrics.ascent / adjustedEmSquare;
+			const fallbackDescentOverride = Math.abs(fallbackMetrics.descent) / adjustedEmSquare;
+			const fallbackLineGapOverride = fallbackMetrics.lineGap / adjustedEmSquare;
+
 			return cssRenderer.generateFontFace(fallbackName, {
 				...properties,
 				src: renderFontSrc([{ name: fallbackFontName }]),
-				'size-adjust': toPercentage(sizeAdjust),
-				'ascent-override': toPercentage(ascentOverride),
-				'descent-override': toPercentage(descentOverride),
-				'line-gap-override': toPercentage(lineGapOverride),
+				'size-adjust': sizeAdjust && sizeAdjust !== 1 ? toPercentString(sizeAdjust) : undefined,
+				'ascent-override':
+					ascentOverride && ascentOverride !== fallbackAscentOverride
+						? toPercentString(ascentOverride)
+						: undefined,
+				'descent-override':
+					descentOverride && descentOverride !== fallbackDescentOverride
+						? toPercentString(descentOverride)
+						: undefined,
+				'line-gap-override':
+					lineGapOverride !== fallbackLineGapOverride
+						? toPercentString(lineGapOverride)
+						: undefined,
 			});
 		},
 	};

packages/astro/src/env/vite-plugin-env.ts

@@ -24,49 +24,14 @@ interface AstroEnvPluginParams {
 
 export function astroEnv({ settings, sync, envLoader }: AstroEnvPluginParams): Plugin {
 	const { schema, validateSecrets } = settings.config.env;
-	let isDev: boolean;
-
-	let templates: { client: string; server: string; internal: string } | null = null;
-
-	function ensureTemplateAreLoaded() {
-		if (templates !== null) {
-			return;
-		}
-
-		const loadedEnv = envLoader.get();
-
-		if (!isDev) {
-			for (const [key, value] of Object.entries(loadedEnv)) {
-				if (value !== undefined) {
-					process.env[key] = value;
-				}
-			}
-		}
-
-		const validatedVariables = validatePublicVariables({
-			schema,
-			loadedEnv,
-			validateSecrets,
-			sync,
-		});
-
-		templates = {
-			...getTemplates(schema, validatedVariables, isDev ? loadedEnv : null),
-			internal: `export const schema = ${JSON.stringify(schema)};`,
-		};
-	}
+	let isBuild: boolean;
+	let populated = false;
 
 	return {
 		name: 'astro-env-plugin',
 		enforce: 'pre',
 		config(_, { command }) {
-			isDev = command !== 'build';
-		},
-		buildStart() {
-			ensureTemplateAreLoaded();
-		},
-		buildEnd() {
-			templates = null;
+			isBuild = command === 'build';
 		},
 		resolveId(id) {
 			if (id === CLIENT_VIRTUAL_MODULE_ID) {
@@ -80,28 +45,62 @@ export function astroEnv({ settings, sync, envLoader }: AstroEnvPluginParams): P
 			}
 		},
 		load(id, options) {
-			if (id === RESOLVED_CLIENT_VIRTUAL_MODULE_ID) {
-				ensureTemplateAreLoaded();
-				return { code: templates!.client };
+			if (id === RESOLVED_INTERNAL_VIRTUAL_MODULE_ID) {
+				return { code: `export const schema = ${JSON.stringify(schema)};` };
 			}
-			if (id === RESOLVED_SERVER_VIRTUAL_MODULE_ID) {
-				if (options?.ssr) {
-					ensureTemplateAreLoaded();
-					return { code: templates!.server };
-				}
+
+			if (id === RESOLVED_SERVER_VIRTUAL_MODULE_ID && !options?.ssr) {
 				throw new AstroError({
 					...AstroErrorData.ServerOnlyModule,
 					message: AstroErrorData.ServerOnlyModule.message(SERVER_VIRTUAL_MODULE_ID),
 				});
 			}
-			if (id === RESOLVED_INTERNAL_VIRTUAL_MODULE_ID) {
-				ensureTemplateAreLoaded();
-				return { code: templates!.internal };
+
+			if (id === RESOLVED_CLIENT_VIRTUAL_MODULE_ID || id === RESOLVED_SERVER_VIRTUAL_MODULE_ID) {
+				const loadedEnv = envLoader.get();
+
+				// During the build, we populate process.env so that secrets can work
+				if (isBuild && !populated) {
+					for (const [key, value] of Object.entries(loadedEnv)) {
+						if (value !== undefined) {
+							process.env[key] = value;
+						}
+					}
+					populated = true;
+				}
+
+				const validatedVariables = validatePublicVariables({
+					schema,
+					loadedEnv,
+					validateSecrets,
+					sync,
+				});
+				const { client, server } = getTemplates({
+					schema,
+					validatedVariables,
+					// In dev, we inline process.env to avoid freezing it
+					loadedEnv: isBuild ? null : loadedEnv,
+				});
+
+				if (id === RESOLVED_CLIENT_VIRTUAL_MODULE_ID) {
+					return { code: client };
+				}
+
+				if (id === RESOLVED_SERVER_VIRTUAL_MODULE_ID) {
+					return { code: server };
+				}
 			}
 		},
 	};
 }
 
+interface ValidVariable {
+	key: string;
+	value: any;
+	type: string;
+	context: 'server' | 'client';
+}
+
 function validatePublicVariables({
 	schema,
 	loadedEnv,
@@ -113,7 +112,7 @@ function validatePublicVariables({
 	validateSecrets: boolean;
 	sync: boolean;
 }) {
-	const valid: Array<{ key: string; value: any; type: string; context: 'server' | 'client' }> = [];
+	const valid: Array<ValidVariable> = [];
 	const invalid: Array<InvalidVariable> = [];
 
 	for (const [key, options] of Object.entries(schema)) {
@@ -143,13 +142,19 @@ function validatePublicVariables({
 	return valid;
 }
 
-function getTemplates(
-	schema: EnvSchema,
-	validatedVariables: ReturnType<typeof validatePublicVariables>,
-	loadedEnv: Record<string, string> | null,
-) {
+let cachedServerTemplate: string | undefined;
+
+function getTemplates({
+	schema,
+	validatedVariables,
+	loadedEnv,
+}: {
+	schema: EnvSchema;
+	validatedVariables: Array<ValidVariable>;
+	loadedEnv: Record<string, string> | null;
+}) {
 	let client = '';
-	let server = readFileSync(MODULE_TEMPLATE_URL, 'utf-8');
+	let server = (cachedServerTemplate ??= readFileSync(MODULE_TEMPLATE_URL, 'utf-8'));
 	let onSetGetEnv = '';
 
 	for (const { key, value, context } of validatedVariables) {

packages/integrations/cloudflare/package.json

@@ -38,10 +38,10 @@
   "dependencies": {
     "@astrojs/internal-helpers": "workspace:*",
     "@astrojs/underscore-redirects": "workspace:*",
-    "@cloudflare/workers-types": "^4.20251014.0",
+    "@cloudflare/workers-types": "^4.20251106.1",
     "tinyglobby": "^0.2.15",
     "vite": "^7.1.7",
-    "wrangler": "4.45.3"
+    "wrangler": "4.46.0"
   },
   "peerDependencies": {
     "astro": "^5.7.0"

packages/integrations/cloudflare/test/fixtures/astro-dev-platform/package.json

@@ -7,6 +7,6 @@
     "astro": "workspace:*"
   },
   "devDependencies": {
-    "wrangler": "4.45.3"
+    "wrangler": "4.46.0"
   }
 }

packages/integrations/cloudflare/test/fixtures/astro-env/package.json

@@ -7,6 +7,6 @@
     "astro": "workspace:*"
   },
   "devDependencies": {
-    "wrangler": "4.45.3"
+    "wrangler": "4.46.0"
   }
 }

packages/integrations/cloudflare/test/fixtures/sessions/package.json

@@ -7,7 +7,7 @@
   },
   "devDependencies": {
     "astro": "workspace:*",
-    "wrangler": "4.45.3"
+    "wrangler": "4.46.0"
   },
   "scripts": {
     "build": "astro build",

packages/integrations/cloudflare/test/fixtures/with-solid-js/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@astrojs/cloudflare": "workspace:*",
-    "@astrojs/solid-js": "^5.1.2",
+    "@astrojs/solid-js": "^5.1.3",
     "astro": "workspace:*",
     "solid-js": "^1.9.10"
   }

packages/integrations/cloudflare/test/fixtures/with-svelte/package.json

@@ -4,8 +4,8 @@
   "private": true,
   "dependencies": {
     "@astrojs/cloudflare": "workspace:*",
-    "@astrojs/svelte": "^7.2.1",
+    "@astrojs/svelte": "^7.2.2",
     "astro": "workspace:*",
-    "svelte": "^5.43.2"
+    "svelte": "^5.43.4"
   }
 }