delete Api module (#3360)

expo · Apr 7, 2021 · 0b76c5d · 0b76c5d
1 parent 7828450
commit 0b76c5d
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 278 deletions.
diff --git a/packages/expo-cli/src/exp.ts b/packages/expo-cli/src/exp.ts
@@ -16,7 +16,6 @@ import url from 'url';
 import wrapAnsi from 'wrap-ansi';
 import {
   Analytics,
-  Api,
   ApiV2,
   Binaries,
   Config,
@@ -46,7 +45,6 @@ import { ora } from './utils/ora';
 // directory
 const packageJSON = require('../package.json');
 
-Api.setClientName(packageJSON.version);
 ApiV2.setClientName(packageJSON.version);
 
 // The following prototyped functions are not used here, but within in each file found in `./commands`

diff --git a/packages/xdl/src/Api.ts b/packages/xdl/src/Api.ts
diff --git a/packages/xdl/src/ApiV2.ts b/packages/xdl/src/ApiV2.ts
@@ -7,8 +7,8 @@ import QueryString from 'querystring';
 
 import { Config, ConnectionStatus } from './internal';
 
-export const MAX_CONTENT_LENGTH = 100 /* MB */ * 1024 * 1024;
-export const MAX_BODY_LENGTH = 100 /* MB */ * 1024 * 1024;
+const MAX_CONTENT_LENGTH = 100 /* MB */ * 1024 * 1024;
+const MAX_BODY_LENGTH = 100 /* MB */ * 1024 * 1024;
 
 // These aren't constants because some commands switch between staging and prod
 function _rootBaseUrl() {

diff --git a/packages/xdl/src/Simulator.ts b/packages/xdl/src/Simulator.ts
@@ -11,9 +11,9 @@ import semver from 'semver';
 
 import {
   Analytics,
-  Api,
   BundleIdentifier,
   delayAsync,
+  downloadAppAsync,
   learnMore,
   Logger,
   NotificationCode,
@@ -434,7 +434,7 @@ export async function _downloadSimulatorAppAsync(
 
   fs.mkdirpSync(dir);
   try {
-    await Api.downloadAsync(url, dir, { extract: true }, downloadProgressCallback);
+    await downloadAppAsync(url, dir, { extract: true }, downloadProgressCallback);
   } catch (e) {
     fs.removeSync(dir);
     throw e;

diff --git a/packages/xdl/src/index.ts b/packages/xdl/src/index.ts
@@ -6,7 +6,6 @@ if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test') {
 export {
   Analytics,
   Android,
-  Api,
   ApiV2,
   Binaries,
   Config,

diff --git a/packages/xdl/src/internal.ts b/packages/xdl/src/internal.ts
@@ -19,12 +19,7 @@ export { default as NotificationCode } from './NotificationCode';
 export { learnMore } from './logs/TerminalLink';
 export { default as Analytics } from './Analytics';
 export * as Android from './Android';
-export { default as Api } from './Api';
-export {
-  default as ApiV2,
-  MAX_BODY_LENGTH as API_V2_MAX_BODY_LENGTH,
-  MAX_CONTENT_LENGTH as API_V2_MAX_CONTENT_LENGTH,
-} from './ApiV2';
+export { default as ApiV2 } from './ApiV2';
 export * as Binaries from './Binaries';
 export * as EmbeddedAssets from './EmbeddedAssets';
 export { ErrorCode } from './ErrorCode';
@@ -83,6 +78,7 @@ export * as ExpSchema from './project/ExpSchema';
 export { delayAsync } from './utils/delayAsync';
 export { choosePortAsync } from './utils/choosePortAsync';
 export { downloadApkAsync } from './utils/downloadApkAsync';
+export { downloadAppAsync } from './utils/downloadAppAsync';
 export * as BundleIdentifier from './BundleIdentifier';
 export * as FsCache from './tools/FsCache';
 export * as WebpackEnvironment from './webpack-utils/WebpackEnvironment';

diff --git a/packages/xdl/src/utils/downloadApkAsync.ts b/packages/xdl/src/utils/downloadApkAsync.ts
@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 
-import { Api, UserSettings, Versions } from '../internal';
+import { downloadAppAsync, UserSettings, Versions } from '../internal';
 
 function _apkCacheDirectory() {
   const dotExpoHomeDirectory = UserSettings.dotExpoHomeDirectory();
@@ -26,6 +26,6 @@ export async function downloadApkAsync(
     return apkPath;
   }
 
-  await Api.downloadAsync(url, apkPath, undefined, downloadProgressCallback);
+  await downloadAppAsync(url, apkPath, undefined, downloadProgressCallback);
   return apkPath;
 }