emit middleware.mjs only when user middleware exists

withastro · Jan 25, 2024 · 2e6008a · 2e6008a
1 parent ad1a731
commit 2e6008a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/packages/astro/src/core/app/common.ts b/packages/astro/src/core/app/common.ts
@@ -18,8 +18,7 @@ export function deserializeManifest(serializedManifest: SerializedSSRManifest):
 	const clientDirectives = new Map(serializedManifest.clientDirectives);
 
 	return {
-		// serialized manifest will always contain the middleware (see plugin-ssr.ts)
-		// this is expected to be overwritten, but is present for types
+		// in case user middleware exists, this no-op middleware will be reassigned (see plugin-ssr.ts)
 		middleware(_, next) { return next() },
 		...serializedManifest,
 		assets,

diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
@@ -146,7 +146,10 @@ export async function generatePages(opts: StaticBuildOptions, internals: BuildIn
 		const baseDirectory = getOutputDirectory(opts.settings.config);
 		const renderersEntryUrl = new URL('renderers.mjs', baseDirectory);
 		const renderers = await import(renderersEntryUrl.toString());
-		const { onRequest: middleware } = await import(new URL('middleware.mjs', baseDirectory).toString());
+		let middleware: MiddlewareHandler = (_, next) => next();
+		try {
+			middleware = await import(new URL('middleware.mjs', baseDirectory).toString()).then(mod => mod.onRequest);
+		} catch {}
 		manifest = createBuildManifest(
 			opts.settings,
 			internals,

diff --git a/packages/astro/src/core/middleware/vite-plugin.ts b/packages/astro/src/core/middleware/vite-plugin.ts
@@ -6,7 +6,6 @@ import { addRollupInput } from '../build/add-rollup-input.js';
 import type { BuildInternals } from '../build/internal.js';
 import type { StaticBuildOptions } from '../build/types.js';
 import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../constants.js';
-import type { PluginContext } from 'rollup';
 
 export const MIDDLEWARE_MODULE_ID = '\0astro-internal:middleware';
 const NOOP_MIDDLEWARE = '\0noop-middleware';
@@ -45,12 +44,17 @@ export function vitePluginMiddleware({ settings }: { settings: AstroSettings }):
 		},
 		async load(id) {
 			if (id === NOOP_MIDDLEWARE) {
-				// In the build, tell Vite to emit this file
-				if (isCommandBuild) emit(this, id)
 				return 'export const onRequest = (_, next) => next()';
 			} else if (id === MIDDLEWARE_MODULE_ID) {
 				// In the build, tell Vite to emit this file
-				if (isCommandBuild) emit(this, id)
+				if (isCommandBuild) {
+					this.emitFile({
+						type: 'chunk',
+						preserveSignature: 'strict',
+						fileName: 'middleware.mjs',
+						id,
+					})
+				}
 
 				const preMiddleware = createMiddlewareImports(settings.middlewares.pre, 'pre');
 				const postMiddleware = createMiddlewareImports(settings.middlewares.post, 'post');
@@ -77,15 +81,6 @@ export const onRequest = sequence(
 	};
 }
 
-function emit(context: PluginContext, id: string) {
-	return context.emitFile({
-		type: 'chunk',
-		preserveSignature: 'strict',
-		fileName: 'middleware.mjs',
-		id,
-	})
-}
-
 function createMiddlewareImports(
 	entrypoints: string[],
 	prefix: string