@storybook/cli 7.0.0-alpha.13 → 7.0.0-alpha.18

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");
@@ -16,21 +14,23 @@ var _baseGenerator = require("../baseGenerator");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const generator = async (packageManager, npmOptions, options) => {
-  let svelteOptions;
-  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'");
 
-    svelteOptions = {
-      preprocess: '%%require("../svelte.config.js").preprocess%%'
+    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;
-    svelteOptions = {
-      preprocess: '%%require("../svelte.config.cjs").preprocess%%'
+    extraMain = {
+      svelteOptions: {
+        preprocess: '%%require("../svelte.config.cjs").preprocess%%'
+      }
     };
   } else {
     // svelte-preprocess dependencies ?
@@ -39,8 +39,10 @@ const generator = async (packageManager, npmOptions, options) => {
     if (packageJson.devDependencies && packageJson.devDependencies['svelte-preprocess']) {
       _nodeLogger.logger.info("Configuring preprocessor with 'svelte-preprocess'");
 
-      svelteOptions = {
-        preprocess: '%%require("svelte-preprocess")()%%'
+      extraMain = {
+        svelteOptions: {
+          preprocess: '%%require("svelte-preprocess")()%%'
+        }
       };
     }
   }
@@ -48,8 +50,8 @@ const generator = async (packageManager, npmOptions, options) => {
   await (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, options, 'svelte', {
     extraPackages: ['svelte', 'svelte-loader'],
     extensions: ['js', 'jsx', 'ts', 'tsx', 'svelte'],
-    framework: svelteOptions,
-    commonJs
+    extraMain,
+    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,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");
@@ -102,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,
@@ -157,7 +156,7 @@ async function baseGenerator(packageManager, npmOptions, {
     },
     addons: pnp ? addons.map(wrapForPnp) : addons,
     extensions,
-    commonJs: options.commonJs
+    commonJs
   }, extraMain, type !== 'framework' ? {
     core: {
       builder: builderInclude

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

@@ -15,9 +15,7 @@ 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 +27,14 @@ var _semver = require("@storybook/semver");
 
 var _stripJsonComments = _interopRequireDefault(require("strip-json-comments"));
 
+var _dirs = require("./dirs");
+
 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 +200,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 +236,7 @@ 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
   });
 }

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");
@@ -218,9 +216,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 +250,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/link.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.link = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
 var _path = _interopRequireDefault(require("path"));
@@ -21,7 +19,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const link = async ({
   target,
-  local
+  local,
+  start
 }) => {
   const storybookDir = process.cwd();
 
@@ -88,11 +87,13 @@ const link = async ({
     cwd: reproDir
   });
 
-  _nodeLogger.logger.info(`Running ${reproName} storybook`);
+  if (start) {
+    _nodeLogger.logger.info(`Running ${reproName} storybook`);
 
-  await (0, _scripts.exec)(`yarn run storybook`, {
-    cwd: reproDir
-  });
+    await (0, _scripts.exec)(`yarn run storybook`, {
+      cwd: reproDir
+    });
+  }
 };
 
 exports.link = link;

package/dist/cjs/migrate.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.migrate = migrate;
 
-require("core-js/modules/es.promise.js");
-
 var _codemod = require("@storybook/codemod");
 
 async function migrate(migration, {

package/dist/cjs/repro-generators/scripts.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.exec = exports.createAndInit = void 0;
 
-require("core-js/modules/es.promise.js");
-
 var _path = _interopRequireDefault(require("path"));
 
 var _fsExtra = require("fs-extra");
@@ -28,14 +26,17 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 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; }
 
 const logger = console;
-const useLocalSbCli = true;
 
 const exec = async (command, options = {}, {
   startMessage,
-  errorMessage
+  errorMessage,
+  dryRun
 } = {}) => {
-  if (startMessage) {
-    logger.info(startMessage);
+  if (startMessage) logger.info(startMessage);
+
+  if (dryRun) {
+    logger.info(`\n> ${command}\n`);
+    return undefined;
   }
 
   logger.debug(command);
@@ -50,7 +51,6 @@ const exec = async (command, options = {}, {
     }));
 
     child.stderr.pipe(process.stderr);
-    child.stdout.pipe(process.stdout);
     child.on('exit', code => {
       if (code === 0) {
         resolve(undefined);
@@ -200,7 +200,7 @@ const initStorybook = async ({
     flags.push('--use-pnp');
   }
 
-  const sbCLICommand = useLocalSbCli ? `node ${_path.default.join(__dirname, '../../esm/generate')}` : `yarn dlx -p @storybook/cli sb`;
+  const sbCLICommand = `node ${_path.default.join(__dirname, '../../cjs/generate')}`;
   const command = `${sbCLICommand} init ${flags.join(' ')}`;
   await exec(command, {
     cwd
@@ -265,10 +265,25 @@ const doTask = async (task, options, condition = true) => {
   }
 };
 
+const registryUrlNPM = url => {
+  const args = ['config', 'set', 'registry', url];
+  return exec(`npm ${args.join(' ')}`, {
+    cwd: _path.default.join(process.cwd(), '..')
+  });
+};
+
+const registryUrlYarn = url => {
+  const args = ['config', 'set', 'npmRegistryServer', url];
+  return exec(`yarn ${args.join(' ')}`, {
+    cwd: _path.default.join(__dirname, '..')
+  });
+};
+
 const createAndInit = async (cwd, _ref, {
   e2e,
   pnp,
-  local
+  local,
+  registry
 }) => {
   let {
     name,
@@ -311,6 +326,12 @@ const createAndInit = async (cwd, _ref, {
 
   await doTask(addTypescript, options, !!options.typescript);
   await doTask(addRequiredDeps, options);
+
+  if (registry) {
+    await registryUrlNPM(registry);
+    await registryUrlYarn(registry);
+  }
+
   await doTask(initStorybook, options);
 };