fix(astro): dynamically import actions

.changeset/clever-tigers-dig.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes a case where `astro:env` secrets used in actions would not be available

packages/astro/src/actions/noop-actions.ts

@@ -0,0 +1,5 @@
+import type { SSRActions } from '../core/app/types.js';
+
+export const NOOP_ACTIONS_MOD: SSRActions = {
+	server: {},
+};

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

@@ -77,7 +77,7 @@ export type SSRManifest = {
 	key: Promise<CryptoKey>;
 	i18n: SSRManifestI18n | undefined;
 	middleware?: () => Promise<AstroMiddlewareInstance> | AstroMiddlewareInstance;
-	actions?: SSRActions;
+	actions?: () => Promise<SSRActions> | SSRActions;
 	checkOrigin: boolean;
 	sessionConfig?: ResolvedSessionConfig<any>;
 	cacheDir: string | URL;

packages/astro/src/core/base-pipeline.ts

@@ -19,6 +19,7 @@ import { NOOP_MIDDLEWARE_FN } from './middleware/noop-middleware.js';
 import { sequence } from './middleware/sequence.js';
 import { RouteCache } from './render/route-cache.js';
 import { createDefaultRoutes } from './routing/default.js';
+import { NOOP_ACTIONS_MOD } from '../actions/noop-actions.js';
 
 /**
  * The `Pipeline` represents the static parts of rendering that do not change between requests.
@@ -131,9 +132,9 @@ export abstract class Pipeline {
 		if (this.resolvedActions) {
 			return this.resolvedActions;
 		} else if (this.actions) {
-			return this.actions;
+			return await this.actions();
 		}
-		return { server: {} };
+		return NOOP_ACTIONS_MOD;
 	}
 
 	async getAction(path: string): Promise<ActionClient<unknown, ActionAccept, ZodType>> {

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

@@ -49,6 +49,7 @@ import type {
 	StylesheetAsset,
 } from './types.js';
 import { getTimeStat, shouldAppendForwardSlash } from './util.js';
+import { NOOP_ACTIONS_MOD } from '../../actions/noop-actions.js';
 
 export async function generatePages(options: StaticBuildOptions, internals: BuildInternals) {
 	const generatePagesTimer = performance.now();
@@ -66,7 +67,7 @@ export async function generatePages(options: StaticBuildOptions, internals: Buil
 
 		const actions: SSRActions = internals.astroActionsEntryPoint
 			? await import(internals.astroActionsEntryPoint.toString()).then((mod) => mod)
-			: { server: {} };
+			: NOOP_ACTIONS_MOD;
 		manifest = createBuildManifest(
 			options.settings,
 			internals,
@@ -651,7 +652,7 @@ function createBuildManifest(
 				onRequest: middleware,
 			};
 		},
-		actions,
+		actions: () => actions,
 		checkOrigin:
 			(settings.config.security?.checkOrigin && settings.buildOutput === 'server') ?? false,
 		key,

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

@@ -168,7 +168,6 @@ function generateSSRCode(adapter: AstroAdapter, middlewareId: string) {
 
 	const imports = [
 		`import { renderers } from '${RENDERERS_MODULE_ID}';`,
-		`import * as actions from '${ASTRO_ACTIONS_INTERNAL_MODULE_ID}';`,
 		`import * as serverEntrypointModule from '${ADAPTER_VIRTUAL_MODULE_ID}';`,
 		`import { manifest as defaultManifest } from '${SSR_MANIFEST_VIRTUAL_MODULE_ID}';`,
 		`import { serverIslandMap } from '${VIRTUAL_ISLAND_MAP_ID}';`,
@@ -180,7 +179,7 @@ function generateSSRCode(adapter: AstroAdapter, middlewareId: string) {
 		`    pageMap,`,
 		`    serverIslandMap,`,
 		`    renderers,`,
-		`    actions,`,
+		`    actions: () => import("${ASTRO_ACTIONS_INTERNAL_MODULE_ID}"),`,
 		`    middleware: ${edgeMiddleware ? 'undefined' : `() => import("${middlewareId}")`}`,
 		`});`,
 		`const _args = ${adapter.args ? JSON.stringify(adapter.args, null, 4) : 'undefined'};`,

packages/integrations/cloudflare/test/astro-env.test.js

@@ -62,4 +62,11 @@ describe('astro:env', () => {
 		const $ = cheerio.load(html);
 		assert.equal($('#secret').text().includes('123456789'), true);
 	});
+
+	it('action secret', async () => {
+		const res = await fetch('http://127.0.0.1:8788/test');
+		const html = await res.text();
+		const $ = cheerio.load(html);
+		assert.equal($('#secret').text().includes('123456789'), true);
+	});
 });

packages/integrations/cloudflare/test/fixtures/astro-env/package.json

@@ -7,6 +7,6 @@
     "astro": "workspace:*"
   },
   "devDependencies": {
-    "wrangler": "^3.112.0"
+    "wrangler": "^4.4.1"
   }
 }

packages/integrations/cloudflare/test/fixtures/astro-env/src/actions.ts

@@ -0,0 +1,12 @@
+import { defineAction } from "astro:actions";
+import { API_SECRET } from "astro:env/server";
+
+export const server = {
+  getSecret: defineAction({
+    handler(_input, _context) {
+      return {
+        secret: API_SECRET,
+      };
+    },
+  }),
+};

packages/integrations/cloudflare/test/fixtures/astro-env/src/middleware.ts

@@ -0,0 +1,9 @@
+import { defineMiddleware } from 'astro/middleware'
+import { API_SECRET } from 'astro:env/server'
+
+const secret = API_SECRET
+
+export const onRequest = defineMiddleware((_ctx, next) => {
+    console.log({ secret })
+    return next()
+})

packages/integrations/cloudflare/test/fixtures/astro-env/src/pages/test.astro

@@ -0,0 +1,6 @@
+---
+import { actions } from "astro:actions";
+const { data } = await Astro.callAction(actions.getSecret, {});
+---
+
+<span id="secret">{data?.secret}</span>