eas-cli 0.46.0 → 0.48.1

package/build/{build → update}/android/UpdatesModule.js

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readChannelSafelyAsync = exports.readReleaseChannelSafelyAsync = exports.syncUpdatesConfigurationAsync = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
+const platform_1 = require("../../platform");
 const projectUtils_1 = require("../../project/projectUtils");
 const actions_1 = require("../../user/actions");
-const updates_1 = require("../utils/updates");
+const utils_1 = require("../utils");
 async function syncUpdatesConfigurationAsync(projectDir, exp) {
-    (0, updates_1.ensureValidVersions)(exp);
+    (0, utils_1.ensureValidVersions)(exp, platform_1.RequestedPlatform.Android);
     const accountName = (0, projectUtils_1.getProjectAccountName)(exp, await (0, actions_1.ensureLoggedInAsync)());
     const androidManifestPath = await config_plugins_1.AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
     const androidManifest = await getAndroidManifestAsync(projectDir);
-    const updatedAndroidManifest = config_plugins_1.AndroidConfig.Updates.setUpdatesConfig(exp, androidManifest, accountName);
+    const updatedAndroidManifest = config_plugins_1.AndroidConfig.Updates.setUpdatesConfig(projectDir, exp, androidManifest, accountName);
     await config_plugins_1.AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, updatedAndroidManifest);
 }
 exports.syncUpdatesConfigurationAsync = syncUpdatesConfigurationAsync;

package/build/{build → update}/ios/UpdatesModule.js

@@ -2,16 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readChannelSafelyAsync = exports.readReleaseChannelSafelyAsync = exports.syncUpdatesConfigurationAsync = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
+const platform_1 = require("../../platform");
 const projectUtils_1 = require("../../project/projectUtils");
 const actions_1 = require("../../user/actions");
 const plist_1 = require("../../utils/plist");
 const vcs_1 = require("../../vcs");
-const updates_1 = require("../utils/updates");
+const utils_1 = require("../utils");
 async function syncUpdatesConfigurationAsync(projectDir, exp) {
-    (0, updates_1.ensureValidVersions)(exp);
+    (0, utils_1.ensureValidVersions)(exp, platform_1.RequestedPlatform.Ios);
     const accountName = (0, projectUtils_1.getProjectAccountName)(exp, await (0, actions_1.ensureLoggedInAsync)());
     const expoPlist = await readExpoPlistAsync(projectDir);
-    const updatedExpoPlist = config_plugins_1.IOSConfig.Updates.setUpdatesConfig(exp, expoPlist, accountName);
+    const updatedExpoPlist = config_plugins_1.IOSConfig.Updates.setUpdatesConfig(projectDir, exp, expoPlist, accountName);
     await writeExpoPlistAsync(projectDir, updatedExpoPlist);
 }
 exports.syncUpdatesConfigurationAsync = syncUpdatesConfigurationAsync;
