@storybook/cli 6.3.6 → 6.3.10

package/dist/modern/frameworks/vue3/Button.stories.js

@@ -1,15 +1,21 @@
 import MyButton from './Button.vue';
 
+// More on default export: https://storybook.js.org/docs/vue/writing-stories/introduction#default-export
 export default {
   title: 'Example/Button',
   component: MyButton,
+  // More on argTypes: https://storybook.js.org/docs/vue/api/argtypes
   argTypes: {
     backgroundColor: { control: 'color' },
-    size: { control: { type: 'select', options: ['small', 'medium', 'large'] } },
     onClick: {},
+    size: {
+      control: { type: 'select' },
+      options: ['small', 'medium', 'large'],
+    },
   },
 };
 
+// More on component templates: https://storybook.js.org/docs/vue/writing-stories/introduction#using-args
 const Template = (args) => ({
   // Components used in your story `template` are defined in the `components` object
   components: { MyButton },
@@ -22,6 +28,7 @@ const Template = (args) => ({
 });
 
 export const Primary = Template.bind({});
+// More on args: https://storybook.js.org/docs/vue/writing-stories/args
 Primary.args = {
   primary: true,
   label: 'Button',

package/dist/modern/frameworks/vue3/Page.stories.js

@@ -20,6 +20,7 @@ const Template = (args) => ({
 
 export const LoggedIn = Template.bind({});
 LoggedIn.args = {
+  // More on composing args: https://storybook.js.org/docs/vue/writing-stories/args#args-composition
   ...HeaderStories.LoggedIn.args,
 };
 

package/dist/modern/frameworks/web-components/js/Button.stories.js

@@ -1,16 +1,24 @@
 import { Button } from './Button';
 
+// More on default export: https://storybook.js.org/docs/web-components/writing-stories/introduction#default-export
 export default {
   title: 'Example/Button',
+  // More on argTypes: https://storybook.js.org/docs/web-components/api/argtypes
   argTypes: {
     backgroundColor: { control: 'color' },
     onClick: { action: 'onClick' },
+    size: {
+      control: { type: 'select' },
+      options: ['small', 'medium', 'large'],
+    },
   },
 };
 
+// More on component templates: https://storybook.js.org/docs/web-components/writing-stories/introduction#using-args
 const Template = (args) => Button(args);
 
 export const Primary = Template.bind({});
+// More on args: https://storybook.js.org/docs/web-components/writing-stories/args
 Primary.args = {
   primary: true,
   label: 'Button',

package/dist/modern/frameworks/web-components/js/Page.stories.js

@@ -9,6 +9,7 @@ const Template = (args) => Page(args);
 
 export const LoggedIn = Template.bind({});
 LoggedIn.args = {
+  // More on composing args: https://storybook.js.org/docs/web-components/writing-stories/args#args-composition
   ...HeaderStories.LoggedIn.args,
 };
 

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

@@ -11,11 +11,17 @@ var _path = _interopRequireDefault(require("path"));
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _semver = _interopRequireDefault(require("@storybook/semver"));
+
 var _baseGenerator = require("../baseGenerator");
 
+var _project_types = require("../../project_types");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const generator = async (packageManager, npmOptions, options) => {
+  var _semver$coerce;
+
   const extraMain = options.linkable ? {
     webpackFinal: `%%(config) => {
       const path = require('path');
@@ -29,10 +35,21 @@ const generator = async (packageManager, npmOptions, options) => {
     }
     %%`
   } : {};
-  await (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, options, 'react', {
-    extraAddons: ['@storybook/preset-create-react-app'],
-    // `@storybook/preset-create-react-app` has `@storybook/node-logger` as peerDep
-    extraPackages: ['@storybook/node-logger'],
+  const craVersion = (_semver$coerce = _semver.default.coerce(packageManager.retrievePackageJson().dependencies['react-scripts'])) === null || _semver$coerce === void 0 ? void 0 : _semver$coerce.version;
+
+  const isCra5 = _semver.default.gte(craVersion, '5.0.0');
+
+  const updatedOptions = isCra5 ? Object.assign({}, options, {
+    builder: _project_types.CoreBuilder.Webpack5
+  }) : options; // `@storybook/preset-create-react-app` has `@storybook/node-logger` as peerDep
+
+  const extraPackages = ['@storybook/node-logger'];
+  if (isCra5) extraPackages.push('webpack'); // preset v3 is compat with older versions of CRA, otherwise let version float
+
+  const extraAddons = [`@storybook/preset-create-react-app${isCra5 ? '' : '@3'}`];
+  await (0, _baseGenerator.baseGenerator)(packageManager, npmOptions, updatedOptions, 'react', {
+    extraAddons,
+    extraPackages,
     staticDir: _fs.default.existsSync(_path.default.resolve('./public')) ? 'public' : undefined,
     addBabel: false,
     addESLint: true,

package/dist/modern/generators/baseGenerator.js

@@ -41,6 +41,8 @@ const builderDependencies = builder => {
   }
 };
 
+const stripVersions = addons => addons.map(addon => (0, _jsPackageManager.getPackageDetails)(addon)[0]);
+
 async function baseGenerator(packageManager, npmOptions, {
   language,
   builder
@@ -72,7 +74,7 @@ async function baseGenerator(packageManager, npmOptions, {
     }
   }, extraMain) : extraMain;
   (0, _configure.configure)(framework, Object.assign({
-    addons: [...addons, ...extraAddons],
+    addons: [...addons, ...stripVersions(extraAddons)],
     extensions,
     commonJs: options.commonJs
   }, mainOptions));

package/dist/modern/upgrade.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.upgrade = exports.checkVersionConsistency = exports.isCorePackage = exports.getStorybookVersion = void 0;
+exports.upgrade = exports.addExtraFlags = exports.checkVersionConsistency = exports.isCorePackage = exports.getStorybookVersion = void 0;
 
 require("core-js/modules/es.promise.js");
 
@@ -91,6 +91,28 @@ const checkVersionConsistency = () => {
 };
 
 exports.checkVersionConsistency = checkVersionConsistency;
+const EXTRA_FLAGS = {
+  'react-scripts@<5': ['--reject', '/preset-create-react-app/']
+};
+
+const addExtraFlags = (extraFlags, flags, {
+  dependencies,
+  devDependencies
+}) => {
+  return Object.entries(extraFlags).reduce((acc, entry) => {
+    const [pattern, extra] = entry;
+    const [pkg, specifier] = (0, _jsPackageManager.getPackageDetails)(pattern);
+    const pkgVersion = dependencies[pkg] || devDependencies[pkg];
+
+    if (pkgVersion && _semver.default.satisfies(_semver.default.coerce(pkgVersion), specifier)) {
+      return [...acc, ...extra];
+    }
+
+    return acc;
+  }, [...flags]);
+};
+
+exports.addExtraFlags = addExtraFlags;
 
 const upgrade = async ({
   prerelease,
@@ -101,10 +123,11 @@ const upgrade = async ({
   const packageManager = _jsPackageManager.JsPackageManagerFactory.getPackageManager(useNpm);
 
   (0, _helpers.commandLog)(`Checking for latest versions of '@storybook/*' packages`);
-  const flags = [];
+  let flags = [];
   if (!dryRun) flags.push('--upgrade');
   flags.push('--target');
   flags.push(prerelease ? 'greatest' : 'latest');
+  flags = addExtraFlags(EXTRA_FLAGS, flags, packageManager.retrievePackageJson());
   const check = (0, _crossSpawn.sync)('npx', ['npm-check-updates', '/storybook/', ...flags], {
     stdio: 'pipe'
   }).output.toString();

package/dist/modern/versions.json

@@ -1,57 +1,57 @@
 {
-  "@storybook/addon-a11y": "6.3.6",
-  "@storybook/addon-actions": "6.3.6",
-  "@storybook/addon-backgrounds": "6.3.6",
-  "@storybook/addon-controls": "6.3.6",
-  "@storybook/addon-docs": "6.3.6",
-  "@storybook/addon-essentials": "6.3.6",
-  "@storybook/addon-jest": "6.3.6",
-  "@storybook/addon-links": "6.3.6",
-  "@storybook/addon-storyshots": "6.3.6",
-  "@storybook/addon-storyshots-puppeteer": "6.3.6",
-  "@storybook/addon-storysource": "6.3.6",
-  "@storybook/addon-toolbars": "6.3.6",
-  "@storybook/addon-viewport": "6.3.6",
-  "@storybook/addons": "6.3.6",
-  "@storybook/angular": "6.3.6",
-  "@storybook/api": "6.3.6",
-  "@storybook/aurelia": "6.3.6",
-  "@storybook/builder-webpack4": "6.3.6",
-  "@storybook/builder-webpack5": "6.3.6",
-  "@storybook/channel-postmessage": "6.3.6",
-  "@storybook/channel-websocket": "6.3.6",
-  "@storybook/channels": "6.3.6",
-  "@storybook/cli": "6.3.6",
-  "@storybook/client-api": "6.3.6",
-  "@storybook/client-logger": "6.3.6",
-  "@storybook/codemod": "6.3.6",
-  "@storybook/components": "6.3.6",
-  "@storybook/core": "6.3.6",
-  "@storybook/core-client": "6.3.6",
-  "@storybook/core-common": "6.3.6",
-  "@storybook/core-events": "6.3.6",
-  "@storybook/core-server": "6.3.6",
-  "@storybook/csf-tools": "6.3.6",
-  "@storybook/ember": "6.3.6",
-  "@storybook/html": "6.3.6",
-  "@storybook/manager-webpack4": "6.3.6",
-  "@storybook/manager-webpack5": "6.3.6",
-  "@storybook/marionette": "6.3.6",
-  "@storybook/marko": "6.3.6",
-  "@storybook/mithril": "6.3.6",
-  "@storybook/node-logger": "6.3.6",
-  "@storybook/postinstall": "6.3.6",
-  "@storybook/preact": "6.3.6",
-  "@storybook/rax": "6.3.6",
-  "@storybook/react": "6.3.6",
-  "@storybook/riot": "6.3.6",
-  "@storybook/router": "6.3.6",
-  "@storybook/server": "6.3.6",
-  "@storybook/source-loader": "6.3.6",
-  "@storybook/svelte": "6.3.6",
-  "@storybook/theming": "6.3.6",
-  "@storybook/ui": "6.3.6",
-  "@storybook/vue": "6.3.6",
-  "@storybook/vue3": "6.3.6",
-  "@storybook/web-components": "6.3.6"
+  "@storybook/addon-a11y": "6.3.10",
+  "@storybook/addon-actions": "6.3.10",
+  "@storybook/addon-backgrounds": "6.3.10",
+  "@storybook/addon-controls": "6.3.10",
+  "@storybook/addon-docs": "6.3.10",
+  "@storybook/addon-essentials": "6.3.10",
+  "@storybook/addon-jest": "6.3.10",
+  "@storybook/addon-links": "6.3.10",
+  "@storybook/addon-storyshots": "6.3.10",
+  "@storybook/addon-storyshots-puppeteer": "6.3.10",
+  "@storybook/addon-storysource": "6.3.10",
+  "@storybook/addon-toolbars": "6.3.10",
+  "@storybook/addon-viewport": "6.3.10",
+  "@storybook/addons": "6.3.10",
+  "@storybook/angular": "6.3.10",
+  "@storybook/api": "6.3.10",
+  "@storybook/aurelia": "6.3.10",
+  "@storybook/builder-webpack4": "6.3.10",
+  "@storybook/builder-webpack5": "6.3.10",
+  "@storybook/channel-postmessage": "6.3.10",
+  "@storybook/channel-websocket": "6.3.10",
+  "@storybook/channels": "6.3.10",
+  "@storybook/cli": "6.3.10",
+  "@storybook/client-api": "6.3.10",
+  "@storybook/client-logger": "6.3.10",
+  "@storybook/codemod": "6.3.10",
+  "@storybook/components": "6.3.10",
+  "@storybook/core": "6.3.10",
+  "@storybook/core-client": "6.3.10",
+  "@storybook/core-common": "6.3.10",
+  "@storybook/core-events": "6.3.10",
+  "@storybook/core-server": "6.3.10",
+  "@storybook/csf-tools": "6.3.10",
+  "@storybook/ember": "6.3.10",
+  "@storybook/html": "6.3.10",
+  "@storybook/manager-webpack4": "6.3.10",
+  "@storybook/manager-webpack5": "6.3.10",
+  "@storybook/marionette": "6.3.10",
+  "@storybook/marko": "6.3.10",
+  "@storybook/mithril": "6.3.10",
+  "@storybook/node-logger": "6.3.10",
+  "@storybook/postinstall": "6.3.10",
+  "@storybook/preact": "6.3.10",
+  "@storybook/rax": "6.3.10",
+  "@storybook/react": "6.3.10",
+  "@storybook/riot": "6.3.10",
+  "@storybook/router": "6.3.10",
+  "@storybook/server": "6.3.10",
+  "@storybook/source-loader": "6.3.10",
+  "@storybook/svelte": "6.3.10",
+  "@storybook/theming": "6.3.10",
+  "@storybook/ui": "6.3.10",
+  "@storybook/vue": "6.3.10",
+  "@storybook/vue3": "6.3.10",
+  "@storybook/web-components": "6.3.10"
 }

package/dist/ts3.4/upgrade.d.ts

@@ -1,9 +1,12 @@
+import { PackageJsonWithDepsAndDevDeps } from './js-package-manager';
 export declare const getStorybookVersion: (line: string) => {
     package: string;
     version: string;
 };
 export declare const isCorePackage: (pkg: string) => boolean;
 export declare const checkVersionConsistency: () => void;
+declare type ExtraFlags = Record<string, string[]>;
+export declare const addExtraFlags: (extraFlags: ExtraFlags, flags: string[], { dependencies, devDependencies }: PackageJsonWithDepsAndDevDeps) => string[];
 declare type Options = {
     prerelease: boolean;
     skipCheck: boolean;

package/dist/ts3.9/upgrade.d.ts

@@ -1,9 +1,12 @@
+import { PackageJsonWithDepsAndDevDeps } from './js-package-manager';
 export declare const getStorybookVersion: (line: string) => {
     package: string;
     version: string;
 };
 export declare const isCorePackage: (pkg: string) => boolean;
 export declare const checkVersionConsistency: () => void;
+declare type ExtraFlags = Record<string, string[]>;
+export declare const addExtraFlags: (extraFlags: ExtraFlags, flags: string[], { dependencies, devDependencies }: PackageJsonWithDepsAndDevDeps) => string[];
 declare type Options = {
     prerelease: boolean;
     skipCheck: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/cli",
-  "version": "6.3.6",
+  "version": "6.3.10",
   "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "keywords": [
     "cli",
@@ -48,8 +48,8 @@
   "dependencies": {
     "@babel/core": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
-    "@storybook/codemod": "6.3.6",
-    "@storybook/node-logger": "6.3.6",
+    "@storybook/codemod": "6.3.10",
+    "@storybook/node-logger": "6.3.10",
     "@storybook/semver": "^7.3.2",
     "boxen": "^4.2.0",
     "chalk": "^4.1.0",
@@ -74,7 +74,7 @@
     "update-notifier": "^5.0.1"
   },
   "devDependencies": {
-    "@storybook/client-api": "6.3.6",
+    "@storybook/client-api": "6.3.10",
     "@types/cross-spawn": "^6.0.2",
     "@types/prompts": "^2.0.9",
     "@types/puppeteer-core": "^2.1.0",
@@ -90,5 +90,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8c14e96e8ab21e6008e7c8458d7515539d448e06"
+  "gitHead": "591d742fd3b9986d5aef4ed66b9f50084eee02e4"
 }