eas-cli 12.6.2 → 13.0.1

package/build/commands/env/unlink.js

@@ -16,7 +16,8 @@ const prompts_2 = require("../../utils/prompts");
 const variableUtils_1 = require("../../utils/variableUtils");
 class EnvironmentVariableUnlink extends EasCommand_1.default {
     async runAsync() {
-        let { flags: { 'variable-name': name, 'non-interactive': nonInteractive, environment: unlinkEnvironments, }, } = await this.parse(_a);
+        const { args, flags } = await this.parse(_a);
+        let { 'variable-name': name, 'non-interactive': nonInteractive, environment: unlinkEnvironments, } = this.validateInputs(flags, args);
         const { projectId, loggedIn: { graphqlClient }, } = await this.getContextAsync(_a, {
             nonInteractive,
         });
@@ -74,6 +75,24 @@ class EnvironmentVariableUnlink extends EasCommand_1.default {
             }
         }
     }
+    validateInputs(flags, { environment }) {
+        if (flags['non-interactive']) {
+            if (!flags['variable-name']) {
+                throw new Error('Current name is required in non-interactive mode. Run the command with --variable-name flag.');
+            }
+        }
+        if (environment) {
+            environment = environment.toUpperCase();
+            if (!(0, variableUtils_1.isEnvironment)(environment)) {
+                throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
+            }
+            return {
+                environment: [environment],
+                ...flags,
+            };
+        }
+        return flags;
+    }
 }
 _a = EnvironmentVariableUnlink;
 EnvironmentVariableUnlink.description = 'unlink a shared environment variable to the current project';
@@ -89,4 +108,11 @@ EnvironmentVariableUnlink.contextDefinition = {
     ..._a.ContextOptions.ProjectId,
     ..._a.ContextOptions.LoggedIn,
 };
+EnvironmentVariableUnlink.args = [
+    {
+        name: 'environment',
+        description: "Environment to unlink the variable from. One of 'production', 'preview', or 'development'.",
+        required: false,
+    },
+];
 exports.default = EnvironmentVariableUnlink;

package/build/commands/env/update.d.ts

@@ -14,6 +14,11 @@ export default class EnvironmentVariableUpdate extends EasCommand {
         value: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         type: import("@oclif/core/lib/interfaces").OptionFlag<"string" | "file" | undefined>;
     };
+    static args: {
+        name: string;
+        description: string;
+        required: boolean;
+    }[];
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         analytics: import("../../commandUtils/context/AnalyticsContextField").default;

package/build/commands/env/update.js

