@storybook/cli 6.5.9 → 7.0.0-alpha.2

package/dist/{ts3.4 → types}/versions.d.ts

@@ -1,60 +1,76 @@
-declare const _default: {
-    '@storybook/addon-a11y': string;
-    '@storybook/addon-actions': string;
-    '@storybook/addon-backgrounds': string;
-    '@storybook/addon-controls': string;
-    '@storybook/addon-docs': string;
-    '@storybook/addon-essentials': string;
-    '@storybook/addon-interactions': string;
-    '@storybook/addon-jest': string;
-    '@storybook/addon-links': string;
-    '@storybook/addon-measure': string;
-    '@storybook/addon-outline': string;
-    '@storybook/addon-storyshots': string;
-    '@storybook/addon-storyshots-puppeteer': string;
-    '@storybook/addon-storysource': string;
-    '@storybook/addon-toolbars': string;
-    '@storybook/addon-viewport': string;
-    '@storybook/addons': string;
-    '@storybook/angular': string;
-    '@storybook/api': string;
-    '@storybook/builder-webpack4': string;
-    '@storybook/builder-webpack5': string;
-    '@storybook/channel-postmessage': string;
-    '@storybook/channel-websocket': string;
-    '@storybook/channels': string;
-    '@storybook/cli': string;
-    '@storybook/client-api': string;
-    '@storybook/client-logger': string;
-    '@storybook/codemod': string;
-    '@storybook/components': string;
-    '@storybook/core': string;
-    '@storybook/core-client': string;
-    '@storybook/core-common': string;
-    '@storybook/core-events': string;
-    '@storybook/core-server': string;
-    '@storybook/csf-tools': string;
-    '@storybook/docs-tools': string;
-    '@storybook/ember': string;
-    '@storybook/html': string;
-    '@storybook/instrumenter': string;
-    '@storybook/manager-webpack4': string;
-    '@storybook/manager-webpack5': string;
-    '@storybook/node-logger': string;
-    '@storybook/postinstall': string;
-    '@storybook/preact': string;
-    '@storybook/preview-web': string;
-    '@storybook/react': string;
-    '@storybook/router': string;
-    '@storybook/server': string;
-    '@storybook/source-loader': string;
-    '@storybook/store': string;
-    '@storybook/svelte': string;
-    '@storybook/telemetry': string;
-    '@storybook/theming': string;
-    '@storybook/ui': string;
-    '@storybook/vue': string;
-    '@storybook/vue3': string;
-    '@storybook/web-components': string;
-};
-export default _default;
+declare const _default: {
+    '@storybook/addon-a11y': string;
+    '@storybook/addon-actions': string;
+    '@storybook/addon-backgrounds': string;
+    '@storybook/addon-controls': string;
+    '@storybook/addon-docs': string;
+    '@storybook/addon-essentials': string;
+    '@storybook/addon-interactions': string;
+    '@storybook/addon-jest': string;
+    '@storybook/addon-links': string;
+    '@storybook/addon-measure': string;
+    '@storybook/addon-outline': string;
+    '@storybook/addon-storyshots': string;
+    '@storybook/addon-storyshots-puppeteer': string;
+    '@storybook/addon-storysource': string;
+    '@storybook/addon-toolbars': string;
+    '@storybook/addon-viewport': string;
+    '@storybook/addons': string;
+    '@storybook/angular': string;
+    '@storybook/api': string;
+    '@storybook/builder-webpack5': string;
+    '@storybook/channel-postmessage': string;
+    '@storybook/channel-websocket': string;
+    '@storybook/channels': string;
+    '@storybook/cli': string;
+    '@storybook/client-api': string;
+    '@storybook/client-logger': string;
+    '@storybook/codemod': string;
+    '@storybook/components': string;
+    '@storybook/core-client': string;
+    '@storybook/core-common': string;
+    '@storybook/core-events': string;
+    '@storybook/core-server': string;
+    '@storybook/core-webpack': string;
+    '@storybook/csf-tools': string;
+    '@storybook/docs-tools': string;
+    '@storybook/ember': string;
+    '@storybook/html': string;
+    '@storybook/html-webpack5': string;
+    '@storybook/instrumenter': string;
+    '@storybook/manager-webpack5': string;
+    '@storybook/node-logger': string;
+    '@storybook/postinstall': string;
+    '@storybook/preact': string;
+    '@storybook/preact-webpack5': string;
+    '@storybook/preset-html-webpack': string;
+    '@storybook/preset-preact-webpack': string;
+    '@storybook/preset-react-webpack': string;
+    '@storybook/preset-server-webpack': string;
+    '@storybook/preset-svelte-webpack': string;
+    '@storybook/preset-vue-webpack': string;
+    '@storybook/preset-vue3-webpack': string;
+    '@storybook/preset-web-components-webpack': string;
+    '@storybook/preview-web': string;
+    '@storybook/react': string;
+    '@storybook/react-webpack5': string;
+    '@storybook/router': string;
+    '@storybook/server': string;
+    '@storybook/server-webpack5': string;
+    '@storybook/source-loader': string;
+    '@storybook/store': string;
+    '@storybook/svelte': string;
+    '@storybook/svelte-webpack5': string;
+    '@storybook/telemetry': string;
+    '@storybook/theming': string;
+    '@storybook/ui': string;
+    '@storybook/vue': string;
+    '@storybook/vue-webpack5': string;
+    '@storybook/vue3': string;
+    '@storybook/vue3-webpack5': string;
+    '@storybook/web-components': string;
+    '@storybook/web-components-webpack5': string;
+    sb: string;
+    storybook: string;
+};
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "6.5.9",
+  "version": "7.0.0-alpha.2",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",
@@ -47,18 +47,20 @@
   "dependencies": {
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
-    "@storybook/codemod": "6.5.9",
-    "@storybook/core-common": "6.5.9",
-    "@storybook/csf-tools": "6.5.9",
-    "@storybook/node-logger": "6.5.9",
+    "@storybook/codemod": "7.0.0-alpha.2",
+    "@storybook/core-common": "7.0.0-alpha.2",
+    "@storybook/core-server": "7.0.0-alpha.2",
+    "@storybook/csf-tools": "7.0.0-alpha.2",
+    "@storybook/node-logger": "7.0.0-alpha.2",
     "@storybook/semver": "^7.3.2",
-    "@storybook/telemetry": "6.5.9",
+    "@storybook/telemetry": "7.0.0-alpha.2",
     "boxen": "^5.1.2",
     "chalk": "^4.1.0",
     "commander": "^6.2.1",
     "core-js": "^3.8.2",
     "cross-spawn": "^7.0.3",
     "envinfo": "^7.7.3",
+    "execa": "^5.0.0",
     "express": "^4.17.1",
     "find-up": "^5.0.0",
     "fs-extra": "^9.0.1",
@@ -76,7 +78,7 @@
     "update-notifier": "^5.0.1"
   },
   "devDependencies": {
-    "@storybook/client-api": "6.5.9",
+    "@storybook/client-api": "7.0.0-alpha.2",
     "@types/cross-spawn": "^6.0.2",
     "@types/prompts": "^2.0.9",
     "@types/puppeteer-core": "^2.1.0",
@@ -89,5 +91,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e2673f765722cbb542ef1b5cf8d533c8e746a127"
+  "gitHead": "44920e2b6bd51981bac5124743c29fb9f5517e44"
 }

