@applitools/core 2.5.10 → 3.0.0

package/dist/troubleshoot/logs.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.structureLogs = exports.parseLogs = void 0;
+function parseLogs(logs) {
+    const regexp = /^(?<label>[^\s]+) (?:\((?<tags>[^\)]+)\) )?\| (?<timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z)? (?:\[(?<level>[A-Z]+)\s*\])? (?<message>.+)$/;
+    const lines = logs.split('\n');
+    return lines.reduce((logs, line) => {
+        var _a, _b;
+        const match = line.match(regexp);
+        if (match) {
+            logs.push({
+                ...match.groups,
+                tags: (_b = (_a = match.groups) === null || _a === void 0 ? void 0 : _a.tags) === null || _b === void 0 ? void 0 : _b.split(' & ').map(tags => tags.split('/')),
+            });
+        }
+        else if (logs[logs.length - 1]) {
+            logs[logs.length - 1].message += line;
+        }
+        return logs;
+    }, []);
+}
+exports.parseLogs = parseLogs;
+function structureLogs(logs) {
+    const groups = {};
+    logs.forEach(log => {
+        var _a;
+        const tags = (_a = log.tags) !== null && _a !== void 0 ? _a : [[]];
+        tags.forEach(tags => {
+            var _a;
+            const group = tags.reduce((object, key) => {
+                var _a;
+                (_a = object[key]) !== null && _a !== void 0 ? _a : (object[key] = {});
+                return object[key];
+            }, groups);
+            (_a = group.logs) !== null && _a !== void 0 ? _a : (group.logs = []);
+            group.logs.push(log);
+        });
+    });
+    return groups;
+}
+exports.structureLogs = structureLogs;

package/dist/ufg/abort.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeAbort = void 0;
 const driver_1 = require("@applitools/driver");
