feat(cli): Source @expo/env dotenv vars for worker deployments

CHANGELOG.md

@@ -14,6 +14,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 - Make error message for invalid CFBundleShortVersionString more descriptive and actionable. Improve CFBundleShortVersionString validation regex. ([#2542](https://github.com/expo/eas-cli/pull/2542) by [@szdziedzic](https://github.com/szdziedzic))
 - Add missing `--non-interactive` argument to `worker:deploy` command. ([#2544](https://github.com/expo/eas-cli/pull/2544) by [@kitten](https://github.com/kitten))
+- Source `@expo/env` dotenv files for worker deployments. ([#2545](https://github.com/expo/eas-cli/pull/2545) by [@kitten](https://github.com/kitten))
 
 ## [12.3.0](https://github.com/expo/eas-cli/releases/tag/v12.3.0) - 2024-09-09
 

packages/eas-cli/package.json

@@ -15,6 +15,7 @@
     "@expo/config-types": "50.0.0",
     "@expo/eas-build-job": "1.0.133",
     "@expo/eas-json": "12.0.0",
+    "@expo/env": "^0.3.0",
     "@expo/json-file": "8.2.37",
     "@expo/logger": "1.0.117",
     "@expo/multipart-body-parser": "1.1.0",

packages/eas-cli/src/commands/worker/deploy.ts

@@ -91,15 +91,12 @@
       );
     }
 
-    async function* emitWorkerTarballAsync(
-      assetMap: WorkerAssets.AssetMap
-    ): AsyncGenerator<WorkerAssets.FileEntry> {
-      yield ['assets.json', JSON.stringify(assetMap)];
-
-      // TODO: Create manifest from user configuration
-      const manifest = { env: {} };
-      yield ['manifest.json', JSON.stringify(manifest)];
-
+    async function* emitWorkerTarballAsync(params: {
+      assetMap: WorkerAssets.AssetMap,
+      manifest: WorkerAssets.Manifest,
+    }): AsyncGenerator<WorkerAssets.FileEntry> {
+      yield ['assets.json', JSON.stringify(params.assetMap)];
+      yield ['manifest.json', JSON.stringify(params.manifest)];
       if (distServerPath) {
         const workerFiles = WorkerAssets.listWorkerFilesAsync(distServerPath);
         for await (const workerFile of workerFiles) {
@@ -195,7 +192,11 @@
     let tarPath: string;
     try {
       assetMap = await WorkerAssets.createAssetMapAsync(distClientPath);
-      tarPath = await WorkerAssets.packFilesIterableAsync(emitWorkerTarballAsync(assetMap));
+      const manifest = await WorkerAssets.createManifestAsync(projectDir);
+      tarPath = await WorkerAssets.packFilesIterableAsync(emitWorkerTarballAsync({
+        assetMap,
+        manifest,
+      }));
     } catch (error: any) {
       progress.fail('Failed to prepare worker upload');
       throw error;

packages/eas-cli/src/worker/assets.ts

@@ -5,6 +5,7 @@
 import path from 'node:path';
 import { pipeline } from 'node:stream/promises';
 import { pack } from 'tar-stream';
+import { get as getEnv } from '@expo/env';
 
 /** Returns whether a file or folder is ignored */
 function isIgnoredName(name: string): boolean {
@@ -87,6 +88,18 @@
   return map;
 }
 
+export interface Manifest {
+  env: Record<string, string | undefined>;
+}
+
+/** Creates a manifest configuration sent up for deployment */
+export async function createManifestAsync(
+  projectDir: string
+): Promise<Manifest> {
+  const { env } = getEnv(projectDir);
+  return { env };
+}
+
 interface WorkerFileEntry {
   normalizedPath: string;
   path: string;