@storybook/cli 6.5.9 → 6.5.10

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

@@ -20,6 +20,8 @@ var _eslintPlugin = require("./eslint-plugin");
 
 var _builderVite = require("./builder-vite");
 
+var _npm = require("./npm7");
+
 var _types = require("../types");
 
 Object.keys(_types).forEach(function (key) {
@@ -33,5 +35,5 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
-const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite];
+const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite, _npm.npm7];
 exports.fixes = fixes;

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

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.npm7 = void 0;
+
+require("core-js/modules/es.promise.js");
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Is the user using npm7+? If so create a .npmrc with legacy-peer-deps=true
+ */
+const npm7 = {
+  id: 'npm7',
+
+  async check({
+    packageManager
+  }) {
+    if (packageManager.type !== 'npm') return null;
+    const npmVersion = packageManager.getNpmVersion();
+
+    if (packageManager.needsLegacyPeerDeps(npmVersion)) {
+      return {
+        npmVersion
+      };
+    }
+
+    return null;
+  },
+
+  prompt({
+    npmVersion
+  }) {
+    const npmFormatted = _chalk.default.cyan(`npm ${npmVersion}`);
+
+    return (0, _tsDedent.default)`
+      We've detected you are running ${npmFormatted} which has peer dependency semantics which Storybook is incompatible with.
+
+      In order to work with Storybook's package structure, you'll need to run \`npm\` with the
+      \`--legacy-peer-deps=true\` flag. We can generate an \`.npmrc\` which will do that automatically.
+      
+      More info: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/issues/18298')}
+    `;
+  },
+
+  async run({
+    packageManager
+  }) {
+    packageManager.setLegacyPeerDeps();
+  }
+
+};
+exports.npm7 = npm7;

package/dist/cjs/generate.js

@@ -44,7 +44,10 @@ 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('-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).catch(err => {
+  logger.error(err);
+  process.exit(1);
+}));
 
 _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/REACT_NATIVE/template-csf/storybook/rn-addons.js

@@ -1,2 +1,2 @@
-import '@storybook/addon-ondevice-actions/manager';
-import '@storybook/addon-ondevice-knobs/manager';
+import '@storybook/addon-ondevice-actions/register';
+import '@storybook/addon-ondevice-knobs/register';

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

@@ -16,8 +16,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 +29,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 +53,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/baseGenerator.js

