refactor: support middleware in entrypoint

packages/astro/dev-only.d.ts

@@ -38,3 +38,9 @@ declare module 'virtual:astro:renderers' {
 	import type { AstroRenderer } from './src/index.js';
 	export const renderers: AstroRenderer[];
 }
+
+declare module 'virtual:astro:middleware' {
+	import type { AstroMiddlewareInstance } from './src/index.js';
+	const middleware: AstroMiddlewareInstance;
+	export default middleware;
+}

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

@@ -12,10 +12,9 @@ import { DevPipeline } from './pipeline.js';
 export class DevApp extends BaseApp<DevPipeline> {
 	logger: Logger;
 	currentRenderContext: RenderContext | undefined = undefined;
-	constructor(manifest: SSRManifest, streaming = true, logger: Logger, routesList: RoutesList) {
+	constructor(manifest: SSRManifest, streaming = true, logger: Logger) {
 		super(manifest, streaming, logger);
 		this.logger = logger;
-		this.manifestData = routesList;
 	}
 
 	createPipeline(streaming: boolean, manifest: SSRManifest, logger: Logger): DevPipeline {

packages/astro/src/core/app/entrypoint.ts

@@ -5,16 +5,19 @@ import { App } from './app.js';
 import type { BaseApp } from './base.js';
 import { DevApp } from './dev/app.js';
 import { createConsoleLogger } from './logging.js';
+import type { SSRManifest } from './types.js';
 
-const actions = async () => {
-	return await import('virtual:astro:actions/entrypoint');
-};
-const manifest = Object.assign(serializedManifest, { renderers, actions });
+const manifest: SSRManifest = Object.assign(serializedManifest, {
+	renderers,
+	actions: () => import('virtual:astro:actions/entrypoint'),
+	middleware: () => import('virtual:astro:middleware'),
+	routes,
+});
 
 export function getApp(dev = import.meta.env.DEV): BaseApp {
 	if (dev) {
 		const logger = createConsoleLogger('debug');
-		return new DevApp(manifest, true, logger, { routes: routes.map((r) => r.routeData) });
+		return new DevApp(manifest, true, logger);
 	} else {
 		return new App(manifest);
 	}

packages/astro/src/core/base-pipeline.ts

@@ -135,7 +135,7 @@ export abstract class Pipeline {
 		if (this.resolvedActions) {
 			return this.resolvedActions;
 		} else if (this.actions) {
-			return await this.actions();
+			return this.actions();
 		}
 		return NOOP_ACTIONS_MOD;
 	}

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

@@ -1,6 +1,6 @@
 import type { Plugin as VitePlugin } from 'vite';
 import { ENTRYPOINT_VIRTUAL_MODULE_ID } from '../../../actions/consts.js';
-import type { AstroAdapter } from '../../../types/public/integrations.js';
+import type { AstroAdapter } from '../../../types/public/index.js';
 import { ASTRO_RENDERERS_MODULE_ID } from '../../../vite-plugin-renderers/index.js';
 import { MIDDLEWARE_MODULE_ID } from '../../middleware/vite-plugin.js';
 import { routeIsRedirect } from '../../redirects/index.js';
@@ -101,8 +101,7 @@ function vitePluginSSR(
 				}
 				contents.push(`const pageMap = new Map([\n    ${pageMap.join(',\n    ')}\n]);`);
 				exports.push(`export { pageMap }`);
-				const middleware = await this.resolve(MIDDLEWARE_MODULE_ID);
-				const ssrCode = generateSSRCode(adapter, middleware!.id);
+				const ssrCode = generateSSRCode(adapter);
 				imports.push(...ssrCode.imports);
 				contents.push(...ssrCode.contents);
 				return { code: [...imports, ...contents, ...exports].join('\n') };
@@ -164,7 +163,7 @@ export function pluginSSR(
 	};
 }
 
-function generateSSRCode(adapter: AstroAdapter, middlewareId: string) {
+function generateSSRCode(adapter: AstroAdapter) {
 	const edgeMiddleware = adapter?.adapterFeatures?.edgeMiddleware ?? false;
 
 	const imports = [
@@ -181,7 +180,7 @@ function generateSSRCode(adapter: AstroAdapter, middlewareId: string) {
 		`    serverIslandMap,`,
 		`    renderers,`,
 		`    actions: () => import("${ENTRYPOINT_VIRTUAL_MODULE_ID}"),`,
-		`    middleware: ${edgeMiddleware ? 'undefined' : `() => import("${middlewareId}")`}`,
+		`    middleware: ${edgeMiddleware ? 'undefined' : `() => import("${MIDDLEWARE_MODULE_ID}")`}`,
 		`});`,
 		`const _args = ${adapter.args ? JSON.stringify(adapter.args, null, 4) : 'undefined'};`,
 		adapter.exports

packages/astro/src/core/middleware/loadMiddleware.ts

@@ -1,7 +1,7 @@
 import { MiddlewareCantBeLoaded } from '../errors/errors-data.js';
 import { AstroError } from '../errors/index.js';
 import type { ModuleLoader } from '../module-loader/index.js';
-import { MIDDLEWARE_MODULE_ID } from './vite-plugin.js';
+import { MIDDLEWARE_RESOLVED_MODULE_ID } from './vite-plugin.js';
 
 /**
  * It accepts a module loader and the astro settings, and it attempts to load the middlewares defined in the configuration.
@@ -10,7 +10,7 @@ import { MIDDLEWARE_MODULE_ID } from './vite-plugin.js';
  */
 export async function loadMiddleware(moduleLoader: ModuleLoader) {
 	try {
-		return await moduleLoader.import(MIDDLEWARE_MODULE_ID);
+		return await moduleLoader.import(MIDDLEWARE_RESOLVED_MODULE_ID);
 	} catch (error: any) {
 		const astroError = new AstroError(MiddlewareCantBeLoaded, { cause: error });
 		throw astroError;

packages/astro/src/core/middleware/vite-plugin.ts

@@ -9,7 +9,8 @@ import { MissingMiddlewareForInternationalization } from '../errors/errors-data.
 import { AstroError } from '../errors/index.js';
 import { normalizePath } from '../viteUtils.js';
 
-export const MIDDLEWARE_MODULE_ID = '\0astro-internal:middleware';
+export const MIDDLEWARE_MODULE_ID = 'virtual:astro:middleware';
+export const MIDDLEWARE_RESOLVED_MODULE_ID = '\0' + MIDDLEWARE_MODULE_ID;
 const NOOP_MIDDLEWARE = '\0noop-middleware';
 
 export function vitePluginMiddleware({ settings }: { settings: AstroSettings }): VitePlugin {
@@ -20,6 +21,9 @@ export function vitePluginMiddleware({ settings }: { settings: AstroSettings }):
 
 	return {
 		name: '@astro/plugin-middleware',
+		applyToEnvironment(environment) {
+			return environment.name === 'ssr';
+		},
 		async resolveId(id) {
 			if (id === MIDDLEWARE_MODULE_ID) {
 				const middlewareId = await this.resolve(
@@ -28,9 +32,9 @@ export function vitePluginMiddleware({ settings }: { settings: AstroSettings }):
 				userMiddlewareIsPresent = !!middlewareId;
 				if (middlewareId) {
 					resolvedMiddlewareId = middlewareId.id;
-					return MIDDLEWARE_MODULE_ID;
+					return MIDDLEWARE_RESOLVED_MODULE_ID;
 				} else if (hasIntegrationMiddleware) {
-					return MIDDLEWARE_MODULE_ID;
+					return MIDDLEWARE_RESOLVED_MODULE_ID;
 				} else {
 					return NOOP_MIDDLEWARE;
 				}
@@ -45,7 +49,7 @@ export function vitePluginMiddleware({ settings }: { settings: AstroSettings }):
 					throw new AstroError(MissingMiddlewareForInternationalization);
 				}
 				return { code: 'export const onRequest = (_, next) => next()' };
-			} else if (id === MIDDLEWARE_MODULE_ID) {
+			} else if (id === MIDDLEWARE_RESOLVED_MODULE_ID) {
 				if (!userMiddlewareIsPresent && settings.config.i18n?.routing === 'manual') {
 					throw new AstroError(MissingMiddlewareForInternationalization);
 				}
@@ -111,7 +115,7 @@ export function vitePluginMiddlewareBuild(
 
 		writeBundle(_, bundle) {
 			for (const [chunkName, chunk] of Object.entries(bundle)) {
-				if (chunk.type !== 'asset' && chunk.facadeModuleId === MIDDLEWARE_MODULE_ID) {
+				if (chunk.type !== 'asset' && chunk.facadeModuleId === MIDDLEWARE_RESOLVED_MODULE_ID) {
 					const outputDirectory = getServerOutputDirectory(opts.settings);
 					internals.middlewareEntryPoint = new URL(chunkName, outputDirectory);
 				}

packages/astro/test/units/vite-plugin-astro-server/request.test.js

@@ -59,7 +59,7 @@ describe('vite-plugin-astro-server', () => {
 				{
 					loader: createLoader({
 						import(id) {
-							if (id === '\0astro-internal:middleware') {
+							if (id === '\0virtual:astro:middleware') {
 								return { onRequest: (_, next) => next() };
 							}
 							const Page = createComponent(() => {

packages/integrations/cloudflare/package.json

@@ -40,11 +40,11 @@
   "dependencies": {
     "@astrojs/internal-helpers": "workspace:*",
     "@astrojs/underscore-redirects": "workspace:*",
-    "@cloudflare/vite-plugin": "^1.13.13",
-    "@cloudflare/workers-types": "^4.20251011.0",
+    "@cloudflare/vite-plugin": "^1.13.14",
+    "@cloudflare/workers-types": "^4.20251014.0",
     "tinyglobby": "^0.2.15",
-    "vite": "^7.1.7",
-    "wrangler": "4.43.0"
+    "vite": "^7.1.12",
+    "wrangler": "4.44.0"
   },
   "peerDependencies": {
     "astro": "^5.7.0"

packages/integrations/cloudflare/test/fixtures/vite-plugin/src/middleware.ts

@@ -0,0 +1,19 @@
+import { defineMiddleware } from 'astro:middleware'
+
+export const onRequest = defineMiddleware(async (ctx, next) => {
+	const url = new URL(ctx.request.url);
+
+	if (url.pathname.includes("/mid/to-redirect")) {
+		return ctx.redirect("/mid/from-redirect");
+	}
+	if (url.pathname.includes("/mid/to-rewrite")) {
+		return ctx.rewrite("/mid/from-rewrite");
+	}
+
+
+	ctx.locals.getGreeting = () => {
+			return `Hello from ${url.pathname}`;
+	};
+
+	return next()
+})

packages/integrations/cloudflare/test/fixtures/vite-plugin/src/pages/index.astro

@@ -27,6 +27,10 @@ const { Content } = await render(increment);
 	<a href="/env">Environment variables</a>
 	<h2>Client router</h2>
 	<a href="/client-router">Client router</a>
+	<h2>Middleware</h2>
+	<a href="/mid/to-redirect">Redirect</a>
+	<a href="/mid/to-rewrite">Rewrite</a>
+	<a href="/mid/locals">Locals</a>
 	<h2>Dogs</h2>
 	<p>Running on: {workerRuntime ?? 'unknown runtime'}</p>
 	<div id="framework">

packages/integrations/cloudflare/test/fixtures/vite-plugin/src/pages/mid/from-redirect.astro

@@ -0,0 +1,3 @@
+
+
+<h1>Came from a redirect</h1>

packages/integrations/cloudflare/test/fixtures/vite-plugin/src/pages/mid/from-rewrite.astro

@@ -0,0 +1 @@
+<h1>I am a rewrite</h1>

packages/integrations/cloudflare/test/fixtures/vite-plugin/src/pages/mid/locals.astro

@@ -0,0 +1,6 @@
+---
+const greeting = Astro.locals.getGreeting();
+---
+
+<h1>Greeting from locals</h1>
+<p>{greeting}</p>