chore: cleanup base-driver
remove dupe files
move dev deps into root
move `.azure-pipelines.yml` to root for reasons
tweak gulp `lint` task to avoid linting `.min.js` files (vendored jQuery)
update `.eslintignore` to do the same
RENAME
packages/base-driver/.azure-pipelines.yml
.azure-pipelines.yml
MODIFY
.eslintignore
.eslintignore
@@ -2,3 +2,5 @@ coverage
node_modules
sample-code/javascript-wd
packages/*/build/**/*
+**/*.min.js
+

MODIFY
package.json
package.json
"chai-as-promised": "7.x",
"eslint-find-rules": "^3.6.1",
"fancy-log": "^1.3.2",
+ "finalhandler": "^1.1.1",
"gulp": "^4.0.0",
"handlebars": "^4.2.0",
"lerna": "^4.0.0",
"mjpeg-server": "^0.3.0",
"mocha": "^8.0.1",
"pre-commit": "1.x",
+ "querystring": "^0.2.0",
+ "serve-static": "^1.13.1",
"sinon": "^9.0.0",
"validate.js": "^0.13.0",
"wd": "^1.14.0",

DELETE
packages/base-driver/.eslintignore
-static
-coverage

DELETE
packages/base-driver/.eslintrc
-{
- "extends": "appium"
-}

DELETE
packages/base-driver/.github/ISSUE_TEMPLATE.md
-**Warning:**
-
-These issues are not tracked. Please create new issues in the main Appium
-repository: https://github.com/appium/appium/issues/new

DELETE
packages/base-driver/.github/dependabot.yml
-version: 2
-updates:
-- package-ecosystem: npm
- directory: "/"
- schedule:
- interval: daily
- time: "11:00"
- open-pull-requests-limit: 10

DELETE
packages/base-driver/.gitignore
-node_modules
-build
-*.log
-.DS_Store
-coverage
-.idea/
-package-lock.json*
-.vscode

DELETE
packages/base-driver/.npmrc
-package-lock=false
\ No newline at end of file

DELETE
packages/base-driver/LICENSE
-Copyright 2012-2016 JS Foundation and other contributors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.

MODIFY
packages/base-driver/README.md
packages/base-driver/README.md
appium-base-driver
===================
-[![NPM version](http://img.shields.io/npm/v/appium-base-driver.svg)](https://npmjs.org/package/appium-base-driver)
-[![Downloads](http://img.shields.io/npm/dm/appium-base-driver.svg)](https://npmjs.org/package/appium-base-driver)
-[![Dependency Status](https://david-dm.org/appium/appium-base-driver.svg)](https://david-dm.org/appium/appium-base-driver)
-[![devDependency Status](https://david-dm.org/appium/appium-base-driver/dev-status.svg)](https://david-dm.org/appium/appium-base-driver#info=devDependencies)
+[![NPM version](http://img.shields.io/npm/v/appium-base-driver.svg)](https://npmjs.org/package/@appium/base-driver)
+[![Downloads](http://img.shields.io/npm/dm/@appium/base-driver.svg)](https://npmjs.org/package/@appium/base-driver)
+[![Dependency Status](https://david-dm.org/appium/@appium/base-driver.svg)](https://david-dm.org/appium/@appium/base-driver)
+[![devDependency Status](https://david-dm.org/appium/@appium/base-driver/dev-status.svg)](https://david-dm.org/appium/@appium/base-driver#info=devDependencies)
-[![Build Status](https://travis-ci.org/appium/appium-base-driver.svg?branch=master)](https://travis-ci.org/appium/appium-base-driver)
+[![Build Status](https://travis-ci.org/appium/@appium/base-driver.svg?branch=master)](https://travis-ci.org/appium/@appium/base-driver)
This is the parent class that all [appium](appium.io) drivers inherit from, along with a collection of globally-used Appium driver utilities. Each utility is documented in its own README in the code:
@@ -14,17 +14,3 @@ This is the parent class that all [appium](appium.io) drivers inherit from, alon
* [The Mobile JSON Wire Protocol Encapsulation](lib/mjsonwp)
* [The JSONWP Proxy Library](lib/jsonwp-proxy)
* [The JSONWP Status Library](lib/jsonwp-status)
-
-*Note*: Issue tracking for this repo has been disabled. Please use the [main Appium issue tracker](https://github.com/appium/appium/issues) instead.
-
-## Watch
-
-```
-gulp
-```
-
-## Test
-
-```
-gulp once
-```

MODIFY
packages/base-driver/gulpfile.js
packages/base-driver/gulpfile.js
'use strict';
const gulp = require('gulp');
-const boilerplate = require('appium-gulp-plugins').boilerplate.use(gulp);
+const boilerplate = require('@appium/gulp-plugins').boilerplate.use(gulp);
boilerplate({
build: 'appium-base-driver',

MODIFY
packages/base-driver/package.json
packages/base-driver/package.json
{
- "name": "appium-base-driver",
+ "name": "@appium/base-driver",
"description": "Base driver class for Appium drivers",
"keywords": [
"appium"
"license": "Apache-2.0",
"repository": {
"type": "git",
- "url": "https://github.com/appium/appium-base-driver.git"
+ "url": "https://github.com/appium/appium.git"
},
"bugs": {
- "url": "https://github.com/appium/appium-base-driver/issues"
+ "url": "https://github.com/appium/appium/issues"
+ },
+ "engines": {
+ "node": ">=12"
},
- "engines": [
- "node"
- ],
"main": "./build/index.js",
- "bin": {},
"directories": {
"lib": "lib"
},
],
"dependencies": {
"@babel/runtime": "^7.0.0",
- "appium-support": "^2.48.0",
+ "@appium/support": "^2.48.0",
"async-lock": "^1.0.0",
"asyncbox": "^2.3.1",
"axios": "^0.21.0",
"webdriverio": "^6.0.2",
"ws": "^7.0.0"
},
- "scripts": {
- "clean": "rm -rf node_modules && rm -f package-lock.json && npm install",
- "prepare": "gulp prepublish",
- "test": "gulp once",
- "watch": "gulp watch",
- "lint": "gulp lint",
- "lint:fix": "gulp eslint --fix",
- "coverage": "gulp coveralls",
- "mocha": "mocha",
- "e2e-test": "gulp e2e-test",
- "build": "gulp transpile",
- "precommit-msg": "echo 'Pre-commit checks...' && exit 0",
- "precommit-test": "REPORTER=dot gulp once"
- },
- "pre-commit": [
- "precommit-msg",
- "precommit-test"
- ],
"devDependencies": {
- "appium-gulp-plugins": "^5.4.0",
- "chai": "^4.1.2",
- "chai-as-promised": "^7.1.1",
- "content-disposition": "^0.5.0",
- "eslint-config-appium": "^4.7.0",
- "finalhandler": "^1.1.1",
- "gulp": "^4.0.0",
- "mocha": "^8.0.1",
- "pre-commit": "^1.1.3",
- "querystring": "^0.2.0",
- "serve-static": "^1.13.1",
- "sinon": "^9.0.0"
+ "@appium/gulp-plugins": "^5.4.0",
+ "@appium/eslint-config-appium": "^4.7.0"
}
}

MODIFY
packages/gulp-plugins/lib/tasks/lint.js
packages/gulp-plugins/lib/tasks/lint.js
@@ -23,7 +23,7 @@ const configure = function configure (gulp, opts) {
};
}
return gulp
- .src(['**/*.js', '!node_modules/**', '!**/node_modules/**', '!build/**'])
+ .src(['**/*.js', '!node_modules/**', '!**/node_modules/**', '!build/**', '!**/*.min.js'])
.pipe(gulpIf(verbose, debug()))
.pipe(eslint(opts))
.pipe(eslint.format())

chore: cleanup base-driver

- remove dupe files
- move dev deps into root
- move `.azure-pipelines.yml` to root for reasons
- tweak gulp `lint` task to avoid linting `.min.js` files (vendored jQuery)
- update `.eslintignore` to do the same