@applitools/eyes-storybook 3.37.1 → 3.37.3

package/CHANGELOG.md

@@ -4,6 +4,25 @@
 
 
 
+## [3.37.3](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-storybook@3.37.2...js/eyes-storybook@3.37.3) (2023-07-21)
+
+
+### Code Refactoring
+
+* ufg client ([#1780](https://github.com/applitools/eyes.sdk.javascript1/issues/1780)) ([d60cf16](https://github.com/applitools/eyes.sdk.javascript1/commit/d60cf1616741a96b152a1548760bb98116e5c3f9))
+
+
+### Dependencies
+
+
+
+## [3.37.2](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-storybook@3.37.1...js/eyes-storybook@3.37.2) (2023-07-18)
+
+
+### Performance Improvements
+
+* additional runtime improvements ([8a33a83](https://github.com/applitools/eyes.sdk.javascript1/commit/8a33a83d4911bdd3bebff646c983d5a2de512763))
+
 ## [3.37.1](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-storybook@3.37.0...js/eyes-storybook@3.37.1) (2023-07-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-storybook",
-  "version": "3.37.1",
+  "version": "3.37.3",
   "description": "",
   "keywords": [
     "applitools",
@@ -28,7 +28,7 @@
     "lint": "run --top-level eslint '**/*.js'",
     "build": "rollup -c rollup.config.js",
     "build:heavy": "node scripts/bitmap.js",
-    "test": "yarn build && yarn test:mocha && yarn lint",
+    "test": "yarn build && yarn test:mocha",
     "test:mocha": "run --top-level mocha --no-timeouts --trace-warnings 'test/{unit,it,e2e}/*.test.js'",
     "test:unit": "run --top-level mocha --no-timeouts --trace-warnings 'test/unit/*.test.js'",
     "test:it": "run --top-level mocha --no-timeouts --trace-warnings 'test/it/*.test.js'",
@@ -57,27 +57,27 @@
     "postinstall": "node src/postinstall"
   },
   "dependencies": {
-    "@applitools/core": "^3.6.2",
-    "@applitools/driver": "^1.13.1",
+    "@applitools/core": "3.6.3",
+    "@applitools/driver": "1.13.2",
     "@applitools/functional-commons": "1.6.0",
-    "@applitools/logger": "^2.0.5",
+    "@applitools/logger": "2.0.6",
     "@applitools/monitoring-commons": "1.0.19",
-    "@applitools/spec-driver-puppeteer": "^1.1.69",
-    "@applitools/ufg-client": "^1.5.0",
-    "@applitools/utils": "^1.5.0",
+    "@applitools/spec-driver-puppeteer": "1.1.70",
+    "@applitools/ufg-client": "1.5.1",
+    "@applitools/utils": "",
     "boxen": "4.2.0",
     "chalk": "3.0.0",
     "detect-port": "1.3.0",
     "lodash.flatten": "4.4.0",
     "lodash.pick": "4.4.0",
     "ora": "3.4.0",
-    "puppeteer": "19.8.0",
+    "puppeteer": "20.8.3",
     "strip-ansi": "6.0.0",
-    "throat": "6.0.1",
+    "throat": "6.0.2",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@applitools/bongo": "^5.0.4",
+    "@applitools/bongo": "^5.1.4",
     "@applitools/sdk-shared": "0.9.15",
     "@applitools/snaptdout": "^1.0.1",
     "@applitools/test-server": "^1.2.2",
@@ -99,7 +99,7 @@
     "ua-parser-js": "^0.7.21"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=16.16.0"
   },
   "publishConfig": {
     "access": "public"

package/src/errMessages.js

@@ -34,7 +34,8 @@ ${chalk.green(
 `;
 
 function refineErrorMessage({prefix, error}) {
-  return `${prefix} ${error.message.replace('Evaluation failed: ', '')}`;
+  const message = error && error.message ? error.message : error;
+  return `${prefix} ${message.replace('Evaluation failed: ', '')}`;
 }
 
 function deprecationWarning({deprecatedThing, newThing, isDead}) {

package/src/eyesStorybook.js

@@ -47,14 +47,7 @@ async function eyesStorybook({
     : Number(process.env.APPLITOOLS_CONCURRENT_TABS);
   logger.log(`Running with ${CONCURRENT_TABS} concurrent tabs`);
 
-  const {
-    storybookUrl,
-    readStoriesTimeout,
-    reloadPagePerStory,
-    proxy,
-    testConcurrency,
-    useDnsCache,
-  } = config;
+  const {storybookUrl, readStoriesTimeout, reloadPagePerStory} = config;
 
   let iframeUrl;
   try {
@@ -75,40 +68,33 @@ async function eyesStorybook({
   const core = await makeCore({spec, agentId, logger});
   const manager = await core.makeManager({
     type: 'ufg',
-    settings: {
-      concurrency: testConcurrency,
-    },
-    logger,
+    settings: {concurrency: config.testConcurrency},
   });
 
-  const settings = {
-    proxy: config.proxy,
-    serverUrl: config.serverUrl,
-    apiKey: config.apiKey,
-    agentId,
-    useDnsCache,
-  };
-  const [error, account] = await presult(core.getAccountInfo({settings, logger}));
+  const account = await core
+    .getAccountInfo({
+      settings: {
+        eyesServerUrl: config.eyesServerUrl,
+        apiKey: config.apiKey,
+        agentId,
+        proxy: config.proxy,
+        useDnsCache: config.useDnsCache,
+      },
+    })
+    .catch(async error => {
+      if (error && error.message && error.message.includes('Unauthorized(401)')) {
+        const failMsg = 'Incorrect API Key';
+        logger.log(failMsg);
+        await browser.close();
+        clearTimeout(memoryTimeout);
+        throw new Error(failMsg);
+      } else {
+        throw error;
+      }
+    });
 
   const getStoriesWithConfig = makeGetStoriesWithConfig({config});
-
-  if (error && error.message && error.message.includes('Unauthorized(401)')) {
-    const failMsg = 'Incorrect API Key';
-    logger.log(failMsg);
-    await browser.close();
-    clearTimeout(memoryTimeout);
-    throw new Error(failMsg);
-  }
-  const client = await makeUFGClient({
-    config: {
-      ...account.ufgServer,
-      ...account,
-      proxy,
-      concurrency: testConcurrency,
-      useDnsCache,
-    },
-    logger,
-  });
+  const client = await makeUFGClient({settings: {...account.ufgServer, ...account}, logger});
 
   const initPage = makeInitPage({
     iframeUrl,
@@ -191,11 +177,6 @@ async function eyesStorybook({
       logger,
       takeDomSnapshots: doTakeDomSnapshots,
     });
-    const closeSettings = {
-      ...settings,
-      updateBaselineIfNew: config.saveNewTests,
-      updateBaselineIfDifferent: config.saveFailedTests,
-    };
     const renderStory = makeRenderStory({
       logger: logger.extend({label: 'renderStory'}),
       openEyes: manager.openEyes,
@@ -203,10 +184,13 @@ async function eyesStorybook({
       timeItAsync,
       reloadPagePerStory,
       storyDataGap: config.storyDataGap,
-      concurrency: testConcurrency,
+      concurrency: config.testConcurrency,
       appName: config.appName,
-      closeSettings,
-      serverSettings: settings,
+      closeSettings: {
+        updateBaselineIfNew: config.saveNewTests,
+        updateBaselineIfDifferent: config.saveFailedTests,
+      },
+      serverSettings: account.eyesServer,
     });
 
     const renderStories = makeRenderStories({

package/src/generateConfig.js

@@ -50,11 +50,7 @@ function generateConfig({argv = {}, defaultConfig = {}, externalConfigParams = [
     ? result.concurrency * 5
     : 5;
 
-  result.serverUrl = result.serverUrl
-    ? result.serverUrl
-    : utils.general.getEnvValue('SERVER_URL')
-    ? utils.general.getEnvValue('SERVER_URL')
-    : 'https://eyesapi.applitools.com';
+  result.eyesServerUrl = result.serverUrl;
 
   result.viewportSize = result.viewportSize ? result.viewportSize : {width: 1024, height: 600};
 

package/src/renderStory.js

@@ -125,17 +125,18 @@ function makeRenderStory({
     };
 
     return timeItAsync(baselineName, async () => {
-      const {checkAndClose} = await openEyes({settings: openParams});
+      const eyes = await openEyes({settings: openParams});
       return new Promise((resolve, reject) => {
         throttle(async () => {
           try {
-            const checkResults = await checkAndClose({
-              settings: {...checkParams, ...closeSettings, throwEx: false},
+            await eyes.checkAndClose({
               target: snapshots,
+              settings: {...checkParams, ...closeSettings},
             });
-            resolve(checkResults);
-          } catch (ex) {
-            reject(ex);
+            const results = await eyes.getResults();
+            resolve(results);
+          } catch (err) {
+            reject(err);
           }
         });
       });