fix(middleware): don't import via entrypoint (#12707)

* fix(middleware): don't import via entrypoint * fix(middleware): don't import via entrypoint
withastro · Dec 10, 2024 · 2aaed2d · 2aaed2d
1 parent f6c4214
commit 2aaed2d
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 5 deletions.
diff --git a/.changeset/bright-crabs-kick.md b/.changeset/bright-crabs-kick.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes a bug where the middleware was incorrectly imported during the build
diff --git a/packages/astro/src/core/build/pipeline.ts b/packages/astro/src/core/build/pipeline.ts
@@ -131,11 +131,11 @@ export class BuildPipeline extends Pipeline {
 		const renderers = await import(renderersEntryUrl.toString());
 
 		const middleware = internals.middlewareEntryPoint
-			? await import(internals.middlewareEntryPoint.toString()).then((mod) => {
-					return function () {
-						return { onRequest: mod.onRequest };
-					};
-				})
+			? async function () {
+					// @ts-expect-error: the compiler can't understand the previous check
+					const mod = await import(internals.middlewareEntryPoint.toString());
+					return { onRequest: mod.onRequest };
+				}
 			: manifest.middleware;
 
 		if (!renderers) {

diff --git a/packages/astro/test/fixtures/middleware-full-ssr/package.json b/packages/astro/test/fixtures/middleware-full-ssr/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/middleware-full-ssr",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/middleware-full-ssr/src/error.js b/packages/astro/test/fixtures/middleware-full-ssr/src/error.js
@@ -0,0 +1 @@
+throw new Error("Shoud not error at build time")
diff --git a/packages/astro/test/fixtures/middleware-full-ssr/src/middleware.js b/packages/astro/test/fixtures/middleware-full-ssr/src/middleware.js
@@ -0,0 +1,2 @@
+import "./error.js"
+export const onRequest = (_ , next) => next();
diff --git a/packages/astro/test/fixtures/middleware-full-ssr/src/pages/index.astro b/packages/astro/test/fixtures/middleware-full-ssr/src/pages/index.astro
@@ -0,0 +1,14 @@
+---
+const data = Astro.locals;
+---
+
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+
+	<span>Index</span>
+	<p>{data?.name}</p>
+</body>
+</html>
diff --git a/packages/astro/test/middleware.test.js b/packages/astro/test/middleware.test.js
@@ -171,6 +171,21 @@ describe('Middleware in PROD mode, SSG', () => {
 	});
 });
 
+describe('Middleware should not be executed or imported during', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	it('should build the project without errors', async () => {
+		fixture = await loadFixture({
+			root: './fixtures/middleware-full-ssr/',
+			output: 'server',
+			adapter: testAdapter({}),
+		});
+		await fixture.build();
+		assert.ok('Should build');
+	});
+});
+
 describe('Middleware API in PROD mode, SSR', () => {
 	/** @type {import('./test-utils').Fixture} */
 	let fixture;

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		throw new Error("Shoud not error at build time")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		import "./error.js"
		export const onRequest = (_ , next) => next();