feat: address reviews

.changeset/eighty-boxes-applaud.md

@@ -10,12 +10,12 @@ To upgrade, update your Astro config:
 import { defineConfig, envField } from 'astro/config'
 
 export default defineConfig({
--    experimental: {
+-  experimental: {
-        env: {
+    env: {
-            schema: {
+      schema: {
-                FOO: envField.string({ /* ... */ })
+        FOO: envField.string({ /* ... */ })
-            }
+      }
-        }
+    }
--    }
+-  }
 })
 ```

packages/astro/src/env/sync.ts

@@ -3,32 +3,29 @@ import { ENV_TYPES_FILE } from './constants.js';
 import { getEnvFieldType } from './validators.js';
 
 export function syncAstroEnv(settings: AstroSettings): void {
-	let client: string | null = null;
+	let client = '';
-	let server: string | null = null;
+	let server = '';
 
 	for (const [key, options] of Object.entries(settings.config.env.schema)) {
 		const str = `	export const ${key}: ${getEnvFieldType(options)};	\n`;
 		if (options.context === 'client') {
-			client ??= '';
 			client += str;
 		} else {
-			server ??= '';
 			server += str;
 		}
 	}
 
-	let content: string | null = null;
+	let content = '';
-	if (client !== null) {
+	if (client !== '') {
 		content = `declare module 'astro:env/client' {
 ${client}}`;
 	}
-	if (server !== null) {
+	if (server !== '') {
-		content ??= '';
 		content += `declare module 'astro:env/server' {
 ${server}}`;
 	}
 
-	if (content) {
+	if (content !== '') {
 		settings.injectedTypes.push({
 			filename: ENV_TYPES_FILE,
 			content,

packages/integrations/vercel/src/serverless/entrypoint.ts

@@ -9,8 +9,8 @@ import {
 	ASTRO_PATH_PARAM,
 } from './adapter.js';
 
-setGetEnv((key) => process.env[key]);
 applyPolyfills();
+setGetEnv((key) => process.env[key]);
 
 export const createExports = (
 	manifest: SSRManifest,