eas-cli 0.55.1 → 0.58.0

package/build/commands/update/list.js

@@ -11,8 +11,8 @@ const log_1 = tslib_1.__importDefault(require("../../log"));
 const expoConfig_1 = require("../../project/expoConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
+const queries_1 = require("../../update/queries");
 const utils_1 = require("../../update/utils");
-const groupBy_1 = tslib_1.__importDefault(require("../../utils/expodash/groupBy"));
 const json_1 = require("../../utils/json");
 const vcs_1 = require("../../vcs");
 class BranchView extends EasCommand_1.default {
@@ -27,8 +27,15 @@ class BranchView extends EasCommand_1.default {
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         let updateGroupDescriptions;
         if (all) {
-            const branchesAndUpdates = await UpdateQuery_1.UpdateQuery.viewAllAsync({ appId: projectId });
-            updateGroupDescriptions = getUpdateGroupDescriptions(branchesAndUpdates.app.byId.updateBranches);
+            const branchesAndUpdates = await UpdateQuery_1.UpdateQuery.viewAllAsync({
+                appId: projectId,
+                limit: queries_1.UPDATES_LIMIT,
+                offset: 0,
+            });
+            updateGroupDescriptions = (0, utils_1.getUpdateGroupsWithPlatforms)(branchesAndUpdates.app.byId.updates.map(update => ({
+                ...update,
+                branch: update.branch.name,
+            }))).sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
         }
         else {
             let branchInteractive;
@@ -50,12 +57,14 @@ class BranchView extends EasCommand_1.default {
             const branchesAndUpdates = await UpdateQuery_1.UpdateQuery.viewBranchAsync({
                 appId: projectId,
                 name: branch,
+                limit: queries_1.UPDATES_LIMIT,
+                offset: 0,
             });
             const UpdateBranch = (_b = branchesAndUpdates.app) === null || _b === void 0 ? void 0 : _b.byId.updateBranchByName;
             if (!UpdateBranch) {
                 throw new Error(`Could not find branch "${branch}"`);
             }
-            updateGroupDescriptions = getUpdateGroupDescriptions([UpdateBranch]);
+            updateGroupDescriptions = (0, utils_1.getUpdateGroupsWithPlatforms)(UpdateBranch.updates.map(update => ({ ...update, branch }))).sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
         }
         if (jsonFlag) {
             (0, json_1.printJsonOnlyOutput)(updateGroupDescriptions);
@@ -82,20 +91,6 @@ BranchView.flags = {
         default: false,
     }),
 };
-function getUpdateGroupDescriptions(branchesAndUpdates) {
-    const flattenedBranchesAndUpdates = branchesAndUpdates.flatMap(branch => branch.updates.map(update => {
-        return { branch: branch.name, ...update };
-    }));
-    const updateGroupDescriptions = Object.values((0, groupBy_1.default)(flattenedBranchesAndUpdates, update => update.group)).map(updateGroup => {
-        const platforms = updateGroup
-            .map(update => update.platform)
-            .sort()
-            .join(', ');
-        return { ...updateGroup[0], platforms };
-    });
-    updateGroupDescriptions.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
-    return updateGroupDescriptions;
-}
 function logAsTable(updateGroupDescriptions) {
     const table = new cli_table3_1.default({
         head: ['Branch', ...utils_1.UPDATE_COLUMNS],

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

@@ -170,10 +170,10 @@ class SetUpAdhocProvisioningProfile {
         return selected;
     }
     async registerDevicesAsync(ctx, appleTeam) {
-        const action = new action_1.default(this.app.account, appleTeam);
+        const action = new action_1.default(ctx.appStore, this.app.account, appleTeam);
         const method = await action.runAsync();
         while (true) {
-            if (method !== action_1.RegistrationMethod.INPUT) {
+            if (method === action_1.RegistrationMethod.WEBSITE) {
                 log_1.default.newLine();
                 log_1.default.log(chalk_1.default.bold("Press any key if you've already finished device registration."));
                 await (0, prompts_1.pressAnyKeyToContinueAsync)();

package/build/credentials/ios/types.d.ts

@@ -1,4 +1,5 @@
 import { JSONObject } from '@expo/json-file';
+import type { XCBuildConfiguration } from 'xcode';
 import { CommonIosAppCredentialsFragment, IosAppBuildCredentialsFragment } from '../../graphql/generated';
 import { Account } from '../../user/Account';
 export interface App {
@@ -11,6 +12,7 @@ export interface Target {
     bundleIdentifier: string;
     parentBundleIdentifier?: string;
     entitlements: JSONObject;
+    buildSettings?: XCBuildConfiguration['buildSettings'];
 }
 export interface TargetCredentials {
     distributionCertificate: {

package/build/devices/actions/create/action.d.ts

@@ -1,14 +1,17 @@
+import AppStoreApi from '../../../credentials/ios/appstore/AppStoreApi';
 import { AppleTeam } from '../../../graphql/generated';
 import { Account } from '../../../user/Account';
 export declare enum RegistrationMethod {
     WEBSITE = 0,
     INPUT = 1,
-    EXIT = 2
+    DEVELOPER_PORTAL = 2,
+    EXIT = 3
 }
 export default class DeviceCreateAction {
+    private appStoreApi;
     private account;
     private appleTeam;
-    constructor(account: Account, appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>);
+    constructor(appStoreApi: AppStoreApi, account: Account, appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>);
     runAsync(): Promise<RegistrationMethod>;
     private askForRegistrationMethodAsync;
 }

package/build/devices/actions/create/action.js

@@ -5,16 +5,19 @@ const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const log_1 = tslib_1.__importDefault(require("../../../log"));
 const prompts_1 = require("../../../prompts");
+const developerPortalMethod_1 = require("./developerPortalMethod");
 const inputMethod_1 = require("./inputMethod");
 const registrationUrlMethod_1 = require("./registrationUrlMethod");
 var RegistrationMethod;
 (function (RegistrationMethod) {
     RegistrationMethod[RegistrationMethod["WEBSITE"] = 0] = "WEBSITE";
     RegistrationMethod[RegistrationMethod["INPUT"] = 1] = "INPUT";
-    RegistrationMethod[RegistrationMethod["EXIT"] = 2] = "EXIT";
+    RegistrationMethod[RegistrationMethod["DEVELOPER_PORTAL"] = 2] = "DEVELOPER_PORTAL";
+    RegistrationMethod[RegistrationMethod["EXIT"] = 3] = "EXIT";
 })(RegistrationMethod = exports.RegistrationMethod || (exports.RegistrationMethod = {}));
 class DeviceCreateAction {
-    constructor(account, appleTeam) {
+    constructor(appStoreApi, account, appleTeam) {
+        this.appStoreApi = appStoreApi;
         this.account = account;
         this.appleTeam = appleTeam;
     }
@@ -23,6 +26,9 @@ class DeviceCreateAction {
         if (method === RegistrationMethod.WEBSITE) {
             await (0, registrationUrlMethod_1.runRegistrationUrlMethodAsync)(this.account.id, this.appleTeam);
         }
+        else if (method === RegistrationMethod.DEVELOPER_PORTAL) {
+            await (0, developerPortalMethod_1.runDeveloperPortalMethodAsync)(this.appStoreApi, this.account.id, this.appleTeam);
+        }
         else if (method === RegistrationMethod.INPUT) {
             await (0, inputMethod_1.runInputMethodAsync)(this.account.id, this.appleTeam);
         }
@@ -42,6 +48,10 @@ class DeviceCreateAction {
                     title: `${chalk_1.default.bold('Website')} - generates a registration URL to be opened on your devices`,
                     value: RegistrationMethod.WEBSITE,
                 },
+                {
+                    title: `${chalk_1.default.bold('Developer Portal')} - import devices already registered on Apple Developer Portal`,
+                    value: RegistrationMethod.DEVELOPER_PORTAL,
+                },
                 {
                     title: `${chalk_1.default.bold('Input')} - allows you to type in UDIDs (advanced option)`,
                     value: RegistrationMethod.INPUT,

package/build/devices/actions/create/developerPortalMethod.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
+import { Device } from '@expo/apple-utils';
+import AppStoreApi from '../../../credentials/ios/appstore/AppStoreApi';
+import { AppleTeam } from '../../../graphql/generated';
+export declare function runDeveloperPortalMethodAsync(appStoreApi: AppStoreApi, accountId: string, appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>): Promise<void>;
+export declare function formatDeviceLabel(device: Device): string;

package/build/devices/actions/create/developerPortalMethod.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatDeviceLabel = exports.runDeveloperPortalMethodAsync = void 0;
+const tslib_1 = require("tslib");
+const apple_utils_1 = require("@expo/apple-utils");
+const AppleDeviceMutation_1 = require("../../../credentials/ios/api/graphql/mutations/AppleDeviceMutation");
+const AppleDeviceQuery_1 = require("../../../credentials/ios/api/graphql/queries/AppleDeviceQuery");
+const authenticate_1 = require("../../../credentials/ios/appstore/authenticate");
+const generated_1 = require("../../../graphql/generated");
+const log_1 = tslib_1.__importDefault(require("../../../log"));
+const ora_1 = require("../../../ora");
+const prompts_1 = require("../../../prompts");
+const chunk_1 = tslib_1.__importDefault(require("../../../utils/expodash/chunk"));
+const DEVICE_IMPORT_CHUNK_SIZE = 10;
+const DEVICE_CLASS_TO_GRAPHQL_TYPE = {
+    [apple_utils_1.DeviceClass.IPAD]: generated_1.AppleDeviceClass.Ipad,
+    [apple_utils_1.DeviceClass.IPHONE]: generated_1.AppleDeviceClass.Iphone,
+};
+async function runDeveloperPortalMethodAsync(appStoreApi, accountId, appleTeam) {
+    const appleAuthCtx = await appStoreApi.ensureAuthenticatedAsync();
+    const unregisteredPortalDevices = await findUnregisteredPortalDevicesAsync(appleAuthCtx, accountId, appleTeam);
+    if (unregisteredPortalDevices.length === 0) {
+        log_1.default.log('All your devices registered on Apple Developer Portal are already imported to EAS.');
+        return;
+    }
+    const devicesToImport = await chooseDevicesToImportAsync(unregisteredPortalDevices);
+    await importDevicesAsync(accountId, appleTeam, devicesToImport);
+}
+exports.runDeveloperPortalMethodAsync = runDeveloperPortalMethodAsync;
+async function importDevicesAsync(accountId, appleTeam, devices) {
+    const spinner = (0, ora_1.ora)(`Importing ${devices.length} Apple device${devices.length === 1 ? '' : 's'} to EAS`).start();
+    const deviceChunks = (0, chunk_1.default)(devices, DEVICE_IMPORT_CHUNK_SIZE);
+    try {
+        for (const deviceChunk of deviceChunks) {
+            await importDeviceChunkAsync(accountId, appleTeam, deviceChunk);
+        }
+    }
+    catch (err) {
+        spinner.fail();
+        throw err;
+    }
+    spinner.succeed();
+}
+async function importDeviceChunkAsync(accountId, appleTeam, devices) {
+    const promises = devices.map(device => {
+        var _a;
+        return AppleDeviceMutation_1.AppleDeviceMutation.createAppleDeviceAsync({
+            appleTeamId: appleTeam.id,
+            identifier: device.attributes.udid,
+            name: device.attributes.name,
+            deviceClass: (_a = DEVICE_CLASS_TO_GRAPHQL_TYPE[device.attributes.deviceClass]) !== null && _a !== void 0 ? _a : undefined,
+        }, accountId);
+    });
+    await Promise.all(promises);
+}
+async function findUnregisteredPortalDevicesAsync(appleAuthCtx, accountId, appleTeam) {
+    const expoRegisteredDevices = await AppleDeviceQuery_1.AppleDeviceQuery.getAllByAppleTeamIdentifierAsync(accountId, appleTeam.appleTeamIdentifier, { useCache: false });
+    const expoRegisteredDevicesByUdid = expoRegisteredDevices.reduce((acc, device) => {
+        acc[device.identifier] = device;
+        return acc;
+    }, {});
+    const portalDevices = await apple_utils_1.Device.getAllIOSProfileDevicesAsync((0, authenticate_1.getRequestContext)(appleAuthCtx));
+    return portalDevices.filter(portalDevice => !(portalDevice.attributes.udid in expoRegisteredDevicesByUdid) &&
+        [apple_utils_1.DeviceClass.IPAD, apple_utils_1.DeviceClass.IPHONE].includes(portalDevice.attributes.deviceClass));
+}
+async function chooseDevicesToImportAsync(devices) {
+    const { chosenDevices } = await (0, prompts_1.promptAsync)({
+        type: 'multiselect',
+        name: 'chosenDevices',
+        message: 'Which devices do you want to import to EAS?',
+        choices: devices.map(device => ({
+            value: device,
+            title: formatDeviceLabel(device),
+            selected: true,
+        })),
+    });
+    return chosenDevices;
+}
+function formatDeviceLabel(device) {
+    const deviceDetails = formatDeviceDetails(device);
+    return `${device.attributes.name} - ${device.attributes.udid})${deviceDetails !== '' ? ` - ${deviceDetails}` : ''}`;
+}
+exports.formatDeviceLabel = formatDeviceLabel;
+function formatDeviceDetails(device) {
+    let details = device.attributes.deviceClass;
+    if (device.attributes.model) {
+        details = device.attributes.model;
+    }
+    return details === '' ? details : `(${details})`;
+}

package/build/devices/manager.js

@@ -27,12 +27,12 @@ class DeviceManager {
         log_1.default.log(chalk_1.default.green(CREATE_COMMAND_DESCRIPTION));
         log_1.default.addNewLineIfNone();
         const account = await this.resolveAccountAsync();
-        const { team } = await this.ctx.appStore.ensureAuthenticatedAsync();
+        const appleAuthCtx = await this.ctx.appStore.ensureAuthenticatedAsync();
         const appleTeam = await ensureAppleTeamExistsAsync(account.id, {
-            appleTeamIdentifier: team.id,
-            appleTeamName: team.name,
+            appleTeamIdentifier: appleAuthCtx.team.id,
+            appleTeamName: appleAuthCtx.team.name,
         });
-        const action = new action_1.default(account, appleTeam);
+        const action = new action_1.default(this.ctx.appStore, account, appleTeam);
         await action.runAsync();
     }
     async resolveAccountAsync() {