refactor(core): remove middleware from actions

withastro · Feb 17, 2025 · fd88009 · fd88009
1 parent 3842ce5
commit fd88009
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 23 deletions.
diff --git a/packages/astro/src/actions/integration.ts b/packages/astro/src/actions/integration.ts
@@ -17,18 +17,13 @@ export default function astroIntegrationActionsRouteHandler({
 	return {
 		name: VIRTUAL_MODULE_ID,
 		hooks: {
-			async 'astro:config:setup'(params) {
+			async 'astro:config:setup'() {
 				settings.injectedRoutes.push({
 					pattern: ACTION_RPC_ROUTE_PATTERN,
 					entrypoint: 'astro/actions/runtime/route.js',
 					prerender: false,
 					origin: 'internal',
 				});
-
-				params.addMiddleware({
-					entrypoint: 'astro/actions/runtime/middleware.js',
-					order: 'post',
-				});
 			},
 			'astro:config:done': async (params) => {
 				if (params.buildOutput === 'static') {

diff --git a/packages/astro/src/actions/runtime/middleware.ts b/packages/astro/src/actions/runtime/middleware.ts
diff --git a/packages/astro/src/actions/runtime/virtual/server.ts b/packages/astro/src/actions/runtime/virtual/server.ts
@@ -239,7 +239,7 @@ function unwrapBaseObjectSchema(schema: z.ZodType, unparsedInput: FormData) {
 	return schema;
 }
 
-export type ActionMiddlewareContext = {
+export type AstroActionContext = {
 	/** Information about an incoming action request. */
 	action?: {
 		/** Whether an action was called using an RPC function or by using an HTML form action. */
@@ -268,15 +268,15 @@ export type ActionMiddlewareContext = {
 /**
  * Access information about Action requests from middleware.
  */
-export function getActionContext(context: APIContext): ActionMiddlewareContext {
+export function getActionContext(context: APIContext): AstroActionContext {
 	const callerInfo = getCallerInfo(context);
 
 	// Prevents action results from being handled on a rewrite.
 	// Also prevents our *own* fallback middleware from running
 	// if the user's middleware has already handled the result.
 	const actionResultAlreadySet = Boolean((context.locals as Locals)._actionPayload);
 
-	let action: ActionMiddlewareContext['action'] = undefined;
+	let action: AstroActionContext['action'] = undefined;
 
 	if (callerInfo && context.request.method === 'POST' && !actionResultAlreadySet) {
 		action = {

diff --git a/packages/astro/src/core/render-context.ts b/packages/astro/src/core/render-context.ts
@@ -32,6 +32,7 @@ import { type Pipeline, Slots, getParams, getProps } from './render/index.js';
 import { isRoute404or500, isRouteExternalRedirect, isRouteServerIsland } from './routing/match.js';
 import { copyRequest, getOriginPathname, setOriginPathname } from './routing/rewrite.js';
 import { AstroSession } from './session.js';
+import {getActionContext} from "../actions/runtime/virtual/server.js";
 
 export const apiContextRoutesSymbol = Symbol.for('context.routes');
 
@@ -192,6 +193,16 @@ export class RenderContext {
 			}
 			let response: Response;
 
+			if 	(!ctx.isPrerendered) {
+
+				const { action, setActionResult, serializeActionResult } = getActionContext(ctx);
+
+				if (action?.calledFrom === 'form') {
+					const actionResult = await action.handler();
+					setActionResult(action.name, serializeActionResult(actionResult));
+				}
+			}
+
 			switch (this.routeData.type) {
 				case 'endpoint': {
 					response = await renderEndpoint(

diff --git a/packages/astro/test/actions.test.js b/packages/astro/test/actions.test.js
@@ -578,7 +578,6 @@ it('Should support trailing slash', async () => {
 		method: 'POST',
 		body: formData,
 	});
-
 	assert.equal(res.ok, true);
 	assert.equal(res.headers.get('Content-Type'), 'application/json+devalue');