Update deps; Bump version (v1.13.0) (#117)

* Update deps; Bump version (v1.13.0)

* Use const

Author: AndreyBelym

.eslintrc

@@ -1,5 +1,8 @@
 {
-  "parser": "babel-eslint",
+  "parserOptions": {
+    "ecmaVersion": 2018,
+    "sourceType":  "module"
+  },
   "extends": "eslint:recommended",
   "rules": {
     "no-alert": "error",

Gulpfile.js

@@ -1,20 +1,19 @@
-var path        = require('path');
-var gulp        = require('gulp');
-var babel       = require('gulp-babel');
-var del         = require('del');
-var execa       = require('execa');
+const path        = require('path');
+const { spawn }   = require('child_process');
+const gulp        = require('gulp');
+const eslint      = require('gulp-eslint');
+const del         = require('del');
 
 
-var PACKAGE_PARENT_DIR  = path.join(__dirname, '../');
-var PACKAGE_SEARCH_PATH = (process.env.NODE_PATH ? process.env.NODE_PATH + path.delimiter : '') + PACKAGE_PARENT_DIR;
+const PACKAGE_PARENT_DIR  = path.join(__dirname, '../');
+const PACKAGE_SEARCH_PATH = (process.env.NODE_PATH ? process.env.NODE_PATH + path.delimiter : '') + PACKAGE_PARENT_DIR;
 
 
 function clean () {
     return del('lib');
 }
 
 function lint () {
-    var eslint = require('gulp-eslint');
 
     return gulp
         .src([
@@ -28,10 +27,7 @@ function lint () {
 }
 
 function build () {
-    return gulp
-        .src('src/**/*.js')
-        .pipe(babel())
-        .pipe(gulp.dest('lib'));
+    return spawn('npx tsc -p src/tsconfig.json', { stdio: 'inherit', shell: true });
 }
 
 function ensureAuthCredentials () {
@@ -44,9 +40,7 @@ function ensureAuthCredentials () {
 function testMocha () {
     ensureAuthCredentials();
 
-    var mochaCmd = path.join(__dirname, 'node_modules/.bin/mocha');
-
-    var mochaOpts = [
+    const mochaOpts = [
         '--ui', 'bdd',
         '--reporter', 'spec',
         '--timeout', typeof v8debug === 'undefined' ? 2000 : Infinity,
@@ -57,7 +51,7 @@ function testMocha () {
     // to find the plugin. So this function starts mocha with proper NODE_PATH.
     process.env.NODE_PATH = PACKAGE_SEARCH_PATH;
 
-    return execa(mochaCmd, mochaOpts, { stdio: 'inherit' });
+    return spawn(`npx mocha ${mochaOpts.join(' ')}`, { stdio: 'inherit', shell: true });
 }
 
 function testMochaRest () {
@@ -75,9 +69,7 @@ function testMochaAutomate () {
 function testTestcafe (browsers) {
     ensureAuthCredentials();
 
-    var testCafeCmd = path.join(__dirname, 'node_modules/.bin/testcafe');
-
-    var testCafeOpts = [
+    const testCafeOpts = [
         browsers,
         'test/testcafe/**/*test.js',
         '-s', '.screenshots'
@@ -87,7 +79,7 @@ function testTestcafe (browsers) {
     // to find the plugin. So this function starts testcafe with proper NODE_PATH.
     process.env.NODE_PATH = PACKAGE_SEARCH_PATH;
 
-    return execa(testCafeCmd, testCafeOpts, { stdio: 'inherit' });
+    return spawn(`npx testcafe ${testCafeOpts.join(' ')}`, { stdio: 'inherit', shell: true });
 }
 
 function testTestcafeRest () {
@@ -105,6 +97,10 @@ function testTestcafeAutomate () {
 exports.clean = clean;
 exports.lint  = lint;
 exports.build = gulp.parallel(gulp.series(clean, build), lint);
-exports.test  = gulp.series(exports.build, testMochaRest, testMochaAutomate, testTestcafeAutomate);
-exports.testTestcafeRest = gulp.series(exports.build, testTestcafeRest);
+
+exports.testMochaRest        = testMochaRest;
+exports.testMochaAutomate    = testMochaAutomate;
+exports.testTestcafeRest     = gulp.series(exports.build, testTestcafeRest);
 exports.testTestcafeAutomate = gulp.series(exports.build, testTestcafeAutomate);
+
+exports.test  = gulp.series(exports.build, testMochaRest, testMochaAutomate, testTestcafeRest, testTestcafeAutomate);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "testcafe-browser-provider-browserstack",
-  "version": "1.13.0-alpha.1",
+  "version": "1.13.0",
   "description": "browserstack TestCafe browser provider plugin.",
   "repository": "https://github.com/DevExpress/testcafe-browser-provider-browserstack",
   "engines": {
@@ -30,12 +30,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "babel-runtime": "^6.11.6",
     "browserstack-local": "^1.3.6",
     "dedent": "^0.7.0",
     "desired-capabilities": "^0.1.0",
     "firefox-profile": "^1.3.1",
-    "jimp": "^0.9.6",
+    "jimp": "^0.10.3",
     "lodash": "^4.17.15",
     "mime-db": "^1.43.0",
     "os-family": "^1.0.0",
@@ -45,18 +44,11 @@
     "tmp": "0.0.31"
   },
   "devDependencies": {
-    "babel-eslint": "^6.1.2",
-    "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-plugin-transform-runtime": "^6.12.0",
-    "babel-preset-es2015": "^6.13.2",
-    "babel-preset-es2015-loose": "^7.0.0",
-    "babel-preset-stage-3": "^6.11.0",
     "chai": "^3.5.0",
     "del": "^2.2.2",
-    "execa": "^0.9.0",
+    "eslint-plugin-no-only-tests": "^2.4.0",
     "gulp": "^4.0.0",
-    "gulp-babel": "^6.1.2",
-    "gulp-eslint": "^3.0.1",
+    "gulp-eslint": "^6.0.0",
     "mocha": "^7.1.1",
     "publish-please": "^5.4.3",
     "testcafe": "latest"

src/.babelrc

@@ -1,5 +1,4 @@
 import { inspect } from 'util';
-import Promise from 'pinkie';
 import jimp from 'jimp';
 import BaseBackend from './base';
 import requestApiBase from '../utils/request-api';
@@ -177,15 +176,12 @@ export default class AutomateBackend extends BaseBackend {
     }
 
     async takeScreenshot (id, screenshotPath) {
-        return new Promise(async (resolve, reject) => {
-            var base64Data = await requestApi(BROWSERSTACK_API_PATHS.screenshot(this.sessions[id].sessionId));
-            var buffer     = Buffer.from(base64Data.value, 'base64');
-
-            jimp
-                .read(buffer)
-                .then(image => image.write(screenshotPath, resolve))
-                .catch(reject);
-        });
+        var base64Data = await requestApi(BROWSERSTACK_API_PATHS.screenshot(this.sessions[id].sessionId));
+        var buffer     = Buffer.from(base64Data.value, 'base64');
+
+        const image = await jimp.read(buffer);
+
+        await image.write(screenshotPath);
     }
 
     async resizeWindow (id, width, height, currentWidth, currentHeight) {

src/backends/automate.js

@@ -2,7 +2,7 @@ import { parse as parseUrl } from 'url';
 import Promise from 'pinkie';
 import { promisify } from 'util';
 import parseCapabilities from 'desired-capabilities';
-import { filter } from 'lodash';
+import { pickBy } from 'lodash';
 import BrowserstackConnector from './connector';
 import JSTestingBackend from './backends/js-testing';
 import AutomateBackend from './backends/automate';
@@ -25,7 +25,7 @@ function getMimeTypes () {
     }).join(',');
 }
 
-export default {
+module.exports = {
     // Multiple browsers support
     isMultiBrowser: true,
 
@@ -146,7 +146,7 @@ export default {
     },
 
     _getAdditionalCapabilities () {
-        const capabilitiesFromEnvironment = filter(this._getCapabilitiesFromEnvironment(), value => value !== void 0);
+        const capabilitiesFromEnvironment = pickBy(this._getCapabilitiesFromEnvironment(), value => value !== void 0);
 
         return { ...this._getCapabilitiesFromConfig(), ...capabilitiesFromEnvironment };
     },

src/index.js

@@ -0,0 +1,13 @@
+{
+    "compilerOptions": {
+      "outDir": "../lib",
+      "target": "es2017",
+      "module": "commonjs",
+      "strict": true,
+      "esModuleInterop": true,
+      "allowJs": true,
+      "checkJs": false,
+      "inlineSourceMap": true,
+      "inlineSources": true
+    }
+}

src/tsconfig.json

@@ -1,6 +1,10 @@
 {
+    "plugins": [
+      "no-only-tests"
+    ],
     "rules": {
-      "no-unused-expressions": 0
+      "no-unused-expressions": "off",
+      "no-only-tests/no-only-tests": "error"
     },
     "env": {
       "mocha":   true,

test/.eslintrc

@@ -43,7 +43,7 @@ describe('Browserstack capabilities', function () {
         });
     });
 
-    it.only('Should read aditional capabilities from a config file', () => {
+    it('Should read aditional capabilities from a config file', () => {
         process.env.BROWSERSTACK_CAPABILITIES_CONFIG_PATH = require.resolve('./data/capabilities-config.json');
 
         const capabilities = browserStackProvider._getAdditionalCapabilities();