eas-cli 0.33.1 → 0.34.0

package/build/build/utils/repository.js

@@ -13,9 +13,9 @@ const prompts_1 = require("../../prompts");
 const files_1 = require("../../utils/files");
 const paths_1 = require("../../utils/paths");
 const timer_1 = require("../../utils/timer");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 async function maybeBailOnRepoStatusAsync() {
-    if (!(await vcs_1.default.hasUncommittedChangesAsync())) {
+    if (!(await (0, vcs_1.getVcsClient)().isCommitRequiredAsync())) {
         return;
     }
     log_1.default.addNewLineIfNone();
@@ -30,7 +30,7 @@ async function maybeBailOnRepoStatusAsync() {
 }
 exports.maybeBailOnRepoStatusAsync = maybeBailOnRepoStatusAsync;
 async function ensureRepoIsCleanAsync(nonInteractive = false) {
-    if (!(await vcs_1.default.hasUncommittedChangesAsync())) {
+    if (!(await (0, vcs_1.getVcsClient)().isCommitRequiredAsync())) {
         return;
     }
     log_1.default.addNewLineIfNone();
@@ -58,7 +58,7 @@ async function commitPromptAsync({ initialCommitMessage, commitAllFiles, } = {})
         initial: initialCommitMessage,
         validate: (input) => input !== '',
     });
-    await vcs_1.default.commitAsync({ commitAllFiles, commitMessage: message });
+    await (0, vcs_1.getVcsClient)().commitAsync({ commitAllFiles, commitMessage: message });
 }
 exports.commitPromptAsync = commitPromptAsync;
 async function makeProjectTarballAsync() {
@@ -77,7 +77,7 @@ async function makeProjectTarballAsync() {
     const compressTimerLabel = 'makeProjectTarballAsync';
     (0, timer_1.startTimer)(compressTimerLabel);
     try {
-        await vcs_1.default.makeShallowCopyAsync(shallowClonePath);
+        await (0, vcs_1.getVcsClient)().makeShallowCopyAsync(shallowClonePath);
         await tar_1.default.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
             '.',
         ]);
@@ -110,7 +110,10 @@ var ShouldCommitChanges;
 })(ShouldCommitChanges || (ShouldCommitChanges = {}));
 async function reviewAndCommitChangesAsync(initialCommitMessage, { nonInteractive, askedFirstTime = true }) {
     if (process.env.EAS_BUILD_AUTOCOMMIT) {
-        await vcs_1.default.commitAsync({ commitMessage: initialCommitMessage, commitAllFiles: false });
+        await (0, vcs_1.getVcsClient)().commitAsync({
+            commitMessage: initialCommitMessage,
+            commitAllFiles: false,
+        });
         log_1.default.withTick('Committed changes.');
         return;
     }
@@ -140,7 +143,7 @@ async function reviewAndCommitChangesAsync(initialCommitMessage, { nonInteractiv
         log_1.default.withTick('Committed changes.');
     }
     else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-        await vcs_1.default.showDiffAsync();
+        await (0, vcs_1.getVcsClient)().showDiffAsync();
         await reviewAndCommitChangesAsync(initialCommitMessage, {
             nonInteractive,
             askedFirstTime: false,

package/build/build/validate.js

@@ -6,7 +6,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const log_1 = (0, tslib_1.__importStar)(require("../log"));
-const vcs_1 = (0, tslib_1.__importDefault)(require("../vcs"));
+const vcs_1 = require("../vcs");
 function checkNodeEnvVariable(ctx) {
     var _a;
     if (((_a = ctx.buildProfile.env) === null || _a === void 0 ? void 0 : _a.NODE_ENV) === 'production') {
@@ -24,14 +24,14 @@ async function checkGoogleServicesFileAsync(ctx) {
     if (!googleServicesFilePath) {
         return;
     }
-    const rootDir = path_1.default.normalize(await vcs_1.default.getRootPathAsync());
+    const rootDir = path_1.default.normalize(await (0, vcs_1.getVcsClient)().getRootPathAsync());
     const absGoogleServicesFilePath = path_1.default.resolve(ctx.projectDir, googleServicesFilePath);
     if ((await fs_extra_1.default.pathExists(absGoogleServicesFilePath)) &&
         (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-            (await vcs_1.default.isFileIgnoredAsync(path_1.default.relative(rootDir, absGoogleServicesFilePath))))) {
+            (await (0, vcs_1.getVcsClient)().isFileIgnoredAsync(path_1.default.relative(rootDir, absGoogleServicesFilePath))))) {
         log_1.default.warn(`File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`);
         log_1.default.warn(`Use EAS Secret to pass all values that you don't want to include in your version control. ${(0, log_1.learnMore)('https://docs.expo.dev/build-reference/variables/#using-secrets-in-environment-variables')}`);
-        log_1.default.warn('If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting GOOGLE_SERVICES_FILE in your build profile in eas.json to any non-falsy value.');
+        log_1.default.warn(`If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting your build profile's env.GOOGLE_SERVICES_FILE in eas.json to any non-empty string.`);
         log_1.default.newLine();
     }
 }

package/build/commandUtils/EasCommand.d.ts

@@ -8,4 +8,5 @@ export default abstract class EasCommand extends Command {
     protected abstract runAsync(): Promise<any>;
     run(): Promise<any>;
     finally(err: Error): Promise<any>;
+    private applyCliConfigAsync;
 }

package/build/commandUtils/EasCommand.js

@@ -1,9 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const eas_json_1 = require("@expo/eas-json");
 const command_1 = require("@oclif/command");
+const semver_1 = (0, tslib_1.__importDefault)(require("semver"));
 const analytics_1 = require("../analytics");
+const log_1 = (0, tslib_1.__importDefault)(require("../log"));
+const projectUtils_1 = require("../project/projectUtils");
 const User_1 = require("../user/User");
 const actions_1 = require("../user/actions");
+const easCli_1 = require("../utils/easCli");
+const vcs_1 = require("../vcs");
+const git_1 = (0, tslib_1.__importDefault)(require("../vcs/clients/git"));
 class EasCommand extends command_1.Command {
     constructor() {
         super(...arguments);
@@ -16,7 +24,9 @@ class EasCommand extends command_1.Command {
     // eslint-disable-next-line async-protect/async-suffix
     async run() {
         var _a;
+        eas_json_1.EasJsonReader.setLog(log_1.default);
         await (0, analytics_1.initAsync)();
+        await this.applyCliConfigAsync();
         if (this.requiresAuthentication) {
             const { flags } = this.parse();
             const nonInteractive = (_a = flags['non-interactive']) !== null && _a !== void 0 ? _a : false;
@@ -37,5 +47,16 @@ class EasCommand extends command_1.Command {
         await (0, analytics_1.flushAsync)();
         return super.finally(err);
     }
+    async applyCliConfigAsync() {
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
+        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+        const config = await easJsonReader.getCliConfigAsync();
+        if ((config === null || config === void 0 ? void 0 : config.version) && !semver_1.default.satisfies(easCli_1.easCliVersion, config.version)) {
+            throw new Error(`You are on eas-cli@${easCli_1.easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`);
+        }
+        if (config === null || config === void 0 ? void 0 : config.requireCommit) {
+            (0, vcs_1.setVcsClient)(new git_1.default());
+        }
+    }
 }
 exports.default = EasCommand;

package/build/commands/branch/create.js

@@ -11,7 +11,7 @@ const client_1 = require("../../graphql/client");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 async function createUpdateBranchOnAppAsync({ appId, name, }) {
     const result = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
         .mutation((0, graphql_tag_1.default) `
@@ -51,7 +51,8 @@ class BranchCreate extends EasCommand_1.default {
                 type: 'text',
                 name: 'name',
                 message: 'Please name the branch:',
-                initial: (await vcs_1.default.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`,
+                initial: (await (0, vcs_1.getVcsClient)().getBranchNameAsync()) ||
+                    `branch-${Math.random().toString(36).substr(2, 4)}`,
                 validate: value => (value ? true : validationMessage),
             }));
         }

package/build/commands/branch/delete.js

@@ -27,7 +27,7 @@ async function getBranchInfoAsync({ appId, name, }) {
         `, {
         appId,
         name,
-    })
+    }, { additionalTypenames: ['UpdateBranch'] })
         .toPromise());
     return data;
 }

package/build/commands/branch/list.js

@@ -34,7 +34,7 @@ async function listBranchesAsync({ projectId, }) {
         `, {
         appId: projectId,
         limit: BRANCHES_LIMIT,
-    })
+    }, { additionalTypenames: ['UpdateBranch'] })
         .toPromise());
     return (_b = (_a = data === null || data === void 0 ? void 0 : data.app) === null || _a === void 0 ? void 0 : _a.byId.updateBranches) !== null && _b !== void 0 ? _b : [];
 }

package/build/commands/branch/publish.js

@@ -22,7 +22,7 @@ const prompts_1 = require("../../prompts");
 const utils_1 = require("../../update/utils");
 const uniqBy_1 = (0, tslib_1.__importDefault)(require("../../utils/expodash/uniqBy"));
 const formatFields_1 = (0, tslib_1.__importDefault)(require("../../utils/formatFields"));
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 const create_1 = require("./create");
 const list_1 = require("./list");
 const view_1 = require("./view");
@@ -42,7 +42,7 @@ async function getUpdateGroupAsync({ group, }) {
           }
         `, {
         group,
-    })
+    }, { additionalTypenames: ['Update'] })
         .toPromise());
     return updatesByGroup;
 }
@@ -75,7 +75,8 @@ class BranchPublish extends EasCommand_1.default {
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         if (!branchName && autoFlag) {
             branchName =
-                (await vcs_1.default.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`;
+                (await (0, vcs_1.getVcsClient)().getBranchNameAsync()) ||
+                    `branch-${Math.random().toString(36).substr(2, 4)}`;
         }
         if (!branchName) {
             const validationMessage = 'branch name may not be empty.';
@@ -172,7 +173,7 @@ class BranchPublish extends EasCommand_1.default {
             }
         }
         if (!message && autoFlag) {
-            message = (_b = (await vcs_1.default.getLastCommitMessageAsync())) === null || _b === void 0 ? void 0 : _b.trim();
+            message = (_b = (await (0, vcs_1.getVcsClient)().getLastCommitMessageAsync())) === null || _b === void 0 ? void 0 : _b.trim();
         }
         if (!message) {
             const validationMessage = 'publish message may not be empty.';
@@ -185,7 +186,7 @@ class BranchPublish extends EasCommand_1.default {
                 message: `Please enter a publication message.`,
                 initial: republish
                     ? `Republish "${oldMessage}" - group: ${group}`
-                    : (_c = (await vcs_1.default.getLastCommitMessageAsync())) === null || _c === void 0 ? void 0 : _c.trim(),
+                    : (_c = (await (0, vcs_1.getVcsClient)().getLastCommitMessageAsync())) === null || _c === void 0 ? void 0 : _c.trim(),
                 validate: value => (value ? true : validationMessage),
             }));
         }

