@storybook/cli 7.0.0-alpha.2 → 7.0.0-alpha.20

package/dist/esm/automigrate/fixes/webpack5.js

@@ -1,24 +1,8 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.webpack5 = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
-
-var _semver = _interopRequireDefault(require("@storybook/semver"));
-
-var _csfTools = require("@storybook/csf-tools");
-
-var _coreCommon = require("@storybook/core-common");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+import chalk from 'chalk';
+import { dedent } from 'ts-dedent';
+import semver from '@storybook/semver';
+import { readConfig, writeConfig } from '@storybook/csf-tools';
+import { getStorybookInfo } from '@storybook/core-common';
 const logger = console;
 
 /**
@@ -31,40 +15,38 @@ const logger = console;
  * - Add core.builder = 'webpack5' to main.js
  * - Add 'webpack5' as a project dependency
  */
-const webpack5 = {
+export const webpack5 = {
   id: 'webpack5',
 
   async checkWebpack5Builder(packageJson) {
-    var _semver$coerce;
-
     const {
       mainConfig,
       version: storybookVersion
-    } = (0, _coreCommon.getStorybookInfo)(packageJson);
-    const storybookCoerced = storybookVersion && ((_semver$coerce = _semver.default.coerce(storybookVersion)) === null || _semver$coerce === void 0 ? void 0 : _semver$coerce.version);
+    } = getStorybookInfo(packageJson);
+    const storybookCoerced = storybookVersion && semver.coerce(storybookVersion)?.version;
 
     if (!storybookCoerced) {
-      logger.warn((0, _tsDedent.default)`
-        ❌ Unable to determine storybook version, skipping ${_chalk.default.cyan('webpack5')} fix.
+      logger.warn(dedent`
+        ❌ Unable to determine storybook version, skipping ${chalk.cyan('webpack5')} fix.
         🤔 Are you running automigrate from your project directory?
       `);
       return null;
     }
 
-    if (_semver.default.lt(storybookCoerced, '6.3.0')) {
-      logger.warn((0, _tsDedent.default)`
+    if (semver.lt(storybookCoerced, '6.3.0')) {
+      logger.warn(dedent`
           Detected SB 6.3 or below, please upgrade storybook to use webpack5.
 
           To upgrade to the latest stable release, run this from your project directory:
 
-          ${_chalk.default.cyan('npx storybook upgrade')}
+          ${chalk.cyan('npx storybook upgrade')}
 
-          Add the ${_chalk.default.cyan('--prerelease')} flag to get the latest prerelease.
+          Add the ${chalk.cyan('--prerelease')} flag to get the latest prerelease.
         `.trim());
       return null;
     }
 
-    if (_semver.default.gte(storybookCoerced, '7.0.0')) {
+    if (semver.gte(storybookCoerced, '7.0.0')) {
       return null;
     }
 
@@ -73,7 +55,7 @@ const webpack5 = {
       return null;
     }
 
-    const main = await (0, _csfTools.readConfig)(mainConfig);
+    const main = await readConfig(mainConfig);
     const builder = main.getFieldValue(['core', 'builder']);
 
     if (builder && builder !== 'webpack4') {
@@ -90,16 +72,14 @@ const webpack5 = {
   async check({
     packageManager
   }) {
-    var _semver$coerce2;
-
     const packageJson = packageManager.retrievePackageJson();
     const {
       dependencies,
       devDependencies
     } = packageJson;
     const webpackVersion = dependencies.webpack || devDependencies.webpack;
-    const webpackCoerced = (_semver$coerce2 = _semver.default.coerce(webpackVersion)) === null || _semver$coerce2 === void 0 ? void 0 : _semver$coerce2.version;
-    if (!webpackCoerced || _semver.default.lt(webpackCoerced, '5.0.0') || _semver.default.gte(webpackCoerced, '6.0.0')) return null;
+    const webpackCoerced = semver.coerce(webpackVersion)?.version;
+    if (!webpackCoerced || semver.lt(webpackCoerced, '5.0.0') || semver.gte(webpackCoerced, '6.0.0')) return null;
     const builderInfo = await this.checkWebpack5Builder(packageJson);
     return builderInfo ? Object.assign({
       webpackVersion
@@ -109,15 +89,14 @@ const webpack5 = {
   prompt({
     webpackVersion
   }) {
-    const webpackFormatted = _chalk.default.cyan(`webpack ${webpackVersion}`);
-
-    return (0, _tsDedent.default)`
+    const webpackFormatted = chalk.cyan(`webpack ${webpackVersion}`);
+    return dedent`
       We've detected you're running ${webpackFormatted}.
       Your Storybook's main.js files specifies webpack4, which is incompatible.
       
-      To run Storybook in webpack5-mode, we can install Storybook's ${_chalk.default.cyan('@storybook/builder-webpack5')} for you.
+      To run Storybook in webpack5-mode, we can install Storybook's ${chalk.cyan('@storybook/builder-webpack5')} for you.
 
-      More info: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack-5-manager-build')}
+      More info: ${chalk.yellow('https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack-5-manager-build')}
     `;
   },
 
@@ -130,7 +109,7 @@ const webpack5 = {
     packageManager,
     dryRun
   }) {
-    const deps = [`@storybook/manager-webpack5@${storybookVersion}`, `@storybook/builder-webpack5@${storybookVersion}`]; // this also gets called by 'cra5' fix so we need to add
+    const deps = [`@storybook/builder-webpack5@${storybookVersion}`]; // this also gets called by 'cra5' fix so we need to add
     // webpack5 at the project root so that it gets hoisted
 
     if (!webpackVersion) {
@@ -145,9 +124,8 @@ const webpack5 = {
 
     if (!dryRun) {
       main.setFieldValue(['core', 'builder'], '@storybook/builder-webpack5');
-      await (0, _csfTools.writeConfig)(main);
+      await writeConfig(main);
     }
   }
 
-};
-exports.webpack5 = webpack5;
+};

package/dist/esm/automigrate/helpers/getEslintInfo.js

@@ -1,28 +1,14 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.findEslintFile = exports.SUPPORTED_ESLINT_EXTENSIONS = void 0;
-
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const SUPPORTED_ESLINT_EXTENSIONS = ['js', 'cjs'];
-exports.SUPPORTED_ESLINT_EXTENSIONS = SUPPORTED_ESLINT_EXTENSIONS;
+import fse from 'fs-extra';
+export const SUPPORTED_ESLINT_EXTENSIONS = ['js', 'cjs'];
 const UNSUPPORTED_ESLINT_EXTENSIONS = ['yaml', 'yml', 'json'];
-
-const findEslintFile = () => {
+export const findEslintFile = () => {
   const filePrefix = '.eslintrc';
-  const unsupportedExtension = UNSUPPORTED_ESLINT_EXTENSIONS.find(ext => _fsExtra.default.existsSync(`${filePrefix}.${ext}`));
+  const unsupportedExtension = UNSUPPORTED_ESLINT_EXTENSIONS.find(ext => fse.existsSync(`${filePrefix}.${ext}`));
 
   if (unsupportedExtension) {
     throw new Error(unsupportedExtension);
   }
 
-  const extension = SUPPORTED_ESLINT_EXTENSIONS.find(ext => _fsExtra.default.existsSync(`${filePrefix}.${ext}`));
+  const extension = SUPPORTED_ESLINT_EXTENSIONS.find(ext => fse.existsSync(`${filePrefix}.${ext}`));
   return extension ? `${filePrefix}.${extension}` : null;
-};
-
-exports.findEslintFile = findEslintFile;
+};

package/dist/esm/automigrate/index.js

@@ -1,39 +1,21 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.automigrate = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _prompts = _interopRequireDefault(require("prompts"));
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _boxen = _interopRequireDefault(require("boxen"));
-
-var _jsPackageManager = require("../js-package-manager");
-
-var _fixes = require("./fixes");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /* eslint-disable no-await-in-loop */
+import prompts from 'prompts';
+import chalk from 'chalk';
+import boxen from 'boxen';
+import { JsPackageManagerFactory } from '../js-package-manager';
+import { fixes } from './fixes';
 const logger = console;
-
-const automigrate = async ({
+export const automigrate = async ({
   fixId,
   dryRun,
   yes
 } = {}) => {
-  const packageManager = _jsPackageManager.JsPackageManagerFactory.getPackageManager();
-
-  const filtered = fixId ? _fixes.fixes.filter(f => f.id === fixId) : _fixes.fixes;
+  const packageManager = JsPackageManagerFactory.getPackageManager();
+  const filtered = fixId ? fixes.filter(f => f.id === fixId) : fixes;
   logger.info('🔎 checking possible migrations..');
 
   for (let i = 0; i < filtered.length; i += 1) {
-    const f = _fixes.fixes[i];
+    const f = fixes[i];
     let result;
 
     try {
@@ -45,10 +27,10 @@ const automigrate = async ({
     }
 
     if (result) {
-      logger.info(`🔎 found a '${_chalk.default.cyan(f.id)}' migration:`);
+      logger.info(`🔎 found a '${chalk.cyan(f.id)}' migration:`);
       logger.info();
       const message = f.prompt(result);
-      logger.info((0, _boxen.default)(message, {
+      logger.info(boxen(message, {
         borderStyle: 'round',
         padding: 1,
         borderColor: '#F1618C'
@@ -64,10 +46,10 @@ const automigrate = async ({
           fix: true
         };
       } else {
-        runAnswer = await (0, _prompts.default)({
+        runAnswer = await prompts({
           type: 'confirm',
           name: 'fix',
-          message: `Do you want to run the '${_chalk.default.cyan(f.id)}' migration on your project?`
+          message: `Do you want to run the '${chalk.cyan(f.id)}' migration on your project?`
         });
       }
 
@@ -78,16 +60,16 @@ const automigrate = async ({
             packageManager,
             dryRun
           });
-          logger.info(`✅ ran ${_chalk.default.cyan(f.id)} migration`);
+          logger.info(`✅ ran ${chalk.cyan(f.id)} migration`);
         } catch (error) {
-          logger.info(`❌ error when running ${_chalk.default.cyan(f.id)} migration:`);
-          logger.info(error.message);
+          logger.info(`❌ error when running ${chalk.cyan(f.id)} migration:`);
+          logger.info(error);
           logger.info();
         }
       } else {
-        logger.info(`Skipping the ${_chalk.default.cyan(f.id)} migration.`);
+        logger.info(`Skipping the ${chalk.cyan(f.id)} migration.`);
         logger.info();
-        logger.info(`If you change your mind, run '${_chalk.default.cyan('npx storybook@next automigrate')}'`);
+        logger.info(`If you change your mind, run '${chalk.cyan('npx storybook@next automigrate')}'`);
       }
     }
   }
@@ -95,6 +77,4 @@ const automigrate = async ({
   logger.info();
   logger.info('✅ migration check successfully ran');
   logger.info();
-};
-
-exports.automigrate = automigrate;
+};

package/dist/esm/automigrate/types.js

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

package/dist/esm/babel-config.js

@@ -1,51 +1,30 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.generateStorybookBabelConfigInCWD = exports.generateStorybookBabelConfig = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _fsExtra = require("fs-extra");
-
-var _nodeLogger = require("@storybook/node-logger");
-
-var _path = _interopRequireDefault(require("path"));
-
-var _prompts = _interopRequireDefault(require("prompts"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const generateStorybookBabelConfigInCWD = async () => {
+import { writeFile, access } from 'fs-extra';
+import { logger } from '@storybook/node-logger';
+import path from 'path';
+import prompts from 'prompts';
+export const generateStorybookBabelConfigInCWD = async () => {
   const target = process.cwd();
   return generateStorybookBabelConfig({
     target
   });
 };
-
-exports.generateStorybookBabelConfigInCWD = generateStorybookBabelConfigInCWD;
-
-const generateStorybookBabelConfig = async ({
+export const generateStorybookBabelConfig = async ({
   target
 }) => {
-  _nodeLogger.logger.info(`Generating the storybook default babel config at ${target}`);
-
+  logger.info(`Generating the storybook default babel config at ${target}`);
   const contents = JSON.stringify({
     sourceType: 'unambiguous',
     presets: [],
     plugins: []
   }, null, 2);
   const fileName = '.babelrc.json';
-
-  const location = _path.default.join(target, fileName);
-
-  const exists = await (0, _fsExtra.access)(location).then(() => true, () => false);
+  const location = path.join(target, fileName);
+  const exists = await access(location).then(() => true, () => false);
 
   if (exists) {
     const {
       overwrite
-    } = await (0, _prompts.default)({
+    } = await prompts({
       type: 'confirm',
       initial: true,
       name: 'overwrite',
@@ -53,15 +32,11 @@ const generateStorybookBabelConfig = async ({
     });
 
     if (overwrite === false) {
-      _nodeLogger.logger.warn(`Cancelled, babel config file was NOT written to file-system.`);
-
+      logger.warn(`Cancelled, babel config file was NOT written to file-system.`);
       return;
     }
   }
 
-  _nodeLogger.logger.info(`Writing file to ${location}`);
-
-  await (0, _fsExtra.writeFile)(location, contents);
-};
-
-exports.generateStorybookBabelConfig = generateStorybookBabelConfig;
+  logger.info(`Writing file to ${location}`);
+  await writeFile(location, contents);
+};

package/dist/esm/build.js

@@ -1,38 +1,22 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.build = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _readPkgUp = require("read-pkg-up");
-
-var _nodeLogger = require("@storybook/node-logger");
-
-var _coreServer = require("@storybook/core-server");
-
-var _coreCommon = require("@storybook/core-common");
-
-const build = async cliOptions => {
+import { sync as readUpSync } from 'read-pkg-up';
+import { logger } from '@storybook/node-logger';
+import { buildStaticStandalone } from '@storybook/core-server';
+import { cache } from '@storybook/core-common';
+export const build = async cliOptions => {
   try {
-    await (0, _coreServer.buildStaticStandalone)(Object.assign({}, cliOptions, {
+    await buildStaticStandalone(Object.assign({}, cliOptions, {
       configDir: cliOptions.configDir || './.storybook',
       outputDir: cliOptions.outputDir || './storybook-static',
       ignorePreview: !!cliOptions.previewUrl && !cliOptions.forceBuildPreview,
       docsMode: !!cliOptions.docs,
       configType: 'PRODUCTION',
-      cache: _coreCommon.cache,
-      packageJson: (0, _readPkgUp.sync)({
+      cache,
+      packageJson: readUpSync({
         cwd: __dirname
       }).packageJson
     }));
   } catch (e) {
-    _nodeLogger.logger.error(e);
-
+    logger.error(e);
     process.exit(1);
   }
-};
-
-exports.build = build;
+};

package/dist/esm/detect-nextjs.js

@@ -1,12 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.detectNextJS = void 0;
 const regex = /[\s"\n]next.*?(\d+).*/;
-
-const detectNextJS = packageManager => {
+export const detectNextJS = packageManager => {
   try {
     let out = '';
 
@@ -28,6 +21,4 @@ const detectNextJS = packageManager => {
   }
 
   return false;
-};
-
-exports.detectNextJS = detectNextJS;
+};

package/dist/esm/detect-webpack.js

@@ -1,11 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.detectWebpack = void 0;
-
-const detectWebpack = packageManager => {
+export const detectWebpack = packageManager => {
   try {
     let out = '';
 
@@ -34,6 +27,4 @@ const detectWebpack = packageManager => {
   }
 
   return false;
-};
-
-exports.detectWebpack = detectWebpack;
+};

package/dist/esm/detect.js

@@ -1,36 +1,14 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.detect = detect;
-exports.detectBuilder = detectBuilder;
-exports.detectFrameworkPreset = detectFrameworkPreset;
-exports.detectLanguage = detectLanguage;
-exports.isStorybookInstalled = isStorybookInstalled;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _findUp = _interopRequireDefault(require("find-up"));
-
-var _project_types = require("./project_types");
-
-var _helpers = require("./helpers");
-
-var _jsPackageManager = require("./js-package-manager");
-
-var _detectNextjs = require("./detect-nextjs");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+import path from 'path';
+import fs from 'fs';
+import findUp from 'find-up';
+import { ProjectType, supportedTemplates, SUPPORTED_RENDERERS, SupportedLanguage, unsupportedTemplate, CoreBuilder } from './project_types';
+import { getBowerJson, paddedLog } from './helpers';
+import { readPackageJson } from './js-package-manager';
+import { detectNextJS } from './detect-nextjs';
 const viteConfigFiles = ['vite.config.ts', 'vite.config.js', 'vite.config.mjs'];
 
 const hasDependency = (packageJson, name, matcher) => {
-  var _packageJson$dependen, _packageJson$devDepen;
-
-  const version = ((_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[name]) || ((_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[name]);
+  const version = packageJson.dependencies?.[name] || packageJson.devDependencies?.[name];
 
   if (version && typeof matcher === 'function') {
     return matcher(version);
@@ -40,9 +18,7 @@ const hasDependency = (packageJson, name, matcher) => {
 };
 
 const hasPeerDependency = (packageJson, name, matcher) => {
-  var _packageJson$peerDepe;
-
-  const version = (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[name];
+  const version = packageJson.peerDependencies?.[name];
 
   if (version && typeof matcher === 'function') {
     return matcher(version);
@@ -91,17 +67,17 @@ const getFrameworkPreset = (packageJson, framework) => {
   }
 
   if (Array.isArray(files) && files.length > 0) {
-    matcher.files = files.map(name => _fs.default.existsSync(_path.default.join(process.cwd(), name)));
+    matcher.files = files.map(name => fs.existsSync(path.join(process.cwd(), name)));
   }
 
   return matcherFunction(matcher) ? preset : null;
 };
 
-function detectFrameworkPreset(packageJson = {}) {
-  const result = [..._project_types.supportedTemplates, _project_types.unsupportedTemplate].find(framework => {
+export function detectFrameworkPreset(packageJson = {}) {
+  const result = [...supportedTemplates, unsupportedTemplate].find(framework => {
     return getFrameworkPreset(packageJson, framework) !== null;
   });
-  return result ? result.preset : _project_types.ProjectType.UNDETECTED;
+  return result ? result.preset : ProjectType.UNDETECTED;
 }
 /**
  * Attempts to detect which builder to use, by searching for a vite config file.  If one is found, the vite builder
@@ -110,75 +86,71 @@ function detectFrameworkPreset(packageJson = {}) {
  * @returns CoreBuilder
  */
 
-
-function detectBuilder(packageManager) {
-  const viteConfig = _findUp.default.sync(viteConfigFiles);
+export function detectBuilder(packageManager) {
+  const viteConfig = findUp.sync(viteConfigFiles);
 
   if (viteConfig) {
-    (0, _helpers.paddedLog)('Detected vite project, setting builder to @storybook/builder-vite');
-    return _project_types.CoreBuilder.Vite;
+    paddedLog('Detected vite project, setting builder to @storybook/builder-vite');
+    return CoreBuilder.Vite;
   }
 
-  const nextJSVersion = (0, _detectNextjs.detectNextJS)(packageManager);
+  const nextJSVersion = detectNextJS(packageManager);
 
   if (nextJSVersion) {
     if (nextJSVersion >= 11) {
-      return _project_types.CoreBuilder.Webpack5;
+      return CoreBuilder.Webpack5;
     }
   } // Fallback to webpack5
 
 
-  return _project_types.CoreBuilder.Webpack5;
+  return CoreBuilder.Webpack5;
 }
-
-function isStorybookInstalled(dependencies, force) {
+export function isStorybookInstalled(dependencies, force) {
   if (!dependencies) {
     return false;
   }
 
   if (!force && dependencies.devDependencies) {
-    if (_project_types.SUPPORTED_RENDERERS.reduce((storybookPresent, framework) => storybookPresent || !!dependencies.devDependencies[`@storybook/${framework}`], false)) {
-      return _project_types.ProjectType.ALREADY_HAS_STORYBOOK;
+    if (SUPPORTED_RENDERERS.reduce((storybookPresent, framework) => storybookPresent || !!dependencies.devDependencies[`@storybook/${framework}`], false)) {
+      return ProjectType.ALREADY_HAS_STORYBOOK;
     }
   }
 
   return false;
 }
-
-function detectLanguage() {
-  let language = _project_types.SupportedLanguage.JAVASCRIPT;
+export function detectLanguage() {
+  let language = SupportedLanguage.JAVASCRIPT;
   let packageJson;
 
   try {
-    packageJson = (0, _jsPackageManager.readPackageJson)();
+    packageJson = readPackageJson();
   } catch (err) {//
   }
 
-  const bowerJson = (0, _helpers.getBowerJson)();
+  const bowerJson = getBowerJson();
 
   if (!packageJson && !bowerJson) {
     return language;
   }
 
   if (hasDependency(packageJson || bowerJson, 'typescript')) {
-    language = _project_types.SupportedLanguage.TYPESCRIPT;
+    language = SupportedLanguage.TYPESCRIPT;
   }
 
   return language;
 }
-
-function detect(options = {}) {
+export function detect(options = {}) {
   let packageJson;
 
   try {
-    packageJson = (0, _jsPackageManager.readPackageJson)();
+    packageJson = readPackageJson();
   } catch (err) {//
   }
 
-  const bowerJson = (0, _helpers.getBowerJson)();
+  const bowerJson = getBowerJson();
 
   if (!packageJson && !bowerJson) {
-    return _project_types.ProjectType.UNDETECTED;
+    return ProjectType.UNDETECTED;
   }
 
   const storyBookInstalled = isStorybookInstalled(packageJson, options.force);
@@ -188,7 +160,7 @@ function detect(options = {}) {
   }
 
   if (options.html) {
-    return _project_types.ProjectType.HTML;
+    return ProjectType.HTML;
   }
 
   return detectFrameworkPreset(packageJson || bowerJson);