eas-cli 12.6.1 → 13.0.0

package/build/project/expoConfig.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPublicExpoConfig = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfig = exports.createOrModifyExpoConfigAsync = void 0;
+exports.getPublicExpoConfigAsync = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfigAsync = exports.createOrModifyExpoConfigAsync = void 0;
 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"));
 async function createOrModifyExpoConfigAsync(projectDir, exp, readOptions) {
     ensureExpoConfigExists(projectDir);
     if (readOptions) {
@@ -16,18 +19,47 @@ async function createOrModifyExpoConfigAsync(projectDir, exp, readOptions) {
     }
 }
 exports.createOrModifyExpoConfigAsync = createOrModifyExpoConfigAsync;
-function getExpoConfigInternal(projectDir, opts = {}) {
+let wasExpoConfigWarnPrinted = false;
+async function getExpoConfigInternalAsync(projectDir, opts = {}) {
     const originalProcessEnv = process.env;
     try {
         process.env = {
             ...process.env,
             ...opts.env,
         };
-        const { exp } = (0, config_1.getConfig)(projectDir, {
-            skipSDKVersionRequirement: true,
-            ...(opts.isPublicConfig ? { isPublicConfig: true } : {}),
-            ...(opts.skipPlugins ? { skipPlugins: true } : {}),
-        });
+        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;
+            }
+        }
+        else {
+            exp = (0, config_1.getConfig)(projectDir, {
+                skipSDKVersionRequirement: true,
+                ...(opts.isPublicConfig ? { isPublicConfig: true } : {}),
+                ...(opts.skipPlugins ? { skipPlugins: true } : {}),
+            }).exp;
+        }
         const { error } = MinimalAppConfigSchema.validate(exp, {
             allowUnknown: true,
             abortEarly: true,
@@ -52,11 +84,11 @@ const MinimalAppConfigSchema = joi_1.default.object({
         buildNumber: joi_1.default.string(),
     }),
 });
-function getPrivateExpoConfig(projectDir, opts = {}) {
+async function getPrivateExpoConfigAsync(projectDir, opts = {}) {
     ensureExpoConfigExists(projectDir);
-    return getExpoConfigInternal(projectDir, { ...opts, isPublicConfig: false });
+    return await getExpoConfigInternalAsync(projectDir, { ...opts, isPublicConfig: false });
 }
-exports.getPrivateExpoConfig = getPrivateExpoConfig;
+exports.getPrivateExpoConfigAsync = getPrivateExpoConfigAsync;
 function ensureExpoConfigExists(projectDir) {
     const paths = (0, config_1.getConfigFilePaths)(projectDir);
     if (!paths?.staticConfigPath && !paths?.dynamicConfigPath) {
@@ -70,8 +102,8 @@ function isUsingStaticExpoConfig(projectDir) {
     return !!(paths.staticConfigPath?.endsWith('app.json') && !paths.dynamicConfigPath);
 }
 exports.isUsingStaticExpoConfig = isUsingStaticExpoConfig;
-function getPublicExpoConfig(projectDir, opts = {}) {
+async function getPublicExpoConfigAsync(projectDir, opts = {}) {
     ensureExpoConfigExists(projectDir);
-    return getExpoConfigInternal(projectDir, { ...opts, isPublicConfig: true });
+    return await getExpoConfigInternalAsync(projectDir, { ...opts, isPublicConfig: true });
 }
-exports.getPublicExpoConfig = getPublicExpoConfig;
+exports.getPublicExpoConfigAsync = getPublicExpoConfigAsync;

package/build/project/ios/entitlements.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNativeTargetEntitlementsAsync = exports.getManagedApplicationTargetEntitlementsAsync = void 0;
+const tslib_1 = require("tslib");
 const config_plugins_1 = require("@expo/config-plugins");
 const prebuild_config_1 = require("@expo/prebuild-config");
+const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
+const log_1 = tslib_1.__importDefault(require("../../log"));
 const plist_1 = require("../../utils/plist");
 const workflow_1 = require("../workflow");
+let wasExpoConfigPluginsWarnPrinted = false;
 async function getManagedApplicationTargetEntitlementsAsync(projectDir, env, vcsClient) {
     const originalProcessEnv = process.env;
     try {
@@ -12,13 +16,32 @@ async function getManagedApplicationTargetEntitlementsAsync(projectDir, env, vcs
             ...process.env,
             ...env,
         };
-        const { exp } = await (0, prebuild_config_1.getPrebuildConfigAsync)(projectDir, { platforms: ['ios'] });
-        const expWithMods = await (0, config_plugins_1.compileModsAsync)(exp, {
-            projectRoot: projectDir,
-            platforms: ['ios'],
-            introspect: true,
-            ignoreExistingNativeFiles: await (0, workflow_1.hasIgnoredIosProjectAsync)(projectDir, vcsClient),
-        });
+        let expWithMods;
+        try {
+            const { stdout } = await (0, spawn_async_1.default)('npx', ['expo', 'config', '--json', '--type', 'introspect'], {
+                cwd: projectDir,
+                env: {
+                    ...process.env,
+                    ...env,
+                    EXPO_NO_DOTENV: '1',
+                },
+            });
+            expWithMods = JSON.parse(stdout);
+        }
+        catch (err) {
+            if (!wasExpoConfigPluginsWarnPrinted) {
+                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.');
+                wasExpoConfigPluginsWarnPrinted = true;
+            }
+            const { exp } = await (0, prebuild_config_1.getPrebuildConfigAsync)(projectDir, { platforms: ['ios'] });
+            expWithMods = await (0, config_plugins_1.compileModsAsync)(exp, {
+                projectRoot: projectDir,
+                platforms: ['ios'],
+                introspect: true,
+                ignoreExistingNativeFiles: await (0, workflow_1.hasIgnoredIosProjectAsync)(projectDir, vcsClient),
+            });
+        }
         return expWithMods.ios?.entitlements ?? {};
     }
     finally {

package/build/project/projectUtils.d.ts

@@ -14,6 +14,7 @@ export declare const toAppPrivacy: (privacy: ExpoConfig['privacy']) => AppPrivac
 export declare function getProjectConfigDescription(projectDir: string): string;
 export declare function isExpoUpdatesInstalled(projectDir: string): boolean;
 export declare function isExpoNotificationsInstalled(projectDir: string): boolean;
+export declare function isExpoInstalled(projectDir: string): boolean;
 export declare function isExpoUpdatesInstalledAsDevDependency(projectDir: string): boolean;
 export declare function isExpoUpdatesInstalledOrAvailable(projectDir: string, sdkVersion?: string): boolean;
 export declare function isUsingEASUpdate(exp: ExpoConfig, projectId: string): boolean;

package/build/project/projectUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDisplayNameForProjectIdAsync = exports.getOwnerAccountForProjectIdAsync = exports.installExpoUpdatesAsync = exports.isModernExpoUpdatesCLIWithRuntimeVersionCommandSupportedAsync = exports.enforceRollBackToEmbeddedUpdateSupportAsync = exports.validateAppVersionRuntimePolicySupportAsync = exports.isUsingEASUpdate = exports.isExpoUpdatesInstalledOrAvailable = exports.isExpoUpdatesInstalledAsDevDependency = exports.isExpoNotificationsInstalled = exports.isExpoUpdatesInstalled = exports.getProjectConfigDescription = exports.toAppPrivacy = exports.getUsername = void 0;
+exports.getDisplayNameForProjectIdAsync = exports.getOwnerAccountForProjectIdAsync = exports.installExpoUpdatesAsync = exports.isModernExpoUpdatesCLIWithRuntimeVersionCommandSupportedAsync = exports.enforceRollBackToEmbeddedUpdateSupportAsync = exports.validateAppVersionRuntimePolicySupportAsync = exports.isUsingEASUpdate = exports.isExpoUpdatesInstalledOrAvailable = exports.isExpoUpdatesInstalledAsDevDependency = exports.isExpoInstalled = exports.isExpoNotificationsInstalled = exports.isExpoUpdatesInstalled = exports.getProjectConfigDescription = exports.toAppPrivacy = exports.getUsername = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -73,6 +73,11 @@ function isExpoNotificationsInstalled(projectDir) {
     return !!(packageJson.dependencies && 'expo-notifications' in packageJson.dependencies);
 }
 exports.isExpoNotificationsInstalled = isExpoNotificationsInstalled;
+function isExpoInstalled(projectDir) {
+    const packageJson = (0, config_1.getPackageJson)(projectDir);
+    return !!(packageJson.dependencies && 'expo' in packageJson.dependencies);
+}
+exports.isExpoInstalled = isExpoInstalled;
 function isExpoUpdatesInstalledAsDevDependency(projectDir) {
     const packageJson = (0, config_1.getPackageJson)(projectDir);
     return !!(packageJson.devDependencies && 'expo-updates' in packageJson.devDependencies);

package/build/utils/variableUtils.d.ts

@@ -1,5 +1,6 @@
 import { EnvironmentVariableEnvironment, EnvironmentVariableFragment } from '../graphql/generated';
 import { EnvironmentVariableWithFileContent } from '../graphql/queries/EnvironmentVariablesQuery';
+export declare function isEnvironment(environment: string): environment is EnvironmentVariableEnvironment;
 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[]>;

package/build/utils/variableUtils.js

@@ -1,10 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatVariable = exports.performForEnvironmentsAsync = exports.formatVariableValue = exports.formatVariableName = void 0;
+exports.formatVariable = exports.performForEnvironmentsAsync = exports.formatVariableValue = exports.formatVariableName = exports.isEnvironment = 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 isEnvironment(environment) {
+    return Object.values(generated_1.EnvironmentVariableEnvironment).includes(environment);
+}
+exports.isEnvironment = isEnvironment;
 function formatVariableName(variable) {
     const name = variable.name;
     const scope = variable.scope === generated_1.EnvironmentVariableScope.Project ? 'project' : 'shared';

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "12.6.1",
+  "version": "13.0.0",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -2022,7 +2022,13 @@
           "allowNo": false
         }
       },
-      "args": {},
+      "args": {
+        "environment": {
+          "name": "environment",
+          "description": "Environment to create the variable in. One of 'production', 'preview', or 'development'.",
+          "required": false
+        }
+      },
       "contextDefinition": {
         "projectId": {},
         "analytics": {},
@@ -2076,7 +2082,13 @@
           "allowNo": false
         }
       },
-      "args": {},
+      "args": {
+        "environment": {
+          "name": "environment",
+          "description": "Current environment of the variable to delete. One of 'production', 'preview', or 'development'.",
+          "required": false
+        }
+      },
       "contextDefinition": {
         "projectId": {},
         "loggedIn": {}
@@ -2092,18 +2104,6 @@
       "hidden": true,
       "aliases": [],
       "flags": {
-        "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",
@@ -2112,8 +2112,13 @@
         }
       },
       "args": {
-        "BASH_COMMAND": {
-          "name": "BASH_COMMAND",
+        "environment": {
+          "name": "environment",
+          "description": "Environment to execute the command in. One of 'production', 'preview', or 'development'.",
+          "required": true
+        },
+        "bash_command": {
+          "name": "bash_command",
           "description": "bash command to execute with the environment variables from the environment",
           "required": true
         }
@@ -2182,7 +2187,13 @@
           "allowNo": false
         }
       },
-      "args": {},
+      "args": {
+        "environment": {
+          "name": "environment",
+          "description": "Current environment of the variable. One of 'production', 'preview', or 'development'.",
+          "required": false
+        }
+      },
       "contextDefinition": {
         "projectId": {},
         "loggedIn": {}
@@ -2235,7 +2246,13 @@
           "allowNo": false
         }
       },
-      "args": {},
+      "args": {
+        "environment": {
+          "name": "environment",
+          "description": "Environment to pull variables from. One of 'production', 'preview', or 'development'.",
+          "required": false
+        }
+      },
       "contextDefinition": {
         "projectId": {},
         "loggedIn": {}
@@ -2263,6 +2280,18 @@
           "description": "Display files content in the output",
           "allowNo": false
         },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "description": "Environment variable's environment",
+          "helpValue": "(development|preview|production)",
+          "multiple": true,
+          "options": [
+            "development",
+            "preview",
+            "production"
+          ]
+        },
         "format": {
           "name": "format",
           "type": "option",
@@ -2286,21 +2315,15 @@
             "project"
           ],
           "default": "PROJECT"
-        },
+        }
+      },
+      "args": {
         "environment": {
           "name": "environment",
-          "type": "option",
-          "description": "Environment variable's environment",
-          "helpValue": "(development|preview|production)",
-          "multiple": true,
-          "options": [
-            "development",
-            "preview",
-            "production"
-          ]
+          "description": "Environment to list the variables from. One of 'production', 'preview', or 'development'.",
+          "required": false
         }
       },
-      "args": {},
       "contextDefinition": {
         "projectId": {},
         "loggedIn": {}
@@ -2316,6 +2339,12 @@
       "hidden": true,
       "aliases": [],
       "flags": {
+        "non-interactive": {
+          "name": "non-interactive",
+          "type": "boolean",
+          "description": "Run the command in non-interactive mode.",
+          "allowNo": false
+        },
         "environment": {
           "name": "environment",
           "type": "option",
@@ -2328,12 +2357,6 @@
             "production"
           ]
         },
-        "non-interactive": {
-          "name": "non-interactive",
-          "type": "boolean",
-          "description": "Run the command in non-interactive mode.",
-          "allowNo": false
-        },
         "path": {
           "name": "path",
           "type": "option",
@@ -2342,7 +2365,13 @@
           "default": ".env.local"
         }
       },
-      "args": {},
+      "args": {
+        "environment": {
+          "name": "environment",
+          "description": "Environment to pull variables from. One of 'production', 'preview', or 'development'.",
+          "required": false
+        }
+      },
       "contextDefinition": {
         "projectId": {},
         "loggedIn": {},
@@ -2379,7 +2408,13 @@
           "default": ".env.local"
         }
       },
-      "args": {},
+      "args": {
+        "environment": {
+          "name": "environment",
+          "description": "Environment to push variables to. One of 'production', 'preview', or 'development'.",
+          "required": false
+        }
+      },
       "contextDefinition": {
         "projectId": {},
         "loggedIn": {}
@@ -2420,7 +2455,13 @@
           "allowNo": false
         }
       },
