eas-cli 18.12.3 → 18.13.1

package/build/graphql/queries/ObserveQuery.js

@@ -186,4 +186,58 @@ exports.ObserveQuery = {
             .toPromise());
         return data.app.byId.observe.customEventNames;
     },
+    async navigationRoutesAsync(graphqlClient, variables) {
+        const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
+            .query((0, graphql_tag_1.default) `
+            query AppObserveNavigationRoutes(
+              $appId: String!
+              $filter: AppObserveNavigationRoutesFilter!
+              $first: Int
+              $after: String
+              $orderBy: AppObserveNavigationRoutesOrderBy
+            ) {
+              app {
+                byId(appId: $appId) {
+                  id
+                  observe {
+                    navigationRoutes(filter: $filter, first: $first, after: $after, orderBy: $orderBy) {
+                      pageInfo {
+                        hasNextPage
+                        hasPreviousPage
+                        endCursor
+                      }
+                      edges {
+                        cursor
+                        node {
+                          routeName
+                          coldTtr {
+                            count
+                            median
+                            p90
+                          }
+                          warmTtr {
+                            count
+                            median
+                            p90
+                          }
+                          tti {
+                            count
+                            median
+                            p90
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          `, variables)
+            .toPromise());
+        const { edges, pageInfo } = data.app.byId.observe.navigationRoutes;
+        return {
+            routes: edges.map(edge => edge.node),
+            pageInfo,
+        };
+    },
 };

package/build/log.js

@@ -4,12 +4,12 @@ exports.link = link;
 exports.learnMore = learnMore;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const debug_1 = tslib_1.__importDefault(require("debug"));
 const figures_1 = tslib_1.__importDefault(require("figures"));
 const getenv_1 = require("getenv");
 const log_symbols_1 = tslib_1.__importDefault(require("log-symbols"));
 const terminal_link_1 = tslib_1.__importDefault(require("terminal-link"));
