eas-cli 3.5.2 → 3.6.1

package/build/project/android/applicationId.js

@@ -17,7 +17,7 @@ const prompts_1 = require("../../prompts");
 const workflow_1 = require("../workflow");
 const gradleUtils = tslib_1.__importStar(require("./gradleUtils"));
 exports.INVALID_APPLICATION_ID_MESSAGE = `Invalid format of Android applicationId. Only alphanumeric characters, '.' and '_' are allowed, and each '.' must be followed by a letter.`;
-async function ensureApplicationIdIsDefinedForManagedProjectAsync(projectDir, exp, actor) {
+async function ensureApplicationIdIsDefinedForManagedProjectAsync({ graphqlClient, projectDir, projectId, exp, }) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
     (0, assert_1.default)(workflow === eas_build_job_1.Workflow.MANAGED, 'This function should be called only for managed projects');
     try {
@@ -26,7 +26,7 @@ async function ensureApplicationIdIsDefinedForManagedProjectAsync(projectDir, ex
         });
     }
     catch {
-        return await configureApplicationIdAsync(projectDir, exp, actor);
+        return await configureApplicationIdAsync({ graphqlClient, projectDir, projectId, exp });
     }
 }
 exports.ensureApplicationIdIsDefinedForManagedProjectAsync = ensureApplicationIdIsDefinedForManagedProjectAsync;
@@ -85,7 +85,7 @@ async function getApplicationIdAsync(projectDir, exp, gradleContext) {
     }
 }
 exports.getApplicationIdAsync = getApplicationIdAsync;
