eas-cli 7.1.3 → 7.3.0

package/build/graphql/generated.d.ts

@@ -5396,6 +5396,16 @@ export type CreateAndroidAppCredentialsMutation = {
                     clientId?: string | null;
                 };
             } | null;
+            googleServiceAccountKeyForFcmV1?: {
+                __typename?: 'GoogleServiceAccountKey';
+                id: string;
+                projectIdentifier: string;
+                privateKeyIdentifier: string;
+                clientEmail: string;
+                clientIdentifier: string;
+                createdAt: any;
+                updatedAt: any;
+            } | null;
             googleServiceAccountKeyForSubmissions?: {
                 __typename?: 'GoogleServiceAccountKey';
                 id: string;
@@ -5496,6 +5506,16 @@ export type SetFcmMutation = {
                     clientId?: string | null;
                 };
             } | null;
+            googleServiceAccountKeyForFcmV1?: {
+                __typename?: 'GoogleServiceAccountKey';
+                id: string;
+                projectIdentifier: string;
+                privateKeyIdentifier: string;
+                clientEmail: string;
+                clientIdentifier: string;
+                createdAt: any;
+                updatedAt: any;
+            } | null;
             googleServiceAccountKeyForSubmissions?: {
                 __typename?: 'GoogleServiceAccountKey';
                 id: string;
@@ -5596,6 +5616,126 @@ export type SetGoogleServiceAccountKeyForSubmissionsMutation = {
                     clientId?: string | null;
                 };
             } | null;