package/build/commands/branch/view.js

@@ -52,7 +52,7 @@ async function viewUpdateBranchAsync({ appId, name, }) {
         appId,
         name,
         limit: PAGE_LIMIT,
-    })
+    }, { additionalTypenames: ['UpdateBranch', 'Update'] })
         .toPromise());
     return data;
 }

package/build/commands/build/index.js

@@ -7,6 +7,8 @@ const eas_json_1 = require("@expo/eas-json");
 const command_1 = require("@oclif/command");
 const errors_1 = require("@oclif/errors");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const figures_1 = (0, tslib_1.__importDefault)(require("figures"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const build_1 = require("../../build/android/build");
 const build_2 = require("../../build/build");
@@ -19,7 +21,7 @@ const repository_1 = require("../../build/utils/repository");
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/EasCommand"));
 const generated_1 = require("../../graphql/generated");
 const AppPlatform_1 = require("../../graphql/types/AppPlatform");
-const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
+const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const platform_1 = require("../../platform");
 const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const metroConfig_1 = require("../../project/metroConfig");
@@ -28,9 +30,11 @@ const prompts_1 = require("../../prompts");
 const context_2 = require("../../submit/context");
 const submit_1 = require("../../submit/submit");
 const urls_1 = require("../../submit/utils/urls");
+const easCli_1 = require("../../utils/easCli");
 const json_1 = require("../../utils/json");
 const profiles_1 = require("../../utils/profiles");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
+const git_1 = (0, tslib_1.__importDefault)(require("../../vcs/clients/git"));
 class Build extends EasCommand_1.default {
     constructor() {
         super(...arguments);
@@ -46,7 +50,7 @@ class Build extends EasCommand_1.default {
         const { requestedPlatform } = flags;
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
-        await vcs_1.default.ensureRepoExistsAsync();
+        await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
         await (0, repository_1.ensureRepoIsCleanAsync)(flags.nonInteractive);
         await (0, configure_1.ensureProjectConfiguredAsync)(projectDir, requestedPlatform);
         const platforms = (0, platform_1.toPlatforms)(requestedPlatform);
@@ -272,28 +276,34 @@ Build.flags = {
     }),
 };
 async function handleDeprecatedEasJsonAsync(projectDir, nonInteractive) {
-    if (await (0, eas_json_1.isUsingDeprecatedFormatAsync)(projectDir)) {
-        const hasMismatchedExtendsKeys = await (0, eas_json_1.hasMismatchedExtendsAsync)(projectDir);
-        if (nonInteractive) {
-            log_1.default.error('We detected that your eas.json is using a deprecated format.');
-            log_1.default.error('We will convert it automatically if run this command without --non-interactive flag. Alternatively, you can update eas.json manually according to https://docs.expo.dev/build/eas-json');
-            (0, errors_1.error)('Unsupported eas.json format', { exit: 1 });
-        }
-        const confirm = await (0, prompts_1.confirmAsync)({
-            message: 'We detected that your eas.json is using a deprecated format, do you want to migrate to the new format?',
-        });
-        if (confirm) {
-            await (0, eas_json_1.migrateAsync)(projectDir);
-            if (hasMismatchedExtendsKeys) {
-                log_1.default.warn('"extends" keyword can only be migrated automatically to the new format if both Android and iOS profiles extend base profiles with the same names for both platforms');
-                log_1.default.warn('Migration was successful, but you need to manually adjust the extend rules for your profiles');
-                (0, errors_1.error)('Fix eas.json manually', { exit: 1 });
-            }
-        }
-        else {
-            log_1.default.error("Aborting, update your eas.json according to https://docs.expo.dev/build/eas-json and run 'eas build' again");
-            (0, errors_1.error)('Unsupported eas.json format', { exit: 1 });
-        }
+    if (!(await fs_extra_1.default.pathExists(eas_json_1.EasJsonReader.formatEasJsonPath(projectDir)))) {
+        return;
+    }
+    const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+    const rawEasJson = await easJsonReader.readRawAsync();
+    if (rawEasJson === null || rawEasJson === void 0 ? void 0 : rawEasJson.cli) {
+        return;
+    }
+    if (nonInteractive) {
+        log_1.default.warn(`${figures_1.default.warning} Action required: the default behavior of EAS CLI has changed and your eas.json must be updated to remove ambiguity around which Git integration workflow to use. Refer to ${(0, log_1.link)('https://expo.fyi/eas-vcs-workflow')} for more information.`);
+        log_1.default.warn('This warning will become an error in an upcoming EAS CLI release. For now, we will proceed with the old default behavior to avoid disruption of your builds.');
+        (0, vcs_1.setVcsClient)(new git_1.default());
+        return;
+    }
+    log_1.default.log(`${chalk_1.default.bold('eas-cli@>=0.34.0 no longer requires that you commit changes to Git before starting a build.')} ${(0, log_1.learnMore)('https://expo.fyi/eas-vcs-workflow')}`);
+    log_1.default.log(`If you want to continue using the Git integration, you can opt in with ${chalk_1.default.bold('cli.requireCommit')} in ${chalk_1.default.bold('eas.json')} or with the following prompt`);
+    log_1.default.newLine();
+    const mode = await (0, prompts_1.selectAsync)('Select your preferred Git integration', [
+        { title: 'Require changes to be committed in Git (old default)', value: 'requireCommit' },
+        { title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
+    ]);
+    rawEasJson.cli =
+        mode === 'requireCommit'
+            ? { version: `>= ${easCli_1.easCliVersion}`, requireCommit: true }
+            : { version: `>= ${easCli_1.easCliVersion}` };
+    await fs_extra_1.default.writeJSON(eas_json_1.EasJsonReader.formatEasJsonPath(projectDir), rawEasJson, { spaces: 2 });
+    if (mode === 'requireCommit') {
+        (0, vcs_1.setVcsClient)(new git_1.default());
     }
 }
 exports.handleDeprecatedEasJsonAsync = handleDeprecatedEasJsonAsync;

package/build/commands/channel/edit.js

@@ -30,7 +30,7 @@ async function getChannelByNameForAppAsync({ appId, channelName, }) {
               }
             }
           }
-        `, { appId, channelName })
+        `, { appId, channelName }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch'] })
         .toPromise());
     const updateChannelByNameResult = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.updateChannelByName;
     if (!updateChannelByNameResult) {

package/build/commands/channel/list.js

@@ -47,7 +47,7 @@ async function getAllUpdateChannelForAppAsync({ appId, }) {
               }
             }
           }
-        `, { appId, offset: 0, limit: CHANNEL_LIMIT })
+        `, { appId, offset: 0, limit: CHANNEL_LIMIT }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] })
         .toPromise());
 }
 class ChannelList extends EasCommand_1.default {

package/build/commands/channel/view.js

@@ -101,7 +101,7 @@ async function getUpdateChannelByNameForAppAsync({ appId, channelName, }) {
               }
             }
           }
