eas-cli 16.22.0 → 16.23.0

package/build/build/android/graphql.js

@@ -4,7 +4,6 @@ exports.transformJob = void 0;
 const eas_build_job_1 = require("@expo/eas-build-job");
 const generated_1 = require("../../graphql/generated");
 const graphql_1 = require("../graphql");
-const environment_1 = require("../utils/environment");
 function transformJob(job) {
     return {
         type: (0, graphql_1.transformWorkflow)(job.type),
@@ -25,7 +24,7 @@ function transformJob(job) {
         experimental: job.experimental,
         mode: (0, graphql_1.transformBuildMode)(job.mode),
         customBuildConfig: job.customBuildConfig,
-        environment: (0, environment_1.buildProfileEnvironmentToEnvironment)(job.environment),
+        environment: job.environment,
         loggerLevel: job.loggerLevel
             ? graphql_1.loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
             : undefined,

package/build/build/evaluateConfigWithEnvVarsAsync.js

@@ -23,14 +23,8 @@ async function evaluateConfigWithEnvVarsAsync({ buildProfile, buildProfileName,
 }
 exports.evaluateConfigWithEnvVarsAsync = evaluateConfigWithEnvVarsAsync;
 async function resolveEnvVarsAsync({ buildProfile, buildProfileName, graphqlClient, projectId, }) {
-    const environment = buildProfile.environment?.toUpperCase() ??
+    const environment = buildProfile.environment ??
         resolveSuggestedEnvironmentForBuildProfileConfiguration(buildProfile);
-    if (!(0, environment_1.isEnvironment)(environment)) {
-        log_1.default.log(`Loaded "env" configuration for the "${buildProfileName}" profile: ${buildProfile.env && Object.keys(buildProfile.env).length > 0
-            ? Object.keys(buildProfile.env).join(', ')
-            : 'no environment variables specified'}. ${(0, log_1.learnMore)('https://docs.expo.dev/build-reference/variables/')}`);
-        return { ...buildProfile.env };
-    }
     try {
         const environmentVariables = await EnvironmentVariablesQuery_1.EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(graphqlClient, {
             appId: projectId,
@@ -68,10 +62,10 @@ async function resolveEnvVarsAsync({ buildProfile, buildProfileName, graphqlClie
 }
 function resolveSuggestedEnvironmentForBuildProfileConfiguration(buildProfile) {
     const environment = buildProfile.distribution === 'store'
-        ? environment_1.EnvironmentVariableEnvironment.Production
+        ? environment_1.DefaultEnvironment.Production
         : buildProfile.developmentClient
-            ? environment_1.EnvironmentVariableEnvironment.Development
-            : environment_1.EnvironmentVariableEnvironment.Preview;
-    log_1.default.log(`Resolved "${environment.toLowerCase()}" environment for the build. ${(0, log_1.learnMore)('https://docs.expo.dev/eas/environment-variables/#setting-the-environment-for-your-builds')}`);
+            ? environment_1.DefaultEnvironment.Development
+            : environment_1.DefaultEnvironment.Preview;
+    log_1.default.log(`Resolved "${environment}" environment for the build. ${(0, log_1.learnMore)('https://docs.expo.dev/eas/environment-variables/#setting-the-environment-for-your-builds')}`);
     return environment;
 }

package/build/build/ios/graphql.js

@@ -4,7 +4,6 @@ exports.transformIosSecrets = exports.transformJob = void 0;
 const tslib_1 = require("tslib");
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const graphql_1 = require("../graphql");
-const environment_1 = require("../utils/environment");
 function transformJob(job) {
     return {
         type: (0, graphql_1.transformWorkflow)(job.type),
@@ -26,7 +25,7 @@ function transformJob(job) {
         experimental: job.experimental,
         mode: (0, graphql_1.transformBuildMode)(job.mode),
         customBuildConfig: job.customBuildConfig,
-        environment: (0, environment_1.buildProfileEnvironmentToEnvironment)(job.environment),
+        environment: job.environment,
         loggerLevel: job.loggerLevel
             ? graphql_1.loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
             : undefined,

package/build/build/utils/environment.d.ts

@@ -1,8 +1,5 @@
-import { BuildProfile } from '@expo/eas-json';
-export declare enum EnvironmentVariableEnvironment {
+export declare enum DefaultEnvironment {
     Development = "development",
     Preview = "preview",
     Production = "production"
 }
-export declare function isEnvironment(env: string): env is EnvironmentVariableEnvironment;
-export declare function buildProfileEnvironmentToEnvironment(environment: BuildProfile['environment']): EnvironmentVariableEnvironment | null;

package/build/build/utils/environment.js

@@ -1,26 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildProfileEnvironmentToEnvironment = exports.isEnvironment = exports.EnvironmentVariableEnvironment = void 0;
-// Default environments
-var EnvironmentVariableEnvironment;
-(function (EnvironmentVariableEnvironment) {
-    EnvironmentVariableEnvironment["Development"] = "development";
-    EnvironmentVariableEnvironment["Preview"] = "preview";
-    EnvironmentVariableEnvironment["Production"] = "production";
-})(EnvironmentVariableEnvironment || (exports.EnvironmentVariableEnvironment = EnvironmentVariableEnvironment = {}));
-const BuildProfileEnvironmentToEnvironment = {
-    production: EnvironmentVariableEnvironment.Production,
-    preview: EnvironmentVariableEnvironment.Preview,
-    development: EnvironmentVariableEnvironment.Development,
-};
-function isEnvironment(env) {
-    return Object.values(EnvironmentVariableEnvironment).includes(env.toLowerCase());
-}
-exports.isEnvironment = isEnvironment;
-function buildProfileEnvironmentToEnvironment(environment) {
-    if (!environment) {
-        return null;
-    }
-    return BuildProfileEnvironmentToEnvironment[environment];
-}
-exports.buildProfileEnvironmentToEnvironment = buildProfileEnvironmentToEnvironment;
+exports.DefaultEnvironment = void 0;
+var DefaultEnvironment;
+(function (DefaultEnvironment) {
+    DefaultEnvironment["Development"] = "development";
+    DefaultEnvironment["Preview"] = "preview";
+    DefaultEnvironment["Production"] = "production";
+})(DefaultEnvironment || (exports.DefaultEnvironment = DefaultEnvironment = {}));

package/build/commandUtils/EasCommand.d.ts

@@ -12,7 +12,6 @@ import { ProjectIdContextField } from './context/ProjectIdContextField';
 import { ServerSideEnvironmentVariablesContextField } from './context/ServerSideEnvironmentVariablesContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
 import VcsClientContextField from './context/VcsClientContextField';
-import { EnvironmentVariableEnvironment } from '../build/utils/environment';
 import { Client } from '../vcs/vcs';
 export type ContextInput<T extends {
     [name: string]: any;
@@ -32,7 +31,7 @@ interface BaseGetContextAsyncArgs {
     vcsClientOverride?: Client;
 }
 interface GetContextAsyncArgsWithRequiredServerSideEnvironmentArgument extends BaseGetContextAsyncArgs {
-    withServerSideEnvironment: EnvironmentVariableEnvironment | null;
+    withServerSideEnvironment: string | null;
 }
 interface GetContextAsyncArgsWithoutServerSideEnvironmentArgument extends BaseGetContextAsyncArgs {
     withServerSideEnvironment?: never;

package/build/commandUtils/context/ContextField.d.ts

@@ -1,5 +1,4 @@
 import { Analytics } from '../../analytics/AnalyticsManager';
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import SessionManager from '../../user/SessionManager';
 import { Client } from '../../vcs/vcs';
 export interface ContextOptions {
@@ -10,7 +9,7 @@ export interface ContextOptions {
     /**
      * If specified, env variables from the selected environment will be fetched from the server and used to evaluate the dynamic config.
      */
-    withServerSideEnvironment?: EnvironmentVariableEnvironment | null;
+    withServerSideEnvironment?: string | null;
 }
 export default abstract class ContextField<T> {
     abstract getValueAsync(options: ContextOptions): Promise<T>;

package/build/commandUtils/context/contextUtils/loadServerSideEnvironmentVariablesAsync.d.ts

@@ -1,7 +1,6 @@
 import { ExpoGraphqlClient } from './createGraphqlClient';
-import { EnvironmentVariableEnvironment } from '../../../build/utils/environment';
 export declare function loadServerSideEnvironmentVariablesAsync({ environment, projectId, graphqlClient, }: {
-    environment: EnvironmentVariableEnvironment;
+    environment: string;
     projectId: string;
     graphqlClient: ExpoGraphqlClient;
 }): Promise<Record<string, string>>;

package/build/commandUtils/context/contextUtils/loadServerSideEnvironmentVariablesAsync.js

@@ -2,14 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadServerSideEnvironmentVariablesAsync = void 0;
 const tslib_1 = require("tslib");
-const environment_1 = require("../../../build/utils/environment");
 const EnvironmentVariablesQuery_1 = require("../../../graphql/queries/EnvironmentVariablesQuery");
 const log_1 = tslib_1.__importDefault(require("../../../log"));
-const cachedServerSideEnvironmentVariables = {
-    [environment_1.EnvironmentVariableEnvironment.Development]: null,
-    [environment_1.EnvironmentVariableEnvironment.Preview]: null,
-    [environment_1.EnvironmentVariableEnvironment.Production]: null,
-};
+const cachedServerSideEnvironmentVariables = {};
 async function loadServerSideEnvironmentVariablesAsync({ environment, projectId, graphqlClient, }) {
     // don't load environment variables if they were already loaded while executing a command
     const cachedEnvVarsForEnvironment = cachedServerSideEnvironmentVariables[environment];
@@ -24,10 +19,10 @@ async function loadServerSideEnvironmentVariablesAsync({ environment, projectId,
         .filter(({ name, value }) => name && value)
         .map(({ name, value }) => [name, value]));
     if (Object.keys(serverEnvVars).length > 0) {
-        log_1.default.log(`Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${Object.keys(serverEnvVars).join(', ')}.`);
+        log_1.default.log(`Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment}" environment on EAS: ${Object.keys(serverEnvVars).join(', ')}.`);
     }
     else {
-        log_1.default.log(`No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`);
+        log_1.default.log(`No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment}" environment on EAS.`);
     }
     log_1.default.newLine();
     cachedServerSideEnvironmentVariables[environment] = serverEnvVars;

package/build/commandUtils/flags.d.ts

@@ -1,17 +1,15 @@
-import { EnvironmentVariableEnvironment } from '../build/utils/environment';
 export declare const EasNonInteractiveAndJsonFlags: {
     json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
 };
 export declare const EasEnvironmentFlagParameters: {
     description: string;
-    options: EnvironmentVariableEnvironment[];
 };
 export declare const EASEnvironmentFlag: {
-    environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | undefined>;
+    environment: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
 };
 export declare const EASMultiEnvironmentFlag: {
-    environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment[] | undefined>;
+    environment: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
 };
 export declare const EASVariableFormatFlag: {
     format: import("@oclif/core/lib/interfaces").OptionFlag<string>;
@@ -30,5 +28,5 @@ export declare const EasJsonOnlyFlag: {
     json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
 };
 export declare const EasUpdateEnvironmentFlag: {
-    environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | null>;
+    environment: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
 };

package/build/commandUtils/flags.js

@@ -2,15 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EasUpdateEnvironmentFlag = exports.EasJsonOnlyFlag = exports.EASNonInteractiveFlag = exports.EASEnvironmentVariableScopeFlag = exports.EASVariableVisibilityFlag = exports.EASVariableFormatFlag = exports.EASMultiEnvironmentFlag = exports.EASEnvironmentFlag = exports.EasEnvironmentFlagParameters = exports.EasNonInteractiveAndJsonFlags = void 0;
 const core_1 = require("@oclif/core");
-const environment_1 = require("../build/utils/environment");
-// NOTE: not exactly true, but, provided mapToLowercase and upperCaseAsync
-// are used in tandem, it saves on unnecessary typying in commands
-async function upperCaseAsync(input) {
-    return input.toUpperCase();
-}
-function mapToLowercase(options) {
-    return options.map(option => option.toLowerCase());
-}
 exports.EasNonInteractiveAndJsonFlags = {
     json: core_1.Flags.boolean({
         description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
@@ -21,18 +12,15 @@ exports.EasNonInteractiveAndJsonFlags = {
     }),
 };
 exports.EasEnvironmentFlagParameters = {
-    description: "Environment variable's environment",
-    options: mapToLowercase([
-        environment_1.EnvironmentVariableEnvironment.Development,
-        environment_1.EnvironmentVariableEnvironment.Preview,
-        environment_1.EnvironmentVariableEnvironment.Production,
-    ]),
+    description: "Environment variable's environment, e.g. 'production', 'preview', 'development'",
 };
 exports.EASEnvironmentFlag = {
-    environment: core_1.Flags.enum(exports.EasEnvironmentFlagParameters),
+    environment: core_1.Flags.string({
+        description: "Environment variable's environment, e.g. 'production', 'preview', 'development'",
+    }),
 };
 exports.EASMultiEnvironmentFlag = {
-    environment: core_1.Flags.enum({
+    environment: core_1.Flags.string({
         ...exports.EasEnvironmentFlagParameters,
         multiple: true,
     }),
@@ -68,11 +56,9 @@ exports.EasJsonOnlyFlag = {
     }),
 };
 exports.EasUpdateEnvironmentFlag = {
-    environment: core_1.Flags.enum({
-        description: 'Environment to use for the server-side defined EAS environment variables during command execution.',
-        options: mapToLowercase(Object.values(environment_1.EnvironmentVariableEnvironment)),
-        parse: upperCaseAsync,
+    environment: core_1.Flags.string({
+        description: 'Environment to use for the server-side defined EAS environment variables during command execution, e.g. "production", "preview", "development"',
         required: false,
-        default: null,
+        default: undefined,
     }),
 };

package/build/commands/build/resign.d.ts

@@ -1,5 +1,4 @@
 import { Platform } from '@expo/eas-build-job';
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { BuildFragment } from '../../graphql/generated';
@@ -13,7 +12,7 @@ interface BuildResignFlags {
     sourceProfile?: string;
     maybeBuildId?: string;
     wait: boolean;
-    environment?: EnvironmentVariableEnvironment;
+    environment?: string;
 }
 interface RawBuildResignFlags {
     json: boolean;
@@ -25,7 +24,7 @@ interface RawBuildResignFlags {
     'source-profile': string | undefined;
     wait: boolean;
     id: string | undefined;
-    environment: EnvironmentVariableEnvironment | undefined;
+    environment: string | undefined;
 }
 export default class BuildResign extends EasCommand {
     static description: string;

package/build/commands/deploy/index.d.ts

@@ -1,4 +1,3 @@
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import EasCommand from '../../commandUtils/EasCommand';
 export default class WorkerDeploy extends EasCommand {
     static description: string;
@@ -8,7 +7,7 @@ export default class WorkerDeploy extends EasCommand {
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | undefined>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         prod: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         alias: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         id: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;

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

@@ -1,4 +1,3 @@
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASEnvironmentVariableScopeFlagValue } from '../../commandUtils/flags';
 export default class EnvCreate extends EasCommand {
@@ -10,7 +9,7 @@ export default class EnvCreate extends EasCommand {
     }[];
     static flags: {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment[] | undefined>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
         scope: import("@oclif/core/lib/interfaces").OptionFlag<EASEnvironmentVariableScopeFlagValue>;
         visibility: import("@oclif/core/lib/interfaces").OptionFlag<"plaintext" | "sensitive" | "secret" | undefined>;
         name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;

package/build/commands/env/create.js

@@ -14,13 +14,12 @@ const log_1 = tslib_1.__importDefault(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const prompts_2 = require("../../utils/prompts");
-const variableUtils_1 = require("../../utils/variableUtils");
 class EnvCreate extends EasCommand_1.default {
     static description = 'create an environment variable for the current project or account';
     static args = [
         {
             name: 'environment',
-            description: "Environment to create the variable in. One of 'production', 'preview', or 'development'.",
+            description: "Environment to create the variable in. Default environments are 'production', 'preview', and 'development'.",
             required: false,
         },
     ];
@@ -52,10 +51,10 @@ class EnvCreate extends EasCommand_1.default {
     async runAsync() {
         const { args, flags } = await this.parse(EnvCreate);
         const validatedFlags = this.sanitizeFlags(flags);
-        const { name, value, scope, 'non-interactive': nonInteractive, environment: environments, visibility, force, type, fileName, } = await this.promptForMissingFlagsAsync(validatedFlags, args);
         const { projectId, loggedIn: { graphqlClient }, } = await this.getContextAsync(EnvCreate, {
-            nonInteractive,
+            nonInteractive: validatedFlags['non-interactive'],
         });
+        const { name, value, scope, 'non-interactive': nonInteractive, environment: environments, visibility, force, type, fileName, } = await this.promptForMissingFlagsAsync(validatedFlags, args, { graphqlClient, projectId });
         const [projectDisplayName, ownerAccount] = await Promise.all([
             (0, projectUtils_1.getDisplayNameForProjectIdAsync)(graphqlClient, projectId),
             (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId),
@@ -152,7 +151,7 @@ class EnvCreate extends EasCommand_1.default {
             throw new Error(`${message} Use --force to overwrite it.`);
         }
     }
-    async promptForMissingFlagsAsync({ name, value, environment: environments, visibility, 'non-interactive': nonInteractive, type, ...rest }, { environment }) {
+    async promptForMissingFlagsAsync({ name, value, environment: environments, visibility, 'non-interactive': nonInteractive, type, ...rest }, { environment }, { graphqlClient, projectId }) {
         if (!name) {
             name = await (0, prompts_2.promptVariableNameAsync)(nonInteractive);
         }
@@ -187,16 +186,15 @@ class EnvCreate extends EasCommand_1.default {
             fileName = path_1.default.basename(environmentFilePath);
         }
         value = environmentFilePath ? await fs_extra_1.default.readFile(environmentFilePath, 'base64') : value;
-        if (environment && !(0, variableUtils_1.isEnvironment)(environment.toLowerCase())) {
-            throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-        }
-        let newEnvironments = environments
-            ? environments
-            : environment
-                ? [environment.toLowerCase()]
-                : undefined;
+        let newEnvironments = environments ? environments : environment ? [environment] : undefined;
         if (!newEnvironments) {
-            newEnvironments = await (0, prompts_2.promptVariableEnvironmentAsync)({ nonInteractive, multiple: true });
+            newEnvironments = await (0, prompts_2.promptVariableEnvironmentAsync)({
+                nonInteractive,
+                multiple: true,
+                canEnterCustomEnvironment: true,
+                graphqlClient,
+                projectId,
+            });
             if (!newEnvironments || newEnvironments.length === 0) {
                 throw new Error('No environments selected');
             }

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

@@ -1,4 +1,3 @@
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASEnvironmentVariableScopeFlagValue } from '../../commandUtils/flags';
 export default class EnvDelete extends EasCommand {
@@ -7,7 +6,7 @@ export default class EnvDelete extends EasCommand {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         scope: import("@oclif/core/lib/interfaces").OptionFlag<EASEnvironmentVariableScopeFlagValue>;
         'variable-name': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        'variable-environment': import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | undefined>;
+        'variable-environment': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static args: {
         name: string;

package/build/commands/env/delete.js

@@ -18,7 +18,7 @@ class EnvDelete extends EasCommand_1.default {
         'variable-name': core_1.Flags.string({
             description: 'Name of the variable to delete',
         }),
-        'variable-environment': core_1.Flags.enum({
+        'variable-environment': core_1.Flags.string({
             ...flags_1.EasEnvironmentFlagParameters,
             description: 'Current environment of the variable to delete',
         }),
@@ -28,7 +28,7 @@ class EnvDelete extends EasCommand_1.default {
     static args = [
         {
             name: 'environment',
-            description: "Current environment of the variable to delete. One of 'production', 'preview', or 'development'.",
+            description: "Current environment of the variable to delete. Default environments are 'production', 'preview', and 'development'.",
             required: false,
         },
     ];
@@ -108,10 +108,6 @@ class EnvDelete extends EasCommand_1.default {
             ? generated_1.EnvironmentVariableScope.Shared
             : generated_1.EnvironmentVariableScope.Project;
         if (environment) {
-            environment = environment.toLowerCase();
-            if (!(0, variableUtils_1.isEnvironment)(environment)) {
-                throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-            }
             return { ...flags, 'variable-environment': environment, scope };
         }
         return { ...flags, scope };

package/build/commands/env/exec.js

@@ -8,7 +8,6 @@ const flags_1 = require("../../commandUtils/flags");
 const EnvironmentVariablesQuery_1 = require("../../graphql/queries/EnvironmentVariablesQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const prompts_1 = require("../../utils/prompts");
-const variableUtils_1 = require("../../utils/variableUtils");
 class EnvExec extends EasCommand_1.default {
     static description = 'execute a command with environment variables from the selected environment';
     static contextDefinition = {
@@ -22,7 +21,7 @@ class EnvExec extends EasCommand_1.default {
         {
             name: 'environment',
             required: true,
-            description: "Environment to execute the command in. One of 'production', 'preview', or 'development'.",
+            description: "Environment to execute the command in. Default environments are 'production', 'preview', and 'development'.",
         },
         {
             name: 'bash_command',
@@ -39,7 +38,11 @@ class EnvExec extends EasCommand_1.default {
         });
         this.isNonInteractive = parsedFlags.nonInteractive;
         const environment = parsedFlags.environment ??
-            (await (0, prompts_1.promptVariableEnvironmentAsync)({ nonInteractive: parsedFlags.nonInteractive }));
+            (await (0, prompts_1.promptVariableEnvironmentAsync)({
+                nonInteractive: parsedFlags.nonInteractive,
+                graphqlClient,
+                projectId,
+            }));
         const environmentVariables = await this.loadEnvironmentVariablesAsync({
             graphqlClient,
             projectId,
@@ -63,10 +66,6 @@ class EnvExec extends EasCommand_1.default {
         if (rawFlags['non-interactive'] && (!bash_command || !environment)) {
             throw new Error("You must specify both environment and bash command when running in non-interactive mode. Run command as `eas env:exec ENVIRONMENT 'bash command'`.");
         }
-        environment = environment?.toLowerCase();
-        if (!(0, variableUtils_1.isEnvironment)(environment)) {
-            throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-        }
         const firstChar = bash_command[0];
         const lastChar = bash_command[bash_command.length - 1];
         const cleanCommand = (firstChar === '"' && lastChar === '"') || (firstChar === "'" && lastChar === "'")

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

@@ -1,4 +1,3 @@
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASEnvironmentVariableScopeFlagValue } from '../../commandUtils/flags';
 export default class EnvGet extends EasCommand {
@@ -17,7 +16,7 @@ export default class EnvGet extends EasCommand {
         scope: import("@oclif/core/lib/interfaces").OptionFlag<EASEnvironmentVariableScopeFlagValue>;
         format: import("@oclif/core/lib/interfaces").OptionFlag<string>;
         'variable-name': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        'variable-environment': import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | undefined>;
+        'variable-environment': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     runAsync(): Promise<void>;
     private sanitizeInputs;

package/build/commands/env/get.js

@@ -19,7 +19,7 @@ class EnvGet extends EasCommand_1.default {
     static args = [
         {
             name: 'environment',
-            description: "Current environment of the variable. One of 'production', 'preview', or 'development'.",
+            description: "Current environment of the variable. Default environments are 'production', 'preview', and 'development'.",
             required: false,
         },
     ];
@@ -27,7 +27,7 @@ class EnvGet extends EasCommand_1.default {
         'variable-name': core_1.Flags.string({
             description: 'Name of the variable',
         }),
-        'variable-environment': core_1.Flags.enum({
+        'variable-environment': core_1.Flags.string({
             ...flags_1.EasEnvironmentFlagParameters,
             description: 'Current environment of the variable',
         }),
@@ -48,6 +48,8 @@ class EnvGet extends EasCommand_1.default {
             environment = await (0, prompts_1.promptVariableEnvironmentAsync)({
                 nonInteractive,
                 multiple: false,
+                graphqlClient,
+                projectId,
             });
         }
         const variables = await getVariablesAsync(graphqlClient, scope, projectId, name, environment);
@@ -95,10 +97,6 @@ class EnvGet extends EasCommand_1.default {
             ? generated_1.EnvironmentVariableScope.Shared
             : generated_1.EnvironmentVariableScope.Project;
         if (environment) {
-            environment = environment.toLowerCase();
-            if (!(0, variableUtils_1.isEnvironment)(environment)) {
-                throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-            }
             return {
                 ...flags,
                 'variable-environment': environment,

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

@@ -1,4 +1,3 @@
-import { EnvironmentVariableEnvironment } from '../../build/utils/environment';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASEnvironmentVariableScopeFlagValue } from '../../commandUtils/flags';
 export default class EnvList extends EasCommand {
@@ -10,7 +9,7 @@ export default class EnvList extends EasCommand {
     static flags: {
         scope: import("@oclif/core/lib/interfaces").OptionFlag<EASEnvironmentVariableScopeFlagValue>;
         format: import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment[] | undefined>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
         'include-sensitive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'include-file-content': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };

package/build/commands/env/list.js

@@ -59,7 +59,7 @@ class EnvList extends EasCommand_1.default {
     static args = [
         {
             name: 'environment',
-            description: "Environment to list the variables from. One of 'production', 'preview', or 'development'.",
+            description: "Environment to list the variables from. Default environments are 'production', 'preview', and 'development'.",
             required: false,
         },
     ];
@@ -70,7 +70,12 @@ class EnvList extends EasCommand_1.default {
             nonInteractive: true,
         });
         if (!environments) {
-            environments = await (0, prompts_1.promptVariableEnvironmentAsync)({ nonInteractive, multiple: true });
+            environments = await (0, prompts_1.promptVariableEnvironmentAsync)({
+                nonInteractive,
+                multiple: true,
+                graphqlClient,
+                projectId,
+            });
         }
         await (0, variableUtils_1.performForEnvironmentsAsync)(environments, async (environment) => {
             const variables = await getVariablesForScopeAsync(graphqlClient, {
@@ -105,13 +110,10 @@ class EnvList extends EasCommand_1.default {
         });
     }
     sanitizeInputs(flags, { environment }) {
-        if (environment && !(0, variableUtils_1.isEnvironment)(environment.toLowerCase())) {
-            throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-        }
         const environments = flags.environment
             ? flags.environment
             : environment
-                ? [environment.toLowerCase()]
+                ? [environment]
                 : undefined;
         return {
             ...flags,

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

@@ -13,7 +13,7 @@ export default class EnvPull extends EasCommand {
     }[];
     static flags: {
         path: import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<import("../../build/utils/environment").EnvironmentVariableEnvironment | undefined>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     runAsync(): Promise<void>;

package/build/commands/env/pull.js

@@ -12,7 +12,6 @@ const EnvironmentVariablesQuery_1 = require("../../graphql/queries/EnvironmentVa
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const prompts_1 = require("../../prompts");
 const prompts_2 = require("../../utils/prompts");
-const variableUtils_1 = require("../../utils/variableUtils");
 class EnvPull extends EasCommand_1.default {
     static description = 'pull environment variables for the selected environment to .env file';
     static contextDefinition = {
@@ -23,7 +22,7 @@ class EnvPull extends EasCommand_1.default {
     static args = [
         {
             name: 'environment',
-            description: "Environment to pull variables from. One of 'production', 'preview', or 'development'.",
+            description: "Environment to pull variables from. Default environments are 'production', 'preview', and 'development'.",
             required: false,
         },
     ];
@@ -38,15 +37,16 @@ class EnvPull extends EasCommand_1.default {
     async runAsync() {
         let { args: { environment: argEnvironment }, flags: { environment: flagEnvironment, path: targetPath, 'non-interactive': nonInteractive }, } = await this.parse(EnvPull);
         let environment = flagEnvironment?.toLowerCase() ?? argEnvironment?.toLowerCase();
-        if (!environment) {
-            environment = await (0, prompts_2.promptVariableEnvironmentAsync)({ nonInteractive });
-        }
-        if (!(0, variableUtils_1.isEnvironment)(environment)) {
-            throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-        }
         const { projectId, loggedIn: { graphqlClient }, projectDir, } = await this.getContextAsync(EnvPull, {
             nonInteractive,
         });
+        if (!environment) {
+            environment = await (0, prompts_2.promptVariableEnvironmentAsync)({
+                nonInteractive,
+                graphqlClient,
+                projectId,
+            });
+        }
         targetPath = targetPath ?? '.env.local';
         const environmentVariables = await EnvironmentVariablesQuery_1.EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(graphqlClient, {
             appId: projectId,