@applitools/eyes-storybook 3.34.2 → 3.36.0

package/CHANGELOG.md

@@ -3,6 +3,91 @@
 ## Unreleased
 
 
+
+## [3.36.0](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-storybook-v3.35.1...js/eyes-storybook@3.36.0) (2023-07-05)
+
+
+### Features
+
+* added support for storybook installed in parent module ([#1060](https://github.com/applitools/eyes.sdk.javascript1/issues/1060)) ([e2b9fbb](https://github.com/applitools/eyes.sdk.javascript1/commit/e2b9fbbb41938b2363a2c675874ad28e41859076))
+* support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+
+
+### Dependencies
+
+* @applitools/core bumped from 3.4.0 to 3.5.0
+  #### Features
+
+  * added auto applitools lib detection ([#1707](https://github.com/applitools/eyes.sdk.javascript1/issues/1707)) ([7d439b5](https://github.com/applitools/eyes.sdk.javascript1/commit/7d439b52af55f3b0596c9d35d6ba85c717448023))
+  * support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+
+
+  #### Bug Fixes
+
+  * some fix ([660a137](https://github.com/applitools/eyes.sdk.javascript1/commit/660a1376a49dd28f8f399690502cd3d1f77665fa))
+
+
+
+* @applitools/core-base bumped from 1.2.1 to 1.3.0
+  #### Features
+
+  * support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+
+
+
+* @applitools/req bumped from 1.3.3 to 1.4.0
+  #### Features
+
+  * support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+* @applitools/driver bumped from 1.12.4 to 1.13.0
+  #### Features
+
+  * added auto applitools lib detection ([#1707](https://github.com/applitools/eyes.sdk.javascript1/issues/1707)) ([7d439b5](https://github.com/applitools/eyes.sdk.javascript1/commit/7d439b52af55f3b0596c9d35d6ba85c717448023))
+* @applitools/ec-client bumped from 1.5.0 to 1.6.0
+  #### Features
+
+  * added support of regional execution cloud servers ([#1711](https://github.com/applitools/eyes.sdk.javascript1/issues/1711)) ([2e26c69](https://github.com/applitools/eyes.sdk.javascript1/commit/2e26c6944bb15f6121fb37c1dba95aba162c1f6a))
+  * support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+
+
+  #### Bug Fixes
+
+  * fixed auto tunnel cleanup after unexpected end of the process ([3c1ad08](https://github.com/applitools/eyes.sdk.javascript1/commit/3c1ad0837d2d3560becc6d89370aa878becb3270))
+
+
+
+* @applitools/tunnel-client bumped from 0.1.1 to 1.0.0
+  #### Features
+
+  * added binaries and made them available in jfrog ([92033fe](https://github.com/applitools/eyes.sdk.javascript1/commit/92033fed7edc58bbc4a4e37269068418fe3afc3d))
+  * release as 1.0.0 ([93bf312](https://github.com/applitools/eyes.sdk.javascript1/commit/93bf31205b07d19bc2cb4f50b974c7bad0f49cea))
+
+
+
+* @applitools/ufg-client bumped from 1.2.22 to 1.3.0
+  #### Features
+
+  * support dns caching ([#1680](https://github.com/applitools/eyes.sdk.javascript1/issues/1680)) ([9bbff34](https://github.com/applitools/eyes.sdk.javascript1/commit/9bbff34f50c9d18758b55a6bcb45571ca1148180))
+
+
+
+* @applitools/spec-driver-webdriver bumped from 1.0.36 to 1.0.37
+
+* @applitools/nml-client bumped from 1.5.0 to 1.5.1
+
+* @applitools/screenshoter bumped from 3.8.1 to 3.8.2
+
+* @applitools/spec-driver-puppeteer bumped from 1.1.67 to 1.1.68
+
+
+## 3.35.0 - 2023/6/13
+
+### Features
+### Bug fixes
+- Add support for variations in storybook 7
+- Increase timeout for rendering results polling
+- Add the option to not fail on visual differences using exitcode `nodiffs`
+
 ## 3.34.2 - 2023/5/16
 
 ### Features

package/README.md

@@ -154,7 +154,7 @@ In addition to command-line arguments, it's possible to define the following con
 | `storybookStaticDir`      | undefined                   | Path to Storybook's static files folder (also available as command-line argument). |
 | `showStorybookOutput`     | undefined                   | Whether or not you want to see Storybook output (also available as command-line argument). |
 | `viewportSize`            | { width: 1024, height: 600} | The size of the puppeteer browser's window. This is the browser window which renders the stories originally (and opens at the size provided in the `viewportSize` parameter), and then a DOM snapshot is uploaded to the server, which renders this snapshot on all the browsers and sizes provided in the `browser` parameter.|
-| `exitcode`                | true                       | If tests failed or has visual differences close with non-zero exit code (also available as command-line argument).|
+| `exitcode`                | true                       | When set to `true` - if there were visual differences or other errors, close with non-zero exit code. When set to `false` - always close with zero exit code (i.e. never fail the build). When set to `nodiffs` - close with non-zero exit code only for errors and **not** for visual differences. (also available as command-line argument: `--exitcode true/false/nodiffs`) |
 | `browser`                 | { width: 1024, height: 768, name: 'chrome' } | The size and browser of the generated screenshots. For more info and possible values, see the [browser section below](#configuring-the-browser).|
 | `showLogs`                | false                       | Whether or not you want to see logs of the Eyes-Storybook plugin. |
 | `batch`                     | undefined                   | An object which describes different aspects of the batch. The following lines in this table depict the various ways to configure the batch. |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-storybook",
-  "version": "3.34.2",
+  "version": "3.36.0",
   "description": "",
   "keywords": [
     "applitools",
@@ -18,12 +18,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "author": "Applitools Team <team@applitools.com>",
-  "aliases": [
-    "storybook"
-  ],
-  "bin": {
-    "eyes-storybook": "./bin/eyes-storybook.js"
-  },
+  "bin": "./bin/eyes-storybook.js",
   "files": [
     "src",
     "bin",
@@ -34,14 +29,14 @@
     "build": "rollup -c rollup.config.js",
     "build:heavy": "node scripts/bitmap.js",
     "test": "yarn build && yarn test:mocha && yarn lint",
-    "test:sanity": "yarn test:unit && yarn test:it",
     "test:mocha": "mocha --no-timeouts --trace-warnings 'test/{unit,it,e2e}/*.test.js'",
     "test:unit": "mocha --no-timeouts --trace-warnings 'test/unit/*.test.js'",
     "test:it": "mocha --no-timeouts --trace-warnings 'test/it/*.test.js'",
     "test:versions": "yarn build && yarn test:e2e:versions && yarn lint",
     "test:e2e": "mocha --no-timeouts --trace-warnings 'test/e2e/*.e2e.test.js'",
     "test:e2e:versions": "npx mocha --no-timeouts --trace-warnings --require test/fixtures/storybook-versions/mochaHooks.js test/versions/*.e2e.versions.test.js",
-    "test:e2e:versions_local": "STORYBOOK_VERSION=latest npx mocha --no-timeouts --trace-warnings --require test/fixtures/storybook-versions/mochaHooks.js test/versions/*.e2e.versions.test.js",
+    "test:e2e:versions_local": "APPLITOOLS_FRAMEWORK_VERSION=latest npx mocha --no-timeouts --trace-warnings --require test/fixtures/storybook-versions/mochaHooks.js test/versions/*.e2e.versions.test.js",
+    "test:heavy": "node bin/eyes-storybook.js -f test/fixtures/heavyStorybook/applitools.config.js",
     "storybook": "start-storybook -c test/fixtures/appWithStorybook -p 9001 -s test/fixtures",
     "storybook:httpHeaders": "start-storybook -c test/fixtures/appWithCustomHttpHeaders -p 9007",
     "storybook:jslayout": "start-storybook -c test/fixtures/jsLayoutStorybookLocal -p 9001 -s test/fixtures",
@@ -59,44 +54,33 @@
     "changelog": "git changelog -x -p -f v$npm_package_version > History.md && git add ./History.md && git commit -am 'changelog'",
     "changelog:init": "git config changelog.format \"* %s [[%h]($(echo $npm_package_repository_url|cut -d+ -f2|cut -d. -f1-2)/commit/%H)]\"",
     "changelog:install": "sudo apt-get install git-extras",
-    "gh:publish": "gh workflow run publish-storybook.yml --ref $(git rev-parse --abbrev-ref HEAD)",
-    "prepublish:setup": "echo 'setup is a no-op. Move along, nothing to see here.'",
-    "deps": "bongo deps",
-    "postinstall": "node src/postinstall",
-    "preversion": "bongo preversion --verifyPendingChanges",
-    "version": "bongo version --withPendingChanges",
-    "postversion": "bongo postversion"
-  },
-  "husky": {
-    "hooks": {
-      "pre-push": "yarn bongo lint"
-    }
+    "postinstall": "node src/postinstall"
   },
   "dependencies": {
-    "@applitools/core": "3.0.1",
-    "@applitools/driver": "1.11.51",
+    "@applitools/core": "3.5.0",
+    "@applitools/driver": "1.13.0",
     "@applitools/functional-commons": "1.6.0",
-    "@applitools/logger": "2.0.0",
+    "@applitools/logger": "2.0.5",
     "@applitools/monitoring-commons": "1.0.19",
-    "@applitools/spec-driver-puppeteer": "1.1.62",
-    "@applitools/test-server": "1.2.0",
-    "@applitools/ufg-client": "1.2.13",
-    "@applitools/utils": "1.3.36",
+    "@applitools/spec-driver-puppeteer": "1.1.68",
+    "@applitools/ufg-client": "1.3.0",
+    "@applitools/utils": "1.5.0",
     "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.5.0",
+    "puppeteer": "19.8.0",
     "strip-ansi": "6.0.0",
     "throat": "6.0.1",
-    "yargs": "15.4.1"
+    "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@applitools/bongo": "^3.0.3",
+    "@applitools/bongo": "^4.0.0",
     "@applitools/sdk-shared": "0.9.15",
     "@applitools/snaptdout": "^1.0.1",
+    "@applitools/test-server": "^1.2.2",
     "@storybook/addon-interactions": "^6.4.18",
     "@storybook/react": "^6.4.18",
     "@storybook/testing-library": "^0.0.9",
@@ -115,8 +99,7 @@
     "eslint-plugin-prettier": "^3.1.1",
     "express": "^4.17.1",
     "filenamify": "^4.1.0",
-    "husky": "^4.3.8",
-    "mocha": "^8.0.1",
+    "mocha": "^10.2.0",
     "node-fetch": "^2.6.0",
     "prettier": "^1.19.1",
     "react": "^16.12.0",
@@ -126,6 +109,9 @@
     "ua-parser-js": "^0.7.21"
   },
   "engines": {
-    "node": ">=12.13.0"
+    "node": ">=14.15.0"
+  },
+  "publishConfig": {
+    "access": "public"
   }
-}
+}

package/src/cli.js

@@ -32,14 +32,20 @@ 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'});
-    await validateAndPopulateConfig({config, logger, packagePath: process.cwd()});
+    const isVersion7 = 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})),
+      timeItAsync('eyesStorybook', () =>
+        eyesStorybook({config, logger, performance, timeItAsync, isVersion7}),
+      ),
     );
     if (err) {
       console.log(chalk.red(err.message));
-      process.exit(config.exitcode ? config.exitcode : 0);
+      process.exit(config.exitcode ? 1 : 0);
     } else {
       const totalTime = performance['eyesStorybook'];
       const {exitCode, summary, outputStr} = processResults({
@@ -47,6 +53,7 @@ const {performance, timeItAsync} = makeTiming();
         totalTime,
         testConcurrency: config.testConcurrency,
         saveNewTests: config.saveNewTests,
+        configExitCode: config.exitcode,
       });
       console.log(outputStr);
       if (config.jsonFilePath) {
@@ -58,7 +65,7 @@ const {performance, timeItAsync} = makeTiming();
       if (config.xmlFilePath) {
         handleXmlFile(config.xmlFilePath, summary, {totalTime});
       }
-      process.exit(config.exitcode ? exitCode : 0);
+      process.exit(exitCode);
     }
   } catch (ex) {
     console.log(ex);

package/src/eyesStorybook.js

@@ -34,6 +34,7 @@ async function eyesStorybook({
   performance,
   timeItAsync,
   outputStream = process.stderr,
+  isVersion7,
 }) {
   let memoryTimeout;
   let renderIE = false;
@@ -46,7 +47,14 @@ async function eyesStorybook({
     : Number(process.env.APPLITOOLS_CONCURRENT_TABS);
   logger.log(`Running with ${CONCURRENT_TABS} concurrent tabs`);
 
-  const {storybookUrl, readStoriesTimeout, reloadPagePerStory, proxy, testConcurrency} = config;
+  const {
+    storybookUrl,
+    readStoriesTimeout,
+    reloadPagePerStory,
+    proxy,
+    testConcurrency,
+    useDnsCache,
+  } = config;
 
   let iframeUrl;
   try {
@@ -56,6 +64,7 @@ async function eyesStorybook({
     throw new Error(`Storybook URL is not valid: ${storybookUrl}`);
   }
   const agentId = `eyes-storybook/${require('../package.json').version}`;
+  process.env.PUPPETEER_DISABLE_HEADLESS_WARNING = true;
   const browser = await puppeteer.launch(config.puppeteerOptions);
   logger.log('browser launched');
   const page = await browser.newPage();
@@ -77,6 +86,7 @@ async function eyesStorybook({
     serverUrl: config.serverUrl,
     apiKey: config.apiKey,
     agentId,
+    useDnsCache,
   };
   const [error, account] = await presult(core.getAccountInfo({settings, logger}));
 
@@ -95,6 +105,7 @@ async function eyesStorybook({
       ...account,
       proxy,
       concurrency: testConcurrency,
+      useDnsCache,
     },
     logger,
   });
@@ -213,6 +224,7 @@ async function eyesStorybook({
       logger,
       stream: outputStream,
       pagePool,
+      isVersion7,
     });
 
     logger.log('finished creating functions');

package/src/findNpmModuleCommandPath.js

@@ -0,0 +1,46 @@
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Find the path to the given npm command.
+ * It goes recursively up the directory tree until it finds the command, like npm itself does.
+ * @param {string} npmModuleCommand - The npm command to find.
+ * @param {string} packageJsonDirPath - the directory in which to start searching for the command.
+ * @returns {Promise<string|null>} The path to the command.
+ */
+module.exports = async function findNpmModuleCommandPath(npmModuleCommand, packageJsonDirPath) {
+  const isWindows = process.platform.startsWith('win');
+
+  let checkRootPath = path.resolve(packageJsonDirPath);
+  while (checkRootPath !== '') {
+    const commandPath = path.join(
+      checkRootPath,
+      'node_modules',
+      '.bin',
+      npmModuleCommand + (isWindows ? '.cmd' : ''),
+    );
+    if (await doesFileExist(commandPath)) return commandPath;
+
+    const nextPath = path.dirname(checkRootPath);
+    if (nextPath === checkRootPath) break; // the top of the file tree is reached
+
+    checkRootPath = nextPath;
+  }
+
+  return null;
+};
+
+/**
+ * Check whether a file exists asynchronously.
+ * @param {string} filePath
+ * @returns {Promise<boolean>}
+ */
+function doesFileExist(filePath) {
+  return new Promise(resolve => {
+    fs.stat(filePath, (err, stats) => {
+      if (err) resolve(false);
+      else if (stats != null && stats.isFile()) resolve(true);
+      else resolve(false);
+    });
+  });
+}

package/src/getStoryUrl.js

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

package/src/processResults.js

@@ -5,7 +5,13 @@ const utils = require('@applitools/utils');
 const uniq = require('./uniq');
 const concurrencyMsg = require('./concurrencyMsg');
 
-function processResults({results, totalTime, testConcurrency, saveNewTests = true}) {
+function processResults({
+  results,
+  totalTime,
+  testConcurrency,
+  saveNewTests = true,
+  configExitCode,
+}) {
   let outputStr = '\n';
   const pluralize = utils.general.pluralize;
   let testResults = flatten(results.summary.results);
@@ -101,8 +107,16 @@ function processResults({results, totalTime, testConcurrency, saveNewTests = tru
     // TODO require from core
     outputStr += `\n${concurrencyMsg}\n`;
   }
-  const exitCode =
-    !warnForUnsavedNewTests && passedOrNew.length && !errors.length && !unresolved.length ? 0 : 1;
+
+  let exitCode;
+  if (!configExitCode) {
+    exitCode = 0;
+  } else if (configExitCode === 'nodiffs') {
+    exitCode = errors.length ? 1 : 0;
+  } else {
+    exitCode =
+      !warnForUnsavedNewTests && passedOrNew.length && !errors.length && !unresolved.length ? 0 : 1;
+  }
   return {
     outputStr,
     summary: results.summary,

package/src/renderStories.js

@@ -13,6 +13,7 @@ function makeRenderStories({
   stream,
   getClientAPI,
   maxPageTTL = 60000,
+  isVersion7,
 }) {
   let newPageIdToAdd;
 
@@ -56,7 +57,7 @@ function makeRenderStories({
 
       async function processStory() {
         const story = stories[currIndex++];
-        const storyUrl = getStoryUrl(story, storybookUrl);
+        const storyUrl = getStoryUrl(story, storybookUrl, isVersion7);
         const title = getStoryBaselineName(story);
         try {
           let [error, storyData] = await presult(

package/src/startStorybookServer.js

@@ -1,16 +1,8 @@
 'use strict';
-const {resolve} = require('path');
 const ora = require('ora');
 const StorybookConnector = require('./storybookConnector');
-const fs = require('fs');
-const {exec} = require('child_process');
-const {promisify: p} = require('util');
-const pexec = p(exec);
-// eslint-disable-next-line
-const semver = require('semver');
 
 async function startStorybookServer({
-  packagePath,
   storybookPort,
   storybookHost,
   storybookConfigDir,
@@ -18,22 +10,10 @@ async function startStorybookServer({
   showStorybookOutput,
   logger,
   startStorybookServerTimeout,
+  storybookPath,
+  sbArg,
 }) {
   const isWindows = process.platform.startsWith('win');
-  let storybookPath, sbArg;
-  const storybookPathV6 = resolve(packagePath, 'node_modules/.bin/start-storybook');
-  const storybookPathV7 = resolve(packagePath, 'node_modules/.bin/sb');
-  if (fs.existsSync(storybookPathV7)) {
-    const version = await pexec(`${storybookPathV7} --version`);
-    if (semver.satisfies(version.stdout, '<7.0.0')) {
-      storybookPath = storybookPathV6;
-    } else {
-      storybookPath = storybookPathV7;
-      sbArg = 'dev';
-    }
-  } else {
-    storybookPath = storybookPathV6;
-  }
 
   const storybookConnector = new StorybookConnector({
     storybookPath,

package/src/storybookConnector.js

@@ -15,7 +15,7 @@ class StorybookConnector extends EventEmitter {
     sbArg,
   }) {
     super();
-    this._storybookPath = `${storybookPath}${isWindows ? '.cmd' : ''}`;
+    this._storybookPath = storybookPath;
     this._storybookPort = storybookPort;
     this._storybookHost = storybookHost;
     this._storybookConfigDir = storybookConfigDir;

package/src/validateAndPopulateConfig.js

@@ -11,14 +11,21 @@ const {
 } = require('./errMessages');
 const startStorybookServer = require('./startStorybookServer');
 const {isIE} = require('./shouldRenderIE');
+const {makeLogger} = require('@applitools/logger');
+const findNpmModuleCommandPath = require('./findNpmModuleCommandPath');
+const {resolve} = require('path');
 
-async function validateAndPopulateConfig({config, packagePath, logger}) {
+async function validateAndPopulateConfig({config, packagePath = '', logger = makeLogger()}) {
   if (!config.apiKey) {
     throw new Error(missingApiKeyFailMsg);
   }
 
   const packageJsonPath = `${packagePath}/package.json`;
   const packageJson = fs.existsSync(packageJsonPath) ? require(packageJsonPath) : undefined;
+  const {storybookPath, isVersion7, sbArg} = await determineStorybookVersion(packagePath);
+  logger.log(
+    `[validateAndPopulateConfig] storybookPath=${storybookPath} isVersion7=${isVersion7} sbArg=${sbArg}`,
+  );
 
   if (!config.appName) {
     if (!packageJson) {
@@ -39,7 +46,9 @@ async function validateAndPopulateConfig({config, packagePath, logger}) {
       console.log(chalk.red(`couldn't find available port around`, config.storybookPort));
     }
 
-    config.storybookUrl = await startStorybookServer(Object.assign({packagePath, logger}, config));
+    config.storybookUrl = await startStorybookServer(
+      Object.assign({packagePath, logger, storybookPath, sbArg}, 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.
     if (!config.storybookUrl) {
@@ -65,6 +74,36 @@ async function validateAndPopulateConfig({config, packagePath, logger}) {
       ),
     );
   }
+  return isVersion7;
 }
 
+async function determineStorybookVersion(packagePath) {
+  let sbArg,
+    storybookPath,
+    isVersion7 = false;
+
+  const storybookPathV6 = resolve(packagePath, 'node_modules/.bin/start-storybook');
+  const storybookPathV7 = resolve(packagePath, 'node_modules/.bin/sb');
+
+  // first we look for the binaries in the local node_modules/.bin folder in case there are multiple versions of storybook installed
+  if (fs.existsSync(storybookPathV6)) {
+    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('start-storybook', packagePath);
+    if (!storybookPath) {
+      storybookPath = await findNpmModuleCommandPath('sb', packagePath);
+      isVersion7 = true;
+      sbArg = 'dev';
+    } else {
+      isVersion7 = false;
+    }
+  }
+
+  return {storybookPath, isVersion7, sbArg};
+}
 module.exports = validateAndPopulateConfig;