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

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

@@ -1,19 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _baseGenerator = require("../baseGenerator");
+import { baseGenerator } from '../baseGenerator';
 
 const generator = async (packageManager, npmOptions, options) => {
-  await (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, options, 'vue', {
+  await baseGenerator(packageManager, npmOptions, options, 'vue', {
     extraPackages: ['vue-loader@^15.7.0']
   });
 };
 
-var _default = generator;
-exports.default = _default;
+export default generator;

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

@@ -1,19 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _baseGenerator = require("../baseGenerator");
+import { baseGenerator } from '../baseGenerator';
 
 const generator = async (packageManager, npmOptions, options) => {
-  await (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, options, 'vue3', {
+  await baseGenerator(packageManager, npmOptions, options, 'vue3', {
     extraPackages: ['vue-loader@^16.0.0']
   });
 };
 
-var _default = generator;
-exports.default = _default;
+export default generator;

package/dist/esm/generators/WEB-COMPONENTS/index.js

@@ -1,19 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _baseGenerator = require("../baseGenerator");
+import { baseGenerator } from '../baseGenerator';
 
 const generator = async (packageManager, npmOptions, options) => {
-  return (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, options, 'web-components', {
+  return baseGenerator(packageManager, npmOptions, options, 'web-components', {
     extraPackages: ['lit-html']
   });
 };
 
-var _default = generator;
-exports.default = _default;
+export default generator;

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

@@ -1,17 +1,7 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _baseGenerator = require("../baseGenerator");
+import { baseGenerator } from '../baseGenerator';
 
 const generator = async (packageManager, npmOptions, options) => {
-  await (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, options, 'react');
+  await baseGenerator(packageManager, npmOptions, options, 'react');
 };
 
-var _default = generator;
-exports.default = _default;
+export default generator;

package/dist/esm/generators/baseGenerator.js

@@ -1,30 +1,11 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.baseGenerator = baseGenerator;
-
-require("core-js/modules/es.promise.js");
-
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
-var _tsDedent = require("ts-dedent");
-
-var _project_types = require("../project_types");
-
-var _helpers = require("../helpers");
-
-var _configure = require("./configure");
-
-var _jsPackageManager = require("../js-package-manager");
-
-var _babelConfig = require("../babel-config");
-
-var _versions = _interopRequireDefault(require("../versions"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+import fse from 'fs-extra';
+import { dedent } from 'ts-dedent';
+import { CoreBuilder } from '../project_types';
+import { getBabelDependencies, copyComponents } from '../helpers';
+import { configureMain, configurePreview } from './configure';
+import { getPackageDetails } from '../js-package-manager';
+import { generateStorybookBabelConfigInCWD } from '../babel-config';
+import packageVersions from '../versions';
 const defaultOptions = {
   extraPackages: [],
   extraAddons: [],
@@ -40,7 +21,7 @@ const defaultOptions = {
 };
 
 const getBuilderDetails = builder => {
-  const map = _versions.default;
+  const map = packageVersions;
 
   if (map[builder]) {
     return builder;
@@ -64,8 +45,8 @@ const getFrameworkDetails = (renderer, builder, pnp) => {
   const rendererPackagePath = pnp ? wrapForPnp(rendererPackage) : rendererPackage;
   const builderPackage = getBuilderDetails(builder);
   const builderPackagePath = pnp ? wrapForPnp(builderPackage) : builderPackage;
-  const isKnownFramework = !!_versions.default[frameworkPackage];
-  const isKnownRenderer = !!_versions.default[rendererPackage];
+  const isKnownFramework = !!packageVersions[frameworkPackage];
+  const isKnownRenderer = !!packageVersions[rendererPackage];
 
   if (renderer === 'angular') {
     return {
@@ -95,13 +76,13 @@ const getFrameworkDetails = (renderer, builder, pnp) => {
   throw new Error(`Could not find the framework (${frameworkPackage}) or renderer (${rendererPackage}) package`);
 };
 
-const stripVersions = addons => addons.map(addon => (0, _jsPackageManager.getPackageDetails)(addon)[0]);
+const stripVersions = addons => addons.map(addon => getPackageDetails(addon)[0]);
 
 const hasInteractiveStories = framework => ['react', 'angular', 'preact', 'svelte', 'vue', 'vue3', 'html'].includes(framework);
 
-async function baseGenerator(packageManager, npmOptions, {
+export async function baseGenerator(packageManager, npmOptions, {
   language,
-  builder = _project_types.CoreBuilder.Webpack5,
+  builder = CoreBuilder.Webpack5,
   pnp,
   commonJs
 }, renderer, options = defaultOptions) {
@@ -127,7 +108,7 @@ async function baseGenerator(packageManager, npmOptions, {
   }
 
   const yarn2ExtraPackages = packageManager.type === 'yarn2' ? ['@storybook/addon-docs', '@mdx-js/react@1.x.x'] : [];
-  const files = await _fsExtra.default.readdir(process.cwd());
+  const files = await fse.readdir(process.cwd());
   const packageJson = packageManager.retrievePackageJson();
   const installedDependencies = new Set(Object.keys(Object.assign({}, packageJson.dependencies, packageJson.devDependencies)));
   const {
@@ -141,17 +122,17 @@ async function baseGenerator(packageManager, npmOptions, {
   } = getFrameworkDetails(renderer, builder, pnp); // TODO: We need to start supporting this at some point
 
   if (type === 'renderer') {
-    throw new Error((0, _tsDedent.dedent)`
+    throw new Error(dedent`
         Sorry, for now, you can not do this, please use a framework such as @storybook/react-webpack5
 
         https://github.com/storybookjs/storybook/issues/18360
       `);
   }
 
-  const packages = ['storybook', ...frameworkPackages, ...addonPackages, ...extraPackages, ...yarn2ExtraPackages].filter(Boolean).filter(packageToInstall => !installedDependencies.has((0, _jsPackageManager.getPackageDetails)(packageToInstall)[0]));
+  const packages = ['storybook', ...frameworkPackages, ...addonPackages, ...extraPackages, ...yarn2ExtraPackages].filter(Boolean).filter(packageToInstall => !installedDependencies.has(getPackageDetails(packageToInstall)[0]));
   const versionedPackages = await packageManager.getVersionedPackages(packages);
-  await _fsExtra.default.ensureDir('./.storybook');
-  await (0, _configure.configureMain)(Object.assign({
+  await fse.ensureDir('./.storybook');
+  await configureMain(Object.assign({
     framework: {
       name: frameworkInclude,
       options: options.framework || {}
@@ -164,29 +145,29 @@ async function baseGenerator(packageManager, npmOptions, {
       builder: builderInclude
     }
   } : {}));
-  await (0, _configure.configurePreview)(renderer, options.commonJs);
+  await configurePreview(renderer, options.commonJs);
 
   if (addComponents) {
-    (0, _helpers.copyComponents)(renderer, language);
+    copyComponents(renderer, language);
   } // FIXME: temporary workaround for https://github.com/storybookjs/storybook/issues/17516
 
 
   if (frameworkPackages.includes('@storybook/builder-vite')) {
-    const previewHead = (0, _tsDedent.dedent)`
+    const previewHead = dedent`
       <script>
         window.global = window;
       </script>
     `;
-    await _fsExtra.default.writeFile(`.storybook/preview-head.html`, previewHead, {
+    await fse.writeFile(`.storybook/preview-head.html`, previewHead, {
       encoding: 'utf8'
     });
   }
 
-  const babelDependencies = addBabel ? await (0, _helpers.getBabelDependencies)(packageManager, packageJson) : [];
+  const babelDependencies = addBabel ? await getBabelDependencies(packageManager, packageJson) : [];
   const isNewFolder = !files.some(fname => fname.startsWith('.babel') || fname.startsWith('babel') || fname === 'package.json');
 
   if (isNewFolder) {
-    await (0, _babelConfig.generateStorybookBabelConfigInCWD)();
+    await generateStorybookBabelConfigInCWD();
   }
 
   packageManager.addDependencies(Object.assign({}, npmOptions, {

package/dist/esm/generators/configure.js

@@ -1,24 +1,10 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.configureMain = configureMain;
-exports.configurePreview = configurePreview;
-
-require("core-js/modules/es.promise.js");
-
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
-var _tsDedent = require("ts-dedent");
-
 const _excluded = ["addons", "extensions", "commonJs"];
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
 
-async function configureMain(_ref) {
+import fse from 'fs-extra';
+import { dedent } from 'ts-dedent';
+export async function configureMain(_ref) {
   let {
     addons,
     extensions = ['js', 'jsx', 'ts', 'tsx'],
@@ -26,7 +12,7 @@ async function configureMain(_ref) {
   } = _ref,
       custom = _objectWithoutPropertiesLoose(_ref, _excluded);
 
-  const prefix = (await _fsExtra.default.pathExists('./src')) ? '../src' : '../stories';
+  const prefix = (await fse.pathExists('./src')) ? '../src' : '../stories';
   const config = Object.assign({
     stories: [`${prefix}/**/*.stories.mdx`, `${prefix}/**/*.stories.@(${extensions.join('|')})`],
     addons
@@ -36,17 +22,16 @@ async function configureMain(_ref) {
   // un-stringify the value for referencing packages by string
   // .replaceAll(/"(path\.dirname\(require\.resolve\(path\.join\('.*\))"/g, (_, a) => a)}`;
 
-  await _fsExtra.default.writeFile(`./.storybook/main.${commonJs ? 'cjs' : 'js'}`, (0, _tsDedent.dedent)`
+  await fse.writeFile(`./.storybook/main.${commonJs ? 'cjs' : 'js'}`, dedent`
       const path = require('path');
       ${stringified}
     `, {
     encoding: 'utf8'
   });
 }
-
 const frameworkToPreviewParts = {
   angular: {
-    prefix: (0, _tsDedent.dedent)`
+    prefix: dedent`
       import { setCompodocJson } from "@storybook/addon-docs/angular";
       import docJson from "../documentation.json";
       setCompodocJson(docJson);
@@ -55,19 +40,18 @@ const frameworkToPreviewParts = {
     extraParameters: 'docs: { inlineStories: true },'
   }
 };
-
-async function configurePreview(framework, commonJs) {
+export async function configurePreview(framework, commonJs) {
   const {
     prefix = '',
     extraParameters = ''
   } = frameworkToPreviewParts[framework] || {};
   const previewPath = `./.storybook/preview.${commonJs ? 'cjs' : 'js'}`; // If the framework template included a preview then we have nothing to do
 
-  if (await _fsExtra.default.pathExists(previewPath)) {
+  if (await fse.pathExists(previewPath)) {
     return;
   }
 
-  const preview = (0, _tsDedent.dedent)`
+  const preview = dedent`
     ${prefix}
     export const parameters = {
       actions: { argTypesRegex: "^on[A-Z].*" },
@@ -79,7 +63,7 @@ async function configurePreview(framework, commonJs) {
       },
       ${extraParameters}
     }`.replace('  \n', '').trim();
-  await _fsExtra.default.writeFile(previewPath, preview, {
+  await fse.writeFile(previewPath, preview, {
     encoding: 'utf8'
   });
 }

package/dist/esm/generators/types.js

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

package/dist/esm/helpers.js

@@ -1,113 +1,74 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.addToDevDependenciesIfNotPresent = addToDevDependenciesIfNotPresent;
-exports.codeLog = codeLog;
-exports.commandLog = void 0;
-exports.copyComponents = copyComponents;
-exports.copyTemplate = copyTemplate;
-exports.getBabelDependencies = getBabelDependencies;
-exports.getBowerJson = getBowerJson;
-exports.getChars = getChars;
-exports.paddedLog = paddedLog;
-exports.readFileAsJson = readFileAsJson;
-exports.writeFileAsJson = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _path = _interopRequireDefault(require("path"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _semver = require("@storybook/semver");
-
-var _stripJsonComments = _interopRequireDefault(require("strip-json-comments"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /* eslint-disable no-param-reassign */
+import path, { join } from 'path';
+import fs from 'fs';
+import fse from 'fs-extra';
+import chalk from 'chalk';
+import { satisfies } from '@storybook/semver';
+import stripJsonComments from 'strip-json-comments';
+import { getBaseDir } from './dirs';
 const logger = console;
+export function getBowerJson() {
+  const bowerJsonPath = path.resolve('bower.json');
 
-function getBowerJson() {
-  const bowerJsonPath = _path.default.resolve('bower.json');
-
-  if (!_fs.default.existsSync(bowerJsonPath)) {
+  if (!fs.existsSync(bowerJsonPath)) {
     return false;
   }
 
-  const jsonContent = _fs.default.readFileSync(bowerJsonPath, 'utf8');
-
+  const jsonContent = fs.readFileSync(bowerJsonPath, 'utf8');
   return JSON.parse(jsonContent);
 }
+export function readFileAsJson(jsonPath, allowComments) {
+  const filePath = path.resolve(jsonPath);
 
-function readFileAsJson(jsonPath, allowComments) {
-  const filePath = _path.default.resolve(jsonPath);
-
-  if (!_fs.default.existsSync(filePath)) {
+  if (!fs.existsSync(filePath)) {
     return false;
   }
 
-  const fileContent = _fs.default.readFileSync(filePath, 'utf8');
-
-  const jsonContent = allowComments ? (0, _stripJsonComments.default)(fileContent) : fileContent;
+  const fileContent = fs.readFileSync(filePath, 'utf8');
+  const jsonContent = allowComments ? stripJsonComments(fileContent) : fileContent;
 
   try {
     return JSON.parse(jsonContent);
   } catch (e) {
-    logger.error(_chalk.default.red(`Invalid json in file: ${filePath}`));
+    logger.error(chalk.red(`Invalid json in file: ${filePath}`));
     throw e;
   }
 }
+export const writeFileAsJson = (jsonPath, content) => {
+  const filePath = path.resolve(jsonPath);
 
-const writeFileAsJson = (jsonPath, content) => {
-  const filePath = _path.default.resolve(jsonPath);
-
-  if (!_fs.default.existsSync(filePath)) {
+  if (!fs.existsSync(filePath)) {
     return false;
   }
 
-  _fs.default.writeFileSync(filePath, `${JSON.stringify(content, null, 2)}\n`);
-
+  fs.writeFileSync(filePath, `${JSON.stringify(content, null, 2)}\n`);
   return true;
 };
-
-exports.writeFileAsJson = writeFileAsJson;
-
-const commandLog = message => {
-  process.stdout.write(_chalk.default.cyan(' • ') + message); // Need `void` to be able to use this function in a then of a Promise<void>
+export const commandLog = message => {
+  process.stdout.write(chalk.cyan(' • ') + message); // Need `void` to be able to use this function in a then of a Promise<void>
 
   return (errorMessage, errorInfo) => {
     if (errorMessage) {
-      process.stdout.write(`. ${_chalk.default.red('✖')}\n`);
-      logger.error(`\n     ${_chalk.default.red(errorMessage)}`);
+      process.stdout.write(`. ${chalk.red('✖')}\n`);
+      logger.error(`\n     ${chalk.red(errorMessage)}`);
 
       if (!errorInfo) {
         return;
       }
 
-      const newErrorInfo = errorInfo.split('\n').map(line => `     ${_chalk.default.dim(line)}`).join('\n');
+      const newErrorInfo = errorInfo.split('\n').map(line => `     ${chalk.dim(line)}`).join('\n');
       logger.error(`${newErrorInfo}\n`);
       return;
     }
 
-    process.stdout.write(`. ${_chalk.default.green('✓')}\n`);
+    process.stdout.write(`. ${chalk.green('✓')}\n`);
   };
 };
-
-exports.commandLog = commandLog;
-
-function paddedLog(message) {
+export function paddedLog(message) {
   const newMessage = message.split('\n').map(line => `    ${line}`).join('\n');
   logger.log(newMessage);
 }
-
-function getChars(char, amount) {
+export function getChars(char, amount) {
   let line = '';
 
   for (let lc = 0; lc < amount; lc += 1) {
@@ -116,8 +77,7 @@ function getChars(char, amount) {
 
   return line;
 }
-
-function codeLog(codeLines, leftPadAmount) {
+export function codeLog(codeLines, leftPadAmount) {
   let maxLength = 0;
   const newLines = codeLines.map(line => {
     maxLength = line.length > maxLength ? line.length : maxLength;
@@ -126,7 +86,7 @@ function codeLog(codeLines, leftPadAmount) {
   const finalResult = newLines.map(line => {
     const rightPadAmount = maxLength - line.length;
     let newLine = line + getChars(' ', rightPadAmount);
-    newLine = getChars(' ', leftPadAmount || 2) + _chalk.default.inverse(` ${newLine} `);
+    newLine = getChars(' ', leftPadAmount || 2) + chalk.inverse(` ${newLine} `);
     return newLine;
   }).join('\n');
   logger.log(finalResult);
@@ -144,8 +104,7 @@ function codeLog(codeLines, leftPadAmount) {
  * ]);
  */
 
-
-async function getBabelDependencies(packageManager, packageJson) {
+export async function getBabelDependencies(packageManager, packageJson) {
   const dependenciesToAdd = [];
   let babelLoaderVersion = '^8.0.0-0';
   const babelCoreVersion = packageJson.dependencies['babel-core'] || packageJson.devDependencies['babel-core'];
@@ -158,7 +117,7 @@ async function getBabelDependencies(packageManager, packageJson) {
   } else {
     const latestCompatibleBabelVersion = await packageManager.latestVersion('babel-core', babelCoreVersion); // Babel 6
 
-    if ((0, _semver.satisfies)(latestCompatibleBabelVersion, '^6.0.0')) {
+    if (satisfies(latestCompatibleBabelVersion, '^6.0.0')) {
       babelLoaderVersion = '^7.0.0';
     }
   }
@@ -170,49 +129,46 @@ async function getBabelDependencies(packageManager, packageJson) {
 
   return dependenciesToAdd;
 }
-
-function addToDevDependenciesIfNotPresent(packageJson, name, packageVersion) {
+export function addToDevDependenciesIfNotPresent(packageJson, name, packageVersion) {
   if (!packageJson.dependencies[name] && !packageJson.devDependencies[name]) {
     packageJson.devDependencies[name] = packageVersion;
   }
 }
+export function copyTemplate(templateRoot) {
+  const templateDir = path.resolve(templateRoot, `template-csf/`);
 
-function copyTemplate(templateRoot) {
-  const templateDir = _path.default.resolve(templateRoot, `template-csf/`);
-
-  if (!_fs.default.existsSync(templateDir)) {
+  if (!fs.existsSync(templateDir)) {
     throw new Error(`Couldn't find template dir`);
   }
 
-  _fsExtra.default.copySync(templateDir, '.', {
+  fse.copySync(templateDir, '.', {
     overwrite: true
   });
 }
-
-async function copyComponents(framework, language) {
+export async function copyComponents(framework, language) {
   const languageFolderMapping = {
     javascript: 'js',
     typescript: 'ts'
   };
 
   const componentsPath = async () => {
-    const frameworkPath = `frameworks/${framework}`;
-
-    const languageSpecific = _path.default.resolve(__dirname, `${frameworkPath}/${languageFolderMapping[language]}`);
+    const baseDir = getBaseDir();
+    const frameworkPath = join(baseDir, 'frameworks', framework);
+    const languageSpecific = path.resolve(__dirname, `${frameworkPath}/${languageFolderMapping[language]}`);
 
-    if (await _fsExtra.default.pathExists(languageSpecific)) {
+    if (await fse.pathExists(languageSpecific)) {
       return languageSpecific;
     }
 
-    const jsFallback = _path.default.resolve(__dirname, `${frameworkPath}/${languageFolderMapping.javascript}`);
+    const jsFallback = path.resolve(__dirname, `${frameworkPath}/${languageFolderMapping.javascript}`);
 
-    if (await _fsExtra.default.pathExists(jsFallback)) {
+    if (await fse.pathExists(jsFallback)) {
       return jsFallback;
     }
 
-    const frameworkRootPath = _path.default.resolve(__dirname, frameworkPath);
+    const frameworkRootPath = path.resolve(__dirname, frameworkPath);
 
-    if (await _fsExtra.default.pathExists(frameworkRootPath)) {
+    if (await fse.pathExists(frameworkRootPath)) {
       return frameworkRootPath;
     }
 
@@ -220,7 +176,7 @@ async function copyComponents(framework, language) {
   };
 
   const targetPath = async () => {
-    if (await _fsExtra.default.pathExists('./src')) {
+    if (await fse.pathExists('./src')) {
       return './src/stories';
     }
 
@@ -228,10 +184,10 @@ async function copyComponents(framework, language) {
   };
 
   const destinationPath = await targetPath();
-  await _fsExtra.default.copy(await componentsPath(), destinationPath, {
+  await fse.copy(await componentsPath(), destinationPath, {
     overwrite: true
   });
-  await _fsExtra.default.copy(_path.default.resolve(__dirname, 'frameworks/common'), destinationPath, {
+  await fse.copy(join(getBaseDir(), 'frameworks/common'), destinationPath, {
     overwrite: true
   });
 }