eas-cli 16.20.4 → 16.22.0

package/build/commands/workflow/create.js

@@ -2,28 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowCreate = void 0;
 const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const promises_1 = tslib_1.__importDefault(require("fs/promises"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const prompts_1 = tslib_1.__importDefault(require("prompts"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
-const flags_1 = require("../../commandUtils/flags");
+const buildProfileUtils_1 = require("../../commandUtils/workflow/buildProfileUtils");
+const creation_1 = require("../../commandUtils/workflow/creation");
+const validation_1 = require("../../commandUtils/workflow/validation");
 const log_1 = tslib_1.__importDefault(require("../../log"));
+const prompts_1 = require("../../prompts");
+const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
 const workflowFile_1 = require("../../utils/workflowFile");
-const DEFAULT_WORKFLOW_NAME = 'workflow.yml';
-const HELLO_WORLD_TEMPLATE = `name: Hello World
-
-on:
-  push:
-    branches: ['*']
-
-jobs:
-  hello_world:
-    steps:
-      - uses: eas/checkout
-      - run: echo "Hello, World"
-`;
 class WorkflowCreate extends EasCommand_1.default {
     static description = 'create a new workflow configuration YAML file';
     static args = [
@@ -34,65 +25,148 @@ class WorkflowCreate extends EasCommand_1.default {
         },
     ];
     static flags = {
-        ...flags_1.EASNonInteractiveFlag,
+        'skip-validation': core_1.Flags.boolean({
+            description: 'If set, the workflow file will not be validated before being created',
+            default: false,
+        }),
     };
     static contextDefinition = {
+        ...this.ContextOptions.DynamicProjectConfig,
         ...this.ContextOptions.ProjectDir,
+        ...this.ContextOptions.LoggedIn,
     };
     async runAsync() {
         const { args: { name: argFileName }, flags, } = await this.parse(WorkflowCreate);
-        const { projectDir } = await this.getContextAsync(WorkflowCreate, {
-            nonInteractive: flags['non-interactive'],
-        });
-        let fileName = argFileName;
-        if (!fileName) {
-            const response = await (0, prompts_1.default)({
-                type: 'text',
-                name: 'fileName',
-                message: 'What would you like to name your workflow file?',
-                initial: DEFAULT_WORKFLOW_NAME,
-                validate: value => {
-                    try {
-                        workflowFile_1.WorkflowFile.validateYamlExtension(value);
-                        return true;
+        try {
+            const { getDynamicPrivateProjectConfigAsync, loggedIn: { graphqlClient }, projectDir, } = await this.getContextAsync(WorkflowCreate, {
+                nonInteractive: false,
+                withServerSideEnvironment: null,
+            });
+            const { exp: originalExpoConfig, projectId } = await getDynamicPrivateProjectConfigAsync();
+            let expoConfig = originalExpoConfig;
+            let workflowStarter;
+            while (!workflowStarter) {
+                workflowStarter = await chooseTemplateAsync();
+                switch (workflowStarter.name) {
+                    case creation_1.WorkflowStarterName.BUILD:
+                    case creation_1.WorkflowStarterName.DEPLOY:
+                    case creation_1.WorkflowStarterName.UPDATE: {
+                        const shouldProceed = await (0, buildProfileUtils_1.runBuildConfigureIfNeededAsync)({
+                            projectDir,
+                            expoConfig,
+                        });
+                        if (!shouldProceed) {
+                            workflowStarter = undefined;
+                            continue;
+                        }
+                        break;
                     }
-                    catch (error) {
-                        return error instanceof Error ? error.message : 'Invalid file name';
+                    default:
+                        break;
+                }
+                switch (workflowStarter.name) {
+                    case creation_1.WorkflowStarterName.DEPLOY:
+                    case creation_1.WorkflowStarterName.UPDATE: {
+                        const shouldProceed = await (0, buildProfileUtils_1.runUpdateConfigureIfNeededAsync)({
+                            projectDir,
+                            expoConfig,
+                        });
+                        if (!shouldProceed) {
+                            workflowStarter = undefined;
+                            continue;
+                        }
+                        // Need to refetch the Expo config because it may have changed
+                        expoConfig = (await getDynamicPrivateProjectConfigAsync()).exp;
+                        break;
                     }
-                },
-            });
-            if (!response.fileName) {
-                log_1.default.warn('Workflow creation cancelled.');
-                process.exit(0);
+                    default:
+                        break;
+                }
+            }
+            const { fileName, filePath } = await chooseFileNameAsync(argFileName, projectDir, workflowStarter);
+            // Customize the template if needed
+            workflowStarter = await (0, creation_1.customizeTemplateIfNeededAsync)(workflowStarter, projectDir, expoConfig);
+            log_1.default.debug(`Creating workflow file ${fileName} from template ${workflowStarter.name}`);
+            const yamlString = [
+                workflowStarter.header,
+                (0, validation_1.workflowContentsFromParsedYaml)(workflowStarter.template),
+            ].join('\n');
+            if (!flags['skip-validation']) {
+                await (0, validation_1.validateWorkflowFileAsync)({ yamlConfig: yamlString, filePath: fileName }, projectDir, graphqlClient, projectId);
+            }
+            await ensureWorkflowsDirectoryExistsAsync({ projectDir });
+            filePath && (await promises_1.default.writeFile(filePath, yamlString));
+            log_1.default.withTick(`Created ${chalk_1.default.bold(filePath)}`);
+            log_1.default.addNewLineIfNone();
+            log_1.default.log((0, creation_1.howToRunWorkflow)(fileName, workflowStarter));
+            // Next steps
+            if (workflowStarter.nextSteps && workflowStarter.nextSteps.length > 0) {
+                log_1.default.addNewLineIfNone();
+                log_1.default.log('Next steps:');
+                log_1.default.addNewLineIfNone();
+                log_1.default.log((0, formatFields_1.default)(workflowStarter.nextSteps.map((step, index) => ({
+                    label: `${index + 1}.`,
+                    value: step,
+                }))));
             }
-            fileName = response.fileName;
-        }
-        try {
-            await this.ensureWorkflowsDirectoryExistsAsync({ projectDir });
-            await this.createWorkflowFileAsync({ fileName, projectDir });
         }
         catch (error) {
+            (0, validation_1.logWorkflowValidationErrors)(error);
             log_1.default.error('Failed to create workflow file.');
-            throw error;
         }
     }
-    async ensureWorkflowsDirectoryExistsAsync({ projectDir, }) {
+}
+exports.WorkflowCreate = WorkflowCreate;
+async function ensureWorkflowsDirectoryExistsAsync({ projectDir, }) {
+    try {
+        await promises_1.default.access(path_1.default.join(projectDir, '.eas', 'workflows'));
+    }
+    catch {
+        await promises_1.default.mkdir(path_1.default.join(projectDir, '.eas', 'workflows'), { recursive: true });
+        log_1.default.withTick(`Created directory ${chalk_1.default.bold(path_1.default.join(projectDir, '.eas', 'workflows'))}`);
+    }
+}
+async function chooseTemplateAsync() {
+    const workflowStarter = (await (0, prompts_1.promptAsync)({
+        type: 'select',
+        name: 'starter',
+        message: 'Select a workflow template:',
+        choices: creation_1.workflowStarters.map(starter => ({
+            title: starter.displayName,
+            value: starter,
+        })),
+    })).starter;
+    return workflowStarter;
+}
+async function chooseFileNameAsync(initialValue, projectDir, workflowStarter) {
+    let fileName = initialValue;
+    let filePath = '';
+    while ((fileName?.length ?? 0) === 0) {
+        fileName = (await (0, prompts_1.promptAsync)({
+            type: 'text',
+            name: 'fileName',
+            message: 'What would you like to name your workflow file?',
+            initial: workflowStarter.defaultFileName,
+        })).fileName;
+        if (!fileName) {
+            fileName = undefined;
+            continue;
+        }
         try {
-            await promises_1.default.access(path_1.default.join(projectDir, '.eas', 'workflows'));
+            workflowFile_1.WorkflowFile.validateYamlExtension(fileName);
         }
-        catch {
-            await promises_1.default.mkdir(path_1.default.join(projectDir, '.eas', 'workflows'), { recursive: true });
-            log_1.default.withTick(`Created directory ${chalk_1.default.bold(path_1.default.join(projectDir, '.eas', 'workflows'))}`);
+        catch (error) {
+            log_1.default.error(error instanceof Error ? error.message : 'Invalid YAML file name extension');
+            fileName = undefined;
+            continue;
         }
-    }
-    async createWorkflowFileAsync({ fileName, projectDir, }) {
-        workflowFile_1.WorkflowFile.validateYamlExtension(fileName);
-        const filePath = path_1.default.join(projectDir, '.eas', 'workflows', fileName);
+        filePath = path_1.default.join(projectDir, '.eas', 'workflows', fileName);
         if (await fs_extra_1.default.pathExists(filePath)) {
-            throw new Error(`Workflow file already exists: ${filePath}`);
+            log_1.default.error(`Workflow file already exists: ${filePath}`);
+            log_1.default.error('Please choose a different file name.');
+            log_1.default.newLine();
+            fileName = undefined;
         }
-        await promises_1.default.writeFile(filePath, HELLO_WORLD_TEMPLATE);
-        log_1.default.withTick(`Created ${chalk_1.default.bold(filePath)}`);
     }
+    return { fileName: fileName ?? '', filePath };
 }
-exports.WorkflowCreate = WorkflowCreate;

package/build/graphql/generated.d.ts

@@ -166,6 +166,7 @@ export type Account = {
     displayName?: Maybe<Scalars['String']['output']>;
     /** Environment secrets for an account */
     environmentSecrets: Array<EnvironmentSecret>;
+    environmentVariableEnvironments: Array<Scalars['EnvironmentVariableEnvironment']['output']>;
     /** Environment variables for an account */
     environmentVariables: Array<EnvironmentVariable>;
     /** Environment variables for an account with decrypted secret values */
@@ -1139,6 +1140,7 @@ export type App = Project & {
     devDomainName?: Maybe<AppDevDomainName>;
     /** Environment secrets for an app */
     environmentSecrets: Array<EnvironmentSecret>;
+    environmentVariableEnvironments: Array<Scalars['EnvironmentVariableEnvironment']['output']>;
     /** Environment variables for an app */
     environmentVariables: Array<EnvironmentVariable>;
     /** Environment variables for an app with decrypted secret values */
@@ -12704,6 +12706,20 @@ export type AppByIdWorkflowsQuery = {
                 fileName: string;
                 createdAt: any;
                 updatedAt: any;
+                revisionsPaginated: {
+                    __typename?: 'WorkflowRevisionsConnection';
+                    edges: Array<{
+                        __typename?: 'WorkflowRevisionEdge';
+                        node: {
+                            __typename?: 'WorkflowRevision';
+                            id: string;
+                            blobSha: string;
+                            commitSha?: string | null;
+                            createdAt: any;
+                            yamlConfig: string;
+                        };
+                    }>;
+                };
             }>;
         };
     };
@@ -15670,6 +15686,20 @@ export type WorkflowFragment = {
     fileName: string;
     createdAt: any;
     updatedAt: any;
+    revisionsPaginated: {
+        __typename?: 'WorkflowRevisionsConnection';
+        edges: Array<{
+            __typename?: 'WorkflowRevisionEdge';
+            node: {
+                __typename?: 'WorkflowRevision';
+                id: string;
+                blobSha: string;
+                commitSha?: string | null;
+                createdAt: any;
+                yamlConfig: string;
+            };
+        }>;
+    };
 };
 export type WorkflowJobFragment = {
     __typename?: 'WorkflowJob';

package/build/graphql/types/Workflow.js

@@ -10,5 +10,16 @@ exports.WorkflowFragmentNode = (0, graphql_tag_1.default) `
     fileName
     createdAt
     updatedAt
+    revisionsPaginated(first: 1) {
+      edges {
+        node {
+          id
+          blobSha
+          commitSha
+          createdAt
+          yamlConfig
+        }
+      }
+    }
   }
 `;

package/build/worker/assets.d.ts

@@ -14,6 +14,11 @@ export interface AssetFileEntry {
 }
 /** Collects assets from a given target path */
 export declare function collectAssetsAsync(assetPath: string | undefined, options: AssetMapOptions): Promise<AssetFileEntry[]>;
+export interface RoutesConfigEntry {
+    headers?: Record<string, unknown>;
+    redirects?: Record<string, unknown>[];
+}
+export declare function getRoutesConfigAsync(assetPath: string | undefined): Promise<RoutesConfigEntry | null>;
 /** Mapping of normalized file paths to a SHA512 hash */
 export type AssetMap = Record<string, string | {
     sha512: string;

package/build/worker/assets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.packFilesIterableAsync = exports.listWorkerFilesAsync = exports.createManifestAsync = exports.assetsToAssetsMap = exports.collectAssetsAsync = void 0;
+exports.packFilesIterableAsync = exports.listWorkerFilesAsync = exports.createManifestAsync = exports.assetsToAssetsMap = exports.getRoutesConfigAsync = exports.collectAssetsAsync = void 0;
 const tslib_1 = require("tslib");
 const env_1 = require("@expo/env");
 const mime_1 = tslib_1.__importDefault(require("mime"));
@@ -12,6 +12,7 @@ const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const promises_1 = require("node:stream/promises");
 const tar_stream_1 = require("tar-stream");
 const EnvironmentVariablesQuery_1 = require("../graphql/queries/EnvironmentVariablesQuery");
+const EXPO_ROUTES_PATHS = new Set(['_expo/routes.json', '_expo/.routes.json', '.expo-routes.json']);
 /** Returns whether a file or folder is ignored */
 function isIgnoredName(name) {
     switch (name) {
@@ -89,6 +90,9 @@ async function collectAssetsAsync(assetPath, options) {
             if (file.size > options.maxFileSize) {
                 throw new Error(`Upload of "${file.normalizedPath}" aborted: File size is greater than the upload limit (>500MB)`);
             }
+            else if (EXPO_ROUTES_PATHS.has(file.normalizedPath)) {
+                continue;
+            }
             const sha512$ = computeSha512HashAsync(file.path);
             const contentType$ = determineMimeTypeAsync(file.path);
             assets.push({
@@ -103,6 +107,25 @@ async function collectAssetsAsync(assetPath, options) {
     return assets;
 }
 exports.collectAssetsAsync = collectAssetsAsync;
+async function getRoutesConfigAsync(assetPath) {
+    if (assetPath) {
+        for (const candidatePath of EXPO_ROUTES_PATHS) {
+            const targetPath = node_path_1.default.resolve(assetPath, candidatePath);
+            let json;
+            try {
+                json = JSON.parse(await node_fs_1.default.promises.readFile(targetPath, 'utf8'));
+            }
+            catch {
+                continue;
+            }
+            if (typeof json === 'object' && json) {
+                return json;
+            }
+        }
+    }
+    return null;
+}
+exports.getRoutesConfigAsync = getRoutesConfigAsync;
 /** Converts array of asset entries into AssetMap (as sent to deployment-api) */
 function assetsToAssetsMap(assets) {
     return assets.reduce((map, entry) => {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "16.20.4",
+  "version": "16.22.0",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -4153,10 +4153,10 @@
       "pluginType": "core",
       "aliases": [],
       "flags": {
-        "non-interactive": {
-          "name": "non-interactive",
+        "skip-validation": {
+          "name": "skip-validation",
           "type": "boolean",
-          "description": "Run the command in non-interactive mode.",
+          "description": "If set, the workflow file will not be validated before being created",
           "allowNo": false
         }
       },
@@ -4168,7 +4168,10 @@
         }
       },
       "contextDefinition": {
-        "projectDir": {}
+        "getDynamicPublicProjectConfigAsync": {},
+        "getDynamicPrivateProjectConfigAsync": {},
+        "projectDir": {},
+        "loggedIn": {}
       }
     },
     "workflow:list": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "16.20.4",
+  "version": "16.22.0",
   "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
@@ -241,5 +241,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "5b9734b60b61012d458ade299f9f4447ad8fa376"
+  "gitHead": "72cff1df1a5db334d2b12461532f483a7a35e2fa"
 }