eas-cli 16.0.1 → 16.2.0

package/build/commands/update/index.js

@@ -5,6 +5,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
+const api_1 = require("../../api");
 const queries_1 = require("../../branch/queries");
 const graphql_1 = require("../../build/graphql");
 const repository_1 = require("../../build/utils/repository");
@@ -15,6 +16,7 @@ const pagination_1 = require("../../commandUtils/pagination");
 const fetch_1 = tslib_1.__importDefault(require("../../fetch"));
 const generated_1 = require("../../graphql/generated");
 const PublishMutation_1 = require("../../graphql/mutations/PublishMutation");
+const AppQuery_1 = require("../../graphql/queries/AppQuery");
 const log_1 = tslib_1.__importStar(require("../../log"));
 const ora_1 = require("../../ora");
 const platform_1 = require("../../platform");
@@ -374,74 +376,103 @@ class UpdatePublish extends EasCommand_1.default {
         }
         if (jsonFlag) {
             (0, json_1.printJsonOnlyOutput)((0, utils_1.getUpdateJsonInfosForUpdates)(newUpdates));
+            return;
         }
-        else {
-            if (new Set(newUpdates.map(update => update.group)).size > 1) {
-                log_1.default.addNewLineIfNone();
-                log_1.default.log('👉 Since multiple runtime versions are defined, multiple update groups have been published.');
+        if (new Set(newUpdates.map(update => update.group)).size > 1) {
+            log_1.default.addNewLineIfNone();
+            log_1.default.log('👉 Since multiple runtime versions are defined, multiple update groups have been published.');
+        }
+        log_1.default.addNewLineIfNone();
+        const runtimeToCompatibleBuilds = await Promise.all(runtimeToPlatformsAndFingerprintInfoAndFingerprintSourceMapping.map(obj => (0, publish_1.findCompatibleBuildsAsync)(graphqlClient, projectId, obj)));
+        for (const runtime of (0, uniqBy_1.default)(runtimeToPlatformsAndFingerprintInfoMapping, version => version.runtimeVersion)) {
+            const newUpdatesForRuntimeVersion = newUpdates.filter(update => update.runtimeVersion === runtime.runtimeVersion);
+            if (newUpdatesForRuntimeVersion.length === 0) {
+                throw new Error(`Publish response is missing updates with runtime ${runtime.runtimeVersion}.`);
             }
+            const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
+            const newAndroidUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'android');
+            const newIosUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'ios');
+            const updateGroupId = newUpdatesForRuntimeVersion[0].group;
+            const projectName = exp.slug;
+            const accountName = (await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId)).name;
+            const updateGroupUrl = (0, url_1.getUpdateGroupUrl)(accountName, projectName, updateGroupId);
+            const updateGroupLink = (0, log_1.link)(updateGroupUrl, { dim: false });
+            log_1.default.log((0, formatFields_1.default)([
+                { label: 'Branch', value: branchName },
+                { label: 'Runtime version', value: runtime.runtimeVersion },
+                { label: 'Platform', value: platforms.join(', ') },
+                { label: 'Update group ID', value: updateGroupId },
+                ...(newAndroidUpdate ? [{ label: 'Android update ID', value: newAndroidUpdate.id }] : []),
+                ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
+                ...(newAndroidUpdate?.rolloutControlUpdate
+                    ? [
+                        {
+                            label: 'Android Rollout',
+                            value: `${newAndroidUpdate.rolloutPercentage}% (Base update ID: ${newAndroidUpdate.rolloutControlUpdate.id})`,
+                        },
+                    ]
+                    : []),
+                ...(newIosUpdate?.rolloutControlUpdate
+                    ? [
+                        {
+                            label: 'iOS Rollout',
+                            value: `${newIosUpdate.rolloutPercentage}% (Base update ID: ${newIosUpdate.rolloutControlUpdate.id})`,
+                        },
+                    ]
+                    : []),
+                { label: 'Message', value: updateMessage ?? '' },
+                ...(gitCommitHash
+                    ? [
+                        {
+                            label: 'Commit',
+                            value: `${gitCommitHash}${isGitWorkingTreeDirty ? '*' : ''}`,
+                        },
+                    ]
+                    : []),
+                { label: 'EAS Dashboard', value: updateGroupLink },
+            ]));
             log_1.default.addNewLineIfNone();