-async function configureApplicationIdAsync(projectDir, exp, actor) {
+async function configureApplicationIdAsync({ graphqlClient, projectDir, projectId, exp, }) {
     var _a;
     const paths = (0, config_1.getConfigFilePaths)(projectDir);
     // we can't automatically update app.config.js
@@ -95,7 +95,7 @@ async function configureApplicationIdAsync(projectDir, exp, actor) {
     (0, assert_1.default)(paths.staticConfigPath, 'app.json must exist');
     log_1.default.addNewLineIfNone();
     log_1.default.log(`${chalk_1.default.bold(`📝  Android application id`)} ${chalk_1.default.dim((0, log_1.learnMore)('https://expo.fyi/android-package'))}`);
-    const suggestedAndroidApplicationId = await getSuggestedApplicationIdAsync(exp, actor);
+    const suggestedAndroidApplicationId = await getSuggestedApplicationIdAsync(graphqlClient, exp, projectId);
     const { packageName } = await (0, prompts_1.promptAsync)({
         name: 'packageName',
         type: 'text',
@@ -125,7 +125,7 @@ function warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir
     }
 }
 exports.warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject = warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject;
-async function getSuggestedApplicationIdAsync(exp, actor) {
+async function getSuggestedApplicationIdAsync(graphqlClient, exp, projectId) {
     // Attempt to use the ios bundle id first since it's convenient to have them aligned.
     const maybeBundleId = config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifier(exp);
     if (maybeBundleId && isApplicationIdValid(maybeBundleId)) {
@@ -133,9 +133,9 @@ async function getSuggestedApplicationIdAsync(exp, actor) {
     }
     else {
         // the only callsite is heavily interactive
-        const username = (0, projectUtils_1.getUsername)(exp, actor);
+        const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
         // It's common to use dashes in your node project name, strip them from the suggested package name.
-        const possibleId = `com.${username}.${exp.slug}`.split('-').join('');
+        const possibleId = `com.${account.name}.${exp.slug}`.split('-').join('');
         if (isApplicationIdValid(possibleId)) {
             return possibleId;
         }

package/build/project/applicationIdentifier.d.ts

@@ -1,5 +1,12 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
-import { Actor } from '../user/User';
-export declare function getApplicationIdentifierAsync(projectDir: string, exp: ExpoConfig, buildProfile: BuildProfile, platform: Platform, actor: Actor): Promise<string>;
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+export declare function getApplicationIdentifierAsync({ graphqlClient, projectDir, projectId, exp, buildProfile, platform, }: {
+    graphqlClient: ExpoGraphqlClient;
+    projectDir: string;
+    projectId: string;
+    exp: ExpoConfig;
+    buildProfile: BuildProfile;
+    platform: Platform;
+}): Promise<string>;

package/build/project/applicationIdentifier.js

@@ -8,12 +8,17 @@ const bundleIdentifier_1 = require("./ios/bundleIdentifier");
 const scheme_1 = require("./ios/scheme");
 const target_1 = require("./ios/target");
 const workflow_1 = require("./workflow");
-async function getApplicationIdentifierAsync(projectDir, exp, buildProfile, platform, actor) {
+async function getApplicationIdentifierAsync({ graphqlClient, projectDir, projectId, exp, buildProfile, platform, }) {
     if (platform === eas_build_job_1.Platform.ANDROID) {
         const profile = buildProfile;
         const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
         if (workflow === eas_build_job_1.Workflow.MANAGED) {
-            return await (0, applicationId_1.ensureApplicationIdIsDefinedForManagedProjectAsync)(projectDir, exp, actor);
+            return await (0, applicationId_1.ensureApplicationIdIsDefinedForManagedProjectAsync)({
+                graphqlClient,
+                projectDir,
+                projectId,
+                exp,
+            });
         }
         const gradleContext = await (0, gradle_1.resolveGradleBuildContextAsync)(projectDir, profile);
         return await (0, applicationId_1.getApplicationIdAsync)(projectDir, exp, gradleContext);
@@ -22,7 +27,12 @@ async function getApplicationIdentifierAsync(projectDir, exp, buildProfile, plat
         const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
         const profile = buildProfile;
         if (workflow === eas_build_job_1.Workflow.MANAGED) {
-            return await (0, bundleIdentifier_1.ensureBundleIdentifierIsDefinedForManagedProjectAsync)(projectDir, exp, actor);
+            return await (0, bundleIdentifier_1.ensureBundleIdentifierIsDefinedForManagedProjectAsync)({
+                graphqlClient,
+                projectDir,
+                projectId,
+                exp,
+            });
         }
         const xcodeBuildContext = await (0, scheme_1.resolveXcodeBuildContextAsync)({ exp, projectDir, nonInteractive: false }, profile);
         const targets = await (0, target_1.resolveTargetsAsync)({

package/build/project/ios/bundleIdentifier.d.ts

@@ -1,7 +1,12 @@
 import { ExpoConfig } from '@expo/config';
-import { Actor } from '../../user/User';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 export declare const INVALID_BUNDLE_IDENTIFIER_MESSAGE = "Invalid format of iOS bundle identifier. Only alphanumeric characters, '.' and '-' are allowed, and each '.' must be followed by a letter.";
-export declare function ensureBundleIdentifierIsDefinedForManagedProjectAsync(projectDir: string, exp: ExpoConfig, actor: Actor): Promise<string>;
+export declare function ensureBundleIdentifierIsDefinedForManagedProjectAsync({ graphqlClient, projectDir, projectId, exp, }: {
+    graphqlClient: ExpoGraphqlClient;
+    projectDir: string;
+    projectId: string;
+    exp: ExpoConfig;
+}): Promise<string>;
 export declare class AmbiguousBundleIdentifierError extends Error {
     constructor(message?: string);
 }

package/build/project/ios/bundleIdentifier.js

@@ -14,14 +14,19 @@ const prompts_1 = require("../../prompts");
 const projectUtils_1 = require("../projectUtils");
 const workflow_1 = require("../workflow");
 exports.INVALID_BUNDLE_IDENTIFIER_MESSAGE = `Invalid format of iOS bundle identifier. Only alphanumeric characters, '.' and '-' are allowed, and each '.' must be followed by a letter.`;
-async function ensureBundleIdentifierIsDefinedForManagedProjectAsync(projectDir, exp, actor) {
+async function ensureBundleIdentifierIsDefinedForManagedProjectAsync({ graphqlClient, projectDir, projectId, exp, }) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
     (0, assert_1.default)(workflow === eas_build_job_1.Workflow.MANAGED, 'This function should be called only for managed projects');
     try {
         return await getBundleIdentifierAsync(projectDir, exp);
     }
     catch {
-        return await configureBundleIdentifierAsync(projectDir, exp, actor);
+        return await configureBundleIdentifierAsync({
+            graphqlClient,
+            projectDir,
+            exp,
+            projectId,
+        });
     }
 }
 exports.ensureBundleIdentifierIsDefinedForManagedProjectAsync = ensureBundleIdentifierIsDefinedForManagedProjectAsync;
@@ -69,7 +74,7 @@ async function getBundleIdentifierAsync(projectDir, exp, xcodeContext) {
     }
 }
 exports.getBundleIdentifierAsync = getBundleIdentifierAsync;
-async function configureBundleIdentifierAsync(projectDir, exp, actor) {
+async function configureBundleIdentifierAsync({ graphqlClient, projectDir, projectId, exp, }) {
     var _a;
     const paths = (0, config_1.getConfigFilePaths)(projectDir);
     // we can't automatically update app.config.js
@@ -79,7 +84,7 @@ async function configureBundleIdentifierAsync(projectDir, exp, actor) {
     (0, assert_1.default)(paths.staticConfigPath, 'app.json must exist');
     log_1.default.addNewLineIfNone();
     log_1.default.log(`${chalk_1.default.bold(`📝  iOS Bundle Identifier`)} ${chalk_1.default.dim((0, log_1.learnMore)('https://expo.fyi/bundle-identifier'))}`);
-    const suggestedBundleIdentifier = await getSuggestedBundleIdentifierAsync(exp, actor);
+    const suggestedBundleIdentifier = await getSuggestedBundleIdentifierAsync(graphqlClient, exp, projectId);
     const { bundleIdentifier } = await (0, prompts_1.promptAsync)({
         name: 'bundleIdentifier',
         type: 'text',
@@ -114,7 +119,7 @@ function isWildcardBundleIdentifier(bundleIdentifier) {
     return wildcardRegex.test(bundleIdentifier);
 }
 exports.isWildcardBundleIdentifier = isWildcardBundleIdentifier;
-async function getSuggestedBundleIdentifierAsync(exp, actor) {
+async function getSuggestedBundleIdentifierAsync(graphqlClient, exp, projectId) {
     // Attempt to use the android package name first since it's convenient to have them aligned.
     const maybeAndroidPackage = config_plugins_1.AndroidConfig.Package.getPackage(exp);
     if (maybeAndroidPackage && isBundleIdentifierValid(maybeAndroidPackage)) {
@@ -122,9 +127,9 @@ async function getSuggestedBundleIdentifierAsync(exp, actor) {
     }
     else {
         // the only callsite is heavily interactive
-        const username = (0, projectUtils_1.getUsername)(exp, actor);
+        const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
         // It's common to use dashes in your node project name, strip them from the suggested package name.
-        const possibleId = `com.${username}.${exp.slug}`.split('-').join('');
+        const possibleId = `com.${account.name}.${exp.slug}`.split('-').join('');
         if (isBundleIdentifierValid(possibleId)) {
             return possibleId;
         }

package/build/submit/ArchiveSource.js

@@ -190,22 +190,31 @@ async function handleBuildListSourceAsync(ctx) {
     }
 }
 function formatBuildChoice(build, expiryDate) {
-    const { id, updatedAt, runtimeVersion, buildProfile, gitCommitHash, gitCommitMessage, channel } = build;
-    const formatValue = (field) => (field ? chalk_1.default.bold(field) : 'Unknown');
+    const { id, updatedAt, runtimeVersion, buildProfile, gitCommitHash, gitCommitMessage, channel, message, } = build;
     const buildDate = new Date(updatedAt);
-    const formattedCommitData = gitCommitHash && gitCommitMessage
-        ? `${gitCommitHash.slice(0, 7)} "${chalk_1.default.bold(gitCommitMessage)}"`
-        : 'Unknown';
+    const splitCommitMessage = gitCommitMessage === null || gitCommitMessage === void 0 ? void 0 : gitCommitMessage.split('\n');
+    const formattedCommitData = gitCommitHash && splitCommitMessage && splitCommitMessage.length > 0
+        ? `${gitCommitHash.slice(0, 7)} "${chalk_1.default.bold(splitCommitMessage[0] + (splitCommitMessage.length > 1 ? '…' : ''))}"`
+        : null;
     const title = `${chalk_1.default.bold(`ID:`)} ${id} (${chalk_1.default.bold(`${(0, date_1.fromNow)(buildDate)} ago`)})`;
-    const description = [
-        `\t${chalk_1.default.bold(`Profile:`)} ${formatValue(buildProfile)}`,
-        `\t${chalk_1.default.bold(`Channel:`)} ${formatValue(channel)}`,
-        `\t${chalk_1.default.bold(`Runtime version:`)} ${formatValue(runtimeVersion)}`,
-        `\t${chalk_1.default.bold(`Commit:`)} ${formattedCommitData}`,
-    ].join('\n');
+    const descriptionItems = [
+        { name: 'Profile', value: buildProfile ? chalk_1.default.bold(buildProfile) : null },
+        { name: 'Channel', value: channel ? chalk_1.default.bold(channel) : null },
+        { name: 'Runtime version', value: runtimeVersion ? chalk_1.default.bold(runtimeVersion) : null },
+        { name: 'Commit', value: formattedCommitData },
+        {
+            name: 'Message',
+            value: message
+                ? chalk_1.default.bold(message.length > 200 ? `${message.slice(0, 200)}...` : message)
+                : null,
+        },
+    ];
+    const filteredDescriptionArray = descriptionItems
+        .filter(item => item.value)
+        .map(item => `${chalk_1.default.bold(item.name)}: ${item.value}`);
     return {
         title,
-        description,
+        description: filteredDescriptionArray.length > 0 ? filteredDescriptionArray.join('\n') : '',
         value: build,
         disabled: buildDate < expiryDate,
     };

package/build/update/configure.d.ts

@@ -2,7 +2,7 @@ import { ExpoConfig } from '@expo/config-types';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { RequestedPlatform } from '../platform';
 export declare const DEFAULT_MANAGED_RUNTIME_VERSION: {
-    readonly policy: "appVersion";
+    readonly policy: "sdkVersion";
 };
 export declare const DEFAULT_BARE_RUNTIME_VERSION: "1.0.0";
 /**

package/build/update/configure.js

@@ -15,7 +15,7 @@ const projectUtils_1 = require("../project/projectUtils");
 const workflow_1 = require("../project/workflow");
 const UpdatesModule_1 = require("./android/UpdatesModule");
 const UpdatesModule_2 = require("./ios/UpdatesModule");
-exports.DEFAULT_MANAGED_RUNTIME_VERSION = { policy: 'appVersion' };
+exports.DEFAULT_MANAGED_RUNTIME_VERSION = { policy: 'sdkVersion' };
 exports.DEFAULT_BARE_RUNTIME_VERSION = '1.0.0';
 function getDefaultRuntimeVersion(workflow) {
     return workflow === eas_build_job_1.Workflow.GENERIC

package/build/user/User.d.ts

@@ -5,4 +5,5 @@ export type Actor = NonNullable<CurrentUserQuery['meActor']>;
  * This should be used whenever the "current user" needs to be displayed.
  * The display name CANNOT be used as project owner.
  */
-export declare function getActorDisplayName(user?: Actor): string;
+export declare function getActorDisplayName(actor?: Actor): string;
+export declare function getActorUsername(actor?: Actor): string | null;

package/build/user/User.js

@@ -1,21 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getActorDisplayName = void 0;
+exports.getActorUsername = exports.getActorDisplayName = void 0;
 /**
  * Resolve the name of the actor, either normal user or robot user.
  * This should be used whenever the "current user" needs to be displayed.
  * The display name CANNOT be used as project owner.
  */
-function getActorDisplayName(user) {
-    switch (user === null || user === void 0 ? void 0 : user.__typename) {
+function getActorDisplayName(actor) {
+    switch (actor === null || actor === void 0 ? void 0 : actor.__typename) {
         case 'User':
-            return user.username;
+            return actor.username;
         case 'Robot':
-            return user.firstName ? `${user.firstName} (robot)` : 'robot';
+            return actor.firstName ? `${actor.firstName} (robot)` : 'robot';
         case 'SSOUser':
-            return user.username ? `${user.username} (sso user)` : 'sso user';
+            return actor.username ? `${actor.username} (sso user)` : 'sso user';
         default:
             return 'anonymous';
     }
 }
 exports.getActorDisplayName = getActorDisplayName;
+function getActorUsername(actor) {
+    switch (actor === null || actor === void 0 ? void 0 : actor.__typename) {
+        case 'User':
+        case 'SSOUser':
+            return actor.username;
+        default:
+            return null;
+    }
+}
+exports.getActorUsername = getActorUsername;