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

package/dist/cjs/generators/REACT_NATIVE/template-csf/storybook/stories/CenterView/style.js

@@ -1,8 +1,15 @@
-export default {
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
   main: {
     flex: 1,
     justifyContent: 'center',
     alignItems: 'center',
-    backgroundColor: '#F5FCFF',
-  },
+    backgroundColor: '#F5FCFF'
+  }
 };
+exports.default = _default;

package/dist/cjs/generators/REACT_NATIVE/template-csf/storybook/stories/Welcome/Welcome.stories.js

@@ -1,6 +1,15 @@
-import React from 'react';
-import { linkTo } from '@storybook/addon-links';
-import { storiesOf } from '@storybook/react-native';
-import Welcome from '.';
+"use strict";
 
-storiesOf('Welcome', module).add('to Storybook', () => <Welcome showApp={linkTo('Button')} />);
+var _react = _interopRequireDefault(require("react"));
+
+var _addonLinks = require("@storybook/addon-links");
+
+var _reactNative = require("@storybook/react-native");
+
+var _ = _interopRequireDefault(require("."));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+(0, _reactNative.storiesOf)('Welcome', module).add('to Storybook', () => /*#__PURE__*/_react.default.createElement(_.default, {
+  showApp: (0, _addonLinks.linkTo)('Button')
+}));

package/dist/cjs/generators/REACT_NATIVE/template-csf/storybook/stories/Welcome/index.js

@@ -1,57 +1,68 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { View, Text } from 'react-native';
-
-export default class Welcome extends React.Component {
-  styles = {
-    wrapper: {
-      flex: 1,
-      padding: 24,
-      justifyContent: 'center',
-    },
-    header: {
-      fontSize: 18,
-      marginBottom: 18,
-    },
-    content: {
-      fontSize: 12,
-      marginBottom: 10,
-      lineHeight: 18,
-    },
-  };
-
-  showApp = (event) => {
-    const { showApp } = this.props;
-    event.preventDefault();
-
-    if (showApp) {
-      showApp();
-    }
-  };
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _reactNative = require("react-native");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class Welcome extends _react.default.Component {
+  constructor(...args) {
+    super(...args);
+    this.styles = {
+      wrapper: {
+        flex: 1,
+        padding: 24,
+        justifyContent: 'center'
+      },
+      header: {
+        fontSize: 18,
+        marginBottom: 18
+      },
+      content: {
+        fontSize: 12,
+        marginBottom: 10,
+        lineHeight: 18
+      }
+    };
+
+    this.showApp = event => {
+      const {
+        showApp
+      } = this.props;
+      event.preventDefault();
+
+      if (showApp) {
+        showApp();
+      }
+    };
+  }
 
   render() {
-    return (
-      <View style={this.styles.wrapper}>
-        <Text style={this.styles.header}>Welcome to React Native Storybook</Text>
-        <Text style={this.styles.content}>
-          This is a UI Component development environment for your React Native app. Here you can
-          display and interact with your UI components as stories. A story is a single state of one
-          or more UI components. You can have as many stories as you want. In other words a story is
-          like a visual test case.
-        </Text>
-        <Text style={this.styles.content}>
-          We have added some stories inside the "storybook/stories" directory for examples. Try
-          editing the "storybook/stories/Welcome.js" file to edit this message.
-        </Text>
-      </View>
-    );
+    return /*#__PURE__*/_react.default.createElement(_reactNative.View, {
+      style: this.styles.wrapper
+    }, /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
+      style: this.styles.header
+    }, "Welcome to React Native Storybook"), /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
+      style: this.styles.content
+    }, "This is a UI Component development environment for your React Native app. Here you can display and interact with your UI components as stories. A story is a single state of one or more UI components. You can have as many stories as you want. In other words a story is like a visual test case."), /*#__PURE__*/_react.default.createElement(_reactNative.Text, {
+      style: this.styles.content
+    }, "We have added some stories inside the \"storybook/stories\" directory for examples. Try editing the \"storybook/stories/Welcome.js\" file to edit this message."));
   }
+
 }
 
+exports.default = Welcome;
 Welcome.defaultProps = {
-  showApp: null,
+  showApp: null
 };
-
 Welcome.propTypes = {
-  showApp: PropTypes.func,
-};
+  showApp: _propTypes.default.func
+};

package/dist/cjs/generators/REACT_NATIVE/template-csf/storybook/stories/index.js

@@ -1,2 +1,5 @@
-import './Button/Button.stories';
-import './Welcome/Welcome.stories';
+"use strict";
+
+require("./Button/Button.stories");
+
+require("./Welcome/Welcome.stories");

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _path = _interopRequireDefault(require("path"));
 
 var _fs = _interopRequireDefault(require("fs"));
