chore: Remove on-commit hooks (#909)

appium · Jan 26, 2024 · fd96db6 · fd96db6
1 parent 46449a1
commit fd96db6
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 55 deletions.
diff --git a/.husky/commit-msg b/.husky/commit-msg
diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/commitlint.config.js b/commitlint.config.js
diff --git a/lib/commands/context/helpers.js b/lib/commands/context/helpers.js
@@ -96,15 +96,17 @@ async function getFreePort() {
  * @returns {Promise<object[]>}
  */
 async function cdpGetRequest(host, port, endpoint) {
-  return (await axios({
-    url: `http://${host}:${port}${endpoint}`,
-    timeout: CDP_REQ_TIMEOUT,
-    // We need to set this from Node.js v19 onwards.
-    // Otherwise, in situation with multiple webviews,
-    // the preceding webview pages will be incorrectly retrieved as the current ones.
-    // https://nodejs.org/en/blog/announcements/v19-release-announce#https11-keepalive-by-default
-    httpAgent: new http.Agent({keepAlive: false}),
-  })).data;
+  return (
+    await axios({
+      url: `http://${host}:${port}${endpoint}`,
+      timeout: CDP_REQ_TIMEOUT,
+      // We need to set this from Node.js v19 onwards.
+      // Otherwise, in situation with multiple webviews,
+      // the preceding webview pages will be incorrectly retrieved as the current ones.
+      // https://nodejs.org/en/blog/announcements/v19-release-announce#https11-keepalive-by-default
+      httpAgent: new http.Agent({keepAlive: false}),
+    })
+  ).data;
 }
 
 /**

diff --git a/lib/commands/device/common.js b/lib/commands/device/common.js
@@ -83,14 +83,13 @@ export async function getDeviceInfoFromCaps() {
           continue;
         }
 
+        const pvMajor = /** @type {semver.SemVer} */ (semverPV).major;
+        const pvMinor = /** @type {semver.SemVer} */ (semverPV).minor;
+        const dvMajor = /** @type {semver.SemVer} */ (semverDO).major;
+        const dvMinor = /** @type {semver.SemVer} */ (semverDO).minor;
         if (
-          ((!_.includes(this.opts.platformVersion, '.') &&
-            /** @type {semver.SemVer} */ (semverPV).major ===
-              /** @type {semver.SemVer} */ (semverDO).major) ||
-            (/** @type {semver.SemVer} */ (semverPV).major ===
-              /** @type {semver.SemVer} */ (semverDO).major &&
-              /** @type {semver.SemVer} */ (semverPV).minor ===
-                /** @type {semver.SemVer} */ (semverDO).minor)) &&
+          ((!_.includes(this.opts.platformVersion, '.') && pvMajor === dvMajor) ||
+            (pvMajor === dvMajor && pvMinor === dvMinor)) &&
           // Got a partial match - make sure we consider the most recent
           // device version available on the host system
           ((partialMatchCandidate && semver.gt(deviceOS, _.values(partialMatchCandidate)[0])) ||

diff --git a/lib/commands/lock/exports.js b/lib/commands/lock/exports.js
@@ -17,7 +17,6 @@ import {
 } from './helpers';
 import _ from 'lodash';
 
-
 /**
  * @this {AndroidDriver}
  * @param {import('../types').LockOpts} opts

diff --git a/lib/commands/resources.js b/lib/commands/resources.js
@@ -66,7 +66,7 @@ async function extractStringsFromResources(language, opts = null) {
         app = await this.adb.pullApk(caps.appPackage, tmpRoot);
       } catch (e) {
         throw new Error(
-          `Could not extract app strings, failed to pull an apk from '${caps.appPackage}'. Original error: ${e.message}`
+          `Could not extract app strings, failed to pull an apk from '${caps.appPackage}'. Original error: ${e.message}`,
         );
       }
     }

diff --git a/lib/index.ts b/lib/index.ts
@@ -2,12 +2,12 @@ import {install} from 'source-map-support';
 install();
 
 import {AndroidDriver} from './driver';
-import { getChromePkg } from './commands/context/helpers';
-import { parseArray, requireArgs } from './utils';
+import {getChromePkg} from './commands/context/helpers';
+import {parseArray, requireArgs} from './utils';
 export const utils = {
-    getChromePkg,
-    parseArray,
-    requireArgs,
+  getChromePkg,
+  parseArray,
+  requireArgs,
 } as const;
 export type * from './commands/types';
 export {ANDROID_DRIVER_CONSTRAINTS as commonCapConstraints} from './constraints';

diff --git a/package.json b/package.json
@@ -36,19 +36,12 @@
     "clean": "npm run build -- --clean",
     "dev": "npm run build -- --watch",
     "lint": "eslint .",
-    "lint:commit": "commitlint",
     "lint:fix": "npm run lint -- --fix",
-    "lint:staged": "lint-staged",
-    "prepare": "husky install; npm run rebuild",
+    "prepare": "npm run rebuild",
     "rebuild": "npm run clean; npm run build",
+    "format": "prettier -w ./lib",
     "test": "mocha --exit --timeout 1m \"./test/unit/**/*-specs.js\""
   },
-  "lint-staged": {
-    "*.(js|ts)": [
-      "eslint --fix",
-      "prettier --write"
-    ]
-  },
   "prettier": {
     "bracketSpacing": false,
     "printWidth": 100,
@@ -80,8 +73,6 @@
     "@appium/test-support": "^3.0.20",
     "@appium/tsconfig": "^0.x",
     "@appium/types": "^0.x",
-    "@commitlint/cli": "^18.0.0",
-    "@commitlint/config-conventional": "^18.0.0",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
     "@types/bluebird": "^3.5.38",
@@ -110,8 +101,6 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-promise": "^6.1.1",
-    "husky": "^8.0.3",
-    "lint-staged": "^15.0.1",
     "mocha": "^10.0.0",
     "prettier": "^3.0.1",
     "rimraf": "^5.0.0",