-        `, { appId, channelName })
+        `, { appId, channelName }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] })
         .toPromise());
 }
 exports.getUpdateChannelByNameForAppAsync = getUpdateChannelByNameForAppAsync;

package/build/commands/diagnostics.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const envinfo_1 = (0, tslib_1.__importDefault)(require("envinfo"));
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../commandUtils/EasCommand"));
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
-const packageJSON = require('../../package.json');
+const easCli_1 = require("../utils/easCli");
 class Diagnostics extends EasCommand_1.default {
     constructor() {
         super(...arguments);
@@ -28,7 +28,7 @@ class Diagnostics extends EasCommand_1.default {
             ],
             npmGlobalPackages: ['eas-cli', 'expo-cli'],
         }, {
-            title: `EAS CLI ${packageJSON.version} environment info`,
+            title: `EAS CLI ${easCli_1.easCliVersion} environment info`,
         });
         log_1.default.log(info);
     }

package/build/commands/project/info.js

@@ -19,7 +19,7 @@ async function projectInfoByIdAsync(appId) {
               }
             }
           }
-        `, { appId })
+        `, { appId }, { additionalTypenames: ['App'] })
         .toPromise());
     return data;
 }

package/build/commands/update/view.js

@@ -33,7 +33,7 @@ async function viewUpdateAsync({ groupId, }) {
           }
         `, {
         groupId,
-    })
+    }, { additionalTypenames: ['Update'] })
         .toPromise());
     if (data.updatesByGroup.length === 0) {
         throw new Error(`Could not find any updates with group ID: "${groupId}"`);

package/build/credentials/android/api/graphql/queries/GoogleServiceAccountKeyQuery.js

@@ -24,6 +24,8 @@ exports.GoogleServiceAccountKeyQuery = {
             ${(0, graphql_1.print)(GoogleServiceAccountKey_1.GoogleServiceAccountKeyFragmentNode)}
           `, {
             accountName,
+        }, {
+            additionalTypenames: ['GoogleServiceAccountKey'],
         })
             .toPromise());
         return data.account.byName.googleServiceAccountKeys;

