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

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

@@ -1,36 +1,19 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("core-js/modules/es.promise.js");
-
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
-var _nodeLogger = require("@storybook/node-logger");
-
-var _baseGenerator = require("../baseGenerator");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+import fse from 'fs-extra';
+import { logger } from '@storybook/node-logger';
+import { baseGenerator } from '../baseGenerator';
 
 const generator = async (packageManager, npmOptions, options) => {
-  let extraMain;
-  let commonJs = false; // svelte.config.js ?
-
-  if (_fsExtra.default.existsSync('./svelte.config.js')) {
-    _nodeLogger.logger.info("Configuring preprocessor from 'svelte.config.js'");
+  let extraMain; // svelte.config.js ?
 
+  if (fse.existsSync('./svelte.config.js')) {
+    logger.info("Configuring preprocessor from 'svelte.config.js'");
     extraMain = {
       svelteOptions: {
         preprocess: '%%require("../svelte.config.js").preprocess%%'
       }
     };
-  } else if (_fsExtra.default.existsSync('./svelte.config.cjs')) {
-    _nodeLogger.logger.info("Configuring preprocessor from 'svelte.config.cjs'");
-
-    commonJs = true;
+  } else if (fse.existsSync('./svelte.config.cjs')) {
+    logger.info("Configuring preprocessor from 'svelte.config.cjs'");
     extraMain = {
       svelteOptions: {
         preprocess: '%%require("../svelte.config.cjs").preprocess%%'
@@ -41,8 +24,7 @@ const generator = async (packageManager, npmOptions, options) => {
     const packageJson = packageManager.retrievePackageJson();
 
     if (packageJson.devDependencies && packageJson.devDependencies['svelte-preprocess']) {
-      _nodeLogger.logger.info("Configuring preprocessor with 'svelte-preprocess'");
-
+      logger.info("Configuring preprocessor with 'svelte-preprocess'");
       extraMain = {
         svelteOptions: {
           preprocess: '%%require("svelte-preprocess")()%%'
@@ -51,13 +33,12 @@ const generator = async (packageManager, npmOptions, options) => {
     }
   }
 
-  await (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, options, 'svelte', {
+  await baseGenerator(packageManager, npmOptions, options, 'svelte', {
     extraPackages: ['svelte', 'svelte-loader'],
     extensions: ['js', 'jsx', 'ts', 'tsx', 'svelte'],
     extraMain,
-    commonJs
+    commonJs: true
   });
 };
 
-var _default = generator;
-exports.default = _default;
+export default generator;

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 = _interopRequireDefault(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: [],
@@ -34,12 +15,13 @@ const defaultOptions = {
   addBabel: true,
   addESLint: false,
   extraMain: undefined,
+  framework: undefined,
   extensions: undefined,
   commonJs: false
 };
 
 const getBuilderDetails = builder => {
-  const map = _versions.default;
+  const map = packageVersions;
 
   if (map[builder]) {
     return builder;
@@ -63,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 {
@@ -94,14 +76,15 @@ 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,
-  pnp
+  builder = CoreBuilder.Webpack5,
+  pnp,
+  commonJs
 }, renderer, options = defaultOptions) {
   const {
     extraAddons: extraAddonPackages,
@@ -114,11 +97,10 @@ async function baseGenerator(packageManager, npmOptions, {
     extraMain,
     extensions
   } = Object.assign({}, defaultOptions, options); // added to main.js
-  // make sure to update `canUsePrebuiltManager` in dev-server.js and build-manager-config/main.js when this list changes
 
   const addons = ['@storybook/addon-links', '@storybook/addon-essentials', ...stripVersions(extraAddonPackages)]; // added to package.json
 
-  const addonPackages = ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-actions', ...extraAddonPackages];
+  const addonPackages = ['@storybook/addon-links', '@storybook/addon-essentials', ...extraAddonPackages];
 
   if (hasInteractiveStories(renderer)) {
     addons.push('@storybook/addon-interactions');
@@ -126,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 {
@@ -134,57 +116,58 @@ async function baseGenerator(packageManager, npmOptions, {
     type,
     // @ts-ignore
     renderer: rendererInclude,
+    // deepscan-disable-line UNUSED_DECL
     framework: frameworkInclude,
     builder: builderInclude
   } = getFrameworkDetails(renderer, builder, pnp); // TODO: We need to start supporting this at some point
 
   if (type === 'renderer') {
-    throw new Error((0, _tsDedent.default)`
+    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 = ['sb', ...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: options.framework || {}
     },
     addons: pnp ? addons.map(wrapForPnp) : addons,
     extensions,
-    commonJs: options.commonJs
+    commonJs
   }, extraMain, type !== 'framework' ? {
     core: {
       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.default)`
+    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 = _interopRequireDefault(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.default)`
+  await fse.writeFile(`./.storybook/main.${commonJs ? 'cjs' : 'js'}`, dedent`
       const path = require('path');
       ${stringified}
     `, {
     encoding: 'utf8'
   });
 }
-
 const frameworkToPreviewParts = {
   angular: {
-    prefix: (0, _tsDedent.default)`
+    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.default)`
+  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 {};