package/dist/cjs/generators/METEOR/index.js

@@ -1,45 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _json = _interopRequireDefault(require("json5"));
-
-var _baseGenerator = require("../baseGenerator");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const generator = async (packageManager, npmOptions, options) => {
-  await (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, options, 'react', {
-    extraPackages: ['react', 'react-dom', '@babel/preset-env', '@babel/preset-react'],
-    staticDir: 'dist'
-  }); // create or update .babelrc
-
-  let babelrc = null;
-
-  if (_fs.default.existsSync('.babelrc')) {
-    const babelrcContent = _fs.default.readFileSync('.babelrc', 'utf8');
-
-    babelrc = _json.default.parse(babelrcContent);
-    babelrc.plugins = babelrc.plugins || [];
-  } else {
-    babelrc = {
-      presets: [['@babel/preset-env', {
-        shippedProposals: true,
-        useBuiltIns: 'usage',
-        corejs: '3'
-      }], '@babel/preset-react']
-    };
-  }
-
-  _fs.default.writeFileSync('.babelrc', JSON.stringify(babelrc, null, 2), 'utf8');
-};
-
-var _default = generator;
-exports.default = _default;

package/dist/cjs/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js

@@ -1,78 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _path = _interopRequireDefault(require("path"));
-
-var _crossSpawn = require("cross-spawn");
-
-var _codemod = require("@storybook/codemod");
-
-var _helpers = require("../../helpers");
-
-var _jsPackageManager = require("../../js-package-manager");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/* eslint-disable no-param-reassign */
-async function updatePackage(packageManager, devDependencies, oldName, newName) {
-  if (devDependencies[oldName]) {
-    delete devDependencies[oldName];
-    devDependencies[newName] = await packageManager.getVersion(newName);
-  }
-}
-
-async function updatePackageJson(packageManager, npmOptions) {
-  const packageJson = packageManager.retrievePackageJson();
-  const {
-    devDependencies
-  } = packageJson;
-  const [actionsVersion, linksVersion] = await packageManager.getVersions('@storybook/addon-actions', '@storybook/addon-links');
-  devDependencies['@storybook/addon-actions'] = actionsVersion;
-  devDependencies['@storybook/addon-links'] = linksVersion;
-  await Promise.all(Object.keys(_codemod.packageNames).map(oldName => {
-    const newName = _codemod.packageNames[oldName];
-    return updatePackage(packageManager, devDependencies, oldName, newName);
-  }));
-
-  if (!devDependencies['@storybook/react'] && !devDependencies['@storybook/react-native']) {
-    throw new Error('Expected to find `@kadira/[react-native]-storybook` in devDependencies');
-  }
-
-  (0, _jsPackageManager.writePackageJson)(packageJson);
-  const babelDependencies = await (0, _helpers.getBabelDependencies)(packageManager, packageJson);
-
-  if (babelDependencies.length > 0) {
-    packageManager.addDependencies(Object.assign({}, npmOptions, {
-      packageJson
-    }), babelDependencies);
-  }
-}
-
-function updateSourceCode(parser) {
-  const jscodeshiftPath = _path.default.dirname(require.resolve('jscodeshift'));
-
-  const jscodeshiftCommand = _path.default.join(jscodeshiftPath, 'bin', 'jscodeshift.sh');
-
-  ['update-organisation-name.js', 'move-builtin-addons.js'].forEach(codemod => {
-    const codemodPath = _path.default.join(_path.default.dirname(require.resolve('@storybook/codemod')), 'transforms', codemod);
-
-    const args = ['-t', codemodPath, '--silent', '--ignore-pattern', '"node_modules|dist"', '.'];
-    if (parser) args.push('--parser', parser);
-    (0, _crossSpawn.sync)(jscodeshiftCommand, args, {
-      stdio: 'inherit'
-    });
-  });
-}
-
-var _default = async (packageManager, parser, npmOptions) => {
-  await updatePackageJson(packageManager, npmOptions);
-  updateSourceCode(parser);
-};
-
-exports.default = _default;

