fix(build): entrypoint leak (#15887)

ematipico · web-flow · commit 1861fedef363 · 2026-03-13T10:58:11.000Z
diff --git a/.changeset/polite-poets-push.md b/.changeset/polite-poets-push.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes an issue where the build incorrectly leaked server entrypoint into the client environment, causing adapters to emit warnings during the build.
diff --git a/packages/astro/src/core/build/plugins/plugin-internals.ts b/packages/astro/src/core/build/plugins/plugin-internals.ts
@@ -1,15 +1,25 @@
-import type { EnvironmentOptions, Plugin as VitePlugin } from 'vite';
+import type { EnvironmentOptions, Plugin as VitePlugin, Rollup } from 'vite';
 import type { BuildInternals } from '../internal.js';
 import type { StaticBuildOptions } from '../types.js';
 import { normalizeEntryId } from './plugin-component-entry.js';
 import { ASTRO_VITE_ENVIRONMENT_NAMES } from '../../constants.js';
 
+function getRollupInputAsSet(rollupInput: Rollup.InputOption | undefined): Set<string> {
+	if (Array.isArray(rollupInput)) {
+		return new Set(rollupInput);
+	} else if (typeof rollupInput === 'string') {
+		return new Set([rollupInput]);
+	} else if (rollupInput && typeof rollupInput === 'object') {
+		return new Set(Object.values(rollupInput) as string[]);
+	} else {
+		return new Set();
+	}
+}
+
 export function pluginInternals(
 	options: StaticBuildOptions,
 	internals: BuildInternals,
 ): VitePlugin {
-	let input: Set<string>;
-
 	return {
 		name: '@astro/plugin-build-internals',
 
@@ -42,21 +52,15 @@ export function pluginInternals(
 			}
 		},
 
-		configResolved(config) {
-			// Get input from rollupOptions
-			const rollupInput = config.build?.rollupOptions?.input;
-			if (Array.isArray(rollupInput)) {
-				input = new Set(rollupInput);
-			} else if (typeof rollupInput === 'string') {
-				input = new Set([rollupInput]);
-			} else if (rollupInput && typeof rollupInput === 'object') {
-				input = new Set(Object.values(rollupInput) as string[]);
-			} else {
-				input = new Set();
-			}
-		},
-
 		async generateBundle(_options, bundle) {
+			// Read the rollup input directly from the current environment's config rather than
+			// relying on a closure variable from configResolved. With Vite's per-environment config
+			// resolution, a shared closure variable would be overwritten by the last environment's
+			// configResolved call, causing inputs from one environment (e.g. SSR) to leak into
+			// another (e.g. client). This caused server-only modules like @astrojs/node/server.js
+			// to be resolved in the client environment, triggering spurious "externalized for
+			// browser compatibility" warnings.
+			const input = getRollupInputAsSet(this.environment?.config.build.rollupOptions.input);
 			const promises = [];
 			const mapping = new Map<string, Set<string>>();
 			const allInput = new Set([...input, ...internals.clientInput]);

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'astro': patch
 +---
++
 +Fixes an issue where the build incorrectly leaked server entrypoint into the client environment, causing adapters to emit warnings during the build.