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

package/README.md

@@ -53,4 +53,4 @@ If the CLI cannot detect your project type, it will ask you. You can also force
 npx sb init --type <type>
 ```
 
-Where type is one of the project types defined in [project_types.js](https://github.com/storybookjs/storybook/blob/next/lib/cli/src/project_types.ts)
+Where type is one of the project types defined in [project_types.ts](https://github.com/storybookjs/storybook/blob/next/code/lib/cli/src/project_types.ts)

package/dist/cjs/automigrate/fixes/index.js

@@ -24,6 +24,10 @@ var _builderVite = require("./builder-vite");
 
 var _npm = require("./npm7");
 
+var _sbScripts = require("./sb-scripts");
+
+var _newFrameworks = require("./new-frameworks");
+
 var _types = require("../types");
 
 Object.keys(_types).forEach(function (key) {
@@ -37,5 +41,5 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
-const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _vue.vue3, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite, _npm.npm7];
+const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _vue.vue3, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite, _npm.npm7, _sbScripts.sbScripts, _newFrameworks.newFrameworks];
 exports.fixes = fixes;

package/dist/cjs/automigrate/fixes/new-frameworks.js

@@ -0,0 +1,249 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.newFrameworks = exports.getFrameworkOptions = exports.getBuilder = void 0;
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+
+var _semver = _interopRequireDefault(require("@storybook/semver"));
+
+var _csfTools = require("@storybook/csf-tools");
+
+var _coreCommon = require("@storybook/core-common");
+
+var _helpers = require("../../helpers");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const logger = console;
+const packagesMap = {
+  '@storybook/react': {
+    webpack5: '@storybook/react-webpack5',
+    vite: '@storybook/react-vite'
+  },
+  '@storybook/preact': {
+    webpack5: '@storybook/preact-webpack5'
+  },
+  '@storybook/server': {
+    webpack5: '@storybook/server-webpack5'
+  },
+  '@storybook/angular': {
+    webpack5: '@storybook/angular'
+  },
+  '@storybook/vue': {
+    webpack5: '@storybook/vue-webpack5',
+    vite: '@storybook/vue-vite'
+  },
+  '@storybook/vue3': {
+    webpack5: '@storybook/vue3-webpack5',
+    vite: '@storybook/vue3-vite'
+  },
+  '@storybook/svelte': {
+    webpack5: '@storybook/svelte-webpack5',
+    vite: '@storybook/svelte-vite'
+  },
+  '@storybook/web-components': {
+    webpack5: '@storybook/web-components-webpack5'
+  },
+  '@storybook/html': {
+    webpack5: '@storybook/html-webpack5'
+  }
+};
+
+const getBuilder = builder => {
+  if (typeof builder === 'string') {
+    return builder.includes('vite') ? 'vite' : 'webpack5';
+  }
+
+  return builder !== null && builder !== void 0 && builder.name.includes('vite') ? 'vite' : 'webpack5';
+};
+
+exports.getBuilder = getBuilder;
+
+const getFrameworkOptions = (framework, main) => {
+  const frameworkOptions = main.getFieldValue([`${framework}Options`]);
+  return frameworkOptions || {};
+};
+/**
+ * Does the user have separate framework and builders (e.g. @storybook/react + core.builder -> webpack5?
+ *
+ * If so:
+ * - Remove the dependencies (@storybook/react + @storybook/builder-webpack5 + @storybook/manager-webpack5)
+ * - Install the correct new package e.g. (@storybook/react-webpack5)
+ * - Update the main config to use the new framework
+ * -- moving core.builder into framework.options.builder
+ * -- moving frameworkOptions (e.g. reactOptions) into framework.options
+ */
+
+
+exports.getFrameworkOptions = getFrameworkOptions;
+const newFrameworks = {
+  id: 'newFrameworks',
+
+  async check({
+    packageManager
+  }) {
+    var _semver$coerce;
+
+    const packageJson = packageManager.retrievePackageJson();
+    const allDeps = Object.assign({}, packageJson.dependencies, packageJson.devDependencies);
+    const config = (0, _coreCommon.getStorybookInfo)(packageJson);
+    const {
+      mainConfig,
+      version: storybookVersion,
+      framework
+    } = config;
+
+    if (!mainConfig) {
+      logger.warn('Unable to find storybook main.js config, skipping');
+      return null;
+    }
+
+    const storybookCoerced = storybookVersion && ((_semver$coerce = _semver.default.coerce(storybookVersion)) === null || _semver$coerce === void 0 ? void 0 : _semver$coerce.version);
+
+    if (!storybookCoerced) {
+      logger.warn((0, _tsDedent.default)`
+        ❌ Unable to determine storybook version, skipping ${_chalk.default.cyan('newFrameworks')} fix.
+        🤔 Are you running automigrate from your project directory?
+      `);
+      return null;
+    }
+
+    if (!_semver.default.gte(storybookCoerced, '7.0.0')) {
+      return null;
+    } // If in the future the eslint plugin has a framework option, using main to extract the framework field will be very useful
+
+
+    const main = await (0, _csfTools.readConfig)(mainConfig);
+    const frameworkPackage = main.getFieldValue(['framework']);
+    const builder = main.getFieldValue(['core', 'builder']);
+
+    if (!frameworkPackage) {
+      return null;
+    }
+
+    const supportedPackages = Object.keys(packagesMap);
+
+    if (!supportedPackages.includes(frameworkPackage)) {
+      return null;
+    }
+
+    const builderInfo = {
+      name: getBuilder(builder),
+      options: main.getFieldValue(['core', 'builder', 'options']) || {}
+    }; // TODO: once we have vite frameworks e.g. @storybook/react-vite, then we support it here
+    // and remove ['storybook-builder-vite', '@storybook/builder-vite'] from deps
+
+    if (builderInfo.name === 'vite') {
+      return null;
+    }
+
+    const frameworkOptions = getFrameworkOptions(framework, main);
+    const dependenciesToRemove = ['@storybook/builder-webpack5', '@storybook/manager-webpack5', '@storybook/builder-webpack4', '@storybook/manager-webpack4'].filter(dep => allDeps[dep]);
+    const newFrameworkPackage = packagesMap[frameworkPackage][builderInfo.name];
+    const dependenciesToAdd = []; // some frameworks didn't change e.g. Angular, Ember
+
+    if (newFrameworkPackage !== frameworkPackage) {
+      dependenciesToRemove.push(frameworkPackage);
+      dependenciesToAdd.push(newFrameworkPackage);
+    }
+
+    return {
+      main,
+      dependenciesToAdd,
+      dependenciesToRemove,
+      frameworkPackage: newFrameworkPackage,
+      frameworkOptions,
+      builderInfo,
+      packageJson
+    };
+  },
+
+  prompt() {
+    return (0, _tsDedent.default)`
+      We've detected you are using an older format of Storybook frameworks and builders.
+
+      In Storybook 7, frameworks also specify the builder to be used.
+
+      We can remove the dependencies that are no longer needed and install the new framework that already includes the builder.
+
+      To learn more about the framework field, see: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#framework-field-mandatory')}
+
+      ${_chalk.default.underline(_chalk.default.bold(_chalk.default.cyan('Webpack4 users')))}
+
+      Unless you're using Storybook's Vite builder, this automigration will install a Webpack5-based framework.
+      
+      If you were using Storybook's Webpack4 builder (default in 6.x, discontinued in 7.0), this could be a breaking
+      change--especially if your project has a custom webpack configuration.
+      
+      To learn more about migrating from Webpack4, see: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack4-support-discontinued')}
+    `;
+  },
+
+  async run({
+    result: {
+      dependenciesToAdd,
+      dependenciesToRemove,
+      main,
+      frameworkPackage,
+      frameworkOptions,
+      builderInfo,
+      packageJson
+    },
+    packageManager,
+    dryRun
+  }) {
+    logger.info(`✅ Removing legacy dependencies: ${dependenciesToRemove.join(', ')}`);
+
+    if (!dryRun) {
+      packageManager.removeDependencies({
+        skipInstall: dependenciesToAdd.length > 0,
+        packageJson
+      }, dependenciesToRemove);
+    }
+
+    if (dependenciesToAdd.length > 0) {
+      logger.info(`✅ Installing new dependencies: ${dependenciesToAdd.join(', ')}`);
+
+      if (!dryRun) {
+        const versionToInstall = (0, _helpers.getStorybookVersionSpecifier)(packageJson);
+        const depsToAdd = dependenciesToAdd.map(dep => `${dep}@${versionToInstall}`);
+        packageManager.addDependencies({
+          installAsDevDependencies: true
+        }, depsToAdd);
+      }
+    }
+
+    if (!dryRun) {
+      logger.info(`✅ Updating framework field in main.js`);
+      const currentCore = main.getFieldValue(['core']);
+      main.setFieldValue(['framework', 'name'], frameworkPackage);
+      main.setFieldValue(['framework', 'options'], frameworkOptions);
+
+      if (currentCore !== null && currentCore !== void 0 && currentCore.builder) {
+        delete currentCore.builder;
+      }
+
+      if (Object.keys(builderInfo.options).length > 0) {
+        main.setFieldValue(['framework', 'options', 'builder'], builderInfo.options);
+      }
+
+      if (currentCore) {
+        if (Object.keys(currentCore).length === 0) {
+          // TODO: this should delete the field instead
+          main.setFieldValue(['core'], {});
+        } else {
+          main.setFieldValue(['core'], currentCore);
+        }
+      }
+
+      await (0, _csfTools.writeConfig)(main);
+    }
+  }
+
+};
+exports.newFrameworks = newFrameworks;

package/dist/cjs/automigrate/fixes/sb-scripts.js

@@ -0,0 +1,140 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sbScripts = exports.getStorybookScripts = void 0;
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _tsDedent = require("ts-dedent");
+
+var _semver = _interopRequireDefault(require("@storybook/semver"));
+
+var _coreCommon = require("@storybook/core-common");
+
+var _helpers = require("../../helpers");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const logger = console;
+
+const getStorybookScripts = scripts => {
+  const storybookScripts = {
+    custom: {},
+    official: {}
+  };
+  Object.keys(scripts).forEach(key => {
+    if (key === 'storybook' || key === 'build-storybook') {
+      storybookScripts.official[key] = scripts[key];
+    } else if (scripts[key].match(/start-storybook/) || scripts[key].match(/build-storybook/)) {
+      storybookScripts.custom[key] = scripts[key];
+    }
+  });
+  return storybookScripts;
+};
+/**
+ * Is the user using start-storybook
+ *
+ * If so:
+ * - Add storybook dependency
+ * - Change start-storybook and build-storybook scripts
+ */
+
+
+exports.getStorybookScripts = getStorybookScripts;
+const sbScripts = {
+  id: 'sb-scripts',
+
+  async check({
+    packageManager
+  }) {
+    var _semver$coerce;
+
+    const packageJson = packageManager.retrievePackageJson();
+    const {
+      scripts = {},
+      devDependencies,
+      dependencies
+    } = packageJson;
+    const {
+      version: storybookVersion
+    } = (0, _coreCommon.getStorybookInfo)(packageJson);
+    const allDeps = Object.assign({}, dependencies, devDependencies);
+    const storybookCoerced = storybookVersion && ((_semver$coerce = _semver.default.coerce(storybookVersion)) === null || _semver$coerce === void 0 ? void 0 : _semver$coerce.version);
+
+    if (!storybookCoerced) {
+      logger.warn((0, _tsDedent.dedent)`
+        ❌ Unable to determine storybook version, skipping ${_chalk.default.cyan('sb-scripts')} fix.
+        🤔 Are you running automigrate from your project directory?
+      `);
+      return null;
+    }
+
+    if (allDeps.sb || allDeps.storybook) {
+      return null;
+    }
+
+    const storybookScripts = getStorybookScripts(scripts);
+
+    if (Object.keys(storybookScripts.official).length === 0 && Object.keys(storybookScripts.custom).length === 0) {
+      return null;
+    }
+
+    Object.keys(storybookScripts.official).forEach(key => {
+      storybookScripts.official[key] = storybookScripts.official[key].replace('start-storybook', 'storybook dev').replace('build-storybook', 'storybook build');
+    });
+    return _semver.default.gte(storybookCoerced, '7.0.0') ? {
+      packageJson,
+      storybookScripts,
+      storybookVersion
+    } : null;
+  },
+
+  prompt({
+    storybookVersion
+  }) {
+    const sbFormatted = _chalk.default.cyan(`Storybook ${storybookVersion}`);
+
+    const explanationMessage = [`Starting in Storybook 7, the ${_chalk.default.yellow('start-storybook')} and ${_chalk.default.yellow('build-storybook')} binaries have changed to ${_chalk.default.magenta('storybook dev')} and ${_chalk.default.magenta('storybook build')} respectively.`, `In order to work with ${sbFormatted}, Storybook's ${_chalk.default.magenta('storybook')} binary has to be installed and your storybook scripts have to be adjusted to use the binary. We can install the storybook binary and attempt to adjust your scripts for you.`].join('\n');
+    return [`We've detected you are using ${sbFormatted} with scripts from previous versions of Storybook.`, explanationMessage, `More info: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#start-storybook--build-storybook-binaries-removed')}`].filter(Boolean).join('\n\n');
+  },
+
+  async run({
+    result: {
+      storybookScripts,
+      packageJson
+    },
+    packageManager,
+    dryRun
+  }) {
+    logger.log();
+    logger.info(`Adding 'storybook' as dev dependency`);
+    logger.log();
+
+    if (!dryRun) {
+      const versionToInstall = (0, _helpers.getStorybookVersionSpecifier)(packageJson);
+      packageManager.addDependencies({
+        installAsDevDependencies: true
+      }, [`storybook@${versionToInstall}`]);
+    }
+
+    logger.info(`Updating scripts in package.json`);
+    logger.log();
+
+    if (!dryRun && Object.keys(storybookScripts.official).length > 0) {
+      const message = [`Migrating your scripts to:`, _chalk.default.yellow(JSON.stringify(storybookScripts.official, null, 2))].join('\n');
+      logger.log(message);
+      logger.log();
+      packageManager.addScripts(storybookScripts.official);
+    }
+
+    if (!dryRun && Object.keys(storybookScripts.custom).length > 0) {
+      const message = [`We detected custom scripts that we can't automigrate:`, _chalk.default.yellow(JSON.stringify(storybookScripts.custom, null, 2)), '\n', `Please manually migrate the ones applicable and use the documentation below for reference: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#start-storybook--build-storybook-binaries-removed')}`].join('\n');
+      logger.log(message);
+      logger.log();
+    }
+  }
+
+};
+exports.sbScripts = sbScripts;