package/dist/esm/generators/METEOR/index.js

@@ -1,45 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _json = _interopRequireDefault(require("json5"));
-
-var _baseGenerator = require("../baseGenerator");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const generator = async (packageManager, npmOptions, options) => {
-  await (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, options, 'react', {
-    extraPackages: ['react', 'react-dom', '@babel/preset-env', '@babel/preset-react'],
-    staticDir: 'dist'
-  }); // create or update .babelrc
-
-  let babelrc = null;
-
-  if (_fs.default.existsSync('.babelrc')) {
-    const babelrcContent = _fs.default.readFileSync('.babelrc', 'utf8');
-
-    babelrc = _json.default.parse(babelrcContent);
-    babelrc.plugins = babelrc.plugins || [];
-  } else {
-    babelrc = {
-      presets: [['@babel/preset-env', {
-        shippedProposals: true,
-        useBuiltIns: 'usage',
-        corejs: '3'
-      }], '@babel/preset-react']
-    };
-  }
-
-  _fs.default.writeFileSync('.babelrc', JSON.stringify(babelrc, null, 2), 'utf8');
-};
-
-var _default = generator;
-exports.default = _default;

package/dist/esm/generators/UPDATE_PACKAGE_ORGANIZATIONS/index.js

@@ -1,78 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _path = _interopRequireDefault(require("path"));
-
-var _crossSpawn = require("cross-spawn");
-
-var _codemod = require("@storybook/codemod");
-
-var _helpers = require("../../helpers");
-
-var _jsPackageManager = require("../../js-package-manager");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/* eslint-disable no-param-reassign */
-async function updatePackage(packageManager, devDependencies, oldName, newName) {
-  if (devDependencies[oldName]) {
-    delete devDependencies[oldName];
-    devDependencies[newName] = await packageManager.getVersion(newName);
-  }
-}
-
-async function updatePackageJson(packageManager, npmOptions) {
-  const packageJson = packageManager.retrievePackageJson();
-  const {
-    devDependencies
-  } = packageJson;
-  const [actionsVersion, linksVersion] = await packageManager.getVersions('@storybook/addon-actions', '@storybook/addon-links');
-  devDependencies['@storybook/addon-actions'] = actionsVersion;
-  devDependencies['@storybook/addon-links'] = linksVersion;
-  await Promise.all(Object.keys(_codemod.packageNames).map(oldName => {
-    const newName = _codemod.packageNames[oldName];
-    return updatePackage(packageManager, devDependencies, oldName, newName);
-  }));
-
-  if (!devDependencies['@storybook/react'] && !devDependencies['@storybook/react-native']) {
-    throw new Error('Expected to find `@kadira/[react-native]-storybook` in devDependencies');
-  }
-
-  (0, _jsPackageManager.writePackageJson)(packageJson);
-  const babelDependencies = await (0, _helpers.getBabelDependencies)(packageManager, packageJson);
-
-  if (babelDependencies.length > 0) {
-    packageManager.addDependencies(Object.assign({}, npmOptions, {
-      packageJson
-    }), babelDependencies);
-  }
-}
-
-function updateSourceCode(parser) {
-  const jscodeshiftPath = _path.default.dirname(require.resolve('jscodeshift'));
-
-  const jscodeshiftCommand = _path.default.join(jscodeshiftPath, 'bin', 'jscodeshift.sh');
-
-  ['update-organisation-name.js', 'move-builtin-addons.js'].forEach(codemod => {
-    const codemodPath = _path.default.join(_path.default.dirname(require.resolve('@storybook/codemod')), 'transforms', codemod);
-
-    const args = ['-t', codemodPath, '--silent', '--ignore-pattern', '"node_modules|dist"', '.'];
-    if (parser) args.push('--parser', parser);
-    (0, _crossSpawn.sync)(jscodeshiftCommand, args, {
-      stdio: 'inherit'
-    });
-  });
-}
-
-var _default = async (packageManager, parser, npmOptions) => {
-  await updatePackageJson(packageManager, npmOptions);
-  updateSourceCode(parser);
-};
-
-exports.default = _default;

