@applitools/core 1.4.1 → 1.4.3

package/dist/make-eg-client.js

@@ -26,10 +26,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeMakeEGClient = void 0;
 const utils = __importStar(require("@applitools/utils"));
 function makeMakeEGClient({ core, logger: defaultLogger }) {
-    const { makeEGClient } = require('@applitools/execution-grid-client');
-    return async function makeECClient({ settings, logger = defaultLogger, } = {}) {
+    return async function makeEGClient({ settings, logger = defaultLogger, } = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         var _j, _k;
+        const { makeEGClient } = require('@applitools/execution-grid-client');
         const serverUrl = (_c = (_b = (_a = settings.capabilities.eyesServerUrl) !== null && _a !== void 0 ? _a : utils.general.getEnvValue('EYES_SERVER_URL')) !== null && _b !== void 0 ? _b : utils.general.getEnvValue('SERVER_URL')) !== null && _c !== void 0 ? _c : 'https://eyesapi.applitools.com';
         const apiKey = ((_d = (_j = settings.capabilities).apiKey) !== null && _d !== void 0 ? _d : (_j.apiKey = utils.general.getEnvValue('API_KEY')));
         const proxy = (_e = settings.proxy) !== null && _e !== void 0 ? _e : (utils.general.getEnvValue('PROXY_URL') && { url: utils.general.getEnvValue('PROXY_URL') });

package/dist/ufg/get-base-eyes.js

@@ -33,7 +33,10 @@ function makeGetBaseEyes({ settings: defaultSettings, core, client, eyes, logger
     async function getBaseEyes({ settings, logger = defaultLogger, } = {}) {
         logger.log(`Command "getBaseEyes" is called with settings`, settings);
         const environment = await client.bookRenderer({ settings });
-        const eyes = await core.openEyes({ settings: { ...defaultSettings, environment }, logger });
+        const eyes = await core.openEyes({
+            settings: { ...defaultSettings, environment: { ...defaultSettings.environment, ...environment } },
+            logger,
+        });
         return [eyes];
     }
 }

package/dist/ufg/open-eyes.js

@@ -35,14 +35,16 @@ const abort_controller_1 = require("abort-controller");
 const utils = __importStar(require("@applitools/utils"));
 function makeOpenEyes({ core, client, spec, logger: defaultLogger, }) {
     return async function openEyes({ target, settings, eyes, logger = defaultLogger, }) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         logger.log(`Command "openEyes" is called with ${target ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), eyes ? 'predefined eyes' : '');
         const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger, customConfig: { disableHelper: true } }));
         (_a = settings.environment) !== null && _a !== void 0 ? _a : (settings.environment = {});
         settings.environment.egSessionId = (driver === null || driver === void 0 ? void 0 : driver.isExecutionGrid) ? driver.sessionId : null;
         if (driver && !eyes) {
             const currentContext = driver.currentContext;
-            if ((_b = settings.environment) === null || _b === void 0 ? void 0 : _b.viewportSize) {
+            (_b = settings.environment) !== null && _b !== void 0 ? _b : (settings.environment = {});
+            settings.environment.egSessionId = (driver === null || driver === void 0 ? void 0 : driver.isExecutionGrid) ? driver.sessionId : null;
+            if ((_c = settings.environment) === null || _c === void 0 ? void 0 : _c.viewportSize) {
                 await driver.setViewportSize(settings.environment.viewportSize);
             }
             await currentContext.focus();
@@ -51,7 +53,7 @@ function makeOpenEyes({ core, client, spec, logger: defaultLogger, }) {
         const account = await core.getAccountInfo({ settings, logger });
         client !== null && client !== void 0 ? client : (client = (0, ufg_client_1.makeUFGClient)({
             config: { ...account.ufg, ...account, proxy: settings.proxy },
-            concurrency: (_c = settings.renderConcurrency) !== null && _c !== void 0 ? _c : 5,
+            concurrency: (_d = settings.renderConcurrency) !== null && _d !== void 0 ? _d : 5,
             logger,
         }));
         const getBaseEyes = (0, get_base_eyes_1.makeGetBaseEyes)({ settings, eyes, core, client, logger });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -78,7 +78,7 @@
     "throat": "6.0.1"
   },
   "optionalDependencies": {
-    "@applitools/execution-grid-client": "^1.2.2"
+    "@applitools/execution-grid-client": "^1.2.3"
   },
   "devDependencies": {
     "@applitools/bongo": "^2.2.2",