feat(cloudflare): support astro:env

.changeset/purple-trainers-drive.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/cloudflare': minor
+---
+
+Adds support for `astro:env` released under an experimental flag in Astro 4.10 

packages/cloudflare/.gitignore

@@ -2,3 +2,4 @@
 functions
 .mf
 .wrangler
+.astro

packages/cloudflare/package.json

@@ -42,14 +42,14 @@
   },
   "devDependencies": {
     "@astrojs/test-utils": "workspace:*",
-    "astro": "^4.5.8",
+    "astro": "^4.10.1",
     "astro-scripts": "workspace:*",
     "cheerio": "1.0.0-rc.12",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
     "rollup": "^4.14.0",
     "strip-ansi": "^7.1.0",
-    "vite": "^5.2.6"
+    "vite": "^5.2.12"
   },
   "publishConfig": {
     "provenance": true

packages/cloudflare/src/entrypoints/server.ts

@@ -5,8 +5,10 @@ import type {
 } from '@cloudflare/workers-types';
 import type { SSRManifest } from 'astro';
 import { App } from 'astro/app';
+import { createGetEnv } from '../utils/env.js';
 
 type Env = {
+	[key: string]: unknown;
 	ASSETS: { fetch: (req: Request | string) => Promise<Response> };
 	ASTRO_STUDIO_APP_TOKEN?: string;
 };
@@ -69,6 +71,9 @@ export function createExports(manifest: SSRManifest) {
 				},
 			},
 		};
+		// Won't throw if the virtual module is not available because it's not supported in
+		// the users's astro version or if astro:env is not enabled in the project
+		await import('astro/env/setup').then((mod) => mod.setGetEnv(createGetEnv(env))).catch(() => {});
 
 		const response = await app.render(request, { routeData, locals });
 

packages/cloudflare/src/index.ts

@@ -19,6 +19,7 @@ import {
 	type CloudflareModulePluginExtra,
 	cloudflareModuleLoader,
 } from './utils/cloudflare-module-loader.js';
+import { createGetEnv } from './utils/env.js';
 import { createRoutesFile, getParts } from './utils/generate-routes-json.js';
 import { setImageConfig } from './utils/image-config.js';
 import { mutateDynamicPageImportsInPlace, mutatePageMapInPlace } from './utils/index.js';
@@ -191,6 +192,7 @@ export default function createIntegration(args?: Options): AstroIntegration {
 							isSharpCompatible: false,
 							isSquooshCompatible: false,
 						},
+						envGetSecret: 'experimental',
 					},
 				});
 			},
@@ -202,6 +204,17 @@ export default function createIntegration(args?: Options): AstroIntegration {
 						persist: args.platformProxy.persist ?? true,
 					});
 
