eas-cli 12.5.0 → 12.5.1

package/build/graphql/generated.d.ts

@@ -3030,6 +3030,11 @@ export type DeleteWebhookResult = {
     __typename?: 'DeleteWebhookResult';
     id: Scalars['ID']['output'];
 };
+export type DeleteWorkerDeploymentResult = {
+    __typename?: 'DeleteWorkerDeploymentResult';
+    deploymentIdentifier: Scalars['WorkerDeploymentIdentifier']['output'];
+    id: Scalars['ID']['output'];
+};
 export type DeployServerlessFunctionResult = {
     __typename?: 'DeployServerlessFunctionResult';
     url: Scalars['String']['output'];
@@ -3145,6 +3150,7 @@ export type DeploymentsMutation = {
     /** Create a signed deployment URL */
     createSignedDeploymentUrl: DeploymentSignedUrlResult;
     deleteAlias: DeleteAliasResult;
+    deleteWorkerDeployment: DeleteWorkerDeploymentResult;
 };
 export type DeploymentsMutationAssignAliasArgs = {
     aliasName?: InputMaybe<Scalars['WorkerDeploymentIdentifier']['input']>;
@@ -3159,6 +3165,9 @@ export type DeploymentsMutationDeleteAliasArgs = {
     aliasName?: InputMaybe<Scalars['WorkerDeploymentIdentifier']['input']>;
     appId: Scalars['ID']['input'];
 };
+export type DeploymentsMutationDeleteWorkerDeploymentArgs = {
+    workerDeploymentId: Scalars['ID']['input'];
+};
 export type DiscordUser = {
     __typename?: 'DiscordUser';
     discordIdentifier: Scalars['String']['output'];
@@ -11033,7 +11042,7 @@ export type CreateAndroidSubmissionMutation = {
                 id: string;
                 status: SubmissionStatus;
                 platform: AppPlatform;
-                logsUrl?: string | null;
+                logFiles: Array<string>;
                 app: {
                     __typename?: 'App';
                     id: string;
@@ -11083,7 +11092,7 @@ export type CreateIosSubmissionMutation = {
                 id: string;
                 status: SubmissionStatus;
                 platform: AppPlatform;
-                logsUrl?: string | null;
+                logFiles: Array<string>;
                 app: {
                     __typename?: 'App';
                     id: string;
@@ -11657,7 +11666,7 @@ export type BuildsWithSubmissionsByIdQuery = {
                 id: string;
                 status: SubmissionStatus;
                 platform: AppPlatform;
-                logsUrl?: string | null;
+                logFiles: Array<string>;
                 app: {
                     __typename?: 'App';
                     id: string;
@@ -12241,7 +12250,7 @@ export type SubmissionsByIdQuery = {
             id: string;
             status: SubmissionStatus;
             platform: AppPlatform;
-            logsUrl?: string | null;
+            logFiles: Array<string>;
             app: {
                 __typename?: 'App';
                 id: string;
@@ -12292,7 +12301,7 @@ export type GetAllSubmissionsForAppQuery = {
                 id: string;
                 status: SubmissionStatus;
                 platform: AppPlatform;
-                logsUrl?: string | null;
+                logFiles: Array<string>;
                 app: {
                     __typename?: 'App';
                     id: string;
@@ -12892,7 +12901,7 @@ export type BuildWithSubmissionsFragment = {
         id: string;
         status: SubmissionStatus;
         platform: AppPlatform;
-        logsUrl?: string | null;
+        logFiles: Array<string>;
         app: {
             __typename?: 'App';
             id: string;
@@ -13006,7 +13015,7 @@ export type SubmissionFragment = {
     id: string;
     status: SubmissionStatus;
     platform: AppPlatform;
-    logsUrl?: string | null;
+    logFiles: Array<string>;
     app: {
         __typename?: 'App';
         id: string;

package/build/graphql/types/Submission.js

@@ -31,6 +31,6 @@ exports.SubmissionFragmentNode = (0, graphql_tag_1.default) `
       errorCode
       message
     }
-    logsUrl
+    logFiles
   }
 `;

package/build/project/publish.js

@@ -25,7 +25,7 @@ const PublishQuery_1 = require("../graphql/queries/PublishQuery");
 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 getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync_1 = require("../update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync");
 const utils_2 = require("../update/utils");
 const uploads_1 = require("../uploads");
 const expoCli_1 = require("../utils/expoCli");
@@ -383,7 +383,8 @@ async function getBranchNameForCommandAsync({ graphqlClient, projectId, channelN
         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);
+        const { branchName } = await (0, getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync_1.getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync)(graphqlClient, projectId, channelNameArg);
+        return branchName;
     }
     if (branchNameArg) {
         return branchNameArg;

package/build/submit/utils/logs.js

@@ -22,23 +22,22 @@ async function displayLogsAsync(submission, { verbose = false, moreSubmissions =
 }
 exports.displayLogsAsync = displayLogsAsync;
 async function downloadAndPrintSubmissionLogsAsync(submission) {
-    if (!submission.logsUrl) {
-        return;
-    }
-    const response = await (0, fetch_1.default)(submission.logsUrl);
-    const logs = parseLogs(await response.text());
-    log_1.default.addNewLineIfNone();
-    const prefix = chalk_1.default.blueBright('[logs] ');
-    for (const { level, msg } of logs) {
-        const msgWithPrefix = `${prefix}${msg}`;
-        if (level === 'error') {
-            log_1.default.error(msgWithPrefix);
-        }
-        else if (level === 'warn') {
-            log_1.default.warn(msgWithPrefix);
-        }
-        else {
-            log_1.default.log(msgWithPrefix);
+    for (const logFile of submission.logFiles) {
+        const response = await (0, fetch_1.default)(logFile);
+        const logs = parseLogs(await response.text());
+        log_1.default.addNewLineIfNone();
+        const prefix = chalk_1.default.blueBright('[logs] ');
+        for (const { level, msg } of logs) {
+            const msgWithPrefix = `${prefix}${msg}`;
+            if (level === 'error') {
+                log_1.default.error(msgWithPrefix);
+            }
+            else if (level === 'warn') {
+                log_1.default.warn(msgWithPrefix);
+            }
+            else {
+                log_1.default.log(msgWithPrefix);
+            }
         }
     }
 }

package/build/update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync.d.ts

@@ -0,0 +1,5 @@
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+export declare function getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync(graphqlClient: ExpoGraphqlClient, projectId: string, channelName: string): Promise<{
+    branchName: string;
+    branchId: string;
+}>;

package/build/update/{getBranchNameFromChannelNameAsync.js → getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync.js}

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBranchNameFromChannelNameAsync = void 0;
+exports.getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync = void 0;
 const queries_1 = require("../branch/queries");
 const errors_1 = require("../channel/errors");
 const queries_2 = require("../channel/queries");
 const ChannelQuery_1 = require("../graphql/queries/ChannelQuery");
-async function getBranchNameFromChannelNameAsync(graphqlClient, projectId, channelName) {
-    let branchName;
+async function getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync(graphqlClient, projectId, channelName) {
+    let branchInfo;
     try {
         const channel = await ChannelQuery_1.ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
             appId: projectId,
             channelName,
         });
         if (channel.updateBranches.length === 1) {
-            branchName = channel.updateBranches[0].name;
+            const branch = channel.updateBranches[0];
+            branchInfo = { branchId: branch.id, branchName: branch.name };
         }
         else if (channel.updateBranches.length === 0) {
             throw new Error("Channel has no branches associated with it. Run 'eas channel:edit' to map a branch");
@@ -38,8 +39,8 @@ async function getBranchNameFromChannelNameAsync(graphqlClient, projectId, chann
         if (!newChannel) {
             throw new Error(`Could not create channel with name ${channelName} on project with id ${projectId}`);
         }
-        branchName = channelName;
+        branchInfo = { branchId, branchName: channelName };
     }
-    return branchName;
+    return branchInfo;
 }
-exports.getBranchNameFromChannelNameAsync = getBranchNameFromChannelNameAsync;
+exports.getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync = getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync;

package/build/update/republish.js

@@ -26,7 +26,7 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
         update.branchId === arbitraryUpdate.branchId &&
         update.branchName === arbitraryUpdate.branchName &&
         update.runtimeVersion === arbitraryUpdate.runtimeVersion;
-    (0, assert_1.default)(updatesToPublish.every(isSameGroup), 'All updates must belong to the same update group');
+    (0, assert_1.default)(updatesToPublish.every(isSameGroup), 'All updates being republished must belong to the same update group');
     (0, assert_1.default)(updatesToPublish.every(u => u.isRollBackToEmbedded) ||
         updatesToPublish.every(u => !u.isRollBackToEmbedded), 'All updates must either be roll back to embedded updates or not');
     const { runtimeVersion } = arbitraryUpdate;
@@ -44,7 +44,7 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
                 throw new Error('Republished updates must use the same code signing key and algorithm as original update');
             }
         }
-        log_1.default.withTick(`The republished update group will be signed`);
+        log_1.default.withTick(`The republished update group will be signed with the same code signing key and algorithm as the original update`);
     }
     const publishIndicator = (0, ora_1.ora)('Republishing...').start();
     let updatesRepublished;

package/build/utils/prompts.js

@@ -10,9 +10,9 @@ async function promptVariableEnvironmentAsync(nonInteractive) {
         throw new Error('The `--environment` flag must be set when running in `--non-interactive` mode.');
     }
     return await (0, prompts_1.selectAsync)('Select environment:', [
-        { title: 'Development', value: generated_1.EnvironmentVariableEnvironment.Development },
-        { title: 'Preview', value: generated_1.EnvironmentVariableEnvironment.Preview },
-        { title: 'Production', value: generated_1.EnvironmentVariableEnvironment.Production },
+        { title: 'development', value: generated_1.EnvironmentVariableEnvironment.Development },
+        { title: 'preview', value: generated_1.EnvironmentVariableEnvironment.Preview },
+        { title: 'production', value: generated_1.EnvironmentVariableEnvironment.Production },
     ]);
 }
 exports.promptVariableEnvironmentAsync = promptVariableEnvironmentAsync;

package/build/worker/assets.d.ts

@@ -10,7 +10,7 @@ interface AssetMapOptions {
 /** Mapping of normalized file paths to a SHA512 hash */
 export type AssetMap = Record<string, string>;
 /** Creates an asset map of a given target path */
-declare function createAssetMapAsync(assetPath: string, options?: AssetMapOptions): Promise<AssetMap>;
+declare function createAssetMapAsync(assetPath?: string, options?: AssetMapOptions): Promise<AssetMap>;
 export interface Manifest {
     env: Record<string, string | undefined>;
 }

package/build/worker/assets.js

@@ -65,8 +65,10 @@ function listFilesRecursively(basePath) {
 /** Creates an asset map of a given target path */
 async function createAssetMapAsync(assetPath, options) {
     const map = Object.create(null);
-    for await (const file of listFilesRecursively(assetPath)) {
-        map[file.normalizedPath] = await computeSha512HashAsync(file.path, options?.hashOptions);
+    if (assetPath) {
+        for await (const file of listFilesRecursively(assetPath)) {
+            map[file.normalizedPath] = await computeSha512HashAsync(file.path, options?.hashOptions);
+        }
     }
     return map;
 }

package/build/worker/deployment.d.ts

@@ -10,6 +10,16 @@ export declare function getSignedDeploymentUrlAsync(graphqlClient: ExpoGraphqlCl
     /** If the terminal is running in non interactive mode or not */
     nonInteractive?: boolean;
 }): Promise<string>;
+/**
+ * Assign a dev domain name to a project.
+ *   - When running in interactive mode, it will prompt the user with a suggested domain name.
+ *   - When running in non interactive mode, it will auto-assign the suggested domain name.
+ */
+export declare function assignDevDomainNameAsync({ graphqlClient, appId, nonInteractive, }: {
+    graphqlClient: ExpoGraphqlClient;
+    appId: string;
+    nonInteractive?: boolean;
+}): ReturnType<typeof DeploymentsMutation.assignDevDomainNameAsync>;
 export declare function assignWorkerDeploymentAliasAsync({ graphqlClient, appId, deploymentId, aliasName, }: {
     graphqlClient: ExpoGraphqlClient;
     appId: string;

package/build/worker/deployment.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectWorkerDeploymentOnAppAsync = exports.assignWorkerDeploymentProductionAsync = exports.assignWorkerDeploymentAliasAsync = exports.getSignedDeploymentUrlAsync = void 0;
+exports.selectWorkerDeploymentOnAppAsync = exports.assignWorkerDeploymentProductionAsync = exports.assignWorkerDeploymentAliasAsync = exports.assignDevDomainNameAsync = exports.getSignedDeploymentUrlAsync = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const mutations_1 = require("./mutations");
@@ -19,23 +19,20 @@ async function getSignedDeploymentUrlAsync(graphqlClient, options) {
     }
     catch (error) {
         const isMissingDevDomain = error?.graphQLErrors?.some(e => ['APP_NO_DEV_DOMAIN_NAME'].includes(e?.extensions?.errorCode));
+        // Throw unexpected errors eagerly
         if (!isMissingDevDomain) {
             throw error;
         }
-        if (options.nonInteractive) {
-            throw new Error('The project URL needs to be set up, but the terminal is running in non-interactive mode.');
-        }
-        const suggestedDevDomainName = await queries_1.DeploymentsQuery.getSuggestedDevDomainByAppIdAsync(graphqlClient, { appId: options.appId });
+        // Ensure the callback is invoked, containing cleanup logic for possible spinners
         options.onSetupDevDomain?.();
-        await chooseDevDomainNameAsync({
+        // Assign the dev domain name by prompting the user
+        await assignDevDomainNameAsync({
             graphqlClient,
             appId: options.appId,
-            initial: suggestedDevDomainName,
-        });
-        return await mutations_1.DeploymentsMutation.createSignedDeploymentUrlAsync(graphqlClient, {
-            appId: options.appId,
-            deploymentIdentifier: options.deploymentIdentifier,
+            nonInteractive: options.nonInteractive,
         });
+        // Retry creating the signed URL
+        return await getSignedDeploymentUrlAsync(graphqlClient, options);
     }
 }
 exports.getSignedDeploymentUrlAsync = getSignedDeploymentUrlAsync;
@@ -55,14 +52,14 @@ function formatDevDomainName(name = '') {
         .replace(DEV_DOMAIN_INVALID_MULTIPLE_HYPHENS, '-')
         .trim();
 }
-async function chooseDevDomainNameAsync({ graphqlClient, appId, initial, }) {
+async function promptDevDomainNameAsync(initialDevDomain) {
     const rootDomain = `.${logs_1.EXPO_BASE_DOMAIN}.app`;
     const memoizedFormatDevDomainName = (0, memoize_1.memoize)(formatDevDomainName);
     const { name } = await (0, prompts_1.promptAsync)({
         type: 'text',
         name: 'name',
         message: 'Choose a preview URL for your project:',
-        initial,
+        initial: initialDevDomain,
         validate: (value) => {
             if (!value) {
                 return 'You have to choose a preview URL for your project';
@@ -95,29 +92,43 @@ async function chooseDevDomainNameAsync({ graphqlClient, appId, initial, }) {
             }
         },
     });
+    // This should never happen due to the validation, if it does its an error
     if (!name) {
         throw new Error('No preview URL provided, aborting deployment.');
     }
+    return name;
+}
+/**
+ * Assign a dev domain name to a project.
+ *   - When running in interactive mode, it will prompt the user with a suggested domain name.
+ *   - When running in non interactive mode, it will auto-assign the suggested domain name.
+ */
+async function assignDevDomainNameAsync({ graphqlClient, appId, nonInteractive, }) {
+    let devDomainName = await queries_1.DeploymentsQuery.getSuggestedDevDomainByAppIdAsync(graphqlClient, {
+        appId,
+    });
+    if (!nonInteractive) {
+        devDomainName = await promptDevDomainNameAsync(devDomainName);
+    }
     try {
-        const success = await mutations_1.DeploymentsMutation.assignDevDomainNameAsync(graphqlClient, {
+        return await mutations_1.DeploymentsMutation.assignDevDomainNameAsync(graphqlClient, {
             appId,
-            name,
+            name: devDomainName,
         });
-        if (!success) {
-            throw new Error('Failed to assign preview URL');
-        }
     }
     catch (error) {
         const isChosenNameTaken = error?.graphQLErrors?.some(e => ['DEV_DOMAIN_NAME_TAKEN'].includes(e?.extensions?.errorCode));
-        if (isChosenNameTaken) {
-            log_1.default.error(`The preview URL "${name}" is already taken, choose a different URL.`);
-            await chooseDevDomainNameAsync({ graphqlClient, appId, initial });
-        }
+        // Throw unexpected errors eagerly
         if (!isChosenNameTaken) {
             throw error;
         }
+        if (!nonInteractive) {
+            log_1.default.error(`The preview URL "${devDomainName}" is already taken, choose a different URL.`);
+        }
+        return await assignDevDomainNameAsync({ graphqlClient, appId, nonInteractive });
     }
 }
+exports.assignDevDomainNameAsync = assignDevDomainNameAsync;
 async function assignWorkerDeploymentAliasAsync({ graphqlClient, appId, deploymentId, aliasName, }) {
     return await mutations_1.DeploymentsMutation.assignAliasAsync(graphqlClient, {
         appId,

package/build/worker/upload.js

@@ -126,16 +126,14 @@ async function* batchUploadAsync(uploads) {
             }
             yield await Promise.race(queue);
         }
+        if (queue.size > 0) {
+            controller.abort();
+        }
     }
     catch (error) {
-        if (typeof error !== 'object' || error.name !== 'AbortError') {
+        if (error.name !== 'AbortError') {
             throw error;
         }
     }
-    finally {
-        if (queue.size > 0) {
-            controller.abort();
-        }
-    }
 }
 exports.batchUploadAsync = batchUploadAsync;

package/build/worker/utils/logs.d.ts

@@ -8,7 +8,7 @@ type WorkerDeploymentData = {
     /** The actual deployment information */
     deployment: Pick<WorkerDeploymentFragment, 'deploymentIdentifier' | 'url'>;
     /** All modified aliases of the deployment, if any */
-    aliases?: WorkerDeploymentAliasFragment[];
+    aliases?: (WorkerDeploymentAliasFragment | null)[];
     /** The production promoting alias of the deployment, if any */
     production?: WorkerDeploymentAliasFragment | null;
 };
@@ -16,19 +16,20 @@ export declare function formatWorkerDeploymentTable(data: WorkerDeploymentData):
 type WorkerDeploymentOutput = {
     /** The absolute URL to the dashboard on `expo.dev` */
     dashboardUrl: string;
-    /** The deployment information */
-    deployment: {
-        identifier: string;
+    /** The deployment identifier */
+    identifier: string;
+    /** The deployment URL */
+    url: string;
+    /** Custom aliases, if assigned */
+    aliases?: {
+        id: string;
+        url: string;
+        name: string;
+    }[];
+    /** The production alias, if assigned */
+    production?: {
+        id: string;
         url: string;
-        aliases?: {
-            id: string;
-            name: string;
-            url: string;
-        }[];
-        production?: {
-            id: string;
-            url: string;
-        };
     };
 };
 export declare function formatWorkerDeploymentJson(data: WorkerDeploymentData): WorkerDeploymentOutput;

package/build/worker/utils/logs.js

@@ -19,7 +19,10 @@ function formatWorkerDeploymentTable(data) {
         { label: 'Deployment URL', value: data.deployment.url },
     ];
     if (data.aliases?.length) {
-        fields.push({ label: 'Alias URL', value: data.aliases[0].url });
+        const alias = data.aliases.filter(Boolean)[0];
+        if (alias) {
+            fields.push({ label: 'Alias URL', value: alias.url });
+        }
     }
     if (data.production) {
         fields.push({ label: 'Production URL', value: data.production.url });
@@ -30,25 +33,22 @@ function formatWorkerDeploymentTable(data) {
 }
 exports.formatWorkerDeploymentTable = formatWorkerDeploymentTable;
 function formatWorkerDeploymentJson(data) {
+    const aliases = !data.aliases
+        ? []
+        : data.aliases.filter(Boolean);
     return {
         dashboardUrl: getDashboardUrl(data.projectId),
-        deployment: {
-            identifier: data.deployment.deploymentIdentifier,
-            url: data.deployment.url,
-            aliases: !data.aliases?.length
-                ? undefined
-                : data.aliases.map(alias => ({
-                    id: alias.id,
-                    name: alias.aliasName,
-                    url: alias.url,
-                })),
-            production: !data.production
-                ? undefined
-                : {
-                    id: data.production.id,
-                    url: data.production.url,
-                },
-        },
+        identifier: data.deployment.deploymentIdentifier,
+        url: data.deployment.url,
+        aliases: !aliases.length
+            ? undefined
+            : aliases.map(alias => ({ id: alias.id, url: alias.url, name: alias.aliasName })),
+        production: !data.production
+            ? undefined
+            : {
+                id: data.production.id,
+                url: data.production.url,
+            },
     };
 }
 exports.formatWorkerDeploymentJson = formatWorkerDeploymentJson;