-      "args": {},
+      "args": {
+        "environment": {
+          "name": "environment",
+          "description": "Environment to unlink the variable from. One of 'production', 'preview', or 'development'.",
+          "required": false
+        }
+      },
       "contextDefinition": {
         "projectId": {},
         "loggedIn": {}
@@ -2520,7 +2561,13 @@
           "allowNo": false
         }
       },
-      "args": {},
+      "args": {
+        "environment": {
+          "name": "environment",
+          "description": "Current environment of the variable to update. One of 'production', 'preview', or 'development'.",
+          "required": false
+        }
+      },
       "contextDefinition": {
         "projectId": {},
         "analytics": {},
@@ -2895,6 +2942,21 @@
           ],
           "default": "all"
         },
+        "with-eas-environment-variables-set": {
+          "name": "with-eas-environment-variables-set",
+          "type": "option",
+          "description": "Environment to use the server-side defined EAS environment variables for during command execution.",
+          "hidden": true,
+          "required": false,
+          "helpValue": "(development|preview|production)",
+          "multiple": false,
+          "options": [
+            "development",
+            "preview",
+            "production"
+          ],
+          "default": null
+        },
         "non-interactive": {
           "name": "non-interactive",
           "type": "boolean",
@@ -3088,7 +3150,7 @@
         "with-eas-environment-variables-set": {
           "name": "with-eas-environment-variables-set",
           "type": "option",
-          "description": "Environment to use for EAS environment variables",
+          "description": "Environment to use the server-side defined EAS environment variables for during command execution.",
           "hidden": true,
           "required": false,
           "helpValue": "(development|preview|production)",
@@ -3097,7 +3159,8 @@
             "development",
             "preview",
             "production"
-          ]
+          ],
+          "default": null
         },
         "json": {
           "name": "json",

package/package.json

@@ -1,34 +1,34 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "12.6.1",
+  "version": "13.0.0",
   "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "2.0.2",
+    "@expo/apple-utils": "2.0.3",
     "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "8.5.4",
-    "@expo/config-plugins": "7.8.4",
-    "@expo/eas-build-job": "1.0.136",
-    "@expo/eas-json": "12.5.2",
+    "@expo/config": "9.0.4",
+    "@expo/config-plugins": "8.0.10",
+    "@expo/eas-build-job": "1.0.144",
+    "@expo/eas-json": "13.0.0",
     "@expo/env": "^0.3.0",
-    "@expo/json-file": "8.2.37",
+    "@expo/json-file": "8.3.3",
     "@expo/logger": "1.0.117",
     "@expo/multipart-body-parser": "1.1.0",
-    "@expo/osascript": "2.0.33",
-    "@expo/package-manager": "1.1.2",
-    "@expo/pkcs12": "0.0.8",
-    "@expo/plist": "0.0.20",
+    "@expo/osascript": "2.1.3",
+    "@expo/package-manager": "1.5.2",
+    "@expo/pkcs12": "0.1.2",
+    "@expo/plist": "0.1.3",
     "@expo/plugin-help": "5.1.23",
     "@expo/plugin-warn-if-update-available": "2.5.1",
-    "@expo/prebuild-config": "6.7.3",
+    "@expo/prebuild-config": "7.0.9",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.136",
+    "@expo/spawn-async": "1.7.2",
+    "@expo/steps": "1.0.144",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^1.26.2",
     "@oclif/plugin-autocomplete": "^2.3.10",
@@ -227,5 +227,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "88740682cde51043859da056d5768e333483dc47"
+  "gitHead": "5be97c50ae1c5b3939ee93e32e73db97fb199e64"
 }