@storybook/cli 7.0.0-alpha.3 → 7.0.0-alpha.30

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

@@ -6,17 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 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 _path = _interopRequireDefault(require("path"));
 
-var _PackageJsonHelper = require("./PackageJsonHelper");
+var _fs = _interopRequireDefault(require("fs"));
+
+var _helpers = require("../helpers");
 
 var _versions = _interopRequireDefault(require("../versions"));
 
@@ -44,13 +44,31 @@ function getPackageDetails(pkg) {
 }
 
 class JsPackageManager {
-  constructor() {
-    this.type = void 0;
+  // NOTE: for some reason yarn prefers the npm registry in
+  // local development, so always use npm
+  setRegistryURL(url) {
+    if (url) {
+      this.executeCommand('npm', ['config', 'set', 'registry', url]);
+    } else {
+      this.executeCommand('npm', ['config', 'delete', 'registry']);
+    }
   }
 
+  getRegistryURL() {
+    const url = this.executeCommand('npm', ['config', 'get', 'registry']).trim();
+    return url === 'undefined' ? undefined : url;
+  }
+
+  constructor(options) {
+    this.type = void 0;
+    this.cwd = void 0;
+    this.cwd = options === null || options === void 0 ? void 0 : options.cwd;
+  }
   /**
    * Install dependencies listed in `package.json`
    */
+
+
   installDependencies() {
     let done = (0, _helpers.commandLog)('Preparing to install dependencies');
     done();
@@ -67,6 +85,28 @@ class JsPackageManager {
 
     done();
   }
+
+  packageJsonPath() {
+    return this.cwd ? _path.default.resolve(this.cwd, 'package.json') : _path.default.resolve('package.json');
+  }
+
+  readPackageJson() {
+    const packageJsonPath = this.packageJsonPath();
+
+    if (!_fs.default.existsSync(packageJsonPath)) {
+      throw new Error(`Could not read package.json file at ${packageJsonPath}`);
+    }
+
+    const jsonContent = _fs.default.readFileSync(packageJsonPath, 'utf8');
+
+    return JSON.parse(jsonContent);
+  }
+
+  writePackageJson(packageJson) {
+    const content = `${JSON.stringify(packageJson, null, 2)}\n`;
+
+    _fs.default.writeFileSync(this.packageJsonPath(), content, 'utf8');
+  }
   /**
    * Read the `package.json` file available in the directory the command was call from
    * If there is no `package.json` it will create one.
@@ -77,10 +117,10 @@ class JsPackageManager {
     let packageJson;
 
     try {
-      packageJson = (0, _PackageJsonHelper.readPackageJson)();
+      packageJson = this.readPackageJson();
     } catch (err) {
       this.initPackageJson();
-      packageJson = (0, _PackageJsonHelper.readPackageJson)();
+      packageJson = this.readPackageJson();
     }
 
     return Object.assign({}, packageJson, {
@@ -125,7 +165,7 @@ class JsPackageManager {
         packageJson.dependencies = Object.assign({}, packageJson.dependencies, dependenciesMap);
       }
 
-      (0, _PackageJsonHelper.writePackageJson)(packageJson);
+      this.writePackageJson(packageJson);
     } else {
       try {
         this.runAddDeps(dependencies, options.installAsDevDependencies);
@@ -136,6 +176,48 @@ class JsPackageManager {
       }
     }
   }
+  /**
+   * Remove dependencies from a project using `yarn remove` or `npm uninstall`.
+   *
+   * @param {Object} options contains `skipInstall`, `packageJson` and `installAsDevDependencies` which we use to determine how we install packages.
+   * @param {Array} dependencies contains a list of packages to remove.
+   * @example
+   * removeDependencies(options, [
+   *   `@storybook/react`,
+   *   `@storybook/addon-actions`,
+   * ]);
+   */
+
+
+  removeDependencies(options, dependencies) {
+    const {
+      skipInstall
+    } = options;
+
+    if (skipInstall) {
+      const {
+        packageJson
+      } = options;
+      dependencies.forEach(dep => {
+        if (packageJson.devDependencies) {
+          delete packageJson.devDependencies[dep];
+        }
+
+        if (packageJson.dependencies) {
+          delete packageJson.dependencies[dep];
+        }
+      });
+      this.writePackageJson(packageJson);
+    } else {
+      try {
+        this.runRemoveDeps(dependencies);
+      } catch (e) {
+        logger.error('An error occurred while removing dependencies.');
+        logger.log(e.message);
+        process.exit(1);
+      }
+    }
+  }
   /**
    * Return an array of strings matching following format: `<package_name>@<package_latest_version>`
    *
@@ -218,9 +300,7 @@ class JsPackageManager {
   }
 
   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 sbPort = (options === null || options === void 0 ? 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;
@@ -234,7 +314,7 @@ class JsPackageManager {
     var _packageJson$eslintCo;
 
     const packageJson = this.retrievePackageJson();
-    (0, _PackageJsonHelper.writePackageJson)(Object.assign({}, packageJson, {
+    this.writePackageJson(Object.assign({}, packageJson, {
       eslintConfig: Object.assign({}, packageJson.eslintConfig, {
         overrides: [...(((_packageJson$eslintCo = packageJson.eslintConfig) === null || _packageJson$eslintCo === void 0 ? void 0 : _packageJson$eslintCo.overrides) || []), {
           files: ['**/*.stories.*'],
@@ -248,26 +328,29 @@ class JsPackageManager {
 
   addScripts(scripts) {
     const packageJson = this.retrievePackageJson();
-    (0, _PackageJsonHelper.writePackageJson)(Object.assign({}, packageJson, {
+    this.writePackageJson(Object.assign({}, packageJson, {
       scripts: Object.assign({}, packageJson.scripts, scripts)
     }));
   }
 
-  executeCommand(command, args, stdio) {
-    var _commandResult$stdout;
+  addPackageResolutions(versions) {
+    const packageJson = this.retrievePackageJson();
+    const resolutions = this.getResolutions(packageJson, versions);
+    this.writePackageJson(Object.assign({}, packageJson, resolutions));
+  }
 
+  executeCommand(command, args, stdio) {
     const commandResult = (0, _crossSpawn.sync)(command, args, {
-      stdio: stdio !== null && stdio !== void 0 ? stdio : 'pipe',
+      cwd: this.cwd,
+      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 ?? '';
   }
 
 }

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

@@ -16,21 +16,31 @@ var _Yarn2Proxy = require("./Yarn2Proxy");
 var _Yarn1Proxy = require("./Yarn1Proxy");
 
 class JsPackageManagerFactory {
-  static getPackageManager(forceNpmUsage = false) {
+  static getPackageManager(forceNpmUsage = false, cwd) {
     if (forceNpmUsage) {
-      return new _NPMProxy.NPMProxy();
+      return new _NPMProxy.NPMProxy({
+        cwd
+      });
     }
 
-    const yarnVersion = getYarnVersion();
-    const hasYarnLockFile = (0, _findUp.sync)('yarn.lock');
-    const hasNPMCommand = hasNPM();
+    const yarnVersion = getYarnVersion(cwd);
+    const hasYarnLockFile = (0, _findUp.sync)('yarn.lock', {
+      cwd
+    });
+    const hasNPMCommand = hasNPM(cwd);
 
     if (yarnVersion && (hasYarnLockFile || !hasNPMCommand)) {
-      return yarnVersion === 1 ? new _Yarn1Proxy.Yarn1Proxy() : new _Yarn2Proxy.Yarn2Proxy();
+      return yarnVersion === 1 ? new _Yarn1Proxy.Yarn1Proxy({
+        cwd
+      }) : new _Yarn2Proxy.Yarn2Proxy({
+        cwd
+      });
     }
 
     if (hasNPMCommand) {
-      return new _NPMProxy.NPMProxy();
+      return new _NPMProxy.NPMProxy({
+        cwd
+      });
     }
 
     throw new Error('Unable to find a usable package manager within NPM, Yarn and Yarn 2');
@@ -40,13 +50,17 @@ class JsPackageManagerFactory {
 
 exports.JsPackageManagerFactory = JsPackageManagerFactory;
 
-function hasNPM() {
-  const npmVersionCommand = (0, _crossSpawn.sync)('npm', ['--version']);
+function hasNPM(cwd) {
+  const npmVersionCommand = (0, _crossSpawn.sync)('npm', ['--version'], {
+    cwd
+  });
   return npmVersionCommand.status === 0;
 }
 
-function getYarnVersion() {
-  const yarnVersionCommand = (0, _crossSpawn.sync)('yarn', ['--version']);
+function getYarnVersion(cwd) {
+  const yarnVersionCommand = (0, _crossSpawn.sync)('yarn', ['--version'], {
+    cwd
+  });
 
   if (yarnVersionCommand.status !== 0) {
     return undefined;

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

@@ -16,6 +16,7 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     super(...args);
     this.type = 'npm';
     this.installArgs = void 0;
+    this.uninstallArgs = void 0;
   }
 
   initPackageJson() {
@@ -30,15 +31,45 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     return `npm run ${command}`;
   }
 
+  getNpmVersion() {
+    return this.executeCommand('npm', ['--version']);
+  }
+
+  hasLegacyPeerDeps() {
+    const result = this.executeCommand('npm', ['config', 'get', 'legacy-peer-deps', '--location=project']);
+    return result.trim() === 'true';
+  }
+
+  setLegacyPeerDeps() {
+    this.executeCommand('npm', ['config', 'set', 'legacy-peer-deps=true', '--location=project']);
+  }
+
+  needsLegacyPeerDeps(version) {
+    return _semver.default.gte(version, '7.0.0') && !this.hasLegacyPeerDeps();
+  }
+
   getInstallArgs() {
     if (!this.installArgs) {
-      const version = this.executeCommand('npm', ['--version']);
-      this.installArgs = _semver.default.gte(version, '7.0.0') ? ['install', '--legacy-peer-deps'] : ['install'];
+      this.installArgs = this.needsLegacyPeerDeps(this.getNpmVersion()) ? ['install', '--legacy-peer-deps'] : ['install'];
     }
 
     return this.installArgs;
   }
 
+  getUninstallArgs() {
+    if (!this.uninstallArgs) {
+      this.uninstallArgs = this.needsLegacyPeerDeps(this.getNpmVersion()) ? ['uninstall', '--legacy-peer-deps'] : ['uninstall'];
+    }
+
+    return this.uninstallArgs;
+  }
+
+  getResolutions(packageJson, versions) {
+    return {
+      overrides: Object.assign({}, packageJson.overrides, versions)
+    };
+  }
+
   runInstall() {
     this.executeCommand('npm', this.getInstallArgs(), 'inherit');
   }
@@ -53,6 +84,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]);

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

@@ -25,6 +25,12 @@ class Yarn1Proxy extends _JsPackageManager.JsPackageManager {
     return `yarn ${command}`;
   }
 
+  getResolutions(packageJson, versions) {
+    return {
+      resolutions: Object.assign({}, packageJson.resolutions, versions)
+    };
+  }
+
   runInstall() {
     this.executeCommand('yarn', [], 'inherit');
   }
@@ -39,6 +45,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]);

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

@@ -25,6 +25,12 @@ class Yarn2Proxy extends _JsPackageManager.JsPackageManager {
     return `yarn ${command}`;
   }
 
+  getResolutions(packageJson, versions) {
+    return {
+      resolutions: Object.assign({}, packageJson.resolutions, versions)
+    };
+  }
+
   runInstall() {
     this.executeCommand('yarn', [], 'inherit');
   }
@@ -39,6 +45,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'];

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

@@ -41,17 +41,4 @@ Object.keys(_PackageJson).forEach(function (key) {
       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];
-    }
-  });
 });

package/dist/cjs/link.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.link = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
 var _path = _interopRequireDefault(require("path"));
@@ -21,7 +19,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const link = async ({
   target,
-  local
+  local,
+  start
 }) => {
   const storybookDir = process.cwd();
 
@@ -88,11 +87,13 @@ const link = async ({
     cwd: reproDir
   });
 
-  _nodeLogger.logger.info(`Running ${reproName} storybook`);
+  if (start) {
+    _nodeLogger.logger.info(`Running ${reproName} storybook`);
 
-  await (0, _scripts.exec)(`yarn run storybook`, {
-    cwd: reproDir
-  });
+    await (0, _scripts.exec)(`yarn run storybook`, {
+      cwd: reproDir
+    });
+  }
 };
 
 exports.link = link;

package/dist/cjs/migrate.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.migrate = migrate;
 
-require("core-js/modules/es.promise.js");
-
 var _codemod = require("@storybook/codemod");
 
 async function migrate(migration, {

package/dist/cjs/repro-generators/scripts.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.exec = exports.createAndInit = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _path = _interopRequireDefault(require("path"));
 
 var _fsExtra = require("fs-extra");
@@ -28,14 +26,17 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 const logger = console;
-const useLocalSbCli = true;
 
 const exec = async (command, options = {}, {
   startMessage,
-  errorMessage
+  errorMessage,
+  dryRun
 } = {}) => {
-  if (startMessage) {
-    logger.info(startMessage);
+  if (startMessage) logger.info(startMessage);
+
+  if (dryRun) {
+    logger.info(`\n> ${command}\n`);
+    return undefined;
   }
 
   logger.debug(command);
@@ -50,7 +51,6 @@ const exec = async (command, options = {}, {
     }));
 
     child.stderr.pipe(process.stderr);
-    child.stdout.pipe(process.stdout);
     child.on('exit', code => {
       if (code === 0) {
         resolve(undefined);
@@ -138,7 +138,7 @@ const configureYarn2ForE2E = async ({
   cwd
 }) => {
   const command = [// ⚠️ Need to set registry because Yarn 2 is not using the conf of Yarn 1 (URL is hardcoded in CircleCI config.yml)
-  `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6000/" } }'`, // Some required magic to be able to fetch deps from local registry
+  `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6001/" } }'`, // Some required magic to be able to fetch deps from local registry
   `yarn config set unsafeHttpWhitelist --json '["localhost"]'`, // Disable fallback mode to make sure everything is required correctly
   `yarn config set pnpFallbackMode none`, // We need to be able to update lockfile when bootstrapping the examples
   `yarn config set enableImmutableInstalls false`, // Discard all YN0013 - FETCH_NOT_CACHED messages
@@ -200,7 +200,7 @@ const initStorybook = async ({
     flags.push('--use-pnp');
   }
 
-  const sbCLICommand = useLocalSbCli ? `node ${_path.default.join(__dirname, '../../esm/generate')}` : `yarn dlx -p @storybook/cli sb`;
+  const sbCLICommand = `node ${_path.default.join(__dirname, '../../cjs/generate')}`;
   const command = `${sbCLICommand} init ${flags.join(' ')}`;
   await exec(command, {
     cwd
@@ -265,10 +265,25 @@ const doTask = async (task, options, condition = true) => {
   }
 };
 
+const registryUrlNPM = url => {
+  const args = ['config', 'set', 'registry', url];
+  return exec(`npm ${args.join(' ')}`, {
+    cwd: _path.default.join(process.cwd(), '..')
+  });
+};
+
+const registryUrlYarn = url => {
+  const args = ['config', 'set', 'npmRegistryServer', url];
+  return exec(`yarn ${args.join(' ')}`, {
+    cwd: _path.default.join(__dirname, '..')
+  });
+};
+
 const createAndInit = async (cwd, _ref, {
   e2e,
   pnp,
-  local
+  local,
+  registry
 }) => {
   let {
     name,
@@ -311,6 +326,12 @@ const createAndInit = async (cwd, _ref, {
 
   await doTask(addTypescript, options, !!options.typescript);
   await doTask(addRequiredDeps, options);
+
+  if (registry) {
+    await registryUrlNPM(registry);
+    await registryUrlYarn(registry);
+  }
+
   await doTask(initStorybook, options);
 };