-// eslint-disable-next-line eslint-import/no-extraneous-dependencies
-const nodeDebug = require('debug')('eas:log:debug');
+const nodeDebug = (0, debug_1.default)('eas:log:debug');
 class Log {
     static isDebug = (0, getenv_1.boolish)('EXPO_DEBUG', false);
     static log(...args) {
@@ -43,7 +43,8 @@ class Log {
         }
         else {
             Log.updateIsLastLineNewLine(args);
-            nodeDebug(...args);
+            const [first, ...rest] = args;
+            nodeDebug(first, ...rest);
         }
     }
     static gray(...args) {

package/build/observe/fetchMetrics.js

@@ -4,14 +4,10 @@ exports.validateDateFlag = validateDateFlag;
 exports.fetchObserveMetricsAsync = fetchObserveMetricsAsync;
 const tslib_1 = require("tslib");
 const errors_1 = require("../commandUtils/errors");
-const generated_1 = require("../graphql/generated");
 const ObserveQuery_1 = require("../graphql/queries/ObserveQuery");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const formatMetrics_1 = require("./formatMetrics");
-const appPlatformToObservePlatform = {
-    [generated_1.AppPlatform.Android]: generated_1.AppObservePlatform.Android,
-    [generated_1.AppPlatform.Ios]: generated_1.AppObservePlatform.Ios,
-};
+const platforms_1 = require("./platforms");
 function validateDateFlag(value, flagName) {
     const parsed = new Date(value);
     if (isNaN(parsed.getTime())) {
@@ -20,7 +16,7 @@ function validateDateFlag(value, flagName) {
 }
 async function fetchObserveMetricsAsync(graphqlClient, appId, metricNames, platforms, startTime, endTime) {
     const queries = platforms.map(async (appPlatform) => {
-        const observePlatform = appPlatformToObservePlatform[appPlatform];
+        const observePlatform = platforms_1.appPlatformToObservePlatform[appPlatform];
         try {
             const appVersions = await ObserveQuery_1.ObserveQuery.appVersionsAsync(graphqlClient, {
                 appId,

package/build/observe/fetchNavigationRoutes.d.ts

@@ -0,0 +1,22 @@
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+import { AppObserveNavigationRoute, AppObserveNavigationRoutesOrderBy, AppPlatform, PageInfo } from '../graphql/generated';
+export interface NavigationRouteWithPlatform {
+    platform: AppPlatform;
+    route: AppObserveNavigationRoute;
+}
+export interface FetchNavigationRoutesOptions {
+    startTime: string;
+    endTime: string;
+    platforms: AppPlatform[];
+    limit: number;
+    after?: string;
+    appVersion?: string;
+    updateId?: string;
+    buildNumber?: string;
+    orderBy?: AppObserveNavigationRoutesOrderBy;
+}
+export interface FetchNavigationRoutesResult {
+    routes: NavigationRouteWithPlatform[];
+    pageInfoByPlatform: Map<AppPlatform, PageInfo>;
+}
+export declare function fetchObserveNavigationRoutesAsync(graphqlClient: ExpoGraphqlClient, appId: string, options: FetchNavigationRoutesOptions): Promise<FetchNavigationRoutesResult>;

package/build/observe/fetchNavigationRoutes.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchObserveNavigationRoutesAsync = fetchObserveNavigationRoutesAsync;
+const tslib_1 = require("tslib");
+const generated_1 = require("../graphql/generated");
+const ObserveQuery_1 = require("../graphql/queries/ObserveQuery");
+const log_1 = tslib_1.__importDefault(require("../log"));
+const platforms_1 = require("./platforms");
+async function fetchObserveNavigationRoutesAsync(graphqlClient, appId, options) {
+    const orderBy = options.orderBy ?? {
+        field: generated_1.AppObserveNavigationRoutesOrderByField.NavigationCount,
+        direction: generated_1.AppObserveEventsOrderByDirection.Desc,
+    };
+    const queries = options.platforms.map(async (appPlatform) => {
+        const observePlatform = platforms_1.appPlatformToObservePlatform[appPlatform];
+        try {
+            const result = await ObserveQuery_1.ObserveQuery.navigationRoutesAsync(graphqlClient, {
+                appId,
+                filter: {
+                    platform: observePlatform,
+                    startTime: options.startTime,
+                    endTime: options.endTime,
+                    ...(options.appVersion && { appVersion: options.appVersion }),
+                    ...(options.updateId && { appUpdateId: options.updateId }),
+                    ...(options.buildNumber && { appBuildNumber: options.buildNumber }),
+                },
+                first: options.limit,
+                ...(options.after && { after: options.after }),
+                orderBy,
+            });
+            return { appPlatform, ...result };
+        }
+        catch (error) {
+            log_1.default.warn(`Failed to fetch navigation routes on ${observePlatform}: ${error.message}`);
+            return null;
+        }
+    });
+    const results = await Promise.all(queries);
+    const routes = [];
+    const pageInfoByPlatform = new Map();
+    for (const result of results) {
+        if (!result) {
+            continue;
+        }
+        pageInfoByPlatform.set(result.appPlatform, result.pageInfo);
+        for (const route of result.routes) {
+            routes.push({ platform: result.appPlatform, route });
+        }
+    }
+    return { routes, pageInfoByPlatform };
+}

package/build/observe/flags.d.ts

@@ -0,0 +1,20 @@
+export declare const ObserveProjectIdFlag: {
+    'project-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+};
+export declare const ObservePlatformFlag: {
+    platform: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+};
+export declare const ObserveTimeRangeFlags: {
+    start: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+    end: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+    days: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+};
+export declare const ObserveAfterFlag: {
+    after: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+};
+export declare const ObserveAppVersionFlag: {
+    'app-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+};
+export declare const ObserveUpdateIdFlag: {
+    'update-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+};

package/build/observe/flags.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObserveUpdateIdFlag = exports.ObserveAppVersionFlag = exports.ObserveAfterFlag = exports.ObserveTimeRangeFlags = exports.ObservePlatformFlag = exports.ObserveProjectIdFlag = void 0;
+const core_1 = require("@oclif/core");
+const platforms_1 = require("./platforms");
+exports.ObserveProjectIdFlag = {
+    'project-id': core_1.Flags.string({
+        description: 'EAS project ID (defaults to the project ID of the current directory)',
+    }),
+};
+exports.ObservePlatformFlag = {
+    platform: core_1.Flags.option({
+        description: 'Filter by platform',
+        options: platforms_1.allowedPlatformFlagValues,
+    })(),
+};
+exports.ObserveTimeRangeFlags = {
+    start: core_1.Flags.string({
+        description: 'Start of time range (ISO date)',
+        exclusive: ['days'],
+    }),
+    end: core_1.Flags.string({
+        description: 'End of time range (ISO date)',
+        exclusive: ['days'],
+    }),
+    days: core_1.Flags.integer({
+        description: 'Show results from the last N days (mutually exclusive with --start/--end)',
+        min: 1,
+        exclusive: ['start', 'end'],
+    }),
+};
+exports.ObserveAfterFlag = {
+    after: core_1.Flags.string({
+        description: 'Cursor for pagination. Use the endCursor from a previous query to fetch the next page.',
+    }),
+};
+exports.ObserveAppVersionFlag = {
+    'app-version': core_1.Flags.string({
+        description: 'Filter by app version',
+    }),
+};
+exports.ObserveUpdateIdFlag = {
+    'update-id': core_1.Flags.string({
+        description: 'Filter by EAS update ID',
+    }),
+};

package/build/observe/formatNavigationRoutes.d.ts

@@ -0,0 +1,34 @@
+import { AppPlatform } from '../graphql/generated';
+import { NavigationRouteWithPlatform } from './fetchNavigationRoutes';
+export type NavigationStatKey = 'median' | 'p90' | 'count';
+export declare const NAVIGATION_STAT_ALIASES: Record<string, NavigationStatKey>;
+export declare const NAVIGATION_STAT_DISPLAY_NAMES: Record<NavigationStatKey, string>;
+export declare function resolveNavigationStatKey(input: string): NavigationStatKey;
+export declare const NAVIGATION_METRIC_NAMES: string[];
+export declare function isNavigationMetric(metricName: string): boolean;
+export interface NavigationRouteValuesJson {
+    routeName: string;
+    platform: AppPlatform;
+    metrics: Record<string, Partial<Record<NavigationStatKey, number | null>>>;
+}
+export interface ObserveNavigationRoutesJsonOutput {
+    routes: NavigationRouteValuesJson[];
+    pageInfoByPlatform: Record<string, {
+        hasNextPage: boolean;
+        endCursor: string | null;
+    }>;
+}
+export declare function buildObserveNavigationRoutesJson(routes: NavigationRouteWithPlatform[], metricNames: string[], stats: NavigationStatKey[], pageInfoByPlatform: Map<AppPlatform, {
+    hasNextPage: boolean;
+    endCursor?: string | null;
+}>): ObserveNavigationRoutesJsonOutput;
+export interface BuildNavigationRoutesTableOptions {
+    daysBack?: number;
+    startTime?: string;
+    endTime?: string;
+    pageInfoByPlatform?: Map<AppPlatform, {
+        hasNextPage: boolean;
+        endCursor?: string | null;
+    }>;
+}
+export declare function buildObserveNavigationRoutesTable(routes: NavigationRouteWithPlatform[], metricNames: string[], stats: NavigationStatKey[], options?: BuildNavigationRoutesTableOptions): string;

package/build/observe/formatNavigationRoutes.js

@@ -0,0 +1,170 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NAVIGATION_METRIC_NAMES = exports.NAVIGATION_STAT_DISPLAY_NAMES = exports.NAVIGATION_STAT_ALIASES = void 0;
+exports.resolveNavigationStatKey = resolveNavigationStatKey;
+exports.isNavigationMetric = isNavigationMetric;
+exports.buildObserveNavigationRoutesJson = buildObserveNavigationRoutesJson;
+exports.buildObserveNavigationRoutesTable = buildObserveNavigationRoutesTable;
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const errors_1 = require("../commandUtils/errors");
+const platform_1 = require("../platform");
+const renderTextTable_1 = tslib_1.__importDefault(require("../utils/renderTextTable"));
+const formatUtils_1 = require("./formatUtils");
+const metricNames_1 = require("./metricNames");
+exports.NAVIGATION_STAT_ALIASES = {
+    med: 'median',
+    median: 'median',
+    p90: 'p90',
+    count: 'count',
+    event_count: 'count',
+    eventCount: 'count',
+};
+exports.NAVIGATION_STAT_DISPLAY_NAMES = {
+    median: 'Med',
+    p90: 'P90',
+    count: 'Count',
+};
+function resolveNavigationStatKey(input) {
+    const resolved = exports.NAVIGATION_STAT_ALIASES[input];
+    if (resolved) {
+        return resolved;
+    }
+    throw new errors_1.EasCommandError(`Unknown statistic: "${input}". Valid options: ${Object.keys(exports.NAVIGATION_STAT_ALIASES).join(', ')}`);
+}
+const FULL_METRIC_NAME_TO_FIELD = {
+    'expo.navigation.cold_ttr': 'coldTtr',
+    'expo.navigation.warm_ttr': 'warmTtr',
+    'expo.navigation.tti': 'tti',
+};
+exports.NAVIGATION_METRIC_NAMES = Object.keys(FULL_METRIC_NAME_TO_FIELD);
+function isNavigationMetric(metricName) {
+    return metricName in FULL_METRIC_NAME_TO_FIELD;
+}
+function formatStatValue(stat, value) {
+    if (value == null) {
+        return '-';
+    }
+    if (stat === 'count') {
+        return String(value);
+    }
+    return `${value.toFixed(2)}s`;
+}
+function formatMergedCell(stat, statValue, count) {
+    const formatted = formatStatValue(stat, statValue);
+    const countStr = count != null ? String(count) : '-';
+    return `${formatted} (${countStr})`;
+}
+function metricStat(node, metricName) {
+    const field = FULL_METRIC_NAME_TO_FIELD[metricName];
+    if (!field) {
+        throw new errors_1.EasCommandError(`Unknown navigation metric: "${metricName}"`);
+    }
+    const stat = node.route[field];
+    return {
+        count: stat.count,
+        median: stat.median ?? null,
+        p90: stat.p90 ?? null,
+    };
+}
+function buildObserveNavigationRoutesJson(routes, metricNames, stats, pageInfoByPlatform) {
+    const jsonRoutes = routes.map(node => {
+        const metrics = {};
+        for (const metricName of metricNames) {
+            const values = metricStat(node, metricName);
+            const statValues = {};
+            for (const stat of stats) {
+                statValues[stat] = values[stat] ?? null;
+            }
+            metrics[metricName] = statValues;
+        }
+        return {
+            routeName: node.route.routeName,
+            platform: node.platform,
+            metrics,
+        };
+    });
+    const pageInfoByPlatformOutput = {};
+    for (const [platform, pageInfo] of pageInfoByPlatform) {
+        pageInfoByPlatformOutput[platform] = {
+            hasNextPage: pageInfo.hasNextPage,
+            endCursor: pageInfo.endCursor ?? null,
+        };
+    }
+    return { routes: jsonRoutes, pageInfoByPlatform: pageInfoByPlatformOutput };
+}
+function buildObserveNavigationRoutesTable(routes, metricNames, stats, options) {
+    if (routes.length === 0) {
+        return chalk_1.default.yellow('No navigation routes found.');
+    }
+    const displayStats = stats.filter(s => s !== 'count');
+    const hasCount = stats.includes('count');
+    const statsDesc = displayStats.length > 0
+        ? displayStats.map(s => exports.NAVIGATION_STAT_DISPLAY_NAMES[s]).join(', ')
+        : 'Navigation count';
+    const timeDesc = (0, formatUtils_1.buildTimeRangeDescription)({
+        daysBack: options?.daysBack,
+        startTime: options?.startTime,
+        endTime: options?.endTime,
+    });
+    const countSuffix = hasCount && displayStats.length > 0 ? ' (navigation count)' : '';
+    const summaryLine = `${statsDesc} values${countSuffix}${timeDesc ? ` ${timeDesc}` : ''}`;
+    const byPlatform = new Map();
+    for (const node of routes) {
+        if (!byPlatform.has(node.platform)) {
+            byPlatform.set(node.platform, []);
+        }
+        byPlatform.get(node.platform).push(node);
+    }
+    const metricHeaders = [];
+    for (const metricName of metricNames) {
+        const displayName = (0, metricNames_1.getMetricDisplayName)(metricName);
+        if (displayStats.length > 0 && hasCount) {
+            for (const stat of displayStats) {
+                metricHeaders.push(displayStats.length > 1
+                    ? `${displayName} ${exports.NAVIGATION_STAT_DISPLAY_NAMES[stat]}`
+                    : displayName);
+            }
+        }
+        else {
+            for (const stat of displayStats.length > 0
+                ? displayStats
+                : ['count']) {
+                metricHeaders.push(displayStats.length === 0
+                    ? `${displayName} Count`
+                    : `${displayName} ${exports.NAVIGATION_STAT_DISPLAY_NAMES[stat]}`);
+            }
+        }
+    }
+    const headers = ['Route', ...metricHeaders];
+    const sections = [chalk_1.default.bold(summaryLine)];
+    for (const [platform, platformRoutes] of byPlatform) {
+        sections.push('');
+        sections.push(chalk_1.default.bold(platform_1.appPlatformDisplayNames[platform]));
+        const rows = platformRoutes.map(node => {
+            const cells = [];
+            for (const metricName of metricNames) {
+                const values = metricStat(node, metricName);
+                if (displayStats.length > 0 && hasCount) {
+                    for (const stat of displayStats) {
+                        cells.push(formatMergedCell(stat, values[stat], values.count));
+                    }
+                }
+                else {
+                    for (const stat of displayStats.length > 0
+                        ? displayStats
+                        : ['count']) {
+                        cells.push(formatStatValue(stat, values[stat]));
+                    }
+                }
+            }
+            return [node.route.routeName, ...cells];
+        });
+        sections.push((0, renderTextTable_1.default)(headers, rows));
+        const pageInfo = options?.pageInfoByPlatform?.get(platform);
+        if (pageInfo?.hasNextPage && pageInfo.endCursor) {
+            sections.push(`Next page (${platform_1.appPlatformDisplayNames[platform]}): --after ${pageInfo.endCursor}`);
+        }
+    }
+    return sections.join('\n');
+}

package/build/observe/metricNames.d.ts

@@ -1,4 +1,6 @@
 export declare const METRIC_ALIASES: Record<string, string>;
+export declare const NAVIGATION_METRIC_ALIASES: Record<string, string>;
 export declare const METRIC_SHORT_NAMES: Record<string, string>;
 export declare function resolveMetricName(input: string): string;
+export declare function resolveNavigationMetricName(input: string): string;
 export declare function getMetricDisplayName(metricName: string): string;

package/build/observe/metricNames.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.METRIC_SHORT_NAMES = exports.METRIC_ALIASES = void 0;
+exports.METRIC_SHORT_NAMES = exports.NAVIGATION_METRIC_ALIASES = exports.METRIC_ALIASES = void 0;
 exports.resolveMetricName = resolveMetricName;
+exports.resolveNavigationMetricName = resolveNavigationMetricName;
 exports.getMetricDisplayName = getMetricDisplayName;
 const errors_1 = require("../commandUtils/errors");
 exports.METRIC_ALIASES = {
@@ -11,13 +12,22 @@ exports.METRIC_ALIASES = {
     warm_launch: 'expo.app_startup.warm_launch_time',
     bundle_load: 'expo.app_startup.bundle_load_time',
 };
+exports.NAVIGATION_METRIC_ALIASES = {
+    cold_ttr: 'expo.navigation.cold_ttr',
+    warm_ttr: 'expo.navigation.warm_ttr',
+    nav_tti: 'expo.navigation.tti',
+};
 const KNOWN_FULL_NAMES = new Set(Object.values(exports.METRIC_ALIASES));
+const KNOWN_FULL_NAVIGATION_NAMES = new Set(Object.values(exports.NAVIGATION_METRIC_ALIASES));
 exports.METRIC_SHORT_NAMES = {
     'expo.app_startup.cold_launch_time': 'Cold Launch',
     'expo.app_startup.warm_launch_time': 'Warm Launch',
-    'expo.app_startup.tti': 'TTI',
-    'expo.app_startup.ttr': 'TTR',
+    'expo.app_startup.tti': 'Startup TTI',
+    'expo.app_startup.ttr': 'Startup TTR',
     'expo.app_startup.bundle_load_time': 'Bundle Load',
+    'expo.navigation.cold_ttr': 'Nav Cold TTR',
+    'expo.navigation.warm_ttr': 'Nav Warm TTR',
+    'expo.navigation.tti': 'Nav TTI',
 };
 function resolveMetricName(input) {
     if (exports.METRIC_ALIASES[input]) {
@@ -28,6 +38,15 @@ function resolveMetricName(input) {
     }
     throw new errors_1.EasCommandError(`Unknown metric: "${input}". Use a full metric name (e.g. expo.app_startup.tti) or a short alias: ${Object.keys(exports.METRIC_ALIASES).join(', ')}`);
 }
+function resolveNavigationMetricName(input) {
+    if (exports.NAVIGATION_METRIC_ALIASES[input]) {
+        return exports.NAVIGATION_METRIC_ALIASES[input];
+    }
+    if (KNOWN_FULL_NAVIGATION_NAMES.has(input)) {
+        return input;
+    }
+    throw new errors_1.EasCommandError(`Unknown navigation metric: "${input}". Use a full metric name (e.g. expo.navigation.cold_ttr) or a short alias: ${Object.keys(exports.NAVIGATION_METRIC_ALIASES).join(', ')}`);
+}
 function getMetricDisplayName(metricName) {
     return exports.METRIC_SHORT_NAMES[metricName] ?? metricName;
 }

package/build/observe/platforms.d.ts

@@ -18,4 +18,5 @@ export declare function appObservePlatformFromFlag(flag: PlatformFlagValue | und
  * platform).
  */
 export declare function appPlatformsFromFlag(flag: PlatformFlagValue | undefined): AppPlatform[];
+export declare const appPlatformToObservePlatform: Record<AppPlatform, AppObservePlatform>;
 export {};

package/build/observe/platforms.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allowedPlatformFlagValues = void 0;
+exports.appPlatformToObservePlatform = exports.allowedPlatformFlagValues = void 0;
 exports.appObservePlatformFromFlag = appObservePlatformFromFlag;
 exports.appPlatformsFromFlag = appPlatformsFromFlag;
 const generated_1 = require("../graphql/generated");
@@ -46,3 +46,7 @@ function appPlatformsFromFlag(flag) {
     }
     return [defaultAppPlatform];
 }
+exports.appPlatformToObservePlatform = {
+    [generated_1.AppPlatform.Android]: generated_1.AppObservePlatform.Android,
+    [generated_1.AppPlatform.Ios]: generated_1.AppObservePlatform.Ios,
+};

package/build/project/expoConfig.js

@@ -7,12 +7,11 @@ exports.isUsingStaticExpoConfig = isUsingStaticExpoConfig;
 exports.getPublicExpoConfigAsync = getPublicExpoConfigAsync;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
-const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const joi_1 = tslib_1.__importDefault(require("joi"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const projectUtils_1 = require("./projectUtils");
-const log_1 = tslib_1.__importDefault(require("../log"));
+const expoCli_1 = require("../utils/expoCli");
 async function createOrModifyExpoConfigAsync(projectDir, exp, readOptions) {
     ensureExpoConfigExists(projectDir);
     if (readOptions) {
@@ -22,7 +21,6 @@ async function createOrModifyExpoConfigAsync(projectDir, exp, readOptions) {
         return await (0, config_1.modifyConfigAsync)(projectDir, exp);
     }
 }
-let wasExpoConfigWarnPrinted = false;
 async function getExpoConfigInternalAsync(projectDir, opts = {}) {
     const originalProcessEnv = process.env;
     try {
@@ -32,29 +30,12 @@ async function getExpoConfigInternalAsync(projectDir, opts = {}) {
         };
         let exp;
         if ((0, projectUtils_1.isExpoInstalled)(projectDir)) {
-            try {
-                const { stdout } = await (0, spawn_async_1.default)('npx', ['expo', 'config', '--json', ...(opts.isPublicConfig ? ['--type', 'public'] : [])], {
-                    cwd: projectDir,
-                    env: {
-                        ...process.env,
-                        ...opts.env,
-                        EXPO_NO_DOTENV: '1',
-                    },
-                });
-                exp = JSON.parse(stdout);
-            }
-            catch (err) {
-                if (!wasExpoConfigWarnPrinted) {
-                    log_1.default.warn(`Failed to read the app config from the project using "npx expo config" command: ${err.message}.`);
-                    log_1.default.warn('Falling back to the version of "@expo/config" shipped with the EAS CLI.');
-                    wasExpoConfigWarnPrinted = true;
-                }
-                exp = (0, config_1.getConfig)(projectDir, {
-                    skipSDKVersionRequirement: true,
-                    ...(opts.isPublicConfig ? { isPublicConfig: true } : {}),
-                    ...(opts.skipPlugins ? { skipPlugins: true } : {}),
-                }).exp;
-            }
+            const { stdout } = await (0, expoCli_1.spawnExpoCommand)(projectDir, ['config', '--json', ...(opts.isPublicConfig ? ['--type', 'public'] : [])], {
+                env: {
+                    EXPO_NO_DOTENV: '1',
+                },
+            });
+            exp = JSON.parse(stdout);
         }
         else {
             exp = (0, config_1.getConfig)(projectDir, {

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

@@ -1,9 +1,8 @@
 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>, vcsClient: Client): Promise<JSONObject>;
+export declare function getManagedApplicationTargetEntitlementsAsync(projectDir: string, env: Record<string, string>): Promise<JSONObject>;
 export declare function getNativeTargetEntitlementsAsync(projectDir: string, target: Target): Promise<JSONObject | null>;
 export {};