@@ -60,7 +60,8 @@ const hasInteractiveStories = framework => ['react', 'angular', 'preact', 'svelt
 
 async function baseGenerator(packageManager, npmOptions, {
   language,
-  builder
+  builder,
+  commonJs
 }, framework, options = defaultOptions) {
   const {
     extraAddons,
@@ -110,7 +111,7 @@ async function baseGenerator(packageManager, npmOptions, {
     framework: frameworkPackage,
     addons: [...addons, ...stripVersions(extraAddons)],
     extensions,
-    commonJs: options.commonJs
+    commonJs
   }, mainOptions));
 
   if (addComponents) {

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

@@ -30,10 +30,26 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     return `npm run ${command}`;
   }
 
+  getNpmVersion() {
+    return this.executeCommand('npm', ['--version']);
+  }
+
+  hasLegacyPeerDeps() {
+    const result = this.executeCommand('npm', ['config', 'get', 'legacy-peer-deps', '--location=project']);
+    return result.trim() === 'true';
+  }
+
+  setLegacyPeerDeps() {
+    this.executeCommand('npm', ['config', 'set', 'legacy-peer-deps=true', '--location=project']);
+  }
+
+  needsLegacyPeerDeps(version) {
+    return _semver.default.gte(version, '7.0.0') && !this.hasLegacyPeerDeps();
+  }
+
   getInstallArgs() {
     if (!this.installArgs) {
-      const version = this.executeCommand('npm', ['--version']);
-      this.installArgs = _semver.default.gte(version, '7.0.0') ? ['install', '--legacy-peer-deps'] : ['install'];
+      this.installArgs = this.needsLegacyPeerDeps(this.getNpmVersion()) ? ['install', '--legacy-peer-deps'] : ['install'];
     }
 
     return this.installArgs;

package/dist/cjs/versions.js

@@ -6,62 +6,62 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 // auto generated file, do not edit
 var _default = {
-  '@storybook/addon-a11y': '6.5.9',
-  '@storybook/addon-actions': '6.5.9',
-  '@storybook/addon-backgrounds': '6.5.9',
-  '@storybook/addon-controls': '6.5.9',
-  '@storybook/addon-docs': '6.5.9',
-  '@storybook/addon-essentials': '6.5.9',
-  '@storybook/addon-interactions': '6.5.9',
-  '@storybook/addon-jest': '6.5.9',
-  '@storybook/addon-links': '6.5.9',
-  '@storybook/addon-measure': '6.5.9',
-  '@storybook/addon-outline': '6.5.9',
-  '@storybook/addon-storyshots': '6.5.9',
-  '@storybook/addon-storyshots-puppeteer': '6.5.9',
-  '@storybook/addon-storysource': '6.5.9',
-  '@storybook/addon-toolbars': '6.5.9',
-  '@storybook/addon-viewport': '6.5.9',
-  '@storybook/addons': '6.5.9',
-  '@storybook/angular': '6.5.9',
-  '@storybook/api': '6.5.9',
-  '@storybook/builder-webpack4': '6.5.9',
-  '@storybook/builder-webpack5': '6.5.9',
-  '@storybook/channel-postmessage': '6.5.9',
-  '@storybook/channel-websocket': '6.5.9',
-  '@storybook/channels': '6.5.9',
-  '@storybook/cli': '6.5.9',
-  '@storybook/client-api': '6.5.9',
-  '@storybook/client-logger': '6.5.9',
-  '@storybook/codemod': '6.5.9',
-  '@storybook/components': '6.5.9',
-  '@storybook/core': '6.5.9',
-  '@storybook/core-client': '6.5.9',
-  '@storybook/core-common': '6.5.9',
-  '@storybook/core-events': '6.5.9',
-  '@storybook/core-server': '6.5.9',
-  '@storybook/csf-tools': '6.5.9',
-  '@storybook/docs-tools': '6.5.9',
-  '@storybook/ember': '6.5.9',
-  '@storybook/html': '6.5.9',
-  '@storybook/instrumenter': '6.5.9',
-  '@storybook/manager-webpack4': '6.5.9',
-  '@storybook/manager-webpack5': '6.5.9',
-  '@storybook/node-logger': '6.5.9',
-  '@storybook/postinstall': '6.5.9',
-  '@storybook/preact': '6.5.9',
-  '@storybook/preview-web': '6.5.9',
-  '@storybook/react': '6.5.9',
-  '@storybook/router': '6.5.9',
-  '@storybook/server': '6.5.9',
-  '@storybook/source-loader': '6.5.9',
-  '@storybook/store': '6.5.9',
-  '@storybook/svelte': '6.5.9',
-  '@storybook/telemetry': '6.5.9',
-  '@storybook/theming': '6.5.9',
-  '@storybook/ui': '6.5.9',
-  '@storybook/vue': '6.5.9',
-  '@storybook/vue3': '6.5.9',
-  '@storybook/web-components': '6.5.9'
+  '@storybook/addon-a11y': '6.5.10',
+  '@storybook/addon-actions': '6.5.10',
+  '@storybook/addon-backgrounds': '6.5.10',
+  '@storybook/addon-controls': '6.5.10',
+  '@storybook/addon-docs': '6.5.10',
+  '@storybook/addon-essentials': '6.5.10',
+  '@storybook/addon-interactions': '6.5.10',
+  '@storybook/addon-jest': '6.5.10',
+  '@storybook/addon-links': '6.5.10',
+  '@storybook/addon-measure': '6.5.10',
+  '@storybook/addon-outline': '6.5.10',
+  '@storybook/addon-storyshots': '6.5.10',
+  '@storybook/addon-storyshots-puppeteer': '6.5.10',
+  '@storybook/addon-storysource': '6.5.10',
+  '@storybook/addon-toolbars': '6.5.10',
+  '@storybook/addon-viewport': '6.5.10',
+  '@storybook/addons': '6.5.10',
+  '@storybook/angular': '6.5.10',
+  '@storybook/api': '6.5.10',
+  '@storybook/builder-webpack4': '6.5.10',
+  '@storybook/builder-webpack5': '6.5.10',
+  '@storybook/channel-postmessage': '6.5.10',
+  '@storybook/channel-websocket': '6.5.10',
+  '@storybook/channels': '6.5.10',
+  '@storybook/cli': '6.5.10',
+  '@storybook/client-api': '6.5.10',
+  '@storybook/client-logger': '6.5.10',
+  '@storybook/codemod': '6.5.10',
+  '@storybook/components': '6.5.10',
+  '@storybook/core': '6.5.10',
+  '@storybook/core-client': '6.5.10',
+  '@storybook/core-common': '6.5.10',
+  '@storybook/core-events': '6.5.10',
+  '@storybook/core-server': '6.5.10',
+  '@storybook/csf-tools': '6.5.10',
+  '@storybook/docs-tools': '6.5.10',
+  '@storybook/ember': '6.5.10',
+  '@storybook/html': '6.5.10',
+  '@storybook/instrumenter': '6.5.10',
+  '@storybook/manager-webpack4': '6.5.10',
+  '@storybook/manager-webpack5': '6.5.10',
+  '@storybook/node-logger': '6.5.10',
+  '@storybook/postinstall': '6.5.10',
+  '@storybook/preact': '6.5.10',
+  '@storybook/preview-web': '6.5.10',
+  '@storybook/react': '6.5.10',
+  '@storybook/router': '6.5.10',
+  '@storybook/server': '6.5.10',
+  '@storybook/source-loader': '6.5.10',
+  '@storybook/store': '6.5.10',
+  '@storybook/svelte': '6.5.10',
+  '@storybook/telemetry': '6.5.10',
+  '@storybook/theming': '6.5.10',
+  '@storybook/ui': '6.5.10',
+  '@storybook/vue': '6.5.10',
+  '@storybook/vue3': '6.5.10',
+  '@storybook/web-components': '6.5.10'
 };
 exports.default = _default;

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

@@ -20,6 +20,8 @@ var _eslintPlugin = require("./eslint-plugin");
 
 var _builderVite = require("./builder-vite");
 
+var _npm = require("./npm7");
+
 var _types = require("../types");
 
 Object.keys(_types).forEach(function (key) {
@@ -33,5 +35,5 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
-const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite];
+const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite, _npm.npm7];
 exports.fixes = fixes;

package/dist/esm/automigrate/fixes/npm7.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.npm7 = void 0;
+
+require("core-js/modules/es.promise.js");
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Is the user using npm7+? If so create a .npmrc with legacy-peer-deps=true
+ */
+const npm7 = {
+  id: 'npm7',
+
+  async check({
+    packageManager
+  }) {
+    if (packageManager.type !== 'npm') return null;
+    const npmVersion = packageManager.getNpmVersion();
+
+    if (packageManager.needsLegacyPeerDeps(npmVersion)) {
+      return {
+        npmVersion
+      };
+    }
+
+    return null;
+  },
+
+  prompt({
+    npmVersion
+  }) {
+    const npmFormatted = _chalk.default.cyan(`npm ${npmVersion}`);
+
+    return (0, _tsDedent.default)`
+      We've detected you are running ${npmFormatted} which has peer dependency semantics which Storybook is incompatible with.
+
+      In order to work with Storybook's package structure, you'll need to run \`npm\` with the
+      \`--legacy-peer-deps=true\` flag. We can generate an \`.npmrc\` which will do that automatically.
+      
+      More info: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/issues/18298')}
+    `;
+  },
+
+  async run({
+    packageManager
+  }) {
+    packageManager.setLegacyPeerDeps();
+  }
+
+};
+exports.npm7 = npm7;

package/dist/esm/generate.js

@@ -44,7 +44,10 @@ 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('-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).catch(err => {
+  logger.error(err);
+  process.exit(1);
+}));
 
 _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/esm/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js

@@ -1,2 +1,2 @@
-import '@storybook/addon-ondevice-actions/manager';
-import '@storybook/addon-ondevice-knobs/manager';
+import '@storybook/addon-ondevice-actions/register';
+import '@storybook/addon-ondevice-knobs/register';

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

@@ -16,8 +16,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 +29,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 +53,7 @@ const generator = async (packageManager, npmOptions, options) => {
     extraPackages: ['svelte', 'svelte-loader'],
     extensions: ['js', 'jsx', 'ts', 'tsx', 'svelte'],
     extraMain,
-    commonJs
+    commonJs: true
   });
 };
 