-            for (const runtime of (0, uniqBy_1.default)(runtimeToPlatformsAndFingerprintInfoMapping, version => version.runtimeVersion)) {
-                const newUpdatesForRuntimeVersion = newUpdates.filter(update => update.runtimeVersion === runtime.runtimeVersion);
-                if (newUpdatesForRuntimeVersion.length === 0) {
-                    throw new Error(`Publish response is missing updates with runtime ${runtime.runtimeVersion}.`);
-                }
-                const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
-                const newAndroidUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'android');
-                const newIosUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'ios');
-                const updateGroupId = newUpdatesForRuntimeVersion[0].group;
-                const projectName = exp.slug;
-                const accountName = (await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId)).name;
-                const updateGroupUrl = (0, url_1.getUpdateGroupUrl)(accountName, projectName, updateGroupId);
-                const updateGroupLink = (0, log_1.link)(updateGroupUrl, { dim: false });
-                log_1.default.log((0, formatFields_1.default)([
-                    { label: 'Branch', value: branchName },
-                    { label: 'Runtime version', value: runtime.runtimeVersion },
-                    { label: 'Platform', value: platforms.join(', ') },
-                    { label: 'Update group ID', value: updateGroupId },
-                    ...(newAndroidUpdate
-                        ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
-                        : []),
-                    ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-                    ...(newAndroidUpdate?.rolloutControlUpdate
-                        ? [
-                            {
-                                label: 'Android Rollout',
-                                value: `${newAndroidUpdate.rolloutPercentage}% (Base update ID: ${newAndroidUpdate.rolloutControlUpdate.id})`,
-                            },
-                        ]
-                        : []),
-                    ...(newIosUpdate?.rolloutControlUpdate
-                        ? [
-                            {
-                                label: 'iOS Rollout',
-                                value: `${newIosUpdate.rolloutPercentage}% (Base update ID: ${newIosUpdate.rolloutControlUpdate.id})`,
-                            },
-                        ]
-                        : []),
-                    { label: 'Message', value: updateMessage ?? '' },
-                    ...(gitCommitHash
-                        ? [
+            if ((0, publish_1.isUploadedAssetCountAboveWarningThreshold)(uploadedAssetCount, assetLimitPerUpdateGroup)) {
+                log_1.default.warn(`This update group contains ${uploadedAssetCount} assets and is nearing the server cap of ${assetLimitPerUpdateGroup}.\n` +
+                    `${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/optimize-assets/', {
+                        learnMoreMessage: 'Consider optimizing your usage of assets',
+                        dim: false,
+                    })}.`);
+                log_1.default.addNewLineIfNone();
+            }
+            const fingerprintsWithoutCompatibleBuilds = runtimeToCompatibleBuilds.find(({ runtimeVersion }) => runtimeVersion === runtime.runtimeVersion)?.fingerprintInfoGroupWithCompatibleBuilds;
+            if (fingerprintsWithoutCompatibleBuilds) {
+                const missingBuilds = Object.entries(fingerprintsWithoutCompatibleBuilds).filter(([_platform, fingerprintInfo]) => !fingerprintInfo.build);
+                if (missingBuilds.length > 0) {
+                    const project = await AppQuery_1.AppQuery.byIdAsync(graphqlClient, projectId);
+                    log_1.default.warn('No compatible builds found for the following fingerprints:');
+                    for (const [platform, fingerprintInfo] of missingBuilds) {
+                        const fingerprintUrl = new URL(`/accounts/${project.ownerAccount.name}/projects/${project.slug}/fingerprints/${fingerprintInfo.fingerprintHash}`, (0, api_1.getExpoWebsiteBaseUrl)());
+                        log_1.default.warn((0, formatFields_1.default)([
                             {
-                                label: 'Commit',
-                                value: `${gitCommitHash}${isGitWorkingTreeDirty ? '*' : ''}`,
+                                label: `${this.prettyPlatform(platform)} fingerprint`,
+                                value: fingerprintInfo.fingerprintHash,
                             },
-                        ]
-                        : []),
-                    { label: 'EAS Dashboard', value: updateGroupLink },
-                ]));
-                log_1.default.addNewLineIfNone();
-                if ((0, publish_1.isUploadedAssetCountAboveWarningThreshold)(uploadedAssetCount, assetLimitPerUpdateGroup)) {
-                    log_1.default.warn(`This update group contains ${uploadedAssetCount} assets and is nearing the server cap of ${assetLimitPerUpdateGroup}.\n` +
-                        `${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/optimize-assets/', {
-                            learnMoreMessage: 'Consider optimizing your usage of assets',
-                            dim: false,
-                        })}.`);
-                    log_1.default.addNewLineIfNone();
+                            { label: 'URL', value: fingerprintUrl.toString() },
+                        ], {
+                            labelFormat: label => `    ${chalk_1.default.dim(label)}:`,
+                        }));
+                        log_1.default.addNewLineIfNone();
+                    }
                 }
             }
         }
     }