package/dist/cjs/automigrate/index.js

@@ -79,7 +79,7 @@ const automigrate = async ({
           logger.info(`✅ ran ${_chalk.default.cyan(f.id)} migration`);
         } catch (error) {
           logger.info(`❌ error when running ${_chalk.default.cyan(f.id)} migration:`);
-          logger.info(error.message);
+          logger.info(error);
           logger.info();
         }
       } else {

package/dist/cjs/generate.js

@@ -128,7 +128,7 @@ _commander.default.command('repro [outputDirectory]').description('Create a repr
   process.exit(1);
 }));
 
-_commander.default.command('repro-next [filterValue]').description('Create a reproduction from a set of possible templates').option('-o --output <outDir>', 'Define an output directory').option('-b --branch <branch>', 'Define the branch to degit from', 'next').action((filterValue, options) => (0, _reproNext.reproNext)(Object.assign({
+_commander.default.command('repro-next [filterValue]').description('Create a reproduction from a set of possible templates').option('-o --output <outDir>', 'Define an output directory').option('-b --branch <branch>', 'Define the branch to degit from', 'next').option('--no-init', 'Whether to download a template without an initialized Storybook', false).action((filterValue, options) => (0, _reproNext.reproNext)(Object.assign({
   filterValue
 }, options)).catch(e => {
   _nodeLogger.logger.error(e);

package/dist/cjs/helpers.js

@@ -11,6 +11,7 @@ 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;
@@ -29,6 +30,8 @@ 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); }
@@ -239,4 +242,19 @@ async function copyComponents(framework, language) {
   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/js-package-manager/JsPackageManager.js

@@ -134,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>`
    *

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'];

package/dist/cjs/repro-next.js

@@ -7,8 +7,6 @@ exports.reproNext = void 0;
 
 var _prompts = _interopRequireDefault(require("prompts"));
 
-var _fs = _interopRequireDefault(require("fs"));
-
 var _path = _interopRequireDefault(require("path"));
 
 var _chalk = _interopRequireDefault(require("chalk"));
@@ -19,6 +17,8 @@ var _tsDedent = require("ts-dedent");
 
 var _degit = _interopRequireDefault(require("degit"));
 
+var _fsExtra = require("fs-extra");
+
 var _reproTemplates = _interopRequireDefault(require("./repro-templates"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -33,7 +33,8 @@ const toChoices = c => ({
 const reproNext = async ({
   output: outputDirectory,
   filterValue,
-  branch
+  branch,
+  init
 }) => {
   const keys = Object.keys(_reproTemplates.default); // get value from template and reduce through TEMPLATES to filter out the correct template
 
@@ -57,7 +58,8 @@ const reproNext = async ({
   if (choices.length === 0) {
     logger.info((0, _boxen.default)((0, _tsDedent.dedent)`
           🔎 You filtered out all templates. 🔍
-          After filtering all the templates with "${_chalk.default.yellow(filterValue)}", we found no templates.
+          
+          After filtering all the templates with "${_chalk.default.yellow(filterValue)}", we found no results. Please try again with a different filter.
 
           Available templates:
           ${keys.map(key => _chalk.default.blue`- ${key}`).join('\n')}
@@ -66,7 +68,7 @@ const reproNext = async ({
       padding: 1,
       borderColor: '#F1618C'
     }));
-    return;
+    process.exit(1);
   }
 
   let selectedTemplate = null;
@@ -105,6 +107,11 @@ const reproNext = async ({
   }
 
   let selectedDirectory = outputDirectory;
+  const outputDirectoryName = outputDirectory || selectedTemplate;
+
+  if (selectedDirectory && (0, _fsExtra.existsSync)(`${selectedDirectory}`)) {
+    logger.info(`⚠️  ${selectedDirectory} already exists! Overwriting...`);
+  }
 
   if (!selectedDirectory) {
     const {
@@ -113,32 +120,34 @@ const reproNext = async ({
       type: 'text',
       message: 'Enter the output directory',
       name: 'directory',
-      initial: selectedTemplate,
-      validate: directoryName => _fs.default.existsSync(directoryName) ? `${directoryName} already exists. Please choose another name.` : true
+      initial: outputDirectoryName,
+      validate: async directoryName => (0, _fsExtra.existsSync)(directoryName) ? `${directoryName} already exists. Please choose another name.` : true
     });
     selectedDirectory = directory;
   }
 
   try {
-    const cwd = _path.default.isAbsolute(selectedDirectory) ? selectedDirectory : _path.default.join(process.cwd(), selectedDirectory);
-    logger.info(`🏃 Adding ${selectedConfig.name} into ${cwd}`);
+    const templateDestination = _path.default.isAbsolute(selectedDirectory) ? selectedDirectory : _path.default.join(process.cwd(), selectedDirectory);
+    logger.info(`🏃 Adding ${selectedConfig.name} into ${templateDestination}`);
     logger.log('📦 Downloading repro template...');
 
     try {
-      // Download the repro based on subfolder "after-storybook" and selected branch
-      await (0, _degit.default)(`storybookjs/repro-templates-temp/${selectedTemplate}/after-storybook#${branch}`, {
+      const templateType = init ? 'after-storybook' : 'before-storybook'; // Download the repro based on subfolder "after-storybook" and selected branch
+
+      await (0, _degit.default)(`storybookjs/repro-templates-temp/${selectedTemplate}/${templateType}#${branch}`, {
         force: true
-      }).clone(selectedTemplate.replace('/', '-'));
+      }).clone(templateDestination);
     } catch (err) {
       logger.error(`🚨 Failed to download repro template: ${err.message}`);
-      return;
+      throw err;
     }
 
+    const initMessage = init ? _chalk.default.yellow(`yarn storybook`) : `Recreate your setup, then ${_chalk.default.yellow(`run npx storybook init`)}`;
     logger.info((0, _boxen.default)((0, _tsDedent.dedent)`
         🎉 Your Storybook reproduction project is ready to use! 🎉
 
         ${_chalk.default.yellow(`cd ${selectedDirectory}`)}
-        ${_chalk.default.yellow(`yarn storybook`)}
+        ${initMessage}
 
         Once you've recreated the problem you're experiencing, please: