eas-cli 12.4.1 → 12.5.1

package/build/commands/update/republish.js

@@ -8,10 +8,11 @@ const queries_2 = require("../../channel/queries");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
 const pagination_1 = require("../../commandUtils/pagination");
+const BranchQuery_1 = require("../../graphql/queries/BranchQuery");
 const UpdateQuery_1 = require("../../graphql/queries/UpdateQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const prompts_1 = require("../../prompts");
-const getBranchNameFromChannelNameAsync_1 = require("../../update/getBranchNameFromChannelNameAsync");
+const getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync_1 = require("../../update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync");
 const queries_3 = require("../../update/queries");
 const republish_1 = require("../../update/republish");
 const utils_1 = require("../../update/utils");
@@ -47,13 +48,14 @@ class UpdateRepublish extends EasCommand_1.default {
             }
             log_1.default.withTick(`The republished update group will appear on the same platforms it was originally published on: ${platformsFromUpdates.join(', ')}`);
         }
-        const updateMessage = await getOrAskUpdateMessageAsync(updatesToPublish, flags);
         const arbitraryUpdate = updatesToPublish[0];
+        const targetBranch = await getOrAskTargetBranchAsync(graphqlClient, projectId, flags, arbitraryUpdate);
+        const updateMessage = await getOrAskUpdateMessageAsync(updatesToPublish, flags);
         await (0, republish_1.republishAsync)({
             graphqlClient,
             app: { exp, projectId },
             updatesToPublish,
-            targetBranch: { branchId: arbitraryUpdate.branchId, branchName: arbitraryUpdate.branchName },
+            targetBranch,
             updateMessage,
             codeSigningInfo,
             json: flags.json,
@@ -63,6 +65,8 @@ class UpdateRepublish extends EasCommand_1.default {
         const branchName = rawFlags.branch;
         const channelName = rawFlags.channel;
         const groupId = rawFlags.group;
+        const destinationChannelName = rawFlags['destination-channel'];
+        const destinationBranchName = rawFlags['destination-branch'];
         const nonInteractive = rawFlags['non-interactive'];
         const privateKeyPath = rawFlags['private-key-path'];
         if (nonInteractive && !groupId) {
@@ -72,6 +76,8 @@ class UpdateRepublish extends EasCommand_1.default {
         return {
             branchName,
             channelName,
+            destinationChannelName,
+            destinationBranchName,
             groupId,
             platform,
             updateMessage: rawFlags.message,
@@ -96,6 +102,14 @@ UpdateRepublish.flags = {
         description: 'Update group ID to republish',
         exclusive: ['branch', 'channel'],
     }),
+    'destination-channel': core_1.Flags.string({
+        description: 'Channel name to select a branch to republish to if republishing to a different branch',
+        exclusive: ['destination-branch'],
+    }),
+    'destination-branch': core_1.Flags.string({
+        description: 'Branch name to republish to if republishing to a different branch',
+        exclusive: ['destination-channel'],
+    }),
     message: core_1.Flags.string({
         char: 'm',
         description: 'Short message describing the republished update group',
@@ -118,6 +132,22 @@ UpdateRepublish.contextDefinition = {
     ..._a.ContextOptions.LoggedIn,
 };
 exports.default = UpdateRepublish;
+async function getOrAskTargetBranchAsync(graphqlClient, projectId, flags, arbitraryUpdate) {
+    // if branch name supplied, use that
+    if (flags.destinationBranchName) {
+        const branch = await BranchQuery_1.BranchQuery.getBranchByNameAsync(graphqlClient, {
+            appId: projectId,
+            name: flags.destinationBranchName,
+        });
+        return { branchId: branch.id, branchName: branch.name };
+    }
+    // if provided channel name but was non-interactive
+    if (flags.destinationChannelName) {
+        return await (0, getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync_1.getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync)(graphqlClient, projectId, flags.destinationChannelName);
+    }
+    // if neither provided, assume republish on same branch
+    return { branchId: arbitraryUpdate.branchId, branchName: arbitraryUpdate.branchName };
+}
 /** Retrieve the update group from either the update group id, or select from branch name. */
 async function getOrAskUpdatesAsync(graphqlClient, projectId, flags) {
     if (flags.groupId) {
@@ -213,7 +243,7 @@ async function askUpdatesFromBranchNameAsync(graphqlClient, { projectId, branchN
 }
 /** Ask the user which update needs to be republished by channel name, this requires interactive mode */
 async function askUpdatesFromChannelNameAsync(graphqlClient, { projectId, channelName, json, nonInteractive, }) {
-    const branchName = await (0, getBranchNameFromChannelNameAsync_1.getBranchNameFromChannelNameAsync)(graphqlClient, projectId, channelName);
+    const { branchName } = await (0, getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync_1.getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync)(graphqlClient, projectId, channelName);
     return await askUpdatesFromBranchNameAsync(graphqlClient, {
         projectId,
         branchName,

package/build/commands/worker/deploy.js

@@ -30,10 +30,8 @@ class WorkerDeploy extends EasCommand_1.default {
         }
         log_1.default.warn('EAS Worker Deployments are in beta and subject to breaking changes.');
         const { getDynamicPrivateProjectConfigAsync, loggedIn: { graphqlClient }, projectDir, } = await this.getContextAsync(_a, flags);
-        const [{ projectId }, projectDist] = await Promise.all([
-            getDynamicPrivateProjectConfigAsync(),
-            resolveExportedProjectAsync(flags, projectDir),
-        ]);
+        const projectDist = await resolveExportedProjectAsync(flags, projectDir);
+        const { projectId } = await getDynamicPrivateProjectConfigAsync();
         logExportedProjectInfo(projectDist);
         async function* emitWorkerTarballAsync(params) {
             yield ['assets.json', JSON.stringify(params.assetMap)];
@@ -76,6 +74,9 @@ class WorkerDeploy extends EasCommand_1.default {
             // TODO(@kitten): Batch and upload multiple files in parallel
             const uploadParams = [];
             const assetPath = projectDist.type === 'server' ? projectDist.clientPath : projectDist.path;
+            if (!assetPath) {
+                return;
+            }
             for await (const asset of WorkerAssets.listAssetMapFilesAsync(assetPath, assetMap)) {
                 const uploadURL = uploads[asset.normalizedPath];
                 if (uploadURL) {
@@ -197,7 +198,7 @@ class WorkerDeploy extends EasCommand_1.default {
                     deploymentIdentifier: deployResult.id,
                     url: (0, logs_1.getDeploymentUrlFromFullName)(deployResult.fullName),
                 },
-                aliases: [deploymentAlias].filter(Boolean),
+                aliases: [deploymentAlias],
                 production: deploymentProdAlias,
             }));
             return;
@@ -211,7 +212,7 @@ class WorkerDeploy extends EasCommand_1.default {
                 deploymentIdentifier: deployResult.id,
                 url: (0, logs_1.getDeploymentUrlFromFullName)(deployResult.fullName),
             },
-            aliases: [deploymentAlias].filter(Boolean),
+            aliases: [deploymentAlias],
             production: deploymentProdAlias,
         }));
         if (!deploymentProdAlias) {
@@ -273,24 +274,24 @@ async function resolveExportedProjectAsync(flags, projectDir) {
     const exportPath = path.join(projectDir, flags.exportDir);
     const serverPath = path.join(exportPath, 'server');
     const clientPath = path.join(exportPath, 'client');
-    const [hasServerPath, hasClientPath, exportStat] = await Promise.all([
-        isDirectory(serverPath),
-        isDirectory(clientPath),
+    const [exportDirStat, expoRoutesStat, hasClientDir] = await Promise.all([
         node_fs_1.default.promises.stat(exportPath).catch(() => null),
+        node_fs_1.default.promises.stat(path.join(serverPath, '_expo/routes.json')).catch(() => null),
+        isDirectory(clientPath),
     ]);
-    if (!exportStat?.isDirectory()) {
+    if (!exportDirStat?.isDirectory()) {
         throw new Error(`No "${flags.exportDir}/" folder found. Prepare your project for deployment with "npx expo export --platform web"`);
     }
-    if (hasServerPath && hasClientPath) {
+    if (expoRoutesStat?.isFile()) {
         return {
             type: 'server',
             path: exportPath,
-            modifiedAt: exportStat.mtime,
+            modifiedAt: exportDirStat.mtime,
             serverPath,
-            clientPath,
+            clientPath: hasClientDir ? clientPath : undefined,
         };
     }
-    return { type: 'static', path: exportPath, modifiedAt: exportStat.mtime };
+    return { type: 'static', path: exportPath, modifiedAt: exportDirStat.mtime };
 }
 function logExportedProjectInfo(project) {
     let modifiedAgo = '';

package/build/credentials/manager/Actions.d.ts

@@ -33,7 +33,8 @@ export declare enum AndroidActionType {
     SetUpGsaKeyForFcmV1 = 21,
     UpdateCredentialsJson = 22,
     SetUpBuildCredentialsFromCredentialsJson = 23,
-    SetUpBuildCredentials = 24
+    SetUpBuildCredentials = 24,
+    Exit = 25
 }
 export declare enum IosActionType {
     ManageCredentialsJson = 0,
@@ -56,5 +57,6 @@ export declare enum IosActionType {
     SetUpAscApiKeyForSubmissions = 17,
     UseExistingAscApiKeyForSubmissions = 18,
     CreateAscApiKeyForSubmissions = 19,
-    RemoveAscApiKey = 20
+    RemoveAscApiKey = 20,
+    Exit = 21
 }

package/build/credentials/manager/Actions.js

@@ -34,6 +34,7 @@ var AndroidActionType;
     AndroidActionType[AndroidActionType["UpdateCredentialsJson"] = 22] = "UpdateCredentialsJson";
     AndroidActionType[AndroidActionType["SetUpBuildCredentialsFromCredentialsJson"] = 23] = "SetUpBuildCredentialsFromCredentialsJson";
     AndroidActionType[AndroidActionType["SetUpBuildCredentials"] = 24] = "SetUpBuildCredentials";
+    AndroidActionType[AndroidActionType["Exit"] = 25] = "Exit";
 })(AndroidActionType || (exports.AndroidActionType = AndroidActionType = {}));
 var IosActionType;
 (function (IosActionType) {
@@ -58,4 +59,5 @@ var IosActionType;
     IosActionType[IosActionType["UseExistingAscApiKeyForSubmissions"] = 18] = "UseExistingAscApiKeyForSubmissions";
     IosActionType[IosActionType["CreateAscApiKeyForSubmissions"] = 19] = "CreateAscApiKeyForSubmissions";
     IosActionType[IosActionType["RemoveAscApiKey"] = 20] = "RemoveAscApiKey";
+    IosActionType[IosActionType["Exit"] = 21] = "Exit";
 })(IosActionType || (exports.IosActionType = IosActionType = {}));

package/build/credentials/manager/AndroidActions.js

@@ -28,6 +28,11 @@ exports.highLevelActions = [
         title: 'Go back',
         scope: Actions_1.Scope.Manager,
     },
+    {
+        value: Actions_1.AndroidActionType.Exit,
+        title: 'Exit',
+        scope: Actions_1.Scope.Manager,
+    },
 ];
 exports.credentialsJsonActions = [
     {

package/build/credentials/manager/IosActions.js

@@ -28,6 +28,11 @@ exports.highLevelActions = [
         title: 'Go back',
         scope: Actions_1.Scope.Manager,
     },
+    {
+        value: Actions_1.IosActionType.Exit,
+        title: 'Exit',
+        scope: Actions_1.Scope.Manager,
+    },
 ];
 exports.credentialsJsonActions = [
     {

package/build/credentials/manager/ManageAndroid.js

@@ -128,6 +128,9 @@ class ManageAndroid {
                         await this.callingAction.runAsync(ctx);
                         return;
                     }
+                    else if (chosenAction === Actions_1.AndroidActionType.Exit) {
+                        return;
+                    }
                 }
                 await this.runProjectSpecificActionAsync(ctx, chosenAction, gradleContext);
             }

package/build/credentials/manager/ManageIos.js

@@ -133,6 +133,9 @@ class ManageIos {
                         await this.callingAction.runAsync(ctx);
                         return;
                     }
+                    else if (chosenAction === Actions_1.IosActionType.Exit) {
+                        return;
+                    }
                 }
                 else if (actionInfo.scope === Actions_1.Scope.Project) {
                     (0, assert_1.default)(ctx.hasProjectContext, 'You must be in your project directory in order to perform this action');