@testim/testim-cli 3.263.0 → 3.265.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testim/testim-cli",
-  "version": "3.263.0",
+  "version": "3.265.0",
   "description": "Command line interface for running Testing on your CI",
   "author": "Oren Rubin",
   "contributors": [{
@@ -43,8 +43,7 @@
     "multer": "1.4.4"
   },
   "dependencies": {
-    "@applitools/eyes-sdk-core": "13.6.23",
-    "@applitools/visual-grid-client": "15.12.34",
+    "@applitools/eyes-sdk-core": "13.11.21",
     "@testim/coralogix-logger": "1.1.27-beta.1",
     "@testim/webdriverio": "0.0.5",
     "abort-controller": "3.0.0",

package/player/WebdriverioWebDriverApi.js

@@ -17,12 +17,9 @@ Queue.configure(Promise);
 const perf = require('../commons/performance-logger');
 
 const getViewportSizeHelper = function () {
-    // this runs on the AUT, should be compatible with old browsers
-    // eslint-disable-next-line no-var
-    var pixelRatio = (/(MSIE)|(Trident)/.test(navigator.userAgent)) ? (window.screen.systemXDPI / window.screen.deviceXDPI) : 1;
     return {
-        screenWidth: Math.floor((window.innerWidth || 0) / pixelRatio),
-        screenHeight: Math.floor((window.innerHeight || 0) / pixelRatio),
+        screenWidth: Math.floor(window.innerWidth || 0),
+        screenHeight: Math.floor(window.innerHeight || 0),
     };
 };
 
@@ -49,7 +46,7 @@ class WebdriverioWebDriverApi {
 
     initQueueRequests() {
         let maxConcurrent = Infinity;
-        if (this.isIE() || this.isAndroid()) {
+        if (this.isAndroid()) {
             maxConcurrent = 1;
         }
         if (typeof config.REQUESTS_QUEUE_SIZE !== 'undefined') {
@@ -90,7 +87,7 @@ class WebdriverioWebDriverApi {
     }
 
     getSessionId() {
-        return this.client && this.client.requestHandler && this.client.requestHandler.sessionID;
+        return this.client?.requestHandler?.sessionID;
     }
 
     isChrome() {
@@ -109,18 +106,10 @@ class WebdriverioWebDriverApi {
         return this.client.desiredCapabilities.browserName === 'safari' || this.client.desiredCapabilities.browserName === 'safari technology preview';
     }
 
-    isIE() {
-        return this.client.desiredCapabilities.browserName === 'internet explorer';
-    }
-
     isAndroid() {
         return this.client.desiredCapabilities.platformName === 'Android';
     }
 
-    isEdge() {
-        return this.client.desiredCapabilities.browserName === 'MicrosoftEdge' && this.client.desiredCapabilities._isOldEdge;
-    }
-
     isEdgeChromium() {
         return this.client.desiredCapabilities.browserName === 'MicrosoftEdge' && !this.client.desiredCapabilities._isOldEdge;
     }
@@ -169,7 +158,7 @@ class WebdriverioWebDriverApi {
                         return newEndpoint();
                     }
 
-                    return Promise.reject(err);
+                    throw err;
                 });
         });
     }
@@ -220,7 +209,7 @@ class WebdriverioWebDriverApi {
                         return newEndpoint();
                     }
 
-                    return Promise.reject(err);
+                    throw err;
                 });
         });
     }
@@ -275,7 +264,7 @@ class WebdriverioWebDriverApi {
                         return newEndpoint();
                     }
 
-                    return Promise.reject(err);
+                    throw err;
                 });
         });
     }
@@ -299,7 +288,7 @@ class WebdriverioWebDriverApi {
                         return newEndpoint();
                     }
 
-                    return Promise.reject(err);
+                    throw err;
                 });
         });
     }
@@ -337,7 +326,7 @@ class WebdriverioWebDriverApi {
                         this.w3cRequests.timeouts = true;
                         return newEndpoint();
                     }
-                    return Promise.reject(err);
+                    throw err;
                 });
         });
     }