+            googleServiceAccountKeyForFcmV1?: {
+                __typename?: 'GoogleServiceAccountKey';
+                id: string;
+                projectIdentifier: string;
+                privateKeyIdentifier: string;
+                clientEmail: string;
+                clientIdentifier: string;
+                createdAt: any;
+                updatedAt: any;
+            } | null;
+            googleServiceAccountKeyForSubmissions?: {
+                __typename?: 'GoogleServiceAccountKey';
+                id: string;
+                projectIdentifier: string;
+                privateKeyIdentifier: string;
+                clientEmail: string;
+                clientIdentifier: string;
+                createdAt: any;
+                updatedAt: any;
+            } | null;
+            androidAppBuildCredentialsList: Array<{
+                __typename?: 'AndroidAppBuildCredentials';
+                id: string;
+                isDefault: boolean;
+                isLegacy: boolean;
+                name: string;
+                androidKeystore?: {
+                    __typename?: 'AndroidKeystore';
+                    id: string;
+                    type: AndroidKeystoreType;
+                    keystore: string;
+                    keystorePassword: string;
+                    keyAlias: string;
+                    keyPassword?: string | null;
+                    md5CertificateFingerprint?: string | null;
+                    sha1CertificateFingerprint?: string | null;
+                    sha256CertificateFingerprint?: string | null;
+                    createdAt: any;
+                    updatedAt: any;
+                } | null;
+            }>;
+        };
+    };
+};
+export type SetGoogleServiceAccountKeyForFcmV1MutationVariables = Exact<{
+    androidAppCredentialsId: Scalars['ID']['input'];
+    googleServiceAccountKeyId: Scalars['ID']['input'];
+}>;
+export type SetGoogleServiceAccountKeyForFcmV1Mutation = {
+    __typename?: 'RootMutation';
+    androidAppCredentials: {
+        __typename?: 'AndroidAppCredentialsMutation';
+        setGoogleServiceAccountKeyForFcmV1: {
+            __typename?: 'AndroidAppCredentials';
+            id: string;
+            applicationIdentifier?: string | null;
+            isLegacy: boolean;
+            app: {
+                __typename?: 'App';
+                id: string;
+                fullName: string;
+                slug: string;
+                ownerAccount: {
+                    __typename?: 'Account';
+                    id: string;
+                    name: string;
+                    ownerUserActor?: {
+                        __typename?: 'SSOUser';
+                        id: string;
+                        username: string;
+                    } | {
+                        __typename?: 'User';
+                        id: string;
+                        username: string;
+                    } | null;
+                    users: Array<{
+                        __typename?: 'UserPermission';
+                        role: Role;
+                        actor: {
+                            __typename?: 'Robot';
+                            id: string;
+                        } | {
+                            __typename?: 'SSOUser';
+                            id: string;
+                        } | {
+                            __typename?: 'User';
+                            id: string;
+                        };
+                    }>;
+                };
+            };
+            androidFcm?: {
+                __typename?: 'AndroidFcm';
+                id: string;
+                credential: any;
+                version: AndroidFcmVersion;
+                createdAt: any;
+                updatedAt: any;
+                snippet: {
+                    __typename?: 'FcmSnippetLegacy';
+                    firstFourCharacters: string;
+                    lastFourCharacters: string;
+                } | {
+                    __typename?: 'FcmSnippetV1';
+                    projectId: string;
+                    keyId: string;
+                    serviceAccountEmail: string;
+                    clientId?: string | null;
+                };
+            } | null;
+            googleServiceAccountKeyForFcmV1?: {
+                __typename?: 'GoogleServiceAccountKey';
+                id: string;
+                projectIdentifier: string;
+                privateKeyIdentifier: string;
+                clientEmail: string;
+                clientIdentifier: string;
+                createdAt: any;
+                updatedAt: any;
+            } | null;
             googleServiceAccountKeyForSubmissions?: {
                 __typename?: 'GoogleServiceAccountKey';
                 id: string;
@@ -5812,6 +5952,16 @@ export type CommonAndroidAppCredentialsWithBuildCredentialsByApplicationIdentifi
                         clientId?: string | null;
                     };
                 } | null;
+                googleServiceAccountKeyForFcmV1?: {
+                    __typename?: 'GoogleServiceAccountKey';
+                    id: string;
+                    projectIdentifier: string;
+                    privateKeyIdentifier: string;
+                    clientEmail: string;
+                    clientIdentifier: string;
+                    createdAt: any;
+                    updatedAt: any;
+                } | null;
                 googleServiceAccountKeyForSubmissions?: {
                     __typename?: 'GoogleServiceAccountKey';
                     id: string;
@@ -10793,6 +10943,16 @@ export type CommonAndroidAppCredentialsFragment = {
             clientId?: string | null;
         };
     } | null;
+    googleServiceAccountKeyForFcmV1?: {
+        __typename?: 'GoogleServiceAccountKey';
+        id: string;
+        projectIdentifier: string;
+        privateKeyIdentifier: string;
+        clientEmail: string;
+        clientIdentifier: string;
+        createdAt: any;
+        updatedAt: any;
+    } | null;
     googleServiceAccountKeyForSubmissions?: {
         __typename?: 'GoogleServiceAccountKey';
         id: string;

package/build/graphql/types/credentials/AndroidAppCredentials.js

@@ -20,6 +20,10 @@ exports.CommonAndroidAppCredentialsFragmentNode = (0, graphql_tag_1.default) `
       id
       ...AndroidFcmFragment
     }
+    googleServiceAccountKeyForFcmV1 {
+      id
+      ...GoogleServiceAccountKeyFragment
+    }
     googleServiceAccountKeyForSubmissions {
       id
       ...GoogleServiceAccountKeyFragment

package/build/project/customBuildConfig.js

@@ -20,7 +20,7 @@ async function validateCustomBuildConfigAsync({ profile, projectDir, vcsClient,
     }
     try {
         const config = await (0, steps_1.readAndValidateBuildConfigAsync)(configPath, {
-            skipNamespacedFunctionsCheck: true,
+            skipNamespacedFunctionsOrFunctionGroupsCheck: true,
         });
         return {
             workflowName: config.build.name,

package/build/project/publish.d.ts

@@ -68,13 +68,12 @@ export declare function convertAssetToUpdateInfoGroupFormatAsync(asset: RawAsset
  * This will be sorted later based on the platform's runtime versions.
  */
 export declare function buildUnsortedUpdateInfoGroupAsync(assets: CollectedAssets, exp: ExpoConfig): Promise<UpdateInfoGroup>;
-export declare function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clearCache, dev, }: {
+export declare function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clearCache, }: {
     projectDir: string;
     inputDir: string;
     exp: Pick<ExpoConfig, 'sdkVersion' | 'web'>;
     platformFlag: ExpoCLIExportPlatformFlag;
     clearCache?: boolean;
-    dev?: boolean;
 }): Promise<void>;
 export declare function resolveInputDirectoryAsync(inputDir: string, { skipBundler }: {
     skipBundler?: boolean;
@@ -137,7 +136,12 @@ export declare function getUpdateMessageForCommandAsync(vcsClient: Client, { upd
 export declare const defaultPublishPlatforms: Platform[];
 export declare function getRequestedPlatform(platform: ExpoCLIExportPlatformFlag): RequestedPlatform | null;
 /** Get runtime versions grouped by platform. Runtime version is always `null` on web where the platform is always backwards compatible. */
-export declare function getRuntimeVersionObjectAsync(exp: ExpoConfig, platforms: Platform[], projectDir: string, vcsClient: Client): Promise<{
+export declare function getRuntimeVersionObjectAsync({ exp, platforms, projectDir, vcsClient, }: {
+    exp: ExpoConfig;
+    platforms: Platform[];
+    projectDir: string;
+    vcsClient: Client;
+}): Promise<{
     platform: string;
     runtimeVersion: string;
 }[]>;

package/build/project/publish.js

@@ -27,6 +27,7 @@ const getBranchNameFromChannelNameAsync_1 = require("../update/getBranchNameFrom
 const utils_2 = require("../update/utils");
 const uploads_1 = require("../uploads");
 const expoCli_1 = require("../utils/expoCli");
+const expoUpdatesCli_1 = require("../utils/expoUpdatesCli");
 const chunk_1 = tslib_1.__importDefault(require("../utils/expodash/chunk"));
 const filter_1 = require("../utils/expodash/filter");
 const uniqBy_1 = tslib_1.__importDefault(require("../utils/expodash/uniqBy"));
@@ -117,7 +118,7 @@ async function buildUnsortedUpdateInfoGroupAsync(assets, exp) {
     return updateInfoGroup;
 }
 exports.buildUnsortedUpdateInfoGroupAsync = buildUnsortedUpdateInfoGroupAsync;
-async function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clearCache, dev = false, }) {
+async function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clearCache, }) {
     var _a;
     const packageJSON = json_file_1.default.read(path_1.default.resolve(projectDir, 'package.json'));
     if (!packageJSON) {
@@ -134,7 +135,6 @@ async function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clea
             '--dump-sourcemap',
             '--dump-assetmap',
             `--platform=${platformFlag}`,
-            ...(dev ? ['--dev'] : []),
             ...(clearCache ? ['--clear'] : []),
         ]);
     }
@@ -151,7 +151,6 @@ async function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clea
             '--dump-sourcemap',
             '--dump-assetmap',
             ...platformArgs,
-            ...(dev ? ['--dev'] : []),
             ...(clearCache ? ['--clear'] : []),
         ]);
     }
@@ -169,7 +168,6 @@ async function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clea
         '--dump-sourcemap',
         '--dump-assetmap',
         `--platform=${platformFlag}`,
-        ...(dev ? ['--dev'] : []),
         ...(clearCache ? ['--clear'] : []),
     ]);
 }
@@ -466,32 +464,53 @@ function getRequestedPlatform(platform) {
 }
 exports.getRequestedPlatform = getRequestedPlatform;
 /** Get runtime versions grouped by platform. Runtime version is always `null` on web where the platform is always backwards compatible. */
-async function getRuntimeVersionObjectAsync(exp, platforms, projectDir, vcsClient) {
-    var _a, _b;
-    for (const platform of platforms) {
-        if (platform === 'web') {
-            continue;
-        }
-        const isPolicy = typeof ((_b = (_a = exp[platform]) === null || _a === void 0 ? void 0 : _a.runtimeVersion) !== null && _b !== void 0 ? _b : exp.runtimeVersion) === 'object';
-        if (isPolicy) {
-            const isManaged = (await (0, workflow_1.resolveWorkflowAsync)(projectDir, platform, vcsClient)) ===
-                eas_build_job_1.Workflow.MANAGED;
-            if (!isManaged) {
-                throw new Error(`You're currently using the bare workflow, where runtime version policies are not supported. You must set your runtime version manually. For example, define your runtime version as "1.0.0", not {"policy": "appVersion"} in your app config. ${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/runtime-versions')}`);
-            }
-        }
-    }
-    return await Promise.all([...new Set(platforms)].map(async (platform) => {
-        if (platform === 'web') {
-            return { platform: 'web', runtimeVersion: 'UNVERSIONED' };
-        }
+async function getRuntimeVersionObjectAsync({ exp, platforms, projectDir, vcsClient, }) {
+    return await Promise.all(platforms.map(async (platform) => {
         return {
             platform,
-            runtimeVersion: (0, nullthrows_1.default)(await config_plugins_1.Updates.getRuntimeVersionAsync(projectDir, exp, platform), `Unable to determine runtime version for ${platform_1.requestedPlatformDisplayNames[platform]}. ${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/runtime-versions/')}`),
+            runtimeVersion: await getRuntimeVersionForPlatformAsync({
+                exp,
+                platform,
+                projectDir,
+                vcsClient,
+            }),
         };
     }));
 }
 exports.getRuntimeVersionObjectAsync = getRuntimeVersionObjectAsync;