+					const getEnv = createGetEnv(platformProxy.env);
+
+					if (_config.experimental.env?.schema) {
+						for (const key of Object.keys(_config.experimental.env.schema)) {
+							const value = getEnv(key);
+							if (value !== undefined) {
+								process.env[key] = value;
+							}
+						}
+					}
+
 					const clientLocalsSymbol = Symbol.for('astro.locals');
 
 					server.middlewares.use(async function middleware(req, res, next) {

packages/cloudflare/src/utils/env.ts

@@ -0,0 +1,15 @@
+import type { GetEnv } from 'astro/env/setup';
+
+export const createGetEnv =
+	(env: Record<string, unknown>): GetEnv =>
+	(key) => {
+		const v = env[key];
+		if (typeof v === 'undefined' || typeof v === 'string') {
+			return v;
+		}
+		if (typeof v === 'boolean' || typeof v === 'number') {
+			// let astro:env handle the validation and transformation
+			return v.toString();
+		}
+		return undefined;
+	};

packages/cloudflare/src/utils/non-server-chunk-detector.ts

@@ -1,5 +1,5 @@
 import type { OutputBundle } from 'rollup';
-import type { Plugin } from 'vite';
+import type { Plugin, PluginOption } from 'vite';
 
 /**
  * A Vite bundle analyzer that identifies chunks that are not used for server rendering.
@@ -11,7 +11,7 @@ import type { Plugin } from 'vite';
 export class NonServerChunkDetector {
 	private nonServerChunks?: string[];
 
-	public getPlugin(): Plugin {
+	public getPlugin(): PluginOption {
 		return {
 			name: 'non-server-chunk-detector',
 			generateBundle: (_, bundle) => {

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

@@ -0,0 +1,65 @@
+import * as assert from 'node:assert/strict';
+import { after, before, describe, it } from 'node:test';
+import { fileURLToPath } from 'node:url';
+import * as cheerio from 'cheerio';
+import { astroCli, wranglerCli } from './_test-utils.js';
+
+const root = new URL('./fixtures/astro-env/', import.meta.url);
+
+describe('AstroEnv', () => {
+	let wrangler;
+
+	before(async () => {
+		process.env.PUBLIC_API_URL = 'https://google.de';
+		process.env.PUBLIC_PORT = '4322';
+		await astroCli(fileURLToPath(root), 'build');
+
+		wrangler = wranglerCli(fileURLToPath(root));
+		await new Promise((resolve) => {
+			wrangler.stdout.on('data', (data) => {
+				// console.log('[stdout]', data.toString());
+				if (data.toString().includes('http://127.0.0.1:8788')) resolve();
+			});
+			wrangler.stderr.on('data', (data) => {
+				// console.log('[stderr]', data.toString());
+			});
+		});
+	});
+
+	after((done) => {
+		wrangler.kill();
+	});
+
+	it('runtime', async () => {
+		const res = await fetch('http://127.0.0.1:8788/');
+		const html = await res.text();
+		const $ = cheerio.load(html);
+		assert.equal(
+			$('#runtime').text().includes('https://google.de') &&
+				$('#runtime').text().includes('4322') &&
+				$('#runtime').text().includes('123456789'),
+			true
+		);
+	});
+
+	it('client', async () => {
+		const res = await fetch('http://127.0.0.1:8788/');
+		const html = await res.text();
+		const $ = cheerio.load(html);
+		assert.equal($('#client').text().includes('https://google.de'), true);
+	});
+
+	it('server', async () => {
+		const res = await fetch('http://127.0.0.1:8788/');
+		const html = await res.text();
+		const $ = cheerio.load(html);
+		assert.equal($('#server').text().includes('4322'), true);
+	});
+
+	it('secret', async () => {
+		const res = await fetch('http://127.0.0.1:8788/');
+		const html = await res.text();
+		const $ = cheerio.load(html);
+		assert.equal($('#secret').text().includes('123456789'), true);
+	});
+});

packages/cloudflare/test/fixtures/astro-env/.dev.vars

@@ -0,0 +1 @@
+API_SECRET=123456789

packages/cloudflare/test/fixtures/astro-env/astro.config.ts

@@ -0,0 +1,21 @@
+import cloudflare from '@astrojs/cloudflare';
+import { defineConfig, envField } from 'astro/config';
+
+export default defineConfig({
+	experimental: {
+		rewriting: false,
+		env: {
+			schema: {
+				PUBLIC_API_URL: envField.string({ context: 'client', access: 'public', optional: true }),
+				PUBLIC_PORT: envField.number({ context: 'server', access: 'public', default: 4321 }),
+				// API_SECRET: envField.string({ context: 'server', access: 'secret' }),
+			},
+		},
+	},
+	adapter: cloudflare({
+		platformProxy: {
+			enabled: true,
+		},
+	}),
+	output: 'server',
+});

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

@@ -0,0 +1,12 @@
+{
+  "name": "@test/astro-cloudflare-astro-env",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/cloudflare": "workspace:*",
+    "astro": "^4.10.1"
+  },
+  "devDependencies": {
+    "wrangler": "^3.15.0"
+  }
+}

packages/cloudflare/test/fixtures/astro-env/src/env.d.ts

@@ -0,0 +1,12 @@
+/// <reference path="../.astro/env.d.ts" />
+/// <reference types="astro/client" />
+
+type Runtime = import('@astrojs/cloudflare').Runtime;
+
+declare namespace App {
+  interface Locals extends Runtime {
+    otherLocals: {
+      test: string;
+    };
+  }
+}

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

@@ -0,0 +1,27 @@
+---
+import { PUBLIC_API_URL } from "astro:env/client"
+import { PUBLIC_PORT, getSecret } from "astro:env/server"
+
+const runtime = Astro.locals.runtime;
+---
+<html>
+	<head>
+		<title>Astro Env</title>
+	</head>
+	<body>
+		<h1>Astro Env</h1>
+		<pre id="runtime">{JSON.stringify(runtime.env, null, 2)}</pre>
+		<div>
+			<span>PUBLIC_API_URL</span>
+			<span id="client">{PUBLIC_API_URL}</span>
+		</div>
+		<div>
+			<span>PUBLIC_PORT</span>
+			<span id="server">{PUBLIC_PORT}</span>
+		</div>
+		<div>
+			<span>getSecret</span>
+			<span id="secret">{getSecret("API_SECRET")}</span>
+		</div>
+	</body>
+</html>

packages/cloudflare/test/fixtures/astro-env/tsconfig.json

@@ -0,0 +1,3 @@
+{
+    "extends": "astro/tsconfigs/strict"
+}

packages/cloudflare/test/fixtures/astro-env/wrangler.toml

@@ -0,0 +1,5 @@
+name = "astro-env"
+
+[vars]
+PUBLIC_API_URL = "https://google.de"
+PUBLIC_PORT = 4322

packages/test-utils/test-utils.js

@@ -7,9 +7,6 @@ import fastGlob from 'fast-glob';
 import stripAnsi from 'strip-ansi';
 import { check } from './node_modules/astro/dist/cli/check/index.js';
 import build from './node_modules/astro/dist/core/build/index.js';
-import { RESOLVED_SPLIT_MODULE_ID } from './node_modules/astro/dist/core/build/plugins/plugin-ssr.js';
-import { getVirtualModulePageNameFromPath } from './node_modules/astro/dist/core/build/plugins/util.js';
-import { makeSplitEntryPointFileName } from './node_modules/astro/dist/core/build/static-build.js';
 import { mergeConfig, resolveConfig } from './node_modules/astro/dist/core/config/index.js';
 import { dev, preview } from './node_modules/astro/dist/core/index.js';
 import { nodeLogDestination } from './node_modules/astro/dist/core/logger/node.js';
@@ -213,15 +210,6 @@ export async function loadFixture(inlineConfig) {
 			app.manifest = manifest;
 			return app;
 		},
-		loadEntryPoint: async (pagePath, routes, streaming) => {
-			const virtualModule = getVirtualModulePageNameFromPath(RESOLVED_SPLIT_MODULE_ID, pagePath);
-			const filePath = makeSplitEntryPointFileName(virtualModule, routes);
-			const url = new URL(`./server/${filePath}?id=${fixtureId}`, config.outDir);
-			const { createApp, manifest } = await import(url);
-			const app = createApp(streaming);
-			app.manifest = manifest;
-			return app;
-		},
 		editFile: async (filePath, newContentsOrCallback) => {
 			const fileUrl = new URL(filePath.replace(/^\//, ''), config.root);
 			const contents = await fs.promises.readFile(fileUrl, 'utf-8');