eas-cli 3.8.1 → 3.9.1

package/build/project/customBuildConfig.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCustomBuildConfigPath = exports.validateCustomBuildConfigAsync = void 0;
 const tslib_1 = require("tslib");
+const steps_1 = require("@expo/steps");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -9,10 +10,24 @@ async function validateCustomBuildConfigAsync(projectDir, profile) {
     if (!profile.config) {
         return;
     }
-    const relativeBuildConfigPath = getCustomBuildConfigPath(profile.config);
-    const buildConfigPath = path_1.default.join(projectDir, relativeBuildConfigPath);
-    if (!(await fs_extra_1.default.pathExists(buildConfigPath))) {
-        throw new Error(`Custom build configuration file ${chalk_1.default.bold(relativeBuildConfigPath)} does not exist.`);
+    const relativeConfigPath = getCustomBuildConfigPath(profile.config);
+    const configPath = path_1.default.join(projectDir, relativeConfigPath);
+    if (!(await fs_extra_1.default.pathExists(configPath))) {
+        throw new Error(`Custom build configuration file ${chalk_1.default.bold(relativeConfigPath)} does not exist.`);
+    }
+    try {
+        await (0, steps_1.readAndValidateBuildConfigAsync)(configPath, { skipNamespacedFunctionsCheck: true });
+    }
+    catch (err) {
+        if (err instanceof steps_1.errors.BuildConfigYAMLError) {
+            throw new Error(`Custom build configuration file ${chalk_1.default.bold(relativeConfigPath)} contains invalid YAML.\n\n${err.message}`);
+        }
+        else if (err instanceof steps_1.errors.BuildConfigError) {
+            throw new Error(`Custom build configuration file ${chalk_1.default.bold(relativeConfigPath)} contains invalid configuration. Please check the docs!\n${err.message}`);
+        }
+        else {
+            throw err;
+        }
     }
 }
 exports.validateCustomBuildConfigAsync = validateCustomBuildConfigAsync;

package/build/project/publish.d.ts

@@ -2,7 +2,9 @@
 import { ExpoConfig, Platform } from '@expo/config';
 import Joi from 'joi';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { PartialManifestAsset } from '../graphql/generated';
+import { RequestedPlatform } from '../platform';
 export type ExpoCLIExportPlatformFlag = Platform | 'all';
 type Metadata = {
     version: number;
@@ -106,4 +108,33 @@ type AssetUploadResult = {
 };
 export declare function uploadAssetsAsync(graphqlClient: ExpoGraphqlClient, assetsForUpdateInfoGroup: CollectedAssets, projectId: string, updateSpinnerText?: (totalAssets: number, missingAssets: number) => void): Promise<AssetUploadResult>;
 export declare function isUploadedAssetCountAboveWarningThreshold(uploadedAssetCount: number, assetLimitPerUpdateGroup: number): boolean;
+export declare function getBranchNameForCommandAsync({ graphqlClient, projectId, channelNameArg, branchNameArg, autoFlag, nonInteractive, paginatedQueryOptions, }: {
+    graphqlClient: ExpoGraphqlClient;
+    projectId: string;
+    channelNameArg: string | undefined;
+    branchNameArg: string | undefined;
+    autoFlag: boolean;
+    nonInteractive: boolean;
+    paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<string>;
+export declare function getUpdateMessageForCommandAsync({ updateMessageArg, autoFlag, nonInteractive, jsonFlag, }: {
+    updateMessageArg: string | undefined;
+    autoFlag: boolean;
+    nonInteractive: boolean;
+    jsonFlag: boolean;
+}): Promise<string>;
+export declare const defaultPublishPlatforms: Platform[];
+export declare function getRequestedPlatform(platform: ExpoCLIExportPlatformFlag): RequestedPlatform | null;
+/** Get runtime versions grouped by platform. Runtime version is always `null` on web where the platform is always backwards compatible. */
+export declare function getRuntimeVersionObjectAsync(exp: ExpoConfig, platforms: Platform[], projectDir: string): Promise<{
+    platform: string;
+    runtimeVersion: string;
+}[]>;
+export declare function getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions: {
+    platform: string;
+    runtimeVersion: string;
+}[]): {
+    runtimeVersion: string;
+    platforms: string[];
+}[];
 export {};

package/build/project/publish.js

@@ -1,23 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUploadedAssetCountAboveWarningThreshold = exports.uploadAssetsAsync = exports.filterOutAssetsThatAlreadyExistAsync = exports.collectAssetsAsync = exports.getOriginalPathFromAssetMap = exports.getAssetHashFromPath = exports.loadAssetMapAsync = exports.filterExportedPlatformsByFlag = exports.loadMetadata = exports.resolveInputDirectoryAsync = exports.buildBundlesAsync = exports.buildUnsortedUpdateInfoGroupAsync = exports.convertAssetToUpdateInfoGroupFormatAsync = exports.getStorageKeyForAssetAsync = exports.getStorageKey = exports.getBase64URLEncoding = exports.guessContentTypeFromExtension = exports.MetadataJoi = void 0;
+exports.getRuntimeToPlatformMappingFromRuntimeVersions = exports.getRuntimeVersionObjectAsync = exports.getRequestedPlatform = exports.defaultPublishPlatforms = exports.getUpdateMessageForCommandAsync = exports.getBranchNameForCommandAsync = exports.isUploadedAssetCountAboveWarningThreshold = exports.uploadAssetsAsync = exports.filterOutAssetsThatAlreadyExistAsync = exports.collectAssetsAsync = exports.getOriginalPathFromAssetMap = exports.getAssetHashFromPath = exports.loadAssetMapAsync = exports.filterExportedPlatformsByFlag = exports.loadMetadata = exports.resolveInputDirectoryAsync = exports.buildBundlesAsync = exports.buildUnsortedUpdateInfoGroupAsync = exports.convertAssetToUpdateInfoGroupFormatAsync = exports.getStorageKeyForAssetAsync = exports.getStorageKey = exports.getBase64URLEncoding = exports.guessContentTypeFromExtension = exports.MetadataJoi = void 0;
 const tslib_1 = require("tslib");
+const config_plugins_1 = require("@expo/config-plugins");
+const eas_build_job_1 = require("@expo/eas-build-job");
 const json_file_1 = tslib_1.__importDefault(require("@expo/json-file"));
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const crypto_1 = tslib_1.__importDefault(require("crypto"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const joi_1 = tslib_1.__importDefault(require("joi"));
 const mime_1 = tslib_1.__importDefault(require("mime"));
+const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const promise_limit_1 = tslib_1.__importDefault(require("promise-limit"));
+const queries_1 = require("../branch/queries");
+const utils_1 = require("../branch/utils");
 const generated_1 = require("../graphql/generated");
 const PublishMutation_1 = require("../graphql/mutations/PublishMutation");
 const PublishQuery_1 = require("../graphql/queries/PublishQuery");
-const log_1 = tslib_1.__importDefault(require("../log"));
+const log_1 = tslib_1.__importStar(require("../log"));
+const platform_1 = require("../platform");
+const prompts_1 = require("../prompts");
+const getBranchNameFromChannelNameAsync_1 = require("../update/getBranchNameFromChannelNameAsync");
+const utils_2 = require("../update/utils");
 const uploads_1 = require("../uploads");
 const expoCli_1 = require("../utils/expoCli");
 const chunk_1 = tslib_1.__importDefault(require("../utils/expodash/chunk"));
 const filter_1 = require("../utils/expodash/filter");
 const uniqBy_1 = tslib_1.__importDefault(require("../utils/expodash/uniqBy"));
+const vcs_1 = require("../vcs");
+const workflow_1 = require("./workflow");
 const fileMetadataJoi = joi_1.default.object({
     assets: joi_1.default.array()
         .required()
@@ -319,3 +332,135 @@ function isUploadedAssetCountAboveWarningThreshold(uploadedAssetCount, assetLimi
     return uploadedAssetCount > warningThreshold;
 }
 exports.isUploadedAssetCountAboveWarningThreshold = isUploadedAssetCountAboveWarningThreshold;
+async function getBranchNameForCommandAsync({ graphqlClient, projectId, channelNameArg, branchNameArg, autoFlag, nonInteractive, paginatedQueryOptions, }) {
+    if (channelNameArg && branchNameArg) {
+        throw new Error('Cannot specify both --channel and --branch. Specify either --channel, --branch, or --auto.');
+    }
+    if (channelNameArg) {
+        return await (0, getBranchNameFromChannelNameAsync_1.getBranchNameFromChannelNameAsync)(graphqlClient, projectId, channelNameArg);
+    }
+    if (branchNameArg) {
+        return branchNameArg;
+    }
+    if (autoFlag) {
+        return await (0, utils_1.getDefaultBranchNameAsync)();
+    }
+    else if (nonInteractive) {
+        throw new Error('Must supply --channel, --branch or --auto when in non-interactive mode.');
+    }
+    else {
+        let branchName;
+        try {
+            const branch = await (0, queries_1.selectBranchOnAppAsync)(graphqlClient, {
+                projectId,
+                promptTitle: `Which branch would you like to roll back to embedded on?`,
+                displayTextForListItem: updateBranch => ({
+                    title: `${updateBranch.name} ${chalk_1.default.grey(`- current update: ${(0, utils_2.formatUpdateMessage)(updateBranch.updates[0])}`)}`,
+                }),
+                paginatedQueryOptions,
+            });
+            branchName = branch.name;
+        }
+        catch {
+            // unable to select a branch (network error or no branches for project)
+            const { name } = await (0, prompts_1.promptAsync)({
+                type: 'text',
+                name: 'name',
+                message: 'No branches found. Provide a branch name:',
+                initial: await (0, utils_1.getDefaultBranchNameAsync)(),
+                validate: value => (value ? true : 'Branch name may not be empty.'),
+            });
+            branchName = name;
+        }
+        (0, assert_1.default)(branchName, 'Branch name must be specified.');
+        return branchName;
+    }
+}
+exports.getBranchNameForCommandAsync = getBranchNameForCommandAsync;
+async function getUpdateMessageForCommandAsync({ updateMessageArg, autoFlag, nonInteractive, jsonFlag, }) {
+    var _a, _b;
+    let updateMessage = updateMessageArg;
+    if (!updateMessageArg && autoFlag) {
+        updateMessage = (_a = (await (0, vcs_1.getVcsClient)().getLastCommitMessageAsync())) === null || _a === void 0 ? void 0 : _a.trim();
+    }
+    if (!updateMessage) {
+        if (nonInteractive) {
+            throw new Error('Must supply --message or use --auto when in non-interactive mode');
+        }
+        const validationMessage = 'publish message may not be empty.';
+        if (jsonFlag) {
+            throw new Error(validationMessage);
+        }
+        const { updateMessageLocal } = await (0, prompts_1.promptAsync)({
+            type: 'text',
+            name: 'updateMessageLocal',
+            message: `Provide an roll back message:`,
+            initial: (_b = (await (0, vcs_1.getVcsClient)().getLastCommitMessageAsync())) === null || _b === void 0 ? void 0 : _b.trim(),
+            validate: (value) => (value ? true : validationMessage),
+        });
+        updateMessage = updateMessageLocal;
+    }
+    (0, assert_1.default)(updateMessage, 'Update message must be specified.');
+    const truncatedMessage = (0, utils_2.truncateString)(updateMessage, 1024);
+    if (truncatedMessage !== updateMessage) {
+        log_1.default.warn('Update message exceeds the allowed 1024 character limit. Truncating message...');
+    }
+    return updateMessage;
+}
+exports.getUpdateMessageForCommandAsync = getUpdateMessageForCommandAsync;
+exports.defaultPublishPlatforms = ['android', 'ios'];
+function getRequestedPlatform(platform) {
+    switch (platform) {
+        case 'android':
+            return platform_1.RequestedPlatform.Android;
+        case 'ios':
+            return platform_1.RequestedPlatform.Ios;
+        case 'web':
+            return null;
+        case 'all':
+            return platform_1.RequestedPlatform.All;
+        default:
+            throw new Error(`Unsupported platform: ${platform}`);
+    }
+}
+exports.getRequestedPlatform = getRequestedPlatform;
+/** Get runtime versions grouped by platform. Runtime version is always `null` on web where the platform is always backwards compatible. */
+async function getRuntimeVersionObjectAsync(exp, platforms, projectDir) {
+    var _a, _b;
+    for (const platform of platforms) {
+        if (platform === 'web') {
+            continue;
+        }
+        const isPolicy = typeof ((_b = (_a = exp[platform]) === null || _a === void 0 ? void 0 : _a.runtimeVersion) !== null && _b !== void 0 ? _b : exp.runtimeVersion) === 'object';
+        if (isPolicy) {
+            const isManaged = (await (0, workflow_1.resolveWorkflowAsync)(projectDir, platform)) ===
+                eas_build_job_1.Workflow.MANAGED;
+            if (!isManaged) {
+                throw new Error('Runtime version policies are only supported in the managed workflow. In the bare workflow, runtime version needs to be set manually.');
+            }
+        }
+    }
+    return [...new Set(platforms)].map(platform => {
+        if (platform === 'web') {
+            return { platform: 'web', runtimeVersion: 'UNVERSIONED' };
+        }
+        return {
+            platform,
+            runtimeVersion: (0, nullthrows_1.default)(config_plugins_1.Updates.getRuntimeVersion(exp, platform), `Unable to determine runtime version for ${platform_1.requestedPlatformDisplayNames[platform]}. ${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/runtime-versions/')}`),
+        };
+    });
+}
+exports.getRuntimeVersionObjectAsync = getRuntimeVersionObjectAsync;
+function getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions) {
+    const runtimeToPlatformMapping = [];
+    for (const runtime of runtimeVersions) {
+        const platforms = runtimeVersions
+            .filter(({ runtimeVersion }) => runtimeVersion === runtime.runtimeVersion)
+            .map(({ platform }) => platform);
+        if (!runtimeToPlatformMapping.find(item => item.runtimeVersion === runtime.runtimeVersion)) {
+            runtimeToPlatformMapping.push({ runtimeVersion: runtime.runtimeVersion, platforms });
+        }
+    }
+    return runtimeToPlatformMapping;
+}
+exports.getRuntimeToPlatformMappingFromRuntimeVersions = getRuntimeToPlatformMappingFromRuntimeVersions;

package/build/update/configure.js

@@ -166,7 +166,7 @@ async function ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir) {
         return;
     }
     try {
-        const easJsonAccessor = new eas_json_1.EasJsonAccessor(projectDir);
+        const easJsonAccessor = eas_json_1.EasJsonAccessor.fromProjectPath(projectDir);
         await easJsonAccessor.readRawJsonAsync();
         easJsonAccessor.patch(easJsonRawObject => {
             const easBuildProfilesWithChannels = Object.keys(easJsonRawObject.build).reduce((acc, profileNameKey) => {

package/build/update/utils.d.ts

@@ -19,6 +19,8 @@ export type FormattedUpdateGroupDescription = {
     group: string;
     platforms: string;
     runtimeVersion: string;
+    codeSigningKey: string | undefined;
+    isRollBackToEmbedded: boolean;
 };
 export type FormattedBranchDescription = {
     branch: string;

package/build/update/utils.js

@@ -20,10 +20,13 @@ exports.UPDATE_COLUMNS = [
 ];
 exports.UPDATE_COLUMNS_WITH_BRANCH = ['Branch', ...exports.UPDATE_COLUMNS];
 function formatUpdateGroup(update) {
+    var _a;
     return (0, formatFields_1.default)([
         { label: 'Platforms', value: update.platforms },
         { label: 'Runtime Version', value: update.runtimeVersion },
         { label: 'Message', value: update.message },
+        { label: 'Code Signing Key', value: (_a = update.codeSigningKey) !== null && _a !== void 0 ? _a : 'N/A' },
+        { label: 'Is Roll Back to Embedded', value: update.isRollBackToEmbedded ? 'Yes' : 'No' },
         { label: 'Group ID', value: update.group },
     ]);
 }
@@ -116,30 +119,42 @@ function getUpdateGroupJsonInfo(updateGroups) {
         runtimeVersion: update.runtimeVersion,
         platform: update.platform,
         manifestPermalink: update.manifestPermalink,
+        isRollBackToEmbedded: update.isRollBackToEmbedded,
         gitCommitHash: update.gitCommitHash,
     }));
 }
 exports.getUpdateGroupJsonInfo = getUpdateGroupJsonInfo;
 function getUpdateGroupDescriptions(updateGroups) {
-    return updateGroups.map(updateGroup => ({
-        message: formatUpdateMessage(updateGroup[0]),
-        runtimeVersion: updateGroup[0].runtimeVersion,
-        group: updateGroup[0].group,
-        platforms: formatPlatformForUpdateGroup(updateGroup),
-    }));
+    return updateGroups.map(updateGroup => {
+        var _a;
+        return ({
+            message: formatUpdateMessage(updateGroup[0]),
+            runtimeVersion: updateGroup[0].runtimeVersion,
+            isRollBackToEmbedded: updateGroup[0].isRollBackToEmbedded,
+            codeSigningKey: (_a = updateGroup[0].codeSigningInfo) === null || _a === void 0 ? void 0 : _a.keyid,
+            group: updateGroup[0].group,
+            platforms: formatPlatformForUpdateGroup(updateGroup),
+        });
+    });
 }
 exports.getUpdateGroupDescriptions = getUpdateGroupDescriptions;
 function getUpdateGroupDescriptionsWithBranch(updateGroups) {
-    return updateGroups.map(updateGroup => ({
-        branch: updateGroup[0].branch.name,
-        message: formatUpdateMessage(updateGroup[0]),
-        runtimeVersion: updateGroup[0].runtimeVersion,
-        group: updateGroup[0].group,
-        platforms: formatPlatformForUpdateGroup(updateGroup),
-    }));
+    return updateGroups.map(updateGroup => {
+        var _a;
+        return ({
+            branch: updateGroup[0].branch.name,
+            message: formatUpdateMessage(updateGroup[0]),
+            runtimeVersion: updateGroup[0].runtimeVersion,
+            isRollBackToEmbedded: updateGroup[0].isRollBackToEmbedded,
+            codeSigningKey: (_a = updateGroup[0].codeSigningInfo) === null || _a === void 0 ? void 0 : _a.keyid,
+            group: updateGroup[0].group,
+            platforms: formatPlatformForUpdateGroup(updateGroup),
+        });
+    });
 }
 exports.getUpdateGroupDescriptionsWithBranch = getUpdateGroupDescriptionsWithBranch;
 function getBranchDescription(branch) {
+    var _a;
     if (branch.updates.length === 0) {
         return { branch: branch.name };
     }
@@ -149,6 +164,8 @@ function getBranchDescription(branch) {
         update: {
             message: formatUpdateMessage(latestUpdate),
             runtimeVersion: latestUpdate.runtimeVersion,
+            isRollBackToEmbedded: latestUpdate.isRollBackToEmbedded,
+            codeSigningKey: (_a = latestUpdate.codeSigningInfo) === null || _a === void 0 ? void 0 : _a.keyid,
             group: latestUpdate.group,
             platforms: getPlatformsForGroup({
                 group: latestUpdate.group,

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

@@ -2,7 +2,7 @@ import { ExpoConfig } from '@expo/config';
 import { pki as PKI } from 'node-forge';
 import { Response } from '../fetch';
 import { PartialManifest } from '../graphql/generated';
-type CodeSigningInfo = {
+export type CodeSigningInfo = {
     privateKey: PKI.rsa.PrivateKey;
     certificate: PKI.Certificate;
     codeSigningMetadata: {
@@ -19,6 +19,7 @@ export declare function getKeyAndCertificateFromPathsAsync({ codeSigningCertific
     certificate: PKI.Certificate;
 }>;
 export declare function getManifestBodyAsync(res: Response): Promise<string | null>;
-export declare function signManifestBody(body: string, codeSigningInfo: CodeSigningInfo): string;
+export declare function getDirectiveBodyAsync(res: Response): Promise<string | null>;
+export declare function signBody(body: string, codeSigningInfo: CodeSigningInfo): string;
 export declare function checkManifestBodyAgainstUpdateInfoGroup(manifestResponseBody: string, partialManifest: PartialManifest): void;
-export {};
+export declare function checkDirectiveBodyAgainstUpdateInfoGroup(directiveResponseBody: string): void;

package/build/utils/code-signing.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkManifestBodyAgainstUpdateInfoGroup = exports.signManifestBody = exports.getManifestBodyAsync = exports.getKeyAndCertificateFromPathsAsync = exports.getCodeSigningInfoAsync = void 0;
+exports.checkDirectiveBodyAgainstUpdateInfoGroup = exports.checkManifestBodyAgainstUpdateInfoGroup = exports.signBody = exports.getDirectiveBodyAsync = exports.getManifestBodyAsync = exports.getKeyAndCertificateFromPathsAsync = exports.getCodeSigningInfoAsync = void 0;
 const tslib_1 = require("tslib");
 const code_signing_certificates_1 = require("@expo/code-signing-certificates");
 const multipart_body_parser_1 = require("@expo/multipart-body-parser");
 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 areSetsEqual_1 = tslib_1.__importDefault(require("./expodash/areSetsEqual"));
 async function getCodeSigningInfoAsync(config, privateKeyPath) {
     var _a, _b;
     const codeSigningCertificatePath = (_a = config.updates) === null || _a === void 0 ? void 0 : _a.codeSigningCertificate;
@@ -61,7 +62,7 @@ async function getKeyAndCertificateFromPathsAsync({ codeSigningCertificatePath,
     };
 }
 exports.getKeyAndCertificateFromPathsAsync = getKeyAndCertificateFromPathsAsync;
-async function getManifestBodyAsync(res) {
+async function getMultipartBodyPartAsync(res, partName) {
     var _a;
     const contentType = res.headers.get('content-type');
     if (!contentType) {
@@ -69,14 +70,21 @@ async function getManifestBodyAsync(res) {
     }
     const bodyBuffer = await res.arrayBuffer();
     const multipartParts = await (0, multipart_body_parser_1.parseMultipartMixedResponseAsync)(contentType, Buffer.from(bodyBuffer));
-    const manifestPart = multipartParts.find(part => (0, multipart_body_parser_1.isMultipartPartWithName)(part, 'manifest'));
+    const manifestPart = multipartParts.find(part => (0, multipart_body_parser_1.isMultipartPartWithName)(part, partName));
     return (_a = manifestPart === null || manifestPart === void 0 ? void 0 : manifestPart.body) !== null && _a !== void 0 ? _a : null;
 }
+async function getManifestBodyAsync(res) {
+    return await getMultipartBodyPartAsync(res, 'manifest');
+}
 exports.getManifestBodyAsync = getManifestBodyAsync;
-function signManifestBody(body, codeSigningInfo) {
+async function getDirectiveBodyAsync(res) {
+    return await getMultipartBodyPartAsync(res, 'directive');
+}
+exports.getDirectiveBodyAsync = getDirectiveBodyAsync;
+function signBody(body, codeSigningInfo) {
     return (0, code_signing_certificates_1.signBufferRSASHA256AndVerify)(codeSigningInfo.privateKey, codeSigningInfo.certificate, Buffer.from(body, 'utf-8'));
 }
-exports.signManifestBody = signManifestBody;
+exports.signBody = signBody;
 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) {
@@ -114,3 +122,13 @@ function checkManifestBodyAgainstUpdateInfoGroup(manifestResponseBody, partialMa
     }
 }
 exports.checkManifestBodyAgainstUpdateInfoGroup = checkManifestBodyAgainstUpdateInfoGroup;
+function checkDirectiveBodyAgainstUpdateInfoGroup(directiveResponseBody) {
+    const directiveResponseBodyJSON = JSON.parse(directiveResponseBody);
+    if (!(0, areSetsEqual_1.default)(new Set(Object.keys(directiveResponseBodyJSON)), new Set(['extra', 'type', 'parameters']))) {
+        throw new Error('Code signing directive integrity error: Unexpected keys');
+    }
+    if (directiveResponseBodyJSON.type !== 'rollBackToEmbedded') {
+        throw new Error('Code signing directive integrity error: Incorrect directive type');
+    }
+}
+exports.checkDirectiveBodyAgainstUpdateInfoGroup = checkDirectiveBodyAgainstUpdateInfoGroup;

package/build/utils/expoCli.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const getenv_1 = require("getenv");
-const resolve_from_1 = tslib_1.__importDefault(require("resolve-from"));
+const resolve_from_1 = tslib_1.__importStar(require("resolve-from"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const log_1 = tslib_1.__importDefault(require("../log"));
 const memoize_1 = require("./expodash/memoize");
@@ -52,7 +52,8 @@ function shouldUseVersionedExpoCLIExpensive(projectDir, exp) {
 exports.shouldUseVersionedExpoCLIExpensive = shouldUseVersionedExpoCLIExpensive;
 exports.shouldUseVersionedExpoCLI = (0, memoize_1.memoize)(shouldUseVersionedExpoCLIExpensive);
 async function expoCommandAsync(projectDir, args, { silent = false } = {}) {
-    const expoCliPath = (0, resolve_from_1.default)(projectDir, 'expo/bin/cli.js');
+    var _a;
+    const expoCliPath = (_a = (0, resolve_from_1.silent)(projectDir, 'expo/bin/cli')) !== null && _a !== void 0 ? _a : (0, resolve_from_1.default)(projectDir, 'expo/bin/cli.js');
     const spawnPromise = (0, spawn_async_1.default)(expoCliPath, args, {
         stdio: ['inherit', 'pipe', 'pipe'], // inherit stdin so user can install a missing expo-cli from inside this command
     });

package/build/utils/expodash/areSetsEqual.d.ts

@@ -0,0 +1 @@
+export default function areSetsEqual<T>(a: Set<T>, b: Set<T>): boolean;

package/build/utils/expodash/areSetsEqual.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function areSetsEqual(a, b) {
+    return a.size === b.size && [...a].every(value => b.has(value));
+}
+exports.default = areSetsEqual;