feat: remove experimental flag middleware

.changeset/young-flies-allow.md

@@ -0,0 +1,5 @@
+---
+'astro': minor
+---
+
+Remove experimental flag for the middleware

examples/middleware/astro.config.mjs

@@ -8,6 +8,6 @@ export default defineConfig({
 		mode: 'standalone',
 	}),
 	experimental: {
-		middleware: true,
+		middleware: true
 	},
 });

packages/astro/src/@types/astro.ts

@@ -108,7 +108,6 @@ export interface CLIFlags {
 	drafts?: boolean;
 	open?: boolean;
 	experimentalAssets?: boolean;
-	experimentalMiddleware?: boolean;
 }
 
 export interface BuildConfig {

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

@@ -1,6 +1,5 @@
 import type { Plugin as VitePlugin } from 'vite';
 import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../../constants.js';
-import { addRollupInput } from '../add-rollup-input.js';
 import type { BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin';
 import type { StaticBuildOptions } from '../types';
@@ -13,14 +12,9 @@ export function vitePluginMiddleware(
 ): VitePlugin {
 	return {
 		name: '@astro/plugin-middleware',
-		options(options) {
-			if (opts.settings.config.experimental.middleware) {
-				return addRollupInput(options, [MIDDLEWARE_MODULE_ID]);
-			}
-		},
 
 		async resolveId(id) {
-			if (id === MIDDLEWARE_MODULE_ID && opts.settings.config.experimental.middleware) {
+			if (id === MIDDLEWARE_MODULE_ID) {
 				const middlewareId = await this.resolve(
 					`${opts.settings.config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
 				);

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

@@ -70,8 +70,9 @@ function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): V
 						imports.push(`import { renderers } from "${RENDERERS_MODULE_ID}";`);
 						exports.push(`export { renderers };`);
 
-						if (opts.settings.config.experimental.middleware) {
-							imports.push(`import * as _middleware from "${MIDDLEWARE_MODULE_ID}";`);
+						const middlewareModule = await this.resolve(MIDDLEWARE_MODULE_ID);
+						if (middlewareModule) {
+							imports.push(`import * as _middleware from "${middlewareModule.id}";`);
 							exports.push(`export const middleware = _middleware;`);
 						}
 

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

@@ -48,8 +48,9 @@ function vitePluginSSR(
 				const contents: string[] = [];
 				const exports: string[] = [];
 				let middleware;
-				if (config.experimental?.middleware === true) {
-					imports.push(`import * as _middleware from "${MIDDLEWARE_MODULE_ID}"`);
+				const middlewareModule = await this.resolve(MIDDLEWARE_MODULE_ID);
+				if (middlewareModule) {
+					imports.push(`import * as _middleware from "${middlewareModule.id}"`);
 					middleware = 'middleware: _middleware';
 				}
 				let i = 0;

packages/astro/src/core/config/config.ts

@@ -104,8 +104,6 @@ export function resolveFlags(flags: Partial<Flags>): CLIFlags {
 		drafts: typeof flags.drafts === 'boolean' ? flags.drafts : undefined,
 		experimentalAssets:
 			typeof flags.experimentalAssets === 'boolean' ? flags.experimentalAssets : undefined,
-		experimentalMiddleware:
-			typeof flags.experimentalMiddleware === 'boolean' ? flags.experimentalMiddleware : undefined,
 	};
 }
 
@@ -139,9 +137,6 @@ function mergeCLIFlags(astroConfig: AstroUserConfig, flags: CLIFlags) {
 		// TODO: Come back here and refactor to remove this expected error.
 		astroConfig.server.open = flags.open;
 	}
-	if (typeof flags.experimentalMiddleware === 'boolean') {
-		astroConfig.experimental.middleware = true;
-	}
 	return astroConfig;
 }
 

packages/astro/src/core/config/schema.ts

@@ -207,7 +207,6 @@ export const AstroConfigSchema = z.object({
 				.enum(['always', 'auto', 'never'])
 				.optional()
 				.default(ASTRO_CONFIG_DEFAULTS.experimental.inlineStylesheets),
-			middleware: z.oboolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.middleware),
 			hybridOutput: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.hybridOutput),
 		})
 		.passthrough()

packages/astro/src/vite-plugin-astro-server/route.ts

@@ -182,11 +182,9 @@ export async function handleRoute(
 		request,
 		route,
 	};
-	if (env.settings.config.experimental.middleware) {
-		const middleware = await loadMiddleware(env.loader, env.settings.config.srcDir);
-		if (middleware) {
-			options.middleware = middleware;
-		}
+	const middleware = await loadMiddleware(env.loader, env.settings.config.srcDir);
+	if (middleware) {
+		options.middleware = middleware;
 	}
 	// Route successfully matched! Render it.
 	if (route.type === 'endpoint') {