+async function getRuntimeVersionForPlatformAsync({ exp, platform, projectDir, vcsClient, }) {
+    var _a, _b;
+    if (platform === 'web') {
+        return 'UNVERSIONED';
+    }
+    const runtimeVersion = (_b = (_a = exp[platform]) === null || _a === void 0 ? void 0 : _a.runtimeVersion) !== null && _b !== void 0 ? _b : exp.runtimeVersion;
+    if (typeof runtimeVersion === 'object') {
+        const policy = runtimeVersion.policy;
+        if (policy === 'fingerprintExperimental') {
+            // log to inform the user that the fingerprint has been calculated
+            log_1.default.warn(`Calculating native fingerprint for platform ${platform} using current state of the "${platform}" directory. ` +
+                `If the fingerprint differs from the build's fingerint, ensure the state of your project is consistent ` +
+                `(repository is clean, ios and android native directories are in the same state as the build if applicable).`);
+            const fingerprintRawString = await (0, expoUpdatesCli_1.expoUpdatesCommandAsync)(projectDir, [
+                'fingerprint:generate',
+                '--platform',
+                platform,
+            ]);
+            const fingerprintObject = JSON.parse(fingerprintRawString);
+            const hash = (0, nullthrows_1.default)(fingerprintObject.hash, 'invalid response from expo-update CLI for fingerprint generation');
+            return hash;
+        }
+        const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, platform, vcsClient);
+        if (workflow !== eas_build_job_1.Workflow.MANAGED) {
+            throw new Error(`You're currently using the bare workflow, where runtime version policies are not supported. You must set your runtime version manually. For example, define your runtime version as "1.0.0", not {"policy": "appVersion"} in your app config. ${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/runtime-versions')}`);
+        }
+    }
+    const resolvedRuntimeVersion = await config_plugins_1.Updates.getRuntimeVersionAsync(projectDir, exp, platform);
+    if (!resolvedRuntimeVersion) {
+        throw new Error(`Unable to determine runtime version for ${platform_1.requestedPlatformDisplayNames[platform]}. ${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/runtime-versions/')}`);
+    }
+    return resolvedRuntimeVersion;
+}
 function getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions) {
     const runtimeToPlatformMapping = [];
     for (const runtime of runtimeVersions) {

package/build/submit/android/ServiceAccountSource.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
-const SetUpGoogleServiceAccountKey_1 = require("../../credentials/android/actions/SetUpGoogleServiceAccountKey");
+const SetUpGoogleServiceAccountKeyForSubmissions_1 = require("../../credentials/android/actions/SetUpGoogleServiceAccountKeyForSubmissions");
 const googleServiceAccountKey_1 = require("../../credentials/android/utils/googleServiceAccountKey");
 const log_1 = tslib_1.__importStar(require("../../log"));
 const applicationId_1 = require("../../project/android/applicationId");
@@ -67,7 +67,7 @@ async function getServiceAccountFromCredentialsServiceAsync(ctx, source) {
         androidApplicationIdentifier: (_a = source.androidApplicationIdentifier) !== null && _a !== void 0 ? _a : (await promptForApplicationIdAsync()),
     };
     log_1.default.log(`Looking up credentials configuration for ${appLookupParams.androidApplicationIdentifier}...`);
-    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey_1.SetUpGoogleServiceAccountKey(appLookupParams);
+    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKeyForSubmissions_1.SetUpGoogleServiceAccountKeyForSubmissions(appLookupParams);
     const androidAppCredentials = await setupGoogleServiceAccountKeyAction.runAsync(ctx.credentialsCtx);
     const googleServiceAccountKey = (0, nullthrows_1.default)(androidAppCredentials.googleServiceAccountKeyForSubmissions, 'Credentials Service must provide a valid GoogleServiceAccountKey');
     return {

package/build/utils/expoUpdatesCli.d.ts

@@ -0,0 +1 @@
+export declare function expoUpdatesCommandAsync(projectDir: string, args: string[]): Promise<string>;

package/build/utils/expoUpdatesCli.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.expoUpdatesCommandAsync = void 0;
+const tslib_1 = require("tslib");
+const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const resolve_from_1 = tslib_1.__importStar(require("resolve-from"));
+const log_1 = tslib_1.__importStar(require("../log"));
+async function expoUpdatesCommandAsync(projectDir, args) {
+    var _a;
+    let expoUpdatesCli;
+    try {
+        expoUpdatesCli =
+            (_a = (0, resolve_from_1.silent)(projectDir, 'expo-updates/bin/cli')) !== null && _a !== void 0 ? _a : (0, resolve_from_1.default)(projectDir, 'expo-updates/bin/cli.js');
+    }
+    catch (e) {
+        if (e.code === 'MODULE_NOT_FOUND') {
+            throw new Error(`The \`expo-updates\` package was not found. Follow the installation directions at ${(0, log_1.link)('https://docs.expo.dev/bare/installing-expo-modules/')}`);
+        }
+        throw e;
+    }
+    const spawnPromise = (0, spawn_async_1.default)(expoUpdatesCli, args, {
+        stdio: ['inherit', 'pipe', 'pipe'], // inherit stdin so user can install a missing expo-cli from inside this command
+    });
+    const { child: { stderr }, } = spawnPromise;
+    if (!stderr) {
+        throw new Error('Failed to spawn expo-updates cli');
+    }
+    stderr.on('data', data => {
+        for (const line of data.toString().trim().split('\n')) {
+            log_1.default.warn(`${chalk_1.default.gray('[expo-cli]')} ${line}`);
+        }
+    });
+    const result = await spawnPromise;
+    return result.stdout;
+}
+exports.expoUpdatesCommandAsync = expoUpdatesCommandAsync;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "7.1.3",
+  "version": "7.3.0",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -2156,12 +2156,6 @@
           ],
           "default": "all"
         },
-        "dev": {
-          "name": "dev",
-          "type": "boolean",
-          "description": "Publish a development bundle",
-          "allowNo": false
-        },
         "auto": {
           "name": "auto",
           "type": "boolean",

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "7.1.3",
+  "version": "7.3.0",
   "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "1.3.2",
+    "@expo/apple-utils": "1.4.0",
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "8.5.4",
     "@expo/config-plugins": "7.8.4",
     "@expo/config-types": "50.0.0",
-    "@expo/eas-build-job": "1.0.61",
-    "@expo/eas-json": "7.1.3",
+    "@expo/eas-build-job": "1.0.71",
+    "@expo/eas-json": "7.3.0",
     "@expo/json-file": "8.2.37",
     "@expo/multipart-body-parser": "1.1.0",
     "@expo/osascript": "2.0.33",
@@ -27,7 +27,7 @@
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.66",
+    "@expo/steps": "1.0.70",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^1.26.2",
     "@oclif/plugin-autocomplete": "^2.3.10",
@@ -222,5 +222,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "caf2403dfdb341c752084c8f88b1f491cc2380c8"
+  "gitHead": "a074ce0cffabae81f5a313df393ba2d80086e4f9"
 }