package/dist/modern/NpmOptions.js

@@ -1 +0,0 @@
-"use strict";

package/dist/modern/add.js

@@ -1,151 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.add = add;
-exports.storybookAddonScope = exports.getPackageName = exports.getPackageArg = exports.getInstalledStorybookVersion = exports.addStorybookAddonToFile = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _path = _interopRequireDefault(require("path"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _crossSpawn = require("cross-spawn");
-
-var _helpers = require("./helpers");
-
-var _jsPackageManager = require("./js-package-manager");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const logger = console;
-const storybookAddonScope = '@storybook/addon-';
-exports.storybookAddonScope = storybookAddonScope;
-
-const isAddon = async (packageManager, name) => {
-  try {
-    await packageManager.latestVersion(name);
-    return true;
-  } catch (e) {
-    return false;
-  }
-};
-
-const isStorybookAddon = async (packageManager, name) => isAddon(packageManager, `${storybookAddonScope}${name}`);
-
-const getPackageName = (addonName, isOfficialAddon) => isOfficialAddon ? storybookAddonScope + addonName : addonName;
-
-exports.getPackageName = getPackageName;
-
-const getInstalledStorybookVersion = packageJson => packageJson.devDependencies[// This only considers the first occurrence.
-Object.keys(packageJson.devDependencies).find(devDep => /@storybook/.test(devDep))] || false;
-
-exports.getInstalledStorybookVersion = getInstalledStorybookVersion;
-
-const getPackageArg = (addonName, isOfficialAddon, packageJson) => {
-  if (isOfficialAddon) {
-    const addonNameNoTag = addonName.split('@')[0];
-    const installedStorybookVersion = getInstalledStorybookVersion(packageJson);
-    return installedStorybookVersion ? `${addonNameNoTag}@${getInstalledStorybookVersion(packageJson)}` : addonName;
-  }
-
-  return addonName;
-};
-
-exports.getPackageArg = getPackageArg;
-
-const installAddon = (packageManager, addonName, isOfficialAddon) => {
-  const prepareDone = (0, _helpers.commandLog)(`Preparing to install the ${addonName} Storybook addon`);
-  prepareDone();
-  logger.log();
-  const packageArg = getPackageArg(addonName, isOfficialAddon, packageManager.retrievePackageJson());
-  logger.log();
-  const installDone = (0, _helpers.commandLog)(`Installing the ${addonName} Storybook addon`);
-
-  try {
-    packageManager.addDependencies({}, [packageArg]);
-  } catch (e) {
-    installDone(`Something went wrong installing the addon: "${getPackageName(addonName, isOfficialAddon)}"`);
-    logger.log();
-    process.exit(1);
-  }
-
-  installDone();
-};
-
-const addStorybookAddonToFile = (addonName, addonsFile, isOfficialAddon) => {
-  const addonNameNoTag = addonName.split('@')[0];
-  const alreadyRegistered = addonsFile.find(line => line.includes(`${addonNameNoTag}/manager`));
-
-  if (alreadyRegistered) {
-    return addonsFile;
-  }
-
-  const latestImportIndex = addonsFile.reduce((prev, curr, currIndex) => curr.startsWith('import') && curr.includes('register') ? currIndex : prev, -1);
-  return [...addonsFile.slice(0, latestImportIndex + 1), `import '${getPackageName(addonNameNoTag, isOfficialAddon)}/manager';`, ...addonsFile.slice(latestImportIndex + 1)];
-};
-
-exports.addStorybookAddonToFile = addStorybookAddonToFile;
-const LEGACY_CONFIGS = ['addons', 'config', 'presets'];
-
-const postinstallAddon = async (addonName, isOfficialAddon) => {
-  let skipMsg = null;
-
-  if (!isOfficialAddon) {
-    skipMsg = 'unofficial addon';
-  } else if (!_fs.default.existsSync('.storybook')) {
-    skipMsg = 'no .storybook config';
-  } else {
-    skipMsg = 'no codmods found';
-    LEGACY_CONFIGS.forEach(config => {
-      try {
-        const codemod = require.resolve(`${getPackageName(addonName, isOfficialAddon)}/postinstall/${config}.js`);
-
-        (0, _helpers.commandLog)(`Running postinstall script for ${addonName}`)();
-
-        let configFile = _path.default.join('.storybook', `${config}.ts`);
-
-        if (!_fs.default.existsSync(configFile)) {
-          configFile = _path.default.join('.storybook', `${config}.js`);
-
-          if (!_fs.default.existsSync(configFile)) {
-            _fs.default.writeFileSync(configFile, '', 'utf8');
-          }
-        }
-
-        (0, _crossSpawn.sync)('npx', ['jscodeshift', '-t', codemod, configFile], {
-          stdio: 'inherit'
-        });
-        skipMsg = null;
-      } catch (err) {// resolve failed, skip
-      }
-    });
-  }
-
-  if (skipMsg) {
-    (0, _helpers.commandLog)(`Skipping postinstall for ${addonName}, ${skipMsg}`)();
-  }
-};
-
-async function add(addonName, options) {
-  const packageManager = _jsPackageManager.JsPackageManagerFactory.getPackageManager(options.useNpm);
-
-  const addonCheckDone = (0, _helpers.commandLog)(`Verifying that ${addonName} is an addon`);
-  const isOfficialAddon = await isStorybookAddon(packageManager, addonName);
-
-  if (!isOfficialAddon) {
-    if (!(await isAddon(packageManager, addonName))) {
-      addonCheckDone(`The provided package was not a Storybook addon: ${addonName}.`);
-      return;
-    }
-  }
-
-  addonCheckDone();
-  installAddon(packageManager, addonName, isOfficialAddon);
-
-  if (!options.skipPostinstall) {
-    await postinstallAddon(addonName, isOfficialAddon);
-  }
-}