Skip to content

Fix before-hydration script emission for environment-api #14818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthewp merged 2 commits into from
Nov 20, 2025
Merged

Fix before-hydration script emission for environment-api #14818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50b780a
Fix before-hydration script emission for environment-api
matthewp Nov 19, 2025
b08b7c0
fix lint
matthewp Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/astro/src/vite-plugin-astro-server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
export { createController, runWithErrorHandling } from './controller.js';
export { default as vitePluginAstroServer, createVitePluginAstroServerClient as vitePluginAstroServerClient } from './plugin.js';
export {
createVitePluginAstroServerClient as vitePluginAstroServerClient,
default as vitePluginAstroServer,
} from './plugin.js';
10 changes: 2 additions & 8 deletions packages/astro/src/vite-plugin-scripts/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ConfigEnv, Plugin as VitePlugin } from 'vite';
import type { Plugin as VitePlugin } from 'vite';
import type { AstroSettings } from '../types/astro.js';
import type { InjectedScriptStage } from '../types/public/integrations.js';

Expand All @@ -13,14 +13,9 @@ export const PAGE_SCRIPT_ID = `${SCRIPT_ID_PREFIX}${'page' as InjectedScriptStag
export const PAGE_SSR_SCRIPT_ID = `${SCRIPT_ID_PREFIX}${'page-ssr' as InjectedScriptStage}.js`;

export default function astroScriptsPlugin({ settings }: { settings: AstroSettings }): VitePlugin {
let env: ConfigEnv | undefined = undefined;
return {
name: 'astro:scripts',

config(_config, _env) {
env = _env;
},

async resolveId(id) {
if (id.startsWith(SCRIPT_ID_PREFIX)) {
return id;
Expand Down Expand Up @@ -57,8 +52,7 @@ export default function astroScriptsPlugin({ settings }: { settings: AstroSettin
},
buildStart() {
const hasHydrationScripts = settings.scripts.some((s) => s.stage === 'before-hydration');
const isSsrBuild = env?.isSsrBuild;
if (hasHydrationScripts && env?.command === 'build' && !isSsrBuild) {
if (hasHydrationScripts && ['prerender', 'ssr'].includes(this.environment.name)) {
this.emitFile({
type: 'chunk',
id: BEFORE_HYDRATION_SCRIPT_ID,
Expand Down
Loading