eas-cli 19.0.7 → 19.0.8

package/build/commands/go.d.ts

@@ -1,4 +1,5 @@
 import EasCommand from '../commandUtils/EasCommand';
+export declare function detectProjectSdkVersionAsync(projectDir: string): Promise<string | undefined>;
 export default class Go extends EasCommand {
     static description: string;
     static hidden: boolean;

package/build/commands/go.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectProjectSdkVersionAsync = detectProjectSdkVersionAsync;
 const tslib_1 = require("tslib");
+const config_1 = require("@expo/config");
 const apple_utils_1 = require("@expo/apple-utils");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -23,6 +25,7 @@ const WorkflowRunQuery_1 = require("../graphql/queries/WorkflowRunQuery");
 const log_1 = tslib_1.__importStar(require("../log"));
 const prompts_1 = require("../prompts");
 const ora_1 = require("../ora");
+const expoConfig_1 = require("../project/expoConfig");
 const fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync_1 = require("../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync");
 const uploadAccountScopedFileAsync_1 = require("../project/uploadAccountScopedFileAsync");
 const uploadAccountScopedProjectSourceAsync_1 = require("../project/uploadAccountScopedProjectSourceAsync");
@@ -34,6 +37,18 @@ const bundleIdentifier_1 = require("../project/ios/bundleIdentifier");
 function deriveBundleIdSlug(bundleId) {
     return bundleId.split('.').filter(Boolean).pop();
 }
+async function detectProjectSdkVersionAsync(projectDir) {
+    const paths = (0, config_1.getConfigFilePaths)(projectDir);
+    if (!paths.staticConfigPath && !paths.dynamicConfigPath) {
+        return;
+    }
+    try {
+        return (await (0, expoConfig_1.getPrivateExpoConfigAsync)(projectDir)).sdkVersion;
+    }
+    catch {
+        return;
+    }
+}
 const TESTFLIGHT_GROUP_NAME = 'Team (Expo)';
 async function setupTestFlightAsync(ascApp) {
     let group;
@@ -150,7 +165,11 @@ class Go extends EasCommand_1.default {
             nonInteractive: false,
         });
         log_1.default.withTick(`Logged in as ${chalk_1.default.cyan((0, User_1.getActorDisplayName)(actor))}`);
-        const sdkVersion = flags['sdk-version'];
+        const detectedSdkVersion = await detectProjectSdkVersionAsync(process.cwd());
+        if (detectedSdkVersion && !flags['sdk-version']) {
+            log_1.default.log(`Current project using SDK ${detectedSdkVersion.split('.')[0]}. Auto-selected same version. To use a different version, pass --sdk-version.`);
+        }
+        const sdkVersion = flags['sdk-version'] ?? detectedSdkVersion;
         const bundleId = flags['bundle-id'] ?? this.generateBundleId(actor);
         if (!(0, bundleIdentifier_1.isBundleIdentifierValid)(bundleId)) {
             throw new Error(`"${bundleId}" is not a valid iOS bundle identifier. ${bundleIdentifier_1.INVALID_BUNDLE_IDENTIFIER_MESSAGE} Pass a valid identifier with --bundle-id.`);
@@ -174,7 +193,8 @@ class Go extends EasCommand_1.default {
                 setupSpinner.stop();
                 log_1.default.markFreshLine();
             });
-            const { workflowUrl, workflowRunId } = await this.dispatchWorkflowAsync(graphqlClient, projectId, actor, bundleId, appName, ascApp.id, sdkVersion, tmpDir, vcsClient);
+            const { workflowUrl, workflowRunId, sdkVersion: resolvedSdkVersion, } = await this.dispatchWorkflowAsync(graphqlClient, projectId, actor, bundleId, appName, ascApp.id, sdkVersion, tmpDir, vcsClient);
+            log_1.default.withTick(`Using Expo Go SDK ${chalk_1.default.cyan(resolvedSdkVersion.split('.')[0])}`);
             log_1.default.withTick(`Build started: ${chalk_1.default.cyan(workflowUrl)}`);
             const status = await this.monitorWorkflowJobsAsync(graphqlClient, workflowRunId);
             if (status === generated_1.WorkflowRunStatus.Failure) {
@@ -319,7 +339,7 @@ class Go extends EasCommand_1.default {
             },
         });
         const workflowUrl = (0, url_1.getWorkflowRunUrl)(account.name, deriveBundleIdSlug(bundleId), result.id);
-        return { workflowUrl, workflowRunId: result.id };
+        return { workflowUrl, workflowRunId: result.id, sdkVersion: repackConfig.sdkVersion };
     }
     async monitorWorkflowJobsAsync(graphqlClient, workflowRunId) {
         const EXPECTED_BUILD_DURATION_SECONDS = 5 * 60;