eas-cli 3.13.1 → 3.13.3

package/build/build/runBuildAndSubmit.js

@@ -39,7 +39,7 @@ const printBuildInfo_1 = require("./utils/printBuildInfo");
 const repository_1 = require("./utils/repository");
 let metroConfigValidated = false;
 let sdkVersionChecked = false;
-async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flags, actor, getDynamicProjectConfigAsync) {
+async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flags, actor, getDynamicPrivateProjectConfigAsync) {
     var _a, _b;
     await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
     await (0, repository_1.ensureRepoIsCleanAsync)(flags.nonInteractive);
@@ -82,7 +82,7 @@ async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flag
             actor,
             graphqlClient,
             analytics,
-            getDynamicProjectConfigAsync,
+            getDynamicPrivateProjectConfigAsync,
             customBuildConfigMetadata: customBuildConfigMetadataByPlatform[platform],
         });
         if (maybeBuild) {
@@ -138,7 +138,8 @@ async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flag
     if (!flags.json) {
         (0, printBuildInfo_1.printBuildResults)(builds);
     }
-    const haveAllBuildsFailedOrCanceled = builds.every(build => (build === null || build === void 0 ? void 0 : build.status) && [generated_1.BuildStatus.Errored, generated_1.BuildStatus.Canceled].includes(build === null || build === void 0 ? void 0 : build.status));
+    const haveAllBuildsFailedOrCanceled = builds.every(build => (build === null || build === void 0 ? void 0 : build.status) &&
+        [generated_1.BuildStatus.Errored, generated_1.BuildStatus.Canceled, generated_1.BuildStatus.PendingCancel].includes(build === null || build === void 0 ? void 0 : build.status));
     await maybeDownloadAndRunSimulatorBuildsAsync(builds, flags);
     if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
         if (flags.json) {
@@ -157,7 +158,7 @@ async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flag
     }
 }
 exports.runBuildAndSubmitAsync = runBuildAndSubmitAsync;