package/build/credentials/credentialsJson/update.js

@@ -8,8 +8,8 @@ const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const target_1 = require("../../project/ios/target");
 const zipObject_1 = (0, tslib_1.__importDefault)(require("../../utils/expodash/zipObject"));
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
-const git_1 = (0, tslib_1.__importDefault)(require("../../vcs/git"));
+const vcs_1 = require("../../vcs");
+const git_1 = (0, tslib_1.__importDefault)(require("../../vcs/clients/git"));
 const read_1 = require("./read");
 const utils_1 = require("./utils");
 /**
@@ -197,8 +197,9 @@ async function updateFileAsync(projectDir, filePath, base64Data) {
     }
 }
 async function isFileUntrackedAsync(path) {
-    if (vcs_1.default instanceof git_1.default) {
-        return await vcs_1.default.isFileUntrackedAsync(path);
+    const vcsClient = (0, vcs_1.getVcsClient)();
+    if (vcsClient instanceof git_1.default) {
+        return await vcsClient.isFileUntrackedAsync(path);
     }
     return false;
 }

package/build/credentials/ios/actions/CreateDistributionCertificate.js

@@ -9,7 +9,7 @@ class CreateDistributionCertificate {
         this.account = account;
     }
     async runAsync(ctx) {
-        const distCert = await (0, DistributionCertificateUtils_1.provideOrGenerateDistributionCertificateAsync)(ctx, this.account.name);
+        const distCert = await (0, DistributionCertificateUtils_1.provideOrGenerateDistributionCertificateAsync)(ctx);
         const result = await ctx.ios.createDistributionCertificateAsync(this.account, distCert);
         log_1.default.succeed('Created distribution certificate');
         return result;

package/build/credentials/ios/actions/CreatePushKey.js

@@ -12,7 +12,7 @@ class CreatePushKey {
         if (ctx.nonInteractive) {
             throw new Error(`A new push key cannot be created in non-interactive mode.`);
         }
-        const pushKey = await (0, PushKeyUtils_1.provideOrGeneratePushKeyAsync)(ctx, this.account.name);
+        const pushKey = await (0, PushKeyUtils_1.provideOrGeneratePushKeyAsync)(ctx);
         const result = await ctx.ios.createPushKeyAsync(this.account, pushKey);
         log_1.default.succeed('Created push key');
         return result;

package/build/credentials/ios/actions/DistributionCertificateUtils.d.ts

@@ -12,4 +12,4 @@ export declare function selectDistributionCertificateWithDependenciesAsync(ctx:
  * select a distribution certificate from a valid set (curated on a best effort basis)
  * */
 export declare function selectValidDistributionCertificateAsync(ctx: CredentialsContext, appLookupParams: AppLookupParams): Promise<AppleDistributionCertificateFragment | null>;
