eas-cli 12.5.1 → 12.5.3

package/build/prompts.js

@@ -32,9 +32,11 @@ async function confirmAsync(question, options) {
 }
 exports.confirmAsync = confirmAsync;
 async function selectAsync(message, choices, config) {
+    const initial = config?.initial ? choices.findIndex(({ value }) => value === config.initial) : 0;
     const { value } = await promptAsync({
         message,
         choices,
+        initial,
         name: 'value',
         type: 'select',
         warn: config?.warningMessageForDisabledEntries,

package/build/update/republish.js

@@ -29,6 +29,7 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
     (0, assert_1.default)(updatesToPublish.every(isSameGroup), 'All updates being republished must belong to the same update group');
     (0, assert_1.default)(updatesToPublish.every(u => u.isRollBackToEmbedded) ||
         updatesToPublish.every(u => !u.isRollBackToEmbedded), 'All updates must either be roll back to embedded updates or not');
+    (0, assert_1.default)(!updatesToPublish.some(u => !!u.rolloutControlUpdate), 'Cannot republish an update that is being rolled-out. Either complete the update rollout and then republish or publish a new rollout update.');
     const { runtimeVersion } = arbitraryUpdate;
     // If codesigning was created for the original update, we need to add it to the republish.
     // If one wishes to not sign the republish or sign with a different key, a normal publish should

package/build/utils/prompts.d.ts

@@ -1,9 +1,22 @@
-import { EnvironmentVariableEnvironment } from '../graphql/generated';
-export declare function promptVariableEnvironmentAsync(nonInteractive: boolean): Promise<EnvironmentVariableEnvironment>;
+import { EnvironmentSecretType, EnvironmentVariableEnvironment, EnvironmentVariableVisibility } from '../graphql/generated';
+export declare function promptVariableTypeAsync(nonInteractive: boolean, initialType?: EnvironmentSecretType): Promise<EnvironmentSecretType>;
+export declare function promptVariableVisibilityAsync(nonInteractive: boolean, selectedVisibility?: EnvironmentVariableVisibility | null): Promise<EnvironmentVariableVisibility>;
+type EnvironmentPromptArgs = {
+    nonInteractive: boolean;
+    selectedEnvironments?: EnvironmentVariableEnvironment[];
+    availableEnvironments?: EnvironmentVariableEnvironment[];
+};
+export declare function promptVariableEnvironmentAsync(input: EnvironmentPromptArgs & {
+    multiple: true;
+}): Promise<EnvironmentVariableEnvironment[]>;
+export declare function promptVariableEnvironmentAsync(input: EnvironmentPromptArgs & {
+    multiple?: false;
+}): Promise<EnvironmentVariableEnvironment>;
 export declare function promptVariableValueAsync({ nonInteractive, required, hidden, initial, }: {
     nonInteractive: boolean;
     required?: boolean;
     initial?: string | null;
     hidden?: boolean;
 }): Promise<string>;
-export declare function promptVariableNameAsync(nonInteractive: boolean): Promise<string>;
+export declare function promptVariableNameAsync(nonInteractive: boolean, initialValue?: string): Promise<string>;
+export {};

package/build/utils/prompts.js

@@ -1,19 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptVariableNameAsync = exports.promptVariableValueAsync = exports.promptVariableEnvironmentAsync = void 0;
+exports.promptVariableNameAsync = exports.promptVariableValueAsync = exports.promptVariableEnvironmentAsync = exports.promptVariableVisibilityAsync = exports.promptVariableTypeAsync = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const capitalize_1 = tslib_1.__importDefault(require("./expodash/capitalize"));
 const generated_1 = require("../graphql/generated");
 const prompts_1 = require("../prompts");
-async function promptVariableEnvironmentAsync(nonInteractive) {
+async function promptVariableTypeAsync(nonInteractive, initialType) {
+    if (nonInteractive) {
+        throw new Error('The `--type` flag must be set when running in `--non-interactive` mode.');
+    }
+    const options = [
+        {
+            title: 'String',
+            value: generated_1.EnvironmentSecretType.String,
+        },
+        {
+            title: 'File',
+            value: generated_1.EnvironmentSecretType.FileBase64,
+        },
+    ];
+    return await (0, prompts_1.selectAsync)('Select the type of variable', options, {
+        initial: initialType,
+    });
+}
+exports.promptVariableTypeAsync = promptVariableTypeAsync;
+async function promptVariableVisibilityAsync(nonInteractive, selectedVisibility) {
+    if (nonInteractive) {
+        throw new Error('The `--visibility` flag must be set when running in `--non-interactive` mode.');
+    }
+    return await (0, prompts_1.selectAsync)('Select visibility:', Object.values(generated_1.EnvironmentVariableVisibility).map(visibility => ({
+        title: (0, capitalize_1.default)(visibility),
+        value: visibility,
+        selected: visibility === selectedVisibility,
+    })));
+}
+exports.promptVariableVisibilityAsync = promptVariableVisibilityAsync;
+async function promptVariableEnvironmentAsync({ nonInteractive, selectedEnvironments, multiple = false, availableEnvironments, }) {
     if (nonInteractive) {
         throw new Error('The `--environment` flag must be set when running in `--non-interactive` mode.');
     }
-    return await (0, prompts_1.selectAsync)('Select environment:', [
-        { title: 'development', value: generated_1.EnvironmentVariableEnvironment.Development },
-        { title: 'preview', value: generated_1.EnvironmentVariableEnvironment.Preview },
-        { title: 'production', value: generated_1.EnvironmentVariableEnvironment.Production },
-    ]);
+    if (!multiple) {
+        return await (0, prompts_1.selectAsync)('Select environment:', (availableEnvironments ?? Object.values(generated_1.EnvironmentVariableEnvironment)).map(environment => ({
+            title: environment,
+            value: environment,
+        })));
+    }
+    const { environments } = await (0, prompts_1.promptAsync)({
+        message: 'Select environment:',
+        name: 'environments',
+        type: 'multiselect',
+        choices: Object.values(generated_1.EnvironmentVariableEnvironment).map(environment => ({
+            title: environment,
+            value: environment,
+            selected: selectedEnvironments?.includes(environment),
+        })),
+    });
+    return environments;
 }
 exports.promptVariableEnvironmentAsync = promptVariableEnvironmentAsync;
 async function promptVariableValueAsync({ nonInteractive, required = true, hidden = false, initial, }) {
@@ -41,7 +84,7 @@ async function promptVariableValueAsync({ nonInteractive, required = true, hidde
     return variableValue;
 }
 exports.promptVariableValueAsync = promptVariableValueAsync;
-async function promptVariableNameAsync(nonInteractive) {
+async function promptVariableNameAsync(nonInteractive, initialValue) {
     const validationMessage = 'Variable name may not be empty.';
     if (nonInteractive) {
         throw new Error(validationMessage);
@@ -50,6 +93,7 @@ async function promptVariableNameAsync(nonInteractive) {
         type: 'text',
         name: 'name',
         message: `Variable name:`,
+        initial: initialValue,
         validate: value => {
             if (!value) {
                 return validationMessage;

package/build/utils/variableUtils.d.ts

@@ -0,0 +1,6 @@
+import { EnvironmentVariableEnvironment, EnvironmentVariableFragment } from '../graphql/generated';
+import { EnvironmentVariableWithFileContent } from '../graphql/queries/EnvironmentVariablesQuery';
+export declare function formatVariableName(variable: EnvironmentVariableFragment): string;
+export declare function formatVariableValue(variable: EnvironmentVariableWithFileContent): string;
+export declare function performForEnvironmentsAsync(environments: EnvironmentVariableEnvironment[] | null, fun: (environment: EnvironmentVariableEnvironment | undefined) => Promise<any>): Promise<any[]>;
+export declare function formatVariable(variable: EnvironmentVariableWithFileContent): string;

package/build/utils/variableUtils.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatVariable = exports.performForEnvironmentsAsync = exports.formatVariableValue = exports.formatVariableName = void 0;
+const tslib_1 = require("tslib");
+const dateformat_1 = tslib_1.__importDefault(require("dateformat"));
+const formatFields_1 = tslib_1.__importDefault(require("./formatFields"));
+const generated_1 = require("../graphql/generated");
+function formatVariableName(variable) {
+    const name = variable.name;
+    const scope = variable.scope === generated_1.EnvironmentVariableScope.Project ? 'project' : 'shared';
+    const environments = variable.environments?.join(', ') ?? '';
+    const updatedAt = variable.updatedAt ? new Date(variable.updatedAt).toLocaleString() : '';
+    const type = variable.type === generated_1.EnvironmentSecretType.FileBase64 ? 'file' : 'string';
+    const visibility = variable.visibility;
+    return `${name} | ${scope} | ${type} | ${visibility} | ${environments} | Updated at: ${updatedAt}`;
+}
+exports.formatVariableName = formatVariableName;
+function formatVariableValue(variable) {
+    // TODO: Add Learn more link
+    if (variable.value) {
+        return variable.value;
+    }
+    if (variable.valueWithFileContent) {
+        return atob(variable.valueWithFileContent);
+    }
+    if (variable.visibility === generated_1.EnvironmentVariableVisibility.Sensitive) {
+        return '***** (This is a sensitive env variable. To access it, run command with --include-sensitive flag. Learn more.)';
+    }
+    if (variable.visibility === generated_1.EnvironmentVariableVisibility.Secret) {
+        return "***** (This is a secret env variable that can only be accessed on EAS builder and can't be read in any UI. Learn more.)";
+    }
+    if (variable.type === generated_1.EnvironmentSecretType.FileBase64) {
+        return '***** (This is a file env variable. To access it, run command with --include-file-content flag. Learn more.)';
+    }
+    return '*****';
+}
+exports.formatVariableValue = formatVariableValue;
+async function performForEnvironmentsAsync(environments, fun) {
+    const selectedEnvironments = environments ?? [undefined];
+    return await Promise.all(selectedEnvironments.map(env => fun(env)));
+}
+exports.performForEnvironmentsAsync = performForEnvironmentsAsync;
+function formatVariable(variable) {
+    return (0, formatFields_1.default)([
+        { label: 'ID', value: variable.id },
+        { label: 'Name', value: variable.name },
+        { label: 'Value', value: formatVariableValue(variable) },
+        { label: 'Scope', value: variable.scope },
+        { label: 'Visibility', value: variable.visibility ?? '' },
+        {
+            label: 'Environments',
+            value: variable.environments ? variable.environments.join(', ') : '-',
+        },
+        {
+            label: 'type',
+            value: variable.type === generated_1.EnvironmentSecretType.FileBase64 ? 'file' : 'string',
+        },
+        { label: 'Created at', value: (0, dateformat_1.default)(variable.createdAt, 'mmm dd HH:MM:ss') },
+        { label: 'Updated at', value: (0, dateformat_1.default)(variable.updatedAt, 'mmm dd HH:MM:ss') },
+    ]);
+}
+exports.formatVariable = formatVariable;

package/build/worker/assets.d.ts

@@ -28,8 +28,13 @@ interface WorkerFileEntry {
 }
 /** Reads worker files while normalizing sourcemaps and providing normalized paths */
 declare function listWorkerFilesAsync(workerPath: string): AsyncGenerator<WorkerFileEntry>;
+interface AssetFileEntry {
+    normalizedPath: string;
+    sha512: string;
+    path: string;
+}
 /** Reads files of an asset maps and enumerates normalized paths and data */
-declare function listAssetMapFilesAsync(assetPath: string, assetMap: AssetMap): AsyncGenerator<WorkerFileEntry>;
+declare function listAssetMapFilesAsync(assetPath: string, assetMap: AssetMap): AsyncGenerator<AssetFileEntry>;
 /** Entry of a normalized (gzip-safe) path and file data */
 export type FileEntry = readonly [normalizedPath: string, data: Buffer | string];
 /** Packs file entries into a tar.gz file (path to tgz returned) */

package/build/worker/assets.js

@@ -105,11 +105,10 @@ exports.listWorkerFilesAsync = listWorkerFilesAsync;
 async function* listAssetMapFilesAsync(assetPath, assetMap) {
     for (const normalizedPath in assetMap) {
         const filePath = node_path_1.default.resolve(assetPath, normalizedPath.split('/').join(node_path_1.default.sep));
-        const data = await node_fs_1.default.promises.readFile(filePath);
         yield {
             normalizedPath,
             path: filePath,
-            data,
+            sha512: assetMap[normalizedPath],
         };
     }
 }

package/build/worker/upload.d.ts

@@ -13,6 +13,7 @@ export interface UploadResult {
     response: Response;
 }
 export declare function uploadAsync(params: UploadParams): Promise<UploadResult>;
+export declare function callUploadApiAsync(url: string | URL, init?: RequestInit): Promise<unknown>;
 export interface UploadPending {
     params: UploadParams;
 }

package/build/worker/upload.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.batchUploadAsync = exports.uploadAsync = void 0;
+exports.batchUploadAsync = exports.callUploadApiAsync = exports.uploadAsync = void 0;
 const tslib_1 = require("tslib");
 const https = tslib_1.__importStar(require("https"));
 const https_proxy_agent_1 = tslib_1.__importDefault(require("https-proxy-agent"));
@@ -112,6 +112,30 @@ async function uploadAsync(params) {
     });
 }
 exports.uploadAsync = uploadAsync;
+async function callUploadApiAsync(url, init) {
+    return await (0, promise_retry_1.default)(async (retry) => {
+        let response;
+        try {
+            response = await (0, node_fetch_1.default)(url, {
+                ...init,
+                agent: getAgent(),
+            });
+        }
+        catch (error) {
+            return retry(error);
+        }
+        if (response.status >= 500 && response.status <= 599) {
+            retry(new Error(`Deployment failed: ${response.statusText}`));
+        }
+        try {
+            return await response.json();
+        }
+        catch (error) {
+            retry(error);
+        }
+    });
+}
+exports.callUploadApiAsync = callUploadApiAsync;
 async function* batchUploadAsync(uploads) {
     const controller = new AbortController();
     const queue = new Set();

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "12.5.1",
+  "version": "12.5.3",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -1884,6 +1884,17 @@
           "description": "Overwrite existing variable",
           "allowNo": false
         },
+        "type": {
+          "name": "type",
+          "type": "option",
+          "description": "The type of variable",
+          "helpValue": "(string|file)",
+          "multiple": false,
+          "options": [
+            "string",
+            "file"
+          ]
+        },
         "visibility": {
           "name": "visibility",
           "type": "option",
@@ -1913,7 +1924,7 @@
           "type": "option",
           "description": "Environment variable's environment",
           "helpValue": "(development|preview|production)",
-          "multiple": false,
+          "multiple": true,
           "options": [
             "development",
             "preview",
@@ -1944,12 +1955,24 @@
       "hidden": true,
       "aliases": [],
       "flags": {
-        "name": {
-          "name": "name",
+        "variable-name": {
+          "name": "variable-name",
           "type": "option",
           "description": "Name of the variable to delete",
           "multiple": false
         },
+        "variable-environment": {
+          "name": "variable-environment",
+          "type": "option",
+          "description": "Current environment of the variable to delete",
+          "helpValue": "(development|preview|production)",
+          "multiple": false,
+          "options": [
+            "development",
+            "preview",
+            "production"
+          ]
+        },
         "scope": {
           "name": "scope",
           "type": "option",
@@ -1962,18 +1985,6 @@
           ],
           "default": "PROJECT"
         },
-        "environment": {
-          "name": "environment",
-          "type": "option",
-          "description": "Environment variable's environment",
-          "helpValue": "(development|preview|production)",
-          "multiple": false,
-          "options": [
-            "development",
-            "preview",
-            "production"
-          ]
-        },
         "non-interactive": {
           "name": "non-interactive",
           "type": "boolean",
@@ -2038,12 +2049,24 @@
       "hidden": true,
       "aliases": [],
       "flags": {
-        "name": {
-          "name": "name",
+        "variable-name": {
+          "name": "variable-name",
           "type": "option",
           "description": "Name of the variable",
           "multiple": false
         },
+        "variable-environment": {
+          "name": "variable-environment",
+          "type": "option",
+          "description": "Current environment of the variable",
+          "helpValue": "(development|preview|production)",
+          "multiple": false,
+          "options": [
+            "development",
+            "preview",
+            "production"
+          ]
+        },
         "format": {
           "name": "format",
           "type": "option",
@@ -2073,18 +2096,6 @@
           "type": "boolean",
           "description": "Run the command in non-interactive mode.",
           "allowNo": false
-        },
-        "environment": {
-          "name": "environment",
-          "type": "option",
-          "description": "Environment variable's environment",
-          "helpValue": "(development|preview|production)",
-          "multiple": false,
-          "options": [
-            "development",
-            "preview",
-            "production"
-          ]
         }
       },
       "args": {},
@@ -2103,18 +2114,30 @@
       "hidden": true,
       "aliases": [],
       "flags": {
-        "name": {
-          "name": "name",
+        "variable-name": {
+          "name": "variable-name",
           "type": "option",
           "description": "Name of the variable",
           "multiple": false
         },
+        "variable-environment": {
+          "name": "variable-environment",
+          "type": "option",
+          "description": "Current environment of the variable to link",
+          "helpValue": "(development|preview|production)",
+          "multiple": false,
+          "options": [
+            "development",
+            "preview",
+            "production"
+          ]
+        },
         "environment": {
           "name": "environment",
           "type": "option",
           "description": "Environment variable's environment",
           "helpValue": "(development|preview|production)",
-          "multiple": false,
+          "multiple": true,
           "options": [
             "development",
             "preview",
@@ -2150,6 +2173,12 @@
           "description": "Display sensitive values in the output",
           "allowNo": false
         },
+        "include-file-content": {
+          "name": "include-file-content",
+          "type": "boolean",
+          "description": "Display files content in the output",
+          "allowNo": false
+        },
         "format": {
           "name": "format",
           "type": "option",
@@ -2179,7 +2208,7 @@
           "type": "option",
           "description": "Environment variable's environment",
           "helpValue": "(development|preview|production)",
-          "multiple": false,
+          "multiple": true,
           "options": [
             "development",
             "preview",
@@ -2281,8 +2310,8 @@
       "hidden": true,
       "aliases": [],
       "flags": {
-        "name": {
-          "name": "name",
+        "variable-name": {
+          "name": "variable-name",
           "type": "option",
           "description": "Name of the variable",
           "multiple": false
@@ -2292,7 +2321,7 @@
           "type": "option",
           "description": "Environment variable's environment",
           "helpValue": "(development|preview|production)",
-          "multiple": false,
+          "multiple": true,
           "options": [
             "development",
             "preview",
@@ -2322,18 +2351,47 @@
       "hidden": true,
       "aliases": [],
       "flags": {
+        "variable-name": {
+          "name": "variable-name",
+          "type": "option",
+          "description": "Current name of the variable",
+          "multiple": false
+        },
+        "variable-environment": {
+          "name": "variable-environment",
+          "type": "option",
+          "description": "Current environment of the variable to update",
+          "helpValue": "(development|preview|production)",
+          "multiple": false,
+          "options": [
+            "development",
+            "preview",
+            "production"
+          ]
+        },
         "name": {
           "name": "name",
           "type": "option",
-          "description": "Name of the variable",
+          "description": "New name of the variable",
           "multiple": false
         },
         "value": {
           "name": "value",
           "type": "option",
-          "description": "Text value or the variable",
+          "description": "New value or the variable",
           "multiple": false
         },
+        "type": {
+          "name": "type",
+          "type": "option",
+          "description": "The type of variable",
+          "helpValue": "(string|file)",
+          "multiple": false,
+          "options": [
+            "string",
+            "file"
+          ]
+        },
         "visibility": {
           "name": "visibility",
           "type": "option",
@@ -2363,7 +2421,7 @@
           "type": "option",
           "description": "Environment variable's environment",
           "helpValue": "(development|preview|production)",
-          "multiple": false,
+          "multiple": true,
           "options": [
             "development",
             "preview",
@@ -2907,7 +2965,6 @@
           "name": "rollout-percentage",
           "type": "option",
           "description": "Percentage of users this update should be immediately available to. Users not in the rollout will be served the previous latest update on the branch, even if that update is itself being rolled out. The specified number must be an integer between 1 and 100. When not specified, this defaults to 100.",
-          "hidden": true,
           "required": false,
           "multiple": false
         },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "12.5.1",
+  "version": "12.5.3",
   "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
@@ -14,7 +14,7 @@
     "@expo/config-plugins": "7.8.4",
     "@expo/config-types": "50.0.0",
     "@expo/eas-build-job": "1.0.136",
-    "@expo/eas-json": "12.5.0",
+    "@expo/eas-json": "12.5.2",
     "@expo/env": "^0.3.0",
     "@expo/json-file": "8.2.37",
     "@expo/logger": "1.0.117",
@@ -228,5 +228,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "01676a4f8821e46215f236f2a105d820e6df2872"
+  "gitHead": "56444432b91bc60062891526946678da45ed2f2c"
 }

package/build/utils/formatVariable.d.ts

@@ -1,2 +0,0 @@
-import { EnvironmentVariableFragment } from '../graphql/generated';
-export declare function formatVariable(variable: EnvironmentVariableFragment): string;

package/build/utils/formatVariable.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatVariable = void 0;
-const tslib_1 = require("tslib");
-const dateformat_1 = tslib_1.__importDefault(require("dateformat"));
-const formatFields_1 = tslib_1.__importDefault(require("./formatFields"));
-function formatVariable(variable) {
-    return (0, formatFields_1.default)([
-        { label: 'ID', value: variable.id },
-        { label: 'Name', value: variable.name },
-        { label: 'Value', value: variable.value ?? '(secret)' },
-        { label: 'Scope', value: variable.scope },
-        { label: 'Created at', value: (0, dateformat_1.default)(variable.createdAt, 'mmm dd HH:MM:ss') },
-    ]);
-}
-exports.formatVariable = formatVariable;