Use config introspection to get all entitlements (#419)

* Use config introspection to get all entitlements * Update CHANGELOG.md * Updated getAppBuildGradle -> getAppBuildGradleFilePath * Update RemoveProvisioningProfile.ts * Update view.ts * Update applicationId.ts * Update entitlements.ts
expo · May 25, 2021 · bd39b29 · bd39b29
1 parent bfbe1e9
commit bd39b29
Show file tree

Hide file tree

Showing 9 changed files with 805 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+- Support auto capabilities in managed workflow using Expo config plugin introspection. ([#419](https://github.com/expo/eas-cli/pull/419) by [@EvanBacon](https://github.com/EvanBacon))
+
 ### 🐛 Bug fixes
 
 ### 🧹 Chores
@@ -33,7 +35,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 Bug fixes
 
-- Fix failure when publishing without the platform flag.  ([#415](https://github.com/expo/eas-cli/pull/415) by [@jkhales](https://github.com/jkhales))
+- Fix failure when publishing without the platform flag. ([#415](https://github.com/expo/eas-cli/pull/415) by [@jkhales](https://github.com/jkhales))
 - Pin versions in package.json. ([#399](https://github.com/expo/eas-cli/pull/399) by [@dsokal](https://github.com/dsokal))
 - Revert [0ac2f](https://github.com/expo/eas-cli/commit/0ac2fb77a118df609381c4e350aa68609340c3cd) as the root cause of the issue has been fixed in [#399](https://github.com/expo/eas-cli/pull/399).
 - Include development-client in valid buildType for internal distribution. ([#410](https://github.com/expo/eas-cli/pull/410) by [@brentvatne](https://github.com/brentvatne))

diff --git a/packages/eas-cli/package.json b/packages/eas-cli/package.json
@@ -11,8 +11,8 @@
     "@amplitude/identify": "1.5.0",
     "@amplitude/node": "1.5.0",
     "@expo/apple-utils": "0.0.0-alpha.20",
-    "@expo/config": "3.3.19",
-    "@expo/config-plugins": "1.0.31",
+    "@expo/config": "3.3.42",
+    "@expo/config-plugins": "1.0.32",
     "@expo/eas-build-job": "0.2.35",
     "@expo/eas-json": "^0.15.0",
     "@expo/json-file": "8.2.25",

diff --git a/packages/eas-cli/src/build/android/UpdatesModule.ts b/packages/eas-cli/src/build/android/UpdatesModule.ts
@@ -10,7 +10,7 @@ import { ensureValidVersions } from '../utils/updates';
 export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
   ensureValidVersions(exp);
   const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradle(projectDir);
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
   const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
 
   if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
@@ -70,7 +70,7 @@ export async function syncUpdatesConfigurationAsync(
 }
 
 async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradle(projectDir);
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
   const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
 
   if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {

diff --git a/packages/eas-cli/src/build/android/version.ts b/packages/eas-cli/src/build/android/version.ts
@@ -36,7 +36,7 @@ export function readVersionName(projectDir: string, exp: ExpoConfig): string | u
 }
 
 function readBuildGradle(projectDir: string): string | undefined {
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradle(projectDir);
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
   if (!fs.pathExistsSync(buildGradlePath)) {
     return undefined;
   }

diff --git a/packages/eas-cli/src/commands/channel/view.ts b/packages/eas-cli/src/commands/channel/view.ts
@@ -1,8 +1,8 @@
 import { getConfig } from '@expo/config';
 import { Command, flags } from '@oclif/command';
+import assert from 'assert';
 import chalk from 'chalk';
 import Table from 'cli-table3';
-import { assert } from 'console';
 import gql from 'graphql-tag';
 
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';

diff --git a/packages/eas-cli/src/credentials/ios/actions/RemoveProvisioningProfile.ts b/packages/eas-cli/src/credentials/ios/actions/RemoveProvisioningProfile.ts
@@ -1,4 +1,4 @@
-import { assert } from '@expo/config';
+import assert from 'assert';
 
 import { AppleProvisioningProfileIdentifiersFragment } from '../../../graphql/generated';
 import Log from '../../../log';

diff --git a/packages/eas-cli/src/credentials/ios/appstore/entitlements.ts b/packages/eas-cli/src/credentials/ios/appstore/entitlements.ts
@@ -1,5 +1,5 @@
-import { getConfig } from '@expo/config';
-import { IOSConfig } from '@expo/config-plugins';
+import { getPrebuildConfig } from '@expo/config';
+import { IOSConfig, compileModsAsync } from '@expo/config-plugins';
 import { Workflow } from '@expo/eas-build-job';
 import { JSONObject } from '@expo/json-file';
 import plist from '@expo/plist';
@@ -16,14 +16,14 @@ function getEntitlementsJson(projectDir: string): JSONObject | null {
 }
 
 export async function getManagedEntitlementsJsonAsync(projectDir: string): Promise<JSONObject> {
-  // TODO: Support prebuild mods
-  const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-  return (
-    exp.ios?.entitlements ?? {
-      // Always enable notifications...
-      'aps-environment': 'production',
-    }
-  );
+  let { exp } = getPrebuildConfig(projectDir, { platforms: ['ios'] });
+
+  exp = await compileModsAsync(exp, {
+    projectRoot: projectDir,
+    platforms: ['ios'],
+    introspect: true,
+  });
+  return exp.ios?.entitlements || {};
 }
 
 export async function resolveEntitlementsJsonAsync(

diff --git a/packages/eas-cli/src/project/android/applicationId.ts b/packages/eas-cli/src/project/android/applicationId.ts
@@ -35,8 +35,11 @@ export function getApplicationId(projectDir: string, exp: ExpoConfig): string {
     warnIfAndroidPackageDefinedInAppConfigForGenericProject(projectDir, exp);
 
     const errorMessage = 'Could not read application id from Android project.';
-    const buildGradlePath = AndroidConfig.Paths.getAppBuildGradle(projectDir);
-    if (!fs.pathExistsSync(buildGradlePath)) {
+    let buildGradlePath = null;
+    try {
+      buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+    } catch {}
+    if (!buildGradlePath || !fs.pathExistsSync(buildGradlePath)) {
       throw new Error(errorMessage);
     }
     const buildGradle = fs.readFileSync(buildGradlePath, 'utf8');