package/dist/esm/generators/baseGenerator.js

@@ -60,7 +60,8 @@ const hasInteractiveStories = framework => ['react', 'angular', 'preact', 'svelt
 
 async function baseGenerator(packageManager, npmOptions, {
   language,
-  builder
+  builder,
+  commonJs
 }, framework, options = defaultOptions) {
   const {
     extraAddons,
@@ -110,7 +111,7 @@ async function baseGenerator(packageManager, npmOptions, {
     framework: frameworkPackage,
     addons: [...addons, ...stripVersions(extraAddons)],
     extensions,
-    commonJs: options.commonJs
+    commonJs
   }, mainOptions));
 
   if (addComponents) {

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

@@ -30,10 +30,26 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     return `npm run ${command}`;
   }
 
+  getNpmVersion() {
+    return this.executeCommand('npm', ['--version']);
+  }
+
+  hasLegacyPeerDeps() {
+    const result = this.executeCommand('npm', ['config', 'get', 'legacy-peer-deps', '--location=project']);
+    return result.trim() === 'true';
+  }
+
+  setLegacyPeerDeps() {
+    this.executeCommand('npm', ['config', 'set', 'legacy-peer-deps=true', '--location=project']);
+  }
+
+  needsLegacyPeerDeps(version) {
+    return _semver.default.gte(version, '7.0.0') && !this.hasLegacyPeerDeps();
+  }
+
   getInstallArgs() {
     if (!this.installArgs) {
-      const version = this.executeCommand('npm', ['--version']);
-      this.installArgs = _semver.default.gte(version, '7.0.0') ? ['install', '--legacy-peer-deps'] : ['install'];
+      this.installArgs = this.needsLegacyPeerDeps(this.getNpmVersion()) ? ['install', '--legacy-peer-deps'] : ['install'];
     }
 
     return this.installArgs;

package/dist/esm/versions.js

@@ -6,62 +6,62 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 // auto generated file, do not edit
 var _default = {
-  '@storybook/addon-a11y': '6.5.9',
-  '@storybook/addon-actions': '6.5.9',
-  '@storybook/addon-backgrounds': '6.5.9',
-  '@storybook/addon-controls': '6.5.9',
-  '@storybook/addon-docs': '6.5.9',
-  '@storybook/addon-essentials': '6.5.9',
-  '@storybook/addon-interactions': '6.5.9',
-  '@storybook/addon-jest': '6.5.9',
-  '@storybook/addon-links': '6.5.9',
-  '@storybook/addon-measure': '6.5.9',
-  '@storybook/addon-outline': '6.5.9',
-  '@storybook/addon-storyshots': '6.5.9',
-  '@storybook/addon-storyshots-puppeteer': '6.5.9',
-  '@storybook/addon-storysource': '6.5.9',
-  '@storybook/addon-toolbars': '6.5.9',
-  '@storybook/addon-viewport': '6.5.9',
-  '@storybook/addons': '6.5.9',
-  '@storybook/angular': '6.5.9',
-  '@storybook/api': '6.5.9',
-  '@storybook/builder-webpack4': '6.5.9',
-  '@storybook/builder-webpack5': '6.5.9',
-  '@storybook/channel-postmessage': '6.5.9',
-  '@storybook/channel-websocket': '6.5.9',
-  '@storybook/channels': '6.5.9',
-  '@storybook/cli': '6.5.9',
-  '@storybook/client-api': '6.5.9',
-  '@storybook/client-logger': '6.5.9',
-  '@storybook/codemod': '6.5.9',
-  '@storybook/components': '6.5.9',
-  '@storybook/core': '6.5.9',
-  '@storybook/core-client': '6.5.9',
-  '@storybook/core-common': '6.5.9',
-  '@storybook/core-events': '6.5.9',
-  '@storybook/core-server': '6.5.9',
-  '@storybook/csf-tools': '6.5.9',
-  '@storybook/docs-tools': '6.5.9',
-  '@storybook/ember': '6.5.9',
-  '@storybook/html': '6.5.9',
-  '@storybook/instrumenter': '6.5.9',
-  '@storybook/manager-webpack4': '6.5.9',
-  '@storybook/manager-webpack5': '6.5.9',
-  '@storybook/node-logger': '6.5.9',
-  '@storybook/postinstall': '6.5.9',
-  '@storybook/preact': '6.5.9',
-  '@storybook/preview-web': '6.5.9',
-  '@storybook/react': '6.5.9',
-  '@storybook/router': '6.5.9',
-  '@storybook/server': '6.5.9',
-  '@storybook/source-loader': '6.5.9',
-  '@storybook/store': '6.5.9',
-  '@storybook/svelte': '6.5.9',
-  '@storybook/telemetry': '6.5.9',
-  '@storybook/theming': '6.5.9',
-  '@storybook/ui': '6.5.9',
-  '@storybook/vue': '6.5.9',
-  '@storybook/vue3': '6.5.9',
-  '@storybook/web-components': '6.5.9'
+  '@storybook/addon-a11y': '6.5.10',
+  '@storybook/addon-actions': '6.5.10',
+  '@storybook/addon-backgrounds': '6.5.10',
+  '@storybook/addon-controls': '6.5.10',
+  '@storybook/addon-docs': '6.5.10',
+  '@storybook/addon-essentials': '6.5.10',
+  '@storybook/addon-interactions': '6.5.10',
+  '@storybook/addon-jest': '6.5.10',
+  '@storybook/addon-links': '6.5.10',
+  '@storybook/addon-measure': '6.5.10',
+  '@storybook/addon-outline': '6.5.10',
+  '@storybook/addon-storyshots': '6.5.10',
+  '@storybook/addon-storyshots-puppeteer': '6.5.10',
+  '@storybook/addon-storysource': '6.5.10',
+  '@storybook/addon-toolbars': '6.5.10',
+  '@storybook/addon-viewport': '6.5.10',
+  '@storybook/addons': '6.5.10',
+  '@storybook/angular': '6.5.10',
+  '@storybook/api': '6.5.10',
+  '@storybook/builder-webpack4': '6.5.10',
+  '@storybook/builder-webpack5': '6.5.10',
+  '@storybook/channel-postmessage': '6.5.10',
+  '@storybook/channel-websocket': '6.5.10',
+  '@storybook/channels': '6.5.10',
+  '@storybook/cli': '6.5.10',
+  '@storybook/client-api': '6.5.10',
+  '@storybook/client-logger': '6.5.10',
+  '@storybook/codemod': '6.5.10',
+  '@storybook/components': '6.5.10',
+  '@storybook/core': '6.5.10',
+  '@storybook/core-client': '6.5.10',
+  '@storybook/core-common': '6.5.10',
+  '@storybook/core-events': '6.5.10',
+  '@storybook/core-server': '6.5.10',
+  '@storybook/csf-tools': '6.5.10',
+  '@storybook/docs-tools': '6.5.10',
+  '@storybook/ember': '6.5.10',
+  '@storybook/html': '6.5.10',
+  '@storybook/instrumenter': '6.5.10',
+  '@storybook/manager-webpack4': '6.5.10',
+  '@storybook/manager-webpack5': '6.5.10',
+  '@storybook/node-logger': '6.5.10',
+  '@storybook/postinstall': '6.5.10',
+  '@storybook/preact': '6.5.10',
+  '@storybook/preview-web': '6.5.10',
+  '@storybook/react': '6.5.10',
+  '@storybook/router': '6.5.10',
+  '@storybook/server': '6.5.10',
+  '@storybook/source-loader': '6.5.10',
+  '@storybook/store': '6.5.10',
+  '@storybook/svelte': '6.5.10',
+  '@storybook/telemetry': '6.5.10',
+  '@storybook/theming': '6.5.10',
+  '@storybook/ui': '6.5.10',
+  '@storybook/vue': '6.5.10',
+  '@storybook/vue3': '6.5.10',
+  '@storybook/web-components': '6.5.10'
 };
 exports.default = _default;

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

@@ -20,6 +20,8 @@ var _eslintPlugin = require("./eslint-plugin");
 
 var _builderVite = require("./builder-vite");
 
+var _npm = require("./npm7");
+
 var _types = require("../types");
 
 Object.keys(_types).forEach(function (key) {
@@ -33,5 +35,5 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
-const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite];
+const fixes = [_cra.cra5, _webpack.webpack5, _angular.angular12, _mainjsFramework.mainjsFramework, _eslintPlugin.eslintPlugin, _builderVite.builderVite, _npm.npm7];
 exports.fixes = fixes;

package/dist/modern/automigrate/fixes/npm7.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.npm7 = void 0;
+
+require("core-js/modules/es.promise.js");
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _tsDedent = _interopRequireDefault(require("ts-dedent"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Is the user using npm7+? If so create a .npmrc with legacy-peer-deps=true
+ */
+const npm7 = {
+  id: 'npm7',
+
+  async check({
+    packageManager
+  }) {
+    if (packageManager.type !== 'npm') return null;
+    const npmVersion = packageManager.getNpmVersion();
+
+    if (packageManager.needsLegacyPeerDeps(npmVersion)) {
+      return {
+        npmVersion
+      };
+    }
+
+    return null;
+  },
+
+  prompt({
+    npmVersion
+  }) {
+    const npmFormatted = _chalk.default.cyan(`npm ${npmVersion}`);
+
+    return (0, _tsDedent.default)`
+      We've detected you are running ${npmFormatted} which has peer dependency semantics which Storybook is incompatible with.
+
+      In order to work with Storybook's package structure, you'll need to run \`npm\` with the
+      \`--legacy-peer-deps=true\` flag. We can generate an \`.npmrc\` which will do that automatically.
+      
+      More info: ${_chalk.default.yellow('https://github.com/storybookjs/storybook/issues/18298')}
+    `;
+  },
+
+  async run({
+    packageManager
+  }) {
+    packageManager.setLegacyPeerDeps();
+  }
+
+};
+exports.npm7 = npm7;

package/dist/modern/generate.js

@@ -44,7 +44,10 @@ 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('-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).catch(err => {
+  logger.error(err);
+  process.exit(1);
+}));
 
 _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/modern/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js

@@ -1,2 +1,2 @@
-import '@storybook/addon-ondevice-actions/manager';
-import '@storybook/addon-ondevice-knobs/manager';
+import '@storybook/addon-ondevice-actions/register';
+import '@storybook/addon-ondevice-knobs/register';

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

@@ -16,8 +16,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 +29,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 +53,7 @@ const generator = async (packageManager, npmOptions, options) => {
     extraPackages: ['svelte', 'svelte-loader'],
     extensions: ['js', 'jsx', 'ts', 'tsx', 'svelte'],
     extraMain,
-    commonJs
+    commonJs: true
   });
 };
 

package/dist/modern/generators/baseGenerator.js

@@ -60,7 +60,8 @@ const hasInteractiveStories = framework => ['react', 'angular', 'preact', 'svelt
 
 async function baseGenerator(packageManager, npmOptions, {
   language,
-  builder
+  builder,
+  commonJs
 }, framework, options = defaultOptions) {
   const {
     extraAddons,
@@ -110,7 +111,7 @@ async function baseGenerator(packageManager, npmOptions, {
     framework: frameworkPackage,
     addons: [...addons, ...stripVersions(extraAddons)],
     extensions,
-    commonJs: options.commonJs
+    commonJs
   }, mainOptions));
 
   if (addComponents) {

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

@@ -30,10 +30,26 @@ class NPMProxy extends _JsPackageManager.JsPackageManager {
     return `npm run ${command}`;
   }
 
+  getNpmVersion() {
+    return this.executeCommand('npm', ['--version']);
+  }
+
+  hasLegacyPeerDeps() {
+    const result = this.executeCommand('npm', ['config', 'get', 'legacy-peer-deps', '--location=project']);
+    return result.trim() === 'true';
+  }
+
+  setLegacyPeerDeps() {
+    this.executeCommand('npm', ['config', 'set', 'legacy-peer-deps=true', '--location=project']);
+  }
+
+  needsLegacyPeerDeps(version) {
+    return _semver.default.gte(version, '7.0.0') && !this.hasLegacyPeerDeps();
+  }
+
   getInstallArgs() {
     if (!this.installArgs) {
-      const version = this.executeCommand('npm', ['--version']);
-      this.installArgs = _semver.default.gte(version, '7.0.0') ? ['install', '--legacy-peer-deps'] : ['install'];
+      this.installArgs = this.needsLegacyPeerDeps(this.getNpmVersion()) ? ['install', '--legacy-peer-deps'] : ['install'];
     }
 
     return this.installArgs;

package/dist/modern/versions.js

@@ -6,62 +6,62 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 // auto generated file, do not edit
 var _default = {
-  '@storybook/addon-a11y': '6.5.9',
-  '@storybook/addon-actions': '6.5.9',
-  '@storybook/addon-backgrounds': '6.5.9',
-  '@storybook/addon-controls': '6.5.9',
-  '@storybook/addon-docs': '6.5.9',
-  '@storybook/addon-essentials': '6.5.9',
-  '@storybook/addon-interactions': '6.5.9',
-  '@storybook/addon-jest': '6.5.9',
-  '@storybook/addon-links': '6.5.9',
-  '@storybook/addon-measure': '6.5.9',
-  '@storybook/addon-outline': '6.5.9',
-  '@storybook/addon-storyshots': '6.5.9',
-  '@storybook/addon-storyshots-puppeteer': '6.5.9',
-  '@storybook/addon-storysource': '6.5.9',
-  '@storybook/addon-toolbars': '6.5.9',
-  '@storybook/addon-viewport': '6.5.9',
-  '@storybook/addons': '6.5.9',
-  '@storybook/angular': '6.5.9',
-  '@storybook/api': '6.5.9',
-  '@storybook/builder-webpack4': '6.5.9',
-  '@storybook/builder-webpack5': '6.5.9',
-  '@storybook/channel-postmessage': '6.5.9',
-  '@storybook/channel-websocket': '6.5.9',
-  '@storybook/channels': '6.5.9',
-  '@storybook/cli': '6.5.9',
-  '@storybook/client-api': '6.5.9',
-  '@storybook/client-logger': '6.5.9',
-  '@storybook/codemod': '6.5.9',
-  '@storybook/components': '6.5.9',
-  '@storybook/core': '6.5.9',
-  '@storybook/core-client': '6.5.9',
-  '@storybook/core-common': '6.5.9',
-  '@storybook/core-events': '6.5.9',
-  '@storybook/core-server': '6.5.9',
-  '@storybook/csf-tools': '6.5.9',
-  '@storybook/docs-tools': '6.5.9',
-  '@storybook/ember': '6.5.9',
-  '@storybook/html': '6.5.9',
-  '@storybook/instrumenter': '6.5.9',
-  '@storybook/manager-webpack4': '6.5.9',
-  '@storybook/manager-webpack5': '6.5.9',
-  '@storybook/node-logger': '6.5.9',
-  '@storybook/postinstall': '6.5.9',
-  '@storybook/preact': '6.5.9',
-  '@storybook/preview-web': '6.5.9',
-  '@storybook/react': '6.5.9',
-  '@storybook/router': '6.5.9',
-  '@storybook/server': '6.5.9',
-  '@storybook/source-loader': '6.5.9',
-  '@storybook/store': '6.5.9',
-  '@storybook/svelte': '6.5.9',
-  '@storybook/telemetry': '6.5.9',
-  '@storybook/theming': '6.5.9',
-  '@storybook/ui': '6.5.9',
-  '@storybook/vue': '6.5.9',
-  '@storybook/vue3': '6.5.9',
-  '@storybook/web-components': '6.5.9'
+  '@storybook/addon-a11y': '6.5.10',
+  '@storybook/addon-actions': '6.5.10',
+  '@storybook/addon-backgrounds': '6.5.10',
+  '@storybook/addon-controls': '6.5.10',
+  '@storybook/addon-docs': '6.5.10',
+  '@storybook/addon-essentials': '6.5.10',
+  '@storybook/addon-interactions': '6.5.10',
+  '@storybook/addon-jest': '6.5.10',
+  '@storybook/addon-links': '6.5.10',
+  '@storybook/addon-measure': '6.5.10',
+  '@storybook/addon-outline': '6.5.10',
+  '@storybook/addon-storyshots': '6.5.10',
+  '@storybook/addon-storyshots-puppeteer': '6.5.10',
+  '@storybook/addon-storysource': '6.5.10',
+  '@storybook/addon-toolbars': '6.5.10',
+  '@storybook/addon-viewport': '6.5.10',
+  '@storybook/addons': '6.5.10',
+  '@storybook/angular': '6.5.10',
+  '@storybook/api': '6.5.10',
+  '@storybook/builder-webpack4': '6.5.10',
+  '@storybook/builder-webpack5': '6.5.10',
+  '@storybook/channel-postmessage': '6.5.10',
+  '@storybook/channel-websocket': '6.5.10',
+  '@storybook/channels': '6.5.10',
+  '@storybook/cli': '6.5.10',
+  '@storybook/client-api': '6.5.10',
+  '@storybook/client-logger': '6.5.10',
+  '@storybook/codemod': '6.5.10',
+  '@storybook/components': '6.5.10',
+  '@storybook/core': '6.5.10',
+  '@storybook/core-client': '6.5.10',
+  '@storybook/core-common': '6.5.10',
+  '@storybook/core-events': '6.5.10',
+  '@storybook/core-server': '6.5.10',
+  '@storybook/csf-tools': '6.5.10',
+  '@storybook/docs-tools': '6.5.10',
+  '@storybook/ember': '6.5.10',
+  '@storybook/html': '6.5.10',
+  '@storybook/instrumenter': '6.5.10',
+  '@storybook/manager-webpack4': '6.5.10',
+  '@storybook/manager-webpack5': '6.5.10',
+  '@storybook/node-logger': '6.5.10',
+  '@storybook/postinstall': '6.5.10',
+  '@storybook/preact': '6.5.10',
+  '@storybook/preview-web': '6.5.10',
+  '@storybook/react': '6.5.10',
+  '@storybook/router': '6.5.10',
+  '@storybook/server': '6.5.10',
+  '@storybook/source-loader': '6.5.10',
+  '@storybook/store': '6.5.10',
+  '@storybook/svelte': '6.5.10',
+  '@storybook/telemetry': '6.5.10',
+  '@storybook/theming': '6.5.10',
+  '@storybook/ui': '6.5.10',
+  '@storybook/vue': '6.5.10',
+  '@storybook/vue3': '6.5.10',
+  '@storybook/web-components': '6.5.10'
 };
 exports.default = _default;

package/dist/ts3.4/automigrate/fixes/npm7.d.ts

@@ -0,0 +1,9 @@
+import { Fix } from '../types';
+interface Npm7RunOptions {
+    npmVersion: string;
+}
+/**
+ * Is the user using npm7+? If so create a .npmrc with legacy-peer-deps=true
+ */
+export declare const npm7: Fix<Npm7RunOptions>;
+export {};

package/dist/ts3.4/generators/baseGenerator.d.ts

@@ -5,6 +5,7 @@ export declare type GeneratorOptions = {
     language: SupportedLanguage;
     builder: Builder;
     linkable: boolean;
+    commonJs: boolean;
 };
 export interface FrameworkOptions {
     extraPackages?: string[];
@@ -19,4 +20,4 @@ export interface FrameworkOptions {
     commonJs?: boolean;
 }
 export declare type Generator = (packageManager: JsPackageManager, npmOptions: NpmOptions, options: GeneratorOptions) => Promise<void>;
-export declare function baseGenerator(packageManager: JsPackageManager, npmOptions: NpmOptions, { language, builder }: GeneratorOptions, framework: SupportedFrameworks, options?: FrameworkOptions): Promise<void>;
+export declare function baseGenerator(packageManager: JsPackageManager, npmOptions: NpmOptions, { language, builder, commonJs }: GeneratorOptions, framework: SupportedFrameworks, options?: FrameworkOptions): Promise<void>;

package/dist/ts3.4/js-package-manager/NPMProxy.d.ts

@@ -5,6 +5,10 @@ export declare class NPMProxy extends JsPackageManager {
     initPackageJson(): string;
     getRunStorybookCommand(): string;
     getRunCommand(command: string): string;
+    getNpmVersion(): string;
+    hasLegacyPeerDeps(): boolean;
+    setLegacyPeerDeps(): void;
+    needsLegacyPeerDeps(version: string): boolean;
     getInstallArgs(): string[];
     protected runInstall(): void;
     protected runAddDeps(dependencies: string[], installAsDevDependencies: boolean): void;

package/dist/ts3.9/automigrate/fixes/npm7.d.ts

@@ -0,0 +1,9 @@
+import { Fix } from '../types';
+interface Npm7RunOptions {
+    npmVersion: string;
+}
+/**
+ * Is the user using npm7+? If so create a .npmrc with legacy-peer-deps=true
+ */
+export declare const npm7: Fix<Npm7RunOptions>;
+export {};

package/dist/ts3.9/generators/baseGenerator.d.ts

@@ -5,6 +5,7 @@ export declare type GeneratorOptions = {
     language: SupportedLanguage;
     builder: Builder;
     linkable: boolean;
+    commonJs: boolean;
 };
 export interface FrameworkOptions {
     extraPackages?: string[];
@@ -19,4 +20,4 @@ export interface FrameworkOptions {
     commonJs?: boolean;
 }
 export declare type Generator = (packageManager: JsPackageManager, npmOptions: NpmOptions, options: GeneratorOptions) => Promise<void>;
-export declare function baseGenerator(packageManager: JsPackageManager, npmOptions: NpmOptions, { language, builder }: GeneratorOptions, framework: SupportedFrameworks, options?: FrameworkOptions): Promise<void>;
+export declare function baseGenerator(packageManager: JsPackageManager, npmOptions: NpmOptions, { language, builder, commonJs }: GeneratorOptions, framework: SupportedFrameworks, options?: FrameworkOptions): Promise<void>;

package/dist/ts3.9/js-package-manager/NPMProxy.d.ts

@@ -5,6 +5,10 @@ export declare class NPMProxy extends JsPackageManager {
     initPackageJson(): string;
     getRunStorybookCommand(): string;
     getRunCommand(command: string): string;
+    getNpmVersion(): string;
+    hasLegacyPeerDeps(): boolean;
+    setLegacyPeerDeps(): void;
+    needsLegacyPeerDeps(version: string): boolean;
     getInstallArgs(): string[];
     protected runInstall(): void;
     protected runAddDeps(dependencies: string[], installAsDevDependencies: boolean): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "6.5.9",
+  "version": "6.5.10",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",
@@ -47,12 +47,12 @@
   "dependencies": {
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
-    "@storybook/codemod": "6.5.9",
-    "@storybook/core-common": "6.5.9",
-    "@storybook/csf-tools": "6.5.9",
-    "@storybook/node-logger": "6.5.9",
+    "@storybook/codemod": "6.5.10",
+    "@storybook/core-common": "6.5.10",
+    "@storybook/csf-tools": "6.5.10",
+    "@storybook/node-logger": "6.5.10",
     "@storybook/semver": "^7.3.2",
-    "@storybook/telemetry": "6.5.9",
+    "@storybook/telemetry": "6.5.10",
     "boxen": "^5.1.2",
     "chalk": "^4.1.0",
     "commander": "^6.2.1",
@@ -76,7 +76,7 @@
     "update-notifier": "^5.0.1"
   },
   "devDependencies": {
-    "@storybook/client-api": "6.5.9",
+    "@storybook/client-api": "6.5.10",
     "@types/cross-spawn": "^6.0.2",
     "@types/prompts": "^2.0.9",
     "@types/puppeteer-core": "^2.1.0",
@@ -89,5 +89,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e2673f765722cbb542ef1b5cf8d533c8e746a127"
+  "gitHead": "893881ff6f87272c0ab0f21776ef8fef990d0c36"
 }