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

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

@@ -1,20 +1,23 @@
-import { action } from '@storybook/addon-actions';
-import { text } from '@storybook/addon-knobs';
-import { storiesOf } from '@storybook/react-native';
-import React from 'react';
-import { Text } from 'react-native';
-import Button from '.';
-import CenterView from '../CenterView';
-
-storiesOf('Button', module)
-  .addDecorator((getStory) => <CenterView>{getStory()}</CenterView>)
-  .add('with text', () => (
-    <Button onPress={action('clicked-text')}>
-      <Text>{text('Button text', 'Hello Button')}</Text>
-    </Button>
-  ))
-  .add('with some emoji', () => (
-    <Button onPress={action('clicked-emoji')}>
-      <Text>😀 😎 👍 💯</Text>
-    </Button>
-  ));
+"use strict";
+
+var _addonActions = require("@storybook/addon-actions");
+
+var _addonKnobs = require("@storybook/addon-knobs");
+
+var _reactNative = require("@storybook/react-native");
+
+var _react = _interopRequireDefault(require("react"));
+
+var _reactNative2 = require("react-native");
+
+var _ = _interopRequireDefault(require("."));
+
+var _CenterView = _interopRequireDefault(require("../CenterView"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+(0, _reactNative.storiesOf)('Button', module).addDecorator(getStory => /*#__PURE__*/_react.default.createElement(_CenterView.default, null, getStory())).add('with text', () => /*#__PURE__*/_react.default.createElement(_.default, {
+  onPress: (0, _addonActions.action)('clicked-text')
+}, /*#__PURE__*/_react.default.createElement(_reactNative2.Text, null, (0, _addonKnobs.text)('Button text', 'Hello Button')))).add('with some emoji', () => /*#__PURE__*/_react.default.createElement(_.default, {
+  onPress: (0, _addonActions.action)('clicked-emoji')
+}, /*#__PURE__*/_react.default.createElement(_reactNative2.Text, null, "\uD83D\uDE00 \uD83D\uDE0E \uD83D\uDC4D \uD83D\uDCAF")));

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

@@ -1,17 +1,32 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { TouchableHighlight } from 'react-native';
+"use strict";
 
-export default function Button({ onPress, children }) {
-  return <TouchableHighlight onPress={onPress}>{children}</TouchableHighlight>;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = Button;
+
+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 }; }
+
+function Button({
+  onPress,
+  children
+}) {
+  return /*#__PURE__*/_react.default.createElement(_reactNative.TouchableHighlight, {
+    onPress: onPress
+  }, children);
 }
 
 Button.defaultProps = {
   children: null,
-  onPress: () => {},
+  onPress: () => {}
 };
-
 Button.propTypes = {
-  children: PropTypes.node,
-  onPress: PropTypes.func,
-};
+  children: _propTypes.default.node,
+  onPress: _propTypes.default.func
+};

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

@@ -1,16 +1,31 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { View } from 'react-native';
-import style from './style';
+"use strict";
 
-export default function CenterView({ children }) {
-  return <View style={style.main}>{children}</View>;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = CenterView;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _reactNative = require("react-native");
+
+var _style = _interopRequireDefault(require("./style"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function CenterView({
+  children
+}) {
+  return /*#__PURE__*/_react.default.createElement(_reactNative.View, {
+    style: _style.default.main
+  }, children);
 }
 
 CenterView.defaultProps = {
-  children: null,
+  children: null
 };
-
 CenterView.propTypes = {
-  children: PropTypes.node,
-};
+  children: _propTypes.default.node
+};

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"));

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");

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,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.baseGenerator = baseGenerator;
 
-require("core-js/modules/es.promise.js");
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
 var _tsDedent = require("ts-dedent");

package/dist/cjs/generators/configure.js

@@ -6,8 +6,6 @@ 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 = require("ts-dedent");

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"));

package/dist/cjs/js-package-manager/JsPackageManager.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.JsPackageManager = void 0;
 exports.getPackageDetails = getPackageDetails;
 
-require("core-js/modules/es.promise.js");
-
 var _chalk = _interopRequireDefault(require("chalk"));
 
 var _semver = require("@storybook/semver");
@@ -136,6 +134,48 @@ class JsPackageManager {
       }
     }
   }
