eas-cli 12.5.3 → 12.6.0

package/build/commands/env/push.js

@@ -12,90 +12,102 @@ const EnvironmentVariableMutation_1 = require("../../graphql/mutations/Environme
 const EnvironmentVariablesQuery_1 = require("../../graphql/queries/EnvironmentVariablesQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const prompts_1 = require("../../prompts");
+const prompts_2 = require("../../utils/prompts");
 class EnvironmentVariablePush extends EasCommand_1.default {
     async runAsync() {
-        const { flags } = await this.parse(_a);
-        const { environment, path: envPath } = this.validateFlags(flags);
+        let { flags: { environment: environments, path: envPath }, } = await this.parse(_a);
         const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(_a, {
             nonInteractive: false,
         });
-        const updateVariables = await this.parseEnvFileAsync(envPath, environment);
-        const variableNames = Object.keys(updateVariables);
-        const existingVariables = await EnvironmentVariablesQuery_1.EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
-            appId: projectId,
-            environment,
-            filterNames: variableNames,
-        });
-        const existingDifferentVariables = [];
-        // Remove variables that are the same as the ones in the environment
-        existingVariables.forEach(variable => {
-            const existingVariableUpdate = updateVariables[variable.name];
-            if (existingVariableUpdate && existingVariableUpdate.value !== variable.value) {
-                existingDifferentVariables.push(variable);
-            }
-            else {
-                delete updateVariables[variable.name];
-            }
-        });
-        const existingDifferentSharedVariables = existingDifferentVariables.filter(variable => variable.scope === generated_1.EnvironmentVariableScope.Shared);
-        if (existingDifferentSharedVariables.length > 0) {
-            const existingDifferentSharedVariablesNames = existingDifferentSharedVariables.map(variable => variable.name);
-            log_1.default.error('Shared variables cannot be overwritten by eas env:push command.');
-            log_1.default.error('Remove them from the env file or unlink them from the project to continue:');
-            existingDifferentSharedVariablesNames.forEach(name => {
-                log_1.default.error(`- ${name}`);
+        if (!environments) {
+            environments = await (0, prompts_2.promptVariableEnvironmentAsync)({
+                nonInteractive: false,
+                multiple: true,
             });
-            throw new Error('Shared variables cannot be overwritten by eas env:push command');
         }
-        if (existingDifferentVariables.length > 0) {
-            log_1.default.warn('Some variables already exist in the environment.');
-            const variableNames = existingDifferentVariables.map(variable => variable.name);
-            const confirmationMessage = variableNames.length > 1
-                ? `The ${variableNames.join(', ')} environment variables already exist in ${environment} environment. Do you want to override them all?`
-                : `The ${variableNames[0]} environment variable already exists in ${environment} environment. Do you want to override it?`;
-            const confirm = await (0, prompts_1.confirmAsync)({
-                message: confirmationMessage,
+        const updateVariables = await this.parseEnvFileAsync(envPath, environments);
+        const variableNames = Object.keys(updateVariables);
+        for (const environment of environments) {
+            const displayedEnvironment = environment.toLocaleLowerCase();
+            const existingVariables = await EnvironmentVariablesQuery_1.EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
+                appId: projectId,
+                environment,
+                filterNames: variableNames,
             });
-            let variablesToOverwrite = [];
-            if (!confirm && existingDifferentVariables.length === 1) {
-                throw new Error('No new variables to push.');
-            }
-            if (confirm) {
-                variablesToOverwrite = existingDifferentVariables.map(variable => variable.name);
-            }
-            else {
-                const promptResult = await (0, prompts_1.promptAsync)({
-                    type: 'multiselect',
-                    name: 'variablesToOverwrite',
-                    message: 'Select variables to overwrite:',
-                    // @ts-expect-error property missing from `@types/prompts`
-                    optionsPerPage: 20,
-                    choices: existingDifferentVariables.map(variable => ({
-                        title: `${variable.name}: ${updateVariables[variable.name].value} (was ${variable.value ?? '(secret)'})`,
-                        value: variable.name,
-                    })),
+            const existingDifferentVariables = [];
+            // Remove variables that are the same as the ones in the environment
+            existingVariables.forEach(existingVariable => {
+                const existingVariableUpdate = updateVariables[existingVariable.name];
+                if (existingVariableUpdate) {
+                    const hasMoreEnvironments = existingVariableUpdate.environments.some(newEnv => !existingVariable.environments?.includes(newEnv));
+                    if (existingVariableUpdate.value !== existingVariable.value || hasMoreEnvironments) {
+                        existingDifferentVariables.push(existingVariable);
+                    }
+                    else {
+                        delete updateVariables[existingVariable.name];
+                    }
+                }
+            });
+            const existingDifferentSharedVariables = existingDifferentVariables.filter(variable => variable.scope === generated_1.EnvironmentVariableScope.Shared);
+            if (existingDifferentSharedVariables.length > 0) {
+                const existingDifferentSharedVariablesNames = existingDifferentSharedVariables.map(variable => variable.name);
+                log_1.default.error('Shared variables cannot be overwritten by eas env:push command.');
+                log_1.default.error('Remove them from the env file or unlink them from the project to continue:');
+                existingDifferentSharedVariablesNames.forEach(name => {
+                    log_1.default.error(`- ${name}`);
                 });
-                variablesToOverwrite = promptResult.variablesToOverwrite;
+                throw new Error('Shared variables cannot be overwritten by eas env:push command');
             }
-            for (const existingVariable of existingVariables) {
-                const name = existingVariable.name;
-                if (variablesToOverwrite.includes(name)) {
-                    updateVariables[name]['overwrite'] = true;
+            if (existingDifferentVariables.length > 0) {
+                log_1.default.warn(`Some variables already exist in the ${displayedEnvironment} environment.`);
+                const variableNames = existingDifferentVariables.map(variable => variable.name);
+                const confirmationMessage = variableNames.length > 1
+                    ? `The ${variableNames.join(', ')} environment variables already exist in ${displayedEnvironment} environment. Do you want to override them all?`
+                    : `The ${variableNames[0]} environment variable already exists in ${displayedEnvironment} environment. Do you want to override it?`;
+                const confirm = await (0, prompts_1.confirmAsync)({
+                    message: confirmationMessage,
+                });
+                let variablesToOverwrite = [];
+                if (!confirm && existingDifferentVariables.length === 0) {
+                    throw new Error('No new variables to push.');
+                }
+                if (confirm) {
+                    variablesToOverwrite = existingDifferentVariables.map(variable => variable.name);
                 }
                 else {
-                    delete updateVariables[name];
+                    const promptResult = await (0, prompts_1.promptAsync)({
+                        type: 'multiselect',
+                        name: 'variablesToOverwrite',
+                        message: 'Select variables to overwrite:',
+                        // @ts-expect-error property missing from `@types/prompts`
+                        optionsPerPage: 20,
+                        choices: existingDifferentVariables.map(variable => ({
+                            title: `${variable.name}: ${updateVariables[variable.name].value} (was ${variable.value ?? '(secret)'})`,
+                            value: variable.name,
+                        })),
+                    });
+                    variablesToOverwrite = promptResult.variablesToOverwrite;
+                }
+                for (const existingVariable of existingVariables) {
+                    const name = existingVariable.name;
+                    if (variablesToOverwrite.includes(name)) {
+                        updateVariables[name]['overwrite'] = true;
+                    }
+                    else {
+                        delete updateVariables[name];
+                    }
                 }
             }
-        }
-        // Check if any of the sensitive variables already exist in the environment. Prompt the user to overwrite them.
-        const existingSensitiveVariables = existingVariables.filter(variable => variable.value === null);
-        if (existingSensitiveVariables.length > 0) {
-            const existingSensitiveVariablesNames = existingSensitiveVariables.map(variable => `- ${variable.name}`);
-            const confirm = await (0, prompts_1.confirmAsync)({
-                message: `You are about to overwrite sensitive variables.\n${existingSensitiveVariablesNames.join('\n')}\n Do you want to continue?`,
-            });
-            if (!confirm) {
-                throw new Error('Aborting...');
+            // Check if any of the sensitive variables already exist in the environment. Prompt the user to overwrite them.
+            const existingSensitiveVariables = existingVariables.filter(variable => variable.visibility !== generated_1.EnvironmentVariableVisibility.Public);
+            if (existingSensitiveVariables.length > 0) {
+                const existingSensitiveVariablesNames = existingSensitiveVariables.map(variable => `- ${variable.name}`);
+                const confirm = await (0, prompts_1.confirmAsync)({
+                    message: `You are about to overwrite sensitive variables.\n${existingSensitiveVariablesNames.join('\n')}\n Do you want to continue?`,
+                });
+                if (!confirm) {
+                    throw new Error('Aborting...');
+                }
             }
         }
         const variablesToPush = Object.values(updateVariables);
@@ -104,9 +116,9 @@ class EnvironmentVariablePush extends EasCommand_1.default {
             return;
         }
         await EnvironmentVariableMutation_1.EnvironmentVariableMutation.createBulkEnvironmentVariablesForAppAsync(graphqlClient, variablesToPush, projectId);
-        log_1.default.log(`Uploaded env file to ${environment} environment.`);
+        log_1.default.log(`Uploaded env file to ${environments.join(', ').toLocaleLowerCase()}.`);
     }
-    async parseEnvFileAsync(envPath, environment) {
+    async parseEnvFileAsync(envPath, environments) {
         if (!(await fs_extra_1.default.exists(envPath))) {
             throw new Error(`File ${envPath} does not exist.`);
         }
@@ -116,7 +128,7 @@ class EnvironmentVariablePush extends EasCommand_1.default {
             pushInput[name] = {
                 name,
                 value,
-                environment,
+                environments,
                 visibility: name.startsWith('EXPO_SENSITIVE')
                     ? generated_1.EnvironmentVariableVisibility.Sensitive
                     : generated_1.EnvironmentVariableVisibility.Public,
@@ -124,12 +136,6 @@ class EnvironmentVariablePush extends EasCommand_1.default {
         }
         return pushInput;
     }
-    validateFlags(flags) {
-        if (!flags.environment) {
-            throw new Error('Please provide an environment to push the env file to.');
-        }
-        return { ...flags, environment: flags.environment };
-    }
 }
 _a = EnvironmentVariablePush;
 EnvironmentVariablePush.description = 'push env file';
@@ -139,7 +145,7 @@ EnvironmentVariablePush.contextDefinition = {
     ..._a.ContextOptions.LoggedIn,
 };
 EnvironmentVariablePush.flags = {
-    ...flags_1.EASEnvironmentFlag,
+    ...flags_1.EASMultiEnvironmentFlag,
     path: core_1.Flags.string({
         description: 'Path to the input `.env` file',
         default: '.env.local',

package/build/commands/env/update.d.ts

@@ -1,5 +1,5 @@
 import EasCommand from '../../commandUtils/EasCommand';
-import { EnvironmentVariableEnvironment, EnvironmentVariableScope, EnvironmentVariableVisibility } from '../../graphql/generated';
+import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
 export default class EnvironmentVariableUpdate extends EasCommand {
     static description: string;
     static hidden: boolean;
@@ -7,7 +7,7 @@ export default class EnvironmentVariableUpdate extends EasCommand {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment[] | undefined>;
         scope: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableScope>;
-        visibility: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableVisibility | undefined>;
+        visibility: import("@oclif/core/lib/interfaces").OptionFlag<"plaintext" | "encrypted" | "sensitive" | undefined>;
         'variable-name': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         'variable-environment': import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | undefined>;
         name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;

package/build/commands/env/update.js

@@ -48,7 +48,7 @@ class EnvironmentVariableUpdate extends EasCommand_1.default {
             });
         }
         if (existingVariables.length === 0) {
-            throw new Error(`Variable with name ${currentName} ${currentEnvironment ? `in environment ${currentEnvironment}` : ''} does not exist ${suffix}.`);
+            throw new Error(`Variable with name ${currentName} ${currentEnvironment ? `in environment ${currentEnvironment.toLocaleLowerCase()}` : ''} does not exist ${suffix}.`);
         }
         else if (existingVariables.length > 1) {
             selectedVariable = await (0, prompts_1.selectAsync)('Select variable', existingVariables.map(variable => ({
@@ -94,6 +94,7 @@ class EnvironmentVariableUpdate extends EasCommand_1.default {
     }
     async promptForMissingFlagsAsync(selectedVariable, { name, value, environment: environments, visibility, 'non-interactive': nonInteractive, type, ...rest }) {
         let newType;
+        let newVisibility;
         if (type === 'file') {
             newType = generated_1.EnvironmentSecretType.FileBase64;
         }
@@ -107,7 +108,6 @@ class EnvironmentVariableUpdate extends EasCommand_1.default {
                     name = undefined;
                 }
             }
-            log_1.default.log(selectedVariable.type, generated_1.EnvironmentSecretType.String === selectedVariable.type, generated_1.EnvironmentSecretType.FileBase64 === selectedVariable.type);
             if (!type && !value && !nonInteractive) {
                 newType = await (0, prompts_2.promptVariableTypeAsync)(nonInteractive, selectedVariable.type);
                 if (!newType || newType === selectedVariable.type) {
@@ -118,6 +118,7 @@ class EnvironmentVariableUpdate extends EasCommand_1.default {
                 value = await (0, prompts_2.promptVariableValueAsync)({
                     nonInteractive,
                     required: false,
+                    filePath: (newType ?? selectedVariable.type) === generated_1.EnvironmentSecretType.FileBase64,
                     initial: (newType ?? selectedVariable.type) === generated_1.EnvironmentSecretType.FileBase64
                         ? undefined
                         : selectedVariable.value,
@@ -127,7 +128,7 @@ class EnvironmentVariableUpdate extends EasCommand_1.default {
                 }
             }
             let environmentFilePath;
-            if (newType === generated_1.EnvironmentSecretType.FileBase64 && value) {
+            if ((newType ?? selectedVariable.type) === generated_1.EnvironmentSecretType.FileBase64 && value) {
                 environmentFilePath = path_1.default.resolve(value);
                 if (!(await fs_extra_1.default.pathExists(environmentFilePath))) {
                     throw new Error(`File "${value}" does not exist`);
@@ -147,17 +148,20 @@ class EnvironmentVariableUpdate extends EasCommand_1.default {
                 }
             }
             if (!visibility) {
-                visibility = await (0, prompts_2.promptVariableVisibilityAsync)(nonInteractive, selectedVariable.visibility);
-                if (!visibility || visibility === selectedVariable.visibility) {
-                    visibility = undefined;
+                newVisibility = await (0, prompts_2.promptVariableVisibilityAsync)(nonInteractive, selectedVariable.visibility);
+                if (!newVisibility || newVisibility === selectedVariable.visibility) {
+                    newVisibility = undefined;
                 }
             }
         }
+        if (visibility) {
+            newVisibility = (0, prompts_2.parseVisibility)(visibility);
+        }
         return {
             name,
             value,
             environment: environments,
-            visibility,
+            visibility: newVisibility,
             scope: rest.scope ?? generated_1.EnvironmentVariableScope.Project,
             'non-interactive': nonInteractive,
             type: newType,

package/build/commands/update/edit.d.ts

@@ -1,19 +1,19 @@
 import EasCommand from '../../commandUtils/EasCommand';
 export default class UpdateEdit extends EasCommand {
     static description: string;
-    static hidden: boolean;
     static args: {
         name: string;
-        required: boolean;
         description: string;
     }[];
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'rollout-percentage': import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
+        branch: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
+        privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/update/edit.js

@@ -5,21 +5,56 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const queries_1 = require("../../branch/queries");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
 const PublishMutation_1 = require("../../graphql/mutations/PublishMutation");
 const UpdateQuery_1 = require("../../graphql/queries/UpdateQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const prompts_1 = require("../../prompts");
+const queries_2 = require("../../update/queries");
 const utils_1 = require("../../update/utils");
 const json_1 = require("../../utils/json");
 class UpdateEdit extends EasCommand_1.default {
     async runAsync() {
-        const { args: { groupId }, flags: { 'rollout-percentage': rolloutPercentage, json: jsonFlag, 'non-interactive': nonInteractive, }, } = await this.parse(_a);
-        const { loggedIn: { graphqlClient }, } = await this.getContextAsync(_a, { nonInteractive });
+        const { args: { groupId: maybeGroupId }, flags: { 'rollout-percentage': rolloutPercentage, json: jsonFlag, 'non-interactive': nonInteractive, branch: branchFlag, }, } = await this.parse(_a);
+        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(_a, { nonInteractive });
         if (jsonFlag) {
             (0, json_1.enableJsonOutput)();
         }
+        let groupId = maybeGroupId;
+        if (!groupId) {
+            let branch = branchFlag;
+            if (!branch) {
+                const validationMessage = 'Branch name may not be empty.';
+                if (nonInteractive) {
+                    throw new Error(validationMessage);
+                }
+                const selectedBranch = await (0, queries_1.selectBranchOnAppAsync)(graphqlClient, {
+                    projectId,
+                    promptTitle: 'On which branch would you like search for an update to edit?',
+                    displayTextForListItem: updateBranch => ({
+                        title: updateBranch.name,
+                    }),
+                    paginatedQueryOptions: {
+                        json: jsonFlag,
+                        nonInteractive,
+                        offset: 0,
+                    },
+                });
+                branch = selectedBranch.name;
+            }
+            const selectedUpdateGroup = await (0, queries_2.selectUpdateGroupOnBranchAsync)(graphqlClient, {
+                projectId,
+                branchName: branch,
+                paginatedQueryOptions: {
+                    json: jsonFlag,
+                    nonInteractive,
+                    offset: 0,
+                },
+            });
+            groupId = selectedUpdateGroup[0].group;
+        }
         const proposedUpdatesToEdit = (await UpdateQuery_1.UpdateQuery.viewUpdateGroupAsync(graphqlClient, { groupId })).map(u => ({ updateId: u.id, rolloutPercentage: u.rolloutPercentage }));
         const updatesToEdit = proposedUpdatesToEdit.filter((u) => u.rolloutPercentage !== null && u.rolloutPercentage !== undefined);
         if (updatesToEdit.length === 0) {
@@ -79,11 +114,9 @@ class UpdateEdit extends EasCommand_1.default {
 }
 _a = UpdateEdit;
 UpdateEdit.description = 'edit all the updates in an update group';
-UpdateEdit.hidden = true;
 UpdateEdit.args = [
     {
         name: 'groupId',
-        required: true,
         description: 'The ID of an update group to edit.',
     },
 ];
@@ -94,9 +127,13 @@ UpdateEdit.flags = {
         min: 0,
         max: 100,
     }),
+    branch: core_1.Flags.string({
+        description: 'Branch for which to list updates to select from',
+    }),
     ...flags_1.EasNonInteractiveAndJsonFlags,
 };
 UpdateEdit.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
     ..._a.ContextOptions.LoggedIn,
 };
 exports.default = UpdateEdit;

package/build/eas-update/utils.d.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { Client } from '../vcs/vcs';
 export type EASUpdateContext = {