@applitools/eyes-storybook 3.51.1 → 3.52.0

package/CHANGELOG.md

@@ -1,5 +1,116 @@
 # Changelog
 
+## [3.52.0](https://github.com/Applitools-Dev/sdk/compare/js/eyes-storybook-v3.51.2...js/eyes-storybook@3.52.0) (2024-11-07)
+
+
+### Features
+
+* offline storybook ([#2596](https://github.com/Applitools-Dev/sdk/issues/2596)) ([c8edf80](https://github.com/Applitools-Dev/sdk/commit/c8edf80bc379d0cf5d94d798314bdad405d2f2b4))
+* upgrade puppeteer to 23.5.1 ([#2457](https://github.com/Applitools-Dev/sdk/issues/2457)) ([62c2160](https://github.com/Applitools-Dev/sdk/commit/62c2160af3cd0ecc19a88c9668726d28d5d22e1a))
+
+
+### Bug Fixes
+
+* exit gracefully without stories ([#2602](https://github.com/Applitools-Dev/sdk/issues/2602)) ([00c9011](https://github.com/Applitools-Dev/sdk/commit/00c901113a9c760e1b10ced2ee4cc61cfd483b67))
+* improve puppeteer related error handling ([#2601](https://github.com/Applitools-Dev/sdk/issues/2601)) ([2813462](https://github.com/Applitools-Dev/sdk/commit/2813462bc06f90b1c67d0fec6e252d3b5864406f))
+* storybook with yarn pnp ([#2350](https://github.com/Applitools-Dev/sdk/issues/2350)) ([1b67e8f](https://github.com/Applitools-Dev/sdk/commit/1b67e8f5e37ed97aed55f38be1827db71243e38c))
+* support reloadPagePerStory ([#2438](https://github.com/Applitools-Dev/sdk/issues/2438)) ([df457af](https://github.com/Applitools-Dev/sdk/commit/df457afcaf60bf272eec5b868401a1a84c98fdd4))
+* trigger release ([88c4f81](https://github.com/Applitools-Dev/sdk/commit/88c4f812bd92eae61ee8ebbee5da0d64ad8c8859))
+* tunnel client ([670b184](https://github.com/Applitools-Dev/sdk/commit/670b1843ce43347d97e19fa02f8bc630332ff414))
+
+
+### Dependencies
+
+* @applitools/utils bumped to 1.7.5
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+* @applitools/logger bumped to 2.0.19
+
+* @applitools/dom-snapshot bumped to 4.11.7
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+
+* @applitools/socket bumped to 1.1.19
+
+* @applitools/req bumped to 1.7.3
+
+* @applitools/image bumped to 1.1.14
+
+* @applitools/snippets bumped to 2.6.2
+  #### Bug Fixes
+
+  * provide a clear "stale element" exception message when passing detached regions to `check` ([#2590](https://github.com/Applitools-Dev/sdk/issues/2590)) ([1e5b49e](https://github.com/Applitools-Dev/sdk/commit/1e5b49e9aec6b8caf89f2cdb1f8e81a237d52896))
+* @applitools/dom-capture bumped to 11.5.1
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+* @applitools/driver bumped to 1.19.7
+
+* @applitools/spec-driver-webdriver bumped to 1.1.19
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+
+* @applitools/spec-driver-selenium bumped to 1.5.90
+
+* @applitools/spec-driver-puppeteer bumped to 1.4.19
+
+* @applitools/screenshoter bumped to 3.9.5
+
+* @applitools/nml-client bumped to 1.8.17
+
+* @applitools/tunnel-client bumped to 1.5.9
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+
+* @applitools/ufg-client bumped to 1.14.0
+  #### Features
+
+  * offline storybook ([#2596](https://github.com/Applitools-Dev/sdk/issues/2596)) ([c8edf80](https://github.com/Applitools-Dev/sdk/commit/c8edf80bc379d0cf5d94d798314bdad405d2f2b4))
+
+
+
+* @applitools/core-base bumped to 1.19.2
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+
+* @applitools/ec-client bumped to 1.9.13
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+
+* @applitools/core bumped to 4.23.0
+  #### Features
+
+  * offline storybook ([#2596](https://github.com/Applitools-Dev/sdk/issues/2596)) ([c8edf80](https://github.com/Applitools-Dev/sdk/commit/c8edf80bc379d0cf5d94d798314bdad405d2f2b4))
+
+
+  #### Bug Fixes
+
+  * handle missing commits in parent and current branch ([#2586](https://github.com/Applitools-Dev/sdk/issues/2586)) ([3b40be5](https://github.com/Applitools-Dev/sdk/commit/3b40be544c36235b43121af82485bfc2e71d9e27))
+
+
+  #### Code Refactoring
+
+  * start linting "no-floating-promises" (wip) ([#2539](https://github.com/Applitools-Dev/sdk/issues/2539)) ([51b91cb](https://github.com/Applitools-Dev/sdk/commit/51b91cb15603f7d68e4bd6a16eb0f80e3f380295))
+
+
+
+
 ## [3.51.1](https://github.com/Applitools-Dev/sdk/compare/js/eyes-storybook@3.51.0...js/eyes-storybook@3.51.1) (2024-10-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-storybook",
-  "version": "3.51.1",
+  "version": "3.52.0",
   "description": "",
   "keywords": [
     "applitools",
@@ -54,14 +54,14 @@
     "up:framework": "cd test/fixtures/storybook-versions/${APPLITOOLS_FRAMEWORK_VERSION} && npm ci"
   },
   "dependencies": {
-    "@applitools/core": "4.21.2",
-    "@applitools/driver": "1.19.4",
+    "@applitools/core": "4.23.0",
+    "@applitools/driver": "1.19.7",
     "@applitools/functional-commons": "1.6.0",
-    "@applitools/logger": "2.0.18",
+    "@applitools/logger": "2.0.19",
     "@applitools/monitoring-commons": "1.0.19",
-    "@applitools/spec-driver-puppeteer": "1.4.16",
-    "@applitools/ufg-client": "1.13.1",
-    "@applitools/utils": "1.7.4",
+    "@applitools/spec-driver-puppeteer": "1.4.19",
+    "@applitools/ufg-client": "1.14.0",
+    "@applitools/utils": "1.7.5",
     "boxen": "4.2.0",
     "chalk": "3.0.0",
     "detect-port": "1.3.0",

package/src/cli.js

@@ -16,6 +16,7 @@ const handleTapFile = require('./handleTapFile');
 const handleXmlFile = require('./handleXmlFile');
 const {presult} = require('@applitools/functional-commons');
 const chalk = require('chalk');
+const utils = require('@applitools/utils');
 const {performance, timeItAsync} = makeTiming();
 
 (async function () {
@@ -41,7 +42,9 @@ const {performance, timeItAsync} = makeTiming();
     const [err, results] = await presult(
       timeItAsync('eyesStorybook', () => eyesStorybook({config, logger, performance, timeItAsync})),
     );
-    if (err) {
+    if (utils.general.getEnvValue('OFFLINE_LOCATION_PATH')) {
+      process.exit();
+    } else if (err) {
       console.log(chalk.red(err.message));
       process.exit(config.exitcode ? 1 : 0);
     } else {

package/src/eyesStorybook.js

@@ -14,15 +14,13 @@ const browserLog = require('./browserLog');
 const getIframeUrl = require('./getIframeUrl');
 const createPagePool = require('./pagePool');
 const getClientAPI = require('../dist/getClientAPI');
-const {takeDomSnapshots} = require('@applitools/core');
-const {prepareTakeDomSnapshotsSettings} = require('./utils/prepare-settings');
+const {mergeConfigs} = require('./utils/merge-configs');
 const {Driver} = require('@applitools/driver');
 const spec = require('@applitools/spec-driver-puppeteer');
 const {refineErrorMessage} = require('./errMessages');
 const executeRenders = require('./executeRenders');
 const {extractEnvironment} = require('./extractEnvironment');
 const {makeCore} = require('@applitools/core');
-const {makeUFGClient} = require('@applitools/ufg-client');
 const makeGetStoriesWithConfig = require('./getStoriesWithConfig');
 
 const MAX_RETRIES = 10;
@@ -91,7 +89,6 @@ async function eyesStorybook({
     });
 
   const getStoriesWithConfig = makeGetStoriesWithConfig({config});
-  const client = await makeUFGClient({settings: {...account.ufgServer, ...account}, logger});
 
   const initPage = makeInitPage({
     iframeUrl,
@@ -103,35 +100,14 @@ async function eyesStorybook({
   });
   const pagePool = createPagePool({initPage, logger});
 
-  const doTakeDomSnapshots = async ({
-    page,
-    environments,
-    layoutBreakpoints,
-    waitBeforeCapture,
-    disableBrowserFetching,
-  }) => {
+  const doTakeDomSnapshots = async ({page, ...settings}) => {
     const driver = await new Driver({spec, driver: page, logger});
-    const skipResources = client.getCachedResourceUrls();
-    const result = await takeDomSnapshots({
+    return await core.takeSnapshots({
       logger,
       driver,
-      settings: prepareTakeDomSnapshotsSettings({
-        config,
-        options: {
-          layoutBreakpoints,
-          environments,
-          waitBeforeCapture,
-          skipResources,
-          disableBrowserFetching,
-        },
-      }),
-      provides: {
-        getChromeEmulationDevices: client.getChromeEmulationDevices,
-        getIOSDevices: client.getIOSDevices,
-      },
-      showLogs: config.showLogs,
+      settings: mergeConfigs({config, settings}),
+      account,
     });
-    return result;
   };
 
   logger.log('got script for processPage');

package/src/getStoryData.js

@@ -1,4 +1,6 @@
 'use strict';
+
+const {storyToCheckSettings} = require('./transformSettings');
 const {presult, ptimeoutWithError} = require('@applitools/functional-commons');
 const renderStoryWithClientAPI = require('../dist/renderStoryWithClientAPI');
 const runRunBeforeScript = require('../dist/runRunBeforeScript');
@@ -58,15 +60,13 @@ function makeGetStoryData({logger, takeDomSnapshots, reloadPagePerStory}) {
     logger.log(`running takeDomSnapshot(s) for story ${title}`);
     const domSnapshotsPromise = takeDomSnapshots({
       page,
-      environments: story.config.environments,
-      layoutBreakpoints: story.config.layoutBreakpoints,
+      ...storyToCheckSettings({story}),
       waitBeforeCapture: wait
         ? async () => {
             logger.log(`waiting before screenshot of ${title} ${wait}`);
             await waitFor(page, wait);
           }
         : undefined,
-      disableBrowserFetching: story.config.disableBrowserFetching,
     });
 
     const result = await ptimeoutWithError(
@@ -127,7 +127,7 @@ function makeGetStoryData({logger, takeDomSnapshots, reloadPagePerStory}) {
         ? ` The detected version of storybook is ${error.version}.`
         : '';
       throw new Error(
-        `Eyes could not render stories properly.${versionMsg} Contact support@applitools.com for troubleshooting.`,
+        `Eyes could not render stories properly.${versionMsg} Contact support@applitools.com for troubleshooting. Original error: ${error.message}`,
       );
     }
   };

package/src/processResults.js

@@ -135,8 +135,7 @@ function processResults({
   } else if (configExitCode === 'nodiffs') {
     exitCode = errors.length ? 1 : 0;
   } else {
-    exitCode =
-      !warnForUnsavedNewTests && passedOrNew.length && !errors.length && !unresolved.length ? 0 : 1;
+    exitCode = !warnForUnsavedNewTests && !errors.length && !unresolved.length ? 0 : 1;
   }
   return {
     outputStr,

package/src/renderStory.js

@@ -1,6 +1,6 @@
 'use strict';
-const {deprecationWarning} = require('./errMessages');
 const throat = require('throat');
+const {storyToCheckSettings, storyToOpenSettings} = require('./transformSettings');
 
 function makeRenderStory({
   logger,
@@ -14,117 +14,13 @@ function makeRenderStory({
 }) {
   const throttle = throat(storyDataGap);
   return function renderStory({story, snapshots, url}) {
-    const config = story.config;
-    const {name, kind, hasPlayFunction} = story;
     const baselineName = story.baselineName;
     const title = story.storyTitle;
-    const {
-      ignoreDisplacements,
-      ignoreRegions,
-      accessibilityRegions,
-      floatingRegions,
-      strictRegions,
-      contentRegions,
-      layoutRegions,
-      scriptHooks,
-      sizeMode,
-      target,
-      fully,
-      selector,
-      tag,
-      properties,
-      ignore,
-      accessibilityValidation,
-      sendDom,
-      visualGridOptions,
-      useDom,
-      enablePatterns,
-      environments,
-      keepBatchOpen,
-      batch,
-      branchName,
-      parentBranchName,
-      baselineBranchName,
-      compareWithParentBranch,
-      ignoreGitMergeBase,
-      baselineEnvName,
-      envName,
-      ignoreCaret,
-      matchLevel,
-      ignoreBaseline,
-      domMapping,
-    } = config;
-
-    if (sizeMode) {
-      console.log(deprecationWarning({deprecatedThing: "'sizeMode'", newThing: "'target'"}));
-    }
-
-    let ignoreRegionsBackCompat = ignoreRegions;
-    if (ignore && ignoreRegions === undefined) {
-      console.log(deprecationWarning({deprecatedThing: "'ignore'", newThing: "'ignoreRegions'"}));
-      ignoreRegionsBackCompat = ignore;
-    }
 
     logger.log(`running story ${title} with baseline ${baselineName}`);
 
-    const storyProperties = [
-      {name: 'Component name', value: kind},
-      {name: 'State', value: name},
-      ...(properties || []),
-    ];
-    if (hasPlayFunction) {
-      storyProperties.push({name: 'Storybook play function', value: 'true'});
-    }
-
-    const openParams = {
-      testName: baselineName,
-      displayName: title,
-      properties: storyProperties,
-      appName,
-      keepBatchOpen,
-      batch,
-      branchName,
-      parentBranchName,
-      baselineBranchName,
-      compareWithParentBranch,
-      ignoreGitBranching: ignoreGitMergeBase,
-      baselineEnvName,
-      environmentName: envName,
-      ignoreBaseline,
-      ...serverSettings,
-    };
-    const checkParams = {
-      url,
-      ignoreRegions: ignoreRegionsBackCompat,
-      floatingRegions: mapFloatingRegions(floatingRegions),
-      layoutRegions,
-      strictRegions,
-      contentRegions,
-      accessibilityRegions: mapAccessibilityRegions(accessibilityRegions),
-      environments,
-      hooks: scriptHooks,
-      sizeMode,
-      region: target === 'region' ? selector : undefined,
-      fully,
-      tag,
-      sendDom,
-      ufgOptions: visualGridOptions,
-      useDom,
-      enablePatterns,
-      ignoreDisplacements,
-      fully,
-      ignoreCaret,
-      matchLevel,
-      accessibilitySettings: accessibilityValidation
-        ? {
-            level: accessibilityValidation ? accessibilityValidation.level : undefined,
-            version: accessibilityValidation
-              ? accessibilityValidation.guidelinesVersion
-              : undefined,
-          }
-        : undefined,
-      domMapping,
-    };
+    const openParams = storyToOpenSettings({story, appName, serverSettings});
+    const checkParams = storyToCheckSettings({story, url});
 
     return timeItAsync(baselineName, async () => {
       const eyes = await openEyes({settings: openParams});
@@ -139,7 +35,7 @@ function makeRenderStory({
               const results = await eyes.getResults();
               resolve(results);
             } else {
-              await eyes.abort({settings: {environments}});
+              await eyes.abort({settings: {environments: checkParams.environments}});
               reject(
                 new Error(`Failed to get story data for ${openParams.testName}, test was aborted`),
               );
@@ -151,68 +47,6 @@ function makeRenderStory({
       });
     }).then(onDoneStory);
 
-    function mapAccessibilityRegions(accessabilityRegions) {
-      if (!accessabilityRegions) return;
-      if (!Array.isArray(accessabilityRegions)) accessabilityRegions = [accessabilityRegions];
-      return accessabilityRegions.map(region => {
-        const res = {
-          type: region.accessibilityType,
-        };
-        if (region.selector) {
-          res.region = region.selector;
-        } else if (region.region && isRegion(region.region)) {
-          res.region = {
-            y: region.region.top,
-            x: region.region.left,
-            width: region.region.width,
-            height: region.region.height,
-          };
-        } else {
-          return;
-        }
-        return res;
-      });
-    }
-
-    function mapFloatingRegions(floatingRegions) {
-      if (!floatingRegions) return;
-      if (!Array.isArray(floatingRegions)) floatingRegions = [floatingRegions];
-      return floatingRegions.map(region => {
-        let res = {
-          offset: {
-            bottom: region.maxDownOffset || 0,
-            left: region.maxLeftOffset || 0,
-            top: region.maxUpOffset || 0,
-            right: region.maxRightOffset || 0,
-          },
-        };
-        if (region.selector) {
-          res.region = region.selector;
-        } else if (region.region && isRegion(region.region)) {
-          res.region = {
-            y: region.region.top,
-            x: region.region.left,
-            width: region.region.width,
-            height: region.region.height,
-          };
-        } else {
-          return;
-        }
-        return res;
-      });
-    }
-
-    function isRegion(region) {
-      if (
-        region.hasOwnProperty('top') &&
-        region.hasOwnProperty('left') &&
-        region.hasOwnProperty('width') &&
-        region.hasOwnProperty('height')
-      ) {
-        return true;
-      }
-    }
-
     function onDoneStory(results) {
       logger.log('finished story', baselineName, 'in', performance[baselineName]);
       return results;

package/src/transformSettings.js

@@ -0,0 +1,186 @@
+const {deprecationWarning} = require('./errMessages');
+
+function storyToOpenSettings({story, appName, serverSettings}) {
+  const {name, kind, hasPlayFunction, config} = story;
+
+  const {
+    keepBatchOpen,
+    batch,
+    branchName,
+    parentBranchName,
+    baselineBranchName,
+    compareWithParentBranch,
+    ignoreGitMergeBase,
+    baselineEnvName,
+    envName,
+    ignoreBaseline,
+    properties,
+  } = config;
+
+  const storyProperties = [
+    {name: 'Component name', value: kind},
+    {name: 'State', value: name},
+    ...(properties || []),
+  ];
+  if (hasPlayFunction) {
+    storyProperties.push({name: 'Storybook play function', value: 'true'});
+  }
+
+  return {
+    testName: story.baselineName,
+    displayName: story.storyTitle,
+    properties: storyProperties,
+    appName,
+    keepBatchOpen,
+    batch,
+    branchName,
+    parentBranchName,
+    baselineBranchName,
+    compareWithParentBranch,
+    ignoreGitBranching: ignoreGitMergeBase,
+    baselineEnvName,
+    environmentName: envName,
+    ignoreBaseline,
+    ...serverSettings,
+  };
+}
+
+function storyToCheckSettings({story, url}) {
+  const {
+    ignoreDisplacements,
+    ignoreRegions,
+    accessibilityRegions,
+    floatingRegions,
+    strictRegions,
+    contentRegions,
+    layoutRegions,
+    scriptHooks,
+    sizeMode,
+    target,
+    fully,
+    selector,
+    tag,
+    ignore,
+    accessibilityValidation,
+    sendDom,
+    visualGridOptions,
+    useDom,
+    enablePatterns,
+    environments,
+    ignoreCaret,
+    matchLevel,
+    domMapping,
+    layoutBreakpoints,
+    disableBrowserFetching,
+  } = story.config;
+
+  if (sizeMode) {
+    console.log(deprecationWarning({deprecatedThing: "'sizeMode'", newThing: "'target'"}));
+  }
+
+  let ignoreRegionsBackCompat = ignoreRegions;
+  if (ignore && ignoreRegions === undefined) {
+    console.log(deprecationWarning({deprecatedThing: "'ignore'", newThing: "'ignoreRegions'"}));
+    ignoreRegionsBackCompat = ignore;
+  }
+
+  return {
+    url,
+    ignoreRegions: ignoreRegionsBackCompat,
+    floatingRegions: mapFloatingRegions(floatingRegions),
+    layoutRegions,
+    strictRegions,
+    contentRegions,
+    accessibilityRegions: mapAccessibilityRegions(accessibilityRegions),
+    environments,
+    hooks: scriptHooks,
+    sizeMode,
+    region: target === 'region' ? selector : undefined,
+    fully,
+    tag,
+    sendDom,
+    ufgOptions: visualGridOptions,
+    useDom,
+    enablePatterns,
+    ignoreDisplacements,
+    fully,
+    ignoreCaret,
+    matchLevel,
+    accessibilitySettings: accessibilityValidation
+      ? {
+          level: accessibilityValidation ? accessibilityValidation.level : undefined,
+          version: accessibilityValidation ? accessibilityValidation.guidelinesVersion : undefined,
+        }
+      : undefined,
+    domMapping,
+    layoutBreakpoints,
+    disableBrowserFetching,
+  };
+}
+
+function mapFloatingRegions(floatingRegions) {
+  if (!floatingRegions) return;
+  if (!Array.isArray(floatingRegions)) floatingRegions = [floatingRegions];
+  return floatingRegions.map(region => {
+    let res = {
+      offset: {
+        bottom: region.maxDownOffset || 0,
+        left: region.maxLeftOffset || 0,
+        top: region.maxUpOffset || 0,
+        right: region.maxRightOffset || 0,
+      },
+    };
+    if (region.selector) {
+      res.region = region.selector;
+    } else if (region.region && isRegion(region.region)) {
+      res.region = {
+        y: region.region.top,
+        x: region.region.left,
+        width: region.region.width,
+        height: region.region.height,
+      };
+    } else {
+      return;
+    }
+    return res;
+  });
+}
+
+function mapAccessibilityRegions(accessabilityRegions) {
+  if (!accessabilityRegions) return;
+  if (!Array.isArray(accessabilityRegions)) accessabilityRegions = [accessabilityRegions];
+  return accessabilityRegions.map(region => {
+    const res = {
+      type: region.accessibilityType,
+    };
+    if (region.selector) {
+      res.region = region.selector;
+    } else if (region.region && isRegion(region.region)) {
+      res.region = {
+        y: region.region.top,
+        x: region.region.left,
+        width: region.region.width,
+        height: region.region.height,
+      };
+    } else {
+      return;
+    }
+    return res;
+  });
+}
+
+function isRegion(region) {
+  if (
+    region.hasOwnProperty('top') &&
+    region.hasOwnProperty('left') &&
+    region.hasOwnProperty('width') &&
+    region.hasOwnProperty('height')
+  ) {
+    return true;
+  }
+}
+
+module.exports = {
+  storyToOpenSettings,
+  storyToCheckSettings,
+};

package/src/utils/merge-configs.js

@@ -0,0 +1,17 @@
+function mergeConfigs({config, settings}) {
+  return {
+    ...settings,
+    layoutBreakpoints:
+      settings.layoutBreakpoints !== undefined
+        ? settings.layoutBreakpoints
+        : config.layoutBreakpoints,
+    disableBrowserFetching:
+      settings.disableBrowserFetching !== undefined
+        ? settings.disableBrowserFetching
+        : config.disableBrowserFetching,
+  };
+}
+
+module.exports = {
+  mergeConfigs,
+};

package/src/utils/prepare-settings.js

@@ -1,14 +0,0 @@
-function prepareTakeDomSnapshotsSettings({config, options}) {
-  let result = {...options};
-  result.layoutBreakpoints =
-    result.layoutBreakpoints !== undefined ? result.layoutBreakpoints : config.layoutBreakpoints;
-  result.disableBrowserFetching =
-    result.disableBrowserFetching !== undefined
-      ? result.disableBrowserFetching
-      : config.disableBrowserFetching;
-  return result;
-}
-
-module.exports = {
-  prepareTakeDomSnapshotsSettings,
-};