Compare commits

...
12 Commits
Author SHA1 Message Date
Brent Vatne 11c194a168 v0.38.2 2021-11-26 13:50:29 -08:00
Brent Vatne 3c74c111a7 Update yarn.lock 2021-11-26 13:41:40 -08:00
Brent Vatne b69b8b87a7 [eas-cli] upgrade @expo/* deps (#801) 2021-11-26 13:40:58 -08:00
jkh 825baa9f68 [eas-cli] check EAS Update URL is correctly configured before publish (#789) 2021-11-26 16:23:14 -05:00
Dominik Sokal 9f5736cfaa fix lint error 2021-11-26 14:39:10 +01:00
Dominik Sokal ae24ffbe86 fix getProfilesAsync tests 2021-11-26 14:23:08 +01:00
Dominik Sokal 487316370b refactor @expo/eas-json (#794)
* refactor @expo/eas-json

* update CHANGELOG.md
2021-11-26 12:35:49 +01:00
Dominik Sokal 8bc3565270 fix evaluating template strings from info.plist (#798)
* fix evaluating template strings from info.plist

* update CHANGELOG.md
2021-11-26 11:41:57 +01:00
Expo CI 07450f6bf7 update CHANGELOG.md 2021-11-25 09:34:42 +00:00
Dominik Sokal 71d48c3cf2 v0.38.1 2021-11-25 10:29:10 +01:00
Dominik Sokal 7343e81065 upgrade @expo/* deps (#792)
* upgrade @expo/* deps

* update CHANGELOG.md

* fix import
2021-11-25 10:25:05 +01:00
Expo CI 1f1310bef6 update CHANGELOG.md 2021-11-24 13:56:49 +00:00
40 changed files with 719 additions and 633 deletions

No files matched your search

+19
View File
@@ -8,6 +8,25 @@ This is the log of notable changes to EAS CLI and related packages.
### 🎉 New features
- Add support for extending submit profiles. ([#794](https://github.com/expo/eas-cli/pull/794) by [@dsokal](https://github.com/dsokal))
### 🐛 Bug fixes
- Fix reading app version and app build version of iOS projects. ([#798](https://github.com/expo/eas-cli/pull/798) by [@dsokal](https://github.com/dsokal))
- Fix push notifications entitlements. ([#801](https://github.com/expo/eas-cli/pull/801) by [@brentvatne](https://github.com/brentvatne))
### 🧹 Chores
## [0.38.1](https://github.com/expo/eas-cli/releases/tag/v0.38.1) - 2021-11-25
### 🐛 Bug fixes
- Fix building iOS projects with whitespace in the project name. ([#792](https://github.com/expo/eas-cli/pull/792) by [@dsokal](https://github.com/dsokal))
## [0.38.0](https://github.com/expo/eas-cli/releases/tag/v0.38.0) - 2021-11-24
### 🎉 New features
- Improve unknown capability syncing error message. ([#775](https://github.com/expo/eas-cli/pulls/775) by [@EvanBacon](https://github.com/EvanBacon))
- Add submit webhooks. ([#777](https://github.com/expo/eas-cli/pull/777) by [@dsokal](https://github.com/dsokal))
+1 -1
View File
@@ -1,5 +1,5 @@
{
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.38.0"
"version": "0.38.2"
}
+2 -53
View File
@@ -73,8 +73,6 @@ ALIASES
$ eas login
```
_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/account/login.js)_
## `eas account:logout`
log out
@@ -87,8 +85,6 @@ ALIASES
$ eas logout
```
_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/account/logout.js)_
## `eas account:view`
show the username you are logged in as
@@ -101,8 +97,6 @@ ALIASES
$ eas whoami
```
_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/account/view.js)_
## `eas analytics [STATUS]`
view or change analytics settings
@@ -112,8 +106,6 @@ USAGE
$ eas analytics [STATUS]
```
_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/analytics.js)_
## `eas build`
start a build
@@ -146,8 +138,6 @@ OPTIONS
--[no-]wait Wait for build(s) to complete
```
_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/build/index.js)_
## `eas build:cancel [BUILD_ID]`
Cancel a build.
@@ -157,8 +147,6 @@ USAGE
$ eas build:cancel [BUILD_ID]
```
_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/build/cancel.js)_
## `eas build:configure`
Configure the project to support EAS Build.
@@ -171,8 +159,6 @@ OPTIONS
-p, --platform=(android|ios|all) Platform to configure
```
_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/build/configure.js)_
## `eas build:list`
list all builds for your project
@@ -204,8 +190,6 @@ OPTIONS
--status=(new|in-queue|in-progress|errored|finished|canceled)
```
_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/build/list.js)_
## `eas build:view [BUILD_ID]`
view a build for your project
@@ -218,8 +202,6 @@ OPTIONS
--json Enable JSON output, non-JSON messages will be printed to stderr
```
_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/build/view.js)_
## `eas config`
show the eas.json config
@@ -233,8 +215,6 @@ OPTIONS
--profile=profile
```
_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/config.js)_
## `eas credentials`
manage your credentials
@@ -244,8 +224,6 @@ USAGE
$ eas credentials
```
_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/credentials.js)_
## `eas device:create`
register new Apple Devices to use for internal distribution
@@ -255,8 +233,6 @@ USAGE
$ eas device:create
```
_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/device/create.js)_
## `eas device:list`
list all registered devices for your account
@@ -269,8 +245,6 @@ OPTIONS
--apple-team-id=apple-team-id
```
_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/device/list.js)_
## `eas device:view [UDID]`
view a device for your project
@@ -280,8 +254,6 @@ USAGE
$ eas device:view [UDID]
```
_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/device/view.js)_
## `eas diagnostics`
log environment info to the console
@@ -291,8 +263,6 @@ USAGE
$ eas diagnostics
```
_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/diagnostics.js)_
## `eas help [COMMAND]`
display help for eas
@@ -319,8 +289,6 @@ USAGE
$ eas project:info
```
_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/project/info.js)_
## `eas project:init`
create or link an EAS project
@@ -333,8 +301,6 @@ ALIASES
$ eas init
```
_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/project/init.js)_
## `eas secret:create`
Create an environment secret on the current project or owner account.
@@ -350,8 +316,6 @@ OPTIONS
--value=value Value of the secret
```
_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/secret/create.js)_
## `eas secret:delete`
Delete an environment secret by ID.
@@ -367,8 +331,6 @@ DESCRIPTION
Unsure where to find the secret's ID? Run eas secret:list
```
_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/secret/delete.js)_
## `eas secret:list`
Lists environment secrets available for your current app
@@ -378,8 +340,6 @@ USAGE
$ eas secret:list
```
_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/secret/list.js)_
## `eas submit`
submit build archive to app store
@@ -405,14 +365,13 @@ OPTIONS
--[no-]wait Wait for submission to complete
DESCRIPTION
See how to configure submits with eas.json: https://docs.expo.dev/submit/eas-json/
See how to configure submits with eas.json:
https://docs.expo.dev/submit/eas-json/
ALIASES
$ eas build:submit
```
_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/submit.js)_
## `eas webhook:create`
Create a webhook on the current project.
@@ -430,8 +389,6 @@ OPTIONS
--url=url Webhook URL
```
_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/webhook/create.js)_
## `eas webhook:delete [ID]`
Delete a webhook on the current project.
@@ -444,8 +401,6 @@ ARGUMENTS
ID ID of the webhook to delete
```
_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/webhook/delete.js)_
## `eas webhook:list`
List webhooks on the current project.
@@ -458,8 +413,6 @@ OPTIONS
--event=(BUILD|SUBMIT) Event type that triggers the webhook
```
_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/webhook/list.js)_
## `eas webhook:update`
Create a webhook on the current project.
@@ -478,8 +431,6 @@ OPTIONS
--url=url Webhook URL
```
_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/webhook/update.js)_
## `eas webhook:view ID`
View a webhook on the current project.
@@ -491,6 +442,4 @@ USAGE
ARGUMENTS
ID ID of the webhook to view
```
_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.38.0/packages/eas-cli/src/commands/webhook/view.js)_
<!-- commandsstop -->
+8 -9
View File
@@ -1,7 +1,7 @@
{
"name": "eas-cli",
"description": "EAS command line tool",
"version": "0.38.0",
"version": "0.38.2",
"author": "Expo <[email protected]>",
"bin": {
"eas": "./bin/run"
@@ -9,18 +9,17 @@
"bugs": "https://github.com/expo/eas-cli/issues",
"dependencies": {
"@expo/apple-utils": "0.0.0-alpha.26",
"@expo/config": "6.0.7",
"@expo/config-plugins": "4.0.7",
"@expo/config": "6.0.9",
"@expo/config-plugins": "4.0.9",
"@expo/eas-build-job": "0.2.57",
"@expo/eas-json": "^0.38.0",
"@expo/json-file": "8.2.33",
"@expo/pkcs12": "0.0.4",
"@expo/plist": "0.0.14",
"@expo/eas-json": "^0.38.2",
"@expo/json-file": "8.2.34",
"@expo/pkcs12": "0.0.6",
"@expo/plist": "0.0.16",
"@expo/plugin-warn-if-update-available": "1.7.0",
"@expo/prebuild-config": "3.0.7",
"@expo/prebuild-config": "3.0.9",
"@expo/results": "1.0.0",
"@expo/rudder-sdk-node": "1.1.1",
"@expo/sdk-runtime-versions": "1.0.0",
"@expo/spawn-async": "1.5.0",
"@expo/timeago.js": "1.0.0",
"@oclif/command": "1.8.3",
@@ -1,7 +1,7 @@
import { ExpoConfig } from '@expo/config';
import { AndroidConfig } from '@expo/config-plugins';
import { Platform, Workflow } from '@expo/eas-build-job';
import { AndroidBuildProfile, AndroidVersionAutoIncrement } from '@expo/eas-json';
import { AndroidVersionAutoIncrement, BuildProfile } from '@expo/eas-json';
import Log from '../../log';
import {
@@ -41,7 +41,7 @@ export async function validateAndSyncProjectConfigurationAsync({
}: {
projectDir: string;
exp: ExpoConfig;
buildProfile: AndroidBuildProfile;
buildProfile: BuildProfile<Platform.ANDROID>;
}): Promise<void> {
const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
const { autoIncrement } = buildProfile;
@@ -1,5 +1,5 @@
import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
import { AndroidBuildProfile } from '@expo/eas-json';
import { BuildProfile } from '@expo/eas-json';
import path from 'path';
import slash from 'slash';
@@ -25,7 +25,7 @@ export async function prepareJobAsync(
jobData: JobData
): Promise<Job> {
const username = getUsername(ctx.exp, await ensureLoggedInAsync());
const buildProfile: AndroidBuildProfile = ctx.buildProfile;
const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
const projectRootDirectory =
slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
const { credentials } = jobData;
+1 -1
View File
@@ -143,7 +143,7 @@ export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<v
if (await fs.pathExists(easJsonPath)) {
const reader = new EasJsonReader(ctx.projectDir);
await reader.readAndValidateAsync();
await reader.readAsync();
Log.withTick('Validated eas.json');
return;
+2 -2
View File
@@ -1,5 +1,5 @@
import { Platform } from '@expo/eas-build-job';
import { AndroidBuildProfile, BuildProfile, IosBuildProfile } from '@expo/eas-json';
import { BuildProfile } from '@expo/eas-json';
import JsonFile from '@expo/json-file';
import resolveFrom from 'resolve-from';
import { v4 as uuidv4 } from 'uuid';
@@ -107,7 +107,7 @@ function getDevClientEventProperties({
}: {
platform: Platform;
projectDir: string;
buildProfile: AndroidBuildProfile | IosBuildProfile;
buildProfile: BuildProfile;
}): Partial<TrackingContext> {
let includesDevClient;
const version = tryGetDevClientVersion(projectDir);
+2 -2
View File
@@ -1,6 +1,6 @@
import { ExpoConfig } from '@expo/config';
import { Platform, Workflow } from '@expo/eas-build-job';
import { IosBuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
import type { XCBuildConfiguration } from 'xcode';
import Log from '../../log';
@@ -36,7 +36,7 @@ export async function validateAndSyncProjectConfigurationAsync({
}: {
projectDir: string;
exp: ExpoConfig;
buildProfile: IosBuildProfile;
buildProfile: BuildProfile<Platform.IOS>;
buildSettings: XCBuildConfiguration['buildSettings'];
}): Promise<void> {
const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+7 -1
View File
@@ -130,6 +130,7 @@ export async function maybeResolveVersionsAsync(
};
} catch (err: any) {
Log.warn('Failed to read app versions.');
Log.debug(err);
Log.warn(err.message);
Log.warn('Proceeding anyway...');
return {};
@@ -200,7 +201,12 @@ function ensureStaticConfigExists(projectDir: string): void {
}
}
export function evaluateTemplateString(s: string, vars: Record<string, any>): string {
export function evaluateTemplateString(
s: string,
buildSettings: XCBuildConfiguration['buildSettings']
): string {
// necessary because XCBuildConfiguration['buildSettings'] is not a plain object
const vars = { ...buildSettings };
return s.replace(/\$\((\w+)\)/g, (match, key) => {
if (vars.hasOwnProperty(key)) {
const value = String(vars[key]);
@@ -8,7 +8,6 @@ import {
initAsync as initAnalyticsAsync,
logEvent,
} from '../analytics/rudderstackClient';
import Log from '../log';
import { findProjectRootAsync } from '../project/projectUtils';
import { getUserAsync } from '../user/User';
import { ensureLoggedInAsync } from '../user/actions';
@@ -27,8 +26,6 @@ export default abstract class EasCommand extends Command {
// eslint-disable-next-line async-protect/async-suffix
async run(): Promise<any> {
EasJsonReader.setLog(Log);
await initAnalyticsAsync();
await this.applyCliConfigAsync();
@@ -40,6 +40,8 @@ import { createUpdateBranchOnAppAsync } from './create';
import { listBranchesAsync } from './list';
import { viewUpdateBranchAsync } from './view';
const EAS_UPDATE_URL = 'https://u.expo.dev';
export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
type PlatformFlag = PublishPlatform | 'all';
@@ -204,8 +206,8 @@ export default class BranchPublish extends EasCommand {
});
const runtimeVersions = await getRuntimeVersionObjectAsync(exp, platformFlag, projectDir);
const projectId = await getProjectIdAsync(exp);
await checkEASUpdateURLIsSetAsync(exp);
if (!branchName && autoFlag) {
branchName =
@@ -473,3 +475,19 @@ function formatUpdateTitle(
'mmm dd HH:MM'
)} by ${actorName}, runtimeVersion: ${runtimeVersion}] ${message}`;
}
async function getEASUpdateURLAsync(exp: ExpoConfig): Promise<string> {
const projectId = await getProjectIdAsync(exp);
return new URL(projectId, EAS_UPDATE_URL).href;
}
async function checkEASUpdateURLIsSetAsync(exp: ExpoConfig): Promise<void> {
const configuredURL = exp.updates?.url;
const expectedURL = await getEASUpdateURLAsync(exp);
if (configuredURL !== expectedURL) {
throw new Error(
`The update URL is incorrectly configured for EAS Update. Please set updates.url to ${expectedURL} in your app.json.`
);
}
}
+26 -14
View File
@@ -1,5 +1,5 @@
import { Platform, Workflow } from '@expo/eas-build-job';
import { EasJsonReader } from '@expo/eas-json';
import { BuildProfile, EasJsonReader, SubmitProfile } from '@expo/eas-json';
import { flags } from '@oclif/command';
import { error } from '@oclif/errors';
import chalk from 'chalk';
@@ -64,7 +64,7 @@ interface RawBuildFlags {
interface BuildFlags {
requestedPlatform: RequestedPlatform;
skipProjectConfiguration: boolean;
profile: string | null;
profile?: string;
nonInteractive: boolean;
local: boolean;
wait: boolean;
@@ -152,7 +152,7 @@ export default class Build extends EasCommand {
type: 'build',
projectDir,
platforms,
profileName: flags.profile,
profileName: flags.profile ?? undefined,
});
await ensureExpoDevClientInstalledForDevClientBuildsAsync({
@@ -190,14 +190,26 @@ export default class Build extends EasCommand {
const submissions: SubmissionFragment[] = [];
if (flags.autoSubmit) {
const submitProfiles = await getProfilesAsync({
projectDir,
platforms,
profileName: flags.submitProfile,
type: 'submit',
});
for (const startedBuild of startedBuilds) {
const submitProfile = nullthrows(
submitProfiles.find(
({ platform }) => toAppPlatform(platform) === startedBuild.build.platform
)
).profile;
const submission = await this.prepareAndStartSubmissionAsync({
build: startedBuild.build,
buildCtx: nullthrows(buildCtxByPlatform[startedBuild.build.platform]),
flags,
moreBuilds: startedBuilds.length > 1,
projectDir,
buildProfile: startedBuild.buildProfile,
buildProfile: startedBuild.buildProfile.profile,
submitProfile,
nonInteractive: flags.nonInteractive,
});
submissions.push(submission);
}
@@ -260,7 +272,7 @@ export default class Build extends EasCommand {
return {
requestedPlatform,
skipProjectConfiguration: flags['skip-project-configuration'],
profile: profile ?? null,
profile,
nonInteractive,
local: flags['local'],
wait: flags['wait'],
@@ -328,29 +340,29 @@ export default class Build extends EasCommand {
private async prepareAndStartSubmissionAsync({
build,
buildCtx,
flags,
moreBuilds,
projectDir,
buildProfile,
submitProfile,
nonInteractive,
}: {
build: BuildFragment;
buildCtx: BuildContext<Platform>;
flags: BuildFlags;
moreBuilds: boolean;
projectDir: string;
buildProfile: ProfileData<'build'>;
buildProfile: BuildProfile;
submitProfile: SubmitProfile;
nonInteractive: boolean;
}): Promise<SubmissionFragment> {
const easJsonReader = new EasJsonReader(projectDir);
const platform = toPlatform(build.platform);
const submitProfile = await easJsonReader.readSubmitProfileAsync(platform, flags.submitProfile);
const submissionCtx = await createSubmissionContextAsync({
platform,
projectDir,
projectId: build.project.id,
profile: submitProfile,
archiveFlags: { id: build.id },
nonInteractive: flags.nonInteractive,
env: buildProfile.profile.env,
nonInteractive,
env: buildProfile.env,
credentialsCtx: buildCtx.credentialsCtx,
applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
});
@@ -386,7 +398,7 @@ export async function handleDeprecatedEasJsonAsync(
return;
}
const easJsonReader = new EasJsonReader(projectDir);
const rawEasJson = await easJsonReader.readRawAsync();
const rawEasJson = await easJsonReader.readAsync();
if (rawEasJson?.cli) {
return;
}
+1 -1
View File
@@ -55,7 +55,7 @@ export default class Config extends EasCommand {
},
]));
const profile = await reader.readBuildProfileAsync(platform, profileName);
const profile = await reader.getBuildProfileAsync(platform, profileName);
const config = getExpoConfig(projectDir, { env: profile.env, isPublicConfig: true });
Log.log(getProjectConfigDescription(projectDir));
@@ -1,7 +1,7 @@
import { IOSConfig, compileModsAsync } from '@expo/config-plugins';
import { Workflow } from '@expo/eas-build-job';
import { JSONObject } from '@expo/json-file';
import { getPrebuildConfig } from '@expo/prebuild-config';
import { getPrebuildConfigAsync } from '@expo/prebuild-config';
import { readPlistAsync } from '../../../utils/plist';
@@ -15,7 +15,7 @@ export async function getManagedEntitlementsJsonAsync(
...process.env,
...env,
};
const { exp } = getPrebuildConfig(projectDir, { platforms: ['ios'] });
const { exp } = await getPrebuildConfigAsync(projectDir, { platforms: ['ios'] });
const expWithMods = await compileModsAsync(exp, {
projectRoot: projectDir,
@@ -1,5 +1,5 @@
import { Platform } from '@expo/eas-build-job';
import { AndroidBuildProfile } from '@expo/eas-json';
import { BuildProfile } from '@expo/eas-json';
import assert from 'assert';
import Log, { learnMore } from '../../log';
@@ -142,7 +142,7 @@ export class ManageAndroid {
private async createProjectContextAsync(ctx: CredentialsContext): Promise<{
gradleContext?: GradleBuildContext;
buildProfile?: AndroidBuildProfile;
buildProfile?: BuildProfile<Platform.ANDROID>;
}> {
if (!ctx.hasProjectContext) {
return {};
@@ -1,5 +1,5 @@
import { Platform } from '@expo/eas-build-job';
import { IosBuildProfile } from '@expo/eas-json';
import { BuildProfile } from '@expo/eas-json';
import assert from 'assert';
import nullthrows from 'nullthrows';
@@ -155,7 +155,11 @@ export class ManageIos {
private async createProjectContextAsync(
ctx: CredentialsContext,
account: Account
): Promise<{ app: App | null; targets: Target[] | null; buildProfile: IosBuildProfile | null }> {
): Promise<{
app: App | null;
targets: Target[] | null;
buildProfile: BuildProfile<Platform.IOS> | null;
}> {
if (!ctx.hasProjectContext) {
return {
app: null,
@@ -219,7 +223,7 @@ export class ManageIos {
ctx: CredentialsContext,
app: App,
targets: Target[],
buildProfile: IosBuildProfile,
buildProfile: BuildProfile<Platform.IOS>,
action: IosActionType
): Promise<void> {
if (action === IosActionType.SetUpBuildCredentials) {
@@ -14,7 +14,7 @@ export class SelectBuildProfileFromEasJson<T extends Platform> {
async runAsync(ctx: CredentialsContext): Promise<BuildProfile<T>> {
const profileName = await this.getProfileNameFromEasConfigAsync(ctx);
const easConfig = await this.easJsonReader.readBuildProfileAsync<T>(this.platform, profileName);
const easConfig = await this.easJsonReader.getBuildProfileAsync<T>(this.platform, profileName);
Log.succeed(`Using build profile: ${profileName}`);
return easConfig;
}
@@ -1,11 +1,12 @@
import { IosBuildProfile } from '@expo/eas-json';
import { Platform } from '@expo/eas-build-job';
import { BuildProfile } from '@expo/eas-json';
import { IosDistributionType as IosDistributionTypeGraphql } from '../../graphql/generated';
import { promptAsync } from '../../prompts';
import { CredentialsContext } from '../context';
export class SelectIosDistributionTypeGraphqlFromBuildProfile {
constructor(private buildProfile: IosBuildProfile) {}
constructor(private buildProfile: BuildProfile<Platform.IOS>) {}
async runAsync(ctx: CredentialsContext): Promise<IosDistributionTypeGraphql> {
const { distribution, simulator } = this.buildProfile;
@@ -1,4 +1,5 @@
import { IosBuildProfile } from '@expo/eas-json';
import { Platform } from '@expo/eas-build-job';
import { BuildProfile } from '@expo/eas-json';
import { IosDistributionType as IosDistributionTypeGraphql } from '../../../graphql/generated';
import { createCtxMock } from '../../__tests__/fixtures-context';
@@ -8,7 +9,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
it('errors with a simulator distribution', async () => {
const buildProfile = {
simulator: true,
} as IosBuildProfile;
} as BuildProfile<Platform.IOS>;
const ctx = createCtxMock({
nonInteractive: false,
@@ -22,7 +23,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
it('returns APP_STORE type with a store distribution', async () => {
const buildProfile = {
distribution: 'store',
} as IosBuildProfile;
} as BuildProfile<Platform.IOS>;
const ctx = createCtxMock({
nonInteractive: false,
@@ -37,7 +38,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
const buildProfile = {
distribution: 'internal',
enterpriseProvisioning: 'universal',
} as IosBuildProfile;
} as BuildProfile<Platform.IOS>;
const ctx = createCtxMock({
nonInteractive: false,
@@ -52,7 +53,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
const buildProfile = {
distribution: 'internal',
enterpriseProvisioning: 'adhoc',
} as IosBuildProfile;
} as BuildProfile<Platform.IOS>;
const ctx = createCtxMock({
nonInteractive: false,
+2 -2
View File
@@ -1,7 +1,7 @@
import { ExpoConfig } from '@expo/config';
import { IOSConfig } from '@expo/config-plugins';
import { Platform, Workflow } from '@expo/eas-build-job';
import { IosBuildProfile } from '@expo/eas-json';
import { BuildProfile } from '@expo/eas-json';
import chalk from 'chalk';
import Log from '../../log';
@@ -20,7 +20,7 @@ export async function resolveXcodeBuildContextAsync(
projectDir,
nonInteractive,
}: { exp: ExpoConfig; projectDir: string; nonInteractive: boolean },
buildProfile: IosBuildProfile
buildProfile: BuildProfile<Platform.IOS>
): Promise<XcodeBuildContext> {
const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
if (workflow === Workflow.GENERIC) {
@@ -8,8 +8,8 @@ jest.mock('@expo/eas-json', () => {
const EasJsonReaderMock = jest.fn();
EasJsonReaderMock.prototype = {
readBuildProfileAsync: jest.fn(),
readSubmitProfileAsync: jest.fn(),
getBuildProfileAsync: jest.fn(),
getSubmitProfileAsync: jest.fn(),
};
return {
...actual,
@@ -17,11 +17,11 @@ jest.mock('@expo/eas-json', () => {
};
});
const readBuildProfileAsync = jest.spyOn(EasJsonReader.prototype, 'readBuildProfileAsync');
const getBuildProfileAsync = jest.spyOn(EasJsonReader.prototype, 'getBuildProfileAsync');
describe(getProfilesAsync, () => {
afterEach(() => {
readBuildProfileAsync.mockReset();
getBuildProfileAsync.mockReset();
});
it('defaults to production profile', async () => {
@@ -34,17 +34,17 @@ describe(getProfilesAsync, () => {
expect(result[0].profileName).toBe('production');
expect(result[1].profileName).toBe('production');
expect(readBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
expect(readBuildProfileAsync).toBeCalledWith(Platform.IOS, 'production');
expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'production');
});
it('defaults to release profile when production profile is non-existent', async () => {
readBuildProfileAsync
.mockRejectedValueOnce(() => {
throw new Error();
getBuildProfileAsync
.mockImplementationOnce(() => {
throw new errors.MissingProfileError();
})
.mockRejectedValueOnce(() => {
throw new Error();
.mockImplementationOnce(() => {
throw new errors.MissingProfileError();
});
const result = await getProfilesAsync({
@@ -56,20 +56,16 @@ describe(getProfilesAsync, () => {
expect(result[0].profileName).toBe('release');
expect(result[1].profileName).toBe('release');
expect(readBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
expect(readBuildProfileAsync).toBeCalledWith(Platform.IOS, 'production');
expect(readBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'release');
expect(readBuildProfileAsync).toBeCalledWith(Platform.IOS, 'release');
expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'production');
expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'release');
expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'release');
});
it('fails when neither production or release profiles are present', async () => {
readBuildProfileAsync
.mockRejectedValueOnce(() => {
throw new Error();
})
.mockRejectedValueOnce(() => {
throw new Error();
});
getBuildProfileAsync.mockImplementation(() => {
throw new errors.MissingProfileError();
});
await expect(
getProfilesAsync({
@@ -78,7 +74,7 @@ describe(getProfilesAsync, () => {
profileName: undefined,
type: 'build',
})
).rejects.toThrowError(/There is no build profile named "production" in eas.json/);
).rejects.toThrowError(errors.MissingProfileError);
});
it('gets a specific profile', async () => {
@@ -91,12 +87,12 @@ describe(getProfilesAsync, () => {
expect(result[0].profileName).toBe('custom-profile');
expect(result[1].profileName).toBe('custom-profile');
expect(readBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'custom-profile');
expect(readBuildProfileAsync).toBeCalledWith(Platform.IOS, 'custom-profile');
expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'custom-profile');
expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'custom-profile');
});
it('throws validation error if eas.json is invalid', async () => {
readBuildProfileAsync.mockImplementation(() => {
getBuildProfileAsync.mockImplementation(() => {
throw new errors.InvalidEasJsonError('eas.json is not valid');
});
+36 -12
View File
@@ -1,10 +1,15 @@
import { Platform } from '@expo/eas-build-job';
import { BuildProfile, EasJsonReader, SubmitProfile, errors } from '@expo/eas-json';
import {
BuildProfile,
EasJsonReader,
ProfileType,
SubmitProfile,
errors,
getDefaultSubmitProfile,
} from '@expo/eas-json';
import Log from '../log';
type ProfileType = 'build' | 'submit';
type EasProfile<T extends ProfileType> = T extends 'build'
? BuildProfile<Platform>
: SubmitProfile<Platform>;
@@ -23,7 +28,7 @@ export async function getProfilesAsync<T extends ProfileType>({
}: {
projectDir: string;
platforms: Platform[];
profileName?: string | null;
profileName?: string;
type: T;
}): Promise<ProfileData<T>[]> {
const results = platforms.map(async function (platform) {
@@ -32,23 +37,28 @@ export async function getProfilesAsync<T extends ProfileType>({
if (!profileName) {
try {
profile = await readProfileAsync({ projectDir, platform, type, profileName: 'production' });
profileName = 'production';
profile = await readProfileAsync({ projectDir, platform, type, profileName });
} catch (errorOuter) {
if (errorOuter instanceof errors.InvalidEasJsonError) {
if (!(errorOuter instanceof errors.MissingProfileError)) {
throw errorOuter;
}
try {
profile = await readProfileAsync({ projectDir, platform, type, profileName: 'release' });
profileName = 'release';
profile = await readProfileAsync({ projectDir, platform, type, profileName });
Log.warn(
'The default profile changed from "release" to "production". We detected that you still have a "release" build profile, so we are using it. Update eas.json to have a profile named "production" under the `build` key, or specify which profile you\'d like to use with the --profile flag. This fallback behavior will be removed in the next major version of EAS CLI.'
);
} catch (errorInner) {
if (errorInner instanceof errors.InvalidEasJsonError) {
if (!(errorInner instanceof errors.MissingProfileError)) {
throw errorInner;
}
throw new Error(`There is no ${type} profile named "production" in eas.json`);
const defaultProfile = getDefaultProfile({ platform, type });
if (!defaultProfile) {
throw errorInner;
}
profileName = '__default__';
profile = defaultProfile;
}
}
} else {
@@ -73,13 +83,27 @@ async function readProfileAsync<T extends ProfileType>({
}: {
projectDir: string;
platform: Platform;
type: ProfileType;
type: T;
profileName: string;
}): Promise<EasProfile<T>> {
const easJsonReader = new EasJsonReader(projectDir);
if (type === 'build') {
return (await easJsonReader.readBuildProfileAsync(platform, profileName)) as EasProfile<T>;
return (await easJsonReader.getBuildProfileAsync(platform, profileName)) as EasProfile<T>;
} else {
return (await easJsonReader.readSubmitProfileAsync(platform, profileName)) as EasProfile<T>;
return (await easJsonReader.getSubmitProfileAsync(platform, profileName)) as EasProfile<T>;
}
}
function getDefaultProfile<T extends ProfileType>({
platform,
type,
}: {
platform: Platform;
type: T;
}): EasProfile<T> | null {
if (type === 'build') {
return null;
} else {
return getDefaultSubmitProfile(platform) as EasProfile<T>;
}
}
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@expo/eas-json",
"description": "A library for interacting with eas.json",
"version": "0.38.0",
"version": "0.38.2",
"author": "Expo <[email protected]>",
"bugs": "https://github.com/expo/eas-cli/issues",
"dependencies": {
-31
View File
@@ -1,31 +0,0 @@
import { Platform } from '@expo/eas-build-job';
import { AndroidBuildProfile, CommonBuildProfile, IosBuildProfile } from './EasBuild.types';
import { AndroidSubmitProfile, IosSubmitProfile } from './EasSubmit.types';
export enum CredentialsSource {
LOCAL = 'local',
REMOTE = 'remote',
}
export interface RawBuildProfile extends Partial<CommonBuildProfile> {
extends?: string;
[Platform.ANDROID]?: Partial<AndroidBuildProfile>;
[Platform.IOS]?: Partial<IosBuildProfile>;
}
export interface EasSubmitConfiguration {
[Platform.ANDROID]?: AndroidSubmitProfile;
[Platform.IOS]?: IosSubmitProfile;
}
export interface CliConfig {
version?: string;
requireCommit?: boolean;
}
export interface EasJson {
cli?: CliConfig;
build: { [profile: string]: RawBuildProfile };
submit?: { [profile: string]: EasSubmitConfiguration };
}
-265
View File
@@ -1,265 +0,0 @@
import { Platform } from '@expo/eas-build-job';
import JsonFile from '@expo/json-file';
import envString from 'env-string';
import fs from 'fs-extra';
import path from 'path';
import { BuildProfile } from './EasBuild.types';
import { CliConfig, CredentialsSource, EasJson, RawBuildProfile } from './EasJson.types';
import {
AndroidSubmitProfileSchema,
CliConfigSchema,
EasJsonSchema,
IosSubmitProfileSchema,
MinimalEasJsonSchema,
} from './EasJsonSchema';
import {
AndroidSubmitProfileFieldsToEvaluate,
IosSubmitProfileFieldsToEvaluate,
SubmitProfile,
} from './EasSubmit.types';
import { InvalidEasJsonError, MissingEasJsonError } from './errors';
interface EasJsonPreValidation {
cli?: object;
build: { [profile: string]: object };
submit?: { [profile: string]: object };
}
const defaults = {
distribution: 'store',
credentialsSource: CredentialsSource.REMOTE,
} as const;
type LoggerFn = (...args: any[]) => void;
interface Logger {
log: LoggerFn;
warn: LoggerFn;
}
export class EasJsonReader {
private static log?: Logger;
public static formatEasJsonPath(projectDir: string): string {
return path.join(projectDir, 'eas.json');
}
public static setLog(log: Logger): void {
this.log = log;
}
constructor(private projectDir: string) {}
public async getBuildProfileNamesAsync(): Promise<string[]> {
const easJson = await this.readRawAsync();
return Object.keys(easJson?.build ?? {});
}
public async getCliConfigAsync(): Promise<CliConfig | null> {
try {
const easJson = await this.readRawAsync();
if (!easJson.cli) {
return null;
}
const { value, error } = CliConfigSchema.validate(easJson.cli, {
allowUnknown: false,
convert: true,
abortEarly: false,
});
if (error) {
throw new Error(`"cli" field in eas.json is not valid [${error.toString()}]`);
}
return value as CliConfig;
} catch (err: any) {
if (err instanceof MissingEasJsonError) {
return null;
}
throw err;
}
}
public async getSubmitProfileNamesAsync({ throwIfEasJsonDoesNotExist = true } = {}): Promise<
string[]
> {
try {
const easJson = await this.readRawAsync();
return Object.keys(easJson?.submit ?? {});
} catch (err: any) {
if (!throwIfEasJsonDoesNotExist && err.code === 'ENOENT') {
return [];
} else {
throw err;
}
}
}
public async readBuildProfileAsync<T extends Platform>(
platform: T,
profileName: string
): Promise<BuildProfile<T>> {
const easJson = await this.readAndValidateAsync();
this.ensureBuildProfileExists(easJson, profileName);
const {
android: resolvedAndroidSpecificValues,
ios: resolvedIosSpecificValues,
...resolvedProfile
} = this.resolveBuildProfile(easJson, profileName);
if (platform === Platform.ANDROID) {
const profileWithoutDefaults = profileMerge(
resolvedProfile,
resolvedAndroidSpecificValues ?? {}
);
return profileMerge(defaults, profileWithoutDefaults) as BuildProfile<T>;
} else if (platform === Platform.IOS) {
const profileWithoutDefaults = profileMerge(resolvedProfile, resolvedIosSpecificValues ?? {});
return profileMerge(defaults, profileWithoutDefaults) as BuildProfile<T>;
} else {
throw new Error(`Unknown platform ${platform}`);
}
}
public async readSubmitProfileAsync<T extends Platform>(
platform: T,
profileNameArg?: string
): Promise<SubmitProfile<T>> {
let profileName = profileNameArg;
if (!profileName) {
const profileNames = await this.getSubmitProfileNamesAsync({
throwIfEasJsonDoesNotExist: false,
});
if (profileNames.includes('production')) {
profileName = 'production';
} else if (profileNames.includes('release')) {
profileName = 'release';
} else {
return getDefaultSubmitProfile(platform);
}
}
const easJson = await this.readAndValidateAsync();
const profile = easJson?.submit?.[profileName];
if (!profile) {
throw new Error(`There is no submit profile named ${profileName} in eas.json`);
}
const platformProfile = profile[platform];
if (platformProfile) {
return this.evaluateFields(platform, platformProfile as SubmitProfile<T>);
} else {
return getDefaultSubmitProfile(platform);
}
}
public async readAndValidateAsync(): Promise<EasJson> {
const easJson = await this.readRawAsync();
const { value, error } = EasJsonSchema.validate(easJson, {
allowUnknown: false,
convert: true,
abortEarly: false,
});
if (error) {
throw new InvalidEasJsonError(`eas.json is not valid [${error.toString()}]`);
}
return value as EasJson;
}
public async readRawAsync(): Promise<EasJsonPreValidation> {
try {
const easJsonPath = EasJsonReader.formatEasJsonPath(this.projectDir);
if (!(await fs.pathExists(easJsonPath))) {
throw new MissingEasJsonError(
`An eas.json file could not be found at ${easJsonPath}. You must make one in order to proceed. Learn more at https://expo.fyi/eas-json`
);
}
const rawEasJson = JsonFile.read(easJsonPath);
const { value, error } = MinimalEasJsonSchema.validate(rawEasJson, { abortEarly: false });
if (error) {
throw new InvalidEasJsonError(`eas.json is not valid [${error.toString()}]`);
}
return value;
} catch (err: any) {
if (err.code === 'EJSONPARSE') {
err.message = `Found invalid JSON in eas.json. ${err.message}`;
}
throw err;
}
}
private resolveBuildProfile(
easJson: EasJson,
profileName: string,
depth: number = 0
): RawBuildProfile {
if (depth >= 2) {
throw new Error(
'Too long chain of build profile extensions, make sure "extends" keys do not make a cycle'
);
}
const buildProfile = easJson.build[profileName];
if (!buildProfile) {
throw new Error(`There is no build profile named ${profileName} in eas.json`);
}
const { extends: baseProfileName, ...buildProfileRest } = buildProfile;
if (baseProfileName) {
return profileMerge(
this.resolveBuildProfile(easJson, baseProfileName, depth + 1),
buildProfileRest
);
} else {
return buildProfileRest;
}
}
private ensureBuildProfileExists(easJson: EasJson, profileName: string): void {
if (!easJson.build || !easJson.build[profileName]) {
throw new Error(`There is no build profile named ${profileName} in eas.json`);
}
}
private evaluateFields<T extends Platform>(
platform: T,
profile: SubmitProfile<T>
): SubmitProfile<T> {
const fields =
platform === Platform.ANDROID
? AndroidSubmitProfileFieldsToEvaluate
: IosSubmitProfileFieldsToEvaluate;
const evaluatedProfile = { ...profile };
for (const field of fields) {
if (field in evaluatedProfile) {
// @ts-ignore
evaluatedProfile[field] = envString(evaluatedProfile[field], process.env);
}
}
return evaluatedProfile;
}
}
export function profileMerge(base: RawBuildProfile, update: RawBuildProfile): RawBuildProfile {
const result = {
...base,
...update,
};
if (base.env && update.env) {
result.env = {
...base.env,
...update.env,
};
}
if (base.android && update.android) {
result.android = profileMerge(base.android, update.android);
}
if (base.ios && update.ios) {
result.ios = profileMerge(base.ios, update.ios);
}
return result;
}
function getDefaultSubmitProfile<T extends Platform>(platform: T): SubmitProfile<T> {
const Schema =
platform === Platform.ANDROID ? AndroidSubmitProfileSchema : IosSubmitProfileSchema;
return Schema.validate({}, { convert: true }).value;
}
@@ -2,7 +2,7 @@ import { Platform } from '@expo/eas-build-job';
import fs from 'fs-extra';
import { vol } from 'memfs';
import { EasJsonReader } from '../EasJsonReader';
import { EasJsonReader } from '../reader';
jest.mock('fs');
@@ -19,18 +19,18 @@ test('minimal valid eas.json for both platforms', async () => {
});
const reader = new EasJsonReader('/project');
const iosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'production');
const androidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'production');
const iosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'production');
const androidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'production');
expect({
expect(androidProfile).toEqual({
distribution: 'store',
credentialsSource: 'remote',
}).toEqual(androidProfile);
});
expect({
expect(iosProfile).toEqual({
distribution: 'store',
credentialsSource: 'remote',
}).toEqual(iosProfile);
});
});
test('valid eas.json for development client builds', async () => {
@@ -47,20 +47,20 @@ test('valid eas.json for development client builds', async () => {
});
const reader = new EasJsonReader('/project');
const iosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'debug');
const androidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'debug');
expect({
const iosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'debug');
const androidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'debug');
expect(androidProfile).toEqual({
credentialsSource: 'remote',
distribution: 'store',
developmentClient: true,
withoutCredentials: true,
}).toEqual(androidProfile);
});
expect({
expect(iosProfile).toEqual({
credentialsSource: 'remote',
distribution: 'store',
developmentClient: true,
}).toEqual(iosProfile);
});
});
test('valid profile for internal distribution on Android', async () => {
@@ -73,11 +73,11 @@ test('valid profile for internal distribution on Android', async () => {
});
const reader = new EasJsonReader('/project');
const profile = await reader.readBuildProfileAsync(Platform.ANDROID, 'internal');
expect({
const profile = await reader.getBuildProfileAsync(Platform.ANDROID, 'internal');
expect(profile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
}).toEqual(profile);
});
});
test('valid profile extending other profile', async () => {
@@ -95,18 +95,18 @@ test('valid profile extending other profile', async () => {
});
const reader = new EasJsonReader('/project');
const baseProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'base');
const extendedProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'extension');
expect({
const baseProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'base');
const extendedProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'extension');
expect(baseProfile).toEqual({
distribution: 'store',
credentialsSource: 'remote',
node: '12.0.0',
}).toEqual(baseProfile);
expect({
});
expect(extendedProfile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
node: '13.0.0',
}).toEqual(extendedProfile);
});
});
test('valid profile extending other profile with platform specific envs', async () => {
@@ -134,33 +134,33 @@ test('valid profile extending other profile with platform specific envs', async
});
const reader = new EasJsonReader('/project');
const baseProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'base');
const extendedAndroidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'extension');
const extendedIosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'extension');
expect({
const baseProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'base');
const extendedAndroidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'extension');
const extendedIosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'extension');
expect(baseProfile).toEqual({
distribution: 'store',
credentialsSource: 'remote',
env: {
BASE_ENV: '1',
PROFILE: 'base',
},
}).toEqual(baseProfile);
expect({
});
expect(extendedAndroidProfile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
env: {
BASE_ENV: '1',
PROFILE: 'extension:android',
},
}).toEqual(extendedAndroidProfile);
expect({
});
expect(extendedIosProfile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
env: {
BASE_ENV: '1',
PROFILE: 'extension',
},
}).toEqual(extendedIosProfile);
});
});
test('valid profile extending other profile with platform specific caching', async () => {
@@ -188,32 +188,32 @@ test('valid profile extending other profile with platform specific caching', asy
});
const reader = new EasJsonReader('/project');
const baseProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'base');
const extendedAndroidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'extension');
const extendedIosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'extension');
expect({
const baseProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'base');
const extendedAndroidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'extension');
const extendedIosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'extension');
expect(baseProfile).toEqual({
distribution: 'store',
credentialsSource: 'remote',
cache: {
disabled: true,
},
}).toEqual(baseProfile);
expect({
});
expect(extendedAndroidProfile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
cache: {
cacheDefaultPaths: false,
customPaths: ['somefakepath'],
},
}).toEqual(extendedAndroidProfile);
expect({
});
expect(extendedIosProfile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
cache: {
key: 'extend-key',
},
}).toEqual(extendedIosProfile);
});
});
test('valid eas.json with missing profile', async () => {
@@ -224,8 +224,8 @@ test('valid eas.json with missing profile', async () => {
});
const reader = new EasJsonReader('/project');
const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'debug');
await expect(promise).rejects.toThrowError('There is no build profile named debug in eas.json');
const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'debug');
await expect(promise).rejects.toThrowError('Missing build profile in eas.json: debug');
});
test('invalid eas.json when using wrong buildType', async () => {
@@ -236,7 +236,7 @@ test('invalid eas.json when using wrong buildType', async () => {
});
const reader = new EasJsonReader('/project');
const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
await expect(promise).rejects.toThrowError(
'eas.json is not valid [ValidationError: "build.production.android.buildType" must be one of [apk, app-bundle]]'
);
@@ -246,10 +246,8 @@ test('empty json', async () => {
await fs.writeJson('/project/eas.json', {});
const reader = new EasJsonReader('/project');
const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
await expect(promise).rejects.toThrowError(
'There is no build profile named production in eas.json'
);
const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
await expect(promise).rejects.toThrowError('Missing build profile in eas.json: production');
});
test('invalid semver value', async () => {
@@ -260,7 +258,7 @@ test('invalid semver value', async () => {
});
const reader = new EasJsonReader('/project');
const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
await expect(promise).rejects.toThrowError(
'eas.json is not valid [ValidationError: "build.production.node" failed custom validation because 12.0.0-alpha is not a valid version]'
);
@@ -274,15 +272,15 @@ test('invalid release channel', async () => {
});
const reader = new EasJsonReader('/project');
const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
await expect(promise).rejects.toThrowError(/fails to match the required pattern/);
});
test('get profile names', async () => {
await fs.writeJson('/project/eas.json', {
build: {
production: { node: '12.0.0-alpha' },
blah: { node: '12.0.0-alpha' },
production: { node: '12.0.0' },
blah: { node: '12.0.0' },
},
});
@@ -2,7 +2,7 @@ import { Platform } from '@expo/eas-build-job';
import fs from 'fs-extra';
import { vol } from 'memfs';
import { EasJsonReader } from '../EasJsonReader';
import { EasJsonReader } from '../reader';
jest.mock('fs');
@@ -19,8 +19,8 @@ test('minimal allowed eas.json for both platforms', async () => {
});
const reader = new EasJsonReader('/project');
const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'production');
const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
const iosProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'production');
const androidProfile = await reader.getSubmitProfileAsync(Platform.ANDROID, 'production');
expect(androidProfile).toEqual({
changesNotSentForReview: false,
@@ -46,7 +46,7 @@ test('android config with all required values', async () => {
});
const reader = new EasJsonReader('/project');
const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
const androidProfile = await reader.getSubmitProfileAsync(Platform.ANDROID, 'production');
expect(androidProfile).toEqual({
serviceAccountKeyPath: './path.json',
@@ -72,7 +72,7 @@ test('android config with serviceAccountKeyPath set to env var', async () => {
try {
process.env.GOOGLE_SERVICE_ACCOUNT = './path.json';
const reader = new EasJsonReader('/project');
const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
const androidProfile = await reader.getSubmitProfileAsync(Platform.ANDROID, 'production');
expect(androidProfile).toEqual({
serviceAccountKeyPath: './path.json',
@@ -102,7 +102,7 @@ test('ios config with all required values', async () => {
});
const reader = new EasJsonReader('/project');
const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'production');
const iosProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'production');
expect(iosProfile).toEqual({
appleId: '[email protected]',
@@ -136,7 +136,7 @@ test('ios config with ascApiKey fields set to env var', async () => {
process.env.ASC_API_KEY_ISSUER_ID = 'abc-123-def-456';
process.env.ASC_API_KEY_ID = 'ABCD';
const reader = new EasJsonReader('/project');
const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'release');
const iosProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'release');
expect(iosProfile).toEqual({
appleId: '[email protected]',
@@ -153,3 +153,45 @@ test('ios config with ascApiKey fields set to env var', async () => {
process.env.ASC_API_KEY_ID = undefined;
}
});
test('valid profile extending other profile', async () => {
await fs.writeJson('/project/eas.json', {
submit: {
base: {
ios: {
appleId: '[email protected]',
ascAppId: '1223423523',
appleTeamId: 'QWERTY',
},
},
extension: {
extends: 'base',
ios: {
appleTeamId: 'ABCDEF',
ascApiKeyPath: './path-ABCD.p8',
ascApiKeyIssuerId: 'abc-123-def-456',
ascApiKeyId: 'ABCD',
},
},
},
});
const reader = new EasJsonReader('/project');
const baseProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'base');
const extendedProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'extension');
expect(baseProfile).toEqual({
language: 'en-US',
appleId: '[email protected]',
ascAppId: '1223423523',
appleTeamId: 'QWERTY',
});
expect(extendedProfile).toEqual({
language: 'en-US',
appleId: '[email protected]',
ascAppId: '1223423523',
appleTeamId: 'ABCDEF',
ascApiKeyPath: './path-ABCD.p8',
ascApiKeyIssuerId: 'abc-123-def-456',
ascApiKeyId: 'ABCD',
});
});
+97
View File
@@ -0,0 +1,97 @@
import { Platform } from '@expo/eas-build-job';
import { MissingParentProfileError, MissingProfileError } from '../errors';
import { EasJson } from '../types';
import { BuildProfileSchema } from './schema';
import { BuildProfile, EasJsonBuildProfile } from './types';
type EasJsonBuildProfileResolved = Omit<EasJsonBuildProfile, 'extends'>;
export function resolveBuildProfile<T extends Platform>({
easJson,
platform,
profileName,
}: {
easJson: EasJson;
platform: T;
profileName: string;
}): BuildProfile<T> {
const easJsonProfile = resolveProfile({
easJson,
profileName,
});
const { android, ios, ...base } = easJsonProfile;
const withoutDefaults = mergeProfiles(base, easJsonProfile[platform] ?? {});
return mergeProfiles(getDefaultProfile(platform), withoutDefaults) as BuildProfile<T>;
}
function resolveProfile({
easJson,
profileName,
depth = 0,
}: {
easJson: EasJson;
profileName: string;
depth?: number;
}): EasJsonBuildProfileResolved {
if (depth >= 2) {
throw new Error(
'Too long chain of profile extensions, make sure "extends" keys do not make a cycle'
);
}
const profile = easJson.build?.[profileName];
if (!profile) {
if (depth === 0) {
throw new MissingProfileError(`Missing build profile in eas.json: ${profileName}`);
} else {
throw new MissingParentProfileError(
`Extending non-existent build profile in eas.json: ${profileName}`
);
}
}
const { extends: baseProfileName, ...rest } = profile;
if (baseProfileName) {
const baseProfile = resolveProfile({
easJson,
profileName: baseProfileName,
depth: depth + 1,
});
return mergeProfiles(baseProfile, rest);
} else {
return rest;
}
}
function mergeProfiles(
base: EasJsonBuildProfileResolved,
update: EasJsonBuildProfileResolved
): EasJsonBuildProfileResolved {
const result = {
...base,
...update,
};
if (base.env && update.env) {
result.env = {
...base.env,
...update.env,
};
}
if (base.android && update.android) {
result.android = mergeProfiles(base.android, update.android);
}
if (base.ios && update.ios) {
result.ios = mergeProfiles(base.ios, update.ios);
}
return result;
}
function getDefaultProfile<T extends Platform>(platform: T): EasJsonBuildProfile {
const defaultProfile = BuildProfileSchema.validate(
{},
{ allowUnknown: false, abortEarly: false, convert: true }
).value;
const { android, ios, ...base } = defaultProfile;
return mergeProfiles(base, defaultProfile[platform]);
}
@@ -1,16 +1,6 @@
import { Android, Ios } from '@expo/eas-build-job';
import Joi from 'joi';
import { AndroidReleaseStatus, AndroidReleaseTrack } from './EasSubmit.types';
const semverSchemaCheck = (value: any): any => {
if (/^[0-9]+\.[0-9]+\.[0-9]+$/.test(value)) {
return value;
} else {
throw new Error(`${value} is not a valid version`);
}
};
const CacheSchema = Joi.object({
disabled: Joi.boolean(),
key: Joi.string().max(128),
@@ -19,8 +9,8 @@ const CacheSchema = Joi.object({
});
const CommonBuildProfileSchema = Joi.object({
credentialsSource: Joi.string().valid('local', 'remote'),
distribution: Joi.string().valid('store', 'internal'),
credentialsSource: Joi.string().valid('local', 'remote').default('remote'),
distribution: Joi.string().valid('store', 'internal').default('store'),
cache: CacheSchema,
releaseChannel: Joi.string().regex(/^[a-z\d][a-z\d._-]*$/),
channel: Joi.string().regex(/^[a-z\d][a-z\d._-]*$/),
@@ -34,6 +24,8 @@ const CommonBuildProfileSchema = Joi.object({
const AndroidBuildProfileSchema = CommonBuildProfileSchema.concat(
Joi.object({
credentialsSource: Joi.string().valid('local', 'remote'),
distribution: Joi.string().valid('store', 'internal'),
withoutCredentials: Joi.boolean(),
image: Joi.string().valid(...Android.builderBaseImages),
@@ -52,6 +44,8 @@ const AndroidBuildProfileSchema = CommonBuildProfileSchema.concat(
const IosBuildProfileSchema = CommonBuildProfileSchema.concat(
Joi.object({
credentialsSource: Joi.string().valid('local', 'remote'),
distribution: Joi.string().valid('store', 'internal'),
enterpriseProvisioning: Joi.string().valid('adhoc', 'universal'),
autoIncrement: Joi.alternatives().try(
Joi.boolean(),
@@ -70,7 +64,7 @@ const IosBuildProfileSchema = CommonBuildProfileSchema.concat(
})
);
const EasJsonBuildProfileSchema = CommonBuildProfileSchema.concat(
export const BuildProfileSchema = CommonBuildProfileSchema.concat(
Joi.object({
extends: Joi.string(),
android: AndroidBuildProfileSchema,
@@ -78,50 +72,10 @@ const EasJsonBuildProfileSchema = CommonBuildProfileSchema.concat(
})
);
export const AndroidSubmitProfileSchema = Joi.object({
serviceAccountKeyPath: Joi.string(),
track: Joi.string()
.valid(...Object.values(AndroidReleaseTrack))
.default(AndroidReleaseTrack.internal),
releaseStatus: Joi.string()
.valid(...Object.values(AndroidReleaseStatus))
.default(AndroidReleaseStatus.completed),
changesNotSentForReview: Joi.boolean().default(false),
applicationId: Joi.string(),
});
export const IosSubmitProfileSchema = Joi.object({
ascApiKeyPath: Joi.string(),
ascApiKeyId: Joi.string(),
ascApiKeyIssuerId: Joi.string(),
appleId: Joi.string(),
ascAppId: Joi.string(),
appleTeamId: Joi.string(),
sku: Joi.string(),
language: Joi.string().default('en-US'),
companyName: Joi.string(),
appName: Joi.string(),
bundleIdentifier: Joi.string(),
});
const EasJsonSubmitConfigurationSchema = Joi.object({
android: AndroidSubmitProfileSchema,
ios: IosSubmitProfileSchema,
});
export const CliConfigSchema = Joi.object({
version: Joi.string(),
requireCommit: Joi.boolean(),
});
export const MinimalEasJsonSchema = Joi.object({
cli: Joi.object(),
build: Joi.object().pattern(Joi.string(), Joi.object()),
submit: Joi.object().pattern(Joi.string(), Joi.object()),
});
export const EasJsonSchema = Joi.object({
cli: CliConfigSchema,
build: Joi.object().pattern(Joi.string(), EasJsonBuildProfileSchema),
submit: Joi.object().pattern(Joi.string(), EasJsonSubmitConfigurationSchema),
});
function semverSchemaCheck(value: any): any {
if (/^[0-9]+\.[0-9]+\.[0-9]+$/.test(value)) {
return value;
} else {
throw new Error(`${value} is not a valid version`);
}
}
@@ -55,8 +55,10 @@ export interface IosBuildProfile extends CommonBuildProfile {
export type BuildProfile<TPlatform extends Platform = Platform> = TPlatform extends Platform.ANDROID
? AndroidBuildProfile
: TPlatform extends Platform.IOS
? IosBuildProfile
: TPlatform extends Platform
? AndroidBuildProfile | IosBuildProfile
: never;
: IosBuildProfile;
export interface EasJsonBuildProfile extends Partial<CommonBuildProfile> {
extends?: string;
[Platform.ANDROID]?: Partial<AndroidBuildProfile>;
[Platform.IOS]?: Partial<IosBuildProfile>;
}
+4
View File
@@ -1,3 +1,7 @@
export class InvalidEasJsonError extends Error {}
export class MissingEasJsonError extends Error {}
export class MissingProfileError extends Error {}
export class MissingParentProfileError extends Error {}
+6 -13
View File
@@ -1,20 +1,13 @@
export { AndroidReleaseStatus, AndroidReleaseTrack, SubmitProfile } from './submit/types';
export { getDefaultProfile as getDefaultSubmitProfile } from './submit/resolver';
export { EasJson, ProfileType } from './types';
export {
AndroidSubmitProfile,
AndroidReleaseStatus,
AndroidReleaseTrack,
IosSubmitProfile,
SubmitProfile,
} from './EasSubmit.types';
export { EasJson } from './EasJson.types';
export {
AndroidBuildProfile,
AndroidVersionAutoIncrement,
BuildProfile,
CredentialsSource,
DistributionType,
IosBuildProfile,
IosEnterpriseProvisioning,
IosVersionAutoIncrement,
AndroidVersionAutoIncrement,
} from './EasBuild.types';
export { EasJsonReader } from './EasJsonReader';
} from './build/types';
export { EasJsonReader } from './reader';
export * as errors from './errors';
+87
View File
@@ -0,0 +1,87 @@
import { Platform } from '@expo/eas-build-job';
import JsonFile from '@expo/json-file';
import fs from 'fs-extra';
import path from 'path';
import { resolveBuildProfile } from './build/resolver';
import { BuildProfile } from './build/types';
import { InvalidEasJsonError, MissingEasJsonError } from './errors';
import { EasJsonSchema } from './schema';
import { resolveSubmitProfile } from './submit/resolver';
import { SubmitProfile } from './submit/types';
import { EasJson } from './types';
export class EasJsonReader {
private easJson: EasJson | undefined;
constructor(private projectDir: string) {}
public static formatEasJsonPath(projectDir: string): string {
return path.join(projectDir, 'eas.json');
}
public async readAsync(): Promise<EasJson> {
if (this.easJson) {
return this.easJson;
}
try {
const easJsonPath = EasJsonReader.formatEasJsonPath(this.projectDir);
if (!(await fs.pathExists(easJsonPath))) {
throw new MissingEasJsonError(
`eas.json could not be found at ${easJsonPath}. Learn more at https://expo.fyi/eas-json`
);
}
const contents = JsonFile.read(easJsonPath);
const { value, error } = EasJsonSchema.validate(contents, {
allowUnknown: false,
abortEarly: false,
convert: true,
noDefaults: true,
});
if (error) {
throw new InvalidEasJsonError(`eas.json is not valid [${error.toString()}]`);
}
this.easJson = value;
return value;
} catch (err: any) {
if (err.code === 'EJSONPARSE') {
err.message = `Found invalid JSON in eas.json. ${err.message}`;
}
throw err;
}
}
public async getBuildProfileNamesAsync(): Promise<string[]> {
const easJson = await this.readAsync();
return Object.keys(easJson?.build ?? {});
}
public async getBuildProfileAsync<T extends Platform>(
platform: T,
profileName: string
): Promise<BuildProfile<T>> {
const easJson = await this.readAsync();
return resolveBuildProfile({ easJson, platform, profileName });
}
public async getCliConfigAsync(): Promise<EasJson['cli'] | null> {
try {
const easJson = await this.readAsync();
return easJson.cli ?? null;
} catch (err: any) {
if (err instanceof MissingEasJsonError) {
return null;
}
throw err;
}
}
public async getSubmitProfileAsync<T extends Platform>(
platform: T,
profileName: string
): Promise<SubmitProfile<T>> {
const easJson = await this.readAsync();
return resolveSubmitProfile({ easJson, platform, profileName });
}
}
+13
View File
@@ -0,0 +1,13 @@
import Joi from 'joi';
import { BuildProfileSchema } from './build/schema';
import { SubmitProfileSchema } from './submit/schema';
export const EasJsonSchema = Joi.object({
cli: Joi.object({
version: Joi.string(),
requireCommit: Joi.boolean(),
}),
build: Joi.object().pattern(Joi.string(), BuildProfileSchema),
submit: Joi.object().pattern(Joi.string(), SubmitProfileSchema),
});
+114
View File
@@ -0,0 +1,114 @@
import { Platform } from '@expo/eas-build-job';
import envString from 'env-string';
import { MissingParentProfileError, MissingProfileError } from '../errors';
import { EasJson } from '../types';
import { AndroidSubmitProfileSchema, IosSubmitProfileSchema } from './schema';
import {
AndroidSubmitProfileFieldsToEvaluate,
IosSubmitProfileFieldsToEvaluate,
SubmitProfile,
} from './types';
export function resolveSubmitProfile<T extends Platform>({
easJson,
platform,
profileName,
}: {
easJson: EasJson;
platform: T;
profileName: string;
}): SubmitProfile<T> {
const submitProfile = resolveProfile({
easJson,
platform,
profileName,
});
const unevaluatedProfile = mergeProfiles(getDefaultProfile(platform), submitProfile);
return evaluateFields(platform, unevaluatedProfile);
}
function resolveProfile<T extends Platform>({
easJson,
profileName,
depth = 0,
platform,
}: {
platform: T;
easJson: EasJson;
profileName: string;
depth?: number;
}): SubmitProfile<T> | undefined {
if (depth >= 2) {
throw new Error(
'Too long chain of profile extensions, make sure "extends" keys do not make a cycle'
);
}
const profile = easJson.submit?.[profileName];
if (!profile) {
if (depth === 0) {
throw new MissingProfileError(`There is no submit profile named ${profileName} in eas.json`);
} else {
throw new MissingParentProfileError(
`Extending non-existent submit profile in eas.json: ${profileName}`
);
}
}
const { extends: baseProfileName, ...rest } = profile;
const platformProfile = rest[platform] as SubmitProfile<T> | undefined;
if (baseProfileName) {
const baseProfile = resolveProfile({
easJson,
platform,
profileName: baseProfileName,
depth: depth + 1,
});
return mergeProfiles(baseProfile, platformProfile);
} else {
return platformProfile;
}
}
function mergeProfiles<T extends Platform>(
base: SubmitProfile<T>,
update?: SubmitProfile<T>
): SubmitProfile<T>;
function mergeProfiles<T extends Platform>(
base?: SubmitProfile<T>,
update?: SubmitProfile<T>
): SubmitProfile<T> | undefined;
function mergeProfiles<T extends Platform>(
base?: SubmitProfile<T>,
update?: SubmitProfile<T>
): SubmitProfile<T> | undefined {
if (!update) {
return base;
}
return { ...base, ...update };
}
export function getDefaultProfile<T extends Platform>(platform: T): SubmitProfile<T> {
const Schema =
platform === Platform.ANDROID ? AndroidSubmitProfileSchema : IosSubmitProfileSchema;
return Schema.validate({}, { allowUnknown: false, abortEarly: false, convert: true }).value;
}
function evaluateFields<T extends Platform>(
platform: T,
profile: SubmitProfile<T>
): SubmitProfile<T> {
const fields =
platform === Platform.ANDROID
? AndroidSubmitProfileFieldsToEvaluate
: IosSubmitProfileFieldsToEvaluate;
const evaluatedProfile = { ...profile };
for (const field of fields) {
if (field in evaluatedProfile) {
// @ts-ignore
evaluatedProfile[field] = envString(evaluatedProfile[field], process.env);
}
}
return evaluatedProfile;
}
+35
View File
@@ -0,0 +1,35 @@
import Joi from 'joi';
import { AndroidReleaseStatus, AndroidReleaseTrack } from './types';
export const AndroidSubmitProfileSchema = Joi.object({
serviceAccountKeyPath: Joi.string(),
track: Joi.string()
.valid(...Object.values(AndroidReleaseTrack))
.default(AndroidReleaseTrack.internal),
releaseStatus: Joi.string()
.valid(...Object.values(AndroidReleaseStatus))
.default(AndroidReleaseStatus.completed),
changesNotSentForReview: Joi.boolean().default(false),
applicationId: Joi.string(),
});
export const IosSubmitProfileSchema = Joi.object({
ascApiKeyPath: Joi.string(),
ascApiKeyId: Joi.string(),
ascApiKeyIssuerId: Joi.string(),
appleId: Joi.string(),
ascAppId: Joi.string(),
appleTeamId: Joi.string(),
sku: Joi.string(),
language: Joi.string().default('en-US'),
companyName: Joi.string(),
appName: Joi.string(),
bundleIdentifier: Joi.string(),
});
export const SubmitProfileSchema = Joi.object({
extends: Joi.string(),
android: AndroidSubmitProfileSchema,
ios: IosSubmitProfileSchema,
});
@@ -47,10 +47,10 @@ export const IosSubmitProfileFieldsToEvaluate: (keyof IosSubmitProfile)[] = [
];
export type SubmitProfile<TPlatform extends Platform = Platform> =
TPlatform extends Platform.ANDROID
? AndroidSubmitProfile
: TPlatform extends Platform.IOS
? IosSubmitProfile
: TPlatform extends Platform
? AndroidSubmitProfile | IosSubmitProfile
: never;
TPlatform extends Platform.ANDROID ? AndroidSubmitProfile : IosSubmitProfile;
export interface EasJsonSubmitProfile {
extends?: string;
[Platform.ANDROID]?: AndroidSubmitProfile;
[Platform.IOS]?: IosSubmitProfile;
}
+21
View File
@@ -0,0 +1,21 @@
import { EasJsonBuildProfile } from './build/types';
import { EasJsonSubmitProfile } from './submit/types';
export type ProfileType = 'build' | 'submit';
export type EasJsonProfile<T extends ProfileType> = T extends 'build'
? EasJsonBuildProfile
: EasJsonSubmitProfile;
export enum CredentialsSource {
LOCAL = 'local',
REMOTE = 'remote',
}
export interface EasJson {
cli?: {
version?: string;
requireCommit?: boolean;
};
build?: { [profileName: string]: EasJsonBuildProfile };
submit?: { [profileName: string]: EasJsonSubmitProfile };
}
Generated
+42 -46
View File
@@ -848,14 +848,14 @@
mv "~2"
safe-json-stringify "~1"
"@expo/[email protected].7":
version "4.0.7"
resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-4.0.7.tgz#c3cd8d2297edd779576b71a8ad16fc8b80c08eda"
integrity sha512-m160Y039LJcI8Q4arzA9edWNRPPnLnTe5tB41812Mn1BAmtoZy9OMs4Rj78OKFkMx6A9JJKUTWMnP/FVAbeMiw==
"@expo/[email protected].9":
version "4.0.9"
resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-4.0.9.tgz#52c5bee8411185fc4a340072fbed3584d0409234"
integrity sha512-3wv0uhG5U5O4BGX2qm4gjFK3jvYVTy0raFsR6B/2zoBNgD3lXF8Ae5osVN118aKNZb2B7SMx3V7McunZhf7RXg==
dependencies:
"@expo/config-types" "^43.0.1"
"@expo/json-file" "8.2.33"
"@expo/plist" "0.0.15"
"@expo/json-file" "8.2.34"
"@expo/plist" "0.0.16"
"@react-native/normalize-color" "^2.0.0"
chalk "^4.1.2"
debug "^4.3.1"
@@ -874,15 +874,15 @@
resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-43.0.1.tgz#3e047dccb371741a540980eaff26fb0c95039c30"
integrity sha512-EtllpCGDdB/UdwAIs5YXJwBLpbFQNdlLLrxIvoILA9cXrpQMWkeDCT9lQPJzFRMFcLUaMuGvkzX2tR4tx5EQFQ==
"@expo/[email protected].7":
version "6.0.7"
resolved "https://registry.yarnpkg.com/@expo/config/-/config-6.0.7.tgz#c84c76c907e65e0f92ebc67e11173c62de1ed513"
integrity sha512-aOsm+ZSqCgQrDf+UPHM62QGIpNdt+D3NJSFdHECnTUS6vWiTXhdVS23VQ4ris2thQS0ZRKKlX90S8CBUU49fIg==
"@expo/[email protected].9":
version "6.0.9"
resolved "https://registry.yarnpkg.com/@expo/config/-/config-6.0.9.tgz#d2f700e067581f7fb088c4e811b38351ac57e151"
integrity sha512-UJs8b5SSU9dl4VrX+MiSJcSwUVt7u6oUfNQDJ6VIWu03lDkNKtrk64GeSmUqHKsFd6iFXaMxtvkTBVmWWM6NaA==
dependencies:
"@babel/code-frame" "~7.10.4"
"@expo/config-plugins" "4.0.7"
"@expo/config-plugins" "4.0.9"
"@expo/config-types" "^43.0.1"
"@expo/json-file" "8.2.33"
"@expo/json-file" "8.2.34"
getenv "^1.0.0"
glob "7.1.6"
require-from-string "^2.0.2"
@@ -899,10 +899,10 @@
joi "^17.4.2"
semver "^7.3.5"
"@expo/[email protected]7":
version "0.3.17"
resolved "https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.3.17.tgz#75e2606749ffa1284de570245f668503e4a06c3f"
integrity sha512-zaOj24JK5F+pPGpULP8D9aAbApcR7ixV2GjT43YzZqjHuyxQ5knI+EsbmZ1TNnA1vNJJKMYrigB5+chcUGwkpw==
"@expo/[email protected]8":
version "0.3.18"
resolved "https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.3.18.tgz#36a41ab2925974ac5707e02cb0d3694349140497"
integrity sha512-77/ub2aGuf7SYfaFhvCHE54Hs/jRuU5j+pemS5seLfVHNwHbJSse91TMhsTLLNz3GwwqTxFVe3KMycSccJ73nA==
dependencies:
"@expo/spawn-async" "1.5.0"
chalk "^4.0.0"
@@ -925,6 +925,15 @@
json5 "^1.0.1"
write-file-atomic "^2.3.0"
"@expo/[email protected]":
version "8.2.34"
resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.2.34.tgz#2f24e90a677195f7a81e167115460eb2902c3130"
integrity sha512-ZxtBodAZGxdLtgKzmsC+8ViUxt1mhFW642Clu2OuG3f6PAyAFsU/SqEGag9wKFaD3x3Wt8VhL+3y5fMJmUFgPw==
dependencies:
"@babel/code-frame" "~7.10.4"
json5 "^1.0.1"
write-file-atomic "^2.3.0"
"@expo/[email protected]":
version "1.24.0-expo"
resolved "https://registry.yarnpkg.com/@expo/oclif-dev-cli/-/oclif-dev-cli-1.24.0-expo.tgz#4e1f766e79b4d99e3da29318a577952793b143bf"
@@ -945,26 +954,17 @@
qqjs "^0.3.10"
tslib "^1.9.3"
"@expo/[email protected].4":
version "0.0.4"
resolved "https://registry.yarnpkg.com/@expo/pkcs12/-/pkcs12-0.0.4.tgz#d4ba48bfcb5dcae979e96644a0ca157c0d70f075"
integrity sha512-dYNecU+r4RIy8dPzu1SCUi+EqPhfSic6ODH6IkKLCf9m7unxEO0SvhU+rJqlgpoQ49PThOmk4EFX2KCClyrKnw==
"@expo/[email protected].6":
version "0.0.6"
resolved "https://registry.yarnpkg.com/@expo/pkcs12/-/pkcs12-0.0.6.tgz#ef9e4691bfced9318d4a3736260ced27401fc752"
integrity sha512-glYvPd2fv9tAQbXWprhnUYmKGmOtFJzGxhBef90bkZL8N4yNhcF1T/+l1Nrtzrf/ZSAjCnek4oXezpwOUYBnWw==
dependencies:
node-forge "^0.10.0"
"@expo/[email protected]4":
version "0.0.14"
resolved "https://registry.yarnpkg.com/@expo/plist/-/plist-0.0.14.tgz#a756903bd28aabe0a961222df2e7858a39a218c9"
integrity sha512-bb4Ua1M/OdNgS8KiGdSDUjZ/bbPfv3xdPY/lz8Ctp/adlj/QgB8xA7tVPeqSSfJPZqFRwU0qLCnRhpUOnP51VQ==
dependencies:
"@xmldom/xmldom" "~0.7.0"
base64-js "^1.2.3"
xmlbuilder "^14.0.0"
"@expo/[email protected]":
version "0.0.15"
resolved "https://registry.yarnpkg.com/@expo/plist/-/plist-0.0.15.tgz#41ef37b7bbe6b81c48bf4a5c359661c766bb9e90"
integrity sha512-LDxiS0KNZAGJu4fIJhbEKczmb+zeftl1NU0LE0tj0mozoMI5HSKdMUchgvnBm35bwBl8ekKkAfJJ0ONxljWQjQ==
"@expo/[email protected]6":
version "0.0.16"
resolved "https://registry.yarnpkg.com/@expo/plist/-/plist-0.0.16.tgz#c7d294a774196cfa1d8caf89a75ba923f5d1d53c"
integrity sha512-yQMt2CTm2VNLiHv2/EqHYrHvfflI2mFJd+DZIQQy569hvpZle0CxMPGH1p2KatbrO8htxJNvwrlR/4TIwhQJ5w==
dependencies:
"@xmldom/xmldom" "~0.7.0"
base64-js "^1.2.3"
@@ -985,20 +985,21 @@
lodash.template "^4.4.0"
semver "^7.3.2"
"@expo/[email protected].7":
version "3.0.7"
resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-3.0.7.tgz#9d2e22b06ea61377331d561e5fb47a505d96757c"
integrity sha512-0lcgbqC5EP5f+SXu7jY0krLqqKfIbpp4LuDKJBpB7+ytM5W6VOURcCJA7BmwYD42kxsj9JOz/qjU1+OLr3g1qQ==
"@expo/[email protected].9":
version "3.0.9"
resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-3.0.9.tgz#c9a7034d4299bd7b3bf36c17efbdf1772899c7fe"
integrity sha512-j4cHyZe04WijAyH2sJS2pH8DltqPDVQczN6brqFiuRktyIAroqh4ZMY1fgpSweX18LTXmGF9d1fG1aXC+N64YQ==
dependencies:
"@expo/config" "6.0.7"
"@expo/config-plugins" "4.0.7"
"@expo/config" "6.0.9"
"@expo/config-plugins" "4.0.9"
"@expo/config-types" "^43.0.1"
"@expo/image-utils" "0.3.17"
"@expo/json-file" "8.2.33"
"@expo/image-utils" "0.3.18"
"@expo/json-file" "8.2.34"
debug "^4.3.1"
fs-extra "^9.0.0"
resolve-from "^5.0.0"
semver "7.3.2"
xml2js "0.4.23"
"@expo/[email protected]":
version "1.0.0"
@@ -1018,11 +1019,6 @@
remove-trailing-slash "^0.1.0"
uuid "^8.3.2"
"@expo/[email protected]":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@expo/sdk-runtime-versions/-/sdk-runtime-versions-1.0.0.tgz#d7ebd21b19f1c6b0395e50d78da4416941c57f7c"
integrity sha512-Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ==
"@expo/[email protected]":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@expo/spawn-async/-/spawn-async-1.5.0.tgz#799827edd8c10ef07eb1a2ff9dcfe081d596a395"