eas-cli 19.0.0 → 19.0.1

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

@@ -1,8 +1,9 @@
 import { JSONObject } from '@expo/json-file';
+import { Client } from '../../vcs/vcs';
 interface Target {
     buildConfiguration?: string;
     targetName: string;
 }
-export declare function getManagedApplicationTargetEntitlementsAsync(projectDir: string, env: Record<string, string>): Promise<JSONObject>;
+export declare function getManagedApplicationTargetEntitlementsAsync(projectDir: string, env: Record<string, string>, vcsClient: Client): Promise<JSONObject>;
 export declare function getNativeTargetEntitlementsAsync(projectDir: string, target: Target): Promise<JSONObject | null>;
 export {};

package/build/project/ios/entitlements.js

@@ -2,15 +2,65 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getManagedApplicationTargetEntitlementsAsync = getManagedApplicationTargetEntitlementsAsync;
 exports.getNativeTargetEntitlementsAsync = getNativeTargetEntitlementsAsync;
+const tslib_1 = require("tslib");
 const config_plugins_1 = require("@expo/config-plugins");
+const prebuild_config_1 = require("@expo/prebuild-config");
+const log_1 = tslib_1.__importDefault(require("../../log"));
 const expoCli_1 = require("../../utils/expoCli");
 const plist_1 = require("../../utils/plist");
-async function getManagedApplicationTargetEntitlementsAsync(projectDir, env) {
-    const { stdout } = await (0, expoCli_1.spawnExpoCommand)(projectDir, ['config', '--json', '--type', 'introspect'], {
-        env,
-    });
-    const expWithMods = JSON.parse(stdout);
-    return expWithMods.ios?.entitlements ?? {};
+const projectUtils_1 = require("../projectUtils");
+const workflow_1 = require("../workflow");
+async function getManagedApplicationTargetEntitlementsAsync(projectDir, env, vcsClient) {
+    let expoConfigError;
+    if ((0, projectUtils_1.isExpoInstalled)(projectDir)) {
+        try {
+            const { stdout } = await (0, expoCli_1.spawnExpoCommand)(projectDir, ['config', '--json', '--type', 'introspect'], {
+                env: {
+                    ...env,
+                    EXPO_NO_DOTENV: '1',
+                },
+            });
+            const expWithMods = JSON.parse(stdout);
+            return expWithMods.ios?.entitlements ?? {};
+        }
+        catch (error) {
+            expoConfigError = error;
+            log_1.default.warn(`Failed to read the app config from the project using the local Expo CLI: ${formatError(error)}`);
+            log_1.default.warn('Falling back to the version of "@expo/config" shipped with the EAS CLI.');
+        }
+    }
+    try {
+        return await resolveManagedApplicationTargetEntitlementsWithBundledConfigAsync(projectDir, env, vcsClient);
+    }
+    catch (fallbackError) {
+        if (expoConfigError) {
+            throw new Error(`Failed to resolve iOS entitlements from Expo config. The local Expo CLI failed with: ${formatError(expoConfigError)}. The bundled config fallback also failed with: ${formatError(fallbackError)}`, { cause: fallbackError });
+        }
+        throw new Error(`Failed to resolve iOS entitlements from Expo config using the bundled config fallback: ${formatError(fallbackError)}`, { cause: fallbackError });
+    }
+}
+async function resolveManagedApplicationTargetEntitlementsWithBundledConfigAsync(projectDir, env, vcsClient) {
+    const originalProcessEnv = process.env;
+    try {
+        process.env = {
+            ...process.env,
+            ...env,
+        };
+        const { exp } = await (0, prebuild_config_1.getPrebuildConfigAsync)(projectDir, { platforms: ['ios'] });
+        const expWithMods = await (0, config_plugins_1.compileModsAsync)(exp, {
+            projectRoot: projectDir,
+            platforms: ['ios'],
+            introspect: true,
+            ignoreExistingNativeFiles: await (0, workflow_1.hasIgnoredIosProjectAsync)(projectDir, vcsClient),
+        });
+        return expWithMods.ios?.entitlements ?? {};
+    }
+    finally {
+        process.env = originalProcessEnv;
+    }
+}
+function formatError(error) {
+    return error.stderr?.trim() || error.stdout?.trim() || error.message;
 }
 async function getNativeTargetEntitlementsAsync(projectDir, target) {
     const entitlementsPath = config_plugins_1.IOSConfig.Entitlements.getEntitlementsPath(projectDir, target);

package/build/project/ios/target.js

@@ -29,7 +29,7 @@ async function resolveManagedProjectTargetsAsync({ exp, projectDir, xcodeBuildCo
         targetName: applicationTargetName,
         buildConfiguration,
     });
-    const applicationTargetEntitlements = await (0, entitlements_1.getManagedApplicationTargetEntitlementsAsync)(projectDir, env ?? {});
+    const applicationTargetEntitlements = await (0, entitlements_1.getManagedApplicationTargetEntitlementsAsync)(projectDir, env ?? {}, vcsClient);
     const appExtensions = exp.extra?.eas?.build?.experimental?.ios?.appExtensions ?? [];
     const { error } = AppExtensionsConfigSchema.validate(appExtensions, {
         allowUnknown: false,