Skip to content

[pull] main from withastro:main #441

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
pull merged 1 commit into from
Mar 16, 2026
+6 −13
Merged

[pull] main from withastro:main #441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 6 additions & 13 deletions packages/astro/src/vite-plugin-astro-server/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@ export default function createVitePluginAstroServer({
? (prerenderEnvironment as RunnableDevEnvironment)
: undefined;

// TODO: let this handle non-runnable environments that don't intercept requests
if (!runnableSsrEnvironment && !runnablePrerenderEnvironment) {
return;
}

async function createHandler(environment: RunnableDevEnvironment) {
const loader = createViteLoader(viteServer, environment);
const { default: createAstroServerApp } =
Expand Down Expand Up @@ -117,20 +112,18 @@ export default function createVitePluginAstroServer({
}
}

process.on('unhandledRejection', handleUnhandledRejection);
viteServer.httpServer?.on('close', () => {
process.off('unhandledRejection', handleUnhandledRejection);
});
if (ssrHandler || prerenderHandler) {
process.on('unhandledRejection', handleUnhandledRejection);
viteServer.httpServer?.on('close', () => {
process.off('unhandledRejection', handleUnhandledRejection);
});
}

return () => {
const shouldHandlePrerenderInCore = Boolean(
(viteServer as any)[devPrerenderMiddlewareSymbol],
);

if (!ssrHandler && !(prerenderHandler && shouldHandlePrerenderInCore)) {
return;
}

// Push this middleware to the front of the stack so that it can intercept responses.
// fix(#6067): always inject this to ensure zombie base handling is killed after restarts
viteServer.middlewares.stack.unshift({
Expand Down
Loading