Merge branch 'main' into hackathon/better-pnpm-dev

.changeset/great-crabs-march.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Correctly emit the middleware code during the build phase. The file emitted is now `dist/middleware.mjs`

.github/ISSUE_TEMPLATE/---01-bug-report.yml

@@ -53,6 +53,13 @@ body:
       description: A clear and concise description of what the bug is.
     validations:
       required: true
+  - type: textarea
+    id: bug-expectation
+    attributes:
+      label: What's the expected result?
+      description: Describe what you expect to happen.
+    validations:
+      required: true
   - type: input
     id: bug-reproduction
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -4,7 +4,7 @@ contact_links:
     url: https://github.com/withastro/docs
     about: File an issue or make an improvement to the docs website.
   - name: 💡 Ideas for New Features, Improvements and RFCs
-    url: https://github.com/withastro/rfcs/discussions
+    url: https://github.com/withastro/roadmap/discussions
     about: Propose and discuss future improvements to Astro
   - name: 👾 Chat
     url: https://astro.build/chat

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

@@ -236,12 +236,11 @@ export class App {
 				site: this.#env.site,
 				adapterName: this.#env.adapterName,
 			});
-			const onRequest = page.middleware?.onRequest;
 			let response;
-			if (onRequest) {
+			if (page.onRequest) {
 				response = await callMiddleware<Response>(
 					this.#env.logging,
-					onRequest as MiddlewareResponseHandler,
+					page.onRequest as MiddlewareResponseHandler,
 					apiContext,
 					() => {
 						return renderPage({ mod, renderContext, env: this.#env, apiContext });
@@ -287,7 +286,7 @@ export class App {
 			mod: handler as any,
 		});
 
-		const result = await callEndpoint(handler, this.#env, ctx, this.#logging, page.middleware);
+		const result = await callEndpoint(handler, this.#env, ctx, this.#logging, page.onRequest);
 
 		if (result.type === 'response') {
 			if (result.response.headers.get('X-Astro-Response') === 'Not-Found') {

packages/astro/src/core/build/generate.ts

@@ -5,13 +5,13 @@ import type { OutputAsset, OutputChunk } from 'rollup';
 import { fileURLToPath } from 'url';
 import type {
 	AstroConfig,
-	AstroMiddlewareInstance,
 	AstroSettings,
 	ComponentInstance,
 	EndpointHandler,
 	EndpointOutput,
 	GetStaticPathsItem,
 	ImageTransform,
+	MiddlewareHandler,
 	MiddlewareResponseHandler,
 	RouteData,
 	RouteType,
@@ -229,7 +229,7 @@ async function generatePage(
 		.reduce(mergeInlineCss, []);
 
 	const pageModulePromise = ssrEntry.page;
-	const middleware = ssrEntry.middleware;
+	const onRequest = ssrEntry.onRequest;
 
 	if (!pageModulePromise) {
 		throw new Error(
@@ -264,7 +264,7 @@ async function generatePage(
 
 	for (let i = 0; i < paths.length; i++) {
 		const path = paths[i];
-		await generatePath(path, opts, generationOptions, middleware);
+		await generatePath(path, opts, generationOptions, onRequest);
 		const timeEnd = performance.now();
 		const timeChange = getTimeStat(timeStart, timeEnd);
 		const timeIncrease = `(+${timeChange})`;
@@ -448,7 +448,7 @@ async function generatePath(
 	pathname: string,
 	opts: StaticBuildOptions,
 	gopts: GeneratePathOptions,
-	middleware?: AstroMiddlewareInstance<unknown>
+	onRequest?: MiddlewareHandler<unknown>
 ) {
 	const { settings, logging, origin, routeCache } = opts;
 	const {
@@ -569,7 +569,7 @@ async function generatePath(
 			env,
 			renderContext,
 			logging,
-			middleware as AstroMiddlewareInstance<Response | EndpointOutput>
+			onRequest as MiddlewareHandler<Response | EndpointOutput>
 		);
 
 		if (result.type === 'response') {
@@ -593,7 +593,6 @@ async function generatePath(
 				adapterName: env.adapterName,
 			});
 
-			const onRequest = middleware?.onRequest;
 			if (onRequest) {
 				response = await callMiddleware<Response>(
 					env.logging,

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

@@ -1,27 +1,45 @@
 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';
 
 export const MIDDLEWARE_MODULE_ID = '@astro-middleware';
 
+const EMPTY_MIDDLEWARE = '\0empty-middleware';
+
 export function vitePluginMiddleware(
 	opts: StaticBuildOptions,
 	_internals: BuildInternals
 ): VitePlugin {
 	return {
 		name: '@astro/plugin-middleware',
 
+		options(options) {
+			return addRollupInput(options, [MIDDLEWARE_MODULE_ID]);
+		},
+
 		async resolveId(id) {
 			if (id === MIDDLEWARE_MODULE_ID) {
 				const middlewareId = await this.resolve(
 					`${opts.settings.config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
 				);
 				if (middlewareId) {
 					return middlewareId.id;
+				} else {
+					return EMPTY_MIDDLEWARE;
 				}
 			}
+			if (id === EMPTY_MIDDLEWARE) {
+				return EMPTY_MIDDLEWARE;
+			}
+		},
+
+		load(id) {
+			if (id === EMPTY_MIDDLEWARE) {
+				return 'export const onRequest = undefined';
+			}
 		},
 	};
 }

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

@@ -82,8 +82,8 @@ function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): V
 
 						const middlewareModule = await this.resolve(MIDDLEWARE_MODULE_ID);
 						if (middlewareModule) {
-							imports.push(`import * as middleware from "${middlewareModule.id}";`);
-							exports.push(`export { middleware };`);
+							imports.push(`import { onRequest } from "${middlewareModule.id}";`);
+							exports.push(`export { onRequest };`);
 						}
 
 						return `${imports.join('\n')}${exports.join('\n')}`;

packages/astro/src/core/build/static-build.ts

@@ -24,6 +24,7 @@ import { generatePages } from './generate.js';
 import { trackPageData } from './internal.js';
 import { createPluginContainer, type AstroBuildPluginContainer } from './plugin.js';
 import { registerAllPlugins } from './plugins/index.js';
+import { MIDDLEWARE_MODULE_ID } from './plugins/plugin-middleware.js';
 import {
 	ASTRO_PAGE_EXTENSION_POST_PATTERN,
 	ASTRO_PAGE_RESOLVED_MODULE_ID,
@@ -176,12 +177,7 @@ async function ssrBuild(
 					entryFileNames(chunkInfo) {
 						if (chunkInfo.facadeModuleId?.startsWith(ASTRO_PAGE_RESOLVED_MODULE_ID)) {
 							return makeAstroPageEntryPointFileName(chunkInfo.facadeModuleId, allPages);
-						} else if (
-							// checks if the path of the module we have middleware, e.g. middleware.js / middleware/index.js
-							chunkInfo.moduleIds.find((m) => m.includes('middleware')) !== undefined &&
-							// checks if the file actually export the `onRequest` function
-							chunkInfo.exports.includes('_middleware')
-						) {
+						} else if (chunkInfo.facadeModuleId === MIDDLEWARE_MODULE_ID) {
 							return 'middleware.mjs';
 						} else if (chunkInfo.facadeModuleId === SSR_VIRTUAL_MODULE_ID) {
 							return opts.settings.config.build.serverEntry;

packages/astro/src/core/build/types.ts

@@ -1,11 +1,11 @@
 import type { default as vite, InlineConfig } from 'vite';
 import type {
 	AstroConfig,
-	AstroMiddlewareInstance,
 	AstroSettings,
 	BuildConfig,
 	ComponentInstance,
 	ManifestData,
+	MiddlewareHandler,
 	RouteData,
 	RuntimeMode,
 	SSRLoadedRenderer,
@@ -51,7 +51,10 @@ type ImportComponentInstance = () => Promise<ComponentInstance>;
 
 export interface SinglePageBuiltModule {
 	page: ImportComponentInstance;
-	middleware: AstroMiddlewareInstance<unknown>;
+	/**
+	 * The `onRequest` hook exported by the middleware
+	 */
+	onRequest?: MiddlewareHandler<unknown>;
 	renderers: SSRLoadedRenderer[];
 }
 

packages/astro/src/core/endpoint/dev/index.ts

@@ -21,5 +21,5 @@ export async function call(options: SSROptions, logging: LogOptions) {
 		mod: endpointHandler as any,
 	});
 
-	return await callEndpoint(endpointHandler, env, ctx, logging, middleware);
+	return await callEndpoint(endpointHandler, env, ctx, logging, middleware?.onRequest);
 }

packages/astro/src/core/endpoint/index.ts

@@ -1,10 +1,10 @@
 import type {
 	APIContext,
 	AstroConfig,
-	AstroMiddlewareInstance,
 	EndpointHandler,
 	EndpointOutput,
 	MiddlewareEndpointHandler,
+	MiddlewareHandler,
 	Params,
 } from '../../@types/astro';
 import type { Environment, RenderContext } from '../render/index';
@@ -97,7 +97,7 @@ export async function callEndpoint<MiddlewareResult = Response | EndpointOutput>
 	env: Environment,
 	ctx: RenderContext,
 	logging: LogOptions,
-	middleware?: AstroMiddlewareInstance<MiddlewareResult> | undefined
+	onRequest?: MiddlewareHandler<MiddlewareResult> | undefined
 ): Promise<EndpointCallResult> {
 	const context = createAPIContext({
 		request: ctx.request,
@@ -108,11 +108,10 @@ export async function callEndpoint<MiddlewareResult = Response | EndpointOutput>
 	});
 
 	let response;
-	if (middleware && middleware.onRequest) {
-		const onRequest = middleware.onRequest as MiddlewareEndpointHandler;
+	if (onRequest) {
 		response = await callMiddleware<Response | EndpointOutput>(
 			env.logging,
-			onRequest,
+			onRequest as MiddlewareEndpointHandler,
 			context,
 			async () => {
 				return await renderEndpoint(mod, context, env.ssr);

packages/astro/src/core/redirects/component.ts

@@ -1,4 +1,4 @@
-import type { AstroMiddlewareInstance, ComponentInstance } from '../../@types/astro';
+import type { ComponentInstance } from '../../@types/astro';
 import type { SinglePageBuiltModule } from '../build/types';
 
 // A stub of a component instance for a given route
@@ -10,12 +10,8 @@ export const RedirectComponentInstance: ComponentInstance = {
 	},
 };
 
-const StaticMiddlewareInstance: AstroMiddlewareInstance<unknown> = {
-	onRequest: (ctx, next) => next(),
-};
-
 export const RedirectSinglePageBuiltModule: SinglePageBuiltModule = {
 	page: () => Promise.resolve(RedirectComponentInstance),
-	middleware: StaticMiddlewareInstance,
+	onRequest: (ctx, next) => next(),
 	renderers: [],
 };