eas-cli 13.2.3 → 13.4.0

package/build/build/build.js

@@ -434,7 +434,7 @@ function formatAccountBillingUrl(accountName) {
 }
 async function computeAndMaybeUploadRuntimeAndFingerprintMetadataAsync(ctx) {
     const runtimeAndFingerprintMetadata = await computeAndMaybeUploadFingerprintFromExpoUpdatesAsync(ctx);
-    if (!runtimeAndFingerprintMetadata?.fingerprint) {
+    if (!runtimeAndFingerprintMetadata?.fingerprintHash) {
         const fingerprint = await computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync(ctx);
         return {
             ...runtimeAndFingerprintMetadata,
@@ -478,13 +478,13 @@ async function computeAndMaybeUploadFingerprintFromExpoUpdatesAsync(ctx) {
     return {
         runtimeVersion: uploadedFingerprint.hash,
         fingerprintSource: uploadedFingerprint.fingerprintSource,
-        fingerprint: resolvedRuntimeVersion.fingerprint,
+        fingerprintHash: resolvedRuntimeVersion.fingerprintHash ?? undefined,
     };
 }
 async function computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync(ctx, { debug } = {}) {
     const fingerprint = await (0, fingerprintCli_1.createFingerprintAsync)(ctx.projectDir, {
         workflow: ctx.workflow,
-        platform: ctx.platform,
+        platforms: [ctx.platform],
         env: ctx.env,
     });
     if (!fingerprint) {

package/build/build/evaluateConfigWithEnvVarsAsync.js

@@ -26,8 +26,9 @@ async function evaluateConfigWithEnvVarsAsync({ buildProfile, buildProfileName,
 }
 exports.evaluateConfigWithEnvVarsAsync = evaluateConfigWithEnvVarsAsync;
 async function resolveEnvVarsAsync({ buildProfile, buildProfileName, graphqlClient, projectId, }) {
-    const environment = buildProfile.environment?.toUpperCase() ?? process.env.EAS_CURRENT_ENVIRONMENT;
-    if (!environment || !isEnvironment(environment)) {
+    const environment = buildProfile.environment?.toUpperCase() ??
+        resolveSuggestedEnvironmentForBuildProfileConfiguration(buildProfile);
+    if (!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/')}`);
@@ -68,3 +69,18 @@ async function resolveEnvVarsAsync({ buildProfile, buildProfileName, graphqlClie
         return { ...buildProfile.env };
     }
 }
+function resolveSuggestedEnvironmentForBuildProfileConfiguration(buildProfile) {
+    const setEnvironmentMessage = 'Set the "environment" field in the build profile if you want to specify the environment manually.';
+    if (buildProfile.distribution === 'store') {
+        log_1.default.log(`We detected that you are building for the "store" distribution. Resolving the environment for environment variables used during the build to "production". ${setEnvironmentMessage}`);
+        return generated_1.EnvironmentVariableEnvironment.Production;
+    }
+    else {
+        if (buildProfile.developmentClient) {
+            log_1.default.log(`We detected that you are building the development client. Resolving the environment for environment variables used during the build to "development". ${setEnvironmentMessage}`);
+            return generated_1.EnvironmentVariableEnvironment.Development;
+        }
+        log_1.default.log(`We detected that you are building for the "internal" distribution. Resolving the environment for environment variables used during the build to "preview". ${setEnvironmentMessage}`);
+        return generated_1.EnvironmentVariableEnvironment.Preview;
+    }
+}

package/build/build/utils/url.d.ts

@@ -5,3 +5,4 @@ export declare function getArtifactUrl(artifactId: string): string;
 export declare function getInternalDistributionInstallUrl(build: BuildFragment): string;
 export declare function getUpdateGroupUrl(accountName: string, projectName: string, updateGroupId: string): string;
 export declare function getWorkflowRunUrl(accountName: string, projectName: string, workflowRunId: string): string;
+export declare function getProjectGitHubSettingsUrl(accountName: string, projectName: string): string;

package/build/build/utils/url.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkflowRunUrl = exports.getUpdateGroupUrl = exports.getInternalDistributionInstallUrl = exports.getArtifactUrl = exports.getBuildLogsUrl = exports.getProjectDashboardUrl = void 0;
+exports.getProjectGitHubSettingsUrl = exports.getWorkflowRunUrl = exports.getUpdateGroupUrl = exports.getInternalDistributionInstallUrl = exports.getArtifactUrl = exports.getBuildLogsUrl = exports.getProjectDashboardUrl = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const api_1 = require("../../api");
@@ -37,3 +37,7 @@ function getWorkflowRunUrl(accountName, projectName, workflowRunId) {
     return new URL(`/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(projectName)}/workflows/${workflowRunId}`, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
 }
 exports.getWorkflowRunUrl = getWorkflowRunUrl;
+function getProjectGitHubSettingsUrl(accountName, projectName) {
+    return new URL(`/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(projectName)}/github`, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
+}
+exports.getProjectGitHubSettingsUrl = getProjectGitHubSettingsUrl;

package/build/commandUtils/flags.d.ts

@@ -1,4 +1,4 @@
-import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../graphql/generated';
+import { EnvironmentVariableEnvironment } from '../graphql/generated';
 declare function upperCaseAsync<T>(input: string): Promise<T>;
 export declare const EasNonInteractiveAndJsonFlags: {
     json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
@@ -19,10 +19,11 @@ export declare const EASVariableFormatFlag: {
     format: import("@oclif/core/lib/interfaces").OptionFlag<string>;
 };
 export declare const EASVariableVisibilityFlag: {
-    visibility: import("@oclif/core/lib/interfaces").OptionFlag<"plaintext" | "encrypted" | "sensitive" | undefined>;
+    visibility: import("@oclif/core/lib/interfaces").OptionFlag<"secret" | "plaintext" | "sensitive" | undefined>;
 };
-export declare const EASVariableScopeFlag: {
-    scope: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableScope>;
+export type EASEnvironmentVariableScopeFlagValue = 'project' | 'account';
+export declare const EASEnvironmentVariableScopeFlag: {
+    scope: import("@oclif/core/lib/interfaces").OptionFlag<EASEnvironmentVariableScopeFlagValue>;
 };
 export declare const EASNonInteractiveFlag: {
     'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;

package/build/commandUtils/flags.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EasUpdateEnvironmentFlag = exports.EasJsonOnlyFlag = exports.EASNonInteractiveFlag = exports.EASVariableScopeFlag = exports.EASVariableVisibilityFlag = exports.EASVariableFormatFlag = exports.EASMultiEnvironmentFlag = exports.EASEnvironmentFlag = exports.EasEnvironmentFlagParameters = exports.EasNonInteractiveAndJsonFlags = void 0;
+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 generated_1 = require("../graphql/generated");
 // NOTE: not exactly true, but, provided mapToLowercase and upperCaseAsync
@@ -48,15 +48,14 @@ exports.EASVariableFormatFlag = {
 exports.EASVariableVisibilityFlag = {
     visibility: core_1.Flags.enum({
         description: 'Visibility of the variable',
-        options: ['plaintext', 'sensitive', 'encrypted'],
+        options: ['plaintext', 'sensitive', 'secret'],
     }),
 };
-exports.EASVariableScopeFlag = {
+exports.EASEnvironmentVariableScopeFlag = {
     scope: core_1.Flags.enum({
         description: 'Scope for the variable',
-        options: mapToLowercase([generated_1.EnvironmentVariableScope.Shared, generated_1.EnvironmentVariableScope.Project]),
-        parse: upperCaseAsync,
-        default: generated_1.EnvironmentVariableScope.Project,
+        options: ['project', 'account'],
+        default: 'project',
     }),
 };
 exports.EASNonInteractiveFlag = {
@@ -71,11 +70,10 @@ exports.EasJsonOnlyFlag = {
 };
 exports.EasUpdateEnvironmentFlag = {
     environment: core_1.Flags.enum({
-        description: 'Environment to use the server-side defined EAS environment variables for during command execution.',
+        description: 'Environment to use for the server-side defined EAS environment variables during command execution.',
         options: mapToLowercase(Object.values(generated_1.EnvironmentVariableEnvironment)),
         parse: upperCaseAsync,
         required: false,
-        hidden: true,
         default: null,
     }),
 };

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

@@ -1,8 +1,8 @@
 import EasCommand from '../../commandUtils/EasCommand';
-import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
-export default class EnvironmentVariableCreate extends EasCommand {
+import { EASEnvironmentVariableScopeFlagValue } from '../../commandUtils/flags';
+import { EnvironmentVariableEnvironment } from '../../graphql/generated';
+export default class EnvCreate extends EasCommand {
     static description: string;
-    static hidden: boolean;
     static args: {
         name: string;
         description: string;
@@ -11,8 +11,8 @@ export default class EnvironmentVariableCreate extends EasCommand {
     static flags: {
         '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<"plaintext" | "encrypted" | "sensitive" | undefined>;
+        scope: import("@oclif/core/lib/interfaces").OptionFlag<EASEnvironmentVariableScopeFlagValue>;
+        visibility: import("@oclif/core/lib/interfaces").OptionFlag<"secret" | "plaintext" | "sensitive" | undefined>;
         name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         value: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         link: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
@@ -27,5 +27,5 @@ export default class EnvironmentVariableCreate extends EasCommand {
     runAsync(): Promise<void>;
     private promptForOverwriteAsync;
     private promptForMissingFlagsAsync;
-    private validateFlags;
+    private sanitizeFlags;
 }

package/build/commands/env/create.js

@@ -16,10 +16,10 @@ const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const prompts_2 = require("../../utils/prompts");
 const variableUtils_1 = require("../../utils/variableUtils");
-class EnvironmentVariableCreate extends EasCommand_1.default {
+class EnvCreate extends EasCommand_1.default {
     async runAsync() {
         const { args, flags } = await this.parse(_a);
-        const validatedFlags = this.validateFlags(flags);
+        const validatedFlags = this.sanitizeFlags(flags);
         const { name, value, scope, 'non-interactive': nonInteractive, environment: environments, visibility, link, force, type, fileName, } = await this.promptForMissingFlagsAsync(validatedFlags, args);
         const { projectId, loggedIn: { graphqlClient }, } = await this.getContextAsync(_a, {
             nonInteractive,
@@ -49,10 +49,10 @@ class EnvironmentVariableCreate extends EasCommand_1.default {
                     await this.promptForOverwriteAsync({
                         nonInteractive,
                         force,
-                        message: `Shared variable with ${name} name already exists on this account.`,
+                        message: `Account-wide variable with ${name} name already exists on this account.`,
                         suggestion: 'Do you want to unlink it first?',
                     });
-                    log_1.default.withTick(`Unlinking shared variable ${chalk_1.default.bold(name)} on project ${chalk_1.default.bold(projectDisplayName)}.`);
+                    log_1.default.withTick(`Unlinking account-wide variable ${chalk_1.default.bold(name)} on project ${chalk_1.default.bold(projectDisplayName)}.`);
                     await (0, variableUtils_1.performForEnvironmentsAsync)(environments, async (environment) => {
                         await EnvironmentVariableMutation_1.EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(graphqlClient, existingVariable.id, projectId, environment);
                     });
@@ -92,8 +92,8 @@ class EnvironmentVariableCreate extends EasCommand_1.default {
                     overwrite = true;
                 }
                 else {
-                    throw new Error(`Shared variable with ${name} name already exists on this account.\n` +
-                        `Use a different name or delete the existing variable on website or by using eas env:delete --name ${name} --scope shared command.`);
+                    throw new Error(`Account-wide variable with ${name} name already exists on this account.\n` +
+                        `Use a different name or delete the existing variable on website or by using the "eas env:delete --name ${name} --scope account" command.`);
                 }
             }
             const variable = overwrite && existingVariable
@@ -110,6 +110,7 @@ class EnvironmentVariableCreate extends EasCommand_1.default {
                     value,
                     visibility,
                     environments,
+                    isGlobal: true, // TODO: every account-wide variable is global for now so it's not user facing
                     type: type ?? generated_1.EnvironmentSecretType.String,
                 }, ownerAccount.id);
             if (!variable) {
@@ -117,11 +118,11 @@ class EnvironmentVariableCreate extends EasCommand_1.default {
             }
             log_1.default.withTick(`Created a new variable ${chalk_1.default.bold(name)} on account ${chalk_1.default.bold(ownerAccount.name)}.`);
             if (link) {
-                log_1.default.withTick(`Linking shared variable ${chalk_1.default.bold(name)} to project ${chalk_1.default.bold(projectDisplayName)}.`);
+                log_1.default.withTick(`Linking account-wide variable ${chalk_1.default.bold(name)} to project ${chalk_1.default.bold(projectDisplayName)}.`);
                 await (0, variableUtils_1.performForEnvironmentsAsync)(environments, async (environment) => {
                     await EnvironmentVariableMutation_1.EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(graphqlClient, variable.id, projectId, environment);
                 });
-                log_1.default.withTick(`Linked shared variable ${chalk_1.default.bold(name)} to project ${chalk_1.default.bold(projectDisplayName)}.`);
+                log_1.default.withTick(`Linked account-wide variable ${chalk_1.default.bold(name)} to project ${chalk_1.default.bold(projectDisplayName)}.`);
             }
         }
     }
@@ -196,37 +197,34 @@ class EnvironmentVariableCreate extends EasCommand_1.default {
             visibility: newVisibility,
             link: rest.link ?? false,
             force: rest.force ?? false,
-            scope: rest.scope ?? generated_1.EnvironmentVariableScope.Project,
             'non-interactive': nonInteractive,
             type: newType,
             fileName,
             ...rest,
         };
     }
-    validateFlags(flags) {
-        if (flags.scope !== generated_1.EnvironmentVariableScope.Shared && flags.link) {
-            throw new Error(`Unexpected argument: --link can only be used when creating shared variables`);
+    sanitizeFlags(flags) {
+        if (flags.scope !== 'account' && flags.link) {
+            throw new Error(`Unexpected argument: --link can only be used when creating account-wide variables`);
         }
-        if (flags.scope === generated_1.EnvironmentVariableScope.Shared &&
-            flags.environment &&
-            !flags.link &&
-            flags['non-interactive']) {
-            throw new Error('Unexpected argument: --environment in non-interactive mode can only be used with --link flag.');
-        }
-        return flags;
+        return {
+            ...flags,
+            scope: flags.scope === 'account'
+                ? generated_1.EnvironmentVariableScope.Shared
+                : generated_1.EnvironmentVariableScope.Project,
+        };
     }
 }
-_a = EnvironmentVariableCreate;
-EnvironmentVariableCreate.description = 'create an environment variable on the current project or owner account';
-EnvironmentVariableCreate.hidden = true;
-EnvironmentVariableCreate.args = [
+_a = EnvCreate;
+EnvCreate.description = 'create an environment variable for the current project or account';
+EnvCreate.args = [
     {
         name: 'environment',
         description: "Environment to create the variable in. One of 'production', 'preview', or 'development'.",
         required: false,
     },
 ];
-EnvironmentVariableCreate.flags = {
+EnvCreate.flags = {
     name: core_1.Flags.string({
         description: 'Name of the variable',
     }),
@@ -234,7 +232,8 @@ EnvironmentVariableCreate.flags = {
         description: 'Text value or the variable',
     }),
     link: core_1.Flags.boolean({
-        description: 'Link shared variable to the current project',
+        description: 'Link account-wide variable to the current project',
+        hidden: true, // every account-wide variable is global for now so it's not user facing
     }),
     force: core_1.Flags.boolean({
         description: 'Overwrite existing variable',
@@ -245,13 +244,13 @@ EnvironmentVariableCreate.flags = {
         options: ['string', 'file'],
     }),
     ...flags_1.EASVariableVisibilityFlag,
-    ...flags_1.EASVariableScopeFlag,
+    ...flags_1.EASEnvironmentVariableScopeFlag,
     ...flags_1.EASMultiEnvironmentFlag,
     ...flags_1.EASNonInteractiveFlag,
 };
-EnvironmentVariableCreate.contextDefinition = {
+EnvCreate.contextDefinition = {
     ..._a.ContextOptions.ProjectId,
     ..._a.ContextOptions.Analytics,
     ..._a.ContextOptions.LoggedIn,
 };
-exports.default = EnvironmentVariableCreate;
+exports.default = EnvCreate;

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

@@ -1,11 +1,11 @@
 import EasCommand from '../../commandUtils/EasCommand';
-import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
-export default class EnvironmentVariableDelete extends EasCommand {
+import { EASEnvironmentVariableScopeFlagValue } from '../../commandUtils/flags';
+import { EnvironmentVariableEnvironment } from '../../graphql/generated';
+export default class EnvDelete extends EasCommand {
     static description: string;
-    static hidden: boolean;
     static flags: {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        scope: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableScope>;
+        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>;
     };
@@ -19,5 +19,5 @@ export default class EnvironmentVariableDelete extends EasCommand {
         projectId: import("../../commandUtils/context/ProjectIdContextField").ProjectIdContextField;
     };
     runAsync(): Promise<void>;
-    private validateInputs;
+    private sanitizeInputs;
 }

package/build/commands/env/delete.js

@@ -13,10 +13,10 @@ const EnvironmentVariablesQuery_1 = require("../../graphql/queries/EnvironmentVa
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const prompts_1 = require("../../prompts");
 const variableUtils_1 = require("../../utils/variableUtils");
-class EnvironmentVariableDelete extends EasCommand_1.default {
+class EnvDelete extends EasCommand_1.default {
     async runAsync() {
         const { args, flags } = await this.parse(_a);
-        const { 'variable-name': name, 'variable-environment': environment, 'non-interactive': nonInteractive, scope, } = this.validateInputs(flags, args);
+        const { 'variable-name': name, 'variable-environment': environment, 'non-interactive': nonInteractive, scope, } = this.sanitizeInputs(flags, args);
         const { projectId, loggedIn: { graphqlClient }, } = await this.getContextAsync(_a, {
             nonInteractive,
         });
@@ -76,26 +76,28 @@ class EnvironmentVariableDelete extends EasCommand_1.default {
         await EnvironmentVariableMutation_1.EnvironmentVariableMutation.deleteAsync(graphqlClient, selectedVariable.id);
         log_1.default.withTick(`️Deleted variable ${selectedVariable.name}".`);
     }
-    validateInputs(flags, { environment }) {
+    sanitizeInputs(flags, { environment }) {
         if (flags['non-interactive']) {
             if (!flags['variable-name']) {
                 throw new Error(`Environment variable needs 'name' to be specified when running in non-interactive mode. Run the command with ${chalk_1.default.bold('--variable-name VARIABLE_NAME')} flag to fix the issue`);
             }
         }
+        const scope = flags.scope === 'account'
+            ? generated_1.EnvironmentVariableScope.Shared
+            : generated_1.EnvironmentVariableScope.Project;
         if (environment) {
             environment = environment.toUpperCase();
             if (!(0, variableUtils_1.isEnvironment)(environment)) {
                 throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
             }
-            return { ...flags, 'variable-environment': environment };
+            return { ...flags, 'variable-environment': environment, scope };
         }
-        return flags;
+        return { ...flags, scope };
     }
 }
-_a = EnvironmentVariableDelete;
-EnvironmentVariableDelete.description = 'delete an environment variable by name';
-EnvironmentVariableDelete.hidden = true;
-EnvironmentVariableDelete.flags = {
+_a = EnvDelete;
+EnvDelete.description = 'delete an environment variable for the current project or account';
+EnvDelete.flags = {
     'variable-name': core_1.Flags.string({
         description: 'Name of the variable to delete',
     }),
@@ -103,18 +105,18 @@ EnvironmentVariableDelete.flags = {
         ...flags_1.EasEnvironmentFlagParameters,
         description: 'Current environment of the variable to delete',
     }),
-    ...flags_1.EASVariableScopeFlag,
+    ...flags_1.EASEnvironmentVariableScopeFlag,
     ...flags_1.EASNonInteractiveFlag,
 };
-EnvironmentVariableDelete.args = [
+EnvDelete.args = [
     {
         name: 'environment',
         description: "Current environment of the variable to delete. One of 'production', 'preview', or 'development'.",
         required: false,
     },
 ];
-EnvironmentVariableDelete.contextDefinition = {
+EnvDelete.contextDefinition = {
     ..._a.ContextOptions.ProjectId,
     ..._a.ContextOptions.LoggedIn,
 };
-exports.default = EnvironmentVariableDelete;
+exports.default = EnvDelete;

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

@@ -1,7 +1,6 @@
 import EasCommand from '../../commandUtils/EasCommand';
 export default class EnvExec extends EasCommand {
     static description: string;
-    static hidden: boolean;
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         projectId: import("../../commandUtils/context/ProjectIdContextField").ProjectIdContextField;

package/build/commands/env/exec.js

@@ -107,8 +107,7 @@ class EnvExec extends EasCommand_1.default {
     }
 }
 _a = EnvExec;
-EnvExec.description = 'execute a bash command with environment variables from the selected environment';
-EnvExec.hidden = true;
+EnvExec.description = 'execute a command with environment variables from the selected environment';
 EnvExec.contextDefinition = {
     ..._a.ContextOptions.ProjectId,
     ..._a.ContextOptions.LoggedIn,

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

@@ -1,8 +1,8 @@
 import EasCommand from '../../commandUtils/EasCommand';
-import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
-export default class EnvironmentVariableGet extends EasCommand {
+import { EASEnvironmentVariableScopeFlagValue } from '../../commandUtils/flags';
+import { EnvironmentVariableEnvironment } from '../../graphql/generated';
+export default class EnvGet extends EasCommand {
     static description: string;
-    static hidden: boolean;
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         projectId: import("../../commandUtils/context/ProjectIdContextField").ProjectIdContextField;
@@ -14,11 +14,11 @@ export default class EnvironmentVariableGet extends EasCommand {
     }[];
     static flags: {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        scope: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableScope>;
+        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>;
     };
     runAsync(): Promise<void>;
-    private validateInputs;
+    private sanitizeInputs;
 }

package/build/commands/env/get.js

@@ -11,10 +11,10 @@ const EnvironmentVariablesQuery_1 = require("../../graphql/queries/EnvironmentVa
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const prompts_1 = require("../../utils/prompts");
 const variableUtils_1 = require("../../utils/variableUtils");
-class EnvironmentVariableGet extends EasCommand_1.default {
+class EnvGet extends EasCommand_1.default {
     async runAsync() {
         const { args, flags } = await this.parse(_a);
-        let { 'variable-environment': environment, 'variable-name': name, 'non-interactive': nonInteractive, format, scope, } = this.validateInputs(flags, args);
+        let { 'variable-environment': environment, 'variable-name': name, 'non-interactive': nonInteractive, format, scope, } = this.sanitizeInputs(flags, args);
         const { projectId, loggedIn: { graphqlClient }, } = await this.getContextAsync(_a, {
             nonInteractive,
         });
@@ -53,7 +53,7 @@ class EnvironmentVariableGet extends EasCommand_1.default {
             log_1.default.log((0, variableUtils_1.formatVariable)(variable));
         }
     }
-    validateInputs(flags, { environment }) {
+    sanitizeInputs(flags, { environment }) {
         if (flags['non-interactive']) {
             if (!flags['variable-name']) {
                 throw new Error('Variable name is required. Run the command with --variable-name flag.');
@@ -68,34 +68,37 @@ class EnvironmentVariableGet extends EasCommand_1.default {
         if (environment && flags['variable-environment']) {
             throw new Error("You can't use both --variable-environment flag when environment is passed as an argument. Run `eas env:get --help` for more information.");
         }
+        const scope = flags.scope === 'account'
+            ? generated_1.EnvironmentVariableScope.Shared
+            : generated_1.EnvironmentVariableScope.Project;
         if (environment) {
             environment = environment.toUpperCase();
             if (!(0, variableUtils_1.isEnvironment)(environment)) {
                 throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
             }
             return {
-                'variable-environment': environment,
                 ...flags,
+                'variable-environment': environment,
+                scope,
             };
         }
-        return flags;
+        return { ...flags, scope };
     }
 }
-_a = EnvironmentVariableGet;
-EnvironmentVariableGet.description = 'get environment variable';
-EnvironmentVariableGet.hidden = true;
-EnvironmentVariableGet.contextDefinition = {
+_a = EnvGet;
+EnvGet.description = 'view an environment variable for the current project or account';
+EnvGet.contextDefinition = {
     ..._a.ContextOptions.ProjectId,
     ..._a.ContextOptions.LoggedIn,
 };
-EnvironmentVariableGet.args = [
+EnvGet.args = [
     {
         name: 'environment',
         description: "Current environment of the variable. One of 'production', 'preview', or 'development'.",
         required: false,
     },
 ];
-EnvironmentVariableGet.flags = {
+EnvGet.flags = {
     'variable-name': core_1.Flags.string({
         description: 'Name of the variable',
     }),
@@ -104,10 +107,10 @@ EnvironmentVariableGet.flags = {
         description: 'Current environment of the variable',
     }),
     ...flags_1.EASVariableFormatFlag,
-    ...flags_1.EASVariableScopeFlag,
+    ...flags_1.EASEnvironmentVariableScopeFlag,
     ...flags_1.EASNonInteractiveFlag,
 };
-exports.default = EnvironmentVariableGet;
+exports.default = EnvGet;
 async function getVariablesAsync(graphqlClient, scope, projectId, name, environment) {
     if (!name) {
         throw new Error("Variable name is required. Run the command with '--variable-name VARIABLE_NAME' flag.");

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

@@ -1,6 +1,6 @@
 import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentVariableEnvironment } from '../../graphql/generated';
-export default class EnvironmentVariableLink extends EasCommand {
+export default class EnvLink extends EasCommand {
     static description: string;
     static hidden: boolean;
     static flags: {

package/build/commands/env/link.js

@@ -14,7 +14,7 @@ const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const prompts_2 = require("../../utils/prompts");
 const variableUtils_1 = require("../../utils/variableUtils");
-class EnvironmentVariableLink extends EasCommand_1.default {
+class EnvLink extends EasCommand_1.default {
     async runAsync() {
         const { args, flags } = await this.parse(_a);
         let { 'variable-name': name, 'variable-environment': currentEnvironment, 'non-interactive': nonInteractive, environment: environments, } = this.validateInputs(flags, args);
@@ -32,13 +32,13 @@ class EnvironmentVariableLink extends EasCommand_1.default {
             if (nonInteractive) {
                 throw new Error('Multiple variables found, run command with --variable-name and --variable-environment arguments.');
             }
-            selectedVariable = await (0, prompts_1.selectAsync)('Select shared variable', variables.map(variable => ({
+            selectedVariable = await (0, prompts_1.selectAsync)('Select account-wide variable', variables.map(variable => ({
                 title: (0, variableUtils_1.formatVariableName)(variable),
                 value: variable,
             })));
         }
         if (!selectedVariable) {
-            throw new Error(`Shared variable ${name} doesn't exist`);
+            throw new Error(`Account-wide variable ${name} doesn't exist`);
         }
         let explicitSelect = false;
         if (!nonInteractive && !environments) {
@@ -96,17 +96,16 @@ class EnvironmentVariableLink extends EasCommand_1.default {
             }
         }
         return {
-            'variable-name': flags['variable-name'],
-            'variable-environment': flags['variable-environment'],
-            'non-interactive': flags['non-interactive'],
+            ...flags,
             environment: environments,
         };
     }
 }
-_a = EnvironmentVariableLink;
-EnvironmentVariableLink.description = 'link a shared environment variable to the current project';
-EnvironmentVariableLink.hidden = true;
-EnvironmentVariableLink.flags = {
+_a = EnvLink;
+EnvLink.description = 'link an account-wide environment variable to the current project';
+// for now we only roll out global account-wide env variables so this should stay hidden
+EnvLink.hidden = true;
+EnvLink.flags = {
     'variable-name': core_1.Flags.string({
         description: 'Name of the variable',
     }),
@@ -117,15 +116,15 @@ EnvironmentVariableLink.flags = {
     ...flags_1.EASMultiEnvironmentFlag,
     ...flags_1.EASNonInteractiveFlag,
 };
-EnvironmentVariableLink.args = [
+EnvLink.args = [
     {
         name: 'environment',
         description: "Environment to pull variables from. One of 'production', 'preview', or 'development'.",
         required: false,
     },
 ];
-EnvironmentVariableLink.contextDefinition = {
+EnvLink.contextDefinition = {
     ..._a.ContextOptions.ProjectId,
     ..._a.ContextOptions.LoggedIn,
 };
-exports.default = EnvironmentVariableLink;
+exports.default = EnvLink;