@@ -37,13 +38,11 @@ async function readReleaseChannelSafelyAsync(projectDir) {
 }
 exports.readReleaseChannelSafelyAsync = readReleaseChannelSafelyAsync;
 async function readChannelSafelyAsync(projectDir) {
-    var _a, _b;
+    var _a;
     try {
-        // TODO-JJ remove any once IOSConfig.ExpoPlist is updated to include `EXUpdatesRequestHeaders : Record<string,string>`
         const expoPlist = await readExpoPlistAsync(projectDir);
-        //TODO-JJ 'EXUpdatesRequestHeaders' IosConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY once https://github.com/expo/expo-cli/pull/3571 is published
-        const updatesRequestHeaders = (_a = expoPlist['EXUpdatesRequestHeaders']) !== null && _a !== void 0 ? _a : {};
-        return (_b = updatesRequestHeaders['expo-channel-name']) !== null && _b !== void 0 ? _b : null;
+        const updatesRequestHeaders = expoPlist['EXUpdatesRequestHeaders'];
+        return (_a = updatesRequestHeaders['expo-channel-name']) !== null && _a !== void 0 ? _a : null;
     }
     catch (err) {
         return null;

package/build/update/utils.d.ts

@@ -1,4 +1,6 @@
+import { ExpoConfig } from '@expo/config';
 import { Maybe, Robot, Update, User } from '../graphql/generated';
+import { RequestedPlatform } from '../platform';
 export declare type FormatUpdateParameter = Pick<Update, 'id' | 'createdAt' | 'message'> & {
     actor?: Maybe<Pick<User, 'username' | 'id'> | Pick<Robot, 'firstName' | 'id'>>;
 };
@@ -11,3 +13,4 @@ export declare function getPlatformsForGroup({ group, updates, }: {
     }[];
 }): string;
 export declare function formatUpdate(update: FormatUpdateParameter): string;
+export declare function ensureValidVersions(exp: ExpoConfig, platform: RequestedPlatform): void;

package/build/update/utils.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatUpdate = exports.getPlatformsForGroup = exports.UPDATE_COLUMNS = void 0;
+exports.ensureValidVersions = exports.formatUpdate = exports.getPlatformsForGroup = exports.UPDATE_COLUMNS = void 0;
 const tslib_1 = require("tslib");
 const timeago_js_1 = require("@expo/timeago.js");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const log_1 = require("../log");
+const platform_1 = require("../platform");
 const User_1 = require("../user/User");
-const groupBy_1 = (0, tslib_1.__importDefault)(require("../utils/expodash/groupBy"));
+const groupBy_1 = tslib_1.__importDefault(require("../utils/expodash/groupBy"));
 exports.UPDATE_COLUMNS = [
     'Update message',
     'Update runtime version',
@@ -30,3 +33,18 @@ function formatUpdate(update) {
     return `${message}(${(0, timeago_js_1.format)(update.createdAt, 'en_US')} by ${(0, User_1.getActorDisplayName)(update.actor)})`;
 }
 exports.formatUpdate = formatUpdate;
+function ensureValidVersions(exp, platform) {
+    var _a, _b;
+    const error = new Error(`Couldn't find either ${chalk_1.default.bold('runtimeVersion')} or ${chalk_1.default.bold('sdkVersion')} to configure ${chalk_1.default.bold('expo-updates')}. Please specify at least one of these properties under the ${chalk_1.default.bold('expo')} key in ${chalk_1.default.bold('app.json')}. ${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/runtime-versions/')}`);
+    if ([platform_1.RequestedPlatform.Android, platform_1.RequestedPlatform.All].includes(platform) &&
+        !(((_a = exp.android) === null || _a === void 0 ? void 0 : _a.runtimeVersion) || exp.runtimeVersion) &&
+        !exp.sdkVersion) {
+        throw error;
+    }
+    if ([platform_1.RequestedPlatform.Ios, platform_1.RequestedPlatform.All].includes(platform) &&
+        !(((_b = exp.ios) === null || _b === void 0 ? void 0 : _b.runtimeVersion) || exp.runtimeVersion) &&
+        !exp.sdkVersion) {
+        throw error;
+    }
+}
+exports.ensureValidVersions = ensureValidVersions;

package/build/uploads.d.ts

@@ -1,16 +1,8 @@
-/// <reference types="node" />
-import { Progress } from 'got';
-import { Readable } from 'stream';
 import { UploadSessionType } from './graphql/generated';
 import { PresignedPost } from './graphql/mutations/UploadSessionMutation';
-declare type ProgressHandler = (props: {
-    progress?: Progress;
-    isComplete?: boolean;
-    error?: Error;
-}) => void;
+import { ProgressHandler } from './utils/progress';
 export declare function uploadAsync(type: UploadSessionType, path: string, handleProgressEvent: ProgressHandler): Promise<{
     url: string;
     bucketKey: string;
 }>;
-export declare function uploadWithPresignedPostAsync(stream: Readable | Buffer, presignedPost: PresignedPost, handleProgressEvent?: ProgressHandler): Promise<string>;
-export {};
+export declare function uploadWithPresignedPostAsync(file: string, presignedPost: PresignedPost, handleProgressEvent?: ProgressHandler): Promise<string>;

package/build/uploads.js

@@ -2,39 +2,59 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadWithPresignedPostAsync = exports.uploadAsync = void 0;
 const tslib_1 = require("tslib");
-const assert_1 = (0, tslib_1.__importDefault)(require("assert"));
-const form_data_1 = (0, tslib_1.__importDefault)(require("form-data"));
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const got_1 = (0, tslib_1.__importDefault)(require("got"));
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const form_data_1 = tslib_1.__importDefault(require("form-data"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const fetch_1 = tslib_1.__importDefault(require("./fetch"));
 const UploadSessionMutation_1 = require("./graphql/mutations/UploadSessionMutation");
 async function uploadAsync(type, path, handleProgressEvent) {
     const presignedPost = await UploadSessionMutation_1.UploadSessionMutation.createUploadSessionAsync(type);
-    const url = await uploadWithPresignedPostAsync(fs_extra_1.default.createReadStream(path), presignedPost, handleProgressEvent);
+    const url = await uploadWithPresignedPostAsync(path, presignedPost, handleProgressEvent);
     (0, assert_1.default)(presignedPost.fields.key, 'key is not specified in in presigned post');
     return { url, bucketKey: presignedPost.fields.key };
 }
 exports.uploadAsync = uploadAsync;
-async function uploadWithPresignedPostAsync(stream, presignedPost, handleProgressEvent) {
+async function uploadWithPresignedPostAsync(file, presignedPost, handleProgressEvent) {
+    const fileStat = await fs_extra_1.default.stat(file);
+    const fileSize = fileStat.size;
     const form = new form_data_1.default();
     for (const [fieldKey, fieldValue] of Object.entries(presignedPost.fields)) {
         form.append(fieldKey, fieldValue);
     }
-    form.append('file', stream);
+    form.append('file', fs_extra_1.default.createReadStream(file), { knownLength: fileSize });
     const formHeaders = form.getHeaders();
-    let uploadPromise = got_1.default.post(presignedPost.url, { body: form, headers: { ...formHeaders } });
+    const uploadPromise = (0, fetch_1.default)(presignedPost.url, {
+        method: 'POST',
+        body: form,
+        headers: {
+            ...formHeaders,
+        },
+    });
+    let currentSize = 0;
     if (handleProgressEvent) {
-        uploadPromise = uploadPromise.on('uploadProgress', progress => handleProgressEvent({ progress }));
+        form.addListener('data', (chunk) => {
+            currentSize += Buffer.byteLength(chunk);
+            handleProgressEvent({
+                progress: {
+                    total: fileSize,
+                    percent: currentSize / fileSize,
+                    transferred: currentSize,
+                },
+            });
+        });
         try {
             const response = await uploadPromise;
             handleProgressEvent({ isComplete: true });
-            return String(response.headers.location);
+            return String(response.headers.get('location'));
         }
         catch (error) {
             handleProgressEvent({ isComplete: true, error });
             throw error;
         }
     }
-    const response = await uploadPromise;
-    return String(response.headers.location);
+    else {
+        const response = await uploadPromise;
+        return String(response.headers.get('location'));
+    }
 }
 exports.uploadWithPresignedPostAsync = uploadWithPresignedPostAsync;

package/build/user/User.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logoutAsync = exports.loginAsync = exports.getUserAsync = exports.getActorDisplayName = exports.getAccessToken = exports.getSessionSecret = void 0;
 const tslib_1 = require("tslib");
-const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
-const Analytics = (0, tslib_1.__importStar)(require("../analytics/rudderstackClient"));
+const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
+const Analytics = tslib_1.__importStar(require("../analytics/rudderstackClient"));
 const api_1 = require("../api");
 const client_1 = require("../graphql/client");
 const UserQuery_1 = require("../graphql/queries/UserQuery");
@@ -43,9 +43,7 @@ async function getUserAsync() {
 }
 exports.getUserAsync = getUserAsync;
 async function loginAsync({ username, password, otp, }) {
-    const body = await api_1.apiClient
-        .post('auth/loginAsync', { json: { username, password, otp } })
-        .json();
+    const body = await api_1.api.postAsync('auth/loginAsync', { body: { username, password, otp } });
     const { sessionSecret } = body.data;
     const result = await client_1.graphqlClient
         .query((0, graphql_tag_1.default) `

package/build/user/UserSettings.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const json_file_1 = (0, tslib_1.__importDefault)(require("@expo/json-file"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const json_file_1 = tslib_1.__importDefault(require("@expo/json-file"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const paths_1 = require("../utils/paths");
 const SETTINGS_FILE_PATH = path_1.default.join((0, paths_1.getConfigDirectory)(), 'user-settings.json');
 const UserSettings = new json_file_1.default(SETTINGS_FILE_PATH, {

package/build/user/actions.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureActorHasUsername = exports.ensureLoggedInAsync = exports.showLoginPromptAsync = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
-const ApiV2Error_1 = (0, tslib_1.__importDefault)(require("../ApiV2Error"));
-const log_1 = (0, tslib_1.__importStar)(require("../log"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
+const api_1 = require("../api");
+const log_1 = tslib_1.__importStar(require("../log"));
 const prompts_1 = require("../prompts");
 const User_1 = require("./User");
 const otp_1 = require("./otp");
@@ -37,7 +37,7 @@ async function showLoginPromptAsync({ nonInteractive = false, printNewLine = fal
         });
     }
     catch (e) {
-        if (e instanceof ApiV2Error_1.default && e.expoApiV2ErrorCode === 'ONE_TIME_PASSWORD_REQUIRED') {
+        if (e instanceof api_1.ApiV2Error && e.expoApiV2ErrorCode === 'ONE_TIME_PASSWORD_REQUIRED') {
             await (0, otp_1.retryUsernamePasswordAuthWithOTPAsync)(username, password, e.expoApiV2ErrorMetadata);
         }
         else {

package/build/user/otp.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.retryUsernamePasswordAuthWithOTPAsync = exports.UserSecondFactorDeviceMethod = void 0;
 const tslib_1 = require("tslib");
-const assert_1 = (0, tslib_1.__importDefault)(require("assert"));
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const api_1 = require("../api");
-const log_1 = (0, tslib_1.__importDefault)(require("../log"));
+const log_1 = tslib_1.__importDefault(require("../log"));
 const prompts_1 = require("../prompts");
 const User_1 = require("./User");
 var UserSecondFactorDeviceMethod;
@@ -65,15 +65,13 @@ async function promptForBackupOTPAsync(username, password, secondFactorDevices)
         return await promptForOTPAsync('cancel');
     }
     const device = smsNonPrimarySecondFactorDevices[selectedValue];
-    await api_1.apiClient
-        .post('auth/send-sms-otp', {
-        json: {
+    await api_1.api.postAsync('auth/send-sms-otp', {
+        body: {
             username,
             password,
             secondFactorDeviceID: device.id,
         },
-    })
-        .json();
+    });
     return await promptForOTPAsync('cancel');
 }
 /**

package/build/user/sessionStorage.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSessionSecret = exports.getAccessToken = exports.setSessionAsync = exports.getSession = void 0;
 const tslib_1 = require("tslib");
-const json_file_1 = (0, tslib_1.__importDefault)(require("@expo/json-file"));
+const json_file_1 = tslib_1.__importDefault(require("@expo/json-file"));
 const paths_1 = require("../utils/paths");
 function getSession() {
     var _a, _b;

package/build/utils/code-signing.d.ts

@@ -0,0 +1,29 @@
+import { ExpoConfig } from '@expo/config';
+import { pki as PKI } from 'node-forge';
+import { Response } from '../fetch';
+import { PartialManifest } from '../graphql/generated';
+declare type CodeSigningInfo = {
+    privateKey: PKI.rsa.PrivateKey;
+    certificate: PKI.Certificate;
+    codeSigningMetadata: {
+        alg: string;
+        keyid: string;
+    };
+};
+export declare function getCodeSigningInfoAsync(config: ExpoConfig, privateKeyPath: string | undefined): Promise<CodeSigningInfo | undefined>;
+export declare function getKeyAndCertificateFromPathsAsync({ codeSigningCertificatePath, privateKeyPath, }: {
+    codeSigningCertificatePath: string;
+    privateKeyPath: string;
+}): Promise<{
+    privateKey: PKI.rsa.PrivateKey;
+    certificate: PKI.Certificate;
+}>;
+export declare type MultipartPart = {
+    headers: Map<string, string>;
+    body: string;
+};
+export declare function parseMultipartMixedResponseAsync(res: Response): Promise<MultipartPart[]>;
+export declare function getManifestBodyAsync(res: Response): Promise<string | null>;
+export declare function signManifestBody(body: string, codeSigningInfo: CodeSigningInfo): string;
+export declare function checkManifestBodyAgainstUpdateInfoGroup(manifestResponseBody: string, partialManifest: PartialManifest): void;
+export {};

package/build/utils/code-signing.js

@@ -0,0 +1,165 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkManifestBodyAgainstUpdateInfoGroup = exports.signManifestBody = exports.getManifestBodyAsync = exports.parseMultipartMixedResponseAsync = exports.getKeyAndCertificateFromPathsAsync = exports.getCodeSigningInfoAsync = void 0;
+const tslib_1 = require("tslib");
+const code_signing_certificates_1 = require("@expo/code-signing-certificates");
+const dicer_1 = tslib_1.__importDefault(require("dicer"));
+const fast_deep_equal_1 = tslib_1.__importDefault(require("fast-deep-equal"));
+const fs_1 = require("fs");
+const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const stream_1 = require("stream");
+const structured_headers_1 = require("structured-headers");
+async function getCodeSigningInfoAsync(config, privateKeyPath) {
+    var _a, _b;
+    const codeSigningCertificatePath = (_a = config.updates) === null || _a === void 0 ? void 0 : _a.codeSigningCertificate;
+    if (!codeSigningCertificatePath) {
+        return undefined;
+    }
+    if (!privateKeyPath) {
+        privateKeyPath = path_1.default.join(path_1.default.dirname(codeSigningCertificatePath), 'private-key.pem');
+    }
+    const codeSigningMetadata = (_b = config.updates) === null || _b === void 0 ? void 0 : _b.codeSigningMetadata;
+    if (!codeSigningMetadata) {
+        throw new Error('Must specify codeSigningMetadata under the "updates" field of your app config file to use EAS code signing');
+    }
+    const { alg, keyid } = codeSigningMetadata;
+    if (!alg || !keyid) {
+        throw new Error('Must specify keyid and alg in the codeSigningMetadata field under the "updates" field of your app config file to use EAS code signing');
+    }
+    return codeSigningCertificatePath && privateKeyPath
+        ? {
+            ...(await getKeyAndCertificateFromPathsAsync({
+                codeSigningCertificatePath,
+                privateKeyPath,
+            })),
+            codeSigningMetadata: {
+                alg,
+                keyid,
+            },
+        }
+        : undefined;
+}
+exports.getCodeSigningInfoAsync = getCodeSigningInfoAsync;
+async function readFileAsync(path, errorMessage) {
+    try {
+        return await fs_1.promises.readFile(path, 'utf8');
+    }
+    catch {
+        throw new Error(errorMessage);
+    }
+}
+async function getKeyAndCertificateFromPathsAsync({ codeSigningCertificatePath, privateKeyPath, }) {
+    const [codeSigningCertificatePEM, privateKeyPEM] = await Promise.all([
+        readFileAsync(codeSigningCertificatePath, `Code signing certificate cannot be read from path: ${codeSigningCertificatePath}`),
+        readFileAsync(privateKeyPath, `Code signing private key cannot be read from path: ${privateKeyPath}`),
+    ]);
+    const privateKey = (0, code_signing_certificates_1.convertPrivateKeyPEMToPrivateKey)(privateKeyPEM);
+    const certificate = (0, code_signing_certificates_1.convertCertificatePEMToCertificate)(codeSigningCertificatePEM);
+    (0, code_signing_certificates_1.validateSelfSignedCertificate)(certificate, {
+        publicKey: certificate.publicKey,
+        privateKey,
+    });
+    return {
+        privateKey,
+        certificate,
+    };
+}
+exports.getKeyAndCertificateFromPathsAsync = getKeyAndCertificateFromPathsAsync;
+async function parseMultipartMixedResponseAsync(res) {
+    var _a;
+    const contentType = res.headers.get('content-type');
+    if (!contentType) {
+        throw new Error('The multipart manifest response is missing the content-type header');
+    }
+    const boundaryRegex = /^multipart\/.+?; boundary=(?:"([^"]+)"|([^\s;]+))/i;
+    const matches = boundaryRegex.exec(contentType);
+    if (!matches) {
+        throw new Error('The content-type header in the HTTP response is not a multipart media type');
+    }
+    const boundary = (_a = matches[1]) !== null && _a !== void 0 ? _a : matches[2];
+    const bodyBuffer = await res.arrayBuffer();
+    const bufferStream = new stream_1.Stream.PassThrough();
+    bufferStream.end(bodyBuffer);
+    return await new Promise((resolve, reject) => {
+        const parts = [];
+        bufferStream.pipe(new dicer_1.default({ boundary })
+            .on('part', p => {
+            const part = {
+                body: '',
+                headers: new Map(),
+            };
+            p.on('header', headers => {
+                for (const h in headers) {
+                    part.headers.set(h, headers[h][0]);
+                }
+            });
+            p.on('data', data => {
+                part.body += data.toString();
+            });
+            p.on('end', () => {
+                parts.push(part);
+            });
+        })
+            .on('finish', () => {
+            resolve(parts);
+        })
+            .on('error', error => {
+            reject(error);
+        }));
+    });
+}
+exports.parseMultipartMixedResponseAsync = parseMultipartMixedResponseAsync;
+function isManifestMultipartPart(multipartPart) {
+    const [, parameters] = (0, structured_headers_1.parseItem)((0, nullthrows_1.default)(multipartPart.headers.get('content-disposition')));
+    const partName = parameters.get('name');
+    return partName === 'manifest';
+}
+async function getManifestBodyAsync(res) {
+    var _a;
+    const multipartParts = await parseMultipartMixedResponseAsync(res);
+    const manifestPart = multipartParts.find(isManifestMultipartPart);
+    return (_a = manifestPart === null || manifestPart === void 0 ? void 0 : manifestPart.body) !== null && _a !== void 0 ? _a : null;
+}
+exports.getManifestBodyAsync = getManifestBodyAsync;
+function signManifestBody(body, codeSigningInfo) {
+    return (0, code_signing_certificates_1.signStringRSASHA256AndVerify)(codeSigningInfo.privateKey, codeSigningInfo.certificate, body);
+}
+exports.signManifestBody = signManifestBody;
+function assertAssetParity(manifestResponseBodyAssetJSON, partialManifestAsset) {
+    const baseErrorMessage = `Code signing manifest integrity error: Manifest asset tamper detected for asset: ${partialManifestAsset.bundleKey}; field: `;
+    if (manifestResponseBodyAssetJSON.hash !== partialManifestAsset.fileSHA256) {
+        throw new Error(baseErrorMessage + 'hash');
+    }
+    if (manifestResponseBodyAssetJSON.contentType !== partialManifestAsset.contentType) {
+        throw new Error(baseErrorMessage + 'contentType');
+    }
+    if (manifestResponseBodyAssetJSON.key !== partialManifestAsset.bundleKey) {
+        throw new Error(baseErrorMessage + 'key');
+    }
+}
+function checkManifestBodyAgainstUpdateInfoGroup(manifestResponseBody, partialManifest) {
+    var _a, _b;
+    const manifestResponseBodyJSON = JSON.parse(manifestResponseBody);
+    // Assert expoClient config is equal. We do not want to sign the manifest if the
+    // server has compromised the integrity of the manifest.
+    // JSON stringify and unstringify to remove any undefined values and bring it as close
+    // to the server sanitized value as possible
+    const isExtraEqual = (0, fast_deep_equal_1.default)(JSON.parse(JSON.stringify((_a = partialManifest.extra) === null || _a === void 0 ? void 0 : _a.expoClient)), (_b = manifestResponseBodyJSON.extra) === null || _b === void 0 ? void 0 : _b.expoClient);
+    if (!isExtraEqual) {
+        throw new Error(`Code signing manifest integrity error: The manifest being signed contains an extra.expoClient field that does not match the initially uploaded manifest's extra.expoClient field`);
+    }
+    assertAssetParity(manifestResponseBodyJSON.launchAsset, partialManifest.launchAsset);
+    if (manifestResponseBodyJSON.assets.length !== partialManifest.assets.length) {
+        throw new Error('Code signing manifest integrity error: The manifest being signed has an assets array of differing length from the initially uploaded manifest');
+    }
+    for (const partialManifestAsset of partialManifest.assets) {
+        const partialManifestAssetBundleKey = (0, nullthrows_1.default)(partialManifestAsset).bundleKey;
+        const correspondingManifestResponseBodyAssetJSON = manifestResponseBodyJSON.assets.find((manifestResponseBodyAssetJSON) => manifestResponseBodyAssetJSON.key === partialManifestAssetBundleKey);
+        if (!correspondingManifestResponseBodyAssetJSON) {
+            throw new Error(`Code signing manifest integrity error: The manifest being signed has is missing an asset specified in the initially uploaded manifest: ${partialManifestAssetBundleKey}`);
+        }
+        assertAssetParity(correspondingManifestResponseBodyAssetJSON, (0, nullthrows_1.default)(partialManifestAsset));
+    }
+}
+exports.checkManifestBodyAgainstUpdateInfoGroup = checkManifestBodyAgainstUpdateInfoGroup;

package/build/utils/expoCli.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expoCommandAsync = void 0;
 const tslib_1 = require("tslib");
-const spawn_async_1 = (0, tslib_1.__importDefault)(require("@expo/spawn-async"));
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const resolve_from_1 = (0, tslib_1.__importDefault)(require("resolve-from"));
-const log_1 = (0, tslib_1.__importDefault)(require("../log"));
+const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const resolve_from_1 = tslib_1.__importDefault(require("resolve-from"));
+const log_1 = tslib_1.__importDefault(require("../log"));
 async function expoCommandAsync(projectDir, args, { silent = false } = {}) {
     const expoCliPath = (0, resolve_from_1.default)(projectDir, 'expo/bin/cli.js');
     const spawnPromise = (0, spawn_async_1.default)(expoCliPath, args, {

package/build/utils/files.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatBytes = exports.maybeRenameExistingFileAsync = void 0;
 const tslib_1 = require("tslib");
-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.__importDefault)(require("../log"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const log_1 = tslib_1.__importDefault(require("../log"));
 function getRenamedFilename(filename, num) {
     const ext = path_1.default.extname(filename);
     const basename = path_1.default.basename(filename, ext);

package/build/utils/formatFields.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 function formatFields(fields, options = { labelFormat: chalk_1.default.dim }) {
     const columnWidth = fields.reduce((a, b) => (a.label.length > b.label.length ? a : b)).label
         .length;

package/build/utils/json.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printJsonOnlyOutput = exports.enableJsonOutput = void 0;
 const tslib_1 = require("tslib");
-const assert_1 = (0, tslib_1.__importDefault)(require("assert"));
-const log_1 = (0, tslib_1.__importDefault)(require("../log"));
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const log_1 = tslib_1.__importDefault(require("../log"));
 let stdoutWrite;
 function enableJsonOutput() {
     if (stdoutWrite) {

package/build/utils/paths.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStateJsonPath = exports.getTmpDirectory = exports.getLogDirectory = exports.getCacheDirectory = exports.getConfigDirectory = exports.getDataDirectory = void 0;
 const tslib_1 = require("tslib");
-const env_paths_1 = (0, tslib_1.__importDefault)(require("env-paths"));
+const env_paths_1 = tslib_1.__importDefault(require("env-paths"));
 const os_1 = require("os");
-const path = (0, tslib_1.__importStar)(require("path"));
+const path = tslib_1.__importStar(require("path"));
 // The ~/.expo directory is used to store authentication sessions,
 // which are shared between EAS CLI and Expo CLI.
 function dotExpoHomeDirectory() {

package/build/utils/plist.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writePlistAsync = exports.readPlistAsync = void 0;
 const tslib_1 = require("tslib");
-const plist_1 = (0, tslib_1.__importDefault)(require("@expo/plist"));
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const plist_1 = tslib_1.__importDefault(require("@expo/plist"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
 async function readPlistAsync(plistPath) {
     if (await fs_extra_1.default.pathExists(plistPath)) {
         const expoPlistContent = await fs_extra_1.default.readFile(plistPath, 'utf8');

package/build/utils/profiles.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProfilesAsync = void 0;
 const tslib_1 = require("tslib");
 const eas_json_1 = require("@expo/eas-json");
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const log_1 = (0, tslib_1.__importDefault)(require("../log"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const log_1 = tslib_1.__importDefault(require("../log"));
 const prompts_1 = require("../prompts");
 async function getProfilesAsync({ projectDir, platforms, profileName, type, }) {
     const results = platforms.map(async function (platform) {

package/build/utils/progress.d.ts

@@ -1,5 +1,9 @@
-import { Progress } from 'got';
-declare type ProgressHandler = (props: {
+export declare type Progress = {
+    total: number;
+    percent: number;
+    transferred: number;
+};
+export declare type ProgressHandler = (props: {
     progress?: Progress;
     isComplete?: boolean;
     error?: Error;
@@ -9,4 +13,3 @@ export declare function createProgressTracker({ total, message, completedMessage
     message: string | ((ratio: number) => string);
     completedMessage: string | ((duration: string) => string);
 }): ProgressHandler;
-export {};

package/build/utils/progress.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProgressTracker = void 0;
 const tslib_1 = require("tslib");
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const ora_1 = require("../ora");
 const timer_1 = require("./timer");
 function createProgressTracker({ total, message, completedMessage, }) {

package/build/vcs/clients/git.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isGitCaseSensitiveAsync = void 0;
 const tslib_1 = require("tslib");
-const spawn_async_1 = (0, tslib_1.__importDefault)(require("@expo/spawn-async"));
+const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const core_1 = require("@oclif/core");
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const log_1 = (0, tslib_1.__importStar)(require("../../log"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const log_1 = tslib_1.__importStar(require("../../log"));
 const ora_1 = require("../../ora");
 const prompts_1 = require("../../prompts");
 const git_1 = require("../git");