fix(middleware): instantiate locals if the adapter does not (#8800)

5 files changed, 42 insertions, 5 deletions

diff --git a/packages/integrations/node/test/fixtures/locals/src/middleware.ts b/packages/integrations/node/test/fixtures/locals/src/middleware.ts
new file mode 100644
index 000000000..e349ca41d
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/locals/src/middleware.ts
@@ -0,0 +1,6 @@
+import { defineMiddleware } from 'astro:middleware';
+
+export const onRequest = defineMiddleware(({ url, locals }, next) => {
+    if (url.pathname === "/from-astro-middleware") locals.foo = "baz";
+    return next();
+})
diff --git a/packages/integrations/node/test/fixtures/locals/src/pages/api.js b/packages/integrations/node/test/fixtures/locals/src/pages/api.js
index 8b209c582..3c279e37b 100644
--- a/packages/integrations/node/test/fixtures/locals/src/pages/api.js
+++ b/packages/integrations/node/test/fixtures/locals/src/pages/api.js
@@ -1,6 +1,6 @@
 
-export async function post({ locals }) {
-	let out = { ...locals };
+export async function POST({ locals }) {
+	const out = { ...locals };
 
 	return new Response(JSON.stringify(out), {
 		headers: {
diff --git a/packages/integrations/node/test/fixtures/locals/src/pages/foo.astro b/packages/integrations/node/test/fixtures/locals/src/pages/from-astro-middleware.astro
index 224a875ec..224a875ec 100644
--- a/packages/integrations/node/test/fixtures/locals/src/pages/foo.astro
+++ b/packages/integrations/node/test/fixtures/locals/src/pages/from-astro-middleware.astro
diff --git a/packages/integrations/node/test/fixtures/locals/src/pages/from-node-middleware.astro b/packages/integrations/node/test/fixtures/locals/src/pages/from-node-middleware.astro
new file mode 100644
index 000000000..224a875ec
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/locals/src/pages/from-node-middleware.astro
@@ -0,0 +1,4 @@
+---
+const { foo } = Astro.locals;
+---
+<h1>{foo}</h1>
diff --git a/packages/integrations/node/test/locals.test.js b/packages/integrations/node/test/locals.test.js
index f7fc6b73f..b593f3eb9 100644
--- a/packages/integrations/node/test/locals.test.js
+++ b/packages/integrations/node/test/locals.test.js
@@ -15,11 +15,10 @@ describe('API routes', () => {
 		await fixture.build();
 	});
 
-	it('Can render locals in page', async () => {
+	it('Can use locals added by node middleware', async () => {
 		const { handler } = await import('./fixtures/locals/dist/server/entry.mjs');
 		let { req, res, text } = createRequestAndResponse({
-			method: 'POST',
-			url: '/foo',
+			url: '/from-node-middleware',
 		});
 
 		let locals = { foo: 'bar' };
@@ -32,6 +31,34 @@ describe('API routes', () => {
 		expect(html).to.contain('<h1>bar</h1>');
 	});
 
+	it('Throws an error when provided non-objects as locals', async () => {
+		const { handler } = await import('./fixtures/locals/dist/server/entry.mjs');
+		let { req, res, done } = createRequestAndResponse({
+			url: '/from-node-middleware',
+		});
+
+		handler(req, res, undefined, "locals");
+		req.send();
+
+		await done;
+		expect(res).to.deep.include({ statusCode: 500 });
+	});
+
+	it('Can use locals added by astro middleware', async () => {
+		const { handler } = await import('./fixtures/locals/dist/server/entry.mjs');
+		
+		const { req, res, text } = createRequestAndResponse({
+			url: '/from-astro-middleware',
+		});
+
+		handler(req, res, () => {});
+		req.send();
+
+		const html = await text();
+
+		expect(html).to.contain('<h1>baz</h1>');
+	});
+
 	it('Can access locals in API', async () => {
 		const { handler } = await import('./fixtures/locals/dist/server/entry.mjs');
 		let { req, res, done } = createRequestAndResponse({