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

package/dist/cjs/automigrate/index.js

@@ -34,9 +34,15 @@ const automigrate = async ({
 
   for (let i = 0; i < filtered.length; i += 1) {
     const f = _fixes.fixes[i];
-    const result = await f.check({
-      packageManager
-    });
+    let result;
+
+    try {
+      result = await f.check({
+        packageManager
+      });
+    } catch (e) {
+      logger.info(`failed to check fix: ${f.id}`);
+    }
 
     if (result) {
       logger.info(`🔎 found a '${_chalk.default.cyan(f.id)}' migration:`);

package/dist/cjs/babel-config.js

@@ -11,8 +11,6 @@ var _fsExtra = require("fs-extra");
 
 var _nodeLogger = require("@storybook/node-logger");
 
-var _coreCommon = require("@storybook/core-common");
-
 var _path = _interopRequireDefault(require("path"));
 
 var _prompts = _interopRequireDefault(require("prompts"));
@@ -33,8 +31,11 @@ const generateStorybookBabelConfig = async ({
 }) => {
   _nodeLogger.logger.info(`Generating the storybook default babel config at ${target}`);
 
-  const config = (0, _coreCommon.getStorybookBabelConfig)();
-  const contents = JSON.stringify(config, null, 2);
+  const contents = JSON.stringify({
+    sourceType: 'unambiguous',
+    presets: [],
+    plugins: []
+  }, null, 2);
   const fileName = '.babelrc.json';
 
   const location = _path.default.join(target, fileName);

package/dist/cjs/frameworks/angular/Button.stories.ts

@@ -13,9 +13,11 @@ export default {
 } as Meta;
 
 // More on component templates: https://storybook.js.org/docs/angular/writing-stories/introduction#using-args
-const Template: Story<Button> = (args: Button) => ({
-  props: args,
-});
+const Template: Story<Button> = (args: Button) => {
+  return {
+    props: { backgroundColor: null, ...args },
+  };
+};
 
 export const Primary = Template.bind({});
 // More on args: https://storybook.js.org/docs/angular/writing-stories/args

package/dist/cjs/generate.js

@@ -52,7 +52,7 @@ process.env.STORYBOOK_DISABLE_TELEMETRY && process.env.STORYBOOK_DISABLE_TELEMET
 
 _commander.default.option('--enable-crash-reports', 'enable sending crash reports to telemetry data');
 
-_commander.default.command('init').description('Initialize Storybook into your project.').option('-f --force', 'Force add Storybook').option('-s --skip-install', 'Skip installing deps').option('-N --use-npm', 'Use npm to install deps').option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser').option('-t --type <type>', 'Add Storybook for a specific project type').option('-y --yes', 'Answer yes to all prompts').option('-b --builder <builder>', 'Builder library').option('-l --linkable', 'Prepare installation for link (contributor helper)').action(options => (0, _initiate.initiate)(options, pkg));
+_commander.default.command('init').description('Initialize Storybook into your project.').option('-f --force', 'Force add Storybook').option('-s --skip-install', 'Skip installing deps').option('-N --use-npm', 'Use npm to install deps').option('--use-pnp', 'Enable pnp mode').option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser').option('-t --type <type>', 'Add Storybook for a specific project type').option('-y --yes', 'Answer yes to all prompts').option('-b --builder <builder>', 'Builder library').option('-l --linkable', 'Prepare installation for link (contributor helper)').action(options => (0, _initiate.initiate)(options, pkg));
 
 _commander.default.command('add <addon>').description('Add an addon to your Storybook').option('-N --use-npm', 'Use NPM to build the Storybook server').option('-s --skip-postinstall', 'Skip package specific postinstall config modifications').action((addonName, options) => (0, _add.add)(addonName, options));
 

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

@@ -57,7 +57,30 @@ const generator = async (packageManager, npmOptions, options) => {
     addScripts: false
   });
   (0, _helpers.copyTemplate)(__dirname);
-  editAngularAppTsConfig();
+  editAngularAppTsConfig(); // TODO: we need to add the following:
+
+  /*
+  "storybook": {
+    "builder": "@storybook/angular:start-storybook",
+    "options": {
+      "browserTarget": "angular-cli:build",
+      "port": 4400
+    }
+  },
+  "build-storybook": {
+    "builder": "@storybook/angular:build-storybook",
+    "options": {
+      "browserTarget": "angular-cli:build"
+    }
+  }
+  */
+  // to the user's angular.json file. see: https://github.com/storybookjs/storybook/blob/next/examples/angular-cli/angular.json#L78
+  // then we want to add these scripts to package.json
+  // packageManager.addScripts({
+  //   storybook: 'ng storybook',
+  //   'build-storybook': 'ng build-storybook',
+  // });
+
   (0, _angularHelpers.editStorybookTsConfig)(_path.default.resolve('./.storybook/tsconfig.json')); // edit scripts to generate docs
 
   const tsConfigFile = await (0, _angularHelpers.getBaseTsConfigName)();

package/dist/cjs/generators/baseGenerator.js

@@ -54,33 +54,39 @@ const getBuilderDetails = builder => {
   return builder;
 };
 
-const getFrameworkDetails = (renderer, builder) => {
+const wrapForPnp = packageName => `%%path.dirname(require.resolve(path.join('${packageName}', 'package.json')))%%`;
+
+const getFrameworkDetails = (renderer, builder, pnp) => {
   const frameworkPackage = `@storybook/${renderer}-${builder}`;
+  const frameworkPackagePath = pnp ? wrapForPnp(frameworkPackage) : frameworkPackage;
   const rendererPackage = `@storybook/${renderer}`;
+  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 builderPackage = getBuilderDetails(builder);
 
   if (renderer === 'angular') {
     return {
-      package: rendererPackage,
-      builder: builderPackage,
+      packages: [rendererPackage],
+      framework: rendererPackagePath,
       type: 'framework'
     };
   }
 
   if (isKnownFramework) {
     return {
-      package: frameworkPackage,
-      builder: builderPackage,
+      packages: [frameworkPackage],
+      framework: frameworkPackagePath,
       type: 'framework'
     };
   }
 
   if (isKnownRenderer) {
     return {
-      package: rendererPackage,
-      builder: builderPackage,
+      packages: [rendererPackage, builderPackage],
+      builder: builderPackagePath,
+      renderer: rendererPackagePath,
       type: 'renderer'
     };
   }
@@ -94,7 +100,8 @@ const hasInteractiveStories = framework => ['react', 'angular', 'preact', 'svelt
 
 async function baseGenerator(packageManager, npmOptions, {
   language,
-  builder = _project_types.CoreBuilder.Webpack5
+  builder = _project_types.CoreBuilder.Webpack5,
+  pnp
 }, renderer, options = defaultOptions) {
   const {
     extraAddons: extraAddonPackages,
@@ -109,9 +116,9 @@ async function baseGenerator(packageManager, npmOptions, {
   } = 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']; // added to package.json
+  const addons = ['@storybook/addon-links', '@storybook/addon-essentials', ...stripVersions(extraAddonPackages)]; // added to package.json
 
-  const addonPackages = [...addons, '@storybook/addon-actions'];
+  const addonPackages = ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-actions', ...extraAddonPackages];
 
   if (hasInteractiveStories(renderer)) {
     addons.push('@storybook/addon-interactions');
@@ -123,20 +130,15 @@ async function baseGenerator(packageManager, npmOptions, {
   const packageJson = packageManager.retrievePackageJson();
   const installedDependencies = new Set(Object.keys(Object.assign({}, packageJson.dependencies, packageJson.devDependencies)));
   const {
-    package: frameworkPackage,
+    packages: frameworkPackages,
     type,
-    builder: builderPackage
-  } = getFrameworkDetails(renderer, builder); // temp
+    // @ts-ignore
+    renderer: rendererInclude,
+    framework: frameworkInclude,
+    builder: builderInclude
+  } = getFrameworkDetails(renderer, builder, pnp); // TODO: We need to start supporting this at some point
 
   if (type === 'renderer') {
-    console.log({
-      language,
-      builder,
-      renderer,
-      builderPackage,
-      frameworkPackage,
-      type
-    });
     throw new Error((0, _tsDedent.default)`
         Sorry, for now, you can not do this, please use a framework such as @storybook/react-webpack5
 
@@ -144,32 +146,30 @@ async function baseGenerator(packageManager, npmOptions, {
       `);
   }
 
-  const packages = ['sb', frameworkPackage, ...addonPackages, ...extraPackages, ...extraAddonPackages, ...yarn2ExtraPackages, ...(type === 'framework' ? [] : [builderPackage])].filter(Boolean).filter(packageToInstall => !installedDependencies.has((0, _jsPackageManager.getPackageDetails)(packageToInstall)[0]));
+  const packages = ['sb', ...frameworkPackages, ...addonPackages, ...extraPackages, ...yarn2ExtraPackages].filter(Boolean).filter(packageToInstall => !installedDependencies.has((0, _jsPackageManager.getPackageDetails)(packageToInstall)[0]));
   const versionedPackages = await packageManager.getVersionedPackages(packages);
-  console.log({
-    versionedPackages
-  });
-  const mainOptions = type !== 'framework' ? Object.assign({
-    core: {
-      builder: builderPackage
-    }
-  }, extraMain) : extraMain;
-  (0, _configure.configure)(renderer, Object.assign({
+  await _fsExtra.default.ensureDir('./.storybook');
+  await (0, _configure.configureMain)(Object.assign({
     framework: {
-      name: frameworkPackage,
+      name: frameworkInclude,
       options: {}
     },
-    addons: [...addons, ...stripVersions(extraAddonPackages)],
+    addons: pnp ? addons.map(wrapForPnp) : addons,
     extensions,
     commonJs: options.commonJs
-  }, mainOptions));
+  }, extraMain, type !== 'framework' ? {
+    core: {
+      builder: builderInclude
+    }
+  } : {}));
+  await (0, _configure.configurePreview)(renderer, options.commonJs);
 
   if (addComponents) {
     (0, _helpers.copyComponents)(renderer, language);
   } // FIXME: temporary workaround for https://github.com/storybookjs/storybook/issues/17516
 
 
-  if (builderPackage === '@storybook/builder-vite') {
+  if (frameworkPackages.includes('@storybook/builder-vite')) {
     const previewHead = (0, _tsDedent.default)`
       <script>
         window.global = window;

package/dist/cjs/generators/configure.js

@@ -3,7 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.configure = configure;
+exports.configureMain = configureMain;
+exports.configurePreview = configurePreview;
+
+require("core-js/modules/es.promise.js");
 
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
@@ -15,7 +18,7 @@ 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; }
 
-function configureMain(_ref) {
+async function configureMain(_ref) {
   let {
     addons,
     extensions = ['js', 'jsx', 'ts', 'tsx'],
@@ -23,17 +26,20 @@ function configureMain(_ref) {
   } = _ref,
       custom = _objectWithoutPropertiesLoose(_ref, _excluded);
 
-  const prefix = _fsExtra.default.existsSync('./src') ? '../src' : '../stories';
+  const prefix = (await _fsExtra.default.pathExists('./src')) ? '../src' : '../stories';
   const config = Object.assign({
     stories: [`${prefix}/**/*.stories.mdx`, `${prefix}/**/*.stories.@(${extensions.join('|')})`],
     addons
   }, custom); // replace escaped values and delimiters
 
-  const stringified = `module.exports = ${JSON.stringify(config, null, 2).replace(/\\"/g, '"').replace(/['"]%%/g, '').replace(/%%['"]/, '').replace(/\\n/g, '\r\n')}`;
-
-  _fsExtra.default.ensureDirSync('./.storybook');
+  const stringified = `module.exports = ${JSON.stringify(config, null, 2).replace(/\\"/g, '"').replace(/['"]%%/g, '').replace(/%%['"]/g, '').replace(/\\n/g, '\r\n')}`; // main.js isn't actually JSON, but we used JSON.stringify to convert the runtime-object into code.
+  // un-stringify the value for referencing packages by string
+  // .replaceAll(/"(path\.dirname\(require\.resolve\(path\.join\('.*\))"/g, (_, a) => a)}`;
 
-  _fsExtra.default.writeFileSync(`./.storybook/main.${commonJs ? 'cjs' : 'js'}`, stringified, {
+  await _fsExtra.default.writeFile(`./.storybook/main.${commonJs ? 'cjs' : 'js'}`, (0, _tsDedent.default)`
+      const path = require('path');
+      ${stringified}
+    `, {
     encoding: 'utf8'
   });
 }
@@ -50,14 +56,14 @@ const frameworkToPreviewParts = {
   }
 };
 
-function configurePreview(framework, commonJs) {
+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 (_fsExtra.default.existsSync(previewPath)) {
+  if (await _fsExtra.default.pathExists(previewPath)) {
     return;
   }
 
@@ -73,15 +79,7 @@ function configurePreview(framework, commonJs) {
       },
       ${extraParameters}
     }`.replace('  \n', '').trim();
-
-  _fsExtra.default.writeFileSync(previewPath, preview, {
+  await _fsExtra.default.writeFile(previewPath, preview, {
     encoding: 'utf8'
   });
-}
-
-function configure(framework, mainOptions) {
-  _fsExtra.default.ensureDirSync('./.storybook');
-
-  configureMain(mainOptions);
-  configurePreview(framework, mainOptions.commonJs);
 }

package/dist/cjs/generators/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/helpers.js

@@ -189,51 +189,49 @@ function copyTemplate(templateRoot) {
   });
 }
 
-function copyComponents(framework, language) {
+async function copyComponents(framework, language) {
   const languageFolderMapping = {
     javascript: 'js',
     typescript: 'ts'
   };
 
-  const componentsPath = () => {
+  const componentsPath = async () => {
     const frameworkPath = `frameworks/${framework}`;
 
     const languageSpecific = _path.default.resolve(__dirname, `${frameworkPath}/${languageFolderMapping[language]}`);
 
-    if (_fsExtra.default.existsSync(languageSpecific)) {
+    if (await _fsExtra.default.pathExists(languageSpecific)) {
       return languageSpecific;
     }
 
     const jsFallback = _path.default.resolve(__dirname, `${frameworkPath}/${languageFolderMapping.javascript}`);
 
-    if (_fsExtra.default.existsSync(jsFallback)) {
+    if (await _fsExtra.default.pathExists(jsFallback)) {
       return jsFallback;
     }
 
     const frameworkRootPath = _path.default.resolve(__dirname, frameworkPath);
 
-    if (_fsExtra.default.existsSync(frameworkRootPath)) {
+    if (await _fsExtra.default.pathExists(frameworkRootPath)) {
       return frameworkRootPath;
     }
 
     throw new Error(`Unsupported framework: ${framework}`);
   };
 
-  const targetPath = () => {
-    if (_fsExtra.default.existsSync('./src')) {
+  const targetPath = async () => {
+    if (await _fsExtra.default.pathExists('./src')) {
       return './src/stories';
     }
 
     return './stories';
   };
 
-  const destinationPath = targetPath();
-
-  _fsExtra.default.copySync(componentsPath(), destinationPath, {
+  const destinationPath = await targetPath();
+  await _fsExtra.default.copy(await componentsPath(), destinationPath, {
     overwrite: true
   });
-
-  _fsExtra.default.copySync(_path.default.resolve(__dirname, 'frameworks/common'), destinationPath, {
+  await _fsExtra.default.copy(_path.default.resolve(__dirname, 'frameworks/common'), destinationPath, {
     overwrite: true
   });
 }

package/dist/cjs/initiate.js

@@ -81,7 +81,8 @@ const installStorybook = (projectType, packageManager, options) => {
     language,
     builder: options.builder || (0, _detect.detectBuilder)(packageManager),
     linkable: !!options.linkable,
-    commonJs: options.commonJs
+    commonJs: options.commonJs,
+    pnp: options.usePnp
   };
 
   const runGenerator = async () => {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.web_components_typescript = exports.web_components_lit2 = exports.web_components = exports.vue3 = exports.vue = exports.vite_react = exports.svelte = exports.sfcVue = exports.react_typescript = exports.react_legacy_root_api = exports.react_in_yarn_workspace = exports.react = exports.preact = exports.html = exports.cra_typescript = exports.cra = exports.angular_modern_inline_rendering = exports.angular130 = exports.angular13 = exports.angular12 = exports.angular11 = exports.angular10 = exports.angular = void 0;
+exports.web_components_typescript = exports.web_components_lit2 = exports.web_components = exports.vue3 = exports.vue = exports.svelte = exports.sfcVue = exports.react_typescript = exports.react_legacy_root_api = exports.react_in_yarn_workspace = exports.react = exports.preact = exports.html = exports.cra_typescript = exports.cra = exports.angular_modern_inline_rendering = exports.angular130 = exports.angular13 = exports.angular12 = exports.angular = void 0;
 
 /* eslint-disable camelcase */
 const fromDeps = (...args) => ['mkdir {{appName}}', 'cd {{appName}}', // Create `yarn.lock` to force Yarn to consider adding deps in this directory
@@ -67,15 +67,14 @@ const react_typescript = {
     path: '.babelrc',
     contents: '{ "presets": ["@babel/preset-react", "@babel/preset-typescript"] }'
   }]
-};
+}; // export const vite_react: Parameters = {
+//   renderer: 'react',
+//   name: 'vite_react',
+//   version: 'latest',
+//   generator: 'npx -p create-vite@{{version}} create-vite {{appName}} --template react-ts',
+// };
+
 exports.react_typescript = react_typescript;
-const vite_react = {
-  renderer: 'react',
-  name: 'vite_react',
-  version: 'latest',
-  generator: 'npx -p create-vite@{{version}} create-vite {{appName}} --template react-ts'
-};
-exports.vite_react = vite_react;
 const react_in_yarn_workspace = {
   renderer: 'react',
   name: 'react_in_yarn_workspace',
@@ -89,18 +88,8 @@ const baseAngular = {
   renderer: 'angular',
   name: 'angular',
   version: 'latest',
-  generator: `npx -p @angular/cli@{{version}} ng new {{appName}} --routing=true --minimal=true --style=scss --skipInstall=true --strict`
+  generator: `npx -p @angular/cli@{{version}} ng new {{appName}} --routing=true --minimal=true --style=scss --skip-install=true --strict`
 };
-const angular10 = Object.assign({}, baseAngular, {
-  name: 'angular10',
-  version: 'v10-lts'
-});
-exports.angular10 = angular10;
-const angular11 = Object.assign({}, baseAngular, {
-  name: 'angular11',
-  version: 'v11-lts'
-});
-exports.angular11 = angular11;
 const angular12 = Object.assign({}, baseAngular, {
   name: 'angular12',
   version: 'v12-lts'
@@ -121,8 +110,7 @@ const angular_modern_inline_rendering = Object.assign({}, baseAngular, {
   additionalDeps: ['jest@27', '@storybook/test-runner'],
   mainOverrides: {
     features: {
-      storyStoreV7: true,
-      modernInlineRender: true
+      storyStoreV7: true
     }
   }
 });
@@ -140,14 +128,24 @@ const web_components = {
 exports.web_components = web_components;
 const web_components_typescript = Object.assign({}, web_components, {
   name: 'web_components_typescript',
-  typescript: true
+  typescript: true,
+  additionalDeps: ['@babel/preset-typescript'],
+  additionalFiles: [{
+    path: '.babelrc',
+    contents: '{ "presets": ["@babel/preset-typescript"] }'
+  }]
 });
 exports.web_components_typescript = web_components_typescript;
 const web_components_lit2 = Object.assign({}, web_components, {
   version: 'next',
   name: 'web_components_lit2',
   generator: fromDeps('lit'),
-  typescript: true
+  typescript: true,
+  additionalDeps: ['@babel/preset-typescript'],
+  additionalFiles: [{
+    path: '.babelrc',
+    contents: '{ "presets": ["@babel/preset-typescript"] }'
+  }]
 }); // #endregion
 // #region  vue
 

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

@@ -41,11 +41,12 @@ const exec = async (command, options = {}, {
   logger.debug(command);
   return new Promise((resolve, reject) => {
     const defaultOptions = {
-      silent: true
+      silent: false
     };
 
     const child = _shelljs.default.exec(command, Object.assign({}, defaultOptions, options, {
-      async: true
+      async: true,
+      silent: false
     }));
 
     child.stderr.pipe(process.stderr);
@@ -170,28 +171,37 @@ const addAdditionalFiles = async ({
   additionalFiles,
   cwd
 }) => {
-  if (!additionalFiles || additionalFiles.length === 0) {
-    return;
-  }
-
   logger.info(`⤵️ Adding required files`);
-  additionalFiles.forEach(async file => {
+  await Promise.all(additionalFiles.map(async file => {
     await (0, _fsExtra.outputFile)(_path.default.resolve(cwd, file.path), file.contents, {
       encoding: 'UTF-8'
     });
-  });
+  }));
 };
 
 const initStorybook = async ({
   cwd,
   autoDetect = true,
   name,
-  e2e
+  e2e,
+  pnp
 }) => {
-  const type = autoDetect ? '' : `--type ${name}`;
-  const linkable = e2e ? '' : '--linkable';
+  const flags = ['--yes'];
+
+  if (!autoDetect) {
+    flags.push(`--type ${name}`);
+  }
+
+  if (e2e) {
+    flags.push('--linkable');
+  }
+
+  if (pnp) {
+    flags.push('--use-pnp');
+  }
+
   const sbCLICommand = useLocalSbCli ? `node ${_path.default.join(__dirname, '../../esm/generate')}` : `yarn dlx -p @storybook/cli sb`;
-  const command = `${sbCLICommand} init --yes ${type} ${linkable}`;
+  const command = `${sbCLICommand} init ${flags.join(' ')}`;
   await exec(command, {
     cwd
   }, {
@@ -283,7 +293,7 @@ const createAndInit = async (cwd, _ref, {
   }));
   await doTask(addAdditionalFiles, Object.assign({}, options, {
     cwd
-  }));
+  }), !!options.additionalFiles);
 
   if (e2e) {
     await doTask(addPackageResolutions, options);