+    prettyPlatform(updatePlatform) {
+        switch (updatePlatform) {
+            case 'android':
+                return 'Android';
+            case 'ios':
+                return 'iOS';
+            default:
+                return updatePlatform;
+        }
+    }
     sanitizeFlags(flags) {
         const nonInteractive = flags['non-interactive'] ?? false;
         const { auto, branch: branchName, channel: channelName, message: updateMessage } = flags;

package/build/fingerprint/cli.js

@@ -69,8 +69,17 @@ async function createFingerprintWithoutLoggingAsync(projectDir, fingerprintPath,
     if (options.debug) {
         fingerprintOptions.debug = true;
     }
-    // eslint-disable-next-line @typescript-eslint/return-await
-    return await Fingerprint.createFingerprintAsync(projectDir, fingerprintOptions);
+    return await withTemporaryEnvAsync(options.env ?? {}, () => Fingerprint.createFingerprintAsync(projectDir, fingerprintOptions));
+}
+async function withTemporaryEnvAsync(envVars, fn) {
+    const originalEnv = { ...process.env };
+    Object.assign(process.env, envVars);
+    try {
+        return await fn();
+    }
+    finally {
+        process.env = originalEnv;
+    }
 }
 /**
  * Computes project fingerprints based on provided options and returns a map of fingerprint data keyed by a string.

package/build/fingerprint/utils.d.ts

@@ -3,7 +3,9 @@ import { Fingerprint } from './types';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { AppPlatform } from '../graphql/generated';
 import { Client } from '../vcs/vcs';
-export declare function getFingerprintInfoFromLocalProjectForPlatformsAsync(graphqlClient: ExpoGraphqlClient, projectDir: string, projectId: string, vcsClient: Client, platforms: AppPlatform[]): Promise<Fingerprint>;
+export declare function getFingerprintInfoFromLocalProjectForPlatformsAsync(graphqlClient: ExpoGraphqlClient, projectDir: string, projectId: string, vcsClient: Client, platforms: AppPlatform[], { env }?: {
+    env?: Record<string, string>;
+}): Promise<Fingerprint>;
 export declare function appPlatformToPlatform(platform: AppPlatform): Platform;
 export declare function appPlatformToString(platform: AppPlatform): string;
 export declare function stringToAppPlatform(platform: string): AppPlatform;

package/build/fingerprint/utils.js

@@ -9,14 +9,14 @@ const FingerprintMutation_1 = require("../graphql/mutations/FingerprintMutation"
 const log_1 = tslib_1.__importDefault(require("../log"));
 const maybeUploadFingerprintAsync_1 = require("../project/maybeUploadFingerprintAsync");
 const workflow_1 = require("../project/workflow");
-async function getFingerprintInfoFromLocalProjectForPlatformsAsync(graphqlClient, projectDir, projectId, vcsClient, platforms) {
+async function getFingerprintInfoFromLocalProjectForPlatformsAsync(graphqlClient, projectDir, projectId, vcsClient, platforms, { env } = {}) {
     const workflows = await (0, workflow_1.resolveWorkflowPerPlatformAsync)(projectDir, vcsClient);
     const optionsFromWorkflow = getFingerprintOptionsFromWorkflow(platforms, workflows);
     const projectFingerprint = await (0, cli_1.createFingerprintAsync)(projectDir, {
         ...optionsFromWorkflow,
         platforms: platforms.map(appPlatformToString),
         debug: true,
-        env: undefined,
+        env,
     });
     if (!projectFingerprint) {
         throw new Error('Project fingerprints can only be computed for projects with SDK 52 or higher');