-function makeAbort({ storage, target, spec, controller, logger: defaultLogger, }) {
-    return async function abort({ settings, logger = defaultLogger, } = {}) {
+function makeAbort({ storage, target, spec, controller, logger: mainLogger, }) {
+    return async function abort({ settings, logger = mainLogger, } = {}) {
+        logger = logger.extend(mainLogger);
         logger.log('Command "abort" is called with settings', settings);
         controller.abort();
         settings !== null && settings !== void 0 ? settings : (settings = {});

package/dist/ufg/check-and-close.js

@@ -37,9 +37,10 @@ const uniquify_renderers_1 = require("./utils/uniquify-renderers");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
-function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger: defaultLogger, }) {
-    return async function checkAndClose({ target = defaultTarget, settings = {}, logger = defaultLogger, }) {
+function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger: mainLogger, }) {
+    return async function checkAndClose({ target = defaultTarget, settings = {}, logger = mainLogger, }) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
+        logger = logger.extend(mainLogger);
         logger.log('Command "checkAndClose" is called with settings', settings);
         if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
             logger.warn('Command "checkAndClose" was called after test was already aborted');
@@ -158,13 +159,14 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
             safeSelector: selector,
         })));
         const promises = uniqueRenderers.map(async (renderer, index) => {
+            const rendererLogger = logger.extend({ tags: [`renderer-${utils.general.shortid()}`] });
             if (utils.types.has(renderer, 'name') && renderer.name === 'edge') {
                 const message = chalk_1.default.yellow(`The 'edge' option that is being used in your browsers' configuration will soon be deprecated. Please change it to either 'edgelegacy' for the legacy version or to 'edgechromium' for the new Chromium-based version. Please note, when using the built-in BrowserType enum, then the values are BrowserType.EDGE_LEGACY and BrowserType.EDGE_CHROMIUM, respectively.`);
-                logger.console.log(message);
+                rendererLogger.console.log(message);
             }
             try {
                 if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                    logger.warn('Command "check" was aborted before rendering');
+                    rendererLogger.warn('Command "check" was aborted before rendering');
                     throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                 }
                 const { cookies, ...snapshot } = snapshots[index];
@@ -179,24 +181,25 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                         autProxy: settings.autProxy,
                         userAgent,
                     },
+                    logger: rendererLogger,
                 });
                 const [baseEyes] = await eyes.getBaseEyes({ settings: { renderer, type: snapshotType }, logger });
                 try {
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                        logger.warn('Command "check" was aborted before rendering');
+                        rendererLogger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
                     else if (!baseEyes.running) {
-                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
                     const renderTarget = await renderTargetPromise;
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                        logger.warn('Command "check" was aborted before rendering');
+                        rendererLogger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
                     else if (!baseEyes.running) {
-                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
                     const { renderId, selectorRegions, ...baseTarget } = await ufgClient.render({
@@ -213,6 +216,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                             rendererId: baseEyes.test.rendererId,
                         },
                         signal,
+                        logger: rendererLogger,
                     });
                     let offset = 0;
                     const baseSettings = getBaseCheckSettings({
@@ -225,22 +229,22 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                     baseTarget.source = snapshotUrl;
                     baseTarget.name = snapshotTitle;
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                        logger.warn('Command "check" was aborted after rendering');
+                        rendererLogger.warn('Command "check" was aborted after rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted after rendering');
                     }
                     else if (!baseEyes.running) {
-                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
                     const [result] = await baseEyes.checkAndClose({
                         target: { ...baseTarget, isTransformed: true },
                         settings: baseSettings,
-                        logger,
+                        logger: rendererLogger,
                     });
-                    return { ...result, eyes: baseEyes, renderer };
+                    return { ...result, userTestId: eyes.test.userTestId, eyes: baseEyes, renderer };
                 }
                 catch (error) {
-                    await baseEyes.abort();
+                    await baseEyes.abort({ logger: rendererLogger });
                     error.info = { eyes: baseEyes };
                     throw error;
                 }
@@ -250,17 +254,7 @@ function makeCheckAndClose({ eyes, target: defaultTarget, spec, signal, logger:
                 throw error;
             }
         });
-        return Promise.all(promises.map(async (promise) => {
-            var _a, _b;
-            try {
-                const result = await promise;
-                return { ...result, userTestId: eyes.test.userTestId };
-            }
-            catch (error) {
-                await ((_b = (_a = error.info) === null || _a === void 0 ? void 0 : _a.eyes) === null || _b === void 0 ? void 0 : _b.abort({ logger }));
-                throw error;
-            }
-        }));
+        return Promise.all(promises);
     };
 }
 exports.makeCheckAndClose = makeCheckAndClose;

package/dist/ufg/check.js

@@ -37,9 +37,10 @@ const uniquify_renderers_1 = require("./utils/uniquify-renderers");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
-function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultLogger, }) {
-    return async function check({ target = defaultTarget, settings = {}, logger = defaultLogger, }) {
+function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: mainLogger, }) {
+    return async function check({ target = defaultTarget, settings = {}, logger = mainLogger, }) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        logger = logger.extend(mainLogger);
         logger.log('Command "check" is called with settings', settings);
         if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
             logger.warn('Command "check" was called after test was already aborted');
@@ -159,13 +160,14 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
             safeSelector: selector,
         })));
         const promises = uniqueRenderers.map(async (renderer, index) => {
+            const rendererLogger = logger.extend({ tags: [`renderer-${utils.general.shortid()}`] });
             if (utils.types.has(renderer, 'name') && renderer.name === 'edge') {
                 const message = chalk_1.default.yellow(`The 'edge' option that is being used in your browsers' configuration will soon be deprecated. Please change it to either 'edgelegacy' for the legacy version or to 'edgechromium' for the new Chromium-based version. Please note, when using the built-in BrowserType enum, then the values are BrowserType.EDGE_LEGACY and BrowserType.EDGE_CHROMIUM, respectively.`);
-                logger.console.log(message);
+                rendererLogger.console.log(message);
             }
             try {
                 if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                    logger.warn('Command "check" was aborted before rendering');
+                    rendererLogger.warn('Command "check" was aborted before rendering');
                     throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                 }
                 const { cookies, ...snapshot } = snapshots[index];
@@ -180,24 +182,25 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
                         autProxy: settings.autProxy,
                         userAgent,
                     },
+                    logger: rendererLogger,
                 });
