From 22dea6d6feef2b873d386587f17e74779f1ee99d Mon Sep 17 00:00:00 2001 From: Brent Vatne Date: Tue, 3 Nov 2020 10:46:21 -0800 Subject: [PATCH] [cli] Use exact @expo/eas-build-job version, update it, and fix related TS errors (#2850) --- packages/expo-cli/package.json | 2 +- .../eas-build/build/builders/AndroidBuilder.ts | 9 +++------ .../commands/eas-build/build/builders/iOSBuilder.ts | 9 +++------ .../src/commands/eas-build/build/credentials.ts | 4 +++- .../expo-cli/src/commands/eas-build/build/metadata.ts | 4 +++- packages/expo-cli/src/easJson.ts | 11 +---------- yarn.lock | 8 ++++---- 7 files changed, 18 insertions(+), 29 deletions(-) diff --git a/packages/expo-cli/package.json b/packages/expo-cli/package.json index add94aa10f..1608e95ac5 100644 --- a/packages/expo-cli/package.json +++ b/packages/expo-cli/package.json @@ -67,7 +67,7 @@ "@expo/bunyan": "3.0.2", "@expo/config": "3.3.12", "@expo/dev-tools": "0.13.56", - "@expo/eas-build-job": "^0.1.1", + "@expo/eas-build-job": "0.1.2", "@expo/json-file": "8.2.24", "@expo/package-manager": "0.0.33", "@expo/plist": "0.0.10", diff --git a/packages/expo-cli/src/commands/eas-build/build/builders/AndroidBuilder.ts b/packages/expo-cli/src/commands/eas-build/build/builders/AndroidBuilder.ts index 5c37d8ebc8..0b503a0728 100644 --- a/packages/expo-cli/src/commands/eas-build/build/builders/AndroidBuilder.ts +++ b/packages/expo-cli/src/commands/eas-build/build/builders/AndroidBuilder.ts @@ -1,5 +1,5 @@ import { AndroidConfig } from '@expo/config'; -import { Android, BuildType, Job, Platform, sanitizeJob } from '@expo/eas-build-job'; +import { Android, Job, Platform, sanitizeJob, Workflow } from '@expo/eas-build-job'; import path from 'path'; import CommandError from '../../../../CommandError'; @@ -11,7 +11,6 @@ import { AndroidGenericBuildProfile, AndroidManagedBuildProfile, CredentialsSource, - Workflow, } from '../../../../easJson'; import { gitAddAsync, gitRootDirectory } from '../../../../git'; import { Builder, BuilderContext } from '../../types'; @@ -169,7 +168,7 @@ class AndroidBuilder implements Builder { const projectRootDirectory = path.relative(await gitRootDirectory(), process.cwd()) || '.'; return { ...(await this.prepareJobCommonAsync(archiveUrl)), - type: BuildType.Generic, + type: Workflow.Generic, gradleCommand: buildProfile.gradleCommand, artifactPath: buildProfile.artifactPath, releaseChannel: buildProfile.releaseChannel, @@ -183,9 +182,7 @@ class AndroidBuilder implements Builder { ): Promise> { return { ...(await this.prepareJobCommonAsync(archiveUrl)), - type: BuildType.Managed, - packageJson: { example: 'packageJson' }, - manifest: { example: 'manifest' }, + type: Workflow.Managed, }; } diff --git a/packages/expo-cli/src/commands/eas-build/build/builders/iOSBuilder.ts b/packages/expo-cli/src/commands/eas-build/build/builders/iOSBuilder.ts index cd7b749c55..793f133236 100644 --- a/packages/expo-cli/src/commands/eas-build/build/builders/iOSBuilder.ts +++ b/packages/expo-cli/src/commands/eas-build/build/builders/iOSBuilder.ts @@ -1,5 +1,5 @@ import { IOSConfig } from '@expo/config'; -import { BuildType, iOS, Job, Platform, sanitizeJob } from '@expo/eas-build-job'; +import { iOS, Job, Platform, sanitizeJob, Workflow } from '@expo/eas-build-job'; import sortBy from 'lodash/sortBy'; import path from 'path'; @@ -12,7 +12,6 @@ import { CredentialsSource, iOSGenericBuildProfile, iOSManagedBuildProfile, - Workflow, } from '../../../../easJson'; import { gitRootDirectory } from '../../../../git'; import log from '../../../../log'; @@ -194,7 +193,7 @@ class iOSBuilder implements Builder { const projectRootDirectory = path.relative(await gitRootDirectory(), process.cwd()) || '.'; return { ...(await this.prepareJobCommonAsync(archiveUrl)), - type: BuildType.Generic, + type: Workflow.Generic, scheme: this.scheme, artifactPath: buildProfile.artifactPath, releaseChannel: buildProfile.releaseChannel, @@ -208,9 +207,7 @@ class iOSBuilder implements Builder { ): Promise> { return { ...(await this.prepareJobCommonAsync(archiveUrl)), - type: BuildType.Managed, - packageJson: { example: 'packageJson' }, - manifest: { example: 'manifest' }, + type: Workflow.Managed, }; } diff --git a/packages/expo-cli/src/commands/eas-build/build/credentials.ts b/packages/expo-cli/src/commands/eas-build/build/credentials.ts index 32a0aa479f..d5911655e3 100644 --- a/packages/expo-cli/src/commands/eas-build/build/credentials.ts +++ b/packages/expo-cli/src/commands/eas-build/build/credentials.ts @@ -1,6 +1,8 @@ +import { Workflow } from '@expo/eas-build-job'; + import CommandError from '../../../CommandError'; import { CredentialsProvider } from '../../../credentials/provider'; -import { CredentialsSource, Workflow } from '../../../easJson'; +import { CredentialsSource } from '../../../easJson'; import log from '../../../log'; import prompts from '../../../prompts'; import { platformDisplayNames } from '../constants'; diff --git a/packages/expo-cli/src/commands/eas-build/build/metadata.ts b/packages/expo-cli/src/commands/eas-build/build/metadata.ts index aa5ba589d4..28348fdd0a 100644 --- a/packages/expo-cli/src/commands/eas-build/build/metadata.ts +++ b/packages/expo-cli/src/commands/eas-build/build/metadata.ts @@ -1,4 +1,6 @@ -import { CredentialsSource, Workflow } from '../../../easJson'; +import { Workflow } from '@expo/eas-build-job'; + +import { CredentialsSource } from '../../../easJson'; import { BuilderContext, Platform, TrackingContext } from '../types'; /** diff --git a/packages/expo-cli/src/easJson.ts b/packages/expo-cli/src/easJson.ts index 331da9d0b6..f1fa246d9d 100644 --- a/packages/expo-cli/src/easJson.ts +++ b/packages/expo-cli/src/easJson.ts @@ -1,19 +1,10 @@ -import { Platform } from '@expo/eas-build-job'; +import { Platform, Workflow } from '@expo/eas-build-job'; import Joi from '@hapi/joi'; import fs from 'fs-extra'; import path from 'path'; // TODO(wkozyra95): move it to @expo/config or to separate package -// Workflow is representing different value than BuildType from @expo/eas-build-job -// Each workflow has a set of BuildTypes available -// - Generic workflow allows to build 'generic' and 'generic-client' -// - Managed workflow allows to build 'managed' and 'managed-client' -export enum Workflow { - Generic = 'generic', - Managed = 'managed', -} - export enum CredentialsSource { LOCAL = 'local', REMOTE = 'remote', diff --git a/yarn.lock b/yarn.lock index f13a62e3da..e1f1e718f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1423,10 +1423,10 @@ xcode "^3.0.0" xml-js "^1.6.11" -"@expo/eas-build-job@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-0.1.1.tgz#7b71f87ac57192ba03613e18fb0fd5f639d21b6d" - integrity sha512-V5zrRdz6qa45Aflh84CmsEyNcNHG95O7dyzQqpzEI73phB+Jr7ffM+AP0f3+POjy6mwNXIKHgbzH8VG3excPpA== +"@expo/eas-build-job@0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-0.1.2.tgz#104b9bcb1602a23aabf893506e8e55d0dc61cd79" + integrity sha512-hBYVWlEWi8Iu+jWmbzKy2bMsYoWvRwY7MZ+SdKpNvAl+sMpp8rwvxRyRs7cRTa6DuiQ2sdOxqemnw9MJ6S5cRA== dependencies: "@hapi/joi" "^17.1.1"