[eas-cli] update expo packages to SDK 52 versions (#2706)

# Why Update `@expo` packages to SDK 52 versions # How Update `@expo` packages to SDK 52 versions Fixes #2696 It seems like the `privacy` field was removed from the expo config in the SDK 52 update: https://expo.dev/changelog/2024/11-12-sdk-52. I used `AppPrivay.Unlisted` for the `createApp` mutation input for which this is still required. It was an option selected for an app when `exp.privacy` was undefined. It also seems that `findWorkspaceRoot` function in `@expo/package-manager` was changed to `resolveWorkspaceRoot`. # Test Plan Tests, test commands manually
expo · Nov 25, 2024 · 66daead · 66daead
1 parent 48ebd9b
commit 66daead
Show file tree

Hide file tree

Showing 14 changed files with 209 additions and 294 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 Chores
 
+- Upgrade `@expo` packages to SDK 52 versions. ([#2706](https://github.com/expo/eas-cli/pull/2706) by [@szdziedzic](https://github.com/szdziedzic))
+
 ## [13.4.1](https://github.com/expo/eas-cli/releases/tag/v13.4.1) - 2024-11-22
 
 ### 🧹 Chores

diff --git a/packages/eas-cli/graphql.schema.json b/packages/eas-cli/graphql.schema.json
diff --git a/packages/eas-cli/package.json b/packages/eas-cli/package.json
@@ -10,21 +10,21 @@
   "dependencies": {
     "@expo/apple-utils": "2.1.0",
     "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "9.0.4",
-    "@expo/config-plugins": "8.0.10",
+    "@expo/config": "10.0.4",
+    "@expo/config-plugins": "9.0.9",
     "@expo/eas-build-job": "1.0.149",
     "@expo/eas-json": "13.4.0",
-    "@expo/env": "^0.3.0",
+    "@expo/env": "^0.4.0",
     "@expo/json-file": "8.3.3",
     "@expo/logger": "1.0.117",
     "@expo/multipart-body-parser": "1.1.0",
-    "@expo/osascript": "2.1.3",
-    "@expo/package-manager": "1.5.2",
-    "@expo/pkcs12": "0.1.2",
-    "@expo/plist": "0.1.3",
+    "@expo/osascript": "2.1.4",
+    "@expo/package-manager": "1.6.1",
+    "@expo/pkcs12": "0.1.3",
+    "@expo/plist": "0.2.0",
     "@expo/plugin-help": "5.1.23",
     "@expo/plugin-warn-if-update-available": "2.5.1",
-    "@expo/prebuild-config": "7.0.9",
+    "@expo/prebuild-config": "8.0.17",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.2",

diff --git a/packages/eas-cli/src/commandUtils/context/contextUtils/__tests__/getProjectIdAsync-test.ts b/packages/eas-cli/src/commandUtils/context/contextUtils/__tests__/getProjectIdAsync-test.ts
@@ -225,7 +225,7 @@ describe(getProjectIdAsync, () => {
     jest.mocked(getConfig).mockReturnValue({ exp: { name: 'test', slug: 'test' } } as any);
     jest.mocked(modifyConfigAsync).mockResolvedValue({
       type: 'success',
-      config: { expo: { name: 'test', slug: 'test', extra: { eas: { projectId: '2345' } } } },
+      config: { name: 'test', slug: 'test', extra: { eas: { projectId: '2345' } } },
     });
     jest
       .mocked(fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)

diff --git a/...eas-cli/src/commandUtils/context/contextUtils/findProjectDirAndVerifyProjectSetupAsync.ts b/...eas-cli/src/commandUtils/context/contextUtils/findProjectDirAndVerifyProjectSetupAsync.ts
@@ -42,7 +42,7 @@ async function ensureEasCliIsNotInDependenciesAsync(projectDir: string): Promise
     consoleWarn(`Found ${chalk.bold('eas-cli')} in your project dependencies.`);
   }
 
-  const maybeRepoRoot = PackageManagerUtils.findWorkspaceRoot(projectDir) ?? projectDir;
+  const maybeRepoRoot = PackageManagerUtils.resolveWorkspaceRoot(projectDir) ?? projectDir;
   if (maybeRepoRoot !== projectDir && (await isEasCliInDependenciesAsync(maybeRepoRoot))) {
     printCliVersionWarning = true;
     consoleWarn(`Found ${chalk.bold('eas-cli')} in your monorepo dependencies.`);

diff --git a/packages/eas-cli/src/commandUtils/context/contextUtils/getProjectIdAsync.ts b/packages/eas-cli/src/commandUtils/context/contextUtils/getProjectIdAsync.ts
@@ -12,7 +12,6 @@ import {
   getPrivateExpoConfigAsync,
 } from '../../../project/expoConfig';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import { toAppPrivacy } from '../../../project/projectUtils';
 import SessionManager from '../../../user/SessionManager';
 import { Actor, getActorUsername } from '../../../user/User';
 
@@ -197,7 +196,6 @@ export async function validateOrSetProjectIdAsync({
     {
       accountName: getAccountNameForEASProjectSync(exp, actor),
       projectName: exp.slug,
-      privacy: toAppPrivacy(exp.privacy),
     },
     {
       nonInteractive: options.nonInteractive,

diff --git a/packages/eas-cli/src/commands/project/init.ts b/packages/eas-cli/src/commands/project/init.ts
@@ -8,14 +8,13 @@ import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { saveProjectIdToAppConfigAsync } from '../../commandUtils/context/contextUtils/getProjectIdAsync';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
-import { AppPrivacy, Role } from '../../graphql/generated';
+import { Role } from '../../graphql/generated';
 import { AppMutation } from '../../graphql/mutations/AppMutation';
 import { AppQuery } from '../../graphql/queries/AppQuery';
 import Log, { link } from '../../log';
 import { ora } from '../../ora';
 import { createOrModifyExpoConfigAsync, getPrivateExpoConfigAsync } from '../../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import { toAppPrivacy } from '../../project/projectUtils';
 import { Choice, confirmAsync, promptAsync } from '../../prompts';
 import { Actor } from '../../user/User';
 
@@ -337,7 +336,6 @@ export default class ProjectInit extends EasCommand {
       createdProjectId = await AppMutation.createAppAsync(graphqlClient, {
         accountId: account.id,
         projectName,
-        privacy: toAppPrivacy(exp.privacy) ?? AppPrivacy.Public,
       });
       spinner.succeed(`Created ${chalk.bold(projectLink)}`);
     } catch (err) {

diff --git a/packages/eas-cli/src/graphql/generated.ts b/packages/eas-cli/src/graphql/generated.ts
diff --git a/packages/eas-cli/src/graphql/mutations/AppMutation.ts b/packages/eas-cli/src/graphql/mutations/AppMutation.ts
@@ -3,15 +3,14 @@ import gql from 'graphql-tag';
 
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../client';
-import { AppPrivacy, CreateAppMutation, CreateAppMutationVariables } from '../generated';
+import { CreateAppMutation, CreateAppMutationVariables } from '../generated';
 
 export const AppMutation = {
   async createAppAsync(
     graphqlClient: ExpoGraphqlClient,
     appInput: {
       accountId: string;
       projectName: string;
-      privacy: AppPrivacy;
     }
   ): Promise<string> {
     const data = await withErrorHandlingAsync(

diff --git a/packages/eas-cli/src/project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync.ts b/packages/eas-cli/src/project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync.ts
@@ -2,7 +2,7 @@ import chalk from 'chalk';
 
 import { getProjectDashboardUrl } from '../build/utils/url';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { AppPrivacy, Role } from '../graphql/generated';
+import { Role } from '../graphql/generated';
 import { AppMutation } from '../graphql/mutations/AppMutation';
 import { AppQuery } from '../graphql/queries/AppQuery';
 import { link } from '../log';
@@ -21,7 +21,6 @@ export async function fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsyn
   projectInfo: {
     accountName: string;
     projectName: string;
-    privacy?: AppPrivacy;
   },
   options: {
     nonInteractive: boolean;
@@ -90,7 +89,6 @@ export async function fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsyn
     const id = await AppMutation.createAppAsync(graphqlClient, {
       accountId: account.id,
       projectName,
-      privacy: projectInfo.privacy ?? AppPrivacy.Public,
     });
     spinner.succeed(`Created ${chalk.bold(projectLink)} on Expo`);
     return id;

diff --git a/packages/eas-cli/src/project/projectUtils.ts b/packages/eas-cli/src/project/projectUtils.ts
@@ -7,7 +7,7 @@ import semver from 'semver';
 
 import { getEASUpdateURL } from '../api';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { AccountFragment, AppPrivacy } from '../graphql/generated';
+import { AccountFragment } from '../graphql/generated';
 import { AppQuery } from '../graphql/queries/AppQuery';
 import Log, { learnMore } from '../log';
 import { Actor } from '../user/User';
@@ -31,16 +31,6 @@ export function getUsername(exp: ExpoConfig, user: Actor): string | undefined {
   }
 }
 
-export const toAppPrivacy = (privacy: ExpoConfig['privacy']): AppPrivacy => {
-  if (privacy === 'public') {
-    return AppPrivacy.Public;
-  } else if (privacy === 'hidden') {
-    return AppPrivacy.Hidden;
-  } else {
-    return AppPrivacy.Unlisted;
-  }
-};
-
 /**
  * Return a useful name describing the project config.
  * - dynamic: app.config.js

diff --git a/packages/eas-cli/src/update/configure.ts b/packages/eas-cli/src/update/configure.ts
@@ -3,6 +3,7 @@ import { Env, Platform, Workflow } from '@expo/eas-build-job';
 import { EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
+import nullthrows from 'nullthrows';
 import semver from 'semver';
 
 import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from './android/UpdatesModule';
@@ -149,7 +150,7 @@ async function ensureEASUpdatesIsConfiguredInExpoConfigAsync({
       return {
         projectChanged: true,
         // TODO(cedric): fix return type of `modifyConfigAsync` to avoid `null` for type === success repsonses
-        exp: result.config?.expo!,
+        exp: nullthrows(result.config, 'Expected config to be defined'),
       };
 
     case 'warn':

diff --git a/packages/eas-cli/src/vcs/clients/git.ts b/packages/eas-cli/src/vcs/clients/git.ts
@@ -60,7 +60,7 @@ export default class GitClient extends Client {
     Log.warn('EAS requires you to use a git repository for your project.');
 
     const cwd = process.cwd();
-    const repoRoot = PackageManagerUtils.findWorkspaceRoot(cwd) ?? cwd;
+    const repoRoot = PackageManagerUtils.resolveWorkspaceRoot(cwd) ?? cwd;
     const confirmInit = await confirmAsync({
       message: `Would you like us to run 'git init' in ${
         this.maybeCwdOverride ?? repoRoot