@storybook/cli 7.0.0-alpha.16 → 7.0.0-alpha.19

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,21 +1,11 @@
-"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';
     this.installArgs = void 0;
+    this.uninstallArgs = void 0;
   }
 
   initPackageJson() {
@@ -44,7 +34,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() {
@@ -55,6 +45,14 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     return this.installArgs;
   }
 
+  getUninstallArgs() {
+    if (!this.uninstallArgs) {
+      this.uninstallArgs = this.needsLegacyPeerDeps(this.getNpmVersion()) ? ['uninstall', '--legacy-peer-deps'] : ['uninstall'];
+    }
+
+    return this.uninstallArgs;
+  }
+
   runInstall() {
     this.executeCommand('npm', this.getInstallArgs(), 'inherit');
   }
@@ -69,6 +67,11 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     this.executeCommand('npm', [...this.getInstallArgs(), ...args], 'inherit');
   }
 
+  runRemoveDeps(dependencies) {
+    const args = [...dependencies];
+    this.executeCommand('npm', [...this.getUninstallArgs(), ...args], 'inherit');
+  }
+
   runGetVersions(packageName, fetchAllVersions) {
     const args = [fetchAllVersions ? 'versions' : 'version', '--json'];
     const commandResult = this.executeCommand('npm', ['info', packageName, ...args]);
@@ -87,6 +90,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';
@@ -39,6 +31,11 @@ class Yarn1Proxy extends _JsPackageManager.JsPackageManager {
     this.executeCommand('yarn', ['add', ...args], 'inherit');
   }
 
+  runRemoveDeps(dependencies) {
+    const args = ['--ignore-workspace-root-check', ...dependencies];
+    this.executeCommand('yarn', ['remove', ...args], 'inherit');
+  }
+
   runGetVersions(packageName, fetchAllVersions) {
     const args = [fetchAllVersions ? 'versions' : 'version', '--json'];
     const commandResult = this.executeCommand('yarn', ['info', packageName, ...args]);
@@ -56,6 +53,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';
@@ -39,6 +31,11 @@ class Yarn2Proxy extends _JsPackageManager.JsPackageManager {
     this.executeCommand('yarn', ['add', ...args], 'inherit');
   }
 
+  runRemoveDeps(dependencies) {
+    const args = [...dependencies];
+    this.executeCommand('yarn', ['remove', ...args], 'inherit');
+  }
+
   runGetVersions(packageName, fetchAllVersions) {
     const field = fetchAllVersions ? 'versions' : 'version';
     const args = ['--fields', field, '--json'];
@@ -52,6 +49,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,69 @@
-"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
+  local,
+  start
 }) => {
   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`, {
-    cwd: reproDir
-  });
-
-  _nodeLogger.logger.info(`Running ${reproName} storybook`);
-
-  await (0, _scripts.exec)(`yarn run storybook`, {
+  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
   });
-};
 
-exports.link = link;
+  if (start) {
+    logger.info(`Running ${reproName} storybook`);
+    await exec(`yarn run storybook`, {
+      cwd: reproDir
+    });
+  }
+};

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,

package/dist/esm/project_types.js

@@ -1,27 +1,18 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.unsupportedTemplate = exports.supportedTemplates = exports.installableProjectTypes = exports.SupportedLanguage = exports.SUPPORTED_RENDERERS = exports.ProjectType = exports.CoreBuilder = void 0;
-
-var _semver = require("@storybook/semver");
+import { validRange, minVersion } from '@storybook/semver';
 
 function ltMajor(versionRange, major) {
   // Uses validRange to avoid a throw from minVersion if an invalid range gets passed
-  return (0, _semver.validRange)(versionRange) && (0, _semver.minVersion)(versionRange).major < major;
+  return validRange(versionRange) && minVersion(versionRange).major < major;
 }
 
 function eqMajor(versionRange, major) {
   // Uses validRange to avoid a throw from minVersion if an invalid range gets passed
-  return (0, _semver.validRange)(versionRange) && (0, _semver.minVersion)(versionRange).major === major;
+  return validRange(versionRange) && minVersion(versionRange).major === major;
 } // Should match @storybook/<renderer>
 
 
-const SUPPORTED_RENDERERS = ['react', 'react-native', 'vue', 'vue3', 'angular', 'mithril', 'riot', 'ember', 'marionette', 'marko', 'preact', 'svelte', 'rax', 'aurelia'];
-exports.SUPPORTED_RENDERERS = SUPPORTED_RENDERERS;
-let ProjectType;
-exports.ProjectType = ProjectType;
+export const SUPPORTED_RENDERERS = ['react', 'react-native', 'vue', 'vue3', 'angular', 'mithril', 'riot', 'ember', 'marionette', 'marko', 'preact', 'svelte', 'rax', 'aurelia'];
+export let ProjectType;
 
 (function (ProjectType) {
   ProjectType["UNDETECTED"] = "UNDETECTED";
@@ -48,24 +39,21 @@ exports.ProjectType = ProjectType;
   ProjectType["RAX"] = "RAX";
   ProjectType["AURELIA"] = "AURELIA";
   ProjectType["SERVER"] = "SERVER";
-})(ProjectType || (exports.ProjectType = ProjectType = {}));
-
-let CoreBuilder; // The `& {}` bit allows for auto-complete, see: https://github.com/microsoft/TypeScript/issues/29729
+})(ProjectType || (ProjectType = {}));
 
-exports.CoreBuilder = CoreBuilder;
+export let CoreBuilder; // The `& {}` bit allows for auto-complete, see: https://github.com/microsoft/TypeScript/issues/29729
 
 (function (CoreBuilder) {
   CoreBuilder["Webpack5"] = "webpack5";
   CoreBuilder["Vite"] = "vite";
-})(CoreBuilder || (exports.CoreBuilder = CoreBuilder = {}));
+})(CoreBuilder || (CoreBuilder = {}));
 
-let SupportedLanguage;
-exports.SupportedLanguage = SupportedLanguage;
+export let SupportedLanguage;
 
 (function (SupportedLanguage) {
   SupportedLanguage["JAVASCRIPT"] = "javascript";
   SupportedLanguage["TYPESCRIPT"] = "typescript";
-})(SupportedLanguage || (exports.SupportedLanguage = SupportedLanguage = {}));
+})(SupportedLanguage || (SupportedLanguage = {}));
 
 /**
  * Configuration to match a storybook preset template.
@@ -74,7 +62,7 @@ exports.SupportedLanguage = SupportedLanguage;
  * Reason: both REACT and WEBPACK_REACT have react as dependency,
  * therefore WEBPACK_REACT has to come first, as it's more specific.
  */
-const supportedTemplates = [{
+export const supportedTemplates = [{
   preset: ProjectType.SFC_VUE,
   dependencies: {
     'vue-loader': versionRange => ltMajor(versionRange, 16),
@@ -244,8 +232,7 @@ const supportedTemplates = [{
 // AnyFramework matchers can be added to this object to give
 // users an "Unsupported framework" message
 
-exports.supportedTemplates = supportedTemplates;
-const unsupportedTemplate = {
+export const unsupportedTemplate = {
   preset: ProjectType.UNSUPPORTED,
   dependencies: {
     // TODO(blaine): Remove when we support Nuxt 3
@@ -257,7 +244,5 @@ const unsupportedTemplate = {
     return dependencies.some(Boolean);
   }
 };
-exports.unsupportedTemplate = unsupportedTemplate;
 const notInstallableProjectTypes = [ProjectType.UNDETECTED, ProjectType.UNSUPPORTED, ProjectType.ALREADY_HAS_STORYBOOK];
-const installableProjectTypes = Object.values(ProjectType).filter(type => !notInstallableProjectTypes.includes(type)).map(type => type.toLowerCase());
-exports.installableProjectTypes = installableProjectTypes;
+export const installableProjectTypes = Object.values(ProjectType).filter(type => !notInstallableProjectTypes.includes(type)).map(type => type.toLowerCase());