-async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, easJsonCliConfig, actor, graphqlClient, analytics, getDynamicProjectConfigAsync, customBuildConfigMetadata, }) {
+async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, easJsonCliConfig, actor, graphqlClient, analytics, getDynamicPrivateProjectConfigAsync, customBuildConfigMetadata, }) {
     const buildCtx = await (0, createContext_1.createBuildContextAsync)({
         buildProfileName: buildProfile.profileName,
         resourceClassFlag: flags.resourceClass,
@@ -173,7 +174,7 @@ async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildP
         actor,
         graphqlClient,
         analytics,
-        getDynamicProjectConfigAsync,
+        getDynamicPrivateProjectConfigAsync,
         customBuildConfigMetadata,
     });
     if (moreBuilds) {

package/build/build/types.d.ts

@@ -2,6 +2,7 @@ export declare enum BuildStatus {
     NEW = "new",
     IN_QUEUE = "in-queue",
     IN_PROGRESS = "in-progress",
+    PENDING_CANCEL = "pending-cancel",
     ERRORED = "errored",
     FINISHED = "finished",
     CANCELED = "canceled"

package/build/build/types.js

@@ -6,6 +6,7 @@ var BuildStatus;
     BuildStatus["NEW"] = "new";
     BuildStatus["IN_QUEUE"] = "in-queue";
     BuildStatus["IN_PROGRESS"] = "in-progress";
+    BuildStatus["PENDING_CANCEL"] = "pending-cancel";
     BuildStatus["ERRORED"] = "errored";
     BuildStatus["FINISHED"] = "finished";
     BuildStatus["CANCELED"] = "canceled";

package/build/build/utils/formatBuild.js

@@ -26,6 +26,7 @@ function formatGraphQLBuild(build) {
                         return chalk_1.default.blue('in queue');
                     case generated_1.BuildStatus.InProgress:
                         return chalk_1.default.blue('in progress');
+                    case generated_1.BuildStatus.PendingCancel:
                     case generated_1.BuildStatus.Canceled:
                         return chalk_1.default.gray('canceled');
                     case generated_1.BuildStatus.Finished:
@@ -90,6 +91,7 @@ function formatGraphQLBuild(build) {
                     case generated_1.BuildStatus.InQueue:
                     case generated_1.BuildStatus.InProgress:
                         return '<in progress>';
+                    case generated_1.BuildStatus.PendingCancel:
                     case generated_1.BuildStatus.Canceled:
                     case generated_1.BuildStatus.Errored:
                         return null;

package/build/build/utils/printBuildInfo.js

@@ -59,7 +59,7 @@ function printBuildResult(build) {
         }
         return;
     }
-    if (build.status === generated_1.BuildStatus.Canceled) {
+    if ([generated_1.BuildStatus.Canceled, generated_1.BuildStatus.PendingCancel].includes(build.status)) {
         log_1.default.addNewLineIfNone();
         log_1.default.error(`${platform_1.appPlatformEmojis[build.platform]} ${platform_1.appPlatformDisplayNames[build.platform]} build was canceled`);
         return;

package/build/commandUtils/EasCommand.d.ts

@@ -1,11 +1,11 @@
 import { Command } from '@oclif/core';
 import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
-import { DynamicProjectConfigContextField } from './context/DynamicProjectConfigContextField';
+import { DynamicPrivateProjectConfigContextField, DynamicPublicProjectConfigContextField } from './context/DynamicProjectConfigContextField';
 import LoggedInContextField from './context/LoggedInContextField';
 import MaybeLoggedInContextField from './context/MaybeLoggedInContextField';
-import { OptionalProjectConfigContextField } from './context/OptionalProjectConfigContextField';
-import ProjectConfigContextField from './context/ProjectConfigContextField';
+import { OptionalPrivateProjectConfigContextField } from './context/OptionalPrivateProjectConfigContextField';
+import { PrivateProjectConfigContextField } from './context/PrivateProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
 export type ContextInput<T extends {
@@ -45,7 +45,7 @@ export default abstract class EasCommand extends Command {
          * run within a project directory, null otherwise.
          */
         OptionalProjectConfig: {
-            projectConfig: OptionalProjectConfigContextField;
+            privateProjectConfig: OptionalPrivateProjectConfigContextField;
         };
         /**
          * Require this command to be run in a project directory. Return the project directory in the context.
@@ -57,7 +57,8 @@ export default abstract class EasCommand extends Command {
          * Provides functions to load the project config when dynamic config options are needed (custom Env for example).
          */
         DynamicProjectConfig: {
-            getDynamicProjectConfigAsync: DynamicProjectConfigContextField;
+            getDynamicPublicProjectConfigAsync: DynamicPublicProjectConfigContextField;
+            getDynamicPrivateProjectConfigAsync: DynamicPrivateProjectConfigContextField;
         };
         /**
          * Require the project to be identified and registered on server. Returns the project config in the context.
@@ -66,7 +67,7 @@ export default abstract class EasCommand extends Command {
          */
         ProjectConfig: {
             loggedIn: LoggedInContextField;
-            projectConfig: ProjectConfigContextField;
+            privateProjectConfig: PrivateProjectConfigContextField;
         };
         /**
          * Analytics manager. Returns the analytics manager in the context for use by the command.

package/build/commandUtils/EasCommand.js

@@ -11,8 +11,8 @@ const AnalyticsContextField_1 = tslib_1.__importDefault(require("./context/Analy
 const DynamicProjectConfigContextField_1 = require("./context/DynamicProjectConfigContextField");
 const LoggedInContextField_1 = tslib_1.__importDefault(require("./context/LoggedInContextField"));
 const MaybeLoggedInContextField_1 = tslib_1.__importDefault(require("./context/MaybeLoggedInContextField"));
-const OptionalProjectConfigContextField_1 = require("./context/OptionalProjectConfigContextField");
-const ProjectConfigContextField_1 = tslib_1.__importDefault(require("./context/ProjectConfigContextField"));
+const OptionalPrivateProjectConfigContextField_1 = require("./context/OptionalPrivateProjectConfigContextField");
+const PrivateProjectConfigContextField_1 = require("./context/PrivateProjectConfigContextField");
 const ProjectDirContextField_1 = tslib_1.__importDefault(require("./context/ProjectDirContextField"));
 const SessionManagementContextField_1 = tslib_1.__importDefault(require("./context/SessionManagementContextField"));
 const errors_1 = require("./errors");
@@ -110,7 +110,7 @@ EasCommand.ContextOptions = {
      * run within a project directory, null otherwise.
      */
     OptionalProjectConfig: {
-        projectConfig: new OptionalProjectConfigContextField_1.OptionalProjectConfigContextField(),
+        privateProjectConfig: new OptionalPrivateProjectConfigContextField_1.OptionalPrivateProjectConfigContextField(),
     },
     /**
      * Require this command to be run in a project directory. Return the project directory in the context.
@@ -123,7 +123,9 @@ EasCommand.ContextOptions = {
      */
     DynamicProjectConfig: {
         // eslint-disable-next-line async-protect/async-suffix
-        getDynamicProjectConfigAsync: new DynamicProjectConfigContextField_1.DynamicProjectConfigContextField(),
+        getDynamicPublicProjectConfigAsync: new DynamicProjectConfigContextField_1.DynamicPublicProjectConfigContextField(),
+        // eslint-disable-next-line async-protect/async-suffix
+        getDynamicPrivateProjectConfigAsync: new DynamicProjectConfigContextField_1.DynamicPrivateProjectConfigContextField(),
     },
     /**
      * Require the project to be identified and registered on server. Returns the project config in the context.
@@ -132,7 +134,7 @@ EasCommand.ContextOptions = {
      */
     ProjectConfig: {
         loggedIn: new LoggedInContextField_1.default(),
-        projectConfig: new ProjectConfigContextField_1.default(),
+        privateProjectConfig: new PrivateProjectConfigContextField_1.PrivateProjectConfigContextField(),
     },
     /**
      * Analytics manager. Returns the analytics manager in the context for use by the command.

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

@@ -1,11 +1,14 @@
 import { ExpoConfig } from '@expo/config-types';
 import { ExpoConfigOptions } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
-export type DynamicConfigContextFn = (options: ExpoConfigOptions) => Promise<{
+export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
     projectId: string;
     exp: ExpoConfig;
     projectDir: string;
 }>;
-export declare class DynamicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
+export declare class DynamicPublicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
+    getValueAsync({ nonInteractive, sessionManager, }: ContextOptions): Promise<DynamicConfigContextFn>;
+}
+export declare class DynamicPrivateProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
     getValueAsync({ nonInteractive, sessionManager, }: ContextOptions): Promise<DynamicConfigContextFn>;
 }

package/build/commandUtils/context/DynamicProjectConfigContextField.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DynamicProjectConfigContextField = void 0;
+exports.DynamicPrivateProjectConfigContextField = exports.DynamicPublicProjectConfigContextField = void 0;
 const tslib_1 = require("tslib");
 const expoConfig_1 = require("../../project/expoConfig");
 const ContextField_1 = tslib_1.__importDefault(require("./ContextField"));
 const findProjectDirAndVerifyProjectSetupAsync_1 = require("./contextUtils/findProjectDirAndVerifyProjectSetupAsync");
 const getProjectIdAsync_1 = require("./contextUtils/getProjectIdAsync");
-class DynamicProjectConfigContextField extends ContextField_1.default {
+class DynamicPublicProjectConfigContextField extends ContextField_1.default {
     async getValueAsync({ nonInteractive, sessionManager, }) {
         const projectDir = await (0, findProjectDirAndVerifyProjectSetupAsync_1.findProjectDirAndVerifyProjectSetupAsync)();
         return async (options) => {
-            const expBefore = (0, expoConfig_1.getExpoConfig)(projectDir, options);
+            const expBefore = (0, expoConfig_1.getPublicExpoConfig)(projectDir, options);
             const projectId = await (0, getProjectIdAsync_1.getProjectIdAsync)(sessionManager, expBefore, {
                 nonInteractive,
                 env: options === null || options === void 0 ? void 0 : options.env,
             });
-            const exp = (0, expoConfig_1.getExpoConfig)(projectDir, options);
+            const exp = (0, expoConfig_1.getPublicExpoConfig)(projectDir, options);
             return {
                 exp,
                 projectDir,
@@ -24,4 +24,23 @@ class DynamicProjectConfigContextField extends ContextField_1.default {
         };
     }
 }
-exports.DynamicProjectConfigContextField = DynamicProjectConfigContextField;
+exports.DynamicPublicProjectConfigContextField = DynamicPublicProjectConfigContextField;
+class DynamicPrivateProjectConfigContextField extends ContextField_1.default {
+    async getValueAsync({ nonInteractive, sessionManager, }) {
+        const projectDir = await (0, findProjectDirAndVerifyProjectSetupAsync_1.findProjectDirAndVerifyProjectSetupAsync)();
+        return async (options) => {
+            const expBefore = (0, expoConfig_1.getPrivateExpoConfig)(projectDir, options);
+            const projectId = await (0, getProjectIdAsync_1.getProjectIdAsync)(sessionManager, expBefore, {
+                nonInteractive,
+                env: options === null || options === void 0 ? void 0 : options.env,
+            });
+            const exp = (0, expoConfig_1.getPrivateExpoConfig)(projectDir, options);
+            return {
+                exp,
+                projectDir,
+                projectId,
+            };
+        };
+    }
+}
+exports.DynamicPrivateProjectConfigContextField = DynamicPrivateProjectConfigContextField;

package/build/commandUtils/context/{OptionalProjectConfigContextField.d.ts → OptionalPrivateProjectConfigContextField.d.ts}

@@ -1,6 +1,6 @@
 import { ExpoConfig } from '@expo/config-types';
 import ContextField, { ContextOptions } from './ContextField';
-export declare class OptionalProjectConfigContextField extends ContextField<{
+export declare class OptionalPrivateProjectConfigContextField extends ContextField<{
     projectId: string;
     exp: ExpoConfig;
     projectDir: string;

package/build/commandUtils/context/{OptionalProjectConfigContextField.js → OptionalPrivateProjectConfigContextField.js}

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OptionalProjectConfigContextField = void 0;
+exports.OptionalPrivateProjectConfigContextField = void 0;
 const tslib_1 = require("tslib");
 const errors_1 = require("@expo/eas-json/build/errors");
 const expoConfig_1 = require("../../project/expoConfig");
 const ContextField_1 = tslib_1.__importDefault(require("./ContextField"));
 const findProjectDirAndVerifyProjectSetupAsync_1 = require("./contextUtils/findProjectDirAndVerifyProjectSetupAsync");
 const getProjectIdAsync_1 = require("./contextUtils/getProjectIdAsync");
-class OptionalProjectConfigContextField extends ContextField_1.default {
+class OptionalPrivateProjectConfigContextField extends ContextField_1.default {
     async getValueAsync({ nonInteractive, sessionManager }) {
         let projectDir;
         try {
@@ -22,11 +22,11 @@ class OptionalProjectConfigContextField extends ContextField_1.default {
             }
             return undefined;
         }
-        const expBefore = (0, expoConfig_1.getExpoConfig)(projectDir);
+        const expBefore = (0, expoConfig_1.getPrivateExpoConfig)(projectDir);
         const projectId = await (0, getProjectIdAsync_1.getProjectIdAsync)(sessionManager, expBefore, {
             nonInteractive,
         });
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
+        const exp = (0, expoConfig_1.getPrivateExpoConfig)(projectDir);
         return {
             exp,
             projectDir,
@@ -34,4 +34,4 @@ class OptionalProjectConfigContextField extends ContextField_1.default {
         };
     }
 }
-exports.OptionalProjectConfigContextField = OptionalProjectConfigContextField;
+exports.OptionalPrivateProjectConfigContextField = OptionalPrivateProjectConfigContextField;

package/build/commandUtils/context/{ProjectConfigContextField.d.ts → PrivateProjectConfigContextField.d.ts}

@@ -1,6 +1,6 @@
 import { ExpoConfig } from '@expo/config-types';
 import ContextField, { ContextOptions } from './ContextField';
-export default class ProjectConfigContextField extends ContextField<{
+export declare class PrivateProjectConfigContextField extends ContextField<{
     projectId: string;
     exp: ExpoConfig;
     projectDir: string;

package/build/commandUtils/context/{ProjectConfigContextField.js → PrivateProjectConfigContextField.js}

@@ -1,18 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrivateProjectConfigContextField = void 0;
 const tslib_1 = require("tslib");
 const expoConfig_1 = require("../../project/expoConfig");
 const ContextField_1 = tslib_1.__importDefault(require("./ContextField"));
 const findProjectDirAndVerifyProjectSetupAsync_1 = require("./contextUtils/findProjectDirAndVerifyProjectSetupAsync");
 const getProjectIdAsync_1 = require("./contextUtils/getProjectIdAsync");
-class ProjectConfigContextField extends ContextField_1.default {
+class PrivateProjectConfigContextField extends ContextField_1.default {
     async getValueAsync({ nonInteractive, sessionManager }) {
         const projectDir = await (0, findProjectDirAndVerifyProjectSetupAsync_1.findProjectDirAndVerifyProjectSetupAsync)();
-        const expBefore = (0, expoConfig_1.getExpoConfig)(projectDir);
+        const expBefore = (0, expoConfig_1.getPrivateExpoConfig)(projectDir);
         const projectId = await (0, getProjectIdAsync_1.getProjectIdAsync)(sessionManager, expBefore, {
             nonInteractive,
         });
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
+        const exp = (0, expoConfig_1.getPrivateExpoConfig)(projectDir);
         return {
             projectId,
             exp,
@@ -20,4 +21,4 @@ class ProjectConfigContextField extends ContextField_1.default {
         };
     }
 }
-exports.default = ProjectConfigContextField;
+exports.PrivateProjectConfigContextField = PrivateProjectConfigContextField;

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

@@ -20,7 +20,7 @@ const findProjectDirAndVerifyProjectSetupAsync_1 = require("./findProjectDirAndV
  */
 async function saveProjectIdToAppConfigAsync(projectDir, projectId, options = {}) {
     var _a;
-    const exp = (0, expoConfig_1.getExpoConfig)(projectDir, options);
+    const exp = (0, expoConfig_1.getPrivateExpoConfig)(projectDir, options);
     const result = await (0, config_1.modifyConfigAsync)(projectDir, {
         extra: { ...exp.extra, eas: { ...(_a = exp.extra) === null || _a === void 0 ? void 0 : _a.eas, projectId } },
     }, { skipSDKVersionRequirement: true });

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

@@ -12,7 +12,7 @@ export default class BranchCreate extends EasCommand {
     };
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
-        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+        privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/branch/create.js

@@ -14,7 +14,7 @@ const json_1 = require("../../utils/json");
 class BranchCreate extends EasCommand_1.default {
     async runAsync() {
         let { args: { name }, flags: { json: jsonFlag, 'non-interactive': nonInteractive }, } = await this.parse(BranchCreate);
-        const { projectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchCreate, {
+        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchCreate, {
             nonInteractive,
         });
         if (jsonFlag) {

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

@@ -3,7 +3,7 @@ export default class BranchDelete extends EasCommand {
     static description: string;
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
-        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+        privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };
     static args: {
         name: string;

package/build/commands/branch/delete.js

@@ -59,7 +59,7 @@ class BranchDelete extends EasCommand_1.default {
         if (jsonFlag) {
             (0, json_1.enableJsonOutput)();
         }
-        const { projectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchDelete, { nonInteractive });
+        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchDelete, { nonInteractive });
         const projectDisplayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(graphqlClient, projectId);
         if (!branchName) {
             const validationMessage = 'branch name may not be empty.';

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

@@ -9,7 +9,7 @@ export default class BranchList extends EasCommand {
     };
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
-        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+        privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/branch/list.js

@@ -10,7 +10,7 @@ const json_1 = require("../../utils/json");
 class BranchList extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(BranchList);
-        const { projectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchList, {
+        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchList, {
             nonInteractive: flags['non-interactive'],
         });
         const paginatedQueryOptions = (0, pagination_1.getPaginatedQueryOptions)(flags);

package/build/commands/branch/rename.d.ts

@@ -9,7 +9,7 @@ export default class BranchRename extends EasCommand {
     };
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
-        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+        privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/branch/rename.js

@@ -36,7 +36,7 @@ async function renameUpdateBranchOnAppAsync(graphqlClient, { appId, name, newNam
 class BranchRename extends EasCommand_1.default {
     async runAsync() {
         let { flags: { json: jsonFlag, from: currentName, to: newName, 'non-interactive': nonInteractive }, } = await this.parse(BranchRename);
-        const { projectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchRename, {
+        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchRename, {
             nonInteractive,
         });
         if (jsonFlag) {

package/build/commands/branch/view.d.ts

@@ -14,7 +14,7 @@ export default class BranchView extends EasCommand {
     };
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
-        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+        privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/branch/view.js

@@ -12,7 +12,7 @@ class BranchView extends EasCommand_1.default {
     async runAsync() {
         let { args: { name: branchName }, flags, } = await this.parse(BranchView);
         const { 'non-interactive': nonInteractive } = flags;
-        const { projectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchView, {
+        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchView, {
             nonInteractive,
         });
         const paginatedQueryOptions = (0, pagination_1.getPaginatedQueryOptions)(flags);

package/build/commands/build/cancel.d.ts

@@ -11,7 +11,7 @@ export default class BuildCancel extends EasCommand {
     };
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
-        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+        privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/build/cancel.js

@@ -105,7 +105,7 @@ async function ensureBuildExistsAsync(graphqlClient, buildId) {
 class BuildCancel extends EasCommand_1.default {
     async runAsync() {
         const { args: { BUILD_ID: buildIdFromArg }, flags: { 'non-interactive': nonInteractive }, } = await this.parse(BuildCancel);
-        const { projectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BuildCancel, {
+        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BuildCancel, {
             nonInteractive,
         });
         const displayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(graphqlClient, projectId);
@@ -125,7 +125,7 @@ class BuildCancel extends EasCommand_1.default {
         const spinner = (0, ora_1.ora)().start('Canceling the build…');
         try {
             const { status } = await cancelBuildAsync(graphqlClient, buildId);
-            if (status === generated_1.BuildStatus.Canceled) {
+            if ([generated_1.BuildStatus.Canceled, generated_1.BuildStatus.PendingCancel].includes(status)) {
                 spinner.succeed('Build canceled');
             }
             else {

package/build/commands/build/configure.d.ts

@@ -6,7 +6,7 @@ export default class BuildConfigure extends EasCommand {
     };
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
-        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+        privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/build/configure.js

@@ -20,7 +20,7 @@ class BuildConfigure extends EasCommand_1.default {
     async runAsync() {
         var _b;
         const { flags } = await this.parse(BuildConfigure);
-        const { projectConfig: { exp, projectId, projectDir }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BuildConfigure, {
+        const { privateProjectConfig: { exp, projectId, projectDir }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BuildConfigure, {
             nonInteractive: false,
         });
         log_1.default.log('💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.');

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

@@ -21,7 +21,8 @@ export default class Build extends EasCommand {
     static contextDefinition: {
         analytics: import("../../commandUtils/context/AnalyticsContextField").default;
         projectDir: import("../../commandUtils/context/ProjectDirContextField").default;
-        getDynamicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicProjectConfigContextField;
+        getDynamicPublicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicPublicProjectConfigContextField;
+        getDynamicPrivateProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicPrivateProjectConfigContextField;
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
     };
     runAsync(): Promise<void>;

package/build/commands/build/index.js

@@ -28,7 +28,7 @@ class Build extends EasCommand_1.default {
             (0, json_1.enableJsonOutput)();
         }
         const flags = this.sanitizeFlags(rawFlags);
-        const { loggedIn: { actor, graphqlClient }, getDynamicProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(Build, {
+        const { loggedIn: { actor, graphqlClient }, getDynamicPrivateProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(Build, {
             nonInteractive: flags.nonInteractive,
         });
         await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
@@ -38,7 +38,7 @@ class Build extends EasCommand_1.default {
                 : [generated_1.StatuspageServiceName.EasBuild]);
         }
         const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
-        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, projectDir, flagsWithPlatform, actor, getDynamicProjectConfigAsync);
+        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, projectDir, flagsWithPlatform, actor, getDynamicPrivateProjectConfigAsync);
     }
     sanitizeFlags(flags) {
         var _b;

package/build/commands/build/inspect.d.ts

@@ -18,7 +18,8 @@ export default class BuildInspect extends EasCommand {
     static contextDefinition: {
         analytics: import("../../commandUtils/context/AnalyticsContextField").default;
         projectDir: import("../../commandUtils/context/ProjectDirContextField").default;
-        getDynamicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicProjectConfigContextField;
+        getDynamicPublicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicPublicProjectConfigContextField;
+        getDynamicPrivateProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicPrivateProjectConfigContextField;
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
     };
     runAsync(): Promise<void>;

package/build/commands/build/inspect.js

@@ -28,7 +28,7 @@ const STAGE_DESCRIPTION = `Stage of the build you want to inspect.
 class BuildInspect extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(BuildInspect);
-        const { loggedIn: { actor, graphqlClient }, getDynamicProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(BuildInspect, {
+        const { loggedIn: { actor, graphqlClient }, getDynamicPrivateProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(BuildInspect, {
             nonInteractive: false,
         });
         const outputDirectory = path_1.default.resolve(process.cwd(), flags.output);
@@ -61,7 +61,7 @@ class BuildInspect extends EasCommand_1.default {
                         workingdir: tmpWorkingdir,
                         artifactsDir: path_1.default.join(tmpWorkingdir, 'artifacts'),
                     },
-                }, actor, getDynamicProjectConfigAsync);
+                }, actor, getDynamicPrivateProjectConfigAsync);
                 if (!flags.verbose) {
                     log_1.default.log(chalk_1.default.green('Build successful'));
                 }

package/build/commands/build/internal.d.ts

@@ -14,7 +14,8 @@ export default class BuildInternal extends EasCommand {
     static contextDefinition: {
         analytics: import("../../commandUtils/context/AnalyticsContextField").default;
         projectDir: import("../../commandUtils/context/ProjectDirContextField").default;
-        getDynamicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicProjectConfigContextField;
+        getDynamicPublicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicPublicProjectConfigContextField;
+        getDynamicPrivateProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicPrivateProjectConfigContextField;
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
     };
     runAsync(): Promise<void>;

package/build/commands/build/internal.js

@@ -21,7 +21,7 @@ class BuildInternal extends EasCommand_1.default {
         const { flags } = await this.parse(BuildInternal);
         // This command is always run with implicit --non-interactive and --json options
         (0, json_1.enableJsonOutput)();
-        const { loggedIn: { actor, graphqlClient }, getDynamicProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(BuildInternal, {
+        const { loggedIn: { actor, graphqlClient }, getDynamicPrivateProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(BuildInternal, {
             nonInteractive: true,
         });
         (0, vcs_1.setVcsClient)(new gitNoCommit_1.default());
@@ -37,7 +37,7 @@ class BuildInternal extends EasCommand_1.default {
             localBuildOptions: {
                 localBuildMode: local_1.LocalBuildMode.INTERNAL,
             },
-        }, actor, getDynamicProjectConfigAsync);
+        }, actor, getDynamicPrivateProjectConfigAsync);
     }
 }
 exports.default = BuildInternal;

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

@@ -22,7 +22,7 @@ export default class BuildList extends EasCommand {
     };
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
-        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+        privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };
     runAsync(): Promise<void>;
 }

package/build/commands/build/list.js

@@ -18,7 +18,7 @@ class BuildList extends EasCommand_1.default {
         const { flags } = await this.parse(BuildList);
         const paginatedQueryOptions = (0, pagination_1.getPaginatedQueryOptions)(flags);
         const { json: jsonFlag, platform: requestedPlatform, status: buildStatus, distribution: buildDistribution, 'non-interactive': nonInteractive, } = flags;
-        const { projectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BuildList, {
+        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BuildList, {
             nonInteractive,
         });
         if (jsonFlag) {
@@ -60,6 +60,7 @@ BuildList.flags = {
             types_1.BuildStatus.NEW,
             types_1.BuildStatus.IN_QUEUE,
             types_1.BuildStatus.IN_PROGRESS,
+            types_1.BuildStatus.PENDING_CANCEL,
             types_1.BuildStatus.ERRORED,
             types_1.BuildStatus.FINISHED,
             types_1.BuildStatus.CANCELED,
@@ -112,6 +113,9 @@ const toGraphQLBuildStatus = (buildStatus) => {
     else if (buildStatus === types_1.BuildStatus.IN_PROGRESS) {
         return generated_1.BuildStatus.InProgress;
     }
+    else if (buildStatus === types_1.BuildStatus.PENDING_CANCEL) {
+        return generated_1.BuildStatus.PendingCancel;
+    }
     else if (buildStatus === types_1.BuildStatus.ERRORED) {
         return generated_1.BuildStatus.Errored;
     }