@@ -19,8 +19,8 @@ const prompts_2 = require("../../utils/prompts");
 const variableUtils_1 = require("../../utils/variableUtils");
 class EnvironmentVariableUpdate extends EasCommand_1.default {
     async runAsync() {
-        const { flags } = await this.parse(_a);
-        const { name, value: rawValue, scope, 'variable-name': currentName, 'variable-environment': currentEnvironment, 'non-interactive': nonInteractive, environment: environments, type, visibility, } = this.validateFlags(flags);
+        const { args, flags } = await this.parse(_a);
+        const { name, value: rawValue, scope, 'variable-name': currentName, 'variable-environment': currentEnvironment, 'non-interactive': nonInteractive, environment: environments, type, visibility, } = this.validateFlags(flags, args);
         const { projectId, loggedIn: { graphqlClient }, } = await this.getContextAsync(_a, {
             nonInteractive,
         });
@@ -82,7 +82,7 @@ class EnvironmentVariableUpdate extends EasCommand_1.default {
         }
         log_1.default.withTick(`Updated variable ${chalk_1.default.bold(selectedVariable.name)} ${suffix}.`);
     }
-    validateFlags(flags) {
+    validateFlags(flags, { environment }) {
         if (flags['non-interactive']) {
             if (!flags['variable-name']) {
                 throw new Error('Current name is required in non-interactive mode. Run the command with --variable-name flag.');
@@ -91,6 +91,16 @@ class EnvironmentVariableUpdate extends EasCommand_1.default {
                 throw new Error('Value is required when type is set. Run the command with --value flag.');
             }
         }
+        if (environment) {
+            environment = environment.toUpperCase();
+            if (!(0, variableUtils_1.isEnvironment)(environment)) {
+                throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
+            }
+            return {
+                'variable-environment': environment,
+                ...flags,
+            };
+        }
         return flags;
     }
     async promptForMissingFlagsAsync(selectedVariable, { name, value, environment: environments, visibility, 'non-interactive': nonInteractive, type, ...rest }) {
@@ -197,6 +207,13 @@ EnvironmentVariableUpdate.flags = {
     ...flags_1.EASMultiEnvironmentFlag,
     ...flags_1.EASNonInteractiveFlag,
 };
+EnvironmentVariableUpdate.args = [
+    {
+        name: 'environment',
+        description: "Current environment of the variable to update. One of 'production', 'preview', or 'development'.",
+        required: false,
+    },
+];
 EnvironmentVariableUpdate.contextDefinition = {
     ..._a.ContextOptions.ProjectId,
     ..._a.ContextOptions.Analytics,

package/build/commands/project/init.js

@@ -59,7 +59,7 @@ class ProjectInit extends EasCommand_1.default {
         }
     }
     static async ensureOwnerSlugConsistencyAsync(graphqlClient, projectId, projectDir, { force, nonInteractive }) {
-        const exp = (0, expoConfig_1.getPrivateExpoConfig)(projectDir);
+        const exp = await (0, expoConfig_1.getPrivateExpoConfigAsync)(projectDir);
         const appForProjectId = await AppQuery_1.AppQuery.byIdAsync(graphqlClient, projectId);
         const correctOwner = appForProjectId.ownerAccount.name;
         const correctSlug = appForProjectId.slug;
@@ -107,7 +107,7 @@ class ProjectInit extends EasCommand_1.default {
         }
     }
     static async setExplicitIDAsync(projectId, projectDir, { force, nonInteractive }) {
-        const exp = (0, expoConfig_1.getPrivateExpoConfig)(projectDir);
+        const exp = await (0, expoConfig_1.getPrivateExpoConfigAsync)(projectDir);
         const existingProjectId = exp.extra?.eas?.projectId;
         if (projectId === existingProjectId) {
             log_1.default.succeed(`Project already linked (ID: ${chalk_1.default.bold(existingProjectId)})`);
@@ -141,7 +141,7 @@ class ProjectInit extends EasCommand_1.default {
         });
     }
     static async initializeWithoutExplicitIDAsync(graphqlClient, actor, projectDir, { force, nonInteractive }) {
-        const exp = (0, expoConfig_1.getPrivateExpoConfig)(projectDir);
+        const exp = await (0, expoConfig_1.getPrivateExpoConfigAsync)(projectDir);
         const existingProjectId = exp.extra?.eas?.projectId;
         if (existingProjectId) {
             log_1.default.succeed(`Project already linked (ID: ${chalk_1.default.bold(existingProjectId)}). To re-configure, remove the "extra.eas.projectId" field from your app config.`);

package/build/commands/project/onboarding.js

@@ -236,7 +236,7 @@ Onboarding.contextDefinition = {
 exports.default = Onboarding;
 // we can't get this automated by using command context because when we run a command the project directory doesn't exist yet
 async function getPrivateExpoConfigWithProjectIdAsync({ projectDir, graphqlClient, actor, options, }) {
-    const expBefore = (0, expoConfig_1.getPrivateExpoConfig)(projectDir, options);
+    const expBefore = await (0, expoConfig_1.getPrivateExpoConfigAsync)(projectDir, options);
     const projectId = await (0, getProjectIdAsync_1.validateOrSetProjectIdAsync)({
         exp: expBefore,
         graphqlClient,
@@ -246,7 +246,7 @@ async function getPrivateExpoConfigWithProjectIdAsync({ projectDir, graphqlClien
         },
         cwd: projectDir,
     });
-    const exp = (0, expoConfig_1.getPrivateExpoConfig)(projectDir, options);
+    const exp = await (0, expoConfig_1.getPrivateExpoConfigAsync)(projectDir, options);
     return {
         exp,
         projectId,

package/build/commands/update/configure.d.ts

@@ -1,9 +1,11 @@
 import EasCommand from '../../commandUtils/EasCommand';
+import { RequestedPlatform } from '../../platform';
 export default class UpdateConfigure extends EasCommand {
     static description: string;
     static flags: {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        platform: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        'with-eas-environment-variables-set': import("@oclif/core/lib/interfaces").OptionFlag<import("../../graphql/generated").EnvironmentVariableEnvironment | null>;
+        platform: import("@oclif/core/lib/interfaces").OptionFlag<RequestedPlatform>;
     };
     static contextDefinition: {
         vcsClient: import("../../commandUtils/context/VcsClientContextField").default;

package/build/commands/update/configure.js

@@ -8,14 +8,14 @@ const configure_1 = require("../../build/configure");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
 const log_1 = tslib_1.__importStar(require("../../log"));
+const platform_1 = require("../../platform");
 const configure_2 = require("../../update/configure");
 class UpdateConfigure extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(_a);
-        const platform = flags.platform;
         const { privateProjectConfig: { projectId, exp, projectDir }, vcsClient, } = await this.getContextAsync(_a, {
             nonInteractive: flags['non-interactive'],
-            withServerSideEnvironment: null,
+            withServerSideEnvironment: flags['with-eas-environment-variables-set'],
         });
         log_1.default.log('💡 The following process will configure your project to use EAS Update. These changes only apply to your local project files and you can safely revert them at any time.');
         await vcsClient.ensureRepoExistsAsync();
@@ -23,7 +23,7 @@ class UpdateConfigure extends EasCommand_1.default {
             exp,
             projectId,
             projectDir,
-            platform,
+            platform: flags['platform'],
             vcsClient,
             env: undefined,
         });
@@ -46,9 +46,10 @@ UpdateConfigure.flags = {
     platform: core_1.Flags.enum({
         description: 'Platform to configure',
         char: 'p',
-        options: ['android', 'ios', 'all'],
-        default: 'all',
+        options: Object.values(platform_1.RequestedPlatform),
+        default: platform_1.RequestedPlatform.All,
     }),
+    ...flags_1.WithEasEnvironmentVariablesSetFlag,
     ...flags_1.EASNonInteractiveFlag,
 };
 UpdateConfigure.contextDefinition = {

package/build/commands/update/index.d.ts

@@ -1,9 +1,12 @@
 import EasCommand from '../../commandUtils/EasCommand';
+import { EnvironmentVariableEnvironment } from '../../graphql/generated';
+import { RequestedPlatform } from '../../platform';
 export default class UpdatePublish extends EasCommand {
     static description: string;
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'with-eas-environment-variables-set': import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | null>;
         branch: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         channel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         message: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
@@ -12,10 +15,9 @@ export default class UpdatePublish extends EasCommand {
         'clear-cache': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'emit-metadata': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'rollout-percentage': import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
-        platform: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        platform: import("@oclif/core/lib/interfaces").OptionFlag<RequestedPlatform>;
         auto: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'private-key-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        'with-eas-environment-variables-set': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {
         getServerSideEnvironmentVariablesAsync: import("../../commandUtils/context/ServerSideEnvironmentVariablesContextField").ServerSideEnvironmentVariablesContextField;

package/build/commands/update/index.js

@@ -18,6 +18,7 @@ const generated_1 = require("../../graphql/generated");
 const PublishMutation_1 = require("../../graphql/mutations/PublishMutation");
 const log_1 = tslib_1.__importStar(require("../../log"));
 const ora_1 = require("../../ora");
+const platform_1 = require("../../platform");
 const maybeUploadFingerprintAsync_1 = require("../../project/maybeUploadFingerprintAsync");
 const projectUtils_1 = require("../../project/projectUtils");
 const publish_1 = require("../../project/publish");
@@ -37,7 +38,7 @@ class UpdatePublish extends EasCommand_1.default {
         const { auto: autoFlag, platform: requestedPlatform, channelName: channelNameArg, updateMessage: updateMessageArg, inputDir, skipBundler, clearCache, privateKeyPath, json: jsonFlag, nonInteractive, branchName: branchNameArg, emitMetadata, rolloutPercentage, withEasEnvironmentVariablesSet, } = this.sanitizeFlags(rawFlags);
         const { getDynamicPublicProjectConfigAsync, getDynamicPrivateProjectConfigAsync, loggedIn: { graphqlClient }, vcsClient, getServerSideEnvironmentVariablesAsync, } = await this.getContextAsync(_a, {
             nonInteractive,
-            withServerSideEnvironment: withEasEnvironmentVariablesSet ?? null,
+            withServerSideEnvironment: withEasEnvironmentVariablesSet,
         });
         if (jsonFlag) {
             (0, json_1.enableJsonOutput)();
@@ -379,12 +380,6 @@ class UpdatePublish extends EasCommand_1.default {
             emitMetadata = false;
             log_1.default.warn('ignoring flag --emit-metadata as metadata cannot be generated when skipping bundle generation');
         }
-        if (flags['with-eas-environment-variables-set'] &&
-            !Object.values(generated_1.EnvironmentVariableEnvironment).includes(flags['with-eas-environment-variables-set'])) {
-            core_1.Errors.error(`--with-eas-environment-variables-set must be one of ${Object.values(generated_1.EnvironmentVariableEnvironment)
-                .map(env => `"${env.toLocaleLowerCase()}"`)
-                .join(', ')}`, { exit: 1 });
-        }
         return {
             auto,
             branchName,
@@ -444,12 +439,8 @@ UpdatePublish.flags = {
     }),
     platform: core_1.Flags.enum({
         char: 'p',
-        options: [
-            // TODO: Add web when it's fully supported
-            ...publish_1.defaultPublishPlatforms,
-            'all',
-        ],
-        default: 'all',
+        options: Object.values(platform_1.RequestedPlatform), // TODO: Add web when it's fully supported
+        default: platform_1.RequestedPlatform.All,
         required: false,
     }),
     auto: core_1.Flags.boolean({
@@ -460,18 +451,7 @@ UpdatePublish.flags = {
         description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory. Only relevant if you are using code signing: https://docs.expo.dev/eas-update/code-signing/`,
         required: false,
     }),
-    'with-eas-environment-variables-set': core_1.Flags.enum({
-        description: 'Environment to use for EAS environment variables',
-        options: [
-            generated_1.EnvironmentVariableEnvironment.Development,
-            generated_1.EnvironmentVariableEnvironment.Preview,
-            generated_1.EnvironmentVariableEnvironment.Production,
-        ].map(env => env.toLowerCase()),
-        // eslint-disable-next-line async-protect/async-suffix
-        parse: async (input) => input.toUpperCase(),
-        required: false,
-        hidden: true,
-    }),
+    ...flags_1.WithEasEnvironmentVariablesSetFlag,
     ...flags_1.EasNonInteractiveAndJsonFlags,
 };
 UpdatePublish.contextDefinition = {

package/build/credentials/android/actions/BuildCredentialsUtils.js

@@ -61,11 +61,11 @@ async function promptUserAndCopyLegacyCredentialsAsync(ctx, app) {
 }
 exports.promptUserAndCopyLegacyCredentialsAsync = promptUserAndCopyLegacyCredentialsAsync;
 async function getAppLookupParamsFromContextAsync(ctx, gradleContext) {
-    ctx.ensureProjectContext();
-    const projectName = ctx.exp.slug;
-    const projectId = ctx.projectId;
+    const exp = await ctx.getExpoConfigAsync();
+    const projectName = exp.slug;
+    const projectId = await ctx.getProjectIdAsync();
     const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(ctx.graphqlClient, projectId);
-    const androidApplicationIdentifier = await (0, applicationId_1.getApplicationIdAsync)(ctx.projectDir, ctx.exp, ctx.vcsClient, gradleContext);
+    const androidApplicationIdentifier = await (0, applicationId_1.getApplicationIdAsync)(ctx.projectDir, exp, ctx.vcsClient, gradleContext);
     if (!androidApplicationIdentifier) {
         throw new errors_1.AndroidPackageNotDefinedError(`android.package needs to be defined in your ${(0, projectUtils_1.getProjectConfigDescription)(ctx.projectDir)} file`);
     }

package/build/credentials/android/actions/CreateKeystore.js

@@ -15,7 +15,7 @@ class CreateKeystore {
         if (ctx.nonInteractive) {
             throw new Error(`New keystore cannot be created in non-interactive mode.`);
         }
-        const projectId = ctx.projectId;
+        const projectId = await ctx.getProjectIdAsync();
         const keystore = await this.provideOrGenerateAsync(ctx.graphqlClient, ctx.analytics, projectId);
         const keystoreFragment = await ctx.android.createKeystoreAsync(ctx.graphqlClient, this.account, keystore);
         log_1.default.succeed('Created keystore');

package/build/credentials/context.d.ts

@@ -40,8 +40,8 @@ export declare class CredentialsContext {
         env?: Env;
     });
     get hasProjectContext(): boolean;
-    get exp(): ExpoConfig;
-    get projectId(): string;
-    ensureProjectContext(): void;
+    getExpoConfigAsync(): Promise<ExpoConfig>;
+    getProjectIdAsync(): Promise<string>;
+    ensureProjectContextAsync(): Promise<void>;
     bestEffortAppStoreAuthenticateAsync(): Promise<void>;
 }

package/build/credentials/context.js

@@ -31,20 +31,20 @@ class CredentialsContext {
     get hasProjectContext() {
         return !!this.projectInfo;
     }
-    get exp() {
-        this.ensureProjectContext();
+    async getExpoConfigAsync() {
+        await this.ensureProjectContextAsync();
         return this.projectInfo.exp;
     }
-    get projectId() {
-        this.ensureProjectContext();
+    async getProjectIdAsync() {
+        await this.ensureProjectContextAsync();
         return this.projectInfo.projectId;
     }
-    ensureProjectContext() {
+    async ensureProjectContextAsync() {
         if (this.hasProjectContext) {
             return;
         }
         // trigger getConfig error
-        (0, expoConfig_1.getPrivateExpoConfig)(this.options.projectDir);
+        await (0, expoConfig_1.getPrivateExpoConfigAsync)(this.options.projectDir);
     }
     async bestEffortAppStoreAuthenticateAsync() {
         if (!!this.appStore.authCtx || !this.shouldAskAuthenticateAppStore) {

package/build/credentials/ios/actions/BuildCredentialsUtils.js

@@ -47,9 +47,9 @@ async function assignBuildCredentialsAsync(ctx, app, iosDistributionType, distCe
 }
 exports.assignBuildCredentialsAsync = assignBuildCredentialsAsync;
 async function getAppFromContextAsync(ctx) {
-    ctx.ensureProjectContext();
-    const projectName = ctx.exp.slug;
-    const projectId = ctx.projectId;
+    const exp = await ctx.getExpoConfigAsync();
+    const projectName = exp.slug;
+    const projectId = await ctx.getProjectIdAsync();
     const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(ctx.graphqlClient, projectId);
     return {
         account,

package/build/credentials/manager/ManageIos.js

@@ -73,7 +73,7 @@ class ManageIos {
             return await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(ctx.graphqlClient, projectId);
         };
         const account = ctx.hasProjectContext
-            ? await getAccountForProjectAsync(ctx.projectId)
+            ? await getAccountForProjectAsync(await ctx.getProjectIdAsync())
             : (0, actions_1.ensureActorHasPrimaryAccount)(ctx.user);
         let app = null;
         let targets = null;
@@ -160,15 +160,16 @@ class ManageIos {
     }
     async createProjectContextAsync(ctx, account, buildProfile) {
         (0, assert_1.default)(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');
-        const app = { account, projectName: ctx.exp.slug };
+        const exp = await ctx.getExpoConfigAsync();
+        const app = { account, projectName: exp.slug };
         const xcodeBuildContext = await (0, scheme_1.resolveXcodeBuildContextAsync)({
             projectDir: ctx.projectDir,
             nonInteractive: ctx.nonInteractive,
-            exp: ctx.exp,
+            exp,
             vcsClient: ctx.vcsClient,
         }, buildProfile);
         const targets = await (0, target_1.resolveTargetsAsync)({
-            exp: ctx.exp,
+            exp,
             projectDir: ctx.projectDir,
             xcodeBuildContext,
             env: buildProfile.env,

package/build/credentials/manager/SetUpIosBuildCredentials.js

@@ -42,7 +42,7 @@ class SetUpIosBuildCredentials extends ManageIos_1.ManageIos {
             return await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(ctx.graphqlClient, projectId);
         };
         const account = ctx.hasProjectContext
-            ? await getAccountForProjectAsync(ctx.projectId)
+            ? await getAccountForProjectAsync(await ctx.getProjectIdAsync())
             : (0, actions_1.ensureActorHasPrimaryAccount)(ctx.user);
         let app = null;
         let targets = null;

package/build/metadata/apple/config/reader.js

@@ -21,22 +21,24 @@ class AppleConfigReader {
             return null;
         }
         return {
+            ageRatingOverride: attributes.ageRatingOverride ?? apple_utils_1.RatingOverride.NONE,
             alcoholTobaccoOrDrugUseOrReferences: attributes.alcoholTobaccoOrDrugUseOrReferences ?? apple_utils_1.Rating.NONE,
             contests: attributes.contests ?? apple_utils_1.Rating.NONE,
+            gambling: attributes.gambling ?? false,
             gamblingSimulated: attributes.gamblingSimulated ?? apple_utils_1.Rating.NONE,
             horrorOrFearThemes: attributes.horrorOrFearThemes ?? apple_utils_1.Rating.NONE,
+            kidsAgeBand: attributes.kidsAgeBand ?? null,
+            koreaAgeRatingOverride: attributes.koreaAgeRatingOverride ?? apple_utils_1.KoreaRatingOverride.NONE,
+            lootBox: attributes.lootBox ?? false,
             matureOrSuggestiveThemes: attributes.matureOrSuggestiveThemes ?? apple_utils_1.Rating.NONE,
             medicalOrTreatmentInformation: attributes.medicalOrTreatmentInformation ?? apple_utils_1.Rating.NONE,
             profanityOrCrudeHumor: attributes.profanityOrCrudeHumor ?? apple_utils_1.Rating.NONE,
             sexualContentGraphicAndNudity: attributes.sexualContentGraphicAndNudity ?? apple_utils_1.Rating.NONE,
             sexualContentOrNudity: attributes.sexualContentOrNudity ?? apple_utils_1.Rating.NONE,
+            unrestrictedWebAccess: attributes.unrestrictedWebAccess ?? false,
             violenceCartoonOrFantasy: attributes.violenceCartoonOrFantasy ?? apple_utils_1.Rating.NONE,
             violenceRealistic: attributes.violenceRealistic ?? apple_utils_1.Rating.NONE,
             violenceRealisticProlongedGraphicOrSadistic: attributes.violenceRealisticProlongedGraphicOrSadistic ?? apple_utils_1.Rating.NONE,
-            gambling: attributes.gambling ?? false,
-            unrestrictedWebAccess: attributes.unrestrictedWebAccess ?? false,
-            kidsAgeBand: attributes.kidsAgeBand ?? null,
-            seventeenPlus: attributes.seventeenPlus ?? false,
         };
     }
     getLocales() {

package/build/metadata/apple/config/writer.d.ts

@@ -14,7 +14,7 @@ export declare class AppleConfigWriter {
         configVersion: number;
         apple: Partial<AppleMetadata>;
     };
-    setAgeRating(attributes: AttributesOf<AgeRatingDeclaration>): void;
+    setAgeRating(attributes: Omit<AttributesOf<AgeRatingDeclaration>, 'seventeenPlus' | 'gamblingAndContests'>): void;
     setInfoLocale(attributes: AttributesOf<AppInfoLocalization>): void;
     setCategories(attributes: Pick<AttributesOf<AppInfo>, 'primaryCategory' | 'primarySubcategoryOne' | 'primarySubcategoryTwo' | 'secondaryCategory' | 'secondarySubcategoryOne' | 'secondarySubcategoryTwo'>): void;
     setVersion(attributes: Omit<AttributesOf<AppStoreVersion>, 'releaseType' | 'earliestReleaseDate'>): void;

package/build/metadata/apple/config/writer.js

@@ -17,24 +17,27 @@ class AppleConfigWriter {
             apple: this.schema,
         };
     }
+    // Note, both `seventeenPlus` and `gamlingAndContests` are deprecated
     setAgeRating(attributes) {
         this.schema.advisory = {
+            ageRatingOverride: attributes.ageRatingOverride ?? apple_utils_1.RatingOverride.NONE,
             alcoholTobaccoOrDrugUseOrReferences: attributes.alcoholTobaccoOrDrugUseOrReferences ?? apple_utils_1.Rating.NONE,
             contests: attributes.contests ?? apple_utils_1.Rating.NONE,
+            gambling: attributes.gambling ?? false,
             gamblingSimulated: attributes.gamblingSimulated ?? apple_utils_1.Rating.NONE,
             horrorOrFearThemes: attributes.horrorOrFearThemes ?? apple_utils_1.Rating.NONE,
+            kidsAgeBand: attributes.kidsAgeBand ?? null,
+            koreaAgeRatingOverride: attributes.koreaAgeRatingOverride ?? apple_utils_1.KoreaRatingOverride.NONE,
+            lootBox: attributes.lootBox ?? false,
             matureOrSuggestiveThemes: attributes.matureOrSuggestiveThemes ?? apple_utils_1.Rating.NONE,
             medicalOrTreatmentInformation: attributes.medicalOrTreatmentInformation ?? apple_utils_1.Rating.NONE,
             profanityOrCrudeHumor: attributes.profanityOrCrudeHumor ?? apple_utils_1.Rating.NONE,
             sexualContentGraphicAndNudity: attributes.sexualContentGraphicAndNudity ?? apple_utils_1.Rating.NONE,
             sexualContentOrNudity: attributes.sexualContentOrNudity ?? apple_utils_1.Rating.NONE,
+            unrestrictedWebAccess: attributes.unrestrictedWebAccess ?? false,
             violenceCartoonOrFantasy: attributes.violenceCartoonOrFantasy ?? apple_utils_1.Rating.NONE,
             violenceRealistic: attributes.violenceRealistic ?? apple_utils_1.Rating.NONE,
             violenceRealisticProlongedGraphicOrSadistic: attributes.violenceRealisticProlongedGraphicOrSadistic ?? apple_utils_1.Rating.NONE,
-            gambling: attributes.gambling ?? false,
-            unrestrictedWebAccess: attributes.unrestrictedWebAccess ?? false,
-            kidsAgeBand: attributes.kidsAgeBand ?? null,
-            seventeenPlus: attributes.seventeenPlus ?? false,
         };
     }
     setInfoLocale(attributes) {

package/build/metadata/apple/types.d.ts

@@ -11,7 +11,7 @@ export interface AppleMetadata {
     preview?: Record<string, string[]>;
     review?: AppleReview;
 }
-export type AppleAdvisory = Partial<AgeRatingDeclarationProps>;
+export type AppleAdvisory = Omit<Partial<AgeRatingDeclarationProps>, 'seventeenPlus' | 'gamblingAndContests'>;
 /** Apps can define up to two categories, or categories with up to two subcategories */
 export type AppleCategory = (string | string[])[];
 export interface AppleRelease {

package/build/project/expoConfig.d.ts

@@ -13,7 +13,7 @@ export interface ExpoConfigOptions {
 export declare function createOrModifyExpoConfigAsync(projectDir: string, exp: Partial<ExpoConfig>, readOptions?: {
     skipSDKVersionRequirement?: boolean;
 }): ReturnType<typeof modifyConfigAsync>;
-export declare function getPrivateExpoConfig(projectDir: string, opts?: ExpoConfigOptions): ExpoConfig;
+export declare function getPrivateExpoConfigAsync(projectDir: string, opts?: ExpoConfigOptions): Promise<ExpoConfig>;
 export declare function ensureExpoConfigExists(projectDir: string): void;
 export declare function isUsingStaticExpoConfig(projectDir: string): boolean;
-export declare function getPublicExpoConfig(projectDir: string, opts?: ExpoConfigOptions): PublicExpoConfig;
+export declare function getPublicExpoConfigAsync(projectDir: string, opts?: ExpoConfigOptions): Promise<PublicExpoConfig>;

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;