eas-cli 16.1.0 → 16.2.1

package/build/run/ios/xcode.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openAppStoreAsync = exports.getXcodeVersionAsync = exports.APP_STORE_ID = exports.MIN_XCODE_VERSION = void 0;
+exports.openAppStoreAsync = exports.resolveXcodeProjectAsync = exports.getXcodeBuildSettingsAsync = exports.getXcodeVersionAsync = exports.APP_STORE_ID = exports.MIN_XCODE_VERSION = 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 fast_glob_1 = tslib_1.__importDefault(require("fast-glob"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const log_1 = tslib_1.__importDefault(require("../../log"));
 // Based on the RN docs (Aug 2020).
@@ -26,6 +27,28 @@ async function getXcodeVersionAsync() {
     }
 }
 exports.getXcodeVersionAsync = getXcodeVersionAsync;
+async function getXcodeBuildSettingsAsync(xcworkspacePath, scheme) {
+    const { stdout } = await (0, spawn_async_1.default)('xcodebuild', [
+        '-workspace',
+        xcworkspacePath,
+        '-scheme',
+        scheme,
+        '-showBuildSettings',
+        '-json',
+    ]);
+    return JSON.parse(stdout);
+}
+exports.getXcodeBuildSettingsAsync = getXcodeBuildSettingsAsync;
+async function resolveXcodeProjectAsync(projectRoot) {
+    const ignoredPaths = ['**/@(Carthage|Pods|vendor|node_modules)/**'];
+    const paths = await (0, fast_glob_1.default)(`ios/*.xcworkspace`, {
+        cwd: projectRoot,
+        onlyDirectories: true,
+        ignore: ignoredPaths,
+    });
+    return paths[0];
+}
+exports.resolveXcodeProjectAsync = resolveXcodeProjectAsync;
 async function openAppStoreAsync(appId) {
     const link = getAppStoreLink(appId);
     await (0, spawn_async_1.default)(`open`, [link]);

package/build/uploads.js

@@ -6,9 +6,10 @@ const form_data_1 = tslib_1.__importDefault(require("form-data"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const promise_retry_1 = tslib_1.__importDefault(require("promise-retry"));
 const fetch_1 = tslib_1.__importDefault(require("./fetch"));
+const generated_1 = require("./graphql/generated");
 const UploadSessionMutation_1 = require("./graphql/mutations/UploadSessionMutation");
 async function uploadFileAtPathToGCSAsync(graphqlClient, type, path, handleProgressEvent = () => { }) {
-    const signedUrl = await UploadSessionMutation_1.UploadSessionMutation.createUploadSessionAsync(graphqlClient, type);
+    const signedUrl = await UploadSessionMutation_1.UploadSessionMutation.createUploadSessionAsync(graphqlClient, type, type === generated_1.UploadSessionType.EasShareGcsAppArchive ? path : undefined);
     await uploadWithSignedUrlWithProgressAsync(path, signedUrl, handleProgressEvent);
     return signedUrl.bucketKey;
 }

package/build/utils/pollForBackgroundJobReceiptAsync.d.ts

@@ -0,0 +1,29 @@
+import { CombinedError } from '@urql/core';
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+import { BackgroundJobReceiptDataFragment } from '../graphql/generated';
+export declare enum BackgroundJobReceiptPollErrorType {
+    NULL_RECEIPT = 0,
+    JOB_FAILED_NO_WILL_RETRY = 1,
+    TIMEOUT = 2
+}
+export type BackgroundJobReceiptPollErrorData = {
+    errorType: BackgroundJobReceiptPollErrorType.NULL_RECEIPT;
+} | {
+    errorType: BackgroundJobReceiptPollErrorType.JOB_FAILED_NO_WILL_RETRY;
+    receiptErrorMessage: string | undefined | null;
+} | {
+    errorType: BackgroundJobReceiptPollErrorType.TIMEOUT;
+};
+export declare class BackgroundJobReceiptPollError extends Error {
+    readonly errorData: BackgroundJobReceiptPollErrorData;
+    constructor(errorData: BackgroundJobReceiptPollErrorData);
+    static createErrorMessage(errorData: BackgroundJobReceiptPollErrorData): string;
+}
+export type BackgroundJobPollErrorCondition = (error: CombinedError) => {
+    errorIndicatesSuccess: boolean;
+};
+export declare function pollForBackgroundJobReceiptAsync(graphqlClient: ExpoGraphqlClient, backgroundJobReceipt: BackgroundJobReceiptDataFragment): Promise<BackgroundJobReceiptDataFragment>;
+export declare function pollForBackgroundJobReceiptAsync(graphqlClient: ExpoGraphqlClient, backgroundJobReceipt: BackgroundJobReceiptDataFragment, options?: {
+    onBackgroundJobReceiptPollError?: BackgroundJobPollErrorCondition;
+    pollInterval?: number;
+}): Promise<BackgroundJobReceiptDataFragment | null>;

package/build/utils/pollForBackgroundJobReceiptAsync.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pollForBackgroundJobReceiptAsync = exports.BackgroundJobReceiptPollError = exports.BackgroundJobReceiptPollErrorType = void 0;
+const core_1 = require("@urql/core");
+const set_interval_async_1 = require("set-interval-async");
+const generated_1 = require("../graphql/generated");
+const BackgroundJobReceiptQuery_1 = require("../graphql/queries/BackgroundJobReceiptQuery");
+var BackgroundJobReceiptPollErrorType;
+(function (BackgroundJobReceiptPollErrorType) {
+    BackgroundJobReceiptPollErrorType[BackgroundJobReceiptPollErrorType["NULL_RECEIPT"] = 0] = "NULL_RECEIPT";
+    BackgroundJobReceiptPollErrorType[BackgroundJobReceiptPollErrorType["JOB_FAILED_NO_WILL_RETRY"] = 1] = "JOB_FAILED_NO_WILL_RETRY";
+    BackgroundJobReceiptPollErrorType[BackgroundJobReceiptPollErrorType["TIMEOUT"] = 2] = "TIMEOUT";
+})(BackgroundJobReceiptPollErrorType || (exports.BackgroundJobReceiptPollErrorType = BackgroundJobReceiptPollErrorType = {}));
+class BackgroundJobReceiptPollError extends Error {
+    errorData;
+    constructor(errorData) {
+        super(BackgroundJobReceiptPollError.createErrorMessage(errorData));
+        this.errorData = errorData;
+    }
+    static createErrorMessage(errorData) {
+        switch (errorData.errorType) {
+            case BackgroundJobReceiptPollErrorType.NULL_RECEIPT:
+                return 'Background job receipt was null.';
+            case BackgroundJobReceiptPollErrorType.JOB_FAILED_NO_WILL_RETRY:
+                return `Background job failed with error: ${errorData.receiptErrorMessage}`;
+            case BackgroundJobReceiptPollErrorType.TIMEOUT:
+                return 'Background job timed out.';
+        }
+    }
+}
+exports.BackgroundJobReceiptPollError = BackgroundJobReceiptPollError;
+async function fetchBackgroundJobReceiptAsync(graphqlClient, receiptId) {
+    try {
+        return [await BackgroundJobReceiptQuery_1.BackgroundJobReceiptQuery.byIdAsync(graphqlClient, receiptId), null];
+    }
+    catch (error) {
+        if (error instanceof core_1.CombinedError) {
+            return [null, error];
+        }
+        throw error;
+    }
+}
+async function pollForBackgroundJobReceiptAsync(graphqlClient, backgroundJobReceipt, options) {
+    return await new Promise((resolve, reject) => {
+        let numChecks = 0;
+        const intervalHandle = (0, set_interval_async_1.setIntervalAsync)(async function pollForDeletionFinishedAsync() {
+            function failBackgroundDeletion(error) {
+                void (0, set_interval_async_1.clearIntervalAsync)(intervalHandle);
+                reject(error);
+            }
+            const [receipt, error] = await fetchBackgroundJobReceiptAsync(graphqlClient, backgroundJobReceipt.id);
+            if (!receipt) {
+                if (error instanceof core_1.CombinedError) {
+                    const errorResult = options?.onBackgroundJobReceiptPollError?.(error);
+                    if (errorResult?.errorIndicatesSuccess) {
+                        void (0, set_interval_async_1.clearIntervalAsync)(intervalHandle);
+                        resolve(null);
+                        return;
+                    }
+                }
+                failBackgroundDeletion(new BackgroundJobReceiptPollError({
+                    errorType: BackgroundJobReceiptPollErrorType.NULL_RECEIPT,
+                }));
+                return;
+            }
+            // job failed and will not retry
+            if (receipt.state === generated_1.BackgroundJobState.Failure && !receipt.willRetry) {
+                failBackgroundDeletion(new BackgroundJobReceiptPollError({
+                    errorType: BackgroundJobReceiptPollErrorType.JOB_FAILED_NO_WILL_RETRY,
+                    receiptErrorMessage: receipt.errorMessage,
+                }));
+                return;
+            }
+            // all else fails, stop polling after 90 checks. This should only happen if there's an
+            // issue with receipts not setting `willRetry` to false when they fail within a reasonable
+            // amount of time.
+            if (numChecks > 90) {
+                failBackgroundDeletion(new BackgroundJobReceiptPollError({
+                    errorType: BackgroundJobReceiptPollErrorType.TIMEOUT,
+                }));
+                return;
+            }
+            if (receipt.state === generated_1.BackgroundJobState.Success) {
+                void (0, set_interval_async_1.clearIntervalAsync)(intervalHandle);
+                resolve(receipt);
+                return;
+            }
+            numChecks++;
+        }, options?.pollInterval ?? 1000);
+    });
+}
+exports.pollForBackgroundJobReceiptAsync = pollForBackgroundJobReceiptAsync;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "16.1.0",
+  "version": "16.2.1",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -214,6 +214,52 @@
         "vcsClient": {}
       }
     },
+    "upload": {
+      "id": "upload",
+      "description": "upload a local build and generate a sharable link",
+      "strict": true,
+      "pluginName": "eas-cli",
+      "pluginAlias": "eas-cli",
+      "pluginType": "core",
+      "hidden": true,
+      "aliases": [],
+      "flags": {
+        "platform": {
+          "name": "platform",
+          "type": "option",
+          "char": "p",
+          "helpValue": "(ios|android)",
+          "multiple": false,
+          "options": [
+            "ios",
+            "android"
+          ]
+        },
+        "build-path": {
+          "name": "build-path",
+          "type": "option",
+          "description": "Path for the local build",
+          "multiple": false
+        },
+        "fingerprint": {
+          "name": "fingerprint",
+          "type": "option",
+          "description": "Fingerprint hash of the local build",
+          "multiple": false
+        },
+        "non-interactive": {
+          "name": "non-interactive",
+          "type": "boolean",
+          "description": "Run the command in non-interactive mode.",
+          "allowNo": false
+        }
+      },
+      "args": {},
+      "contextDefinition": {
+        "projectId": {},
+        "loggedIn": {}
+      }
+    },
     "account:login": {
       "id": "account:login",
       "description": "log in with your Expo account",
@@ -2781,6 +2827,7 @@
         "$ eas fingerprint:compare <FINGERPRINT-HASH> \t # Compare fingerprint against local directory",
         "$ eas fingerprint:compare <FINGERPRINT-HASH-1> <FINGERPRINT-HASH-2> \t # Compare provided fingerprints",
         "$ eas fingerprint:compare --build-id <BUILD-ID> \t # Compare fingerprint from build against local directory",
+        "$ eas fingerprint:compare --build-id <BUILD-ID> --environment production \t # Compare fingerprint from build against local directory with the \"production\" environment",
         "$ eas fingerprint:compare --build-id <BUILD-ID-1> --build-id <BUILD-ID-2>\t # Compare fingerprint from a build against another build",
         "$ eas fingerprint:compare --build-id <BUILD-ID> --update-id <UPDATE-ID>\t # Compare fingerprint from build against fingerprint from update",
         "$ eas fingerprint:compare <FINGERPRINT-HASH> --update-id <UPDATE-ID> \t # Compare fingerprint from update against provided fingerprint"
@@ -2810,6 +2857,18 @@
           "description": "Open the fingerprint comparison in the browser",
           "allowNo": false
         },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "description": "If generating a fingerprint from the local directory, use the specified environment.",
+          "helpValue": "(development|preview|production)",
+          "multiple": false,
+          "options": [
+            "development",
+            "preview",
+            "production"
+          ]
+        },
         "json": {
           "name": "json",
           "type": "boolean",
@@ -2842,7 +2901,8 @@
         "projectId": {},
         "loggedIn": {},
         "privateProjectConfig": {},
-        "vcsClient": {}
+        "vcsClient": {},
+        "getServerSideEnvironmentVariablesAsync": {}
       }
     },
     "fingerprint:generate": {
@@ -2852,11 +2912,11 @@
       "pluginName": "eas-cli",
       "pluginAlias": "eas-cli",
       "pluginType": "core",
-      "hidden": true,
       "aliases": [],
       "examples": [
         "$ eas fingerprint:generate  \t # Generate fingerprint in interactive mode",
-        "$ eas fingerprint:generate --profile preview  \t # Generate a fingerprint using the \"preview\" build profile",
+        "$ eas fingerprint:generate --build-profile preview  \t # Generate a fingerprint using the \"preview\" build profile",
+        "$ eas fingerprint:generate --environment preview  \t # Generate a fingerprint using the \"preview\" environment",
         "$ eas fingerprint:generate --json --non-interactive --platform android  \t # Output fingerprint json to stdout"
       ],
       "flags": {
@@ -2881,6 +2941,19 @@
             "development",
             "preview",
             "production"
+          ],
+          "exclusive": [
+            "build-profile"
+          ]
+        },
+        "build-profile": {
+          "name": "build-profile",
+          "type": "option",
+          "char": "e",
+          "description": "Name of the build profile from eas.json.",
+          "multiple": false,
+          "exclusive": [
+            "environment"
           ]
         },
         "json": {
@@ -2905,7 +2978,9 @@
         "loggedIn": {},
         "privateProjectConfig": {},
         "vcsClient": {},
-        "getServerSideEnvironmentVariablesAsync": {}
+        "getServerSideEnvironmentVariablesAsync": {},
+        "getDynamicPublicProjectConfigAsync": {},
+        "getDynamicPrivateProjectConfigAsync": {}
       }
     },
     "metadata:lint": {

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "16.1.0",
+  "version": "16.2.1",
   "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "2.1.11",
+    "@expo/apple-utils": "2.1.12",
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "10.0.6",
     "@expo/config-plugins": "9.0.12",
@@ -68,6 +68,7 @@
     "nanoid": "3.3.8",
     "node-fetch": "2.6.7",
     "node-forge": "1.3.1",
+    "node-stream-zip": "1.15.0",
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
@@ -78,6 +79,7 @@
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
     "semver": "7.5.4",
+    "set-interval-async": "3.0.3",
     "slash": "3.0.0",
     "tar": "6.2.1",
     "tar-stream": "3.1.7",
@@ -237,5 +239,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "66c6c8ab0b5da8e514cf244a6bbf2f27472fafb5"
+  "gitHead": "89d1572f9d84809c951ecbe359ea37b5c25fdaf3"
 }