@@ -373,7 +362,7 @@ class WebdriverioWebDriverApi {
     }
 
     keys(value) {
-        const checkUnicode = value => (UNICODE_CHARACTERS.hasOwnProperty(value) ? [UNICODE_CHARACTERS[value]] : value.split(''));
+        const checkUnicode = _value => (UNICODE_CHARACTERS.hasOwnProperty(_value) ? [UNICODE_CHARACTERS[_value]] : _value.split(''));
 
         let key = [];
 
@@ -392,8 +381,8 @@ class WebdriverioWebDriverApi {
 
         const oldEndpoint = () => this.client.requestHandler.create('/session/:sessionId/keys', { value: key });
         const newEndpoint = () => {
-            const keyDownActions = key.map((value) => ({ type: 'keyDown', value }));
-            const keyUpActions = key.map((value) => ({ type: 'keyUp', value }));
+            const keyDownActions = key.map((_value) => ({ type: 'keyDown', value: _value }));
+            const keyUpActions = key.map((_value) => ({ type: 'keyUp', value: _value }));
 
             return this.actions([{
                 type: 'key',
@@ -415,7 +404,7 @@ class WebdriverioWebDriverApi {
                 return newEndpoint();
             }
 
-            return Promise.reject(err);
+            throw err;
         }));
     }
 
@@ -537,7 +526,7 @@ class WebdriverioWebDriverApi {
                 // we make sure to use its absolute value.
                 data = {
                     width: Math.abs(size.width),
-                    height: Math.abs(this.isEdge() ? size.height - 1 : size.height),
+                    height: Math.abs(size.height),
                 };
             }
 
@@ -568,7 +557,7 @@ class WebdriverioWebDriverApi {
                         return newEndpoint();
                     }
 
-                    return Promise.reject(err);
+                    throw err;
                 });
         });
     }

package/player/stepActions/baseJsStepAction.js

@@ -1,5 +1,3 @@
-/* eslint-disable prefer-template */
-
 'use strict';
 
 const Promise = require('bluebird');
@@ -17,15 +15,6 @@ const logger = require('../../commons/logger').getLogger('base-js-step-action');
 const _ = require('lodash');
 const utils = require('../../utils');
 
