@applitools/eyes-storybook 3.49.0 → 3.50.2

package/CHANGELOG.md

@@ -1,5 +1,105 @@
 # Changelog
 
+## [3.50.2](https://github.com/Applitools-Dev/sdk/compare/js/eyes-storybook@3.50.1...js/eyes-storybook@3.50.2) (2024-05-01)
+
+
+### Dependencies
+
+* @applitools/dom-snapshot bumped to 4.11.1
+  #### Bug Fixes
+
+  * support for using unicode and just using escape with numbers ([#2241](https://github.com/Applitools-Dev/sdk/issues/2241)) ([c59f47f](https://github.com/Applitools-Dev/sdk/commit/c59f47f73585d7f308c43c9ee1845e097a2111a3))
+* @applitools/driver bumped to 1.17.2
+  #### Bug Fixes
+
+  * cache nml client per driver ([#2336](https://github.com/Applitools-Dev/sdk/issues/2336)) ([02c09a5](https://github.com/Applitools-Dev/sdk/commit/02c09a53eb6ca6340c93365908f4c485ab389c21))
+* @applitools/core-base bumped to 1.13.0
+  #### Features
+
+  * `matchTimeout` ([#2309](https://github.com/Applitools-Dev/sdk/issues/2309)) ([626529e](https://github.com/Applitools-Dev/sdk/commit/626529e839fd2a96ac0de98332f42873c0f387a4))
+* @applitools/spec-driver-webdriver bumped to 1.1.7
+
+* @applitools/spec-driver-selenium bumped to 1.5.78
+
+* @applitools/spec-driver-puppeteer bumped to 1.4.7
+
+* @applitools/screenshoter bumped to 3.8.31
+
+* @applitools/nml-client bumped to 1.8.4
+
+* @applitools/ec-client bumped to 1.8.4
+
+* @applitools/core bumped to 4.14.0
+  #### Features
+
+  * `matchTimeout` ([#2309](https://github.com/Applitools-Dev/sdk/issues/2309)) ([626529e](https://github.com/Applitools-Dev/sdk/commit/626529e839fd2a96ac0de98332f42873c0f387a4))
+
+
+  #### Bug Fixes
+
+  * cache nml client per driver ([#2336](https://github.com/Applitools-Dev/sdk/issues/2336)) ([02c09a5](https://github.com/Applitools-Dev/sdk/commit/02c09a53eb6ca6340c93365908f4c485ab389c21))
+  * support for using unicode and just using escape with numbers ([#2241](https://github.com/Applitools-Dev/sdk/issues/2241)) ([c59f47f](https://github.com/Applitools-Dev/sdk/commit/c59f47f73585d7f308c43c9ee1845e097a2111a3))
+
+
+
+
+## [3.50.1](https://github.com/Applitools-Dev/sdk/compare/js/eyes-storybook@3.50.0...js/eyes-storybook@3.50.1) (2024-04-22)
+
+
+### Dependencies
+
+* @applitools/dom-snapshot bumped to 4.11.0
+  #### Features
+
+  * extract url from embed element ([#2285](https://github.com/Applitools-Dev/sdk/issues/2285)) ([3c4da0d](https://github.com/Applitools-Dev/sdk/commit/3c4da0dbd061cb2fc4313392196012ffd4601d0e))
+* @applitools/driver bumped to 1.17.0
+  #### Features
+
+  * report batchId and batchUrl to kobiton ([#2329](https://github.com/Applitools-Dev/sdk/issues/2329)) ([5be4356](https://github.com/Applitools-Dev/sdk/commit/5be4356d7f3cd96b70491325d4a788202c06720a))
+* @applitools/core-base bumped to 1.12.0
+  #### Features
+
+  * ability to override baseline parameters per environment ([#2332](https://github.com/Applitools-Dev/sdk/issues/2332)) ([43b8b18](https://github.com/Applitools-Dev/sdk/commit/43b8b189fb3c9dd19aa3be372e8fcc0fe8edfa50))
+* @applitools/spec-driver-webdriver bumped to 1.1.5
+
+* @applitools/spec-driver-selenium bumped to 1.5.76
+
+* @applitools/spec-driver-puppeteer bumped to 1.4.5
+
+* @applitools/screenshoter bumped to 3.8.29
+
+* @applitools/nml-client bumped to 1.8.2
+
+* @applitools/ec-client bumped to 1.8.2
+
+* @applitools/core bumped to 4.13.0
+  #### Features
+
+  * ability to override baseline parameters per environment ([#2332](https://github.com/Applitools-Dev/sdk/issues/2332)) ([43b8b18](https://github.com/Applitools-Dev/sdk/commit/43b8b189fb3c9dd19aa3be372e8fcc0fe8edfa50))
+  * report batchId and batchUrl to kobiton ([#2329](https://github.com/Applitools-Dev/sdk/issues/2329)) ([5be4356](https://github.com/Applitools-Dev/sdk/commit/5be4356d7f3cd96b70491325d4a788202c06720a))
+
+
+
+
+## [3.50.0](https://github.com/Applitools-Dev/sdk/compare/js/eyes-storybook-v3.49.1...js/eyes-storybook@3.50.0) (2024-04-17)
+
+
+### Features
+
+* added notification about outdated sdk version ([#2012](https://github.com/Applitools-Dev/sdk/issues/2012)) ([0f0a646](https://github.com/Applitools-Dev/sdk/commit/0f0a6462a56e7c97f9a22173c3b63af91e220adb))
+
+
+### Bug Fixes
+
+* lodash.pick vulnerability ([#2169](https://github.com/Applitools-Dev/sdk/issues/2169)) ([7354088](https://github.com/Applitools-Dev/sdk/commit/735408874e4917f5e9b086e1796f84101fd1f304))
+* storybook upgrade puppeteer ([#2260](https://github.com/Applitools-Dev/sdk/issues/2260)) ([cb419a5](https://github.com/Applitools-Dev/sdk/commit/cb419a541cdfefaf7ab01727647ee40a002cb78a))
+* support storybook 8 ([#2293](https://github.com/Applitools-Dev/sdk/issues/2293)) ([3611510](https://github.com/Applitools-Dev/sdk/commit/3611510cb7fa56f6930f0a66f9bab41a3acf0f7a))
+
+
+### Code Refactoring
+
+* fix safe selector generation ([#2072](https://github.com/Applitools-Dev/sdk/issues/2072)) ([373f11b](https://github.com/Applitools-Dev/sdk/commit/373f11b0dfea6eab417eb7077e0cfec79877dc1b))
+
 ## [3.49.0](https://github.com/Applitools-Dev/sdk/compare/js/eyes-storybook-v3.48.2...js/eyes-storybook@3.49.0) (2024-04-15)
 
 

package/dist/getClientAPI.js

@@ -8,6 +8,7 @@ function __getClientAPI(...args) {
     v5: 'v5',
     v5_2: 'v5_2',
     v6_4: 'v6_4',
+    v8: 'v8',
   };
 
   function getClientAPI() {
@@ -20,7 +21,9 @@ function __getClientAPI(...args) {
     function getStorybookVersion() {
       const addonsForV4 = frameWindow.__STORYBOOK_ADDONS;
 
-      if (frameWindow.__STORYBOOK_PREVIEW__) {
+      if (!clientAPI && frameWindow.__STORYBOOK_PREVIEW__) {
+        return API_VERSIONS.v8;
+      } else if (frameWindow.__STORYBOOK_PREVIEW__) {
         return API_VERSIONS.v6_4;
       } else if (frameWindow.__STORYBOOK_STORY_STORE__) {
         return API_VERSIONS.v5_2;
@@ -39,17 +42,18 @@ function __getClientAPI(...args) {
       }
     }
     function onStoryRendered(callback) {
-      if (addons && addons.channel && addons.channel.once) {
-        addons.channel.once('storyRendered', () => {
+      const channel = addons?.getChannel?.();
+      if (channel) {
+        channel.once('storyRendered', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('playFunctionThrewException', () => {
+        channel.once('playFunctionThrewException', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('storyErrored', () => {
+        channel.once('storyErrored', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('storyThrewException', () => {
+        channel.once('storyThrewException', () => {
           setTimeout(callback, 0);
         });
       } else {
@@ -134,6 +138,20 @@ function __getClientAPI(...args) {
             };
             break;
           }
+
+          case API_VERSIONS.v8: {
+            api = {
+              getStories: async () => {
+                await frameWindow.__STORYBOOK_PREVIEW__.ready();
+                return Object.values(await frameWindow.__STORYBOOK_PREVIEW__.extract());
+              },
+              selectStory: async (_i, id) => {
+                await frameWindow.__STORYBOOK_PREVIEW__.ready();
+                frameWindow.__STORYBOOK_ADDONS_PREVIEW.channel.emit('setCurrentStory', {storyId: id});
+              },
+              onStoryRendered,
+            };
+          }
         }
 
         return {version, ...api};

package/dist/getStories.js

@@ -8,6 +8,7 @@ function __getStories(...args) {
     v5: 'v5',
     v5_2: 'v5_2',
     v6_4: 'v6_4',
+    v8: 'v8',
   };
 
   function getClientAPI() {
@@ -20,7 +21,9 @@ function __getStories(...args) {
     function getStorybookVersion() {
       const addonsForV4 = frameWindow.__STORYBOOK_ADDONS;
 
-      if (frameWindow.__STORYBOOK_PREVIEW__) {
+      if (!clientAPI && frameWindow.__STORYBOOK_PREVIEW__) {
+        return API_VERSIONS.v8;
+      } else if (frameWindow.__STORYBOOK_PREVIEW__) {
         return API_VERSIONS.v6_4;
       } else if (frameWindow.__STORYBOOK_STORY_STORE__) {
         return API_VERSIONS.v5_2;
@@ -39,17 +42,18 @@ function __getStories(...args) {
       }
     }
     function onStoryRendered(callback) {
-      if (addons && addons.channel && addons.channel.once) {
-        addons.channel.once('storyRendered', () => {
+      const channel = addons?.getChannel?.();
+      if (channel) {
+        channel.once('storyRendered', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('playFunctionThrewException', () => {
+        channel.once('playFunctionThrewException', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('storyErrored', () => {
+        channel.once('storyErrored', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('storyThrewException', () => {
+        channel.once('storyThrewException', () => {
           setTimeout(callback, 0);
         });
       } else {
@@ -134,6 +138,20 @@ function __getStories(...args) {
             };
             break;
           }
+
+          case API_VERSIONS.v8: {
+            api = {
+              getStories: async () => {
+                await frameWindow.__STORYBOOK_PREVIEW__.ready();
+                return Object.values(await frameWindow.__STORYBOOK_PREVIEW__.extract());
+              },
+              selectStory: async (_i, id) => {
+                await frameWindow.__STORYBOOK_PREVIEW__.ready();
+                frameWindow.__STORYBOOK_ADDONS_PREVIEW.channel.emit('setCurrentStory', {storyId: id});
+              },
+              onStoryRendered,
+            };
+          }
         }
 
         return {version, ...api};

package/dist/renderStoryWithClientAPI.js

@@ -8,6 +8,7 @@ function __renderStoryWithClientAPI(...args) {
     v5: 'v5',
     v5_2: 'v5_2',
     v6_4: 'v6_4',
+    v8: 'v8',
   };
 
   function getClientAPI() {
@@ -20,7 +21,9 @@ function __renderStoryWithClientAPI(...args) {
     function getStorybookVersion() {
       const addonsForV4 = frameWindow.__STORYBOOK_ADDONS;
 
-      if (frameWindow.__STORYBOOK_PREVIEW__) {
+      if (!clientAPI && frameWindow.__STORYBOOK_PREVIEW__) {
+        return API_VERSIONS.v8;
+      } else if (frameWindow.__STORYBOOK_PREVIEW__) {
         return API_VERSIONS.v6_4;
       } else if (frameWindow.__STORYBOOK_STORY_STORE__) {
         return API_VERSIONS.v5_2;
@@ -39,17 +42,18 @@ function __renderStoryWithClientAPI(...args) {
       }
     }
     function onStoryRendered(callback) {
-      if (addons && addons.channel && addons.channel.once) {
-        addons.channel.once('storyRendered', () => {
+      const channel = addons?.getChannel?.();
+      if (channel) {
+        channel.once('storyRendered', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('playFunctionThrewException', () => {
+        channel.once('playFunctionThrewException', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('storyErrored', () => {
+        channel.once('storyErrored', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('storyThrewException', () => {
+        channel.once('storyThrewException', () => {
           setTimeout(callback, 0);
         });
       } else {
@@ -134,6 +138,20 @@ function __renderStoryWithClientAPI(...args) {
             };
             break;
           }
+
+          case API_VERSIONS.v8: {
+            api = {
+              getStories: async () => {
+                await frameWindow.__STORYBOOK_PREVIEW__.ready();
+                return Object.values(await frameWindow.__STORYBOOK_PREVIEW__.extract());
+              },
+              selectStory: async (_i, id) => {
+                await frameWindow.__STORYBOOK_PREVIEW__.ready();
+                frameWindow.__STORYBOOK_ADDONS_PREVIEW.channel.emit('setCurrentStory', {storyId: id});
+              },
+              onStoryRendered,
+            };
+          }
         }
 
         return {version, ...api};
@@ -166,11 +184,11 @@ function __renderStoryWithClientAPI(...args) {
   var getClientAPI_1 = getClientAPI;
 
   function renderStoryWithClientAPI(index, id) {
-    return new Promise(resolve => {
+    return new Promise(async resolve => {
       let api;
       try {
         api = getClientAPI_1();
-        api.selectStory(index, id);
+        await api.selectStory(index, id);
         api.onStoryRendered(resolve);
       } catch (ex) {
         resolve({message: ex.message, version: api ? api.version : undefined});

package/dist/runRunAfterScript.js

@@ -8,6 +8,7 @@ function __runRunAfterScript(...args) {
     v5: 'v5',
     v5_2: 'v5_2',
     v6_4: 'v6_4',
+    v8: 'v8',
   };
 
   function getClientAPI() {
@@ -20,7 +21,9 @@ function __runRunAfterScript(...args) {
     function getStorybookVersion() {
       const addonsForV4 = frameWindow.__STORYBOOK_ADDONS;
 
-      if (frameWindow.__STORYBOOK_PREVIEW__) {
+      if (!clientAPI && frameWindow.__STORYBOOK_PREVIEW__) {
+        return API_VERSIONS.v8;
+      } else if (frameWindow.__STORYBOOK_PREVIEW__) {
         return API_VERSIONS.v6_4;
       } else if (frameWindow.__STORYBOOK_STORY_STORE__) {
         return API_VERSIONS.v5_2;
@@ -39,17 +42,18 @@ function __runRunAfterScript(...args) {
       }
     }
     function onStoryRendered(callback) {
-      if (addons && addons.channel && addons.channel.once) {
-        addons.channel.once('storyRendered', () => {
+      const channel = addons?.getChannel?.();
+      if (channel) {
+        channel.once('storyRendered', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('playFunctionThrewException', () => {
+        channel.once('playFunctionThrewException', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('storyErrored', () => {
+        channel.once('storyErrored', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('storyThrewException', () => {
+        channel.once('storyThrewException', () => {
           setTimeout(callback, 0);
         });
       } else {
@@ -134,6 +138,20 @@ function __runRunAfterScript(...args) {
             };
             break;
           }
+
+          case API_VERSIONS.v8: {
+            api = {
+              getStories: async () => {
+                await frameWindow.__STORYBOOK_PREVIEW__.ready();
+                return Object.values(await frameWindow.__STORYBOOK_PREVIEW__.extract());
+              },
+              selectStory: async (_i, id) => {
+                await frameWindow.__STORYBOOK_PREVIEW__.ready();
+                frameWindow.__STORYBOOK_ADDONS_PREVIEW.channel.emit('setCurrentStory', {storyId: id});
+              },
+              onStoryRendered,
+            };
+          }
         }
 
         return {version, ...api};

package/dist/runRunBeforeScript.js

@@ -8,6 +8,7 @@ function __runRunBeforeScript(...args) {
     v5: 'v5',
     v5_2: 'v5_2',
     v6_4: 'v6_4',
+    v8: 'v8',
   };
 
   function getClientAPI() {
@@ -20,7 +21,9 @@ function __runRunBeforeScript(...args) {
     function getStorybookVersion() {
       const addonsForV4 = frameWindow.__STORYBOOK_ADDONS;
 
-      if (frameWindow.__STORYBOOK_PREVIEW__) {
+      if (!clientAPI && frameWindow.__STORYBOOK_PREVIEW__) {
+        return API_VERSIONS.v8;
+      } else if (frameWindow.__STORYBOOK_PREVIEW__) {
         return API_VERSIONS.v6_4;
       } else if (frameWindow.__STORYBOOK_STORY_STORE__) {
         return API_VERSIONS.v5_2;
@@ -39,17 +42,18 @@ function __runRunBeforeScript(...args) {
       }
     }
     function onStoryRendered(callback) {
-      if (addons && addons.channel && addons.channel.once) {
-        addons.channel.once('storyRendered', () => {
+      const channel = addons?.getChannel?.();
+      if (channel) {
+        channel.once('storyRendered', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('playFunctionThrewException', () => {
+        channel.once('playFunctionThrewException', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('storyErrored', () => {
+        channel.once('storyErrored', () => {
           setTimeout(callback, 0);
         });
-        addons.channel.once('storyThrewException', () => {
+        channel.once('storyThrewException', () => {
           setTimeout(callback, 0);
         });
       } else {
@@ -134,6 +138,20 @@ function __runRunBeforeScript(...args) {
             };
             break;
           }
+
+          case API_VERSIONS.v8: {
+            api = {
+              getStories: async () => {
+                await frameWindow.__STORYBOOK_PREVIEW__.ready();
+                return Object.values(await frameWindow.__STORYBOOK_PREVIEW__.extract());
+              },
+              selectStory: async (_i, id) => {
+                await frameWindow.__STORYBOOK_PREVIEW__.ready();
+                frameWindow.__STORYBOOK_ADDONS_PREVIEW.channel.emit('setCurrentStory', {storyId: id});
+              },
+              onStoryRendered,
+            };
+          }
         }
 
         return {version, ...api};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-storybook",
-  "version": "3.49.0",
+  "version": "3.50.2",
   "description": "",
   "keywords": [
     "applitools",
@@ -54,20 +54,21 @@
     "up:framework": "cd test/fixtures/storybook-versions/${APPLITOOLS_FRAMEWORK_VERSION} && npm ci"
   },
   "dependencies": {
-    "@applitools/core": "4.12.2",
-    "@applitools/driver": "1.16.6",
+    "@applitools/core": "4.14.0",
+    "@applitools/driver": "1.17.2",
     "@applitools/functional-commons": "1.6.0",
-    "@applitools/logger": "2.0.15",
+    "@applitools/logger": "2.0.16",
     "@applitools/monitoring-commons": "1.0.19",
-    "@applitools/spec-driver-puppeteer": "1.4.4",
-    "@applitools/ufg-client": "1.11.1",
-    "@applitools/utils": "1.7.1",
+    "@applitools/spec-driver-puppeteer": "1.4.7",
+    "@applitools/ufg-client": "1.11.2",
+    "@applitools/utils": "1.7.2",
     "boxen": "4.2.0",
     "chalk": "3.0.0",
     "detect-port": "1.3.0",
     "lodash": "4.17.21",
     "ora": "3.4.0",
     "puppeteer": "21.11.0",
+    "semver": "7.5.4",
     "strip-ansi": "6.0.0",
     "throat": "6.0.2",
     "yargs": "17.7.2"

package/src/browser/.eslintrc.json

@@ -6,7 +6,7 @@
     "browser": true
   },
   "parserOptions": {
-    "ecmaVersion": 2018
+    "ecmaVersion": 2022
   },
   "plugins": [
     "prettier"

package/src/browser/getClientAPI.js

@@ -5,6 +5,7 @@ const API_VERSIONS = {
   v5: 'v5',
   v5_2: 'v5_2',
   v6_4: 'v6_4',
+  v8: 'v8',
 };
 
 function getClientAPI() {
@@ -17,7 +18,9 @@ function getClientAPI() {
   function getStorybookVersion() {
     const addonsForV4 = frameWindow.__STORYBOOK_ADDONS;
 
-    if (frameWindow.__STORYBOOK_PREVIEW__) {
+    if (!clientAPI && frameWindow.__STORYBOOK_PREVIEW__) {
+      return API_VERSIONS.v8;
+    } else if (frameWindow.__STORYBOOK_PREVIEW__) {
       return API_VERSIONS.v6_4;
     } else if (frameWindow.__STORYBOOK_STORY_STORE__) {
       return API_VERSIONS.v5_2;
@@ -36,17 +39,18 @@ function getClientAPI() {
     }
   }
   function onStoryRendered(callback) {
-    if (addons && addons.channel && addons.channel.once) {
-      addons.channel.once('storyRendered', () => {
+    const channel = addons?.getChannel?.();
+    if (channel) {
+      channel.once('storyRendered', () => {
         setTimeout(callback, 0);
       });
-      addons.channel.once('playFunctionThrewException', () => {
+      channel.once('playFunctionThrewException', () => {
         setTimeout(callback, 0);
       });
-      addons.channel.once('storyErrored', () => {
+      channel.once('storyErrored', () => {
         setTimeout(callback, 0);
       });
-      addons.channel.once('storyThrewException', () => {
+      channel.once('storyThrewException', () => {
         setTimeout(callback, 0);
       });
     } else {
@@ -131,6 +135,20 @@ function getClientAPI() {
           };
           break;
         }
+
+        case API_VERSIONS.v8: {
+          api = {
+            getStories: async () => {
+              await frameWindow.__STORYBOOK_PREVIEW__.ready();
+              return Object.values(await frameWindow.__STORYBOOK_PREVIEW__.extract());
+            },
+            selectStory: async (_i, id) => {
+              await frameWindow.__STORYBOOK_PREVIEW__.ready();
+              frameWindow.__STORYBOOK_ADDONS_PREVIEW.channel.emit('setCurrentStory', {storyId: id});
+            },
+            onStoryRendered,
+          };
+        }
       }
 
       return {version, ...api};

package/src/browser/renderStoryWithClientAPI.js

@@ -1,11 +1,11 @@
 const getClientAPI = require('./getClientAPI');
 
 function renderStoryWithClientAPI(index, id) {
-  return new Promise(resolve => {
+  return new Promise(async resolve => {
     let api;
     try {
       api = getClientAPI();
-      api.selectStory(index, id);
+      await api.selectStory(index, id);
       api.onStoryRendered(resolve);
     } catch (ex) {
       resolve({message: ex.message, version: api ? api.version : undefined});

package/src/cli.js

@@ -32,16 +32,14 @@ const {performance, timeItAsync} = makeTiming();
     console.log(`Using @applitools/eyes-storybook version ${VERSION}.\n`);
     const config = generateConfig({argv, defaultConfig, externalConfigParams});
     const logger = makeLogger({level: config.showLogs ? 'info' : 'silent', label: 'eyes'});
-    const isVersion7 = await validateAndPopulateConfig({
+    await validateAndPopulateConfig({
       config,
       logger,
       packagePath: process.cwd(),
     });
     logger.log(`Running with the following config:\n${configDigest(config)}`);
     const [err, results] = await presult(
-      timeItAsync('eyesStorybook', () =>
-        eyesStorybook({config, logger, performance, timeItAsync, isVersion7}),
-      ),
+      timeItAsync('eyesStorybook', () => eyesStorybook({config, logger, performance, timeItAsync})),
     );
     if (err) {
       console.log(chalk.red(err.message));

package/src/eyesStorybook.js

@@ -34,7 +34,6 @@ async function eyesStorybook({
   performance,
   timeItAsync,
   outputStream = process.stderr,
-  isVersion7,
 }) {
   let renderIE = false;
   let transitioning = false;
@@ -199,7 +198,6 @@ async function eyesStorybook({
       logger,
       stream: outputStream,
       pagePool,
-      isVersion7,
     });
 
     logger.log('finished creating functions');

package/src/getStoryData.js

@@ -38,6 +38,7 @@ function makeGetStoryData({logger, takeDomSnapshots, reloadPagePerStory}) {
         }
       } else {
         await renderStoryLegacy();
+        await waitFor(page, 'body.sb-show-main');
       }
     } else {
       await renderStoryLegacy();

package/src/getStoryUrl.js

@@ -1,14 +1,8 @@
 'use strict';
 const getIframeUrl = require('./getIframeUrl');
 
-function getStoryUrl({name, kind, parameters, id}, baseUrl, isVersion7) {
-  let storyUrl = getIframeUrl(baseUrl);
-  if (!isVersion7) {
-    storyUrl += `&selectedKind=${encodeURIComponent(kind)}`;
-    storyUrl += `&selectedStory=${encodeURIComponent(name)}`;
-  } else {
-    storyUrl += `&path=/story/${encodeURIComponent(id)}`;
-  }
+function getStoryUrl({parameters, id}, baseUrl) {
+  let storyUrl = `${getIframeUrl(baseUrl)}&path=/story/${encodeURIComponent(id)}`;
 
   const queryParams = parameters && parameters.eyes && parameters.eyes.queryParams;
   if (queryParams) {

package/src/renderStories.js

@@ -13,7 +13,6 @@ function makeRenderStories({
   stream,
   getClientAPI,
   maxPageTTL = 60000,
-  isVersion7,
 }) {
   let newPageIdToAdd;
 
@@ -57,7 +56,7 @@ function makeRenderStories({
 
       async function processStory() {
         const story = stories[currIndex++];
-        const storyUrl = getStoryUrl(story, storybookUrl, isVersion7);
+        const storyUrl = getStoryUrl(story, storybookUrl);
         const title = getStoryBaselineName(story);
         try {
           let [error, storyData] = await presult(
@@ -70,7 +69,7 @@ function makeRenderStories({
 
           if (
             error &&
-            /(Protocol error|Execution context was destroyed|timeout reached when trying to take DOM for story)/.test(
+            /(Runtime.callFunctionOn timed out|Protocol error|Execution context was destroyed|timeout reached when trying to take DOM for story)/.test(
               error.message,
             )
           ) {

package/src/startStorybookServer.js

@@ -12,6 +12,7 @@ async function startStorybookServer({
   startStorybookServerTimeout,
   storybookPath,
   sbArg,
+  sbVersion,
 }) {
   const isWindows = process.platform.startsWith('win');
 
@@ -24,6 +25,7 @@ async function startStorybookServer({
     isWindows,
     logger,
     sbArg,
+    sbVersion,
   });
 
   if (showStorybookOutput) {

package/src/storybookConnector.js

@@ -2,6 +2,7 @@
 const {spawn} = require('child_process');
 const EventEmitter = require('events');
 const stripAnsi = require('strip-ansi');
+const {lt} = require('semver');
 
 class StorybookConnector extends EventEmitter {
   constructor({
@@ -13,6 +14,7 @@ class StorybookConnector extends EventEmitter {
     isWindows,
     logger,
     sbArg,
+    sbVersion,
   }) {
     super();
     this._storybookPath = storybookPath;
@@ -23,6 +25,7 @@ class StorybookConnector extends EventEmitter {
     this._isWindows = isWindows;
     this._logger = logger;
     this._sbArg = sbArg;
+    this._sbVersion = sbVersion;
 
     this._childProcess = null;
     this._version = 5;
@@ -103,6 +106,10 @@ class StorybookConnector extends EventEmitter {
   }
 
   _doSpawan(version) {
+    let isLt8;
+    try {
+      isLt8 = lt(this._sbVersion, '8.0.0');
+    } catch (err) {}
     const args = [
       '-p',
       this._storybookPort,
@@ -111,7 +118,7 @@ class StorybookConnector extends EventEmitter {
       '-c',
       this._storybookConfigDir,
     ];
-    if (this._storybookStaticDir) {
+    if (this._storybookStaticDir && isLt8) {
       args.push('-s');
       args.push(this._storybookStaticDir);
     }

package/src/utils/determineStorybookVersion.js

@@ -1,11 +1,10 @@
 const {resolve} = require('path');
+const {execSync} = require('child_process');
 const fs = require('fs');
 const findNpmModuleCommandPath = require('../findNpmModuleCommandPath');
 
 async function determineStorybookVersion({packagePath, isWindows}) {
-  let sbArg,
-    storybookPath,
-    isVersion7 = false;
+  let sbArg, storybookPath;
 
   const commandV6 = 'start-storybook' + (isWindows ? '.cmd' : '');
   const commandV7 = 'sb' + (isWindows ? '.cmd' : '');
@@ -17,18 +16,18 @@ async function determineStorybookVersion({packagePath, isWindows}) {
     storybookPath = storybookPathV6;
   } else if (fs.existsSync(storybookPathV7)) {
     storybookPath = storybookPathV7;
-    isVersion7 = true;
     sbArg = 'dev';
   } else {
     // the binary is not in the local node_modules/.bin folder, so we need to find it
     storybookPath = await findNpmModuleCommandPath(commandV6, packagePath);
     if (!storybookPath) {
       storybookPath = await findNpmModuleCommandPath(commandV7, packagePath);
-      isVersion7 = true;
       sbArg = 'dev';
     }
   }
 
-  return {storybookPath, isVersion7, sbArg};
+  const sbVersion = execSync(`${storybookPath} ${sbArg ?? ''} --version`).toString();
+
+  return {storybookPath, sbVersion, sbArg};
 }
 module.exports = determineStorybookVersion;

package/src/validateAndPopulateConfig.js

@@ -21,12 +21,12 @@ async function validateAndPopulateConfig({config, packagePath = '', logger = mak
 
   const packageJsonPath = `${packagePath}/package.json`;
   const packageJson = fs.existsSync(packageJsonPath) ? require(packageJsonPath) : undefined;
-  const {storybookPath, isVersion7, sbArg} = await determineStorybookVersion({
+  const {storybookPath, sbVersion, sbArg} = await determineStorybookVersion({
     packagePath,
     isWindows: process.platform.startsWith('win'),
   });
   logger.log(
-    `[validateAndPopulateConfig] storybookPath=${storybookPath} isVersion7=${isVersion7} sbArg=${sbArg}`,
+    `[validateAndPopulateConfig] storybookPath=${storybookPath} sbVersion=${sbVersion} sbArg=${sbArg}`,
   );
 
   if (!config.appName) {
@@ -49,7 +49,7 @@ async function validateAndPopulateConfig({config, packagePath = '', logger = mak
     }
 
     config.storybookUrl = await startStorybookServer(
-      Object.assign({packagePath, logger, storybookPath, sbArg}, config),
+      Object.assign({packagePath, logger, storybookPath, sbArg, sbVersion}, config),
     );
 
     // NOTE (Amit): I don't understand why this condition is here. It shouldn't happen. I might have been the one to put it here, but it seems like a mistake. We should take a thorough look and remove it.
@@ -76,6 +76,5 @@ async function validateAndPopulateConfig({config, packagePath = '', logger = mak
       ),
     );
   }
-  return isVersion7;
 }
 module.exports = validateAndPopulateConfig;