+  /**
+   * Remove dependencies from a project using `yarn remove` or `npm uninstall`.
+   *
+   * @param {Object} options contains `skipInstall`, `packageJson` and `installAsDevDependencies` which we use to determine how we install packages.
+   * @param {Array} dependencies contains a list of packages to remove.
+   * @example
+   * removeDependencies(options, [
+   *   `@storybook/react`,
+   *   `@storybook/addon-actions`,
+   * ]);
+   */
+
+
+  removeDependencies(options, dependencies) {
+    const {
+      skipInstall
+    } = options;
+
+    if (skipInstall) {
+      const {
+        packageJson
+      } = options;
+      dependencies.forEach(dep => {
+        if (packageJson.devDependencies) {
+          delete packageJson.devDependencies[dep];
+        }
+
+        if (packageJson.dependencies) {
+          delete packageJson.dependencies[dep];
+        }
+      });
+      (0, _PackageJsonHelper.writePackageJson)(packageJson);
+    } else {
+      try {
+        this.runRemoveDeps(dependencies);
+      } catch (e) {
+        logger.error('An error occurred while removing dependencies.');
+        logger.log(e.message);
+        process.exit(1);
+      }
+    }
+  }
   /**
    * Return an array of strings matching following format: `<package_name>@<package_latest_version>`
    *
@@ -218,9 +258,7 @@ class JsPackageManager {
   }
 
   addStorybookCommandInScripts(options) {
-    var _options$port;
-
-    const sbPort = (_options$port = options === null || options === void 0 ? void 0 : options.port) !== null && _options$port !== void 0 ? _options$port : 6006;
+    const sbPort = (options === null || options === void 0 ? void 0 : options.port) ?? 6006;
     const storybookCmd = options !== null && options !== void 0 && options.staticFolder ? `npx storybook dev -p ${sbPort} -s ${options.staticFolder}` : `npx storybook dev -p ${sbPort}`;
     const buildStorybookCmd = options !== null && options !== void 0 && options.staticFolder ? `npx storybook build -s ${options.staticFolder}` : `npx storybook build`;
     const preCommand = options !== null && options !== void 0 && options.preCommand ? this.getRunCommand(options.preCommand) : undefined;
@@ -254,20 +292,16 @@ class JsPackageManager {
   }
 
   executeCommand(command, args, stdio) {
-    var _commandResult$stdout;
-
     const commandResult = (0, _crossSpawn.sync)(command, args, {
-      stdio: stdio !== null && stdio !== void 0 ? stdio : 'pipe',
+      stdio: stdio ?? 'pipe',
       encoding: 'utf-8'
     });
 
     if (commandResult.status !== 0) {
-      var _commandResult$stderr;
-
-      throw new Error((_commandResult$stderr = commandResult.stderr) !== null && _commandResult$stderr !== void 0 ? _commandResult$stderr : '');
+      throw new Error(commandResult.stderr ?? '');
     }
 
-    return (_commandResult$stdout = commandResult.stdout) !== null && _commandResult$stdout !== void 0 ? _commandResult$stdout : '';
+    return commandResult.stdout ?? '';
   }
 
 }

package/dist/cjs/js-package-manager/NPMProxy.js

@@ -16,6 +16,7 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     super(...args);
     this.type = 'npm';
     this.installArgs = void 0;
+    this.uninstallArgs = void 0;
   }
 
   initPackageJson() {
@@ -55,6 +56,14 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     return this.installArgs;
   }
 
+  getUninstallArgs() {
+    if (!this.uninstallArgs) {
+      this.uninstallArgs = this.needsLegacyPeerDeps(this.getNpmVersion()) ? ['uninstall', '--legacy-peer-deps'] : ['uninstall'];
+    }
+
+    return this.uninstallArgs;
+  }
+
   runInstall() {
     this.executeCommand('npm', this.getInstallArgs(), 'inherit');
   }
@@ -69,6 +78,11 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     this.executeCommand('npm', [...this.getInstallArgs(), ...args], 'inherit');
   }
 
+  runRemoveDeps(dependencies) {
+    const args = [...dependencies];
+    this.executeCommand('npm', [...this.getUninstallArgs(), ...args], 'inherit');
+  }
+
   runGetVersions(packageName, fetchAllVersions) {
     const args = [fetchAllVersions ? 'versions' : 'version', '--json'];
     const commandResult = this.executeCommand('npm', ['info', packageName, ...args]);

package/dist/cjs/js-package-manager/Yarn1Proxy.js

@@ -39,6 +39,11 @@ class Yarn1Proxy extends _JsPackageManager.JsPackageManager {
     this.executeCommand('yarn', ['add', ...args], 'inherit');
   }
 
+  runRemoveDeps(dependencies) {
+    const args = ['--ignore-workspace-root-check', ...dependencies];
+    this.executeCommand('yarn', ['remove', ...args], 'inherit');
+  }
+
   runGetVersions(packageName, fetchAllVersions) {
     const args = [fetchAllVersions ? 'versions' : 'version', '--json'];
     const commandResult = this.executeCommand('yarn', ['info', packageName, ...args]);

package/dist/cjs/js-package-manager/Yarn2Proxy.js

@@ -39,6 +39,11 @@ class Yarn2Proxy extends _JsPackageManager.JsPackageManager {
     this.executeCommand('yarn', ['add', ...args], 'inherit');
   }
 
+  runRemoveDeps(dependencies) {
+    const args = [...dependencies];
+    this.executeCommand('yarn', ['remove', ...args], 'inherit');
+  }
+
   runGetVersions(packageName, fetchAllVersions) {
     const field = fetchAllVersions ? 'versions' : 'version';
     const args = ['--fields', field, '--json'];