-function constructWithArguments(constructor, args) {
-    function F() {
-        return constructor.apply(this, args);
-    }
-
-    F.prototype = constructor.prototype;
-    return new F();
-}
-
 class BaseJsStepAction extends StepAction {
     isExceedingMaxResultSize(data, context) {
         try {
@@ -45,16 +34,16 @@ class BaseJsStepAction extends StepAction {
     }
 
     executeGetStatus(transactionId) {
-        // TODO: Cleanup after dropping IE11/Edge support
-        /* eslint-disable prefer-arrow-callback,  no-undef,  unicorn/prefer-includes, no-shadow */
-        return this.driver.executeJS(function (transactionId) {
-            const sessionItem = 'data-testim-' + transactionId;
+        return this.driver.executeJS(_transactionId => {
+            /* eslint-disable no-undef */
+            const sessionItem = `data-testim-${_transactionId}`;
             try {
                 return window.sessionStorage.getItem(sessionItem);
             } catch (err) {
-                if (err.message.indexOf('sessionStorage') > -1 || // Chrome + Firefox
-                    err.message.indexOf('The operation is insecure') > -1 || // Safari
-                    err.message.indexOf('SecurityError') > -1) { // edge
+                if (
+                    err.message.includes('sessionStorage') || // Chrome + Firefox
+                    err.message.includes('The operation is insecure') // Safari
+                ) {
                     const storage = document.head.querySelector('#testim-storage-backup');
                     if (!storage) {
                         return '{}';
@@ -63,8 +52,8 @@ class BaseJsStepAction extends StepAction {
                 }
                 throw err;
             }
+            /* eslint-enable no-undef */
         }, transactionId);
-        /* eslint-enable prefer-arrow-callback,  no-undef,  unicorn/prefer-includes, no-shadow */
     }
 
     constructJSFunParams(eventData) {
@@ -146,7 +135,7 @@ class BaseJsStepAction extends StepAction {
         let funcToRunString = 'undefined';
         if (useExperimentalPreCompilation) {
             const paramNames = rawParams.function.params.slice(0, -1);
-            funcToRunString = (experimentalAsyncCustomCode && !this.driver.isIE()) ? `async function(${paramNames.join(',')}) {
+            funcToRunString = experimentalAsyncCustomCode ? `async function(${paramNames.join(',')}) {
                 ${eventMessage.code}
             };` : `function(${paramNames.join(',')}) {
                 ${eventMessage.code}
@@ -158,16 +147,15 @@ class BaseJsStepAction extends StepAction {
         const runCode = `
             ${hasLocateParams ? `var getLocatedElement = ${codeSnippets.getLocatedElementCode};` : ';'}
             var runCode = ${runCodeScript.toString()};
-            var eventData = ${this.driver.isEdge() ? 'JSON.parse(arguments[0])' : 'arguments[0]'};
+            var eventData = arguments[0];
             var funcToRun = ${funcToRunString};
             return runCode.call(null, eventData, funcToRun);
         `;
-        const params = this.driver.isEdge() ? JSON.stringify(rawParams) : rawParams;
         if (!useExperimentalPreCompilation) {
-            return this.driver.executeJS(runCode, params);
+            return this.driver.executeJS(runCode, rawParams);
         }
 
-        return this.driver.executeJS(runCode, params).catch(err => this.handleExecutionError(err));
+        return this.driver.executeJS(runCode, rawParams).catch(err => this.handleExecutionError(err));
     }
 
     codeExecDone(resp) {
@@ -276,20 +264,9 @@ class BaseJsStepAction extends StepAction {
             err.seleniumStack.orgStatusMessage;
 
         if (canExtractError) {
-            if (!this.driver.isIE()) {
-                const endOfMessage = err.seleniumStack.orgStatusMessage.indexOf('\nBuild info');
-                const reason = err.seleniumStack.orgStatusMessage.slice(0, endOfMessage === -1 ? undefined : endOfMessage);
-                throw new Error(reason);
-            }
-
-            // IE has unhelpful messages
-            try {
-                constructWithArguments(Function, rawParams.function.params.concat([eventMessage.code]));
-            } catch (err) {
-                if (err instanceof SyntaxError) {
-                    throw new Error(err.message);
-                }
-            }
+            const endOfMessage = err.seleniumStack.orgStatusMessage.indexOf('\nBuild info');
+            const reason = err.seleniumStack.orgStatusMessage.slice(0, endOfMessage === -1 ? undefined : endOfMessage);
+            throw new Error(reason);
         }
 
         throw err;

package/player/stepActions/locateStepAction.js

@@ -52,8 +52,7 @@ function createUtils(driver) {
                     window.close();
                 }, 1000 * 60);
             }
-            window.document.TESTIM_URL = url;
-            return window.document;
+            return Object.assign(window.document, { TESTIM_URL: url });
         },
 
         shouldUseNativeVisibilityCheck(locateStep, driver, visibilityUtils, positionUtils) {
@@ -72,27 +71,11 @@ function createUtils(driver) {
             if (driver.isSafari()) {
                 return featureFlags.flags.useSafariWebdriverVisibilityChecks.isEnabled();
             }
-            if (driver.isIE()) {
-                return featureFlags.flags.useIEWebdriverVisibilityChecks.isEnabled();
-            }
             return true;
         },
 
         /** @type {typeof import('clickim/src/background/stepActions/locateStepAction').LocateStepAction['isVisible']} */
         async isVisible(target, targetElement, rect, locateStep, frameHandler, allOffsets, dom) {
-            const skipVisibilityCheck = featureFlags.flags.disableEdgeVisibilityChecks.isEnabled() && driver.isEdge();
-
-            if (skipVisibilityCheck) {
-                logger.info('bypassed visibility check because of feature flag');
-                target.visibilityCheckSkipped = skipVisibilityCheck;
-                try {
-                    await driver.isVisible(target.seleniumElement);
-                } catch {
-                    /* ignored */
-                }
-                return true;
-            }
-
             const useNativeVisibilityCheck = this.shouldUseNativeVisibilityCheck(locateStep, driver, visibilityUtils, positionUtils);
             if (useNativeVisibilityCheck) {
                 return driver.isVisible(target.seleniumElement);

package/player/stepActions/mouseStepAction.js

@@ -48,17 +48,14 @@ class MouseStepAction extends StepAction {
             var getLocatedElement = ${codeSnippets.getLocatedElementCode};
             var dispatchFocus = ${dispatchFocus.toString()};
             var doClick = ${doClickScript.toString()};
-            var eventData = ${this.driver.isEdge() ? 'JSON.parse(arguments[0])' : 'arguments[0]'};
+            var eventData = arguments[0];
             var done = arguments[1];
             return doClick.call(null, eventData, done);
         `;
 
-        // hack for Edge (17/18) which does not accept properties with negative (throws Unknown Error)
-        // values between 0 and -1 -_-.
-        const eventParam = this.driver.isEdge() ? JSON.stringify(eventMessage) : eventMessage;
 
         try {
-            const result = await this.driver.executeCodeAsync(doClickCode, timeout, eventParam);
+            const result = await this.driver.executeCodeAsync(doClickCode, timeout, eventMessage);
             if (result.value?.success) {
                 return { success: true };
             }
@@ -192,7 +189,7 @@ class MouseStepAction extends StepAction {
         };
         // will skip left click and double click on Edge.
         const skipFileInputClick =
-            (this.driver.isEdge() || featureFlagService.flags.skipFileInputClicks.isEnabled()) &&
+            featureFlagService.flags.skipFileInputClicks.isEnabled() &&
             target.tagName === 'INPUT' &&
             (target.elementSymbol.includes('type="file"') ||
                 target.elementSymbol.includes('type=\'file\'') ||
@@ -219,8 +216,7 @@ class MouseStepAction extends StepAction {
             if (this.step.toElement) {
                 const destTarget = this.context.data.toElement;
                 if (this.step.isHTML5Drag) {
-                    const isIE = this.driver.isIE();
-                    if (!isIE && featureFlagService.flags.usePortedHtml5DragDrop.isEnabled()) {
+                    if (featureFlagService.flags.usePortedHtml5DragDrop.isEnabled()) {
                         const events = this.generateHTML5DragEventSequence();
                         const timeout = this.context.data.timeToPlayStep + 3000;
                         const contextTarget = this.context.data[this.step.targetId || 'targetId'];
@@ -243,32 +239,25 @@ class MouseStepAction extends StepAction {
                             locatedElement: contextTarget.locatedElement,
                             isRoot: contextTarget.isRoot,
                         };
-                        // hack for Edge (17/18) which does not accept properties with negative (throws Unknown Error)
-                        // values between 0 and -1 -_-.
-                        const eventParam = this.driver.isEdge() ? JSON.stringify(eventMessage) : eventMessage;
                         const html5DNDCode = `
                         var getLocatedElement = ${codeSnippets.getLocatedElementCode};
                         var dnd = ${html5dndActionV2.toString()};
-                        var eventData = ${this.driver.isEdge() ? 'JSON.parse(arguments[0])' : 'arguments[0]'};
+                        var eventData = arguments[0];
                         var done = arguments[1];
                         return dnd.call(null, eventData, done);
                     `;
-                        return this.driver.executeCodeAsync(html5DNDCode, timeout, eventParam);
+                        return this.driver.executeCodeAsync(html5DNDCode, timeout, eventMessage);
                     }
 
                     const html5DNDCode = `
                         var getLocatedElement = ${codeSnippets.getLocatedElementCode};
                         var dnd = ${html5dndAction.toString()};
-                        var eventData = ${this.driver.isEdge() ? 'JSON.parse(arguments[0])' : 'arguments[0]'};
+                        var eventData = arguments[0];
                         return dnd.call(null, eventData);
                     `;
 
                     const eventMessage = { fromLocatedElement: locatedElement, toLocatedElement: destTarget.locatedElement };
-
-                    // hack for Edge (17/18) which does not accept properties with negative (throws Unknown Error)
-                    // values between 0 and -1 -_-.
-                    const eventParam = this.driver.isEdge() ? JSON.stringify(eventMessage) : eventMessage;
-                    return this.driver.executeJS(html5DNDCode, eventParam);
+                    return this.driver.executeJS(html5DNDCode, eventMessage);
                 }
 
                 const rectsAndOffsets = this.getDnDRectsAndOffsets(target, destTarget, this.step.element.clickOffset, this.step.toElement.clickOffset);
@@ -279,7 +268,7 @@ class MouseStepAction extends StepAction {
             // This is the old way, which uses selenium action (AKA "native" drag).
             // return this.driver.drag(seleniumElement, rectWithoutFrameOffset, xOffset, yOffset, this.step.events);
         }
-        const useRightClickJS = (this.driver.isSafari() || this.driver.isIE()) && this.step.button === 2;
+        const useRightClickJS = this.driver.isSafari() && this.step.button === 2;
         const forceNativeEvent = this.driver.isSafari() && target.tagName === 'SELECT';
 
         if (this.driver.isSafari() && forceNativeEvent) {

package/player/stepActions/pixelValidationStepAction.js

@@ -3,11 +3,13 @@
 const _ = require('lodash');
 const StepAction = require('./stepAction');
 const { eyeSdkService } = require('../utils/eyeSdkService');
-const logger = require('../../commons/logger').getLogger('pixel-validation-step-action');
+const { getLogger } = require('../../commons/logger');
+
+const logger = getLogger('pixel-validation-step-action');
 
 class PixelValidationStepAction extends StepAction {
     async performAction() {
-        const { shouldUseVisualGrid, applitoolsSdkConfig: config, testResultId } = this.context;
+        const { shouldUseVisualGrid, applitoolsSdkConfig: config, applitoolsSdkLogger, testResultId } = this.context;
         this.runContext = this.context.getRunContext(undefined);
         const finalParams = this.runContext.incomingParams?.final || {};
         const batchId = config.batch?.id || testResultId;
@@ -15,10 +17,10 @@ class PixelValidationStepAction extends StepAction {
         const targetElementData = this.getTarget() || {};
         let result;
         try {
-            const openedEye = await eyeManager.openEyes({ driver: this.driver.client, config });
+            const openedEye = await eyeManager.openEyes({ driver: this.driver.client, config, logger: applitoolsSdkLogger });
             const region = (this.step.action === 'element' && targetElementData.seleniumElement) || undefined;
             const settings = { region, fully: this.step.action === 'stitched' };
-            if (finalParams.applitoolsStepSettings && _.isPlainObject(finalParams.applitoolsStepSettings)) {
+            if (_.isPlainObject(finalParams.applitoolsStepSettings)) {
                 Object.assign(settings, finalParams.applitoolsStepSettings);
                 logger.info('Applitools SDK step executed with applitoolsStepSettings parameter', { applitoolsStepSettings: finalParams.applitoolsStepSettings });
             }

package/player/stepActions/scripts/runCode.js

@@ -32,9 +32,9 @@ const runCode = function (eventData, preCompiledCode) {
             const isQuotaExceededError = err.message.toLowerCase().indexOf('quota') > -1;
             const isNativeFunctionError = err.message === nativeFuncErrMsg;
 
-            if (err.message.indexOf('sessionStorage') > -1 || // Chrome + Firefox
+            if (
+                err.message.indexOf('sessionStorage') > -1 || // Chrome + Firefox
                 err.message.indexOf('The operation is insecure') > -1 || // Safari
-                err.message.indexOf('SecurityError') > -1 || // Edge
                 isQuotaExceededError ||
                 isNativeFunctionError
             ) {

package/player/stepActions/scripts/wheel.js

@@ -1,4 +1,5 @@
-"use strict";
+'use strict';
+
 /*global WheelEvent */
 var wheel = function (eventData, done) {
     var MAX_WHEEL_EVENT_TIMEOUT = 200;
@@ -9,30 +10,14 @@ var wheel = function (eventData, done) {
         }
         var pointerPosition = userEvent.pointerPosition || {};
         var rect = element.getBoundingClientRect();
-        var clientX = pointerPosition.originX && isWithinBounds(rect.left, rect.left + rect.width, pointerPosition.originX) ? pointerPosition.originX : rect.left + (rect.width/2);
-        var clientY = pointerPosition.originY && isWithinBounds(rect.top,  rect.top + rect.height, pointerPosition.originY) ? pointerPosition.originY : rect.top + (rect.height/2);
-        return {x: clientX, y: clientY};
+        var clientX = pointerPosition.originX && isWithinBounds(rect.left, rect.left + rect.width, pointerPosition.originX) ? pointerPosition.originX : rect.left + (rect.width / 2);
+        var clientY = pointerPosition.originY && isWithinBounds(rect.top, rect.top + rect.height, pointerPosition.originY) ? pointerPosition.originY : rect.top + (rect.height / 2);
+        return { x: clientX, y: clientY };
     }
 
     function getWheelEvent(userEvent, eventData, element) {
-        var isIE = (navigator.appVersion.indexOf('Trident/') > 0) || (navigator.userAgent.indexOf('MSIE') !== -1);
-        return isIE ?
-            getWheelEventIE(userEvent, eventData, element) :
-            getWheelEventNonIE(userEvent, eventData, element);
-    }
-
-    function getWheelEventIE(userEvent, eventData, element) {
-        var pos = getEventPosition(userEvent, element);
-        var modifiers = (eventData && eventData.modifiers) || {};
-        var modifiersString = Object.keys(modifiers).join(" ");
-        var event = document.createEvent('WheelEvent');
-        event.initWheelEvent('wheel', true, true, window, 0, 0, 0, pos.x, pos.y, 0, null, modifiersString, userEvent.deltaX, userEvent.deltaY, userEvent.deltaZ, userEvent.deltaMode);
-        return event;
-    }
-
-    function getWheelEventNonIE(userEvent, eventData, element) {
         var pos = getEventPosition(userEvent, element);
-        var modifiers = (eventData && eventData.modifiers) || {};
+        var modifiers = eventData?.modifiers || {};
         var dict = {
             deltaX: userEvent.deltaX,
             deltaY: userEvent.deltaY,
@@ -45,14 +30,14 @@ var wheel = function (eventData, done) {
             ctrl: Boolean(modifiers.ctrl),
             alt: Boolean(modifiers.alt),
             shift: Boolean(modifiers.shift),
-            meta: Boolean(modifiers.meta)
+            meta: Boolean(modifiers.meta),
         };
         return new WheelEvent('wheel', dict);
     }
 
     function executeEvents(events, element) {
         if (events.length === 0) {
-            return done({state: "success"});
+            return done({ state: 'success' });
         }
         if (!element) {
             throw new Error('element not found');

package/player/stepActions/textStepAction.js

@@ -50,16 +50,12 @@ class TextStepAction extends StepAction {
             var getLocatedElement = ${codeSnippets.getLocatedElementCode};
             var dispatchFocus = ${dispatchFocus};
             var setText = ${setTextScript.toString()};
-            var eventData = ${this.driver.isEdge() ? 'JSON.parse(arguments[0])' : 'arguments[0]'};
+            var eventData = arguments[0];
             var done = arguments[1];
             return setText.call(null, eventData, done);
         `;
 
-        // hack for Edge (17/18) which does not accept properties with negative (throws Unknown Error)
-        // values between 0 and -1 -_-.
-        const eventParam = this.driver.isEdge() ? JSON.stringify(eventMessage) : eventMessage;
-
-        const result = await this.driver.executeCodeAsync(setTextCode, timeout, eventParam);
+        const result = await this.driver.executeCodeAsync(setTextCode, timeout, eventMessage);
         return { success: Boolean(result.value?.success) };
     }
 

package/player/stepActions/wheelStepAction.js

@@ -28,16 +28,12 @@ class WheelStepAction extends StepAction {
         const wheelCode = `
             var getLocatedElement = ${codeSnippets.getLocatedElementCode};
             var wheel = ${wheelScript.toString()};
-            var eventData = ${this.driver.isEdge() ? 'JSON.parse(arguments[0])' : 'arguments[0]'};
+            var eventData = arguments[0];
             var done = arguments[1];
             return wheel.call(null, eventData, done);
         `;
 
-        // hack for Edge (17/18) which does not accept properties with negative (throws Unknown Error)
-        // values between 0 and -1 -_-.
-        const eventParam = this.driver.isEdge() ? JSON.stringify(eventMessage) : eventMessage;
-
-        const result = await this.driver.executeCodeAsync(wheelCode, timeout, eventParam);
+        const result = await this.driver.executeCodeAsync(wheelCode, timeout, eventMessage);
         return { success: result.value?.state === 'success' };
     }
 }

package/player/utils/eyeSdkService.js

@@ -4,10 +4,10 @@
  * @typedef {import('@applitools/types').Core} Core
  */
 
-const { EyeSdkBuilder } = require('../../commons/getSessionPlayerRequire');
+const _ = require('lodash');
 const { makeSDK } = require('@applitools/eyes-sdk-core');
 const { W3C_ELEMENT_ID } = require('../constants');
-const _ = require('lodash');
+const { EyeSdkBuilder } = require('../../commons/getSessionPlayerRequire');
 
 let packageJson;
 // There is a difference in the folder structure in prod vs. dev
@@ -41,13 +41,6 @@ function extractElementId(element) {
     }
     return undefined;
 }
-/** implements the ?? capability for backward compatibility */
-function getValueOrFallbackIfNullOrUndefined(value, fallback) {
-    if (value === null || value === undefined) {
-        return fallback;
-    }
-    return value;
-}
 
 /**
  * Applitools Spec Driver for webdriverIO 4.
@@ -57,7 +50,7 @@ function getValueOrFallbackIfNullOrUndefined(value, fallback) {
 class EyesSpec {
     // #region UTILITY
     isDriver(driver) {
-        return Boolean(driver && driver.getPrototype && driver.desiredCapabilities && driver.requestHandler);
+        return Boolean(driver?.getPrototype && driver.desiredCapabilities && driver.requestHandler);
     }
 
     isElement(element) {
@@ -69,7 +62,7 @@ class EyesSpec {
     }
 
     isSelector(selector) {
-        return _.isString(selector);
+        return typeof selector === 'string';
     }
 
     transformDriver(driver) {
@@ -176,8 +169,8 @@ class EyesSpec {
             deviceName: desiredCapabilities.deviceName,
             platformName: desiredCapabilities.platformName || desiredCapabilities.platform,
             platformVersion: desiredCapabilities.platformVersion,
-            browserName: getValueOrFallbackIfNullOrUndefined(desiredCapabilities.browserName, desiredCapabilities.name),
-            browserVersion: getValueOrFallbackIfNullOrUndefined(desiredCapabilities.browserVersion, desiredCapabilities.version),
+            browserName: desiredCapabilities.browserName ?? desiredCapabilities.name,
+            browserVersion: desiredCapabilities.browserVersion ?? desiredCapabilities.version,
             pixelRatio: desiredCapabilities.pixelRatio,
         };
     }
@@ -209,7 +202,7 @@ class EyesSpec {
         if (this.isSelector(element)) {
             element = await this.findElement(driver, element);
         }
-        await driver.moveTo(extractElementId(element), offset && offset.x, offset && offset.y);
+        await driver.moveTo(extractElementId(element), offset?.x, offset?.y);
     }
 
     async type(driver, element, keys) {
@@ -242,7 +235,6 @@ class EyeSdkService {
             name: 'Testim.io',
             version: `4.0.0/eyes-sdk-core/${sdkVersion}`,
             spec: new EyesSpec(),
-            VisualGridClient: require('@applitools/visual-grid-client'),
         });
         /** @type {EyeSdkBuilder['handleApplitoolsSdkResult']} */
         this.handleApplitoolsSdkResult = EyeSdkBuilder.handleApplitoolsSdkResult;