v0.44.1

* upgrade oclif deps

* update CHANGELOG.md

CHANGELOG.md

@@ -8,6 +8,37 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+### 🐛 Bug fixes
+
+- Fix build:configure expo-updates configuration to only run on generic projects. ([#904](https://github.com/expo/eas-cli/pull/904) by [@brentvatne](https://github.com/brentvatne))
+
+### 🧹 Chores
+
+- Upgrade `node-forge` to 1.0.0. ([#902](https://github.com/expo/eas-cli/pull/902) by [@dependabot](https://github.com/apps/dependabot) + [@dsokal](https://github.com/dsokal))
+- Replace `@expo/plugin-autocomplete` with `@oclif/plugin-autocomplete`. Upgrade oclif deps. ([#903](https://github.com/expo/eas-cli/pull/903) by [@dsokal](https://github.com/dsokal))
+
+## [0.44.0](https://github.com/expo/eas-cli/releases/tag/v0.44.0) - 2022-01-11
+
+### 🛠 Breaking changes
+
+- No longer enable APNS (iOS Push Notifications) capability by default anymore. ([#797](https://github.com/expo/eas-cli/pull/797) by [@EvanBacon](https://github.com/EvanBacon))
+- Don't configure Android projects locally. Clean up old Gradle signing config. Streamline `expo-updates` configuration. ([#888](https://github.com/expo/eas-cli/pull/888) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Add `update:list` command. ([#884](https://github.com/expo/eas-cli/pull/884) by [@jkhales](https://github.com/jkhales))
+- Improve error message for outdated Apple PLA error. ([#889](https://github.com/expo/eas-cli/pull/889) by [@EvanBacon](https://github.com/EvanBacon))
+- Add `--output` flag to the build command. ([#885](https://github.com/expo/eas-cli/pull/885) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix creating project archive with symlink cycle. ([#891](https://github.com/expo/eas-cli/pull/891) by [@wkozyra95](https://github.com/wkozyra95))
+- Sign Android debug builds with the correct keystore. Previously, all debug builds would be signed with a default debug keystore. ([#888](https://github.com/expo/eas-cli/pull/888) by [@dsokal](https://github.com/dsokal))
+
+## [0.43.0](https://github.com/expo/eas-cli/releases/tag/v0.43.0) - 2022-01-03
+
+### 🎉 New features
+
 - Add `eas channel:delete`. ([#846](https://github.com/expo/eas-cli/pull/846), [#869](https://github.com/expo/eas-cli/pull/869) by [@jkhales](https://github.com/jkhales))
 - Add `eas autocomplete`. ([#870](https://github.com/expo/eas-cli/pull/870) by [@dsokal](https://github.com/dsokal))
 
@@ -15,8 +46,6 @@ This is the log of notable changes to EAS CLI and related packages.
 
 - Fix saving `build:inspect` results to project subdirectory. ([#863](https://github.com/expo/eas-cli/pull/863) by [@wkozyra95](https://github.com/wkozyra95))
 
-### 🧹 Chores
-
 ## [0.42.4](https://github.com/expo/eas-cli/releases/tag/v0.42.4) - 2021-12-21
 
 ### 🐛 Bug fixes

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.43.0"
+  "version": "0.44.1"
 }

package.json

@@ -26,7 +26,7 @@
     "jest": "27.1.0",
     "jest-watch-typeahead": "0.6.4",
     "lerna": "4.0.0",
-    "oclif": "2.0.1",
+    "oclif": "2.1.5",
     "prettier": "2.4.1",
     "ts-jest": "27.0.5",
     "typescript": "4.5.2"

packages/eas-cli/README.md

@@ -63,7 +63,7 @@ EXAMPLES
   $ eas autocomplete --refresh-cache
 ```
 
-_See code: [@expo/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.0.2/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.1.1/src/commands/autocomplete/index.ts)_
 
 ## `eas help [COMMAND]`
 

packages/eas-cli/package.json

@@ -1,29 +1,29 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "0.43.0",
+  "version": "0.44.1",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.26",
+    "@expo/apple-utils": "0.0.0-alpha.27",
     "@expo/config": "6.0.11",
     "@expo/config-plugins": "4.0.11",
     "@expo/eas-build-job": "0.2.61",
-    "@expo/eas-json": "0.43.0",
+    "@expo/eas-json": "0.44.0",
     "@expo/json-file": "8.2.34",
     "@expo/pkcs12": "0.0.6",
     "@expo/plist": "0.0.16",
-    "@expo/plugin-autocomplete": "1.0.2",
-    "@expo/plugin-warn-if-update-available": "2.0.1",
+    "@expo/plugin-warn-if-update-available": "2.0.4",
     "@expo/prebuild-config": "3.0.11",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.5.0",
     "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.0.10",
+    "@oclif/core": "1.1.2",
+    "@oclif/plugin-autocomplete": "1.1.1",
     "@oclif/plugin-help": "5.1.10",
     "@urql/core": "2.3.1",
     "@urql/exchange-retry": "0.3.0",
@@ -51,7 +51,7 @@
     "minimatch": "3.0.4",
     "nanoid": "3.1.25",
     "node-fetch": "2.6.1",
-    "node-forge": "0.10.0",
+    "node-forge": "1.0.0",
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
@@ -81,7 +81,7 @@
     "@types/getenv": "^1.0.0",
     "@types/mime": "2.0.3",
     "@types/node-fetch": "^2.5.7",
-    "@types/node-forge": "^0.9.5",
+    "@types/node-forge": "1.0.0",
     "@types/prompts": "^2.0.9",
     "@types/semver": "7.3.8",
     "@types/tar": "4.0.5",
@@ -116,9 +116,9 @@
     "bin": "eas",
     "commands": "./build/commands",
     "plugins": [
+      "@oclif/plugin-autocomplete",
       "@oclif/plugin-help",
-      "@expo/plugin-warn-if-update-available",
-      "@expo/plugin-autocomplete"
+      "@expo/plugin-warn-if-update-available"
     ],
     "topics": {
       "account": {

packages/eas-cli/src/build/android/UpdatesModule.ts

@@ -1,63 +1,29 @@
 import { ExpoConfig } from '@expo/config';
 import { AndroidConfig, AndroidManifest } from '@expo/config-plugins';
 
-import Log from '../../log';
 import { getProjectAccountName } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
 import { ensureValidVersions } from '../utils/updates';
 
-export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  ensureValidVersions(exp);
-  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-
-  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-  const androidManifest = await getAndroidManifestAsync(projectDir);
-
-  if (!AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
-    const result = AndroidConfig.Updates.setUpdatesConfig(exp, androidManifest, accountName);
-
-    await AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, result);
-  }
-}
-
 export async function syncUpdatesConfigurationAsync(
   projectDir: string,
   exp: ExpoConfig
 ): Promise<void> {
   ensureValidVersions(exp);
   const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-  try {
-    await ensureUpdatesConfiguredAsync(projectDir);
-  } catch (error) {
-    Log.error(
-      'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
-    );
-    throw error;
-  }
 
   const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-  let androidManifest = await getAndroidManifestAsync(projectDir);
-
-  if (!AndroidConfig.Updates.areVersionsSynced(exp, androidManifest)) {
-    androidManifest = AndroidConfig.Updates.setVersionsConfig(exp, androidManifest);
-    await AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, androidManifest);
-  }
-
-  if (!AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
-    Log.warn(
-      'Native project configuration is not synced with values present in your app.json, run "eas build:configure" to make sure all values are applied in the native project'
-    );
-  }
-}
-
-// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
-// all that is needed on Expo SDK 43+ to configure expo-updates configuration in AndroidManifest.xml
-async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {
   const androidManifest = await getAndroidManifestAsync(projectDir);
 
-  if (!AndroidConfig.Updates.isMainApplicationMetaDataSet(androidManifest)) {
-    throw new Error('Missing values in AndroidManifest.xml');
-  }
+  const updatedAndroidManifest = AndroidConfig.Updates.setUpdatesConfig(
+    exp,
+    androidManifest,
+    accountName
+  );
+  await AndroidConfig.Manifest.writeAndroidManifestAsync(
+    androidManifestPath,
+    updatedAndroidManifest
+  );
 }
 
 export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {

packages/eas-cli/src/build/android/build.ts

@@ -24,9 +24,9 @@ import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
 import { transformMetadata } from '../graphql';
 import { logCredentialsSource } from '../utils/credentials';
 import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
-import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
 
 export async function createAndroidContextAsync(
   ctx: CommonContext<Platform.ANDROID>
@@ -71,8 +71,8 @@ export async function prepareAndroidBuildAsync(
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.ANDROID>) => {
       return await ensureAndroidCredentialsAsync(ctx);
     },
-    ensureProjectConfiguredAsync: async () => {
-      await validateAndSyncProjectConfigurationAsync({
+    syncProjectConfigurationAsync: async () => {
+      await syncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         buildProfile: ctx.buildProfile,

packages/eas-cli/src/build/android/syncProjectConfiguration.ts

@@ -2,39 +2,17 @@ import { ExpoConfig } from '@expo/config';
 import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { AndroidVersionAutoIncrement, BuildProfile } from '@expo/eas-json';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
 
 import Log from '../../log';
-import {
-  ensureApplicationIdIsDefinedForManagedProjectAsync,
-  warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject,
-} from '../../project/android/applicationId';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { getVcsClient } from '../../vcs';
-import { ConfigureContext } from '../context';
 import { isExpoUpdatesInstalled } from '../utils/updates';
-import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
+import { syncUpdatesConfigurationAsync } from './UpdatesModule';
 import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
-export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void> {
-  if (!ctx.hasAndroidNativeProject) {
-    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
-    return;
-  }
-
-  warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(ctx.projectDir, ctx.exp);
-
-  await AndroidConfig.EasBuild.configureEasBuildAsync(ctx.projectDir);
-
-  const easGradlePath = AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
-  await getVcsClient().trackFileAsync(easGradlePath);
-
-  if (isExpoUpdatesInstalled(ctx.projectDir)) {
-    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
-  }
-  Log.withTick('Android project configured');
-}
-
-export async function validateAndSyncProjectConfigurationAsync({
+export async function syncProjectConfigurationAsync({
   projectDir,
   exp,
   buildProfile,
@@ -48,11 +26,7 @@ export async function validateAndSyncProjectConfigurationAsync({
   const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);
 
   if (workflow === Workflow.GENERIC) {
-    if (!(await AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(projectDir))) {
-      throw new Error(
-        'Project is not configured. Please run "eas build:configure" to configure the project.'
-      );
-    }
+    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
     if (isExpoUpdatesInstalled(projectDir)) {
       await syncUpdatesConfigurationAsync(projectDir, exp);
     }
@@ -73,3 +47,22 @@ function resolveVersionBumpStrategy(autoIncrement: AndroidVersionAutoIncrement):
     return BumpStrategy.APP_VERSION;
   }
 }
+
+// TODO: remove this after a few months
+export async function cleanUpOldEasBuildGradleScriptAsync(projectDir: string): Promise<void> {
+  const easBuildGradlePath = path.join(projectDir, 'android', 'app', 'eas-build.gradle');
+  if (await fs.pathExists(easBuildGradlePath)) {
+    Log.withTick(`Removing ${chalk.bold('eas-build.gradle')} as it's not longer necessary`);
+    await fs.remove(easBuildGradlePath);
+
+    const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+    const buildGradleContents = await fs.readFile(buildGradlePath, 'utf-8');
+    const buildGradleContentsWithoutApply = buildGradleContents.replace(
+      /apply from: ["'].\/eas-build.gradle["']\n/,
+      ''
+    );
+    if (buildGradleContentsWithoutApply !== buildGradleContents) {
+      await fs.writeFile(buildGradlePath, buildGradleContentsWithoutApply);
+    }
+  }
+}

packages/eas-cli/src/build/build.ts

@@ -38,7 +38,7 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
   ensureCredentialsAsync(
     ctx: BuildContext<TPlatform>
   ): Promise<CredentialsResult<Credentials> | undefined>;
-  ensureProjectConfiguredAsync(ctx: BuildContext<TPlatform>): Promise<void>;
+  syncProjectConfigurationAsync(ctx: BuildContext<TPlatform>): Promise<void>;
   prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
   sendBuildRequestAsync(appId: string, job: TJob, metadata: Metadata): Promise<BuildResult>;
 }
@@ -60,14 +60,13 @@ export async function prepareBuildRequestForPlatformAsync<
       trackingCtx: ctx.trackingCtx,
     }
   );
-  if (!ctx.skipProjectConfiguration) {
-    await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(ctx), {
-      attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
-      successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
-      failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
-      trackingCtx: ctx.trackingCtx,
-    });
-  }
+
+  await withAnalyticsAsync(async () => await builder.syncProjectConfigurationAsync(ctx), {
+    attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
+    successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
+    failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
+    trackingCtx: ctx.trackingCtx,
+  });
 
   if (await getVcsClient().isCommitRequiredAsync()) {
     Log.addNewLineIfNone();

packages/eas-cli/src/build/configure.ts

@@ -1,97 +1,47 @@
-import { getConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { EasJson, EasJsonReader } from '@expo/eas-json';
-import { Errors } from '@oclif/core';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import Log, { learnMore } from '../log';
-import { RequestedPlatform } from '../platform';
+import Log from '../log';
 import { resolveWorkflowAsync } from '../project/workflow';
-import { confirmAsync, promptAsync } from '../prompts';
-import { ensureLoggedInAsync } from '../user/actions';
 import { easCliVersion } from '../utils/easCli';
 import { getVcsClient } from '../vcs';
-import { configureAndroidAsync } from './android/configure';
-import { ConfigureContext } from './context';
-import { configureIosAsync } from './ios/configure';
-import { commitPromptAsync, maybeBailOnRepoStatusAsync } from './utils/repository';
+import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
-const configureCommitMessage = {
-  [RequestedPlatform.Android]: 'Configure EAS Build for Android',
-  [RequestedPlatform.Ios]: 'Configure EAS Build for iOS',
-  [RequestedPlatform.All]: 'Configure EAS Build',
-};
-
-export async function ensureProjectConfiguredAsync(
-  projectDir: string,
-  requestedPlatform: RequestedPlatform
-): Promise<void> {
-  if (await fs.pathExists(EasJsonReader.formatEasJsonPath(projectDir))) {
-    return;
-  }
-
-  const message = 'This project is not configured to build with EAS. Set it up now?';
-  const confirm = await confirmAsync({ message });
-  if (confirm) {
-    await configureAsync({
-      projectDir,
-      platform: requestedPlatform,
-    });
-    if (await getVcsClient().isCommitRequiredAsync()) {
-      Errors.error(
-        'Build process requires clean working tree, please commit all your changes and run `eas build` again',
-        { exit: 1 }
-      );
-    }
-  } else {
-    Errors.error(
-      `Aborting, please run ${chalk.bold('eas build:configure')} or create eas.json (${learnMore(
-        'https://docs.expo.dev/build/eas-json'
-      )})`,
-      { exit: 1 }
-    );
-  }
+interface ConfigureParams {
+  projectDir: string;
+  nonInteractive: boolean;
 }
 
-export async function configureAsync(options: {
-  platform: RequestedPlatform;
-  projectDir: string;
-}): Promise<void> {
+/**
+ * Creates eas.json if it does not exist.
+ *
+ * Returns:
+ * - false - if eas.json already exists
+ * - true - if eas.json was created by the function
+ */
+export async function ensureProjectConfiguredAsync(
+  configureParams: ConfigureParams
+): Promise<boolean> {
+  if (await fs.pathExists(EasJsonReader.formatEasJsonPath(configureParams.projectDir))) {
+    return false;
+  }
+
+  await configureAsync(configureParams);
+  return true;
+}
+
+async function configureAsync({ projectDir, nonInteractive }: ConfigureParams): Promise<void> {
   await maybeBailOnRepoStatusAsync();
 
-  const { exp } = getConfig(options.projectDir, { skipSDKVersionRequirement: true });
-
-  const ctx: ConfigureContext = {
-    user: await ensureLoggedInAsync(),
-    projectDir: options.projectDir,
-    exp,
-    requestedPlatform: options.platform,
-    shouldConfigureAndroid: [RequestedPlatform.All, RequestedPlatform.Android].includes(
-      options.platform
-    ),
-    shouldConfigureIos: [RequestedPlatform.All, RequestedPlatform.Ios].includes(options.platform),
-    hasAndroidNativeProject:
-      (await resolveWorkflowAsync(options.projectDir, Platform.ANDROID)) === Workflow.GENERIC,
-    hasIosNativeProject:
-      (await resolveWorkflowAsync(options.projectDir, Platform.IOS)) === Workflow.GENERIC,
-  };
-
-  Log.newLine();
-  await ensureEasJsonExistsAsync(ctx);
-  if (ctx.shouldConfigureAndroid) {
-    await configureAndroidAsync(ctx);
-  }
-  if (ctx.shouldConfigureIos) {
-    await configureIosAsync(ctx);
-  }
+  await createEasJsonAsync(projectDir);
 
   if (await getVcsClient().isCommitRequiredAsync()) {
     Log.newLine();
-    await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
-  } else if (!(await getVcsClient().hasUncommittedChangesAsync())) {
-    Log.newLine();
-    Log.withTick('No changes were necessary, the project is already configured correctly.');
+    await reviewAndCommitChangesAsync('Configure EAS Build', {
+      nonInteractive,
+    });
   }
 }
 
@@ -138,58 +88,19 @@ const EAS_JSON_BARE_DEFAULT: EasJson = {
   },
 };
 
-export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<void> {
-  const easJsonPath = EasJsonReader.formatEasJsonPath(ctx.projectDir);
-
-  if (await fs.pathExists(easJsonPath)) {
-    const reader = new EasJsonReader(ctx.projectDir);
-    await reader.readAsync();
-
-    Log.withTick('Validated eas.json');
-    return;
-  }
+async function createEasJsonAsync(projectDir: string): Promise<void> {
+  const easJsonPath = EasJsonReader.formatEasJsonPath(projectDir);
 
+  const hasAndroidNativeProject =
+    (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
+  const hasIosNativeProject =
+    (await resolveWorkflowAsync(projectDir, Platform.IOS)) === Workflow.GENERIC;
   const easJson =
-    ctx.hasAndroidNativeProject && ctx.hasIosNativeProject
+    hasAndroidNativeProject || hasIosNativeProject
       ? EAS_JSON_BARE_DEFAULT
       : EAS_JSON_MANAGED_DEFAULT;
 
   await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
   await getVcsClient().trackFileAsync(easJsonPath);
-  Log.withTick('Generated eas.json');
-}
-
-enum ShouldCommitChanges {
-  Yes,
-  ShowDiffFirst,
-  Skip,
-}
-
-async function reviewAndCommitChangesAsync(
-  initialCommitMessage: string,
-  askedFirstTime: boolean = true
-): Promise<void> {
-  const { selected } = await promptAsync({
-    type: 'select',
-    name: 'selected',
-    message: 'Can we commit these changes to git for you?',
-    choices: [
-      { title: 'Yes', value: ShouldCommitChanges.Yes },
-      ...(askedFirstTime
-        ? [{ title: 'Show the diff and ask me again', value: ShouldCommitChanges.ShowDiffFirst }]
-        : []),
-      {
-        title: 'Skip committing changes, I will do it later on my own',
-        value: ShouldCommitChanges.Skip,
-      },
-    ],
-  });
-
-  if (selected === ShouldCommitChanges.Yes) {
-    await commitPromptAsync({ initialCommitMessage });
-    Log.withTick('Committed changes');
-  } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await getVcsClient().showDiffAsync();
-    await reviewAndCommitChangesAsync(initialCommitMessage, false);
-  }
+  Log.withTick(`Generated ${chalk.bold('eas.json')}`);
 }

packages/eas-cli/src/build/context.ts

@@ -6,23 +6,11 @@ import type { XCBuildConfiguration } from 'xcode';
 import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
 import { Target } from '../credentials/ios/types';
-import { RequestedPlatform } from '../platform';
 import { GradleBuildContext } from '../project/android/gradle';
 import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
 import { LocalBuildOptions } from './local';
 
-export interface ConfigureContext {
-  user: Actor;
-  projectDir: string;
-  exp: ExpoConfig;
-  requestedPlatform: RequestedPlatform;
-  shouldConfigureAndroid: boolean;
-  shouldConfigureIos: boolean;
-  hasAndroidNativeProject: boolean;
-  hasIosNativeProject: boolean;
-}
-
 export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
 
 export interface AndroidBuildContext {
@@ -51,7 +39,6 @@ export interface BuildContext<T extends Platform> {
   projectDir: string;
   projectId: string;
   projectName: string;
-  skipProjectConfiguration: boolean;
   trackingCtx: TrackingContext;
   user: Actor;
   workflow: Workflow;

packages/eas-cli/src/build/createContext.ts

@@ -25,7 +25,6 @@ export async function createBuildContextAsync<T extends Platform>({
   nonInteractive = false,
   platform,
   projectDir,
-  skipProjectConfiguration = false,
 }: {
   buildProfileName: string;
   buildProfile: BuildProfile<T>;
@@ -34,7 +33,6 @@ export async function createBuildContextAsync<T extends Platform>({
   nonInteractive: boolean;
   platform: T;
   projectDir: string;
-  skipProjectConfiguration: boolean;
 }): Promise<BuildContext<T>> {
   const exp = getExpoConfig(projectDir, { env: buildProfile.env });
 
@@ -81,7 +79,6 @@ export async function createBuildContextAsync<T extends Platform>({
     projectDir,
     projectId,
     projectName,
-    skipProjectConfiguration,
     trackingCtx,
     user,
     workflow,

packages/eas-cli/src/build/ios/UpdatesModule.ts

@@ -1,60 +1,21 @@
 import { ExpoConfig } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
 
-import Log from '../../log';
 import { getProjectAccountName } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
 import { readPlistAsync, writePlistAsync } from '../../utils/plist';
 import { getVcsClient } from '../../vcs';
 import { ensureValidVersions } from '../utils/updates';
 
-export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  ensureValidVersions(exp);
-  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-
-  let expoPlist = await readExpoPlistAsync(projectDir);
-  if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
-    expoPlist = IOSConfig.Updates.setUpdatesConfig(exp, expoPlist, accountName);
-    await writeExpoPlistAsync(projectDir, expoPlist);
-  }
-  // TODO: ensure ExpoPlist in pbxproj
-}
-
 export async function syncUpdatesConfigurationAsync(
   projectDir: string,
   exp: ExpoConfig
 ): Promise<void> {
   ensureValidVersions(exp);
   const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-  try {
-    await ensureUpdatesConfiguredAsync(projectDir);
-  } catch (error) {
-    Log.error(
-      'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
-    );
-    throw error;
-  }
-
-  let expoPlist = await readExpoPlistAsync(projectDir);
-  if (!IOSConfig.Updates.isPlistVersionConfigurationSynced(exp, expoPlist)) {
-    expoPlist = IOSConfig.Updates.setVersionsConfig(exp, expoPlist);
-    await writeExpoPlistAsync(projectDir, expoPlist);
-  }
-
-  if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
-    Log.warn(
-      'Native project configuration is not synced with values present in your app.json, run "eas build:configure" to make sure all values are applied in the native project'
-    );
-  }
-}
-
-// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
-// all that is needed on Expo SDK 43+ to configure expo-updates configuration in Expo.plist
-async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {
   const expoPlist = await readExpoPlistAsync(projectDir);
-  if (!IOSConfig.Updates.isPlistConfigurationSet(expoPlist)) {
-    throw new Error('Missing values in Expo.plist');
-  }
+  const updatedExpoPlist = IOSConfig.Updates.setUpdatesConfig(exp, expoPlist, accountName);
+  await writeExpoPlistAsync(projectDir, updatedExpoPlist);
 }
 
 async function readExpoPlistAsync(projectDir: string): Promise<IOSConfig.ExpoPlist> {
@@ -82,8 +43,10 @@ export async function readReleaseChannelSafelyAsync(projectDir: string): Promise
 
 export async function readChannelSafelyAsync(projectDir: string): Promise<string | null> {
   try {
-    const expoPlist: any = await readExpoPlistAsync(projectDir); // TODO-JJ remove any once IOSConfig.ExpoPlist is updated to include `EXUpdatesRequestHeaders : Record<string,string>`
-    const updatesRequestHeaders = expoPlist['EXUpdatesRequestHeaders'] ?? {}; //TODO-JJ 'EXUpdatesRequestHeaders' IosConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY once https://github.com/expo/expo-cli/pull/3571 is published
+    // TODO-JJ remove any once IOSConfig.ExpoPlist is updated to include `EXUpdatesRequestHeaders : Record<string,string>`
+    const expoPlist: any = await readExpoPlistAsync(projectDir);
+    //TODO-JJ 'EXUpdatesRequestHeaders' IosConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY once https://github.com/expo/expo-cli/pull/3571 is published
+    const updatesRequestHeaders = expoPlist['EXUpdatesRequestHeaders'] ?? {};
     return updatesRequestHeaders['expo-channel-name'] ?? null;
   } catch (err) {
     return null;

packages/eas-cli/src/build/ios/build.ts

@@ -11,10 +11,10 @@ import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from
 import { BuildContext, CommonContext, IosBuildContext } from '../context';
 import { transformMetadata } from '../graphql';
 import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
-import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { ensureIosCredentialsAsync } from './credentials';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
 
 export async function createIosContextAsync(
   ctx: CommonContext<Platform.IOS>
@@ -63,8 +63,8 @@ export async function prepareIosBuildAsync(
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.IOS>) => {
       return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
     },
-    ensureProjectConfiguredAsync: async () => {
-      await validateAndSyncProjectConfigurationAsync({
+    syncProjectConfigurationAsync: async () => {
+      await syncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         buildProfile: ctx.buildProfile,

packages/eas-cli/src/build/ios/syncProjectConfiguration.ts

@@ -3,32 +3,12 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
 import type { XCBuildConfiguration } from 'xcode';
 
-import Log from '../../log';
-import {
-  ensureBundleIdentifierIsDefinedForManagedProjectAsync,
-  warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject,
-} from '../../project/ios/bundleIdentifier';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { ConfigureContext } from '../context';
 import { isExpoUpdatesInstalled } from '../utils/updates';
-import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
+import { syncUpdatesConfigurationAsync } from './UpdatesModule';
 import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
-export async function configureIosAsync(ctx: ConfigureContext): Promise<void> {
-  if (!ctx.hasIosNativeProject) {
-    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
-    return;
-  }
-
-  warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(ctx.projectDir, ctx.exp);
-
-  if (isExpoUpdatesInstalled(ctx.projectDir)) {
-    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
-  }
-  Log.withTick('iOS project configured');
-}
-
-export async function validateAndSyncProjectConfigurationAsync({
+export async function syncProjectConfigurationAsync({
   projectDir,
   exp,
   buildProfile,

packages/eas-cli/src/build/local.ts

@@ -6,13 +6,14 @@ import semver from 'semver';
 import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.57';
+const PLUGIN_PACKAGE_VERSION = '0.0.58';
 
 export interface LocalBuildOptions {
   enable: boolean;
   skipCleanup?: boolean;
   skipNativeBuild?: boolean;
   artifactsDir?: string;
+  artifactPath?: string;
   workingdir?: string;
   verbose?: boolean;
 }
@@ -41,6 +42,7 @@ export async function runLocalBuildAsync(job: Job, options: LocalBuildOptions):
           : {}),
         ...(options.skipNativeBuild ? { EAS_LOCAL_BUILD_SKIP_NATIVE_BUILD: '1' } : {}),
         ...(options.artifactsDir ? { EAS_LOCAL_BUILD_ARTIFACTS_DIR: options.artifactsDir } : {}),
+        ...(options.artifactPath ? { EAS_LOCAL_BUILD_ARTIFACT_PATH: options.artifactPath } : {}),
       },
     });
     childProcess = spawnPromise.child;

packages/eas-cli/src/build/runBuildAndSubmit.ts

@@ -38,7 +38,6 @@ let sdkVersionChecked = false;
 
 export interface BuildFlags {
   requestedPlatform: RequestedPlatform;
-  skipProjectConfiguration: boolean;
   profile?: string;
   nonInteractive: boolean;
   wait: boolean;
@@ -53,7 +52,10 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
   await getVcsClient().ensureRepoExistsAsync();
   await ensureRepoIsCleanAsync(flags.nonInteractive);
 
-  await ensureProjectConfiguredAsync(projectDir, flags.requestedPlatform);
+  await ensureProjectConfiguredAsync({
+    projectDir,
+    nonInteractive: flags.nonInteractive,
+  });
 
   const platforms = toPlatforms(flags.requestedPlatform);
   const buildProfiles = await getProfilesAsync({
@@ -163,7 +165,6 @@ async function prepareAndStartBuildAsync({
     nonInteractive: flags.nonInteractive,
     platform: buildProfile.platform,
     projectDir,
-    skipProjectConfiguration: flags.skipProjectConfiguration,
     localBuildOptions: flags.localBuildOptions,
   });
 

packages/eas-cli/src/commands/branch/view.ts

@@ -2,11 +2,9 @@ import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import Table from 'cli-table3';
-import gql from 'graphql-tag';
 
 import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import { ViewBranchQuery, ViewBranchQueryVariables } from '../../graphql/generated';
+import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
@@ -15,58 +13,6 @@ import groupBy from '../../utils/expodash/groupBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
-const PAGE_LIMIT = 10_000;
-
-export async function viewUpdateBranchAsync({
-  appId,
-  name,
-}: Pick<ViewBranchQueryVariables, 'appId' | 'name'>): Promise<ViewBranchQuery> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .query<ViewBranchQuery, ViewBranchQueryVariables>(
-        gql`
-          query ViewBranch($appId: String!, $name: String!, $limit: Int!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateBranchByName(name: $name) {
-                  id
-                  name
-                  updates(offset: 0, limit: $limit) {
-                    id
-                    group
-                    message
-                    createdAt
-                    runtimeVersion
-                    platform
-                    manifestFragment
-                    actor {
-                      id
-                      ... on User {
-                        username
-                      }
-                      ... on Robot {
-                        firstName
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        `,
-        {
-          appId,
-          name,
-          limit: PAGE_LIMIT,
-        },
-        { additionalTypenames: ['UpdateBranch', 'Update'] }
-      )
-      .toPromise()
-  );
-  return data;
-}
-
 export default class BranchView extends EasCommand {
   static description = 'View a branch.';
 
@@ -111,7 +57,7 @@ export default class BranchView extends EasCommand {
       }));
     }
 
-    const { app } = await viewUpdateBranchAsync({
+    const { app } = await UpdateQuery.viewBranchAsync({
       appId: projectId,
       name,
     });

packages/eas-cli/src/commands/build/configure.ts

@@ -1,11 +1,18 @@
+import { getConfig } from '@expo/config';
+import { Platform, Workflow } from '@expo/eas-build-job';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import { configureAsync } from '../../build/configure';
+import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../build/android/UpdatesModule';
+import { cleanUpOldEasBuildGradleScriptAsync } from '../../build/android/syncProjectConfiguration';
+import { ensureProjectConfiguredAsync } from '../../build/configure';
+import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../build/ios/UpdatesModule';
+import { isExpoUpdatesInstalled } from '../../build/utils/updates';
 import EasCommand from '../../commandUtils/EasCommand';
 import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
 import { findProjectRootAsync } from '../../project/projectUtils';
+import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { getVcsClient } from '../../vcs';
 
@@ -26,45 +33,60 @@ export default class BuildConfigure extends EasCommand {
     Log.log(
       '💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.'
     );
-    Log.newLine();
 
     await getVcsClient().ensureRepoExistsAsync();
 
+    const projectDir = await findProjectRootAsync();
+    const expoUpdatesIsInstalled = isExpoUpdatesInstalled(projectDir);
+
     const platform =
       (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());
 
-    await configureAsync({
-      platform,
-      projectDir: await findProjectRootAsync(),
+    // clean up old Android configuration
+    if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
+      await cleanUpOldEasBuildGradleScriptAsync(projectDir);
+    }
+
+    // ensure eas.json exists
+    Log.newLine();
+    await ensureProjectConfiguredAsync({
+      projectDir,
+      nonInteractive: false,
     });
 
-    Log.newLine();
-    logSuccess(platform);
-  }
-}
+    // configure expo-updates
+    if (expoUpdatesIsInstalled) {
+      const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
 
-function logSuccess(platform: RequestedPlatform): void {
-  let platformsText = 'iOS and Android projects are';
-  let storesText = 'the Apple App Store or Google Play Store';
+      if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+        if (workflow === Workflow.GENERIC) {
+          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
+        }
+      }
 
-  if (platform === 'android') {
-    platformsText = 'Android project is';
-    storesText = 'the Google Play Store';
-  } else if (platform === 'ios') {
-    platformsText = 'iOS project is';
-    storesText = 'the Apple App Store Connect';
-  }
+      if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+        if (workflow === Workflow.GENERIC) {
+          await syncIosUpdatesConfigurationAsync(projectDir, exp);
+        }
+      }
+    }
 
-  Log.log(`🎉 Your ${platformsText} ready to build.
+    Log.addNewLineIfNone();
+
+    Log.log(`🎉 Your project is ready to build.
 
 - Run ${chalk.bold('eas build')} when you are ready to create your first build.
-- Once the build is completed, run ${chalk.bold('eas submit')} to upload the app to ${storesText}
+- Once the build is completed, run ${chalk.bold('eas submit')} to upload the app to app stores.
 - ${learnMore('https://docs.expo.dev/build/introduction', {
-    learnMoreMessage: 'Learn more about other capabilities of EAS Build',
-  })}`);
+      learnMoreMessage: 'Learn more about other capabilities of EAS Build',
+    })}`);
+  }
 }
 
 async function promptForPlatformAsync(): Promise<RequestedPlatform> {
+  Log.addNewLineIfNone();
   const { platform } = await promptAsync({
     type: 'select',
     message: 'Which platforms would you like to configure for EAS Build?',

packages/eas-cli/src/commands/build/index.ts

@@ -3,6 +3,7 @@ import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import figures from 'figures';
 import fs from 'fs-extra';
+import path from 'path';
 
 import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
 import { ensureRepoIsCleanAsync, reviewAndCommitChangesAsync } from '../../build/utils/repository';
@@ -23,6 +24,7 @@ interface RawBuildFlags {
   profile?: string;
   'non-interactive': boolean;
   local: boolean;
+  output?: string;
   wait: boolean;
   'clear-cache': boolean;
   json: boolean;
@@ -63,6 +65,9 @@ export default class Build extends EasCommand {
       default: false,
       description: 'Run build locally [experimental]',
     }),
+    output: Flags.string({
+      description: 'Output path for local build',
+    }),
     wait: Flags.boolean({
       default: true,
       allowNo: true,
@@ -100,6 +105,9 @@ export default class Build extends EasCommand {
 
   private async sanitizeFlagsAsync(flags: RawBuildFlags): Promise<BuildFlags> {
     const nonInteractive = flags['non-interactive'];
+    if (!flags.local && flags.output) {
+      Errors.error('--output is allowed only for local builds', { exit: 1 });
+    }
     if (!flags.platform && nonInteractive) {
       Errors.error('--platform is required when building in non-interactive mode', { exit: 1 });
     }
@@ -134,11 +142,14 @@ export default class Build extends EasCommand {
     const profile = flags['profile'];
     return {
       requestedPlatform,
-      skipProjectConfiguration: flags['skip-project-configuration'],
       profile,
       nonInteractive,
       localBuildOptions: flags['local']
-        ? { enable: true, verbose: true }
+        ? {
+            enable: true,
+            verbose: true,
+            artifactPath: flags.output && path.resolve(process.cwd(), flags.output),
+          }
         : {
             enable: false,
           },

packages/eas-cli/src/commands/build/inspect.ts

@@ -83,7 +83,6 @@ export default class BuildInspect extends EasCommand {
       const projectDir = await findProjectRootAsync();
       try {
         await runBuildAndSubmitAsync(projectDir, {
-          skipProjectConfiguration: false,
           nonInteractive: false,
           wait: true,
           clearCache: false,

packages/eas-cli/src/commands/update/index.ts

@@ -17,9 +17,10 @@ import {
   Update,
   UpdateInfoGroup,
   User,
-  ViewBranchQuery,
+  ViewBranchUpdatesQuery,
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
+import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
@@ -39,7 +40,6 @@ import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { getVcsClient } from '../../vcs';
 import { createUpdateBranchOnAppAsync } from '../branch/create';
 import { listBranchesAsync } from '../branch/list';
-import { viewUpdateBranchAsync } from '../branch/view';
 import { createUpdateChannelOnAppAsync } from '../channel/create';
 
 export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
@@ -110,11 +110,11 @@ async function ensureBranchExistsAsync({
 }): Promise<{
   id: string;
   updates: Exclude<
-    Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
+    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
     null | undefined
   >['updates'];
 }> {
-  const { app } = await viewUpdateBranchAsync({
+  const { app } = await UpdateQuery.viewBranchAsync({
     appId,
     name: branchName,
   });
@@ -480,7 +480,7 @@ async function getRuntimeVersionObjectAsync(
 
 function formatUpdateTitle(
   update: Exclude<
-    Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
+    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
     null | undefined
   >['updates'][number]
 ): string {

packages/eas-cli/src/commands/update/list.ts

@@ -0,0 +1,139 @@
+import { getConfig } from '@expo/config';
+import { Flags } from '@oclif/core';
+import assert from 'assert';
+import chalk from 'chalk';
+import CliTable from 'cli-table3';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { ViewAllUpdatesQuery } from '../../graphql/generated';
+import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
+import Log from '../../log';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import { FormatUpdateParameter, UPDATE_COLUMNS, formatUpdate } from '../../update/utils';
+import groupBy from '../../utils/expodash/groupBy';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { getVcsClient } from '../../vcs';
+
+type UpdateGroupDescription = FormatUpdateParameter & {
+  branch: string;
+  group: string;
+  platforms: string;
+  runtimeVersion: string;
+};
+
+export default class BranchView extends EasCommand {
+  static description = 'View the recent updates for a branch';
+
+  static flags = {
+    branch: Flags.string({
+      description: 'List all updates on this branch',
+      exclusive: ['all'],
+    }),
+    all: Flags.boolean({
+      description: 'List all updates associated with this project',
+      exclusive: ['branch'],
+      default: false,
+    }),
+    json: Flags.boolean({
+      description: `Return a json with all of the recent update groups.`,
+      default: false,
+    }),
+  };
+
+  async runAsync(): Promise<void> {
+    const {
+      flags: { branch: branchFlag, all, json: jsonFlag },
+    } = await this.parse(BranchView);
+    if (jsonFlag) {
+      enableJsonOutput();
+    }
+
+    const projectDir = await findProjectRootAsync();
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+
+    let updateGroupDescriptions: UpdateGroupDescription[];
+    if (all) {
+      const branchesAndUpdates = await UpdateQuery.viewAllAsync({ appId: projectId });
+      updateGroupDescriptions = getUpdateGroupDescriptions(
+        branchesAndUpdates.app.byId.updateBranches
+      );
+    } else {
+      let branchInteractive: string | undefined;
+      if (!branchFlag) {
+        const validationMessage = 'Branch name may not be empty.';
+        if (jsonFlag) {
+          throw new Error(validationMessage);
+        }
+        ({ name: branchInteractive } = await promptAsync({
+          type: 'text',
+          name: 'name',
+          message: 'Please enter the name of the branch whose updates you wish to view:',
+          initial: (await getVcsClient().getBranchNameAsync()) ?? undefined,
+          validate: (value: any) => (value ? true : validationMessage),
+        }));
+      }
+      const branch = branchFlag ?? branchInteractive;
+      assert(branch, 'Branch name may not be empty.');
+
+      const branchesAndUpdates = await UpdateQuery.viewBranchAsync({
+        appId: projectId,
+        name: branch,
+      });
+      const UpdateBranch = branchesAndUpdates.app?.byId.updateBranchByName;
+      if (!UpdateBranch) {
+        throw new Error(`Could not find branch "${branch}"`);
+      }
+      updateGroupDescriptions = getUpdateGroupDescriptions([UpdateBranch]);
+    }
+
+    if (jsonFlag) {
+      printJsonOnlyOutput(updateGroupDescriptions);
+    } else {
+      logAsTable(updateGroupDescriptions);
+    }
+  }
+}
+
+function getUpdateGroupDescriptions(
+  branchesAndUpdates: ViewAllUpdatesQuery['app']['byId']['updateBranches']
+): UpdateGroupDescription[] {
+  const flattenedBranchesAndUpdates = branchesAndUpdates.flatMap(branch =>
+    branch.updates.map(update => {
+      return { branch: branch.name, ...update };
+    })
+  );
+  const updateGroupDescriptions = Object.values(
+    groupBy(flattenedBranchesAndUpdates, update => update.group)
+  ).map(updateGroup => {
+    const platforms = updateGroup
+      .map(update => update.platform)
+      .sort()
+      .join(', ');
+    return { ...updateGroup[0], platforms };
+  });
+  updateGroupDescriptions.sort(
+    (a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
+  );
+  return updateGroupDescriptions;
+}
+
+function logAsTable(updateGroupDescriptions: UpdateGroupDescription[]): void {
+  const table = new CliTable({
+    head: ['Branch', ...UPDATE_COLUMNS],
+    wordWrap: true,
+  });
+  table.push(
+    ...updateGroupDescriptions.map(updateGroupDescription => [
+      updateGroupDescription.branch,
+      formatUpdate(updateGroupDescription),
+      updateGroupDescription.runtimeVersion,
+      updateGroupDescription.group,
+      updateGroupDescription.platforms,
+    ])
+  );
+  Log.addNewLineIfNone();
+  Log.log(chalk.bold('Recently published update groups:'));
+  Log.log(table.toString());
+}

packages/eas-cli/src/credentials/ios/appstore/__tests__/bundleIdCapabilities-test.ts

@@ -1,4 +1,4 @@
-import { BundleIdCapability, CapabilityType } from '@expo/apple-utils';
+import { BundleIdCapability } from '@expo/apple-utils';
 
 import {
   CapabilityMapping,
@@ -222,10 +222,6 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
     const bundleId = {
       getBundleIdCapabilitiesAsync: jest.fn(() => [
         new BundleIdCapability({}, 'XXX_IN_APP_PURCHASE', { settings: null }),
-        new BundleIdCapability({}, 'FOOBAR', {
-          settings: null,
-          capabilityType: CapabilityType.PUSH_NOTIFICATIONS,
-        }),
         new BundleIdCapability({}, 'XXX_GAME_CENTER', { settings: null }),
       ]),
       updateBundleIdCapabilityAsync: jest.fn(),

packages/eas-cli/src/credentials/ios/appstore/bundleIdCapabilities.ts

@@ -214,11 +214,9 @@ function getCapabilitiesToDisable(
   // might be enabling capabilities in modifiers.
 
   for (const existingCapability of currentCapabilities) {
-    // Special case APNS because it's always enabled in Expo,
     // GC and IAP are always enabled in apps by default so we should avoid modifying them.
     if (
       existingCapability.isType(CapabilityType.IN_APP_PURCHASE) ||
-      existingCapability.isType(CapabilityType.PUSH_NOTIFICATIONS) ||
       existingCapability.isType(CapabilityType.GAME_CENTER)
     ) {
       continue;

packages/eas-cli/src/credentials/ios/appstore/ensureAppExists.ts

@@ -67,7 +67,11 @@ export async function ensureBundleIdExistsWithNameAsync(
       spinner.fail(`Failed to register bundle identifier ${chalk.dim(bundleIdentifier)}`);
 
       // Assert contract errors for easier resolution when the user has an expired developer account.
-      if (err.message.match(/forbidden for security reasons/)) {
+      if (
+        err.message.match(/forbidden for security reasons/) ||
+        // Unable to process request - PLA Update available - You currently don't have access to this membership resource. To resolve this issue, agree to the latest Program License Agreement in your developer account.
+        err.message.match(/agree/)
+      ) {
         await assertContractMessagesAsync(context);
       }
     }

packages/eas-cli/src/graphql/generated.ts

@@ -3719,39 +3719,6 @@ export type EditUpdateBranchMutation = (
   ) }
 );
 
-export type ViewBranchQueryVariables = Exact<{
-  appId: Scalars['String'];
-  name: Scalars['String'];
-  limit: Scalars['Int'];
-}>;
-
-
-export type ViewBranchQuery = (
-  { __typename?: 'RootQuery' }
-  & { app: (
-    { __typename?: 'AppQuery' }
-    & { byId: (
-      { __typename?: 'App' }
-      & Pick<App, 'id'>
-      & { updateBranchByName?: Maybe<(
-        { __typename?: 'UpdateBranch' }
-        & Pick<UpdateBranch, 'id' | 'name'>
-        & { updates: Array<(
-          { __typename?: 'Update' }
-          & Pick<Update, 'id' | 'group' | 'message' | 'createdAt' | 'runtimeVersion' | 'platform' | 'manifestFragment'>
-          & { actor?: Maybe<(
-            { __typename?: 'User' }
-            & Pick<User, 'username' | 'id'>
-          ) | (
-            { __typename?: 'Robot' }
-            & Pick<Robot, 'firstName' | 'id'>
-          )> }
-        )> }
-      )> }
-    ) }
-  ) }
-);
-
 export type CancelBuildMutationVariables = Exact<{
   buildId: Scalars['ID'];
 }>;
@@ -5404,6 +5371,71 @@ export type GetAllSubmissionsForAppQuery = (
   ) }
 );
 
+export type ViewAllUpdatesQueryVariables = Exact<{
+  appId: Scalars['String'];
+  limit: Scalars['Int'];
+}>;
+
+
+export type ViewAllUpdatesQuery = (
+  { __typename?: 'RootQuery' }
+  & { app: (
+    { __typename?: 'AppQuery' }
+    & { byId: (
+      { __typename?: 'App' }
+      & Pick<App, 'id'>
+      & { updateBranches: Array<(
+        { __typename?: 'UpdateBranch' }
+        & Pick<UpdateBranch, 'id' | 'name'>
+        & { updates: Array<(
+          { __typename?: 'Update' }
+          & Pick<Update, 'id' | 'group' | 'message' | 'createdAt' | 'runtimeVersion' | 'platform'>
+          & { actor?: Maybe<(
+            { __typename?: 'User' }
+            & Pick<User, 'username' | 'id'>
+          ) | (
+            { __typename?: 'Robot' }
+            & Pick<Robot, 'firstName' | 'id'>
+          )> }
+        )> }
+      )> }
+    ) }
+  ) }
+);
+
+export type ViewBranchUpdatesQueryVariables = Exact<{
+  appId: Scalars['String'];
+  name: Scalars['String'];
+  limit: Scalars['Int'];
+}>;
+
+
+export type ViewBranchUpdatesQuery = (
+  { __typename?: 'RootQuery' }
+  & { app: (
+    { __typename?: 'AppQuery' }
+    & { byId: (
+      { __typename?: 'App' }
+      & Pick<App, 'id'>
+      & { updateBranchByName?: Maybe<(
+        { __typename?: 'UpdateBranch' }
+        & Pick<UpdateBranch, 'id' | 'name'>
+        & { updates: Array<(
+          { __typename?: 'Update' }
+          & Pick<Update, 'id' | 'group' | 'message' | 'createdAt' | 'runtimeVersion' | 'platform' | 'manifestFragment'>
+          & { actor?: Maybe<(
+            { __typename?: 'User' }
+            & Pick<User, 'username' | 'id'>
+          ) | (
+            { __typename?: 'Robot' }
+            & Pick<Robot, 'firstName' | 'id'>
+          )> }
+        )> }
+      )> }
+    ) }
+  ) }
+);
+
 export type CurrentUserQueryVariables = Exact<{ [key: string]: never; }>;
 
 

packages/eas-cli/src/graphql/queries/UpdateQuery.ts

@@ -0,0 +1,102 @@
+import gql from 'graphql-tag';
+
+import { graphqlClient, withErrorHandlingAsync } from '../client';
+import {
+  ViewAllUpdatesQuery,
+  ViewAllUpdatesQueryVariables,
+  ViewBranchUpdatesQuery,
+  ViewBranchUpdatesQueryVariables,
+} from '../generated';
+
+const PAGE_LIMIT = 10_000;
+
+export const UpdateQuery = {
+  async viewAllAsync({ appId }: { appId: string }): Promise<ViewAllUpdatesQuery> {
+    return withErrorHandlingAsync(
+      graphqlClient
+        .query<ViewAllUpdatesQuery, ViewAllUpdatesQueryVariables>(
+          gql`
+            query ViewAllUpdates($appId: String!, $limit: Int!) {
+              app {
+                byId(appId: $appId) {
+                  id
+                  updateBranches(offset: 0, limit: $limit) {
+                    id
+                    name
+                    updates(offset: 0, limit: $limit) {
+                      id
+                      group
+                      message
+                      createdAt
+                      runtimeVersion
+                      platform
+                      actor {
+                        id
+                        ... on User {
+                          username
+                        }
+                        ... on Robot {
+                          firstName
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          `,
+          {
+            appId,
+            limit: PAGE_LIMIT,
+          },
+          { additionalTypenames: ['UpdateBranch', 'Update'] }
+        )
+        .toPromise()
+    );
+  },
+  async viewBranchAsync({ appId, name }: Pick<ViewBranchUpdatesQueryVariables, 'appId' | 'name'>) {
+    return withErrorHandlingAsync<ViewBranchUpdatesQuery>(
+      graphqlClient
+        .query<ViewBranchUpdatesQuery, ViewBranchUpdatesQueryVariables>(
+          gql`
+            query ViewBranchUpdates($appId: String!, $name: String!, $limit: Int!) {
+              app {
+                byId(appId: $appId) {
+                  id
+                  updateBranchByName(name: $name) {
+                    id
+                    name
+                    updates(offset: 0, limit: $limit) {
+                      id
+                      group
+                      message
+                      createdAt
+                      runtimeVersion
+                      platform
+                      manifestFragment
+                      actor {
+                        id
+                        ... on User {
+                          username
+                        }
+                        ... on Robot {
+                          firstName
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          `,
+          {
+            appId,
+            name,
+            limit: PAGE_LIMIT,
+          },
+          { additionalTypenames: ['UpdateBranch', 'Update'] }
+        )
+        .toPromise()
+    );
+  },
+};

packages/eas-cli/src/vcs/local.ts

@@ -44,7 +44,11 @@ export class Ignore {
       return;
     }
     const ignoreFilePaths = (
-      await fg(`**/${GITIGNORE_FILENAME}`, { cwd: this.rootDir, ignore: ['node_modules'] })
+      await fg(`**/${GITIGNORE_FILENAME}`, {
+        cwd: this.rootDir,
+        ignore: ['node_modules'],
+        followSymbolicLinks: false,
+      })
     )
       // ensure that parent dir is before child directories
       .sort((a, b) => a.length - b.length && a.localeCompare(b));

packages/eas-json/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@expo/eas-json",
   "description": "A library for interacting with eas.json",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "author": "Expo <[email protected]>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {

yarn.lock

@@ -833,10 +833,10 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@expo/[email protected]6":
-  version "0.0.0-alpha.26"
-  resolved "https://registry.yarnpkg.com/@expo/apple-utils/-/apple-utils-0.0.0-alpha.26.tgz#cf5a893b7c9cc779af5b54a482196325dcde1426"
-  integrity sha512-t+xOhn4bYSAXkXamhDPUiI2Ol+QIwHRHLn/2QiCmNAGHolaVan/hMaVveSzvCYitpaJ16b4nthvcWFoJipxGlA==
+"@expo/[email protected]7":
+  version "0.0.0-alpha.27"
+  resolved "https://registry.yarnpkg.com/@expo/apple-utils/-/apple-utils-0.0.0-alpha.27.tgz#5b77cd4522d19fa75a7801071c49da04b9162cd7"
+  integrity sha512-oprlh8UpNM5nqz6clGpCr7u8Uf1WjmnOkETKLEFDnW2JRcOkSrVwJrV4CfKfm3qvIoAwEk4ZONDMr0ZiI21dzQ==
 
 "@expo/bunyan@^4.0.0":
   version "4.0.0"
@@ -951,23 +951,12 @@
     base64-js "^1.2.3"
     xmlbuilder "^14.0.0"
 
-"@expo/plugin-autocomplete@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@expo/plugin-autocomplete/-/plugin-autocomplete-1.0.2.tgz#d20bcaa7e4576ffb904057707e5b990461132003"
-  integrity sha512-HYM9yGDj2ZteA3vmI8GQc03pZFEN/FjgXQ3qHWk8SOcEtAZ41haYD6TgRW+iaGHLtscUsjoYdtksAC5wmXm+AQ==
+"@expo/plugin-warn-if-update-available@2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@expo/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.0.4.tgz#3c6f39f697e3fed0f9734a4d38e033939e961bf0"
+  integrity sha512-0FRqpx9Vij/wCr/JkXB8lt0mlQARzop8sF+tPntiEOVynMTD0yBZiLNF+fk3iCZ5um6SQHKRMLruOODyjFmXQg==
   dependencies:
-    "@oclif/core" "^1.0.10"
-    chalk "^4.1.0"
-    cli-ux "^6.0.5"
-    debug "^4.0.0"
-    fs-extra "^9.0.1"
-
-"@expo/[email protected]":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@expo/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.0.1.tgz#9aee458faba2620b2906f7c9ff11679707c43bfe"
-  integrity sha512-8Hd7wdKkpbqc/O1JCnn8f0cOHOgsOl5WmFVg2e1s7SoGlpTWEu9cgFY/Y7EejpIZqBAGnmra+W17kfzAyWIQEA==
-  dependencies:
-    "@oclif/core" "^1.0.4"
+    "@oclif/core" "^1.0.8"
     chalk "^4.1.0"
     debug "^4.1.0"
     fs-extra "^9.0.1"
@@ -2377,7 +2366,30 @@
     supports-color "^8.1.1"
     tslib "^2"
 
-"@oclif/core@1.0.10", "@oclif/core@^1.0.10", "@oclif/core@^1.0.4", "@oclif/core@^1.0.8":
+"@oclif/core@1.1.2", "@oclif/core@^1.0.11", "@oclif/core@^1.1.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.1.2.tgz#e8cddb248ce49daa6f49b01f593d420522a75fd1"
+  integrity sha512-hoox4ygjazblt9icBs3dc0Zaw9m5S6nwzjgSnlqzJ9Kb6PzrwGtc1YOYxnJFB8z/Fyv3hpiQo3Ze2DIeGsF/wg==
+  dependencies:
+    "@oclif/linewrap" "^1.0.0"
+    chalk "^4.1.2"
+    clean-stack "^3.0.1"
+    cli-ux "^6.0.6"
+    debug "^4.3.3"
+    ejs "^3.1.6"
+    fs-extra "^9.1.0"
+    get-package-type "^0.1.0"
+    globby "^11.0.4"
+    indent-string "^4.0.0"
+    is-wsl "^2.2.0"
+    semver "^7.3.5"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    tslib "^2.3.1"
+    widest-line "^3.1.0"
+    wrap-ansi "^7.0.0"
+
+"@oclif/core@^1.0.10", "@oclif/core@^1.0.8":
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.0.10.tgz#5fd01d572e44d372b7279ee0f49b4860e14b6e4e"
   integrity sha512-L+IcNU3NoYxwz5hmHfcUlOJ3dpgHRsIj1kAmI9CKEJHq5gBVKlP44Ot179Jke1jKRKX2g9N42izbmlh0SNpkkw==
@@ -2410,40 +2422,54 @@
     extend-object "^1.0.0"
     rc "^1.2.8"
 
+"@oclif/fixpack@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@oclif/fixpack/-/fixpack-2.3.1.tgz#6ecee36fd4945b2e3aef604f0b0de466e396a26c"
+  integrity sha512-ynDtqYke7WBjyAK5KQiOoNm2XGm4wBfNDzjbpq3k4NEarA5wRW0PMjdP2FkTAJE2NI3tA6I7DXxxqBzwyt+fBg==
+  dependencies:
+    alce "1.2.0"
+    colors "1.4.0"
+    extend-object "^1.0.0"
+    rc "^1.2.8"
+
 "@oclif/linewrap@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@oclif/linewrap/-/linewrap-1.0.0.tgz#aedcb64b479d4db7be24196384897b5000901d91"
   integrity sha512-Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==
 
-"@oclif/plugin-help@5.1.10":
+"@oclif/plugin-autocomplete@1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@oclif/plugin-autocomplete/-/plugin-autocomplete-1.1.1.tgz#f6c343d81569fc986d38e4950799ccf3e2b677e1"
+  integrity sha512-pbhW8MlgdiF7hNxYVW+d43BwSMtb2WSwuw5hyMFdO15U3J4FDRLynG5sdcz0k1GSBr5tOgZHJ+Dh813amckSAw==
+  dependencies:
+    "@oclif/core" "^1.0.11"
+    chalk "^4.1.0"
+    cli-ux "^6.0.6"
+    debug "^4.0.0"
+    fs-extra "^9.0.1"
+
+"@oclif/[email protected]", "@oclif/plugin-help@^5.1.10":
   version "5.1.10"
   resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-5.1.10.tgz#465aa0397da723c39536780f6f7c1ad9cbd1671e"
   integrity sha512-ngurn/3kQVCw1Df5TJEURjxU+w7iA9z3Pskw8dJorfnd0Xibe/qlPg+VYV3hB7EhTbV82EVfZ5DhQYD5YvoxeA==
   dependencies:
     "@oclif/core" "^1.0.10"
 
-"@oclif/plugin-[email protected]":
-  version "5.1.9"
-  resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-5.1.9.tgz#1365fd76d5382a1a217e6b5c247251211c300d7b"
-  integrity sha512-CDMu5zPEkszr9cPzk75XRn/P4ly6xzCbfVr2i1isu2B5+2JZGMYuJM+JCXUauCCx4d2Gb3JTSszP+nfkjaxGkg==
-  dependencies:
-    "@oclif/core" "^1.0.10"
-
-"@oclif/plugin-not-found@^2.2.2":
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@oclif/plugin-not-found/-/plugin-not-found-2.2.3.tgz#146748c75e9a23417b26ce06adba978d7513e27c"
-  integrity sha512-HZ1ZlRqOdxoxjnM36T0wfzvmSFT2iO9HrYjSU0ZHuGhCwvgIK5PDjxZu1j44SStfYGSKcIcj08Uz1fRUvgQa9Q==
+"@oclif/plugin-not-found@^2.2.3":
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/@oclif/plugin-not-found/-/plugin-not-found-2.2.4.tgz#fdea729face92228c19fc2bf04759909e9a986b1"
+  integrity sha512-ESq4nqgtWXpF2zCjhYC+dOTcStHu9mHttmFjElSvRUPOLqL38TGwqcX07ATzw/OQAsonDVwIaH/neSfq+MmWgA==
   dependencies:
     "@oclif/color" "^1.0.0"
-    "@oclif/core" "1.0.10"
-    cli-ux "6.0.6"
+    "@oclif/core" "^1.1.1"
+    cli-ux "^6.0.6"
     fast-levenshtein "^3.0.0"
     lodash "^4.17.21"
 
-"@oclif/plugin-warn-if-update-available@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.0.2.tgz#ab30956495483fd2eb55ce8c3549c74f260d23fd"
-  integrity sha512-lg4eesMxjCTaz6PgwC1j7VuyW6tzYWO85eSCz6pwjxmCCW8T6bHxLiIHO3TXTfYJTj1YVUL1fOFVc1Gelc0neQ==
+"@oclif/plugin-warn-if-update-available@^2.0.3":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.0.4.tgz#3d509ca2394cccf65e6622be812d7be4065a60aa"
+  integrity sha512-9dprC1CWPjesg0Vf/rDSQH2tzJXhP1ow84cb2My1kj6e6ESulPKpctiCFSZ1WaCQFfq+crKhzlNoP/vRaXNUAg==
   dependencies:
     "@oclif/core" "^1.0.8"
     chalk "^4.1.0"
@@ -2871,10 +2897,10 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node-forge@^0.9.5":
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-0.9.5.tgz#648231d79da197216290429020698d4e767365a0"
-  integrity sha512-rrN3xfA/oZIzwOnO3d2wRQz7UdeVkmMMPjWUCfpPTPuKFVb3D6G10LuiVHYYmvrivBBLMx4m0P/FICoDbNZUMA==
+"@types/node-forge@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.0.0.tgz#0b4e9507209485945115a4db4879f39632230593"
+  integrity sha512-h0bgwPKq5u99T9Gor4qtV1lCZ41xNkai0pie1n/a2mh2/4+jENWOlo7AJ4YKxTZAnSZ8FRurUpdIN7ohaPPuHA==
   dependencies:
     "@types/node" "*"
 
@@ -4097,6 +4123,13 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
+cli-progress@^3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.10.0.tgz#63fd9d6343c598c93542fdfa3563a8b59887d78a"
+  integrity sha512-kLORQrhYCAtUPLZxqsAt2YJGOvRdt34+O6jl5cQGb7iF3dM55FQZlTR+rQyIK9JUcO9bBMwZsTlND+3dmFU2Cw==
+  dependencies:
+    string-width "^4.2.0"
+
 cli-progress@^3.9.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.9.1.tgz#a22eba6a20f53289fdd05d5ee8cb2cc8c28f866e"
@@ -4166,12 +4199,12 @@ [email protected]:
     supports-hyperlinks "^2.1.0"
     tslib "^2.0.0"
 
-[email protected], cli-ux@^6.0.5:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-6.0.6.tgz#00536bf6038f195b0a1a2589f61ce5e625e75870"
-  integrity sha512-CvL4qmV78VhnbyHTswGjpDSQtU+oj3hT9DP9L6yMOwiTiNv0nMjMEV/8zou4CSqO6PtZ2A8qnlZDgAc07Js+aw==
+cli-ux@^6.0.6, cli-ux@^6.0.8:
+  version "6.0.8"
+  resolved "https://registry.yarnpkg.com/cli-ux/-/cli-ux-6.0.8.tgz#a3943e889df827ceab2ffbe3e46c1fff194099e9"
+  integrity sha512-ERJ61QDVS1fqnWhzp3cPFHbfucmkzWh/K6SlMlf5GweIb0wB4G/wtZiAeWK6TOTSFXGQdGczVHzWrG1BMqTmSw==
   dependencies:
-    "@oclif/core" "1.0.10"
+    "@oclif/core" "^1.1.1"
     "@oclif/linewrap" "^1.0.0"
     "@oclif/screen" "^1.0.4 "
     ansi-escapes "^4.3.0"
@@ -4179,7 +4212,7 @@ [email protected], cli-ux@^6.0.5:
     cardinal "^2.1.1"
     chalk "^4.1.0"
     clean-stack "^3.0.0"
-    cli-progress "^3.9.1"
+    cli-progress "^3.10.0"
     extract-stack "^2.0.0"
     fs-extra "^8.1"
     hyperlinker "^1.0.0"
@@ -4324,7 +4357,7 @@ colorette@^1.2.2:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
-colors@*, colors@^1.1.2:
+colors@*, [email protected], colors@^1.1.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -5031,6 +5064,11 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+dom-walk@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
+  integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
+
 domexception@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
@@ -5117,7 +5155,7 @@ ejs@^2.5.9, ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-ejs@^3.1.5:
+ejs@^3.1.5, ejs@^3.1.6:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a"
   integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==
@@ -6358,6 +6396,14 @@ glob@^7.0.0, glob@^7.0.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+global@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
+  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
+  dependencies:
+    min-document "^2.19.0"
+    process "^0.11.10"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -8925,6 +8971,13 @@ mimic-response@^3.1.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
+  dependencies:
+    dom-walk "^0.1.0"
+
 min-indent@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
@@ -9237,7 +9290,12 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-forge@0.10.0, node-forge@^0.10.0:
+node-forge@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.0.0.tgz#a025e3beeeb90d9cee37dae34d25b968ec3e6f15"
+  integrity sha512-ShkiiAlzSsgH1IwGlA0jybk9vQTIOLyJ9nBd0JTuP+nzADJFLY0NoDijM2zvD/JaezooGu3G2p2FNxOAK6459g==
+
+node-forge@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
@@ -9327,7 +9385,7 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
+normalize-package-data@^3.0.0, normalize-package-data@^3.0.2, normalize-package-data@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
   integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
@@ -9613,28 +9671,30 @@ object.values@^1.1.4:
     define-properties "^1.1.3"
     es-abstract "^1.18.2"
 
-oclif@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/oclif/-/oclif-2.0.1.tgz#0def8f7e98ba5645413e46a0c2ae8656c6ad7b37"
-  integrity sha512-9CzlF5VB7s3dTClBS/QaI2YD1/r/gYhmtQ2qbhhsAShpxbyItRtv46DlqCwCfx/5+amDVNfsRpslFFkWmfKz0g==
+oclif@2.1.5, oclif@^2.1.1:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/oclif/-/oclif-2.1.5.tgz#beef802a1a3363d7f2a5a6dd551e171c14135420"
+  integrity sha512-5KGqkFcTEHOa+H5ERIcLXzr8jA2IaMP3E2KBCel4lryMf+fctztMYuwgr4h4H5BGlRpZfk9gv9iGM5J4tUxKlw==
   dependencies:
-    "@oclif/core" "1.0.10"
-    "@oclif/fixpack" "^2.3.0"
-    "@oclif/plugin-help" "5.1.9"
-    "@oclif/plugin-not-found" "^2.2.2"
-    "@oclif/plugin-warn-if-update-available" "^2.0.2"
-    cli-ux "6.0.6"
-    debug "^4.1.1"
+    "@oclif/core" "^1.0.11"
+    "@oclif/fixpack" "^2.3.1"
+    "@oclif/plugin-help" "^5.1.10"
+    "@oclif/plugin-not-found" "^2.2.3"
+    "@oclif/plugin-warn-if-update-available" "^2.0.3"
+    cli-ux "^6.0.8"
+    debug "^4.3.3"
     find-yarn-workspace-root "^2.0.0"
     fs-extra "^8.1"
     github-slugger "^1.2.1"
+    global "^4.4.0"
     lodash "^4.17.11"
-    normalize-package-data "^3.0.0"
+    normalize-package-data "^3.0.3"
     nps-utils "^1.7.0"
+    oclif "^2.1.1"
     qqjs "^0.3.10"
     semver "^7.3.5"
     sort-pjson "^1.0.3"
-    tslib "^2.0.0"
+    tslib "^2.3.1"
     yeoman-environment "^2.3.4"
     yeoman-generator "3"
     yosay "^2.0.2"
@@ -10257,6 +10317,11 @@ process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
 progress@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"