refactor: Set Appium as peer dependency (#747)

Author: mykola-mokhnach

.azure-pipelines.yml

@@ -1,5 +1,5 @@
 variables:
-  NODE_VERSION: 12.x
+  NODE_VERSION: 16.x
   _FORCE_LOGS: 1
   CI: true
   MOCHA_TIMEOUT: 360000

gulpfile.js

@@ -1,13 +1,12 @@
 'use strict';
 
 const { exec } = require('teen_process');
-const system = require('@appium/support').system;
 const gulp = require('gulp');
 const boilerplate = require('@appium/gulp-plugins').boilerplate.use(gulp);
 const DEFAULTS = require('@appium/gulp-plugins').boilerplate.DEFAULTS;
 
 
-const ANT_CMD = system.isWindows() ? 'ant.bat' : 'ant';
+const ANT_CMD = process.platform === 'win32' ? 'ant.bat' : 'ant';
 
 gulp.task('ant-clean', function clean () {
   return exec(ANT_CMD, ['clean'], {cwd: 'bootstrap'});

index.js

@@ -1,30 +1,5 @@
 #!/usr/bin/env node
 // transpile:main
-
-import { asyncify } from 'asyncbox';
-import * as server from './lib/server';
-
-
-const { startServer } = server;
-
-const DEFAULT_HOST = 'localhost';
-const DEFAULT_PORT = 4723;
-
-async function main () {
-  const getArgValue = (argName) => {
-    const argIndex = process.argv.indexOf(argName);
-    return argIndex > 0 ? process.argv[argIndex + 1] : null;
-  };
-  const port = parseInt(getArgValue('--port'), 10) || DEFAULT_PORT;
-  const host = getArgValue('--host') || DEFAULT_HOST;
-  return await startServer(port, host);
-}
-
-if (require.main === module) {
-  asyncify(main);
-}
-
-
 import * as driver from './lib/driver';
 import * as androidHelperIndex from './lib/android-helpers';
 import * as commandIndex from './lib/commands/index';
@@ -42,7 +17,7 @@ const { helpers: androidHelpers, SETTINGS_HELPER_PKG_ID } = androidHelperIndex;
 
 export default AndroidDriver;
 export {
-  androidHelpers, androidCommands, AndroidDriver, startServer,
+  androidHelpers, androidCommands, AndroidDriver,
   commonCapConstraints, webviewHelpers, NATIVE_WIN, WEBVIEW_WIN,
   WEBVIEW_BASE, CHROMIUM_WIN, SETTINGS_HELPER_PKG_ID,
 };

lib/android-helpers.js

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import path from 'path';
 import { retry, waitForCondition } from 'asyncbox';
 import logger from './logger';
-import { fs, util } from '@appium/support';
+import { fs, util } from 'appium/support';
 import { path as settingsApkPath } from 'io.appium.settings';
 import Bootstrap from './bootstrap';
 import B from 'bluebird';

lib/bootstrap.js

@@ -2,9 +2,9 @@ import UiAutomator from './uiautomator';
 import net from 'net';
 import path from 'path';
 import _ from 'lodash';
-import { errorFromCode } from '@appium/base-driver';
+import { errorFromCode } from 'appium/driver';
 import B from 'bluebird';
-import { logger } from '@appium/support';
+import { logger } from 'appium/support';
 
 
 const log = logger.getLogger('AndroidBootstrap');

lib/commands/actions.js

@@ -1,5 +1,5 @@
 import androidHelpers from '../android-helpers';
-import { fs, util, tempDir} from '@appium/support';
+import { fs, util, tempDir} from 'appium/support';
 import path from 'path';
 import B from 'bluebird';
 import jimp from 'jimp';

lib/commands/alert.js

@@ -1,5 +1,5 @@
 /* eslint-disable require-await */
-import { errors } from '@appium/base-driver';
+import { errors } from 'appium/driver';
 
 let commands = {}, helpers = {}, extensions = {};
 

lib/commands/app-management.js

@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import { waitForCondition } from 'asyncbox';
-import { util } from '@appium/support';
+import { util } from 'appium/support';
 import { APP_STATE } from '../android-helpers';
-import { errors } from '@appium/base-driver';
+import { errors } from 'appium/driver';
 
 const APP_EXTENSIONS = ['.apk', '.apks'];
 

lib/commands/context.js

@@ -2,8 +2,8 @@ import _ from 'lodash';
 import Chromedriver from 'appium-chromedriver';
 import PortFinder from 'portfinder';
 import B from 'bluebird';
-import { util } from '@appium/support';
-import { errors } from '@appium/base-driver';
+import { util } from 'appium/support';
+import { errors } from 'appium/driver';
 import {
   default as webviewHelpers,
   NATIVE_WIN, WEBVIEW_BASE, WEBVIEW_WIN, CHROMIUM_WIN, KNOWN_CHROME_PACKAGE_NAMES

lib/commands/element.js

@@ -1,6 +1,6 @@
 import androidHelpers from '../android-helpers';
 import { retryInterval } from 'asyncbox';
-import { util } from '@appium/support';
+import { util } from 'appium/support';
 
 
 let commands = {}, helpers = {}, extensions = {};