@@ -30,10 +28,10 @@ const generator = async (packageManager, npmOptions, options) => {
       config.resolve.plugins.forEach((p) => {
         if (Array.isArray(p.appSrcs)) {
           p.appSrcs.push('${monorepoRootPath}');
-        }
-      });
-      return config;
-    }
+              }
+            });
+          return config;
+          }
     %%`
   } : {};
   const craVersion = (_semver$coerce = _semver.default.coerce(packageManager.retrievePackageJson().dependencies['react-scripts'])) === null || _semver$coerce === void 0 ? void 0 : _semver$coerce.version;

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _baseGenerator = require("../baseGenerator");
 
 const generator = async (packageManager, npmOptions, options) => {

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _baseGenerator = require("../baseGenerator");
 
 var _helpers = require("../../helpers");

package/dist/cjs/generators/SERVER/template-csf/.storybook/preview.js

@@ -1,5 +1,12 @@
-export const parameters = {
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parameters = void 0;
+const parameters = {
   server: {
-    url: 'http://storybook-server-demo.netlify.app/api',
-  },
+    url: 'http://storybook-server-demo.netlify.app/api'
+  }
 };
+exports.parameters = parameters;

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _baseGenerator = require("../baseGenerator");
 
 const generator = async (packageManager, npmOptions, options) => {

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
 var _nodeLogger = require("@storybook/node-logger");
@@ -16,8 +14,7 @@ var _baseGenerator = require("../baseGenerator");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const generator = async (packageManager, npmOptions, options) => {
-  let extraMain;
-  let commonJs = false; // svelte.config.js ?
+  let extraMain; // svelte.config.js ?
 
   if (_fsExtra.default.existsSync('./svelte.config.js')) {
     _nodeLogger.logger.info("Configuring preprocessor from 'svelte.config.js'");
@@ -30,7 +27,6 @@ const generator = async (packageManager, npmOptions, options) => {
   } else if (_fsExtra.default.existsSync('./svelte.config.cjs')) {
     _nodeLogger.logger.info("Configuring preprocessor from 'svelte.config.cjs'");
 
-    commonJs = true;
     extraMain = {
       svelteOptions: {
         preprocess: '%%require("../svelte.config.cjs").preprocess%%'
@@ -55,7 +51,7 @@ const generator = async (packageManager, npmOptions, options) => {
     extraPackages: ['svelte', 'svelte-loader'],
     extensions: ['js', 'jsx', 'ts', 'tsx', 'svelte'],
     extraMain,
-    commonJs
+    commonJs: true
   });
 };
 

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _baseGenerator = require("../baseGenerator");
 
 const generator = async (packageManager, npmOptions, options) => {

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _baseGenerator = require("../baseGenerator");
 
 const generator = async (packageManager, npmOptions, options) => {

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _baseGenerator = require("../baseGenerator");
 
 const generator = async (packageManager, npmOptions, options) => {

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _baseGenerator = require("../baseGenerator");
 
 const generator = async (packageManager, npmOptions, options) => {

package/dist/cjs/generators/baseGenerator.js

@@ -5,11 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.baseGenerator = baseGenerator;
 
-require("core-js/modules/es.promise.js");
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
-var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+var _tsDedent = require("ts-dedent");
 
 var _project_types = require("../project_types");
 
@@ -34,6 +32,7 @@ const defaultOptions = {
   addBabel: true,
   addESLint: false,
   extraMain: undefined,
+  framework: undefined,
   extensions: undefined,
   commonJs: false
 };
@@ -101,7 +100,8 @@ const hasInteractiveStories = framework => ['react', 'angular', 'preact', 'svelt
 async function baseGenerator(packageManager, npmOptions, {
   language,
   builder = _project_types.CoreBuilder.Webpack5,
-  pnp
+  pnp,
+  commonJs
 }, renderer, options = defaultOptions) {
   const {
     extraAddons: extraAddonPackages,
@@ -114,11 +114,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');
@@ -134,29 +133,30 @@ 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((0, _tsDedent.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((0, _jsPackageManager.getPackageDetails)(packageToInstall)[0]));
   const versionedPackages = await packageManager.getVersionedPackages(packages);
   await _fsExtra.default.ensureDir('./.storybook');
   await (0, _configure.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
@@ -170,7 +170,7 @@ async function baseGenerator(packageManager, npmOptions, {
 
 
   if (frameworkPackages.includes('@storybook/builder-vite')) {
-    const previewHead = (0, _tsDedent.default)`
+    const previewHead = (0, _tsDedent.dedent)`
       <script>
         window.global = window;
       </script>

package/dist/cjs/generators/configure.js

@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 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"));
+var _tsDedent = require("ts-dedent");
 
 const _excluded = ["addons", "extensions", "commonJs"];
 
@@ -36,7 +34,7 @@ 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 _fsExtra.default.writeFile(`./.storybook/main.${commonJs ? 'cjs' : 'js'}`, (0, _tsDedent.dedent)`
       const path = require('path');
       ${stringified}
     `, {
@@ -46,7 +44,7 @@ async function configureMain(_ref) {
 
 const frameworkToPreviewParts = {
   angular: {
-    prefix: (0, _tsDedent.default)`
+    prefix: (0, _tsDedent.dedent)`
       import { setCompodocJson } from "@storybook/addon-docs/angular";
       import docJson from "../documentation.json";
       setCompodocJson(docJson);
@@ -67,7 +65,7 @@ async function configurePreview(framework, commonJs) {
     return;
   }
 
-  const preview = (0, _tsDedent.default)`
+  const preview = (0, _tsDedent.dedent)`
     ${prefix}
     export const parameters = {
       actions: { argTypesRegex: "^on[A-Z].*" },

package/dist/cjs/helpers.js

@@ -11,13 +11,12 @@ exports.copyTemplate = copyTemplate;
 exports.getBabelDependencies = getBabelDependencies;
 exports.getBowerJson = getBowerJson;
 exports.getChars = getChars;
+exports.getStorybookVersionSpecifier = getStorybookVersionSpecifier;
 exports.paddedLog = paddedLog;
 exports.readFileAsJson = readFileAsJson;
 exports.writeFileAsJson = void 0;
 
-require("core-js/modules/es.promise.js");
-
-var _path = _interopRequireDefault(require("path"));
+var _path = _interopRequireWildcard(require("path"));
 
 var _fs = _interopRequireDefault(require("fs"));
 
@@ -29,8 +28,16 @@ var _semver = require("@storybook/semver");
 
 var _stripJsonComments = _interopRequireDefault(require("strip-json-comments"));
 
+var _dirs = require("./dirs");
+
+var _versions = _interopRequireDefault(require("./versions"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 /* eslint-disable no-param-reassign */
 const logger = console;
 
@@ -196,7 +203,8 @@ async function copyComponents(framework, language) {
   };
 
   const componentsPath = async () => {
-    const frameworkPath = `frameworks/${framework}`;
+    const baseDir = (0, _dirs.getBaseDir)();
+    const frameworkPath = (0, _path.join)(baseDir, 'frameworks', framework);
 
     const languageSpecific = _path.default.resolve(__dirname, `${frameworkPath}/${languageFolderMapping[language]}`);
 
@@ -231,7 +239,22 @@ async function copyComponents(framework, language) {
   await _fsExtra.default.copy(await componentsPath(), destinationPath, {
     overwrite: true
   });
-  await _fsExtra.default.copy(_path.default.resolve(__dirname, 'frameworks/common'), destinationPath, {
+  await _fsExtra.default.copy((0, _path.join)((0, _dirs.getBaseDir)(), 'frameworks/common'), destinationPath, {
     overwrite: true
   });
+} // Given a package.json, finds any official storybook package within it
+// and if it exists, returns the version of that package from the specified package.json
+
+
+function getStorybookVersionSpecifier(packageJson) {
+  const allDeps = Object.assign({}, packageJson.dependencies, packageJson.devDependencies);
+  const storybookPackage = Object.keys(allDeps).find(name => {
+    return _versions.default[name];
+  });
+
+  if (!storybookPackage) {
+    throw new Error(`Couldn't find any official storybook packages in package.json`);
+  }
+
+  return allDeps[storybookPackage];
 }

package/dist/cjs/initiate.js

@@ -5,10 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.initiate = initiate;
 
-require("core-js/modules/es.promise.js");
-
-require("core-js/modules/es.array.sort.js");
-
 var _updateNotifier = require("update-notifier");
 
 var _chalk = _interopRequireDefault(require("chalk"));
@@ -76,7 +72,14 @@ const installStorybook = (projectType, packageManager, options) => {
     installAsDevDependencies: true,
     skipInstall: options.skipInstall
   };
-  const language = (0, _detect.detectLanguage)();
+  let packageJson;
+
+  try {
+    packageJson = packageManager.readPackageJson();
+  } catch (err) {//
+  }
+
+  const language = (0, _detect.detectLanguage)(packageJson);
   const generatorOptions = {
     language,
     builder: options.builder || (0, _detect.detectBuilder)(packageManager),
@@ -253,7 +256,7 @@ async function initiate(options, pkg) {
         process.exit(1);
       }
     } else {
-      projectType = (0, _detect.detect)(options);
+      projectType = (0, _detect.detect)(packageJson, options);
     }
   } catch (ex) {
     done(ex.message);