-                const [baseEyes] = await eyes.getBaseEyes({ settings: { renderer, type: snapshotType }, logger });
+                const [baseEyes] = await eyes.getBaseEyes({ settings: { renderer, type: snapshotType }, logger: rendererLogger });
                 try {
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                        logger.warn('Command "check" was aborted before rendering');
+                        rendererLogger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
                     else if (!baseEyes.running) {
-                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
                     const renderTarget = await renderTargetPromise;
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                        logger.warn('Command "check" was aborted before rendering');
+                        rendererLogger.warn('Command "check" was aborted before rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted before rendering');
                     }
                     else if (!baseEyes.running) {
-                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
                     const { renderId, selectorRegions, ...baseTarget } = await ufgClient.render({
@@ -214,6 +217,7 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
                             rendererId: baseEyes.test.rendererId,
                         },
                         signal,
+                        logger: rendererLogger,
                     });
                     let offset = 0;
                     const baseSettings = getBaseCheckSettings({
@@ -226,27 +230,27 @@ function makeCheck({ eyes, target: defaultTarget, spec, signal, logger: defaultL
                     baseTarget.source = snapshotUrl;
                     baseTarget.name = snapshotTitle;
                     if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
-                        logger.warn('Command "check" was aborted after rendering');
+                        rendererLogger.warn('Command "check" was aborted after rendering');
                         throw new abort_error_1.AbortError('Command "check" was aborted after rendering');
                     }
                     else if (!baseEyes.running) {
-                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
                     const [result] = await baseEyes.check({
                         target: { ...baseTarget, isTransformed: true },
                         settings: baseSettings,
-                        logger,
+                        logger: rendererLogger,
                     });
                     if (!baseEyes.running) {
-                        logger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
+                        rendererLogger.warn(`Renderer with id ${baseEyes.test.rendererId} was aborted during one of the previous steps`);
                         throw new abort_error_1.AbortError(`Renderer with id "${baseEyes.test.rendererId}" was aborted during one of the previous steps`);
                     }
                     return { ...result, eyes: baseEyes, renderer };
                 }
                 catch (error) {
                     if (baseEyes.running && !(signal === null || signal === void 0 ? void 0 : signal.aborted))
-                        await baseEyes.abort({ logger });
+                        await baseEyes.abort({ logger: rendererLogger });
                     error.info = { eyes: baseEyes };
                     throw error;
                 }

package/dist/ufg/close.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeClose = void 0;
 const driver_1 = require("@applitools/driver");
-function makeClose({ storage, target, spec, logger: defaultLogger }) {
-    return async function close({ settings, logger = defaultLogger, } = {}) {
+function makeClose({ storage, target, spec, logger: mainLogger }) {
+    return async function close({ settings, logger = mainLogger, } = {}) {
+        logger = logger.extend(mainLogger);
         logger.log('Command "close" is called with settings', settings);
         settings !== null && settings !== void 0 ? settings : (settings = {});
         if (!settings.testMetadata) {

package/dist/ufg/core.js

@@ -36,8 +36,7 @@ const get_nml_client_1 = require("./get-nml-client");
 const open_eyes_1 = require("./open-eyes");
 const utils = __importStar(require("@applitools/utils"));
 function makeCore({ concurrency, spec, clients, base, fetchConcurrency, agentId = 'core-ufg', cwd = process.cwd(), logger: defaultLogger, }) {
-    var _a;
-    const logger = (_a = defaultLogger === null || defaultLogger === void 0 ? void 0 : defaultLogger.extend({ label: 'core-ufg' })) !== null && _a !== void 0 ? _a : (0, logger_1.makeLogger)({ label: 'core-ufg' });
+    const logger = (0, logger_1.makeLogger)({ logger: defaultLogger, format: { label: 'core-ufg' } });
     logger.log(`Core ufg is initialized ${base ? 'with' : 'without'} custom base core`);
     base !== null && base !== void 0 ? base : (base = (0, core_base_1.makeCore)({ agentId, concurrency, cwd, logger }));
     return utils.general.extend(base, core => {

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

@@ -25,13 +25,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetBaseEyes = void 0;
 const utils = __importStar(require("@applitools/utils"));
-function makeGetBaseEyes({ settings: defaultSettings, eyes, base, logger: defaultLogger, }) {
+function makeGetBaseEyes({ settings: defaultSettings, eyes, base, logger: mainLogger, }) {
     const getBaseEyesWithCache = utils.general.cachify(getBaseEyes, ([options]) => options === null || options === void 0 ? void 0 : options.settings);
     if (base) {
         base.forEach(baseEyes => getBaseEyesWithCache.setCachedValue(baseEyes.test.rendererInfo, Promise.resolve([baseEyes])));
     }
     return getBaseEyesWithCache;
-    async function getBaseEyes({ settings, logger = defaultLogger, } = {}) {
+    async function getBaseEyes({ settings, logger = mainLogger, } = {}) {
+        logger = logger.extend(mainLogger);
         logger.log(`Command "getBaseEyes" is called with settings`, settings);
         if (!settings)
             throw new Error('');
@@ -39,7 +40,7 @@ function makeGetBaseEyes({ settings: defaultSettings, eyes, base, logger: defaul
             config: { ...eyes.test.ufgServer },
             logger,
         });
-        const environment = await ufgClient.bookRenderer({ settings });
+        const environment = await ufgClient.bookRenderer({ settings, logger });
         const baseEyes = await eyes.core.base.openEyes({
             settings: { ...defaultSettings, environment: { ...defaultSettings.environment, ...environment } },
             logger,

package/dist/ufg/get-nml-client.js

@@ -26,12 +26,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetNMLClient = void 0;
 const nml_client_1 = require("@applitools/nml-client");
 const utils = __importStar(require("@applitools/utils"));
-function makeGetNMLClient({ client, logger: defaultLogger }) {
+function makeGetNMLClient({ client, logger: mainLogger }) {
     const getNMLClientWithCache = utils.general.cachify(getNMLClient, ([options]) => client ? 'default' : [options.driver.guid, options.config]);
     if (client)
         getNMLClientWithCache.setCachedValue('default', Promise.resolve(client));
     return getNMLClientWithCache;
-    async function getNMLClient({ driver, config, logger = defaultLogger, }) {
+    async function getNMLClient({ driver, config, logger = mainLogger, }) {
+        logger = logger.extend(mainLogger);
         const brokerUrl = await driver.extractBrokerUrl();
         if (!brokerUrl)
             return null;

package/dist/ufg/get-results.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetResults = void 0;
 const abort_error_1 = require("../errors/abort-error");
-function makeGetResults({ storage, logger: defaultLogger }) {
-    return async function getResults({ settings, logger = defaultLogger, } = {}) {
+function makeGetResults({ storage, logger: mainLogger }) {
+    return async function getResults({ settings, logger = mainLogger, } = {}) {
+        logger = logger.extend(mainLogger);
         logger.log('Command "getResults" is called with settings', settings);
         return Promise.all(Array.from(storage.values(), async (promises) => {
             var _a;

package/dist/ufg/get-ufg-client.js

@@ -26,14 +26,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeGetUFGClient = void 0;
 const ufg_client_1 = require("@applitools/ufg-client");
 const utils = __importStar(require("@applitools/utils"));
-function makeGetUFGClient({ client, fetchConcurrency, logger: defaultLogger }) {
+function makeGetUFGClient({ client, fetchConcurrency, logger: mainLogger }) {
     // we are caching by the server config, therefor if the user creates another Runner / manager with the same server config but different
     // fetchConcurrency, it will not take any affect.
     const getUFGClientWithCache = utils.general.cachify(getUFGClient, ([options]) => client ? 'default' : [{ ...options.config, fetchConcurrency: undefined }]);
     if (client)
         getUFGClientWithCache.setCachedValue('default', Promise.resolve(client));
     return getUFGClientWithCache;
-    async function getUFGClient({ config, logger = defaultLogger }) {
+    async function getUFGClient({ config, logger = mainLogger }) {
+        logger = logger.extend(mainLogger);
         return (0, ufg_client_1.makeUFGClient)({ config: { ...config, fetchConcurrency }, logger });
     }
 }

package/dist/ufg/open-eyes.js

@@ -33,9 +33,10 @@ const abort_1 = require("./abort");
 const get_results_1 = require("./get-results");
 const abort_controller_1 = require("abort-controller");
 const utils = __importStar(require("@applitools/utils"));
-function makeOpenEyes({ core, spec, logger: defaultLogger }) {
-    return async function openEyes({ target, settings, base, logger = defaultLogger, }) {
+function makeOpenEyes({ core, spec, logger: mainLogger }) {
+    return async function openEyes({ target, settings, base, logger = mainLogger, }) {
         var _a, _b;
+        logger = logger.extend(mainLogger);
         logger.log(`Command "openEyes" is called with ${target ? 'default driver and' : ''}`, ...(settings ? ['settings', settings] : []), base ? 'predefined eyes' : '');
         const driver = target && (await (0, driver_1.makeDriver)({ spec, driver: target, logger }));
         if (driver && !base) {

package/dist/ufg/utils/take-dom-snapshots.js

@@ -35,7 +35,7 @@ const utils = __importStar(require("@applitools/utils"));
 const chalk_1 = __importDefault(require("chalk"));
 __exportStar(require("./take-dom-snapshot"), exports);
 async function takeDomSnapshots({ driver, settings, hooks, provides, logger, }) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const currentContext = driver.currentContext;
     const waitBeforeCapture = async () => {
         if (utils.types.isFunction(settings.waitBeforeCapture)) {
@@ -53,12 +53,12 @@ async function takeDomSnapshots({ driver, settings, hooks, provides, logger, })
         const snapshot = await (0, take_dom_snapshot_1.takeDomSnapshot)({ context: currentContext, settings, logger });
         return Array(settings.renderers.length).fill(snapshot);
     }
-    const isStrictBreakpoints = utils.types.isArray(settings.layoutBreakpoints);
+    const isStrictBreakpoints = utils.types.isArray((_c = settings.layoutBreakpoints) === null || _c === void 0 ? void 0 : _c.breakpoints);
     const requiredWidths = await settings.renderers.reduce(async (prev, renderer, index) => {
         const { name, width } = (await extractRendererInfo({ renderer }));
         const requiredWidths = await prev;
         const requiredWidth = isStrictBreakpoints
-            ? calculateBreakpoint({ breakpoints: settings.layoutBreakpoints, value: width })
+            ? calculateBreakpoint({ breakpoints: settings.layoutBreakpoints.breakpoints, value: width })
             : width;
         let renderers = requiredWidths.get(requiredWidth);
         if (!renderers)
@@ -66,7 +66,7 @@ async function takeDomSnapshots({ driver, settings, hooks, provides, logger, })
         renderers.push({ name, width, index });
         return requiredWidths;
     }, Promise.resolve(new Map()));
-    const smallestBreakpoint = Math.min(...(isStrictBreakpoints ? settings.layoutBreakpoints : []));
+    const smallestBreakpoint = Math.min(...(isStrictBreakpoints ? settings.layoutBreakpoints.breakpoints : []));
     if (isStrictBreakpoints && requiredWidths.has(smallestBreakpoint - 1)) {
         const smallestBrowsers = requiredWidths
             .get(smallestBreakpoint - 1)
@@ -75,13 +75,13 @@ async function takeDomSnapshots({ driver, settings, hooks, provides, logger, })
         const message = chalk_1.default.yellow(`The following configuration's viewport-widths are smaller than the smallest configured layout breakpoint (${smallestBreakpoint} pixels): [${smallestBrowsers}]. As a fallback, the resources that will be used for these configurations have been captured on a viewport-width of ${smallestBreakpoint} - 1 pixels. If an additional layout breakpoint is needed for you to achieve better results - please add it to your configuration.`);
         logger.console.log(message);
     }
-    logger.log(`taking multiple dom snapshots for breakpoints:`, settings.layoutBreakpoints);
+    logger.log(`taking multiple dom snapshots for breakpoints:`, settings.layoutBreakpoints.breakpoints);
     logger.log(`required widths: ${[...requiredWidths.keys()].join(', ')}`);
     const viewportSize = await driver.getViewportSize();
     const snapshots = Array(settings.renderers.length);
     if (requiredWidths.has(viewportSize.width)) {
         logger.log(`taking dom snapshot for existing width ${viewportSize.width}`);
-        await ((_c = hooks === null || hooks === void 0 ? void 0 : hooks.beforeEachSnapshot) === null || _c === void 0 ? void 0 : _c.call(hooks));
+        await ((_d = hooks === null || hooks === void 0 ? void 0 : hooks.beforeEachSnapshot) === null || _d === void 0 ? void 0 : _d.call(hooks));
         await waitBeforeCapture();
         const snapshot = await (0, take_dom_snapshot_1.takeDomSnapshot)({ context: currentContext, settings, logger });
         requiredWidths.get(viewportSize.width).forEach(({ index }) => (snapshots[index] = snapshot));
@@ -90,6 +90,10 @@ async function takeDomSnapshots({ driver, settings, hooks, provides, logger, })
         logger.log(`taking dom snapshot for width ${requiredWidth}`);
         try {
             await driver.setViewportSize({ width: requiredWidth, height: viewportSize.height });
+            if (settings.layoutBreakpoints.reload) {
+                await driver.reloadPage();
+                await waitBeforeCapture();
+            }
         }
         catch (err) {
             logger.error(err);
@@ -107,12 +111,16 @@ async function takeDomSnapshots({ driver, settings, hooks, provides, logger, })
                 logger.log(message);
             }
         }
-        await ((_d = hooks === null || hooks === void 0 ? void 0 : hooks.beforeEachSnapshot) === null || _d === void 0 ? void 0 : _d.call(hooks));
+        await ((_e = hooks === null || hooks === void 0 ? void 0 : hooks.beforeEachSnapshot) === null || _e === void 0 ? void 0 : _e.call(hooks));
         await waitBeforeCapture();
         const snapshot = await (0, take_dom_snapshot_1.takeDomSnapshot)({ context: currentContext, settings, logger });
         browsersInfo.forEach(({ index }) => (snapshots[index] = snapshot));
     }
     await driver.setViewportSize(viewportSize);
+    if (settings.layoutBreakpoints.reload) {
+        await driver.reloadPage();
+        await waitBeforeCapture();
+    }
     return snapshots;
     function calculateBreakpoint({ breakpoints, value }) {
         const nextBreakpointIndex = breakpoints

package/dist/universal/core-server.js

@@ -20,9 +20,8 @@ printStdout = false, ...handlerOptions } = {}) {
     const logDirname = (_a = process.env.APPLITOOLS_LOG_DIR) !== null && _a !== void 0 ? _a : path_1.default.resolve(os_1.default.tmpdir(), `applitools-logs`);
     const baseLogger = (0, logger_1.makeLogger)({
         handler: { type: 'rolling file', name: 'universal', dirname: logDirname },
-        label: 'core-universal',
         level: 'info',
-        colors: false,
+        format: { label: 'core-universal', colors: false },
     });
     baseLogger.log('Core universal is going to be initialized with options', {
         debug,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "2.5.10",
+  "version": "3.0.0",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -75,20 +75,20 @@
     ]
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.53",
-    "@applitools/dom-capture": "11.2.1",
+    "@applitools/core-base": "1.1.54",
+    "@applitools/dom-capture": "11.2.2",
     "@applitools/dom-snapshot": "4.7.9",
-    "@applitools/driver": "1.11.49",
-    "@applitools/ec-client": "1.2.29",
-    "@applitools/logger": "1.1.52",
-    "@applitools/nml-client": "1.3.52",
-    "@applitools/req": "1.2.5",
-    "@applitools/screenshoter": "3.7.43",
-    "@applitools/snippets": "2.4.19",
-    "@applitools/socket": "1.0.13",
-    "@applitools/spec-driver-webdriver": "1.0.30",
-    "@applitools/ufg-client": "1.2.12",
-    "@applitools/utils": "1.3.35",
+    "@applitools/driver": "1.11.51",
+    "@applitools/ec-client": "1.2.30",
+    "@applitools/logger": "2.0.0",
+    "@applitools/nml-client": "1.3.53",
+    "@applitools/req": "1.2.6",
+    "@applitools/screenshoter": "3.7.44",
+    "@applitools/snippets": "2.4.20",
+    "@applitools/socket": "1.0.14",
+    "@applitools/spec-driver-webdriver": "1.0.31",
+    "@applitools/ufg-client": "1.2.13",
+    "@applitools/utils": "1.3.36",
     "@types/ws": "8.5.4",
     "abort-controller": "3.0.0",
     "chalk": "4.1.2",
@@ -100,10 +100,10 @@
   "devDependencies": {
     "@applitools/bongo": "^3.0.3",
     "@applitools/sdk-coverage-tests": "^3.0.2",
-    "@applitools/spec-driver-puppeteer": "^1.1.60",
-    "@applitools/spec-driver-selenium": "^1.5.44",
-    "@applitools/spec-driver-webdriverio": "^1.4.45",
-    "@applitools/test-server": "^1.1.31",
+    "@applitools/spec-driver-puppeteer": "^1.1.62",
+    "@applitools/spec-driver-selenium": "^1.5.45",
+    "@applitools/spec-driver-webdriverio": "^1.5.0",
+    "@applitools/test-server": "^1.2.0",
     "@applitools/test-utils": "^1.5.16",
     "@types/node": "^12.20.55",
     "@types/selenium-webdriver": "^4.1.2",

package/types/automation/extract-text.d.ts

@@ -7,7 +7,7 @@ type Options<TSpec extends SpecType> = {
     spec?: SpecDriver<TSpec>;
     logger: Logger;
 };
-export declare function makeExtractText<TSpec extends SpecType>({ core, spec, logger: defaultLogger }: Options<TSpec>): ({ target, settings, logger, }: {
+export declare function makeExtractText<TSpec extends SpecType>({ core, spec, logger: mainLogger }: Options<TSpec>): ({ target, settings, logger, }: {
     target: Target<TSpec>;
     settings: MaybeArray<ExtractTextSettings<TSpec>>;
     logger?: Logger | undefined;

package/types/automation/get-viewport-size.d.ts

@@ -5,7 +5,7 @@ type Options<TSpec extends SpecType> = {
     spec: SpecDriver<TSpec>;
     logger: Logger;
 };
-export declare function makeGetViewportSize<TSpec extends SpecType>({ spec, logger: defaultLogger }: Options<TSpec>): ({ target, logger, }: {
+export declare function makeGetViewportSize<TSpec extends SpecType>({ spec, logger: mainLogger }: Options<TSpec>): ({ target, logger }: {
     target: DriverTarget<TSpec>;
     logger?: Logger | undefined;
 }) => Promise<import("@applitools/utils").Size>;

package/types/automation/locate-text.d.ts

@@ -6,7 +6,7 @@ type Options<TSpec extends SpecType> = {
     spec?: SpecDriver<TSpec>;
     logger: Logger;
 };
-export declare function makeLocateText<TSpec extends SpecType>({ core, spec, logger: defaultLogger }: Options<TSpec>): <TPattern extends string>({ target, settings, logger, }: {
+export declare function makeLocateText<TSpec extends SpecType>({ core, spec, logger: mainLogger }: Options<TSpec>): <TPattern extends string>({ target, settings, logger, }: {
     target: Target<TSpec>;
     settings: LocateTextSettings<TPattern, TSpec>;
     logger?: Logger | undefined;

package/types/automation/locate.d.ts

@@ -6,7 +6,7 @@ type Options<TSpec extends SpecType> = {
     spec?: SpecDriver<TSpec>;
     logger: Logger;
 };
-export declare function makeLocate<TSpec extends SpecType>({ spec, core, logger: defaultLogger }: Options<TSpec>): <TLocator extends string>({ settings, target, logger, }: {
+export declare function makeLocate<TSpec extends SpecType>({ spec, core, logger: mainLogger }: Options<TSpec>): <TLocator extends string>({ settings, target, logger, }: {
     target: Target<TSpec>;
     settings: LocateSettings<TLocator, TSpec>;
     logger?: Logger | undefined;

package/types/automation/set-viewport-size.d.ts

@@ -6,7 +6,7 @@ type Options<TSpec extends SpecType> = {
     spec: SpecDriver<TSpec>;
     logger: Logger;
 };
-export declare function makeSetViewportSize<TSpec extends SpecType>({ spec, logger: defaultLogger }: Options<TSpec>): ({ target, size, logger, }: {
+export declare function makeSetViewportSize<TSpec extends SpecType>({ spec, logger: mainLogger }: Options<TSpec>): ({ target, size, logger, }: {
     target: DriverTarget<TSpec>;
     size: Size;
     logger?: Logger | undefined;

package/types/check-and-close.d.ts

@@ -8,7 +8,7 @@ type Options<TSpec extends SpecType, TType extends 'classic' | 'ufg'> = {
     spec?: SpecDriver<TSpec>;
     logger: Logger;
 };
-export declare function makeCheckAndClose<TSpec extends SpecType, TDefaultType extends 'classic' | 'ufg'>({ type: defaultType, eyes, target: defaultTarget, spec, logger: defaultLogger, }: Options<TSpec, TDefaultType>): <TType extends "classic" | "ufg" = TDefaultType>({ type, target, settings, config, logger, }?: {
+export declare function makeCheckAndClose<TSpec extends SpecType, TDefaultType extends 'classic' | 'ufg'>({ type: defaultType, eyes, target: defaultTarget, spec, logger: mainLogger, }: Options<TSpec, TDefaultType>): <TType extends "classic" | "ufg" = TDefaultType>({ type, target, settings, config, logger, }?: {
     type?: TType | undefined;
     target?: Target<TSpec, TType> | undefined;
     settings?: (CheckSettings<TSpec, TDefaultType> & CloseSettings<TDefaultType> & CheckSettings<TSpec, TType> & CloseSettings<TType>) | undefined;

package/types/check.d.ts

@@ -8,7 +8,7 @@ type Options<TSpec extends SpecType, TType extends 'classic' | 'ufg'> = {
     spec?: SpecDriver<TSpec>;
     logger: Logger;
 };
-export declare function makeCheck<TSpec extends SpecType, TDefaultType extends 'classic' | 'ufg'>({ type: defaultType, eyes, target: defaultTarget, spec, logger: defaultLogger, }: Options<TSpec, TDefaultType>): <TType extends "classic" | "ufg" = TDefaultType>({ type, target, settings, config, logger, }?: {
+export declare function makeCheck<TSpec extends SpecType, TDefaultType extends 'classic' | 'ufg'>({ type: defaultType, eyes, target: defaultTarget, spec, logger: mainLogger, }: Options<TSpec, TDefaultType>): <TType extends "classic" | "ufg" = TDefaultType>({ type, target, settings, config, logger, }?: {
     type?: TType | undefined;
     target?: Target<TSpec, TType> | undefined;
     settings?: CheckSettings<TSpec, TType> | undefined;

package/types/classic/abort.d.ts

@@ -9,7 +9,7 @@ type Options<TSpec extends SpecType> = {
     spec?: SpecDriver<TSpec>;
     logger: Logger;
 };
-export declare function makeAbort<TSpec extends SpecType>({ eyes, target, spec, logger: defaultLogger }: Options<TSpec>): ({ settings, logger, }?: {
+export declare function makeAbort<TSpec extends SpecType>({ eyes, target, spec, logger: mainLogger }: Options<TSpec>): ({ settings, logger, }?: {
     settings?: AbortSettings | undefined;
     logger?: Logger | undefined;
 }) => Promise<void>;