@storybook/cli 7.0.0-alpha.12 → 7.0.0-alpha.17

package/dist/esm/js-package-manager/JsPackageManager.js

@@ -1,27 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.JsPackageManager = void 0;
-exports.getPackageDetails = getPackageDetails;
-
-require("core-js/modules/es.promise.js");
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _semver = require("@storybook/semver");
-
-var _crossSpawn = require("cross-spawn");
-
-var _helpers = require("../helpers");
-
-var _PackageJsonHelper = require("./PackageJsonHelper");
-
-var _versions = _interopRequireDefault(require("../versions"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+import chalk from 'chalk';
+import { gt, satisfies } from '@storybook/semver';
+import { sync as spawnSync } from 'cross-spawn';
+import { commandLog } from '../helpers';
+import { readPackageJson, writePackageJson } from './PackageJsonHelper';
+import storybookPackagesVersions from '../versions';
 const logger = console;
 /**
  * Extract package name and version from input
@@ -30,7 +12,7 @@ const logger = console;
  * @return A tuple of 2 elements: [packageName, packageVersion]
  */
 
-function getPackageDetails(pkg) {
+export function getPackageDetails(pkg) {
   const idx = pkg.lastIndexOf('@'); // If the only `@` is the first character, it is a scoped package
   // If it isn't in the string, it will be -1
 
@@ -42,8 +24,7 @@ function getPackageDetails(pkg) {
   const packageVersion = pkg.slice(idx + 1);
   return [packageName, packageVersion];
 }
-
-class JsPackageManager {
+export class JsPackageManager {
   constructor() {
     this.type = void 0;
   }
@@ -52,11 +33,11 @@ class JsPackageManager {
    * Install dependencies listed in `package.json`
    */
   installDependencies() {
-    let done = (0, _helpers.commandLog)('Preparing to install dependencies');
+    let done = commandLog('Preparing to install dependencies');
     done();
     logger.log();
     logger.log();
-    done = (0, _helpers.commandLog)('Installing dependencies');
+    done = commandLog('Installing dependencies');
 
     try {
       this.runInstall();
@@ -77,10 +58,10 @@ class JsPackageManager {
     let packageJson;
 
     try {
-      packageJson = (0, _PackageJsonHelper.readPackageJson)();
+      packageJson = readPackageJson();
     } catch (err) {
       this.initPackageJson();
-      packageJson = (0, _PackageJsonHelper.readPackageJson)();
+      packageJson = readPackageJson();
     }
 
     return Object.assign({}, packageJson, {
@@ -125,7 +106,7 @@ class JsPackageManager {
         packageJson.dependencies = Object.assign({}, packageJson.dependencies, dependenciesMap);
       }
 
-      (0, _PackageJsonHelper.writePackageJson)(packageJson);
+      writePackageJson(packageJson);
     } else {
       try {
         this.runAddDeps(dependencies, options.installAsDevDependencies);
@@ -178,7 +159,7 @@ class JsPackageManager {
 
     if (/(@storybook|^sb$|^storybook$)/.test(packageName)) {
       // @ts-ignore
-      current = _versions.default[packageName];
+      current = storybookPackagesVersions[packageName];
     }
 
     let latest;
@@ -187,15 +168,15 @@ class JsPackageManager {
       latest = await this.latestVersion(packageName, constraint);
     } catch (e) {
       if (current) {
-        logger.warn(`\n     ${_chalk.default.yellow(e.message)}`);
+        logger.warn(`\n     ${chalk.yellow(e.message)}`);
         return current;
       }
 
-      logger.error(`\n     ${_chalk.default.red(e.message)}`);
+      logger.error(`\n     ${chalk.red(e.message)}`);
       process.exit(1);
     }
 
-    const versionToUse = current && (!constraint || (0, _semver.satisfies)(current, constraint)) && (0, _semver.gt)(current, latest) ? current : latest;
+    const versionToUse = current && (!constraint || satisfies(current, constraint)) && gt(current, latest) ? current : latest;
     return `^${versionToUse}`;
   }
   /**
@@ -214,16 +195,14 @@ class JsPackageManager {
 
     const versions = await this.runGetVersions(packageName, true); // Get the latest version satisfying the constraint
 
-    return versions.reverse().find(version => (0, _semver.satisfies)(version, constraint));
+    return versions.reverse().find(version => satisfies(version, constraint));
   }
 
   addStorybookCommandInScripts(options) {
-    var _options$port;
-
-    const sbPort = (_options$port = options === null || options === void 0 ? void 0 : options.port) !== null && _options$port !== void 0 ? _options$port : 6006;
-    const storybookCmd = options !== null && options !== void 0 && options.staticFolder ? `npx storybook dev -p ${sbPort} -s ${options.staticFolder}` : `npx storybook dev -p ${sbPort}`;
-    const buildStorybookCmd = options !== null && options !== void 0 && options.staticFolder ? `npx storybook build -s ${options.staticFolder}` : `npx storybook build`;
-    const preCommand = options !== null && options !== void 0 && options.preCommand ? this.getRunCommand(options.preCommand) : undefined;
+    const sbPort = options?.port ?? 6006;
+    const storybookCmd = options?.staticFolder ? `npx storybook dev -p ${sbPort} -s ${options.staticFolder}` : `npx storybook dev -p ${sbPort}`;
+    const buildStorybookCmd = options?.staticFolder ? `npx storybook build -s ${options.staticFolder}` : `npx storybook build`;
+    const preCommand = options?.preCommand ? this.getRunCommand(options.preCommand) : undefined;
     this.addScripts({
       storybook: [preCommand, storybookCmd].filter(Boolean).join(' && '),
       'build-storybook': [preCommand, buildStorybookCmd].filter(Boolean).join(' && ')
@@ -231,12 +210,10 @@ class JsPackageManager {
   }
 
   addESLintConfig() {
-    var _packageJson$eslintCo;
-
     const packageJson = this.retrievePackageJson();
-    (0, _PackageJsonHelper.writePackageJson)(Object.assign({}, packageJson, {
+    writePackageJson(Object.assign({}, packageJson, {
       eslintConfig: Object.assign({}, packageJson.eslintConfig, {
-        overrides: [...(((_packageJson$eslintCo = packageJson.eslintConfig) === null || _packageJson$eslintCo === void 0 ? void 0 : _packageJson$eslintCo.overrides) || []), {
+        overrides: [...(packageJson.eslintConfig?.overrides || []), {
           files: ['**/*.stories.*'],
           rules: {
             'import/no-anonymous-default-export': 'off'
@@ -248,28 +225,22 @@ class JsPackageManager {
 
   addScripts(scripts) {
     const packageJson = this.retrievePackageJson();
-    (0, _PackageJsonHelper.writePackageJson)(Object.assign({}, packageJson, {
+    writePackageJson(Object.assign({}, packageJson, {
       scripts: Object.assign({}, packageJson.scripts, scripts)
     }));
   }
 
   executeCommand(command, args, stdio) {
-    var _commandResult$stdout;
-
-    const commandResult = (0, _crossSpawn.sync)(command, args, {
-      stdio: stdio !== null && stdio !== void 0 ? stdio : 'pipe',
+    const commandResult = spawnSync(command, args, {
+      stdio: stdio ?? 'pipe',
       encoding: 'utf-8'
     });
 
     if (commandResult.status !== 0) {
-      var _commandResult$stderr;
-
-      throw new Error((_commandResult$stderr = commandResult.stderr) !== null && _commandResult$stderr !== void 0 ? _commandResult$stderr : '');
+      throw new Error(commandResult.stderr ?? '');
     }
 
-    return (_commandResult$stdout = commandResult.stdout) !== null && _commandResult$stdout !== void 0 ? _commandResult$stdout : '';
+    return commandResult.stdout ?? '';
   }
 
-}
-
-exports.JsPackageManager = JsPackageManager;
+}

package/dist/esm/js-package-manager/JsPackageManagerFactory.js

@@ -1,36 +1,24 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.JsPackageManagerFactory = void 0;
-
-var _crossSpawn = require("cross-spawn");
-
-var _findUp = require("find-up");
-
-var _NPMProxy = require("./NPMProxy");
-
-var _Yarn2Proxy = require("./Yarn2Proxy");
-
-var _Yarn1Proxy = require("./Yarn1Proxy");
-
-class JsPackageManagerFactory {
+import { sync as spawnSync } from 'cross-spawn';
+import { sync as findUpSync } from 'find-up';
+import { NPMProxy } from './NPMProxy';
+import { Yarn2Proxy } from './Yarn2Proxy';
+import { Yarn1Proxy } from './Yarn1Proxy';
+export class JsPackageManagerFactory {
   static getPackageManager(forceNpmUsage = false) {
     if (forceNpmUsage) {
-      return new _NPMProxy.NPMProxy();
+      return new NPMProxy();
     }
 
     const yarnVersion = getYarnVersion();
-    const hasYarnLockFile = (0, _findUp.sync)('yarn.lock');
+    const hasYarnLockFile = findUpSync('yarn.lock');
     const hasNPMCommand = hasNPM();
 
     if (yarnVersion && (hasYarnLockFile || !hasNPMCommand)) {
-      return yarnVersion === 1 ? new _Yarn1Proxy.Yarn1Proxy() : new _Yarn2Proxy.Yarn2Proxy();
+      return yarnVersion === 1 ? new Yarn1Proxy() : new Yarn2Proxy();
     }
 
     if (hasNPMCommand) {
-      return new _NPMProxy.NPMProxy();
+      return new NPMProxy();
     }
 
     throw new Error('Unable to find a usable package manager within NPM, Yarn and Yarn 2');
@@ -38,15 +26,13 @@ class JsPackageManagerFactory {
 
 }
 
-exports.JsPackageManagerFactory = JsPackageManagerFactory;
-
 function hasNPM() {
-  const npmVersionCommand = (0, _crossSpawn.sync)('npm', ['--version']);
+  const npmVersionCommand = spawnSync('npm', ['--version']);
   return npmVersionCommand.status === 0;
 }
 
 function getYarnVersion() {
-  const yarnVersionCommand = (0, _crossSpawn.sync)('yarn', ['--version']);
+  const yarnVersionCommand = spawnSync('yarn', ['--version']);
 
   if (yarnVersionCommand.status !== 0) {
     return undefined;

package/dist/esm/js-package-manager/NPMProxy.js

@@ -1,17 +1,6 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.NPMProxy = void 0;
-
-var _semver = _interopRequireDefault(require("@storybook/semver"));
-
-var _JsPackageManager = require("./JsPackageManager");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class NPMProxy extends _JsPackageManager.JsPackageManager {
+import semver from '@storybook/semver';
+import { JsPackageManager } from './JsPackageManager';
+export class NPMProxy extends JsPackageManager {
   constructor(...args) {
     super(...args);
     this.type = 'npm';
@@ -44,7 +33,7 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
   }
 
   needsLegacyPeerDeps(version) {
-    return _semver.default.gte(version, '7.0.0') && !this.hasLegacyPeerDeps();
+    return semver.gte(version, '7.0.0') && !this.hasLegacyPeerDeps();
   }
 
   getInstallArgs() {
@@ -87,6 +76,4 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     }
   }
 
-}
-
-exports.NPMProxy = NPMProxy;
+}

package/dist/esm/js-package-manager/PackageJson.js

@@ -1,5 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+export {};

package/dist/esm/js-package-manager/PackageJsonHelper.js

@@ -1,33 +1,17 @@
-"use strict";
+import path from 'path';
+import fs from 'fs';
+export function readPackageJson() {
+  const packageJsonPath = path.resolve('package.json');
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.readPackageJson = readPackageJson;
-exports.writePackageJson = writePackageJson;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function readPackageJson() {
-  const packageJsonPath = _path.default.resolve('package.json');
-
-  if (!_fs.default.existsSync(packageJsonPath)) {
+  if (!fs.existsSync(packageJsonPath)) {
     throw new Error(`Could not read package.json file at ${packageJsonPath}`);
   }
 
-  const jsonContent = _fs.default.readFileSync(packageJsonPath, 'utf8');
-
+  const jsonContent = fs.readFileSync(packageJsonPath, 'utf8');
   return JSON.parse(jsonContent);
 }
-
-function writePackageJson(packageJson) {
+export function writePackageJson(packageJson) {
   const content = `${JSON.stringify(packageJson, null, 2)}\n`;
-
-  const packageJsonPath = _path.default.resolve('package.json');
-
-  _fs.default.writeFileSync(packageJsonPath, content, 'utf8');
+  const packageJsonPath = path.resolve('package.json');
+  fs.writeFileSync(packageJsonPath, content, 'utf8');
 }

package/dist/esm/js-package-manager/Yarn1Proxy.js

@@ -1,13 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Yarn1Proxy = void 0;
-
-var _JsPackageManager = require("./JsPackageManager");
-
-class Yarn1Proxy extends _JsPackageManager.JsPackageManager {
+import { JsPackageManager } from './JsPackageManager';
+export class Yarn1Proxy extends JsPackageManager {
   constructor(...args) {
     super(...args);
     this.type = 'yarn1';
@@ -56,6 +48,4 @@ class Yarn1Proxy extends _JsPackageManager.JsPackageManager {
     }
   }
 
-}
-
-exports.Yarn1Proxy = Yarn1Proxy;
+}

package/dist/esm/js-package-manager/Yarn2Proxy.js

@@ -1,13 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Yarn2Proxy = void 0;
-
-var _JsPackageManager = require("./JsPackageManager");
-
-class Yarn2Proxy extends _JsPackageManager.JsPackageManager {
+import { JsPackageManager } from './JsPackageManager';
+export class Yarn2Proxy extends JsPackageManager {
   constructor(...args) {
     super(...args);
     this.type = 'yarn2';
@@ -52,6 +44,4 @@ class Yarn2Proxy extends _JsPackageManager.JsPackageManager {
     }
   }
 
-}
-
-exports.Yarn2Proxy = Yarn2Proxy;
+}

package/dist/esm/js-package-manager/index.js

@@ -1,57 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _JsPackageManagerFactory = require("./JsPackageManagerFactory");
-
-Object.keys(_JsPackageManagerFactory).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _JsPackageManagerFactory[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _JsPackageManagerFactory[key];
-    }
-  });
-});
-
-var _JsPackageManager = require("./JsPackageManager");
-
-Object.keys(_JsPackageManager).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _JsPackageManager[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _JsPackageManager[key];
-    }
-  });
-});
-
-var _PackageJson = require("./PackageJson");
-
-Object.keys(_PackageJson).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _PackageJson[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _PackageJson[key];
-    }
-  });
-});
-
-var _PackageJsonHelper = require("./PackageJsonHelper");
-
-Object.keys(_PackageJsonHelper).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _PackageJsonHelper[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _PackageJsonHelper[key];
-    }
-  });
-});
+export * from './JsPackageManagerFactory';
+export * from './JsPackageManager';
+export * from './PackageJson';
+export * from './PackageJsonHelper';

package/dist/esm/link.js

@@ -1,98 +1,65 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.link = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
-var _path = _interopRequireDefault(require("path"));
-
-var _crossSpawn = require("cross-spawn");
-
-var _nodeLogger = require("@storybook/node-logger");
-
-var _scripts = require("./repro-generators/scripts");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const link = async ({
+import fse from 'fs-extra';
+import path from 'path';
+import { sync as spawnSync } from 'cross-spawn';
+import { logger } from '@storybook/node-logger';
+import { exec } from './repro-generators/scripts';
+export const link = async ({
   target,
   local
 }) => {
   const storybookDir = process.cwd();
 
   try {
-    const packageJson = JSON.parse(_fsExtra.default.readFileSync('package.json', 'utf8'));
+    const packageJson = JSON.parse(fse.readFileSync('package.json', 'utf8'));
     if (packageJson.name !== '@storybook/root') throw new Error();
   } catch {
     throw new Error('Expected to run link from the root of the storybook monorepo');
   }
 
   let reproDir = target;
-
-  let reproName = _path.default.basename(target);
+  let reproName = path.basename(target);
 
   if (!local) {
-    const reprosDir = _path.default.join(storybookDir, '../storybook-repros');
-
-    _nodeLogger.logger.info(`Ensuring directory ${reprosDir}`);
-
-    _fsExtra.default.ensureDirSync(reprosDir);
-
-    _nodeLogger.logger.info(`Cloning ${target}`);
-
-    await (0, _scripts.exec)(`git clone ${target}`, {
+    const reprosDir = path.join(storybookDir, '../storybook-repros');
+    logger.info(`Ensuring directory ${reprosDir}`);
+    fse.ensureDirSync(reprosDir);
+    logger.info(`Cloning ${target}`);
+    await exec(`git clone ${target}`, {
       cwd: reprosDir
     }); // Extract a repro name from url given as input (take the last part of the path and remove the extension)
 
-    reproName = _path.default.basename(target, _path.default.extname(target));
-    reproDir = _path.default.join(reprosDir, reproName);
+    reproName = path.basename(target, path.extname(target));
+    reproDir = path.join(reprosDir, reproName);
   }
 
-  const version = (0, _crossSpawn.sync)('yarn', ['--version'], {
+  const version = spawnSync('yarn', ['--version'], {
     cwd: reproDir,
     stdio: 'pipe'
   }).stdout.toString();
 
   if (!/^[23]\./.test(version)) {
-    _nodeLogger.logger.warn(`🚨 Expected yarn 2 or 3 in ${reproDir}!`);
-
-    _nodeLogger.logger.warn('');
-
-    _nodeLogger.logger.warn('Please set it up with `yarn set version berry`,');
-
-    _nodeLogger.logger.warn(`then link '${reproDir}' with the '--local' flag.`);
-
+    logger.warn(`🚨 Expected yarn 2 or 3 in ${reproDir}!`);
+    logger.warn('');
+    logger.warn('Please set it up with `yarn set version berry`,');
+    logger.warn(`then link '${reproDir}' with the '--local' flag.`);
     return;
   }
 
-  _nodeLogger.logger.info(`Linking ${reproDir}`);
-
-  await (0, _scripts.exec)(`yarn link --all ${storybookDir}`, {
+  logger.info(`Linking ${reproDir}`);
+  await exec(`yarn link --all ${storybookDir}`, {
     cwd: reproDir
   });
-
-  _nodeLogger.logger.info(`Installing ${reproName}`);
-
-  await (0, _scripts.exec)(`yarn install`, {
+  logger.info(`Installing ${reproName}`);
+  await exec(`yarn install`, {
     cwd: reproDir
   }); // ⚠️ TODO: Fix peer deps in `@storybook/preset-create-react-app`
 
-  _nodeLogger.logger.info(`Magic stuff related to @storybook/preset-create-react-app, we need to fix peerDependencies`);
-
-  await (0, _scripts.exec)(`yarn add -D webpack-hot-middleware`, {
+  logger.info(`Magic stuff related to @storybook/preset-create-react-app, we need to fix peerDependencies`);
+  await exec(`yarn add -D webpack-hot-middleware`, {
     cwd: reproDir
   });
-
-  _nodeLogger.logger.info(`Running ${reproName} storybook`);
-
-  await (0, _scripts.exec)(`yarn run storybook`, {
+  logger.info(`Running ${reproName} storybook`);
+  await exec(`yarn run storybook`, {
     cwd: reproDir
   });
-};
-
-exports.link = link;
+};

package/dist/esm/migrate.js

@@ -1,15 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.migrate = migrate;
-
-require("core-js/modules/es.promise.js");
-
-var _codemod = require("@storybook/codemod");
-
-async function migrate(migration, {
+import { listCodemods, runCodemod } from '@storybook/codemod';
+export async function migrate(migration, {
   configDir,
   glob,
   dryRun,
@@ -19,9 +9,9 @@ async function migrate(migration, {
   parser
 }) {
   if (list) {
-    (0, _codemod.listCodemods)().forEach(key => logger.log(key));
+    listCodemods().forEach(key => logger.log(key));
   } else if (migration) {
-    await (0, _codemod.runCodemod)(migration, {
+    await runCodemod(migration, {
       configDir,
       glob,
       dryRun,