appium 2.0.0-beta.43 → 2.0.0-beta.44

package/lib/utils.js

@@ -2,6 +2,8 @@ import _ from 'lodash';
 import logger from './logger';
 import {processCapabilities, PROTOCOLS} from '@appium/base-driver';
 import {inspect as dump} from 'util';
+import {node} from '@appium/support';
+import path from 'path';
 
 const W3C_APPIUM_PREFIX = 'appium';
 
@@ -209,6 +211,63 @@ function getPackageVersion(pkgName) {
   return pkgInfo.version;
 }
 
+/**
+ * Adjusts NODE_PATH environment variable,
+ * so drivers and plugins could load their peer dependencies.
+ * Read https://nodejs.org/api/modules.html#loading-from-the-global-folders
+ * for more details.
+ * @returns {void}
+ */
+function adjustNodePath() {
+  const selfRoot = node.getModuleRootSync('appium', __filename);
+  if (!selfRoot || path.dirname(selfRoot).length >= selfRoot.length) {
+    return;
+  }
+  const nodeModulesRoot = path.dirname(selfRoot);
+
+  const refreshRequirePaths = () => {
+    try {
+      // ! This hack allows us to avoid modification of import
+      // ! statements in client modules. It uses a private API though,
+      // ! so it could break (maybe, eventually).
+      // See https://gist.github.com/branneman/8048520#7-the-hack
+      // @ts-ignore
+      require('module').Module._initPaths();
+      return true;
+    } catch (e) {
+      logger.info(`Module init paths cannot be refreshed. Original error: ${e.message}`);
+      return false;
+    }
+  };
+
+  if (!process.env.NODE_PATH) {
+    process.env.NODE_PATH = nodeModulesRoot;
+    if (refreshRequirePaths()) {
+      logger.info(`Setting NODE_PATH to '${nodeModulesRoot}'`);
+      process.env.APPIUM_OMIT_PEER_DEPS = '1';
+    } else {
+      delete process.env.NODE_PATH;
+    }
+    return;
+  }
+
+  const nodePathParts = process.env.NODE_PATH.split(path.delimiter);
+  if (nodePathParts.includes(nodeModulesRoot)) {
+    logger.info(`NODE_PATH already includes '${nodeModulesRoot}'`);
+    process.env.APPIUM_OMIT_PEER_DEPS = '1';
+    return;
+  }
+
+  nodePathParts.push(nodeModulesRoot);
+  process.env.NODE_PATH = nodePathParts.join(path.delimiter);
+  if (refreshRequirePaths()) {
+    logger.info(`Adding '${nodeModulesRoot}' to NODE_PATH`);
+    process.env.APPIUM_OMIT_PEER_DEPS = '1';
+  } else {
+    process.env.NODE_PATH = _.without(nodePathParts, nodeModulesRoot).join(path.delimiter);
+  }
+}
+
 /**
  * Pulls the initial values of Appium settings from the given capabilities argument.
  * Each setting item must satisfy the following format:
@@ -250,6 +309,7 @@ export {
   getPackageVersion,
   pullSettings,
   removeAppiumPrefixes,
+  adjustNodePath,
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium",
-  "version": "2.0.0-beta.43",
+  "version": "2.0.0-beta.44",
   "description": "Automation for Apps.",
   "keywords": [
     "automation",
@@ -37,7 +37,6 @@
     "driver.*",
     "support.*",
     "plugin.*",
-    "test.*",
     "scripts/autoinstall-extensions.js",
     "types"
   ],
@@ -61,19 +60,18 @@
     "test:unit": "mocha \"./test/unit/**/*.spec.js\""
   },
   "dependencies": {
-    "@appium/base-driver": "^8.7.0",
-    "@appium/base-plugin": "^1.10.2",
-    "@appium/docutils": "^0.0.10",
+    "@appium/base-driver": "^8.7.1",
+    "@appium/base-plugin": "^1.10.3",
+    "@appium/docutils": "^0.0.11",
     "@appium/schema": "^0.0.9",
-    "@appium/support": "^2.59.5",
-    "@appium/test-support": "^1.5.0",
-    "@appium/types": "^0.4.0",
-    "@babel/runtime": "7.18.9",
+    "@appium/support": "^2.60.0",
+    "@appium/types": "^0.4.1",
+    "@babel/runtime": "7.19.0",
     "@sidvind/better-ajv-errors": "2.0.0",
     "@types/argparse": "2.0.10",
     "@types/bluebird": "3.5.36",
     "@types/fancy-log": "2.0.0",
-    "@types/semver": "7.3.10",
+    "@types/semver": "7.3.12",
     "@types/teen_process": "1.16.1",
     "@types/wrap-ansi": "3.0.0",
     "ajv": "8.11.0",
@@ -95,7 +93,7 @@
     "semver": "7.3.7",
     "source-map-support": "0.5.21",
     "teen_process": "1.16.0",
-    "type-fest": "2.18.0",
+    "type-fest": "2.19.0",
     "winston": "3.8.1",
     "wrap-ansi": "7.0.0",
     "yaml": "2.1.1"
@@ -108,5 +106,5 @@
     "access": "public",
     "tag": "next"
   },
-  "gitHead": "c58f32441daba3aae9768a57d0a412fe92f4b587"
+  "gitHead": "c26af8f85230ac65cbc19f08f763942f74b0eb0c"
 }

package/test.d.ts

@@ -1,7 +0,0 @@
-export * from '@appium/test-support';
-/**
- * @typedef {import('@appium/test-support').SessionHelpers} SessionHelpers
- */
-/**
- * @typedef {import('@appium/test-support').E2ESetupOpts} E2ESetupOpts
- */

package/test.js

@@ -1,13 +0,0 @@
-'use strict';
-
-// @ts-check
-
-/**
- * This module is here to re-export `@appium/test-support` for Appium extensions.
- *
- * @see https://npm.im/@appium/test-support
- * @example
- * const { getPort } = require('appium/test');
- */
-
-module.exports = require('@appium/test-support');