From 82304e91bfddc7aecc6487b09bd9ac1ddcd15da3 Mon Sep 17 00:00:00 2001 From: Szymon Dziedzic Date: Mon, 2 Sep 2024 16:04:00 +0200 Subject: [PATCH] [eas-cli] remove @expo-config-types dependency --- packages/eas-cli/package.json | 1 - packages/eas-cli/src/__tests__/commands/utils.ts | 2 +- packages/eas-cli/src/build/runBuildAndSubmit.ts | 2 +- .../commandUtils/context/DynamicProjectConfigContextField.ts | 2 +- .../context/OptionalPrivateProjectConfigContextField.ts | 2 +- .../commandUtils/context/PrivateProjectConfigContextField.ts | 2 +- .../src/commandUtils/context/contextUtils/getProjectIdAsync.ts | 3 +-- packages/eas-cli/src/commands/project/init.ts | 3 +-- packages/eas-cli/src/commands/project/onboarding.ts | 2 +- packages/eas-cli/src/eas-update/utils.ts | 2 +- packages/eas-cli/src/metadata/download.ts | 2 +- packages/eas-cli/src/metadata/upload.ts | 2 +- packages/eas-cli/src/update/configure.ts | 2 +- packages/eas-cli/src/utils/expoCli.ts | 2 +- yarn.lock | 2 +- 15 files changed, 14 insertions(+), 17 deletions(-) diff --git a/packages/eas-cli/package.json b/packages/eas-cli/package.json index 27e295db58..9e6ac0ed73 100644 --- a/packages/eas-cli/package.json +++ b/packages/eas-cli/package.json @@ -12,7 +12,6 @@ "@expo/code-signing-certificates": "0.0.5", "@expo/config": "8.5.4", "@expo/config-plugins": "7.8.4", - "@expo/config-types": "50.0.0", "@expo/eas-build-job": "1.0.133", "@expo/eas-json": "11.0.0", "@expo/json-file": "8.2.37", diff --git a/packages/eas-cli/src/__tests__/commands/utils.ts b/packages/eas-cli/src/__tests__/commands/utils.ts index 74d5096f2a..e11f3ff64d 100644 --- a/packages/eas-cli/src/__tests__/commands/utils.ts +++ b/packages/eas-cli/src/__tests__/commands/utils.ts @@ -1,4 +1,4 @@ -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig } from '@expo/config'; import { EasJson } from '@expo/eas-json'; import { Command, Config } from '@oclif/core'; import { vol } from 'memfs'; diff --git a/packages/eas-cli/src/build/runBuildAndSubmit.ts b/packages/eas-cli/src/build/runBuildAndSubmit.ts index c3f8546fae..d667afa496 100644 --- a/packages/eas-cli/src/build/runBuildAndSubmit.ts +++ b/packages/eas-cli/src/build/runBuildAndSubmit.ts @@ -1,4 +1,4 @@ -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig } from '@expo/config'; import { Env, Platform, Workflow } from '@expo/eas-build-job'; import { AppVersionSource, diff --git a/packages/eas-cli/src/commandUtils/context/DynamicProjectConfigContextField.ts b/packages/eas-cli/src/commandUtils/context/DynamicProjectConfigContextField.ts index 08b5a45fff..c6eef0033f 100644 --- a/packages/eas-cli/src/commandUtils/context/DynamicProjectConfigContextField.ts +++ b/packages/eas-cli/src/commandUtils/context/DynamicProjectConfigContextField.ts @@ -1,4 +1,4 @@ -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig } from '@expo/config'; import ContextField, { ContextOptions } from './ContextField'; import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync'; diff --git a/packages/eas-cli/src/commandUtils/context/OptionalPrivateProjectConfigContextField.ts b/packages/eas-cli/src/commandUtils/context/OptionalPrivateProjectConfigContextField.ts index bfc67344b3..2b5516611e 100644 --- a/packages/eas-cli/src/commandUtils/context/OptionalPrivateProjectConfigContextField.ts +++ b/packages/eas-cli/src/commandUtils/context/OptionalPrivateProjectConfigContextField.ts @@ -1,4 +1,4 @@ -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig } from '@expo/config'; import { InvalidEasJsonError } from '@expo/eas-json/build/errors'; import ContextField, { ContextOptions } from './ContextField'; diff --git a/packages/eas-cli/src/commandUtils/context/PrivateProjectConfigContextField.ts b/packages/eas-cli/src/commandUtils/context/PrivateProjectConfigContextField.ts index 4bcc5777b7..cb0d0f7c13 100644 --- a/packages/eas-cli/src/commandUtils/context/PrivateProjectConfigContextField.ts +++ b/packages/eas-cli/src/commandUtils/context/PrivateProjectConfigContextField.ts @@ -1,4 +1,4 @@ -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig } from '@expo/config'; import ContextField, { ContextOptions } from './ContextField'; import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync'; diff --git a/packages/eas-cli/src/commandUtils/context/contextUtils/getProjectIdAsync.ts b/packages/eas-cli/src/commandUtils/context/contextUtils/getProjectIdAsync.ts index 031aa5552e..c89a6144d1 100644 --- a/packages/eas-cli/src/commandUtils/context/contextUtils/getProjectIdAsync.ts +++ b/packages/eas-cli/src/commandUtils/context/contextUtils/getProjectIdAsync.ts @@ -1,5 +1,4 @@ -import { getProjectConfigDescription } from '@expo/config'; -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig, getProjectConfigDescription } from '@expo/config'; import { Env } from '@expo/eas-build-job'; import chalk from 'chalk'; diff --git a/packages/eas-cli/src/commands/project/init.ts b/packages/eas-cli/src/commands/project/init.ts index 2ca850cbba..0421996ba4 100644 --- a/packages/eas-cli/src/commands/project/init.ts +++ b/packages/eas-cli/src/commands/project/init.ts @@ -1,5 +1,4 @@ -import { ConfigError, getProjectConfigDescription } from '@expo/config'; -import { ExpoConfig } from '@expo/config-types'; +import { ConfigError, ExpoConfig, getProjectConfigDescription } from '@expo/config'; import { Flags } from '@oclif/core'; import chalk from 'chalk'; import nullthrows from 'nullthrows'; diff --git a/packages/eas-cli/src/commands/project/onboarding.ts b/packages/eas-cli/src/commands/project/onboarding.ts index cf6a1fd4bb..8952b0b5bd 100644 --- a/packages/eas-cli/src/commands/project/onboarding.ts +++ b/packages/eas-cli/src/commands/project/onboarding.ts @@ -1,4 +1,4 @@ -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig } from '@expo/config'; import { Platform } from '@expo/eas-build-job'; import { EasJson } from '@expo/eas-json'; import chalk from 'chalk'; diff --git a/packages/eas-cli/src/eas-update/utils.ts b/packages/eas-cli/src/eas-update/utils.ts index b71f051677..bfbb0f2219 100644 --- a/packages/eas-cli/src/eas-update/utils.ts +++ b/packages/eas-cli/src/eas-update/utils.ts @@ -1,4 +1,4 @@ -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig } from '@expo/config'; import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient'; import { Client } from '../vcs/vcs'; diff --git a/packages/eas-cli/src/metadata/download.ts b/packages/eas-cli/src/metadata/download.ts index b3c5c3cb50..4d3fb67892 100644 --- a/packages/eas-cli/src/metadata/download.ts +++ b/packages/eas-cli/src/metadata/download.ts @@ -1,4 +1,4 @@ -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig } from '@expo/config'; import { SubmitProfile } from '@expo/eas-json'; import fs from 'fs-extra'; import path from 'path'; diff --git a/packages/eas-cli/src/metadata/upload.ts b/packages/eas-cli/src/metadata/upload.ts index 9c15a3c9b8..ef3a02ad1f 100644 --- a/packages/eas-cli/src/metadata/upload.ts +++ b/packages/eas-cli/src/metadata/upload.ts @@ -1,4 +1,4 @@ -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig } from '@expo/config'; import { SubmitProfile } from '@expo/eas-json'; import { AppleData } from './apple/data'; diff --git a/packages/eas-cli/src/update/configure.ts b/packages/eas-cli/src/update/configure.ts index f1bc8953ae..e3c867c515 100644 --- a/packages/eas-cli/src/update/configure.ts +++ b/packages/eas-cli/src/update/configure.ts @@ -1,4 +1,4 @@ -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig } from '@expo/config'; import { Env, Platform, Workflow } from '@expo/eas-build-job'; import { EasJsonAccessor } from '@expo/eas-json'; import chalk from 'chalk'; diff --git a/packages/eas-cli/src/utils/expoCli.ts b/packages/eas-cli/src/utils/expoCli.ts index fb8cf9138c..aa82072d02 100644 --- a/packages/eas-cli/src/utils/expoCli.ts +++ b/packages/eas-cli/src/utils/expoCli.ts @@ -1,4 +1,4 @@ -import { ExpoConfig } from '@expo/config-types'; +import { ExpoConfig } from '@expo/config'; import spawnAsync from '@expo/spawn-async'; import chalk from 'chalk'; import { boolish } from 'getenv'; diff --git a/yarn.lock b/yarn.lock index 508d51ce9f..a0352293b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1428,7 +1428,7 @@ xcode "^3.0.1" xml2js "0.6.0" -"@expo/config-types@50.0.0", "@expo/config-types@^50.0.0", "@expo/config-types@^50.0.0-alpha.1": +"@expo/config-types@^50.0.0", "@expo/config-types@^50.0.0-alpha.1": version "50.0.0" resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-50.0.0.tgz#b534d3ec997ec60f8af24f6ad56244c8afc71a0b" integrity sha512-0kkhIwXRT6EdFDwn+zTg9R2MZIAEYGn1MVkyRohAd+C9cXOb5RA8WLQi7vuxKF9m1SMtNAUrf0pO+ENK0+/KSw==