-export declare function provideOrGenerateDistributionCertificateAsync(ctx: CredentialsContext, accountName: string): Promise<DistributionCertificate>;
+export declare function provideOrGenerateDistributionCertificateAsync(ctx: CredentialsContext): Promise<DistributionCertificate>;

package/build/credentials/ios/actions/DistributionCertificateUtils.js

@@ -99,7 +99,7 @@ You can have only ${chalk_1.default.underline('three')} Apple Distribution Certi
 Please revoke the old ones or reuse existing from your other apps.
 Please remember that Apple Distribution Certificates are not application specific!
 `;
-async function provideOrGenerateDistributionCertificateAsync(ctx, accountName) {
+async function provideOrGenerateDistributionCertificateAsync(ctx) {
     if (!ctx.nonInteractive) {
         const userProvided = await promptForDistCertAsync(ctx);
         if (userProvided) {
@@ -112,13 +112,11 @@ async function provideOrGenerateDistributionCertificateAsync(ctx, accountName) {
                 if (!isValid) {
                     log_1.default.warn("Provided Distribution Certificate is no longer valid on Apple's server");
                 }
-                return isValid
-                    ? userProvided
-                    : await provideOrGenerateDistributionCertificateAsync(ctx, accountName);
+                return isValid ? userProvided : await provideOrGenerateDistributionCertificateAsync(ctx);
             }
         }
     }
-    return await generateDistributionCertificateAsync(ctx, accountName);
+    return await generateDistributionCertificateAsync(ctx);
 }
 exports.provideOrGenerateDistributionCertificateAsync = provideOrGenerateDistributionCertificateAsync;
 async function promptForDistCertAsync(ctx) {
@@ -140,7 +138,7 @@ async function promptForDistCertAsync(ctx) {
     }
     return userProvided;
 }
-async function generateDistributionCertificateAsync(ctx, accountName) {
+async function generateDistributionCertificateAsync(ctx) {
     await ctx.appStore.ensureAuthenticatedAsync();
     try {
         return await ctx.appStore.createDistributionCertificateAsync();
@@ -176,7 +174,7 @@ async function generateDistributionCertificateAsync(ctx, accountName) {
             throw e;
         }
     }
-    return await generateDistributionCertificateAsync(ctx, accountName);
+    return await generateDistributionCertificateAsync(ctx);
 }
 function formatDistributionCertificateFromApple(appleInfo) {
     const { name, status, id, expires, created, ownerName, serialNumber } = appleInfo;

package/build/credentials/ios/actions/PushKeyUtils.d.ts

@@ -2,7 +2,7 @@ import { ApplePushKeyFragment } from '../../../graphql/generated';
 import { Account } from '../../../user/Account';
 import { CredentialsContext } from '../../context';
 import { PushKey } from '../appstore/Credentials.types';
-export declare function provideOrGeneratePushKeyAsync(ctx: CredentialsContext, accountName: string): Promise<PushKey>;
+export declare function provideOrGeneratePushKeyAsync(ctx: CredentialsContext): Promise<PushKey>;
 /**
  * select a push key from an account (validity status shown on a best effort basis)
  * */

package/build/credentials/ios/actions/PushKeyUtils.js

@@ -12,7 +12,7 @@ const pushKey_1 = require("../appstore/pushKey");
 const credentials_1 = require("../credentials");
 const validatePushKey_1 = require("../validators/validatePushKey");
 const AppleTeamUtils_1 = require("./AppleTeamUtils");
-async function provideOrGeneratePushKeyAsync(ctx, accountName) {
+async function provideOrGeneratePushKeyAsync(ctx) {
     if (!ctx.nonInteractive) {
         const userProvided = await promptForPushKeyAsync(ctx);
         if (userProvided) {
@@ -32,11 +32,11 @@ async function provideOrGeneratePushKeyAsync(ctx, accountName) {
                 if (useUserProvided) {
                     return userProvided;
                 }
-                return await provideOrGeneratePushKeyAsync(ctx, accountName);
+                return await provideOrGeneratePushKeyAsync(ctx);
             }
         }
     }
-    return await generatePushKeyAsync(ctx, accountName);
+    return await generatePushKeyAsync(ctx);
 }
 exports.provideOrGeneratePushKeyAsync = provideOrGeneratePushKeyAsync;
 async function promptForPushKeyAsync(ctx) {
@@ -58,7 +58,7 @@ async function promptForPushKeyAsync(ctx) {
     }
     return userProvided;
 }
-async function generatePushKeyAsync(ctx, accountName) {
+async function generatePushKeyAsync(ctx) {
     await ctx.appStore.ensureAuthenticatedAsync();
     try {
         return await ctx.appStore.createPushKeyAsync();
@@ -94,7 +94,7 @@ async function generatePushKeyAsync(ctx, accountName) {
             throw e;
         }
     }
-    return await generatePushKeyAsync(ctx, accountName);
+    return await generatePushKeyAsync(ctx);
 }
 function formatPushKeyFromApple(pushKey) {
     const { name, id } = pushKey;

package/build/credentials/ios/api/graphql/queries/AppQuery.js

@@ -20,7 +20,9 @@ exports.AppQuery = {
               }
             }
             ${(0, graphql_1.print)(App_1.AppFragmentNode)}
-          `, { fullName })
+          `, { fullName }, {
+            additionalTypenames: ['App'],
+        })
             .toPromise());
         (0, assert_1.default)(data.app, 'GraphQL: `app` not defined in server response');
         return data.app.byFullName;

package/build/credentials/ios/api/graphql/queries/AppleDeviceQuery.js

@@ -68,7 +68,9 @@ exports.AppleDeviceQuery = {
                 }
               }
             }
-          `, { accountName, appleTeamIdentifier })
+          `, { accountName, appleTeamIdentifier }, {
+            additionalTypenames: ['AppleDevice', 'AppleTeam'],
+        })
             .toPromise());
         return data.account.byName.appleTeams[0];
     },
@@ -95,7 +97,9 @@ exports.AppleDeviceQuery = {
                 }
               }
             }
-          `, { accountName, identifier })
+          `, { accountName, identifier }, {
+            additionalTypenames: ['AppleDevice', 'AppleTeam'],
+        })
             .toPromise());
         return (_a = data.account.byName.appleDevices[0]) !== null && _a !== void 0 ? _a : null;
     },

package/build/credentials/ios/api/graphql/queries/AppleDistributionCertificateQuery.js

@@ -47,7 +47,11 @@ exports.AppleDistributionCertificateQuery = {
             appleAppIdentifierId,
             iosDistributionType,
         }, {
-            additionalTypenames: ['IosAppCredentials', 'IosAppBuildCredentials'],
+            additionalTypenames: [
+                'AppleDistributionCertificate',
+                'IosAppCredentials',
+                'IosAppBuildCredentials',
+            ],
         })
             .toPromise());
         (0, assert_1.default)(data.app, 'GraphQL: `app` not defined in server response');
@@ -70,6 +74,8 @@ exports.AppleDistributionCertificateQuery = {
             ${(0, graphql_1.print)(AppleDistributionCertificate_1.AppleDistributionCertificateFragmentNode)}
           `, {
             accountName,
+        }, {
+            additionalTypenames: ['AppleDistributionCertificate'],
         })
             .toPromise());
         return data.account.byName.appleDistributionCertificates;

package/build/credentials/ios/api/graphql/queries/AppleProvisioningProfileQuery.js

@@ -59,7 +59,11 @@ exports.AppleProvisioningProfileQuery = {
             appleAppIdentifierId,
             iosDistributionType,
         }, {
-            additionalTypenames: ['IosAppCredentials', 'IosAppBuildCredentials'],
+            additionalTypenames: [
+                'AppleProvisioningProfile',
+                'IosAppCredentials',
+                'IosAppBuildCredentials',
+            ],
         })
             .toPromise());
         (0, assert_1.default)(data.app, 'GraphQL: `app` not defined in server response');