From dae9d404642304d986e4374288da17606a7d904e Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 25 May 2020 16:08:19 +0200 Subject: [PATCH 01/47] rename generator --- lib/cli/src/generators/Generator.ts | 8 ---- lib/cli/src/generators/generator1.ts | 57 ++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 8 deletions(-) delete mode 100644 lib/cli/src/generators/Generator.ts create mode 100644 lib/cli/src/generators/generator1.ts diff --git a/lib/cli/src/generators/Generator.ts b/lib/cli/src/generators/Generator.ts deleted file mode 100644 index b6143c0c92dc..000000000000 --- a/lib/cli/src/generators/Generator.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { NpmOptions } from '../NpmOptions'; -import { StoryFormat } from '../project_types'; - -export type GeneratorOptions = { - storyFormat: StoryFormat; -}; - -export type Generator = (npmOptions: NpmOptions, options: GeneratorOptions) => Promise; diff --git a/lib/cli/src/generators/generator1.ts b/lib/cli/src/generators/generator1.ts new file mode 100644 index 000000000000..1a0b7ce3206f --- /dev/null +++ b/lib/cli/src/generators/generator1.ts @@ -0,0 +1,57 @@ +import { NpmOptions } from '../NpmOptions'; +import { StoryFormat, SupportedLanguage, SupportedFrameworks } from '../project_types'; +import { + retrievePackageJson, + getVersionedPackages, + writePackageJson, + getBabelDependencies, + installDependencies, + copyTemplate, + copyComponents, +} from '../helpers'; +import configure from './configure'; + +export type GeneratorOptions = { + language: SupportedLanguage; + storyFormat: StoryFormat; +}; + +export type Generator = (npmOptions: NpmOptions, options: GeneratorOptions) => Promise; + +const generator = async ( + npmOptions: NpmOptions, + { storyFormat, language }: GeneratorOptions, + framework: SupportedFrameworks, + extraPackages?: string[], + extraAddons?: string[] +) => { + const packages = [ + `@storybook/${framework}`, + '@storybook/addon-essentials', + '@storybook/addon-links', + ...extraPackages, + ...extraAddons, + ]; + const versionedPackages = await getVersionedPackages(npmOptions, ...packages); + + configure(extraAddons); + copyComponents(framework, language); + copyTemplate(__dirname, storyFormat); + + const packageJson = await retrievePackageJson(); + + packageJson.dependencies = packageJson.dependencies || {}; + packageJson.devDependencies = packageJson.devDependencies || {}; + + packageJson.scripts = packageJson.scripts || {}; + packageJson.scripts.storybook = 'start-storybook -p 6006'; + packageJson.scripts['build-storybook'] = 'build-storybook'; + + writePackageJson(packageJson); + + const babelDependencies = await getBabelDependencies(npmOptions, packageJson); + + installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]); +}; + +export default generator; From 5597f5a67bf594b1086663781fc3b5ff59ae80a6 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 25 May 2020 16:08:46 +0200 Subject: [PATCH 02/47] CLI: react stories --- lib/cli/.babelrc.json | 1 + lib/cli/src/{generators => }/.eslintrc.js | 16 +- .../react/js}/0-Welcome.stories.js | 2 +- .../react/js}/1-Button.stories.js | 2 +- lib/cli/src/frameworks/react/js/Button.jsx | 19 +++ lib/cli/src/frameworks/react/js/Welcome.jsx | 128 ++++++++++++++ .../react/ts}/0-Welcome.stories.tsx | 2 +- .../react/ts/1-Button.stories.tsx} | 2 +- lib/cli/src/frameworks/react/ts/Button.tsx | 20 +++ lib/cli/src/frameworks/react/ts/Welcome.tsx | 159 ++++++++++++++++++ lib/cli/src/generators/ANGULAR/index.ts | 2 +- lib/cli/src/generators/AURELIA/index.ts | 2 +- lib/cli/src/generators/EMBER/index.ts | 2 +- lib/cli/src/generators/HTML/index.ts | 2 +- lib/cli/src/generators/MARIONETTE/index.ts | 2 +- lib/cli/src/generators/MARKO/index.ts | 2 +- lib/cli/src/generators/METEOR/index.ts | 2 +- lib/cli/src/generators/MITHRIL/index.ts | 2 +- lib/cli/src/generators/PREACT/index.ts | 2 +- lib/cli/src/generators/RAX/index.ts | 2 +- lib/cli/src/generators/REACT/index.ts | 42 +---- .../REACT/template-csf/.storybook/main.js | 2 +- .../template-csf/stories/0-Welcome.stories.js | 12 -- .../REACT/template-mdx/.storybook/main.js | 5 +- .../stories/0-Welcome.stories.mdx | 2 +- .../template-mdx/stories/1-Button.stories.mdx | 2 +- lib/cli/src/generators/REACT_NATIVE/index.ts | 2 +- lib/cli/src/generators/REACT_SCRIPTS/index.ts | 47 +----- .../template-csf-ts/.storybook/main.js | 8 - .../src/stories/1-Button.stories.tsx | 18 -- .../template-csf/.storybook/main.js | 2 +- .../template-mdx/.storybook/main.js | 5 +- .../{src => }/stories/0-Welcome.stories.mdx | 2 +- .../{src => }/stories/1-Button.stories.mdx | 2 +- lib/cli/src/generators/RIOT/index.ts | 2 +- lib/cli/src/generators/SFC_VUE/index.ts | 2 +- lib/cli/src/generators/SVELTE/index.ts | 2 +- lib/cli/src/generators/VUE/index.ts | 2 +- .../src/generators/WEB-COMPONENTS/index.ts | 2 +- lib/cli/src/generators/WEBPACK_REACT/index.ts | 41 +---- .../template-csf/.storybook/main.js | 9 - .../template-csf/stories/0-Welcome.stories.js | 12 -- .../template-csf/stories/1-Button.stories.js | 42 ----- .../template-mdx/.storybook/main.js | 16 -- .../stories/0-Welcome.stories.mdx | 2 +- .../template-mdx/stories/1-Button.stories.mdx | 2 +- lib/cli/src/generators/configure.ts | 16 ++ .../{generator1.ts => generator.ts} | 0 lib/cli/src/helpers.test.ts | 53 +++++- lib/cli/src/helpers.ts | 51 +++++- lib/cli/src/initiate.ts | 6 +- lib/cli/src/project_types.ts | 6 +- lib/cli/tsconfig.json | 2 +- scripts/prepare.js | 11 +- 54 files changed, 525 insertions(+), 276 deletions(-) rename lib/cli/src/{generators => }/.eslintrc.js (58%) rename lib/cli/src/{generators/REACT_SCRIPTS/template-csf/src/stories => frameworks/react/js}/0-Welcome.stories.js (83%) rename lib/cli/src/{generators/REACT_SCRIPTS/template-csf/src/stories => frameworks/react/js}/1-Button.stories.js (95%) create mode 100644 lib/cli/src/frameworks/react/js/Button.jsx create mode 100644 lib/cli/src/frameworks/react/js/Welcome.jsx rename lib/cli/src/{generators/REACT_SCRIPTS/template-csf-ts/src/stories => frameworks/react/ts}/0-Welcome.stories.tsx (83%) rename lib/cli/src/{generators/REACT/template-csf/stories/1-Button.stories.js => frameworks/react/ts/1-Button.stories.tsx} (95%) create mode 100644 lib/cli/src/frameworks/react/ts/Button.tsx create mode 100644 lib/cli/src/frameworks/react/ts/Welcome.tsx delete mode 100644 lib/cli/src/generators/REACT/template-csf/stories/0-Welcome.stories.js delete mode 100644 lib/cli/src/generators/REACT_SCRIPTS/template-csf-ts/.storybook/main.js delete mode 100644 lib/cli/src/generators/REACT_SCRIPTS/template-csf-ts/src/stories/1-Button.stories.tsx rename lib/cli/src/generators/REACT_SCRIPTS/template-mdx/{src => }/stories/0-Welcome.stories.mdx (89%) rename lib/cli/src/generators/REACT_SCRIPTS/template-mdx/{src => }/stories/1-Button.stories.mdx (90%) delete mode 100644 lib/cli/src/generators/WEBPACK_REACT/template-csf/.storybook/main.js delete mode 100644 lib/cli/src/generators/WEBPACK_REACT/template-csf/stories/0-Welcome.stories.js delete mode 100644 lib/cli/src/generators/WEBPACK_REACT/template-csf/stories/1-Button.stories.js delete mode 100644 lib/cli/src/generators/WEBPACK_REACT/template-mdx/.storybook/main.js create mode 100644 lib/cli/src/generators/configure.ts rename lib/cli/src/generators/{generator1.ts => generator.ts} (100%) diff --git a/lib/cli/.babelrc.json b/lib/cli/.babelrc.json index 9ab56eefbb58..d2ad1c00b008 100644 --- a/lib/cli/.babelrc.json +++ b/lib/cli/.babelrc.json @@ -12,6 +12,7 @@ ] ], "ignore": [ + "./src/frameworks", "./src/generators/**/template", "./src/generators/**/template-csf", "./src/generators/**/template-csf-ts", diff --git a/lib/cli/src/generators/.eslintrc.js b/lib/cli/src/.eslintrc.js similarity index 58% rename from lib/cli/src/generators/.eslintrc.js rename to lib/cli/src/.eslintrc.js index d7fac90c788e..3625258646f3 100644 --- a/lib/cli/src/generators/.eslintrc.js +++ b/lib/cli/src/.eslintrc.js @@ -3,7 +3,7 @@ const ignore = 0; module.exports = { overrides: [ { - files: '*/template[-?]*/**', + files: '**/template[-?]*/**', env: { browser: true, }, @@ -12,7 +12,6 @@ module.exports = { 'import/no-unresolved': ignore, 'import/no-extraneous-dependencies': ignore, 'global-require': ignore, - 'react/react-in-jsx-scope': ignore, }, }, { @@ -21,5 +20,18 @@ module.exports = { browser: false, }, }, + { + files: 'frameworks/**/*', + env: { + browser: true, + }, + rules: { + 'jsx-a11y/anchor-is-valid': ignore, + 'import/no-unresolved': ignore, + 'react/prop-types': ignore, + 'react/react-in-jsx-scope': ignore, + 'import/no-extraneous-dependencies': ignore, + }, + }, ], }; diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-csf/src/stories/0-Welcome.stories.js b/lib/cli/src/frameworks/react/js/0-Welcome.stories.js similarity index 83% rename from lib/cli/src/generators/REACT_SCRIPTS/template-csf/src/stories/0-Welcome.stories.js rename to lib/cli/src/frameworks/react/js/0-Welcome.stories.js index 9920a416e1ff..1274ca16a4ff 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-csf/src/stories/0-Welcome.stories.js +++ b/lib/cli/src/frameworks/react/js/0-Welcome.stories.js @@ -1,6 +1,6 @@ import React from 'react'; import { linkTo } from '@storybook/addon-links'; -import { Welcome } from '@storybook/react/demo'; +import Welcome from './Welcome'; export default { title: 'Welcome', diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-csf/src/stories/1-Button.stories.js b/lib/cli/src/frameworks/react/js/1-Button.stories.js similarity index 95% rename from lib/cli/src/generators/REACT_SCRIPTS/template-csf/src/stories/1-Button.stories.js rename to lib/cli/src/frameworks/react/js/1-Button.stories.js index 383864b23ad1..57f15cf2a479 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-csf/src/stories/1-Button.stories.js +++ b/lib/cli/src/frameworks/react/js/1-Button.stories.js @@ -1,7 +1,7 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import { linkTo } from '@storybook/addon-links'; -import { Button } from '@storybook/react/demo'; +import Button from './Button'; export default { title: 'Button', diff --git a/lib/cli/src/frameworks/react/js/Button.jsx b/lib/cli/src/frameworks/react/js/Button.jsx new file mode 100644 index 000000000000..8b431e3d0e57 --- /dev/null +++ b/lib/cli/src/frameworks/react/js/Button.jsx @@ -0,0 +1,19 @@ +import React from 'react'; + +const styles = { + border: '1px solid #eee', + borderRadius: 3, + backgroundColor: '#FFFFFF', + cursor: 'pointer', + fontSize: 15, + padding: '3px 10px', + margin: 10, +}; + +const Button = ({ children, onClick }) => ( + +); + +export default Button; diff --git a/lib/cli/src/frameworks/react/js/Welcome.jsx b/lib/cli/src/frameworks/react/js/Welcome.jsx new file mode 100644 index 000000000000..42328a1b4fc7 --- /dev/null +++ b/lib/cli/src/frameworks/react/js/Welcome.jsx @@ -0,0 +1,128 @@ +import React from 'react'; + +const Main = (props) => ( +
+); + +const Title = ({ children, ...props }) =>

{children}

; + +const Note = (props) => ( +

+); + +const InlineCode = (props) => ( + +); + +const Link = ({ children, href, target, rel, ...props }) => ( + + {children} + +); + +const NavButton = ({ children, onClick, ...props }) => ( + +); + +const Welcome = ({ showApp }) => ( +

+ Welcome to storybook +

This is a UI component dev environment for your app.

+

+ We've added some basic stories inside the src/stories directory. +
A story is a single state of one or more UI components. You can have as many stories as + you want. +
+ (Basically a story is like a visual test case.) +

+

+ See these sample stories for a component called  + Button. +

+

+ Just like that, you can add your own components as stories. +
+ You can also edit those components and see changes right away. +
+ (Try editing the Button stories located at  + src/stories/1-Button.stories.js + .) +

+

+ Usually we create stories with smaller UI components in the app. +
+ Have a look at the  + + Writing Stories + +  section in our documentation. +

+ + NOTE: +
+ Have a look at the .storybook/webpack.config.js to add webpack + loaders and plugins you are using in this project. + +
+); + +export default Welcome; diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-csf-ts/src/stories/0-Welcome.stories.tsx b/lib/cli/src/frameworks/react/ts/0-Welcome.stories.tsx similarity index 83% rename from lib/cli/src/generators/REACT_SCRIPTS/template-csf-ts/src/stories/0-Welcome.stories.tsx rename to lib/cli/src/frameworks/react/ts/0-Welcome.stories.tsx index 9920a416e1ff..1274ca16a4ff 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-csf-ts/src/stories/0-Welcome.stories.tsx +++ b/lib/cli/src/frameworks/react/ts/0-Welcome.stories.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { linkTo } from '@storybook/addon-links'; -import { Welcome } from '@storybook/react/demo'; +import Welcome from './Welcome'; export default { title: 'Welcome', diff --git a/lib/cli/src/generators/REACT/template-csf/stories/1-Button.stories.js b/lib/cli/src/frameworks/react/ts/1-Button.stories.tsx similarity index 95% rename from lib/cli/src/generators/REACT/template-csf/stories/1-Button.stories.js rename to lib/cli/src/frameworks/react/ts/1-Button.stories.tsx index 383864b23ad1..57f15cf2a479 100644 --- a/lib/cli/src/generators/REACT/template-csf/stories/1-Button.stories.js +++ b/lib/cli/src/frameworks/react/ts/1-Button.stories.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import { linkTo } from '@storybook/addon-links'; -import { Button } from '@storybook/react/demo'; +import Button from './Button'; export default { title: 'Button', diff --git a/lib/cli/src/frameworks/react/ts/Button.tsx b/lib/cli/src/frameworks/react/ts/Button.tsx new file mode 100644 index 000000000000..bd79304547b2 --- /dev/null +++ b/lib/cli/src/frameworks/react/ts/Button.tsx @@ -0,0 +1,20 @@ +import React, { FunctionComponent, HTMLAttributes } from 'react'; + +const styles = { + border: '1px solid #eee', + borderRadius: 3, + backgroundColor: '#FFFFFF', + cursor: 'pointer', + fontSize: 15, + padding: '3px 10px', + margin: 10, +}; + +type Props = Pick, 'onClick'>; +const Button: FunctionComponent = ({ children, onClick }) => ( + +); + +export default Button; diff --git a/lib/cli/src/frameworks/react/ts/Welcome.tsx b/lib/cli/src/frameworks/react/ts/Welcome.tsx new file mode 100644 index 000000000000..2d5d35e5000a --- /dev/null +++ b/lib/cli/src/frameworks/react/ts/Welcome.tsx @@ -0,0 +1,159 @@ +import React, { + AnchorHTMLAttributes, + ButtonHTMLAttributes, + DetailedHTMLProps, + FunctionComponent, + HTMLAttributes, +} from 'react'; + +type MainProps = Omit, HTMLElement>, 'style'>; +const Main: FunctionComponent = (props) => ( +
+); + +type TitleProps = DetailedHTMLProps, HTMLHeadingElement>; +const Title: FunctionComponent = ({ children, ...props }) => ( +

{children}

+); + +type NoteProps = Omit< + DetailedHTMLProps, HTMLParagraphElement>, + 'style' +>; +const Note: FunctionComponent = (props) => ( +

+); + +type InlineCodeProps = Omit, HTMLElement>, 'style'>; +const InlineCode: FunctionComponent = (props) => ( + +); + +type LinkProps = Omit< + DetailedHTMLProps, HTMLAnchorElement>, + 'style' +> & { + href: string; + target: string; + rel: string; +}; +const Link: FunctionComponent = ({ children, href, target, rel, ...props }) => ( + + {children} + +); + +type NavButtonProps = Omit< + DetailedHTMLProps, HTMLButtonElement>, + 'style' | 'type' +> & {}; +const NavButton: FunctionComponent = ({ children, onClick, ...props }) => ( + +); + +interface WelcomeProps { + showApp: () => void; +} +const Welcome: FunctionComponent = ({ showApp }) => ( +

+ Welcome to storybook +

This is a UI component dev environment for your app.

+

+ We've added some basic stories inside the src/stories directory. +
A story is a single state of one or more UI components. You can have as many stories as + you want. +
+ (Basically a story is like a visual test case.) +

+

+ See these sample stories for a component called  + Button. +

+

+ Just like that, you can add your own components as stories. +
+ You can also edit those components and see changes right away. +
+ (Try editing the Button stories located at  + src/stories/1-Button.stories.js + .) +

+

+ Usually we create stories with smaller UI components in the app. +
+ Have a look at the  + + Writing Stories + +  section in our documentation. +

+ + NOTE: +
+ Have a look at the .storybook/webpack.config.js to add webpack + loaders and plugins you are using in this project. + +
+); +Welcome.displayName = 'Welcome'; + +export { Welcome as default }; diff --git a/lib/cli/src/generators/ANGULAR/index.ts b/lib/cli/src/generators/ANGULAR/index.ts index cc9d5921366f..0a9c387ec980 100644 --- a/lib/cli/src/generators/ANGULAR/index.ts +++ b/lib/cli/src/generators/ANGULAR/index.ts @@ -16,7 +16,7 @@ import { } from '../../helpers'; import { StoryFormat } from '../../project_types'; import { NpmOptions } from '../../NpmOptions'; -import { Generator, GeneratorOptions } from '../Generator'; +import { Generator, GeneratorOptions } from '../generator'; async function addDependencies(npmOptions: NpmOptions, { storyFormat }: GeneratorOptions) { const packages = [ diff --git a/lib/cli/src/generators/AURELIA/index.ts b/lib/cli/src/generators/AURELIA/index.ts index 3f7362f13759..2e8a1e3e091a 100644 --- a/lib/cli/src/generators/AURELIA/index.ts +++ b/lib/cli/src/generators/AURELIA/index.ts @@ -8,7 +8,7 @@ import { copyTemplate, readFileAsJson, } from '../../helpers'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; import { StoryFormat } from '../../project_types'; function addStorybookExcludeGlobToTsConfig() { diff --git a/lib/cli/src/generators/EMBER/index.ts b/lib/cli/src/generators/EMBER/index.ts index 874e81e6e2e7..5ce6864cf87e 100644 --- a/lib/cli/src/generators/EMBER/index.ts +++ b/lib/cli/src/generators/EMBER/index.ts @@ -6,7 +6,7 @@ import { installDependencies, copyTemplate, } from '../../helpers'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const [ diff --git a/lib/cli/src/generators/HTML/index.ts b/lib/cli/src/generators/HTML/index.ts index 25d850192b6c..a11a0bd4321c 100755 --- a/lib/cli/src/generators/HTML/index.ts +++ b/lib/cli/src/generators/HTML/index.ts @@ -7,7 +7,7 @@ import { copyTemplate, } from '../../helpers'; import { StoryFormat } from '../../project_types'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const packages = ['@storybook/html', '@storybook/addon-actions', '@storybook/addon-links']; diff --git a/lib/cli/src/generators/MARIONETTE/index.ts b/lib/cli/src/generators/MARIONETTE/index.ts index e3ce805931a8..a55e1f36aab0 100644 --- a/lib/cli/src/generators/MARIONETTE/index.ts +++ b/lib/cli/src/generators/MARIONETTE/index.ts @@ -7,7 +7,7 @@ import { installDependencies, retrievePackageJson, } from '../../helpers'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions) => { const storybookVersion = await getVersion(npmOptions, '@storybook/marionette'); diff --git a/lib/cli/src/generators/MARKO/index.ts b/lib/cli/src/generators/MARKO/index.ts index b8a3bc0e40e1..5220b6a1d81d 100644 --- a/lib/cli/src/generators/MARKO/index.ts +++ b/lib/cli/src/generators/MARKO/index.ts @@ -6,7 +6,7 @@ import { installDependencies, copyTemplate, } from '../../helpers'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const [storybookVersion, addonActionVersion, addonKnobsVersion] = await getVersions( diff --git a/lib/cli/src/generators/METEOR/index.ts b/lib/cli/src/generators/METEOR/index.ts index 6420a01f0b03..94f2c1c21b1c 100644 --- a/lib/cli/src/generators/METEOR/index.ts +++ b/lib/cli/src/generators/METEOR/index.ts @@ -8,7 +8,7 @@ import { installDependencies, copyTemplate, } from '../../helpers'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const [ diff --git a/lib/cli/src/generators/MITHRIL/index.ts b/lib/cli/src/generators/MITHRIL/index.ts index d6bff9454643..271187acd3d2 100644 --- a/lib/cli/src/generators/MITHRIL/index.ts +++ b/lib/cli/src/generators/MITHRIL/index.ts @@ -6,7 +6,7 @@ import { installDependencies, copyTemplate, } from '../../helpers'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const [ diff --git a/lib/cli/src/generators/PREACT/index.ts b/lib/cli/src/generators/PREACT/index.ts index 42c9eb416c9d..4a4b9dba7aa7 100644 --- a/lib/cli/src/generators/PREACT/index.ts +++ b/lib/cli/src/generators/PREACT/index.ts @@ -6,7 +6,7 @@ import { installDependencies, copyTemplate, } from '../../helpers'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const [storybookVersion, actionsVersion, linksVersion, addonsVersion] = await getVersions( diff --git a/lib/cli/src/generators/RAX/index.ts b/lib/cli/src/generators/RAX/index.ts index 4ac18e259ab9..8e7e2f12e049 100644 --- a/lib/cli/src/generators/RAX/index.ts +++ b/lib/cli/src/generators/RAX/index.ts @@ -6,7 +6,7 @@ import { installDependencies, copyTemplate, } from '../../helpers'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const [ diff --git a/lib/cli/src/generators/REACT/index.ts b/lib/cli/src/generators/REACT/index.ts index 586dac39814b..117af995d217 100644 --- a/lib/cli/src/generators/REACT/index.ts +++ b/lib/cli/src/generators/REACT/index.ts @@ -1,43 +1,7 @@ -import { - getVersionedPackages, - retrievePackageJson, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; -import { StoryFormat } from '../../project_types'; -import { Generator } from '../Generator'; +import baseGenerator, { Generator } from '../generator'; -const generator: Generator = async (npmOptions, { storyFormat }) => { - const packages = [ - '@storybook/react', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addons', - ]; - if (storyFormat === StoryFormat.MDX) { - packages.push('@storybook/addon-docs'); - } - - const versionedPackages = await getVersionedPackages(npmOptions, ...packages); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]); +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'react'); }; export default generator; diff --git a/lib/cli/src/generators/REACT/template-csf/.storybook/main.js b/lib/cli/src/generators/REACT/template-csf/.storybook/main.js index 11692a0e7725..2271016abe6b 100644 --- a/lib/cli/src/generators/REACT/template-csf/.storybook/main.js +++ b/lib/cli/src/generators/REACT/template-csf/.storybook/main.js @@ -1,4 +1,4 @@ module.exports = { - stories: ['../stories/**/*.stories.(ts|tsx|js|jsx)'], + stories: ['../src/**/*.stories.(ts|tsx|js|jsx)'], addons: ['@storybook/addon-actions', '@storybook/addon-links'], }; diff --git a/lib/cli/src/generators/REACT/template-csf/stories/0-Welcome.stories.js b/lib/cli/src/generators/REACT/template-csf/stories/0-Welcome.stories.js deleted file mode 100644 index 9920a416e1ff..000000000000 --- a/lib/cli/src/generators/REACT/template-csf/stories/0-Welcome.stories.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react'; -import { linkTo } from '@storybook/addon-links'; -import { Welcome } from '@storybook/react/demo'; - -export default { - title: 'Welcome', - component: Welcome, -}; - -export const ToStorybook = () => ; - -ToStorybook.storyName = 'to Storybook'; diff --git a/lib/cli/src/generators/REACT/template-mdx/.storybook/main.js b/lib/cli/src/generators/REACT/template-mdx/.storybook/main.js index 687009302e52..c698efe5509d 100644 --- a/lib/cli/src/generators/REACT/template-mdx/.storybook/main.js +++ b/lib/cli/src/generators/REACT/template-mdx/.storybook/main.js @@ -1,5 +1,8 @@ module.exports = { - stories: ['../stories/**/*.stories.(js|mdx)'], + stories: [ + '../src/**/*.stories.(ts|tsx|js|jsx|mdx)', + '../stories/**/*.stories.(ts|tsx|js|jsx|mdx)', + ], addons: [ '@storybook/addon-actions', '@storybook/addon-links', diff --git a/lib/cli/src/generators/REACT/template-mdx/stories/0-Welcome.stories.mdx b/lib/cli/src/generators/REACT/template-mdx/stories/0-Welcome.stories.mdx index 8f48008a3b56..4e0f04619efe 100644 --- a/lib/cli/src/generators/REACT/template-mdx/stories/0-Welcome.stories.mdx +++ b/lib/cli/src/generators/REACT/template-mdx/stories/0-Welcome.stories.mdx @@ -1,6 +1,6 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { linkTo } from '@storybook/addon-links'; -import { Welcome } from '@storybook/react/demo'; +import Welcome from '../Welcome'; diff --git a/lib/cli/src/generators/REACT/template-mdx/stories/1-Button.stories.mdx b/lib/cli/src/generators/REACT/template-mdx/stories/1-Button.stories.mdx index ed90840f9dcb..09554ab784a8 100644 --- a/lib/cli/src/generators/REACT/template-mdx/stories/1-Button.stories.mdx +++ b/lib/cli/src/generators/REACT/template-mdx/stories/1-Button.stories.mdx @@ -1,6 +1,6 @@ import { action } from '@storybook/addon-actions'; -import { Button } from '@storybook/react/demo'; import { Meta, Story } from '@storybook/addon-docs/blocks'; +import Button from '../Button'; diff --git a/lib/cli/src/generators/REACT_NATIVE/index.ts b/lib/cli/src/generators/REACT_NATIVE/index.ts index aad02bcb16c6..f69c29ec9a98 100644 --- a/lib/cli/src/generators/REACT_NATIVE/index.ts +++ b/lib/cli/src/generators/REACT_NATIVE/index.ts @@ -10,7 +10,7 @@ import { copyTemplate, } from '../../helpers'; import { NpmOptions } from '../../NpmOptions'; -import { GeneratorOptions } from '../Generator'; +import { GeneratorOptions } from '../generator'; export default async ( npmOptions: NpmOptions, diff --git a/lib/cli/src/generators/REACT_SCRIPTS/index.ts b/lib/cli/src/generators/REACT_SCRIPTS/index.ts index cc43eafdb98e..a06f24bfb011 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/index.ts +++ b/lib/cli/src/generators/REACT_SCRIPTS/index.ts @@ -1,53 +1,18 @@ import path from 'path'; import fs from 'fs'; -import { - retrievePackageJson, - getVersionedPackages, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; -import { StoryFormat } from '../../project_types'; -import { Generator } from '../Generator'; +import { retrievePackageJson, writePackageJson } from '../../helpers'; -const generator: Generator = async (npmOptions, { storyFormat }) => { - const packages = [ - '@storybook/react', - '@storybook/preset-create-react-app', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addons', - ]; - - if (storyFormat === StoryFormat.MDX) { - packages.push('@storybook/addon-docs'); - } - - const versionedPackages = await getVersionedPackages(npmOptions, ...packages); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 9009'; - packageJson.scripts['build-storybook'] = 'build-storybook'; +import baseGenerator, { Generator } from '../generator'; +const generator: Generator = async (npmOptions, options) => { + await baseGenerator(npmOptions, options, 'react', [], ['@storybook/preset-create-react-app']); if (fs.existsSync(path.resolve('./public'))) { + const packageJson = await retrievePackageJson(); // has a public folder and add support to it. packageJson.scripts.storybook += ' -s public'; packageJson.scripts['build-storybook'] += ' -s public'; + writePackageJson(packageJson); } - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]); }; export default generator; diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-csf-ts/.storybook/main.js b/lib/cli/src/generators/REACT_SCRIPTS/template-csf-ts/.storybook/main.js deleted file mode 100644 index cd20fe295779..000000000000 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-csf-ts/.storybook/main.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.(ts|tsx|js|jsx)'], - addons: [ - '@storybook/preset-create-react-app', - '@storybook/addon-actions', - '@storybook/addon-links', - ], -}; diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-csf-ts/src/stories/1-Button.stories.tsx b/lib/cli/src/generators/REACT_SCRIPTS/template-csf-ts/src/stories/1-Button.stories.tsx deleted file mode 100644 index 6bcfa2146627..000000000000 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-csf-ts/src/stories/1-Button.stories.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react'; -import { action } from '@storybook/addon-actions'; -import { Button } from '@storybook/react/demo'; - -export default { - title: 'Button', - component: Button, -}; - -export const Text = () => ; - -export const Emoji = () => ( - -); diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-csf/.storybook/main.js b/lib/cli/src/generators/REACT_SCRIPTS/template-csf/.storybook/main.js index 8f79d4617f2b..cd20fe295779 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-csf/.storybook/main.js +++ b/lib/cli/src/generators/REACT_SCRIPTS/template-csf/.storybook/main.js @@ -1,5 +1,5 @@ module.exports = { - stories: ['../src/**/*.stories.js'], + stories: ['../src/**/*.stories.(ts|tsx|js|jsx)'], addons: [ '@storybook/preset-create-react-app', '@storybook/addon-actions', diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/.storybook/main.js b/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/.storybook/main.js index fac25378d41e..6181a3b86505 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/.storybook/main.js +++ b/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/.storybook/main.js @@ -1,5 +1,8 @@ module.exports = { - stories: ['../src/**/*.stories.(js|mdx)'], + stories: [ + '../src/**/*.stories.(ts|tsx|js|jsx|mdx)', + '../stories/**/*.stories.(ts|tsx|js|jsx|mdx)', + ], addons: [ '@storybook/addon-actions', '@storybook/addon-links', diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/src/stories/0-Welcome.stories.mdx b/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/0-Welcome.stories.mdx similarity index 89% rename from lib/cli/src/generators/REACT_SCRIPTS/template-mdx/src/stories/0-Welcome.stories.mdx rename to lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/0-Welcome.stories.mdx index 8f48008a3b56..3e250967895c 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/src/stories/0-Welcome.stories.mdx +++ b/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/0-Welcome.stories.mdx @@ -1,6 +1,6 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { linkTo } from '@storybook/addon-links'; -import { Welcome } from '@storybook/react/demo'; +import Welcome from '../src/Welcome'; diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/src/stories/1-Button.stories.mdx b/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/1-Button.stories.mdx similarity index 90% rename from lib/cli/src/generators/REACT_SCRIPTS/template-mdx/src/stories/1-Button.stories.mdx rename to lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/1-Button.stories.mdx index 7c87b32323cd..8005ba7e0e0b 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/src/stories/1-Button.stories.mdx +++ b/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/1-Button.stories.mdx @@ -1,6 +1,6 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { action } from '@storybook/addon-actions'; -import { Button } from '@storybook/react/demo'; +import Button from '../src/Button'; diff --git a/lib/cli/src/generators/RIOT/index.ts b/lib/cli/src/generators/RIOT/index.ts index 2c624431018a..12a27c812cd0 100644 --- a/lib/cli/src/generators/RIOT/index.ts +++ b/lib/cli/src/generators/RIOT/index.ts @@ -6,7 +6,7 @@ import { installDependencies, copyTemplate, } from '../../helpers'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const [ diff --git a/lib/cli/src/generators/SFC_VUE/index.ts b/lib/cli/src/generators/SFC_VUE/index.ts index 0f85dbce6b12..26b6246983e5 100644 --- a/lib/cli/src/generators/SFC_VUE/index.ts +++ b/lib/cli/src/generators/SFC_VUE/index.ts @@ -7,7 +7,7 @@ import { copyTemplate, } from '../../helpers'; import { StoryFormat } from '../../project_types'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const packages = [ diff --git a/lib/cli/src/generators/SVELTE/index.ts b/lib/cli/src/generators/SVELTE/index.ts index 9da7bfa15463..bb7bb6007bdf 100644 --- a/lib/cli/src/generators/SVELTE/index.ts +++ b/lib/cli/src/generators/SVELTE/index.ts @@ -6,7 +6,7 @@ import { installDependencies, copyTemplate, } from '../../helpers'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const [ diff --git a/lib/cli/src/generators/VUE/index.ts b/lib/cli/src/generators/VUE/index.ts index d35af935858a..881e44d3415a 100644 --- a/lib/cli/src/generators/VUE/index.ts +++ b/lib/cli/src/generators/VUE/index.ts @@ -9,7 +9,7 @@ import { copyTemplate, } from '../../helpers'; import { StoryFormat } from '../../project_types'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const packages = [ diff --git a/lib/cli/src/generators/WEB-COMPONENTS/index.ts b/lib/cli/src/generators/WEB-COMPONENTS/index.ts index 373eac327a67..6884166f964f 100755 --- a/lib/cli/src/generators/WEB-COMPONENTS/index.ts +++ b/lib/cli/src/generators/WEB-COMPONENTS/index.ts @@ -8,7 +8,7 @@ import { installDependencies, } from '../../helpers'; import { StoryFormat } from '../../project_types'; -import { Generator } from '../Generator'; +import { Generator } from '../generator'; const generator: Generator = async (npmOptions, { storyFormat }) => { const packages = [ diff --git a/lib/cli/src/generators/WEBPACK_REACT/index.ts b/lib/cli/src/generators/WEBPACK_REACT/index.ts index 75bec7324ed2..117af995d217 100644 --- a/lib/cli/src/generators/WEBPACK_REACT/index.ts +++ b/lib/cli/src/generators/WEBPACK_REACT/index.ts @@ -1,42 +1,7 @@ -import { - retrievePackageJson, - getVersionedPackages, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; -import { StoryFormat } from '../../project_types'; -import { Generator } from '../Generator'; +import baseGenerator, { Generator } from '../generator'; -const generator: Generator = async (npmOptions, { storyFormat }) => { - const packages = [ - '@storybook/react', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addons', - ]; - if (storyFormat === StoryFormat.MDX) { - packages.push('@storybook/addon-docs'); - } - const versionedPackages = await getVersionedPackages(npmOptions, ...packages); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]); +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'react'); }; export default generator; diff --git a/lib/cli/src/generators/WEBPACK_REACT/template-csf/.storybook/main.js b/lib/cli/src/generators/WEBPACK_REACT/template-csf/.storybook/main.js deleted file mode 100644 index 69e89d84f741..000000000000 --- a/lib/cli/src/generators/WEBPACK_REACT/template-csf/.storybook/main.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], - webpackFinal: async (config) => { - // do mutation to the config - - return config; - }, -}; diff --git a/lib/cli/src/generators/WEBPACK_REACT/template-csf/stories/0-Welcome.stories.js b/lib/cli/src/generators/WEBPACK_REACT/template-csf/stories/0-Welcome.stories.js deleted file mode 100644 index 9920a416e1ff..000000000000 --- a/lib/cli/src/generators/WEBPACK_REACT/template-csf/stories/0-Welcome.stories.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react'; -import { linkTo } from '@storybook/addon-links'; -import { Welcome } from '@storybook/react/demo'; - -export default { - title: 'Welcome', - component: Welcome, -}; - -export const ToStorybook = () => ; - -ToStorybook.storyName = 'to Storybook'; diff --git a/lib/cli/src/generators/WEBPACK_REACT/template-csf/stories/1-Button.stories.js b/lib/cli/src/generators/WEBPACK_REACT/template-csf/stories/1-Button.stories.js deleted file mode 100644 index 383864b23ad1..000000000000 --- a/lib/cli/src/generators/WEBPACK_REACT/template-csf/stories/1-Button.stories.js +++ /dev/null @@ -1,42 +0,0 @@ -import React from 'react'; -import { action } from '@storybook/addon-actions'; -import { linkTo } from '@storybook/addon-links'; -import { Button } from '@storybook/react/demo'; - -export default { - title: 'Button', - component: Button, -}; - -export const Text = () => ; - -export const Emoji = () => ( - -); - -Emoji.parameters = { notes: 'My notes on a button with emojis' }; - -export const WithSomeEmojiAndAction = () => ( - -); - -WithSomeEmojiAndAction.storyName = 'with some emoji and action'; -WithSomeEmojiAndAction.parameters = { notes: 'My notes on a button with emojis' }; - -export const ButtonWithLinkToAnotherStory = () => ( - -); - -ButtonWithLinkToAnotherStory.storyName = 'button with link to another story'; diff --git a/lib/cli/src/generators/WEBPACK_REACT/template-mdx/.storybook/main.js b/lib/cli/src/generators/WEBPACK_REACT/template-mdx/.storybook/main.js deleted file mode 100644 index b6db46a69841..000000000000 --- a/lib/cli/src/generators/WEBPACK_REACT/template-mdx/.storybook/main.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.(js|mdx)'], - addons: [ - '@storybook/addon-actions', - '@storybook/addon-links', - { - name: '@storybook/addon-docs', - options: { configureJSX: true }, - }, - ], - webpackFinal: async (config) => { - // do mutation to the config - - return config; - }, -}; diff --git a/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/0-Welcome.stories.mdx b/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/0-Welcome.stories.mdx index 8f48008a3b56..3e250967895c 100644 --- a/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/0-Welcome.stories.mdx +++ b/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/0-Welcome.stories.mdx @@ -1,6 +1,6 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { linkTo } from '@storybook/addon-links'; -import { Welcome } from '@storybook/react/demo'; +import Welcome from '../src/Welcome'; diff --git a/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/1-Button.stories.mdx b/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/1-Button.stories.mdx index 876782206a82..e7606083b0a3 100644 --- a/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/1-Button.stories.mdx +++ b/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/1-Button.stories.mdx @@ -1,6 +1,6 @@ import { Meta, Story } from '@storybook/addon-docs/blocks'; import { action } from '@storybook/addon-actions'; -import { Button } from '@storybook/react/demo'; +import Button from '../src/Button'; diff --git a/lib/cli/src/generators/configure.ts b/lib/cli/src/generators/configure.ts new file mode 100644 index 000000000000..333576de9b33 --- /dev/null +++ b/lib/cli/src/generators/configure.ts @@ -0,0 +1,16 @@ +import fse from 'fs-extra'; + +function mainConfigurationGenerator(addons?: string[], custom?: any) { + const hasSrc = fse.existsSync('./src'); + + const config = { + stories: ['../stories/**/*.stories.*', hasSrc && '../src/**/*.stories.*'].filter(Boolean), + addons: ['@storybook/addon-essentials', '@storybook/addon-links', ...addons], + ...custom, + }; + + const stringified = `module.exports = ${JSON.stringify(config, null, 2)}`; + fse.writeFileSync('./.storybook/main.js', stringified, { encoding: 'utf8' }); +} + +export default mainConfigurationGenerator; diff --git a/lib/cli/src/generators/generator1.ts b/lib/cli/src/generators/generator.ts similarity index 100% rename from lib/cli/src/generators/generator1.ts rename to lib/cli/src/generators/generator.ts diff --git a/lib/cli/src/helpers.test.ts b/lib/cli/src/helpers.test.ts index 47dedbb8da34..a6c1503c86e9 100644 --- a/lib/cli/src/helpers.test.ts +++ b/lib/cli/src/helpers.test.ts @@ -2,7 +2,7 @@ import fs from 'fs'; import fse from 'fs-extra'; import * as helpers from './helpers'; -import { StoryFormat } from './project_types'; +import { StoryFormat, SupportedLanguage, SupportedFrameworks } from './project_types'; jest.mock('fs', () => ({ existsSync: jest.fn(), @@ -10,6 +10,7 @@ jest.mock('fs', () => ({ jest.mock('fs-extra', () => ({ copySync: jest.fn(() => ({})), + ensureDir: jest.fn(() => {}), })); jest.mock('path', () => ({ @@ -54,4 +55,54 @@ describe('Helpers', () => { }).toThrowError(expectedMessage); }); }); + + it.each` + language | exists | expected + ${'javascript'} | ${['js', 'ts']} | ${'/js'} + ${'typescript'} | ${['js', 'ts']} | ${'/ts'} + ${'typescript'} | ${['js']} | ${'/js'} + ${'javascript'} | ${[]} | ${''} + ${'typescript'} | ${[]} | ${''} + `( + `should copy $expected when folder $exists exists for language $language`, + ({ language, exists, expected }) => { + const componentsDirectory = exists.map((folder: string) => `frameworks/react/${folder}`); + const expectedDirectory = `frameworks/react${expected}`; + (fse.existsSync as jest.Mock).mockImplementation((filePath) => { + return componentsDirectory.includes(filePath) || filePath === 'frameworks/react'; + }); + helpers.copyComponents('react', language); + + const copySyncSpy = jest.spyOn(fse, 'copySync'); + expect(copySyncSpy).toHaveBeenCalledWith( + expectedDirectory, + expect.anything(), + expect.anything() + ); + } + ); + + it(`should copy to src folder when exists`, () => { + (fse.existsSync as jest.Mock).mockImplementation((filePath) => { + return filePath === 'frameworks/react' || filePath === './src'; + }); + helpers.copyComponents('react', SupportedLanguage.JAVASCRIPT); + expect(fse.copySync).toHaveBeenCalledWith(expect.anything(), './src', expect.anything()); + }); + + it(`should copy to root folder when src doesn't exist`, () => { + (fse.existsSync as jest.Mock).mockImplementation((filePath) => { + return filePath === 'frameworks/react'; + }); + helpers.copyComponents('react', SupportedLanguage.JAVASCRIPT); + expect(fse.copySync).toHaveBeenCalledWith(expect.anything(), '.', expect.anything()); + }); + + it(`should throw an error for unsupported framework`, () => { + const framework = 'unknown framework' as SupportedFrameworks; + const expectedMessage = `Unsupported framework: ${framework}`; + expect(() => { + helpers.copyComponents(framework, SupportedLanguage.JAVASCRIPT); + }).toThrowError(expectedMessage); + }); }); diff --git a/lib/cli/src/helpers.ts b/lib/cli/src/helpers.ts index 4e345911d346..2d15b4583aeb 100644 --- a/lib/cli/src/helpers.ts +++ b/lib/cli/src/helpers.ts @@ -9,7 +9,7 @@ import stripJsonComments from 'strip-json-comments'; import { latestVersion } from './latest_version'; import { npmInit } from './npm_init'; -import { StoryFormat } from './project_types'; +import { StoryFormat, SupportedFrameworks, SupportedLanguage } from './project_types'; import { PackageJson } from './PackageJson'; import { NpmOptions } from './NpmOptions'; @@ -328,6 +328,16 @@ export function addToDevDependenciesIfNotPresent( export function copyTemplate(templateRoot: string, storyFormat: StoryFormat) { const templateDir = path.resolve(templateRoot, `template-${storyFormat}/`); + const newTemplates = [/WEBPACK_REACT/, /REACT/, /REACT_SCRIPTS/]; + const reactNative = /REACT_NATIVE/; + if ( + newTemplates.some((t) => templateRoot.match(t)) && + storyFormat !== StoryFormat.MDX && + !templateRoot.match(reactNative) + ) { + return; + } + if (!fs.existsSync(templateDir)) { // Fallback to CSF plain first, in case format is typescript but template is not available. if (storyFormat === StoryFormat.CSF_TYPESCRIPT) { @@ -339,3 +349,42 @@ export function copyTemplate(templateRoot: string, storyFormat: StoryFormat) { } fse.copySync(templateDir, '.', { overwrite: true }); } + +export function copyComponents(framework: SupportedFrameworks, language: SupportedLanguage) { + const languageFolderMapping: { [key in SupportedLanguage]: string } = { + javascript: 'js', + typescript: 'ts', + }; + const componentsPath = () => { + const frameworkPath = `frameworks/${framework}`; + const languageSpecific = path.resolve( + __dirname, + `${frameworkPath}/${languageFolderMapping[language]}` + ); + if (fse.existsSync(languageSpecific)) { + return languageSpecific; + } + const jsFallback = path.resolve( + __dirname, + `${frameworkPath}/${languageFolderMapping.javascript}` + ); + if (fse.existsSync(jsFallback)) { + return jsFallback; + } + const frameworkRootPath = path.resolve(__dirname, frameworkPath); + if (fse.existsSync(frameworkRootPath)) { + return frameworkRootPath; + } + throw new Error(`Unsupported framework: ${framework}`); + }; + + const targetPath = () => { + if (fse.existsSync('./src')) { + return './src/stories'; + } + return './stories'; + }; + + const destinationPath = targetPath(); + fse.copySync(componentsPath(), destinationPath, { overwrite: true }); +} diff --git a/lib/cli/src/initiate.ts b/lib/cli/src/initiate.ts index 1c080c029a09..7a5f7c6f2a3c 100644 --- a/lib/cli/src/initiate.ts +++ b/lib/cli/src/initiate.ts @@ -58,13 +58,13 @@ const installStorybook = (projectType: ProjectType, options: CommandOptions): Pr skipInstall: options.skipInstall, }; + const language = detectLanguage(); const defaultStoryFormat = - detectLanguage() === SupportedLanguage.TYPESCRIPT - ? StoryFormat.CSF_TYPESCRIPT - : StoryFormat.CSF; + language === SupportedLanguage.TYPESCRIPT ? StoryFormat.CSF_TYPESCRIPT : StoryFormat.CSF; const generatorOptions = { storyFormat: options.storyFormat || defaultStoryFormat, + language, }; const runStorybookCommand = useYarn ? 'yarn storybook' : 'npm run storybook'; diff --git a/lib/cli/src/project_types.ts b/lib/cli/src/project_types.ts index 48df5d200767..35cf14657a83 100644 --- a/lib/cli/src/project_types.ts +++ b/lib/cli/src/project_types.ts @@ -1,3 +1,4 @@ +// Should match @storybook/ export type SupportedFrameworks = | 'react' | 'react-native' @@ -11,7 +12,10 @@ export type SupportedFrameworks = | 'meteor' | 'preact' | 'svelte' - | 'rax'; + | 'rax' + | 'aurelia' + | 'html' + | 'web-components'; export enum ProjectType { UNDETECTED = 'UNDETECTED', diff --git a/lib/cli/tsconfig.json b/lib/cli/tsconfig.json index c4e40706894b..d87605d41afd 100644 --- a/lib/cli/tsconfig.json +++ b/lib/cli/tsconfig.json @@ -12,5 +12,5 @@ "noFallthroughCasesInSwitch": true }, "include": ["src/**/*"], - "exclude": ["src/**/template*"] + "exclude": ["src/**/template*", "src/frameworks/**/*"] } diff --git a/scripts/prepare.js b/scripts/prepare.js index 19e50ee6bccf..84c397565b51 100644 --- a/scripts/prepare.js +++ b/scripts/prepare.js @@ -34,9 +34,16 @@ function cleanup() { if (fs.existsSync(path.join(process.cwd(), 'dist'))) { const files = shell.find('dist').filter((filePath) => { // Do not remove folder - // And do not clean anything for @storybook/cli/dist/generators/**/template* because these are the template files + // And do not clean anything for: + // - @storybook/cli/dist/generators/**/template* + // - @storybook/cli/dist/frameworks/* + // because these are the template files // that will be copied to init SB on users' projects - if (fs.lstatSync(filePath).isDirectory() || /generators\/.+\/template.*/.test(filePath)) { + if ( + fs.lstatSync(filePath).isDirectory() || + /generators\/.+\/template.*/.test(filePath) || + /dist\/frameworks\/.*/.test(filePath) + ) { return false; } From b2d57445fa7ca41c11b37a3511f1a64c9812813f Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 25 May 2020 16:12:13 +0200 Subject: [PATCH 03/47] fix build --- lib/cli/src/generators/ANGULAR/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cli/src/generators/ANGULAR/index.ts b/lib/cli/src/generators/ANGULAR/index.ts index 0a9c387ec980..f2587a863a8d 100644 --- a/lib/cli/src/generators/ANGULAR/index.ts +++ b/lib/cli/src/generators/ANGULAR/index.ts @@ -64,7 +64,7 @@ function editAngularAppTsConfig() { writeFileAsJson(getAngularAppTsConfigPath(), tsConfigJson); } -const generator: Generator = async (npmOptions, { storyFormat }) => { +const generator: Generator = async (npmOptions, { storyFormat, language }) => { if (!isDefaultProjectSet()) { throw new Error( 'Could not find a default project in your Angular workspace.\nSet a defaultProject in your angular.json and re-run the installation.' @@ -73,7 +73,7 @@ const generator: Generator = async (npmOptions, { storyFormat }) => { copyTemplate(__dirname, storyFormat); - await addDependencies(npmOptions, { storyFormat }); + await addDependencies(npmOptions, { storyFormat, language }); editAngularAppTsConfig(); editStorybookTsConfig(path.resolve('./.storybook/tsconfig.json')); }; From fb1a12416da157b465f911045b46b4778ce6aa10 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 25 May 2020 16:58:51 +0200 Subject: [PATCH 04/47] fixes --- lib/cli/src/generators/REACT/index.ts | 5 ++++- .../REACT/template-csf/.storybook/main.js | 4 ---- .../REACT/template-mdx/.storybook/main.js | 14 -------------- .../template-mdx/stories/0-Welcome.stories.mdx | 4 ++-- .../template-mdx/stories/1-Button.stories.mdx | 4 ++-- lib/cli/src/generators/REACT_SCRIPTS/index.ts | 6 +++++- .../template-csf/.storybook/main.js | 8 -------- .../template-mdx/.storybook/main.js | 17 ----------------- .../template-mdx/stories/0-Welcome.stories.mdx | 4 ++-- .../template-mdx/stories/1-Button.stories.mdx | 4 ++-- lib/cli/src/generators/WEBPACK_REACT/index.ts | 5 ++++- .../template-mdx/stories/0-Welcome.stories.mdx | 4 ++-- .../template-mdx/stories/1-Button.stories.mdx | 4 ++-- lib/cli/src/generators/configure.ts | 1 + lib/cli/src/generators/generator.ts | 18 +++++++++++++++--- lib/cli/src/helpers.ts | 6 ++---- 16 files changed, 43 insertions(+), 65 deletions(-) delete mode 100644 lib/cli/src/generators/REACT/template-csf/.storybook/main.js delete mode 100644 lib/cli/src/generators/REACT/template-mdx/.storybook/main.js delete mode 100644 lib/cli/src/generators/REACT_SCRIPTS/template-csf/.storybook/main.js delete mode 100644 lib/cli/src/generators/REACT_SCRIPTS/template-mdx/.storybook/main.js diff --git a/lib/cli/src/generators/REACT/index.ts b/lib/cli/src/generators/REACT/index.ts index 117af995d217..3d6e7120e850 100644 --- a/lib/cli/src/generators/REACT/index.ts +++ b/lib/cli/src/generators/REACT/index.ts @@ -1,7 +1,10 @@ import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { - baseGenerator(npmOptions, options, 'react'); + await baseGenerator(npmOptions, options, 'react', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + }); }; export default generator; diff --git a/lib/cli/src/generators/REACT/template-csf/.storybook/main.js b/lib/cli/src/generators/REACT/template-csf/.storybook/main.js deleted file mode 100644 index 2271016abe6b..000000000000 --- a/lib/cli/src/generators/REACT/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.(ts|tsx|js|jsx)'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/REACT/template-mdx/.storybook/main.js b/lib/cli/src/generators/REACT/template-mdx/.storybook/main.js deleted file mode 100644 index c698efe5509d..000000000000 --- a/lib/cli/src/generators/REACT/template-mdx/.storybook/main.js +++ /dev/null @@ -1,14 +0,0 @@ -module.exports = { - stories: [ - '../src/**/*.stories.(ts|tsx|js|jsx|mdx)', - '../stories/**/*.stories.(ts|tsx|js|jsx|mdx)', - ], - addons: [ - '@storybook/addon-actions', - '@storybook/addon-links', - { - name: '@storybook/addon-docs', - options: { configureJSX: true }, - }, - ], -}; diff --git a/lib/cli/src/generators/REACT/template-mdx/stories/0-Welcome.stories.mdx b/lib/cli/src/generators/REACT/template-mdx/stories/0-Welcome.stories.mdx index 4e0f04619efe..705382f9fa56 100644 --- a/lib/cli/src/generators/REACT/template-mdx/stories/0-Welcome.stories.mdx +++ b/lib/cli/src/generators/REACT/template-mdx/stories/0-Welcome.stories.mdx @@ -1,8 +1,8 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { linkTo } from '@storybook/addon-links'; -import Welcome from '../Welcome'; +import Welcome from './Welcome'; - + # Welcome diff --git a/lib/cli/src/generators/REACT/template-mdx/stories/1-Button.stories.mdx b/lib/cli/src/generators/REACT/template-mdx/stories/1-Button.stories.mdx index 09554ab784a8..9688920f604b 100644 --- a/lib/cli/src/generators/REACT/template-mdx/stories/1-Button.stories.mdx +++ b/lib/cli/src/generators/REACT/template-mdx/stories/1-Button.stories.mdx @@ -1,8 +1,8 @@ import { action } from '@storybook/addon-actions'; import { Meta, Story } from '@storybook/addon-docs/blocks'; -import Button from '../Button'; +import Button from './Button'; - + # Button diff --git a/lib/cli/src/generators/REACT_SCRIPTS/index.ts b/lib/cli/src/generators/REACT_SCRIPTS/index.ts index a06f24bfb011..28ac3d70c4b2 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/index.ts +++ b/lib/cli/src/generators/REACT_SCRIPTS/index.ts @@ -3,9 +3,13 @@ import fs from 'fs'; import { retrievePackageJson, writePackageJson } from '../../helpers'; import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { - await baseGenerator(npmOptions, options, 'react', [], ['@storybook/preset-create-react-app']); + await baseGenerator(npmOptions, options, 'react', { + extraAddons: ['@storybook/preset-create-react-app'], + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + }); if (fs.existsSync(path.resolve('./public'))) { const packageJson = await retrievePackageJson(); // has a public folder and add support to it. diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-csf/.storybook/main.js b/lib/cli/src/generators/REACT_SCRIPTS/template-csf/.storybook/main.js deleted file mode 100644 index cd20fe295779..000000000000 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-csf/.storybook/main.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.(ts|tsx|js|jsx)'], - addons: [ - '@storybook/preset-create-react-app', - '@storybook/addon-actions', - '@storybook/addon-links', - ], -}; diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/.storybook/main.js b/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/.storybook/main.js deleted file mode 100644 index 6181a3b86505..000000000000 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/.storybook/main.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - stories: [ - '../src/**/*.stories.(ts|tsx|js|jsx|mdx)', - '../stories/**/*.stories.(ts|tsx|js|jsx|mdx)', - ], - addons: [ - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/preset-create-react-app', - { - name: '@storybook/addon-docs', - options: { - configureJSX: true, - }, - }, - ], -}; diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/0-Welcome.stories.mdx b/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/0-Welcome.stories.mdx index 3e250967895c..705382f9fa56 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/0-Welcome.stories.mdx +++ b/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/0-Welcome.stories.mdx @@ -1,8 +1,8 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { linkTo } from '@storybook/addon-links'; -import Welcome from '../src/Welcome'; +import Welcome from './Welcome'; - + # Welcome diff --git a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/1-Button.stories.mdx b/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/1-Button.stories.mdx index 8005ba7e0e0b..2abc573287c6 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/1-Button.stories.mdx +++ b/lib/cli/src/generators/REACT_SCRIPTS/template-mdx/stories/1-Button.stories.mdx @@ -1,8 +1,8 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { action } from '@storybook/addon-actions'; -import Button from '../src/Button'; +import Button from './Button'; - + # Button diff --git a/lib/cli/src/generators/WEBPACK_REACT/index.ts b/lib/cli/src/generators/WEBPACK_REACT/index.ts index 117af995d217..98bcc8af2986 100644 --- a/lib/cli/src/generators/WEBPACK_REACT/index.ts +++ b/lib/cli/src/generators/WEBPACK_REACT/index.ts @@ -1,7 +1,10 @@ import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { - baseGenerator(npmOptions, options, 'react'); + baseGenerator(npmOptions, options, 'react', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + }); }; export default generator; diff --git a/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/0-Welcome.stories.mdx b/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/0-Welcome.stories.mdx index 3e250967895c..705382f9fa56 100644 --- a/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/0-Welcome.stories.mdx +++ b/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/0-Welcome.stories.mdx @@ -1,8 +1,8 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { linkTo } from '@storybook/addon-links'; -import Welcome from '../src/Welcome'; +import Welcome from './Welcome'; - + # Welcome diff --git a/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/1-Button.stories.mdx b/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/1-Button.stories.mdx index e7606083b0a3..329ea1da39c1 100644 --- a/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/1-Button.stories.mdx +++ b/lib/cli/src/generators/WEBPACK_REACT/template-mdx/stories/1-Button.stories.mdx @@ -1,8 +1,8 @@ import { Meta, Story } from '@storybook/addon-docs/blocks'; import { action } from '@storybook/addon-actions'; -import Button from '../src/Button'; +import Button from './Button'; - + # Button diff --git a/lib/cli/src/generators/configure.ts b/lib/cli/src/generators/configure.ts index 333576de9b33..710986f3713a 100644 --- a/lib/cli/src/generators/configure.ts +++ b/lib/cli/src/generators/configure.ts @@ -10,6 +10,7 @@ function mainConfigurationGenerator(addons?: string[], custom?: any) { }; const stringified = `module.exports = ${JSON.stringify(config, null, 2)}`; + fse.ensureDirSync('./.storybook'); fse.writeFileSync('./.storybook/main.js', stringified, { encoding: 'utf8' }); } diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index 1a0b7ce3206f..ab6ad6fde4a2 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -16,18 +16,30 @@ export type GeneratorOptions = { storyFormat: StoryFormat; }; +export interface FrameworkOptions { + extraPackages?: string[]; + extraAddons?: string[]; + dirname?: string; +} + export type Generator = (npmOptions: NpmOptions, options: GeneratorOptions) => Promise; +const defaultOptions: FrameworkOptions = { + extraPackages: [], + extraAddons: [], + dirname: __dirname, +}; const generator = async ( npmOptions: NpmOptions, { storyFormat, language }: GeneratorOptions, framework: SupportedFrameworks, - extraPackages?: string[], - extraAddons?: string[] + options: FrameworkOptions = defaultOptions ) => { + const { extraAddons, extraPackages, dirname } = { ...defaultOptions, ...options }; const packages = [ `@storybook/${framework}`, '@storybook/addon-essentials', + '@storybook/addon-actions', '@storybook/addon-links', ...extraPackages, ...extraAddons, @@ -36,7 +48,7 @@ const generator = async ( configure(extraAddons); copyComponents(framework, language); - copyTemplate(__dirname, storyFormat); + copyTemplate(dirname, storyFormat); const packageJson = await retrievePackageJson(); diff --git a/lib/cli/src/helpers.ts b/lib/cli/src/helpers.ts index 2d15b4583aeb..ba6b3798aad6 100644 --- a/lib/cli/src/helpers.ts +++ b/lib/cli/src/helpers.ts @@ -328,12 +328,10 @@ export function addToDevDependenciesIfNotPresent( export function copyTemplate(templateRoot: string, storyFormat: StoryFormat) { const templateDir = path.resolve(templateRoot, `template-${storyFormat}/`); - const newTemplates = [/WEBPACK_REACT/, /REACT/, /REACT_SCRIPTS/]; - const reactNative = /REACT_NATIVE/; + console.log('templateRoot', templateRoot); if ( - newTemplates.some((t) => templateRoot.match(t)) && storyFormat !== StoryFormat.MDX && - !templateRoot.match(reactNative) + templateRoot.match(/generators$/) // Means we're using base config and migrated ) { return; } From 8434dcc2b2b2b084350844e412d08e589176140e Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 25 May 2020 17:20:44 +0200 Subject: [PATCH 05/47] fix tests --- lib/cli/src/generators/generator.ts | 2 +- lib/cli/src/helpers.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index ab6ad6fde4a2..b7e638116a19 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -48,7 +48,7 @@ const generator = async ( configure(extraAddons); copyComponents(framework, language); - copyTemplate(dirname, storyFormat); + copyTemplate(dirname || __dirname, storyFormat); const packageJson = await retrievePackageJson(); diff --git a/lib/cli/src/helpers.ts b/lib/cli/src/helpers.ts index ba6b3798aad6..3e9d8df38e0d 100644 --- a/lib/cli/src/helpers.ts +++ b/lib/cli/src/helpers.ts @@ -328,7 +328,6 @@ export function addToDevDependenciesIfNotPresent( export function copyTemplate(templateRoot: string, storyFormat: StoryFormat) { const templateDir = path.resolve(templateRoot, `template-${storyFormat}/`); - console.log('templateRoot', templateRoot); if ( storyFormat !== StoryFormat.MDX && templateRoot.match(/generators$/) // Means we're using base config and migrated From 8673294311b3bc79cc4e9d4eccad39ee0d6c5071 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 25 May 2020 17:37:34 +0200 Subject: [PATCH 06/47] fix unit test --- lib/cli/src/helpers.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/cli/src/helpers.test.ts b/lib/cli/src/helpers.test.ts index a6c1503c86e9..dd2b59cf614c 100644 --- a/lib/cli/src/helpers.test.ts +++ b/lib/cli/src/helpers.test.ts @@ -11,6 +11,7 @@ jest.mock('fs', () => ({ jest.mock('fs-extra', () => ({ copySync: jest.fn(() => ({})), ensureDir: jest.fn(() => {}), + existsSync: jest.fn(), })); jest.mock('path', () => ({ From 2b5372ee798a0e4c4799136cd35bf4459081d3a7 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 25 May 2020 17:39:24 +0200 Subject: [PATCH 07/47] fix lint --- lib/cli/src/.eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/cli/src/.eslintrc.js b/lib/cli/src/.eslintrc.js index 3625258646f3..fe5159bc5894 100644 --- a/lib/cli/src/.eslintrc.js +++ b/lib/cli/src/.eslintrc.js @@ -10,6 +10,7 @@ module.exports = { rules: { 'react/no-this-in-sfc': ignore, 'import/no-unresolved': ignore, + 'react/react-in-jsx-scope': ignore, 'import/no-extraneous-dependencies': ignore, 'global-require': ignore, }, From 93eaae00a1ddde6c401b5e49b2f447eec3f222b3 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 25 May 2020 18:41:59 +0200 Subject: [PATCH 08/47] fix tests --- lib/cli/src/generators/configure.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/cli/src/generators/configure.ts b/lib/cli/src/generators/configure.ts index 710986f3713a..cd9e86432b52 100644 --- a/lib/cli/src/generators/configure.ts +++ b/lib/cli/src/generators/configure.ts @@ -4,7 +4,9 @@ function mainConfigurationGenerator(addons?: string[], custom?: any) { const hasSrc = fse.existsSync('./src'); const config = { - stories: ['../stories/**/*.stories.*', hasSrc && '../src/**/*.stories.*'].filter(Boolean), + stories: [!hasSrc && '../stories/**/*.stories.*', hasSrc && '../src/**/*.stories.*'].filter( + Boolean + ), addons: ['@storybook/addon-essentials', '@storybook/addon-links', ...addons], ...custom, }; From 665163dfb0e99173e624707236df8fcf26689721 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 25 May 2020 18:43:25 +0200 Subject: [PATCH 09/47] fix unit test --- lib/cli/src/helpers.test.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/cli/src/helpers.test.ts b/lib/cli/src/helpers.test.ts index dd2b59cf614c..6aca0d062250 100644 --- a/lib/cli/src/helpers.test.ts +++ b/lib/cli/src/helpers.test.ts @@ -88,7 +88,11 @@ describe('Helpers', () => { return filePath === 'frameworks/react' || filePath === './src'; }); helpers.copyComponents('react', SupportedLanguage.JAVASCRIPT); - expect(fse.copySync).toHaveBeenCalledWith(expect.anything(), './src', expect.anything()); + expect(fse.copySync).toHaveBeenCalledWith( + expect.anything(), + './src/stories', + expect.anything() + ); }); it(`should copy to root folder when src doesn't exist`, () => { @@ -96,7 +100,7 @@ describe('Helpers', () => { return filePath === 'frameworks/react'; }); helpers.copyComponents('react', SupportedLanguage.JAVASCRIPT); - expect(fse.copySync).toHaveBeenCalledWith(expect.anything(), '.', expect.anything()); + expect(fse.copySync).toHaveBeenCalledWith(expect.anything(), './stories', expect.anything()); }); it(`should throw an error for unsupported framework`, () => { From 7cf2595cfa8ea4207475795dee35c39bc0d2ac1c Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 21:39:16 +0200 Subject: [PATCH 10/47] Feedbacks --- lib/cli/src/frameworks/react/js/0-Welcome.stories.js | 2 +- lib/cli/src/frameworks/react/js/1-Button.stories.js | 2 +- lib/cli/src/frameworks/react/js/Button.jsx | 4 +--- lib/cli/src/frameworks/react/js/Welcome.jsx | 4 +--- lib/cli/src/frameworks/react/ts/0-Welcome.stories.tsx | 2 +- lib/cli/src/frameworks/react/ts/1-Button.stories.tsx | 2 +- lib/cli/src/frameworks/react/ts/Button.tsx | 4 ++-- lib/cli/src/frameworks/react/ts/Welcome.tsx | 4 ++-- 8 files changed, 10 insertions(+), 14 deletions(-) diff --git a/lib/cli/src/frameworks/react/js/0-Welcome.stories.js b/lib/cli/src/frameworks/react/js/0-Welcome.stories.js index 1274ca16a4ff..4c2d95bdb227 100644 --- a/lib/cli/src/frameworks/react/js/0-Welcome.stories.js +++ b/lib/cli/src/frameworks/react/js/0-Welcome.stories.js @@ -1,6 +1,6 @@ import React from 'react'; import { linkTo } from '@storybook/addon-links'; -import Welcome from './Welcome'; +import { Welcome } from './Welcome'; export default { title: 'Welcome', diff --git a/lib/cli/src/frameworks/react/js/1-Button.stories.js b/lib/cli/src/frameworks/react/js/1-Button.stories.js index 57f15cf2a479..abe7d581770b 100644 --- a/lib/cli/src/frameworks/react/js/1-Button.stories.js +++ b/lib/cli/src/frameworks/react/js/1-Button.stories.js @@ -1,7 +1,7 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import { linkTo } from '@storybook/addon-links'; -import Button from './Button'; +import { Button } from './Button'; export default { title: 'Button', diff --git a/lib/cli/src/frameworks/react/js/Button.jsx b/lib/cli/src/frameworks/react/js/Button.jsx index 8b431e3d0e57..0b9a6baeb6a1 100644 --- a/lib/cli/src/frameworks/react/js/Button.jsx +++ b/lib/cli/src/frameworks/react/js/Button.jsx @@ -10,10 +10,8 @@ const styles = { margin: 10, }; -const Button = ({ children, onClick }) => ( +export const Button = ({ children, onClick }) => ( ); - -export default Button; diff --git a/lib/cli/src/frameworks/react/js/Welcome.jsx b/lib/cli/src/frameworks/react/js/Welcome.jsx index 42328a1b4fc7..45d25f6ebafd 100644 --- a/lib/cli/src/frameworks/react/js/Welcome.jsx +++ b/lib/cli/src/frameworks/react/js/Welcome.jsx @@ -79,7 +79,7 @@ const NavButton = ({ children, onClick, ...props }) => ( ); -const Welcome = ({ showApp }) => ( +export const Welcome = ({ showApp }) => (
Welcome to storybook

This is a UI component dev environment for your app.

@@ -124,5 +124,3 @@ const Welcome = ({ showApp }) => (
); - -export default Welcome; diff --git a/lib/cli/src/frameworks/react/ts/0-Welcome.stories.tsx b/lib/cli/src/frameworks/react/ts/0-Welcome.stories.tsx index 1274ca16a4ff..4c2d95bdb227 100644 --- a/lib/cli/src/frameworks/react/ts/0-Welcome.stories.tsx +++ b/lib/cli/src/frameworks/react/ts/0-Welcome.stories.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { linkTo } from '@storybook/addon-links'; -import Welcome from './Welcome'; +import { Welcome } from './Welcome'; export default { title: 'Welcome', diff --git a/lib/cli/src/frameworks/react/ts/1-Button.stories.tsx b/lib/cli/src/frameworks/react/ts/1-Button.stories.tsx index 57f15cf2a479..abe7d581770b 100644 --- a/lib/cli/src/frameworks/react/ts/1-Button.stories.tsx +++ b/lib/cli/src/frameworks/react/ts/1-Button.stories.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { action } from '@storybook/addon-actions'; import { linkTo } from '@storybook/addon-links'; -import Button from './Button'; +import { Button } from './Button'; export default { title: 'Button', diff --git a/lib/cli/src/frameworks/react/ts/Button.tsx b/lib/cli/src/frameworks/react/ts/Button.tsx index bd79304547b2..42b1313f8bf1 100644 --- a/lib/cli/src/frameworks/react/ts/Button.tsx +++ b/lib/cli/src/frameworks/react/ts/Button.tsx @@ -10,8 +10,8 @@ const styles = { margin: 10, }; -type Props = Pick, 'onClick'>; -const Button: FunctionComponent = ({ children, onClick }) => ( +export type ButtonProps = HTMLAttributes; +export const Button: FunctionComponent = ({ children, onClick }: ButtonProps) => ( diff --git a/lib/cli/src/frameworks/react/ts/Welcome.tsx b/lib/cli/src/frameworks/react/ts/Welcome.tsx index 2d5d35e5000a..3d0885f6bbdc 100644 --- a/lib/cli/src/frameworks/react/ts/Welcome.tsx +++ b/lib/cli/src/frameworks/react/ts/Welcome.tsx @@ -106,10 +106,10 @@ const NavButton: FunctionComponent = ({ children, onClick, ...pr ); -interface WelcomeProps { +export interface WelcomeProps { showApp: () => void; } -const Welcome: FunctionComponent = ({ showApp }) => ( +export const Welcome: FunctionComponent = ({ showApp }: WelcomeProps) => (
Welcome to storybook

This is a UI component dev environment for your app.

From f535af4519a4bad11154f31c907b28b241d3c752 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 22:10:47 +0200 Subject: [PATCH 11/47] Move ember --- .../ember}/0-Welcome.stories.js | 0 .../ember}/1-Button.stories.js | 0 lib/cli/src/generators/EMBER/index.ts | 72 ++++--------------- .../EMBER/template-csf/.storybook/main.js | 4 -- lib/cli/src/generators/REACT_SCRIPTS/index.ts | 9 +-- lib/cli/src/generators/generator.ts | 9 ++- 6 files changed, 21 insertions(+), 73 deletions(-) rename lib/cli/src/{generators/EMBER/template-csf/stories => frameworks/ember}/0-Welcome.stories.js (100%) rename lib/cli/src/{generators/EMBER/template-csf/stories => frameworks/ember}/1-Button.stories.js (100%) delete mode 100644 lib/cli/src/generators/EMBER/template-csf/.storybook/main.js diff --git a/lib/cli/src/generators/EMBER/template-csf/stories/0-Welcome.stories.js b/lib/cli/src/frameworks/ember/0-Welcome.stories.js similarity index 100% rename from lib/cli/src/generators/EMBER/template-csf/stories/0-Welcome.stories.js rename to lib/cli/src/frameworks/ember/0-Welcome.stories.js diff --git a/lib/cli/src/generators/EMBER/template-csf/stories/1-Button.stories.js b/lib/cli/src/frameworks/ember/1-Button.stories.js similarity index 100% rename from lib/cli/src/generators/EMBER/template-csf/stories/1-Button.stories.js rename to lib/cli/src/frameworks/ember/1-Button.stories.js diff --git a/lib/cli/src/generators/EMBER/index.ts b/lib/cli/src/generators/EMBER/index.ts index 5ce6864cf87e..5560a8e453b3 100644 --- a/lib/cli/src/generators/EMBER/index.ts +++ b/lib/cli/src/generators/EMBER/index.ts @@ -1,61 +1,17 @@ -import { - getVersions, - retrievePackageJson, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; -import { Generator } from '../generator'; - -const generator: Generator = async (npmOptions, { storyFormat }) => { - const [ - storybookVersion, - babelPluginEmberModulePolyfillVersion, - babelPluginHtmlBarsInlinePrecompileVersion, - linksVersion, - actionsVersion, - addonsVersion, - ] = await getVersions( - npmOptions, - '@storybook/ember', - // babel-plugin-ember-modules-api-polyfill is a peerDep of @storybook/ember - 'babel-plugin-ember-modules-api-polyfill', - // babel-plugin-htmlbars-inline-precompile is a peerDep of @storybook/ember - 'babel-plugin-htmlbars-inline-precompile', - '@storybook/addon-links', - '@storybook/addon-actions', - '@storybook/addons' - ); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = { - ...packageJson.scripts, - ...{ - storybook: 'start-storybook -p 6006 -s dist', - 'build-storybook': 'build-storybook -s dist', - }, - }; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [ - `@storybook/ember@${storybookVersion}`, - `@storybook/addon-actions@${actionsVersion}`, - `@storybook/addon-links@${linksVersion}`, - `@storybook/addons@${addonsVersion}`, - `babel-plugin-ember-modules-api-polyfill@${babelPluginEmberModulePolyfillVersion}`, - `babel-plugin-htmlbars-inline-precompile@${babelPluginHtmlBarsInlinePrecompileVersion}`, - ...babelDependencies, - ]); +import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; + +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'ember', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + extraPackages: [ + // babel-plugin-ember-modules-api-polyfill is a peerDep of @storybook/ember + 'babel-plugin-ember-modules-api-polyfill', + // babel-plugin-htmlbars-inline-precompile is a peerDep of @storybook/ember + 'babel-plugin-htmlbars-inline-precompile', + ], + staticDir: 'dist', + }); }; export default generator; diff --git a/lib/cli/src/generators/EMBER/template-csf/.storybook/main.js b/lib/cli/src/generators/EMBER/template-csf/.storybook/main.js deleted file mode 100644 index 3036098563cc..000000000000 --- a/lib/cli/src/generators/EMBER/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/REACT_SCRIPTS/index.ts b/lib/cli/src/generators/REACT_SCRIPTS/index.ts index 28ac3d70c4b2..6112ab646032 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/index.ts +++ b/lib/cli/src/generators/REACT_SCRIPTS/index.ts @@ -1,6 +1,5 @@ import path from 'path'; import fs from 'fs'; -import { retrievePackageJson, writePackageJson } from '../../helpers'; import baseGenerator, { Generator } from '../generator'; import { StoryFormat } from '../../project_types'; @@ -9,14 +8,8 @@ const generator: Generator = async (npmOptions, options) => { await baseGenerator(npmOptions, options, 'react', { extraAddons: ['@storybook/preset-create-react-app'], dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + staticDir: fs.existsSync(path.resolve('./public')) ? 'public' : undefined, }); - if (fs.existsSync(path.resolve('./public'))) { - const packageJson = await retrievePackageJson(); - // has a public folder and add support to it. - packageJson.scripts.storybook += ' -s public'; - packageJson.scripts['build-storybook'] += ' -s public'; - writePackageJson(packageJson); - } }; export default generator; diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index b7e638116a19..7d3b7a68b3bb 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -20,6 +20,7 @@ export interface FrameworkOptions { extraPackages?: string[]; extraAddons?: string[]; dirname?: string; + staticDir?: string; } export type Generator = (npmOptions: NpmOptions, options: GeneratorOptions) => Promise; @@ -28,6 +29,7 @@ const defaultOptions: FrameworkOptions = { extraPackages: [], extraAddons: [], dirname: __dirname, + staticDir: undefined, }; const generator = async ( npmOptions: NpmOptions, @@ -35,7 +37,7 @@ const generator = async ( framework: SupportedFrameworks, options: FrameworkOptions = defaultOptions ) => { - const { extraAddons, extraPackages, dirname } = { ...defaultOptions, ...options }; + const { extraAddons, extraPackages, dirname, staticDir } = { ...defaultOptions, ...options }; const packages = [ `@storybook/${framework}`, '@storybook/addon-essentials', @@ -55,9 +57,10 @@ const generator = async ( packageJson.dependencies = packageJson.dependencies || {}; packageJson.devDependencies = packageJson.devDependencies || {}; + const staticParameter = staticDir ? `-s ${staticDir}` : ''; packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; + packageJson.scripts.storybook = `start-storybook -p 6006 ${staticParameter}`.trim(); + packageJson.scripts['build-storybook'] = `build-storybook ${staticParameter}`.trim(); writePackageJson(packageJson); From 2783b12ceab483f654dab270ea7ffa72a5b7ddbf Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 22:21:03 +0200 Subject: [PATCH 12/47] Move Meteor --- lib/cli/src/generators/METEOR/index.ts | 84 ++----------------- .../METEOR/template-csf/.storybook/main.js | 4 - .../template-csf/stories/0-Welcome.stories.js | 12 --- .../template-csf/stories/1-Button.stories.js | 18 ---- 4 files changed, 8 insertions(+), 110 deletions(-) delete mode 100644 lib/cli/src/generators/METEOR/template-csf/.storybook/main.js delete mode 100644 lib/cli/src/generators/METEOR/template-csf/stories/0-Welcome.stories.js delete mode 100644 lib/cli/src/generators/METEOR/template-csf/stories/1-Button.stories.js diff --git a/lib/cli/src/generators/METEOR/index.ts b/lib/cli/src/generators/METEOR/index.ts index 94f2c1c21b1c..f638c6d22a8c 100644 --- a/lib/cli/src/generators/METEOR/index.ts +++ b/lib/cli/src/generators/METEOR/index.ts @@ -1,54 +1,14 @@ import fs from 'fs'; import JSON5 from 'json5'; -import { - getVersions, - retrievePackageJson, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; -import { Generator } from '../generator'; +import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; -const generator: Generator = async (npmOptions, { storyFormat }) => { - const [ - storybookVersion, - actionsVersion, - linksVersion, - knobsVersion, - addonsVersion, - reactVersion, - reactDomVersion, - presetEnvVersion, - presetReactVersion, - ] = await getVersions( - npmOptions, - '@storybook/react', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addon-knobs', - '@storybook/addons', - 'react', - 'react-dom', - '@babel/preset-env', - '@babel/preset-react' - ); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.devDependencies = packageJson.devDependencies || {}; - packageJson.scripts = packageJson.scripts || {}; - packageJson.dependencies = packageJson.dependencies || {}; - - const devDependencies = [ - `@storybook/react@${storybookVersion}`, - `@storybook/addon-actions@${actionsVersion}`, - `@storybook/addon-links@${linksVersion}`, - `@storybook/addon-knobs@${knobsVersion}`, - `@storybook/addons@${addonsVersion}`, - ]; +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'react', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + extraPackages: ['react', 'react-dom', '@babel/preset-env', '@babel/preset-react'], + staticDir: 'dist', + }); // create or update .babelrc let babelrc = null; @@ -63,37 +23,9 @@ const generator: Generator = async (npmOptions, { storyFormat }) => { '@babel/preset-react', ], }; - - devDependencies.push(`@babel/preset-env@${presetEnvVersion}`); - devDependencies.push(`@babel/preset-react@${presetReactVersion}`); } fs.writeFileSync('.babelrc', JSON.stringify(babelrc, null, 2), 'utf8'); - - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - // add react packages. - const dependencies = []; - if (!packageJson.dependencies.react) { - dependencies.push(`react@${reactVersion}`); - } - if (!packageJson.dependencies['react-dom']) { - dependencies.push(`react-dom@${reactDomVersion}`); - } - - if (dependencies.length > 0) { - installDependencies( - { ...npmOptions, packageJson, installAsDevDependencies: false }, - dependencies - ); - } - - installDependencies({ ...npmOptions, packageJson }, [...devDependencies, ...babelDependencies]); }; export default generator; diff --git a/lib/cli/src/generators/METEOR/template-csf/.storybook/main.js b/lib/cli/src/generators/METEOR/template-csf/.storybook/main.js deleted file mode 100644 index c6a06f1fbc34..000000000000 --- a/lib/cli/src/generators/METEOR/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-knobs'], -}; diff --git a/lib/cli/src/generators/METEOR/template-csf/stories/0-Welcome.stories.js b/lib/cli/src/generators/METEOR/template-csf/stories/0-Welcome.stories.js deleted file mode 100644 index 9920a416e1ff..000000000000 --- a/lib/cli/src/generators/METEOR/template-csf/stories/0-Welcome.stories.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react'; -import { linkTo } from '@storybook/addon-links'; -import { Welcome } from '@storybook/react/demo'; - -export default { - title: 'Welcome', - component: Welcome, -}; - -export const ToStorybook = () => ; - -ToStorybook.storyName = 'to Storybook'; diff --git a/lib/cli/src/generators/METEOR/template-csf/stories/1-Button.stories.js b/lib/cli/src/generators/METEOR/template-csf/stories/1-Button.stories.js deleted file mode 100644 index 6bcfa2146627..000000000000 --- a/lib/cli/src/generators/METEOR/template-csf/stories/1-Button.stories.js +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react'; -import { action } from '@storybook/addon-actions'; -import { Button } from '@storybook/react/demo'; - -export default { - title: 'Button', - component: Button, -}; - -export const Text = () => ; - -export const Emoji = () => ( - -); From 79d6b00cbef8e39cecdd8b8dad5af05553c3096e Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 22:22:48 +0200 Subject: [PATCH 13/47] Move mithril --- .../mithril}/0-Welcome.stories.js | 0 .../mithril}/1-Button.stories.js | 0 .../stories => frameworks/mithril}/Button.js | 0 .../stories => frameworks/mithril}/Welcome.js | 0 lib/cli/src/generators/MITHRIL/index.ts | 54 +++---------------- .../MITHRIL/template-csf/.storybook/main.js | 4 -- 6 files changed, 6 insertions(+), 52 deletions(-) rename lib/cli/src/{generators/MITHRIL/template-csf/stories => frameworks/mithril}/0-Welcome.stories.js (100%) rename lib/cli/src/{generators/MITHRIL/template-csf/stories => frameworks/mithril}/1-Button.stories.js (100%) rename lib/cli/src/{generators/MITHRIL/template-csf/stories => frameworks/mithril}/Button.js (100%) rename lib/cli/src/{generators/MITHRIL/template-csf/stories => frameworks/mithril}/Welcome.js (100%) delete mode 100644 lib/cli/src/generators/MITHRIL/template-csf/.storybook/main.js diff --git a/lib/cli/src/generators/MITHRIL/template-csf/stories/0-Welcome.stories.js b/lib/cli/src/frameworks/mithril/0-Welcome.stories.js similarity index 100% rename from lib/cli/src/generators/MITHRIL/template-csf/stories/0-Welcome.stories.js rename to lib/cli/src/frameworks/mithril/0-Welcome.stories.js diff --git a/lib/cli/src/generators/MITHRIL/template-csf/stories/1-Button.stories.js b/lib/cli/src/frameworks/mithril/1-Button.stories.js similarity index 100% rename from lib/cli/src/generators/MITHRIL/template-csf/stories/1-Button.stories.js rename to lib/cli/src/frameworks/mithril/1-Button.stories.js diff --git a/lib/cli/src/generators/MITHRIL/template-csf/stories/Button.js b/lib/cli/src/frameworks/mithril/Button.js similarity index 100% rename from lib/cli/src/generators/MITHRIL/template-csf/stories/Button.js rename to lib/cli/src/frameworks/mithril/Button.js diff --git a/lib/cli/src/generators/MITHRIL/template-csf/stories/Welcome.js b/lib/cli/src/frameworks/mithril/Welcome.js similarity index 100% rename from lib/cli/src/generators/MITHRIL/template-csf/stories/Welcome.js rename to lib/cli/src/frameworks/mithril/Welcome.js diff --git a/lib/cli/src/generators/MITHRIL/index.ts b/lib/cli/src/generators/MITHRIL/index.ts index 271187acd3d2..5f4f46de1b66 100644 --- a/lib/cli/src/generators/MITHRIL/index.ts +++ b/lib/cli/src/generators/MITHRIL/index.ts @@ -1,52 +1,10 @@ -import { - getVersions, - retrievePackageJson, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; -import { Generator } from '../generator'; +import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; -const generator: Generator = async (npmOptions, { storyFormat }) => { - const [ - storybookVersion, - actionsVersion, - linksVersion, - knobsVersion, - addonsVersion, - ] = await getVersions( - npmOptions, - '@storybook/mithril', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addon-knobs', - '@storybook/addons' - ); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [ - `@storybook/mithril@${storybookVersion}`, - `@storybook/addon-actions@${actionsVersion}`, - `@storybook/addon-links@${linksVersion}`, - `@storybook/addon-knobs@${knobsVersion}`, - `@storybook/addons@${addonsVersion}`, - ...babelDependencies, - ]); +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'mithril', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + }); }; export default generator; diff --git a/lib/cli/src/generators/MITHRIL/template-csf/.storybook/main.js b/lib/cli/src/generators/MITHRIL/template-csf/.storybook/main.js deleted file mode 100644 index c6a06f1fbc34..000000000000 --- a/lib/cli/src/generators/MITHRIL/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-knobs'], -}; From 06e3c149adb5197e88bd3001d9cac6508edc2466 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 22:25:14 +0200 Subject: [PATCH 14/47] Move preact --- .../preact}/0-Welcome.stories.js | 0 .../preact}/1-Button.stories.js | 0 .../stories => frameworks/preact}/Button.js | 2 +- .../stories => frameworks/preact}/Welcome.js | 4 -- lib/cli/src/generators/PREACT/index.ts | 46 +++---------------- .../PREACT/template-csf/.storybook/main.js | 4 -- 6 files changed, 7 insertions(+), 49 deletions(-) rename lib/cli/src/{generators/PREACT/template-csf/stories => frameworks/preact}/0-Welcome.stories.js (100%) rename lib/cli/src/{generators/PREACT/template-csf/stories => frameworks/preact}/1-Button.stories.js (100%) rename lib/cli/src/{generators/PREACT/template-csf/stories => frameworks/preact}/Button.js (74%) rename lib/cli/src/{generators/PREACT/template-csf/stories => frameworks/preact}/Welcome.js (94%) delete mode 100644 lib/cli/src/generators/PREACT/template-csf/.storybook/main.js diff --git a/lib/cli/src/generators/PREACT/template-csf/stories/0-Welcome.stories.js b/lib/cli/src/frameworks/preact/0-Welcome.stories.js similarity index 100% rename from lib/cli/src/generators/PREACT/template-csf/stories/0-Welcome.stories.js rename to lib/cli/src/frameworks/preact/0-Welcome.stories.js diff --git a/lib/cli/src/generators/PREACT/template-csf/stories/1-Button.stories.js b/lib/cli/src/frameworks/preact/1-Button.stories.js similarity index 100% rename from lib/cli/src/generators/PREACT/template-csf/stories/1-Button.stories.js rename to lib/cli/src/frameworks/preact/1-Button.stories.js diff --git a/lib/cli/src/generators/PREACT/template-csf/stories/Button.js b/lib/cli/src/frameworks/preact/Button.js similarity index 74% rename from lib/cli/src/generators/PREACT/template-csf/stories/Button.js rename to lib/cli/src/frameworks/preact/Button.js index 2a3546d48c5d..698f9d881933 100644 --- a/lib/cli/src/generators/PREACT/template-csf/stories/Button.js +++ b/lib/cli/src/frameworks/preact/Button.js @@ -1,5 +1,5 @@ /** @jsx h */ -/* eslint-disable react/no-unknown-property, react/prop-types */ +/* eslint-disable react/no-unknown-property */ import { h } from 'preact'; const Button = ({ children, ...props }) => ( diff --git a/lib/cli/src/generators/PREACT/template-csf/stories/Welcome.js b/lib/cli/src/frameworks/preact/Welcome.js similarity index 94% rename from lib/cli/src/generators/PREACT/template-csf/stories/Welcome.js rename to lib/cli/src/frameworks/preact/Welcome.js index b4ce7052f260..7a47695cf121 100644 --- a/lib/cli/src/generators/PREACT/template-csf/stories/Welcome.js +++ b/lib/cli/src/frameworks/preact/Welcome.js @@ -13,7 +13,6 @@ const Main = (props) => ( /> ); -// eslint-disable-next-line react/prop-types const Title = ({ children, ...props }) =>

{children}

; const Note = (props) => ( @@ -40,7 +39,6 @@ const InlineCode = (props) => ( /> ); -// eslint-disable-next-line react/prop-types const Link = ({ children, href, ...props }) => ( ( ); -// eslint-disable-next-line react/prop-types const NavButton = ({ children, ...props }) => ( ); -/* eslint-disable-next-line react/prop-types */ const Welcome = ({ showApp }) => (
Welcome to storybook diff --git a/lib/cli/src/generators/PREACT/index.ts b/lib/cli/src/generators/PREACT/index.ts index 4a4b9dba7aa7..edecc76690fb 100644 --- a/lib/cli/src/generators/PREACT/index.ts +++ b/lib/cli/src/generators/PREACT/index.ts @@ -1,44 +1,10 @@ -import { - getVersions, - retrievePackageJson, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; -import { Generator } from '../generator'; +import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; -const generator: Generator = async (npmOptions, { storyFormat }) => { - const [storybookVersion, actionsVersion, linksVersion, addonsVersion] = await getVersions( - npmOptions, - '@storybook/preact', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addons' - ); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [ - `@storybook/preact@${storybookVersion}`, - `@storybook/addon-actions@${actionsVersion}`, - `@storybook/addon-links@${linksVersion}`, - `@storybook/addons@${addonsVersion}`, - ...babelDependencies, - ]); +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'preact', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + }); }; export default generator; diff --git a/lib/cli/src/generators/PREACT/template-csf/.storybook/main.js b/lib/cli/src/generators/PREACT/template-csf/.storybook/main.js deleted file mode 100644 index 3036098563cc..000000000000 --- a/lib/cli/src/generators/PREACT/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; From fb3845de7f1e43f04b1b7996e2faf14e9b6b1e0b Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 22:33:16 +0200 Subject: [PATCH 15/47] Move rax --- .../rax}/0-Welcome.stories.js | 0 .../rax}/1-Button.stories.js | 0 .../stories => frameworks/rax}/Welcome.js | 1 - lib/cli/src/generators/RAX/index.ts | 49 ++++--------------- .../RAX/template-csf/.storybook/main.js | 4 -- 5 files changed, 9 insertions(+), 45 deletions(-) rename lib/cli/src/{generators/RAX/template-csf/stories => frameworks/rax}/0-Welcome.stories.js (100%) rename lib/cli/src/{generators/RAX/template-csf/stories => frameworks/rax}/1-Button.stories.js (100%) rename lib/cli/src/{generators/RAX/template-csf/stories => frameworks/rax}/Welcome.js (97%) delete mode 100644 lib/cli/src/generators/RAX/template-csf/.storybook/main.js diff --git a/lib/cli/src/generators/RAX/template-csf/stories/0-Welcome.stories.js b/lib/cli/src/frameworks/rax/0-Welcome.stories.js similarity index 100% rename from lib/cli/src/generators/RAX/template-csf/stories/0-Welcome.stories.js rename to lib/cli/src/frameworks/rax/0-Welcome.stories.js diff --git a/lib/cli/src/generators/RAX/template-csf/stories/1-Button.stories.js b/lib/cli/src/frameworks/rax/1-Button.stories.js similarity index 100% rename from lib/cli/src/generators/RAX/template-csf/stories/1-Button.stories.js rename to lib/cli/src/frameworks/rax/1-Button.stories.js diff --git a/lib/cli/src/generators/RAX/template-csf/stories/Welcome.js b/lib/cli/src/frameworks/rax/Welcome.js similarity index 97% rename from lib/cli/src/generators/RAX/template-csf/stories/Welcome.js rename to lib/cli/src/frameworks/rax/Welcome.js index 340844748cd3..6995d7de5947 100644 --- a/lib/cli/src/generators/RAX/template-csf/stories/Welcome.js +++ b/lib/cli/src/frameworks/rax/Welcome.js @@ -1,4 +1,3 @@ -/* eslint-disable react/prop-types, jsx-a11y/anchor-is-valid */ import { createElement } from 'rax'; import View from 'rax-view'; import Text from 'rax-text'; diff --git a/lib/cli/src/generators/RAX/index.ts b/lib/cli/src/generators/RAX/index.ts index 8e7e2f12e049..b1854a1a6afb 100644 --- a/lib/cli/src/generators/RAX/index.ts +++ b/lib/cli/src/generators/RAX/index.ts @@ -1,31 +1,9 @@ -import { - getVersions, - retrievePackageJson, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; -import { Generator } from '../generator'; - -const generator: Generator = async (npmOptions, { storyFormat }) => { - const [ - storybookVersion, - actionsVersion, - linksVersion, - addonsVersion, - latestRaxVersion, - ] = await getVersions( - npmOptions, - '@storybook/rax', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addons', - 'rax' - ); - - copyTemplate(__dirname, storyFormat); +import { getVersions, retrievePackageJson, writePackageJson } from '../../helpers'; +import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; +const generator: Generator = async (npmOptions, options) => { + const [latestRaxVersion] = await getVersions(npmOptions, 'rax'); const packageJson = await retrievePackageJson(); packageJson.dependencies = packageJson.dependencies || {}; @@ -42,21 +20,12 @@ const generator: Generator = async (npmOptions, { storyFormat }) => { packageJson.dependencies['rax-text'] = packageJson.dependencies['rax-text'] || raxVersion; packageJson.dependencies['rax-view'] = packageJson.dependencies['rax-view'] || raxVersion; - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - writePackageJson(packageJson); - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [ - `@storybook/rax@${storybookVersion}`, - `@storybook/addon-actions@${actionsVersion}`, - `@storybook/addon-links@${linksVersion}`, - `@storybook/addons@${addonsVersion}`, - ...babelDependencies, - ]); + baseGenerator(npmOptions, options, 'rax', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + extraPackages: ['rax'], + }); }; export default generator; diff --git a/lib/cli/src/generators/RAX/template-csf/.storybook/main.js b/lib/cli/src/generators/RAX/template-csf/.storybook/main.js deleted file mode 100644 index 3036098563cc..000000000000 --- a/lib/cli/src/generators/RAX/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; From 5ba3eef437451f9c3caafc7593699f0fc6760e2c Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 22:37:21 +0200 Subject: [PATCH 16/47] Move riot --- .../riot}/0-Welcome.stories.js | 0 .../riot}/1-Button.stories.js | 0 .../stories => frameworks/riot}/MyButton.tag | 0 .../stories => frameworks/riot}/Welcome.tag | 0 lib/cli/src/generators/RIOT/index.ts | 62 +++---------------- .../RIOT/template-csf/.storybook/main.js | 4 -- 6 files changed, 8 insertions(+), 58 deletions(-) rename lib/cli/src/{generators/RIOT/template-csf/stories => frameworks/riot}/0-Welcome.stories.js (100%) rename lib/cli/src/{generators/RIOT/template-csf/stories => frameworks/riot}/1-Button.stories.js (100%) rename lib/cli/src/{generators/RIOT/template-csf/stories => frameworks/riot}/MyButton.tag (100%) rename lib/cli/src/{generators/RIOT/template-csf/stories => frameworks/riot}/Welcome.tag (100%) delete mode 100644 lib/cli/src/generators/RIOT/template-csf/.storybook/main.js diff --git a/lib/cli/src/generators/RIOT/template-csf/stories/0-Welcome.stories.js b/lib/cli/src/frameworks/riot/0-Welcome.stories.js similarity index 100% rename from lib/cli/src/generators/RIOT/template-csf/stories/0-Welcome.stories.js rename to lib/cli/src/frameworks/riot/0-Welcome.stories.js diff --git a/lib/cli/src/generators/RIOT/template-csf/stories/1-Button.stories.js b/lib/cli/src/frameworks/riot/1-Button.stories.js similarity index 100% rename from lib/cli/src/generators/RIOT/template-csf/stories/1-Button.stories.js rename to lib/cli/src/frameworks/riot/1-Button.stories.js diff --git a/lib/cli/src/generators/RIOT/template-csf/stories/MyButton.tag b/lib/cli/src/frameworks/riot/MyButton.tag similarity index 100% rename from lib/cli/src/generators/RIOT/template-csf/stories/MyButton.tag rename to lib/cli/src/frameworks/riot/MyButton.tag diff --git a/lib/cli/src/generators/RIOT/template-csf/stories/Welcome.tag b/lib/cli/src/frameworks/riot/Welcome.tag similarity index 100% rename from lib/cli/src/generators/RIOT/template-csf/stories/Welcome.tag rename to lib/cli/src/frameworks/riot/Welcome.tag diff --git a/lib/cli/src/generators/RIOT/index.ts b/lib/cli/src/generators/RIOT/index.ts index 12a27c812cd0..f9986bb8da87 100644 --- a/lib/cli/src/generators/RIOT/index.ts +++ b/lib/cli/src/generators/RIOT/index.ts @@ -1,57 +1,11 @@ -import { - getVersions, - retrievePackageJson, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; -import { Generator } from '../generator'; - -const generator: Generator = async (npmOptions, { storyFormat }) => { - const [ - storybookVersion, - actionsVersion, - linksVersion, - addonsVersion, - tagLoaderVersion, - ] = await getVersions( - npmOptions, - '@storybook/riot', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addons', - 'riot-tag-loader' - ); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - const dependencies = [ - `@storybook/riot@${storybookVersion}`, - `@storybook/addon-actions@${actionsVersion}`, - `@storybook/addon-links@${linksVersion}`, - `@storybook/addons@${addonsVersion}`, - ]; - if ( - !packageJson.devDependencies['riot-tag-loader'] && - !packageJson.dependencies['riot-tag-loader'] - ) - dependencies.push(`riot-tag-loader@${tagLoaderVersion}`); - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [...dependencies, ...babelDependencies]); +import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; + +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'riot', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + extraPackages: ['riot-tag-loader'], + }); }; export default generator; diff --git a/lib/cli/src/generators/RIOT/template-csf/.storybook/main.js b/lib/cli/src/generators/RIOT/template-csf/.storybook/main.js deleted file mode 100644 index 3036098563cc..000000000000 --- a/lib/cli/src/generators/RIOT/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; From ba37d85223d2563ef651c27089fffe43a826c831 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 22:37:38 +0200 Subject: [PATCH 17/47] Move svelte --- .../svelte}/0-welcome.stories.js | 0 .../svelte}/1-button.stories.js | 0 .../svelte}/button.svelte | 0 .../svelte}/welcome.svelte | 0 lib/cli/src/generators/SVELTE/index.ts | 60 +++---------------- .../SVELTE/template-csf/.storybook/main.js | 4 -- 6 files changed, 8 insertions(+), 56 deletions(-) rename lib/cli/src/{generators/SVELTE/template-csf/stories => frameworks/svelte}/0-welcome.stories.js (100%) rename lib/cli/src/{generators/SVELTE/template-csf/stories => frameworks/svelte}/1-button.stories.js (100%) rename lib/cli/src/{generators/SVELTE/template-csf/stories => frameworks/svelte}/button.svelte (100%) rename lib/cli/src/{generators/SVELTE/template-csf/stories => frameworks/svelte}/welcome.svelte (100%) delete mode 100644 lib/cli/src/generators/SVELTE/template-csf/.storybook/main.js diff --git a/lib/cli/src/generators/SVELTE/template-csf/stories/0-welcome.stories.js b/lib/cli/src/frameworks/svelte/0-welcome.stories.js similarity index 100% rename from lib/cli/src/generators/SVELTE/template-csf/stories/0-welcome.stories.js rename to lib/cli/src/frameworks/svelte/0-welcome.stories.js diff --git a/lib/cli/src/generators/SVELTE/template-csf/stories/1-button.stories.js b/lib/cli/src/frameworks/svelte/1-button.stories.js similarity index 100% rename from lib/cli/src/generators/SVELTE/template-csf/stories/1-button.stories.js rename to lib/cli/src/frameworks/svelte/1-button.stories.js diff --git a/lib/cli/src/generators/SVELTE/template-csf/stories/button.svelte b/lib/cli/src/frameworks/svelte/button.svelte similarity index 100% rename from lib/cli/src/generators/SVELTE/template-csf/stories/button.svelte rename to lib/cli/src/frameworks/svelte/button.svelte diff --git a/lib/cli/src/generators/SVELTE/template-csf/stories/welcome.svelte b/lib/cli/src/frameworks/svelte/welcome.svelte similarity index 100% rename from lib/cli/src/generators/SVELTE/template-csf/stories/welcome.svelte rename to lib/cli/src/frameworks/svelte/welcome.svelte diff --git a/lib/cli/src/generators/SVELTE/index.ts b/lib/cli/src/generators/SVELTE/index.ts index bb7bb6007bdf..3a5a2547678b 100644 --- a/lib/cli/src/generators/SVELTE/index.ts +++ b/lib/cli/src/generators/SVELTE/index.ts @@ -1,55 +1,11 @@ -import { - getVersions, - retrievePackageJson, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; -import { Generator } from '../generator'; - -const generator: Generator = async (npmOptions, { storyFormat }) => { - const [ - storybookVersion, - actionsVersion, - linksVersion, - addonsVersion, - svelte, - svelteLoader, - ] = await getVersions( - npmOptions, - '@storybook/svelte', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addons', - 'svelte', - 'svelte-loader' - ); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [ - `@storybook/svelte@${storybookVersion}`, - `@storybook/addon-actions@${actionsVersion}`, - `@storybook/addon-links@${linksVersion}`, - `@storybook/addons@${addonsVersion}`, - `svelte@${svelte}`, - `svelte-loader@${svelteLoader}`, - ...babelDependencies, - ]); +import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; + +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'svelte', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + extraPackages: ['svelte', 'svelte-loader'], + }); }; export default generator; diff --git a/lib/cli/src/generators/SVELTE/template-csf/.storybook/main.js b/lib/cli/src/generators/SVELTE/template-csf/.storybook/main.js deleted file mode 100644 index 3036098563cc..000000000000 --- a/lib/cli/src/generators/SVELTE/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; From 472222026ff01e4ef22c6af644532116c36afe48 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 22:53:42 +0200 Subject: [PATCH 18/47] Move marko and cleanup --- .../marko/0-Welcome.stories.js} | 2 +- lib/cli/src/frameworks/marko/welcome.marko | 37 +++++++++++++++ lib/cli/src/generators/MARKO/index.ts | 44 +++--------------- .../MARKO/template-csf/.storybook/main.js | 4 -- .../stories/components/welcome/index.marko | 46 ------------------- 5 files changed, 44 insertions(+), 89 deletions(-) rename lib/cli/src/{generators/MARKO/template-csf/stories/index.stories.js => frameworks/marko/0-Welcome.stories.js} (68%) create mode 100644 lib/cli/src/frameworks/marko/welcome.marko delete mode 100644 lib/cli/src/generators/MARKO/template-csf/.storybook/main.js delete mode 100644 lib/cli/src/generators/MARKO/template-csf/stories/components/welcome/index.marko diff --git a/lib/cli/src/generators/MARKO/template-csf/stories/index.stories.js b/lib/cli/src/frameworks/marko/0-Welcome.stories.js similarity index 68% rename from lib/cli/src/generators/MARKO/template-csf/stories/index.stories.js rename to lib/cli/src/frameworks/marko/0-Welcome.stories.js index 41fcb8b4fc12..a0cba3b6d1b0 100644 --- a/lib/cli/src/generators/MARKO/template-csf/stories/index.stories.js +++ b/lib/cli/src/frameworks/marko/0-Welcome.stories.js @@ -1,4 +1,4 @@ -import Welcome from './components/welcome/index.marko'; +import Welcome from './welcome.marko'; export default { title: 'Welcome', diff --git a/lib/cli/src/frameworks/marko/welcome.marko b/lib/cli/src/frameworks/marko/welcome.marko new file mode 100644 index 000000000000..74f9e032ac03 --- /dev/null +++ b/lib/cli/src/frameworks/marko/welcome.marko @@ -0,0 +1,37 @@ + +class { + onCreate() {} +} + +style { + #app { + font-family: 'Avenir', Helvetica, Arial, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-align: center; + color: #2c3e50; + margin-top: 60px; + } + + h1, h2 { + font-weight: normal; + } + + ul { + list-style-type: none; + padding: 0; + } + + li { + display: inline-block; + margin: 0 10px; + } + + a { + color: #42b983; + } +} + + +

Welcome to storybook

+ diff --git a/lib/cli/src/generators/MARKO/index.ts b/lib/cli/src/generators/MARKO/index.ts index 5220b6a1d81d..3c83040bdb61 100644 --- a/lib/cli/src/generators/MARKO/index.ts +++ b/lib/cli/src/generators/MARKO/index.ts @@ -1,42 +1,10 @@ -import { - getVersions, - retrievePackageJson, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; -import { Generator } from '../generator'; +import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; -const generator: Generator = async (npmOptions, { storyFormat }) => { - const [storybookVersion, addonActionVersion, addonKnobsVersion] = await getVersions( - npmOptions, - '@storybook/marko', - '@storybook/addon-actions', - '@storybook/addon-knobs' - ); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [ - `@storybook/marko@${storybookVersion}`, - `@storybook/addon-actions@${addonActionVersion}`, - `@storybook/addon-knobs@${addonKnobsVersion}`, - ...babelDependencies, - ]); +const generator: Generator = async (npmOptions, options) => { + await baseGenerator(npmOptions, options, 'marko', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + }); }; export default generator; diff --git a/lib/cli/src/generators/MARKO/template-csf/.storybook/main.js b/lib/cli/src/generators/MARKO/template-csf/.storybook/main.js deleted file mode 100644 index c6a06f1fbc34..000000000000 --- a/lib/cli/src/generators/MARKO/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-knobs'], -}; diff --git a/lib/cli/src/generators/MARKO/template-csf/stories/components/welcome/index.marko b/lib/cli/src/generators/MARKO/template-csf/stories/components/welcome/index.marko deleted file mode 100644 index 272d7211f2bf..000000000000 --- a/lib/cli/src/generators/MARKO/template-csf/stories/components/welcome/index.marko +++ /dev/null @@ -1,46 +0,0 @@ - -class { - onCreate() {} -} - -style { - #app { - font-family: 'Avenir', Helvetica, Arial, sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-align: center; - color: #2c3e50; - margin-top: 60px; - } - - .logo { - background-image:url('data:image/png;base64,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'); - background-repeat:no-repeat; - display:inline-block; - width: 365px; - height: 200px; - } - - h1, h2 { - font-weight: normal; - } - - ul { - list-style-type: none; - padding: 0; - } - - li { - display: inline-block; - margin: 0 10px; - } - - a { - color: #42b983; - } -} - - -

Welcome to storybook

- - From 0e2f5f6a81bebed55e05e4d9c76eaf10977442bd Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 22:58:40 +0200 Subject: [PATCH 19/47] Move marionette --- .../marionette}/index.stories.js | 4 +- lib/cli/src/generators/MARIONETTE/index.ts | 37 +++---------------- .../MARIONETTE/template/.storybook/main.js | 4 -- 3 files changed, 8 insertions(+), 37 deletions(-) rename lib/cli/src/{generators/MARIONETTE/template/stories => frameworks/marionette}/index.stories.js (83%) delete mode 100644 lib/cli/src/generators/MARIONETTE/template/.storybook/main.js diff --git a/lib/cli/src/generators/MARIONETTE/template/stories/index.stories.js b/lib/cli/src/frameworks/marionette/index.stories.js similarity index 83% rename from lib/cli/src/generators/MARIONETTE/template/stories/index.stories.js rename to lib/cli/src/frameworks/marionette/index.stories.js index 32f924b93608..a21a55194725 100644 --- a/lib/cli/src/generators/MARIONETTE/template/stories/index.stories.js +++ b/lib/cli/src/frameworks/marionette/index.stories.js @@ -1,11 +1,11 @@ -import Marionette from 'backbone.marionette'; +import { View } from 'backbone.marionette'; import { storiesOf } from '@storybook/marionette'; storiesOf('Demo', module).add( 'button', () => - new Marionette.View({ + new View({ template: () => '', ui: { button: '#my_button', diff --git a/lib/cli/src/generators/MARIONETTE/index.ts b/lib/cli/src/generators/MARIONETTE/index.ts index a55e1f36aab0..6f030e5f7856 100644 --- a/lib/cli/src/generators/MARIONETTE/index.ts +++ b/lib/cli/src/generators/MARIONETTE/index.ts @@ -1,35 +1,10 @@ -import fse from 'fs-extra'; -import path from 'path'; -import { - getVersion, - writePackageJson, - getBabelDependencies, - installDependencies, - retrievePackageJson, -} from '../../helpers'; -import { Generator } from '../generator'; +import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; -const generator: Generator = async (npmOptions) => { - const storybookVersion = await getVersion(npmOptions, '@storybook/marionette'); - fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true }); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [ - `@storybook/marionette@${storybookVersion}`, - ...babelDependencies, - ]); +const generator: Generator = async (npmOptions, options) => { + await baseGenerator(npmOptions, options, 'marionette', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + }); }; export default generator; diff --git a/lib/cli/src/generators/MARIONETTE/template/.storybook/main.js b/lib/cli/src/generators/MARIONETTE/template/.storybook/main.js deleted file mode 100644 index a0f65ec500a5..000000000000 --- a/lib/cli/src/generators/MARIONETTE/template/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: '../stories/**/*.stories.js', - addons: ['@storybook/addon-actions', '@storybook/addon-knobs'], -}; From cdea7b95b70ab962c1191c4d4174996d06599d24 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 23:04:58 +0200 Subject: [PATCH 20/47] Move vue --- .../vue}/0-Welcome.stories.js | 0 .../vue}/1-Button.stories.js | 2 +- .../vue/Button.vue} | 0 .../stories => frameworks/vue}/Welcome.vue | 0 lib/cli/src/generators/SFC_VUE/index.ts | 42 +------ .../SFC_VUE/template-csf/.storybook/main.js | 4 - .../SFC_VUE/template-mdx/.storybook/main.js | 4 - .../template-mdx/src/stories/MyButton.vue | 29 ----- .../template-mdx/src/stories/Welcome.vue | 119 ------------------ .../{src => }/stories/0-Welcome.stories.mdx | 0 .../{src => }/stories/1-Button.stories.mdx | 2 +- 11 files changed, 7 insertions(+), 195 deletions(-) rename lib/cli/src/{generators/SFC_VUE/template-csf/src/stories => frameworks/vue}/0-Welcome.stories.js (100%) rename lib/cli/src/{generators/SFC_VUE/template-csf/src/stories => frameworks/vue}/1-Button.stories.js (96%) rename lib/cli/src/{generators/SFC_VUE/template-csf/src/stories/MyButton.vue => frameworks/vue/Button.vue} (100%) rename lib/cli/src/{generators/SFC_VUE/template-csf/src/stories => frameworks/vue}/Welcome.vue (100%) delete mode 100644 lib/cli/src/generators/SFC_VUE/template-csf/.storybook/main.js delete mode 100644 lib/cli/src/generators/SFC_VUE/template-mdx/.storybook/main.js delete mode 100644 lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/MyButton.vue delete mode 100644 lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/Welcome.vue rename lib/cli/src/generators/SFC_VUE/template-mdx/{src => }/stories/0-Welcome.stories.mdx (100%) rename lib/cli/src/generators/SFC_VUE/template-mdx/{src => }/stories/1-Button.stories.mdx (94%) diff --git a/lib/cli/src/generators/SFC_VUE/template-csf/src/stories/0-Welcome.stories.js b/lib/cli/src/frameworks/vue/0-Welcome.stories.js similarity index 100% rename from lib/cli/src/generators/SFC_VUE/template-csf/src/stories/0-Welcome.stories.js rename to lib/cli/src/frameworks/vue/0-Welcome.stories.js diff --git a/lib/cli/src/generators/SFC_VUE/template-csf/src/stories/1-Button.stories.js b/lib/cli/src/frameworks/vue/1-Button.stories.js similarity index 96% rename from lib/cli/src/generators/SFC_VUE/template-csf/src/stories/1-Button.stories.js rename to lib/cli/src/frameworks/vue/1-Button.stories.js index 19f372961463..20fb5fd82f3f 100644 --- a/lib/cli/src/generators/SFC_VUE/template-csf/src/stories/1-Button.stories.js +++ b/lib/cli/src/frameworks/vue/1-Button.stories.js @@ -1,7 +1,7 @@ import { action } from '@storybook/addon-actions'; import { linkTo } from '@storybook/addon-links'; -import MyButton from './MyButton.vue'; +import MyButton from './Button.vue'; export default { title: 'Button', diff --git a/lib/cli/src/generators/SFC_VUE/template-csf/src/stories/MyButton.vue b/lib/cli/src/frameworks/vue/Button.vue similarity index 100% rename from lib/cli/src/generators/SFC_VUE/template-csf/src/stories/MyButton.vue rename to lib/cli/src/frameworks/vue/Button.vue diff --git a/lib/cli/src/generators/SFC_VUE/template-csf/src/stories/Welcome.vue b/lib/cli/src/frameworks/vue/Welcome.vue similarity index 100% rename from lib/cli/src/generators/SFC_VUE/template-csf/src/stories/Welcome.vue rename to lib/cli/src/frameworks/vue/Welcome.vue diff --git a/lib/cli/src/generators/SFC_VUE/index.ts b/lib/cli/src/generators/SFC_VUE/index.ts index 26b6246983e5..a947c486e843 100644 --- a/lib/cli/src/generators/SFC_VUE/index.ts +++ b/lib/cli/src/generators/SFC_VUE/index.ts @@ -1,42 +1,10 @@ -import { - retrievePackageJson, - getVersionedPackages, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; +import baseGenerator, { Generator } from '../generator'; import { StoryFormat } from '../../project_types'; -import { Generator } from '../generator'; -const generator: Generator = async (npmOptions, { storyFormat }) => { - const packages = [ - '@storybook/vue', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addons', - ]; - if (storyFormat === StoryFormat.MDX) { - packages.push('@storybook/addon-docs'); - } - const versionedPackages = await getVersionedPackages(npmOptions, ...packages); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]); +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'vue', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + }); }; export default generator; diff --git a/lib/cli/src/generators/SFC_VUE/template-csf/.storybook/main.js b/lib/cli/src/generators/SFC_VUE/template-csf/.storybook/main.js deleted file mode 100644 index 302586ca4090..000000000000 --- a/lib/cli/src/generators/SFC_VUE/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/SFC_VUE/template-mdx/.storybook/main.js b/lib/cli/src/generators/SFC_VUE/template-mdx/.storybook/main.js deleted file mode 100644 index a956ae0c91da..000000000000 --- a/lib/cli/src/generators/SFC_VUE/template-mdx/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.(js|mdx)'], - addons: ['@storybook/addon-docs', '@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/MyButton.vue b/lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/MyButton.vue deleted file mode 100644 index 4ad8ff85f08c..000000000000 --- a/lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/MyButton.vue +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/Welcome.vue b/lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/Welcome.vue deleted file mode 100644 index bfb932da3d2a..000000000000 --- a/lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/Welcome.vue +++ /dev/null @@ -1,119 +0,0 @@ - - - - - diff --git a/lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/0-Welcome.stories.mdx b/lib/cli/src/generators/SFC_VUE/template-mdx/stories/0-Welcome.stories.mdx similarity index 100% rename from lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/0-Welcome.stories.mdx rename to lib/cli/src/generators/SFC_VUE/template-mdx/stories/0-Welcome.stories.mdx diff --git a/lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/1-Button.stories.mdx b/lib/cli/src/generators/SFC_VUE/template-mdx/stories/1-Button.stories.mdx similarity index 94% rename from lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/1-Button.stories.mdx rename to lib/cli/src/generators/SFC_VUE/template-mdx/stories/1-Button.stories.mdx index f37647542ac2..8a5b92a8d630 100644 --- a/lib/cli/src/generators/SFC_VUE/template-mdx/src/stories/1-Button.stories.mdx +++ b/lib/cli/src/generators/SFC_VUE/template-mdx/stories/1-Button.stories.mdx @@ -1,7 +1,7 @@ import { Meta, Story } from '@storybook/addon-docs/blocks'; import { action } from '@storybook/addon-actions'; import { linkTo } from '@storybook/addon-links'; -import MyButton from './MyButton.vue'; +import MyButton from './Button.vue'; From 6d3eec2d1c1b892698f57ecfb850f5411fec45e4 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 26 May 2020 23:17:17 +0200 Subject: [PATCH 21/47] Move html --- .../html}/0-Welcome.stories.js | 0 .../html}/1-Button.stories.js | 0 lib/cli/src/generators/HTML/index.ts | 38 +++---------------- .../HTML/template-csf/.storybook/main.js | 4 -- .../HTML/template-mdx/.storybook/main.js | 4 -- 5 files changed, 5 insertions(+), 41 deletions(-) rename lib/cli/src/{generators/HTML/template-csf/stories => frameworks/html}/0-Welcome.stories.js (100%) rename lib/cli/src/{generators/HTML/template-csf/stories => frameworks/html}/1-Button.stories.js (100%) delete mode 100644 lib/cli/src/generators/HTML/template-csf/.storybook/main.js delete mode 100644 lib/cli/src/generators/HTML/template-mdx/.storybook/main.js diff --git a/lib/cli/src/generators/HTML/template-csf/stories/0-Welcome.stories.js b/lib/cli/src/frameworks/html/0-Welcome.stories.js similarity index 100% rename from lib/cli/src/generators/HTML/template-csf/stories/0-Welcome.stories.js rename to lib/cli/src/frameworks/html/0-Welcome.stories.js diff --git a/lib/cli/src/generators/HTML/template-csf/stories/1-Button.stories.js b/lib/cli/src/frameworks/html/1-Button.stories.js similarity index 100% rename from lib/cli/src/generators/HTML/template-csf/stories/1-Button.stories.js rename to lib/cli/src/frameworks/html/1-Button.stories.js diff --git a/lib/cli/src/generators/HTML/index.ts b/lib/cli/src/generators/HTML/index.ts index a11a0bd4321c..519e6880ac07 100755 --- a/lib/cli/src/generators/HTML/index.ts +++ b/lib/cli/src/generators/HTML/index.ts @@ -1,38 +1,10 @@ -import { - retrievePackageJson, - getVersionedPackages, - writePackageJson, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; +import baseGenerator, { Generator } from '../generator'; import { StoryFormat } from '../../project_types'; -import { Generator } from '../generator'; -const generator: Generator = async (npmOptions, { storyFormat }) => { - const packages = ['@storybook/html', '@storybook/addon-actions', '@storybook/addon-links']; - - const versionedPackages = await getVersionedPackages(npmOptions, ...packages); - if (storyFormat === StoryFormat.MDX) { - packages.push('@storybook/addon-docs'); - } - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]); +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'html', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + }); }; export default generator; diff --git a/lib/cli/src/generators/HTML/template-csf/.storybook/main.js b/lib/cli/src/generators/HTML/template-csf/.storybook/main.js deleted file mode 100644 index 3036098563cc..000000000000 --- a/lib/cli/src/generators/HTML/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/HTML/template-mdx/.storybook/main.js b/lib/cli/src/generators/HTML/template-mdx/.storybook/main.js deleted file mode 100644 index be80f95bd994..000000000000 --- a/lib/cli/src/generators/HTML/template-mdx/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.(js|mdx)'], - addons: ['@storybook/addon-docs'], -}; From 6aad11e4a1bd5842bdc1070b9b5bbb6c72e0d3ca Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 28 May 2020 10:17:55 +0200 Subject: [PATCH 22/47] no tabs --- lib/cli/src/frameworks/marko/welcome.marko | 46 +++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/cli/src/frameworks/marko/welcome.marko b/lib/cli/src/frameworks/marko/welcome.marko index 74f9e032ac03..828d359bcc42 100644 --- a/lib/cli/src/frameworks/marko/welcome.marko +++ b/lib/cli/src/frameworks/marko/welcome.marko @@ -1,35 +1,35 @@ class { - onCreate() {} + onCreate() {} } style { - #app { - font-family: 'Avenir', Helvetica, Arial, sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-align: center; - color: #2c3e50; - margin-top: 60px; - } + #app { + font-family: 'Avenir', Helvetica, Arial, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-align: center; + color: #2c3e50; + margin-top: 60px; + } - h1, h2 { - font-weight: normal; - } + h1, h2 { + font-weight: normal; + } - ul { - list-style-type: none; - padding: 0; - } + ul { + list-style-type: none; + padding: 0; + } - li { - display: inline-block; - margin: 0 10px; - } + li { + display: inline-block; + margin: 0 10px; + } - a { - color: #42b983; - } + a { + color: #42b983; + } } From 10dbb81ab91dea464b69b106d865c3f65792d439 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Thu, 28 May 2020 22:43:56 +0200 Subject: [PATCH 23/47] Move WebComponents --- lib/cli/src/.eslintrc.js | 1 + .../web-components}/0-Welcome.stories.js | 0 .../web-components}/1-Button.stories.js | 0 .../src/generators/WEB-COMPONENTS/index.ts | 47 +++---------------- .../.storybook/preview.js | 0 .../template/.storybook/main.js | 4 -- scripts/run-e2e.ts | 5 +- 7 files changed, 11 insertions(+), 46 deletions(-) rename lib/cli/src/{generators/WEB-COMPONENTS/template/stories => frameworks/web-components}/0-Welcome.stories.js (100%) rename lib/cli/src/{generators/WEB-COMPONENTS/template/stories => frameworks/web-components}/1-Button.stories.js (100%) rename lib/cli/src/generators/WEB-COMPONENTS/{template => template-csf}/.storybook/preview.js (100%) delete mode 100644 lib/cli/src/generators/WEB-COMPONENTS/template/.storybook/main.js diff --git a/lib/cli/src/.eslintrc.js b/lib/cli/src/.eslintrc.js index fe5159bc5894..ae114bfdcc2f 100644 --- a/lib/cli/src/.eslintrc.js +++ b/lib/cli/src/.eslintrc.js @@ -13,6 +13,7 @@ module.exports = { 'react/react-in-jsx-scope': ignore, 'import/no-extraneous-dependencies': ignore, 'global-require': ignore, + 'no-redeclare': ignore, }, }, { diff --git a/lib/cli/src/generators/WEB-COMPONENTS/template/stories/0-Welcome.stories.js b/lib/cli/src/frameworks/web-components/0-Welcome.stories.js similarity index 100% rename from lib/cli/src/generators/WEB-COMPONENTS/template/stories/0-Welcome.stories.js rename to lib/cli/src/frameworks/web-components/0-Welcome.stories.js diff --git a/lib/cli/src/generators/WEB-COMPONENTS/template/stories/1-Button.stories.js b/lib/cli/src/frameworks/web-components/1-Button.stories.js similarity index 100% rename from lib/cli/src/generators/WEB-COMPONENTS/template/stories/1-Button.stories.js rename to lib/cli/src/frameworks/web-components/1-Button.stories.js diff --git a/lib/cli/src/generators/WEB-COMPONENTS/index.ts b/lib/cli/src/generators/WEB-COMPONENTS/index.ts index 6884166f964f..24fb41a2e24f 100755 --- a/lib/cli/src/generators/WEB-COMPONENTS/index.ts +++ b/lib/cli/src/generators/WEB-COMPONENTS/index.ts @@ -1,45 +1,10 @@ -import fse from 'fs-extra'; -import path from 'path'; -import { - getVersionedPackages, - retrievePackageJson, - writePackageJson, - getBabelDependencies, - installDependencies, -} from '../../helpers'; -import { StoryFormat } from '../../project_types'; -import { Generator } from '../generator'; +import baseGenerator, { Generator } from '../generator'; -const generator: Generator = async (npmOptions, { storyFormat }) => { - const packages = [ - '@storybook/web-components', - '@storybook/addon-actions', - '@storybook/addon-links', - 'lit-html', - ]; - - const versionedPackages = await getVersionedPackages(npmOptions, ...packages); - - fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true }); - - if (storyFormat === StoryFormat.MDX) { - // TODO: handle adding of docs mode - } - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]); +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'web-components', { + dirname: __dirname, + extraPackages: ['lit-html'], + }); }; export default generator; diff --git a/lib/cli/src/generators/WEB-COMPONENTS/template/.storybook/preview.js b/lib/cli/src/generators/WEB-COMPONENTS/template-csf/.storybook/preview.js similarity index 100% rename from lib/cli/src/generators/WEB-COMPONENTS/template/.storybook/preview.js rename to lib/cli/src/generators/WEB-COMPONENTS/template-csf/.storybook/preview.js diff --git a/lib/cli/src/generators/WEB-COMPONENTS/template/.storybook/main.js b/lib/cli/src/generators/WEB-COMPONENTS/template/.storybook/main.js deleted file mode 100644 index 3036098563cc..000000000000 --- a/lib/cli/src/generators/WEB-COMPONENTS/template/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/scripts/run-e2e.ts b/scripts/run-e2e.ts index 40e510297d6b..98ed6ca2a9e4 100644 --- a/scripts/run-e2e.ts +++ b/scripts/run-e2e.ts @@ -85,7 +85,10 @@ const initStorybook = async ({ cwd, autoDetect = true, name }: Options) => { logger.info(`🎨 Initializing Storybook with @storybook/cli`); try { const type = autoDetect ? '' : `--type ${name}`; - await exec(`npx -p @storybook/cli sb init --skip-install --yes ${type}`, { cwd }); + await exec(`node ../../storybook/lib/cli/dist/generate.js init --skip-install --yes ${type}`, { + cwd, + }); + // await exec(`npx -p @storybook/cli sb init --skip-install --yes ${type}`, { cwd }); } catch (e) { logger.error(`🚨 Storybook initialization failed`); throw e; From 6a29fb0e2e88924751ac8ef44523e31f36004d54 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Thu, 28 May 2020 23:23:18 +0200 Subject: [PATCH 24/47] Move react-native --- lib/cli/src/generators/REACT_NATIVE/index.ts | 73 +++++--------------- lib/cli/src/generators/generator.ts | 26 ++++--- 2 files changed, 36 insertions(+), 63 deletions(-) diff --git a/lib/cli/src/generators/REACT_NATIVE/index.ts b/lib/cli/src/generators/REACT_NATIVE/index.ts index f69c29ec9a98..8dbe9ae44505 100644 --- a/lib/cli/src/generators/REACT_NATIVE/index.ts +++ b/lib/cli/src/generators/REACT_NATIVE/index.ts @@ -1,32 +1,14 @@ import shell from 'shelljs'; import chalk from 'chalk'; -import { - getVersions, - retrievePackageJson, - writePackageJson, - paddedLog, - getBabelDependencies, - installDependencies, - copyTemplate, -} from '../../helpers'; +import { retrievePackageJson, paddedLog } from '../../helpers'; import { NpmOptions } from '../../NpmOptions'; -import { GeneratorOptions } from '../generator'; +import baseGenerator, { GeneratorOptions } from '../generator'; -export default async ( +const generator = async ( npmOptions: NpmOptions, installServer: boolean, - { storyFormat }: GeneratorOptions -) => { - const [storybookVersion, addonsVersion, actionsVersion, linksVersion] = await getVersions( - npmOptions, - '@storybook/react-native', - '@storybook/addons', - '@storybook/addon-actions', - '@storybook/addon-links' - ); - - copyTemplate(__dirname, storyFormat); - + options: GeneratorOptions +): Promise => { // set correct project name on entry files if possible const dirname = shell.ls('-d', 'ios/*.xcodeproj').stdout; @@ -47,35 +29,18 @@ export default async ( const packageJson = await retrievePackageJson(); - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - const devDependencies = [ - `@storybook/react-native@${storybookVersion}`, - `@storybook/addon-actions@${actionsVersion}`, - `@storybook/addon-links@${linksVersion}`, - `@storybook/addons@${addonsVersion}`, - ]; - - if (installServer) { - devDependencies.push(`@storybook/react-native-server@${storybookVersion}`); - } - - if (!packageJson.dependencies['react-dom'] && !packageJson.devDependencies['react-dom']) { - if (packageJson.dependencies.react) { - const reactVersion = packageJson.dependencies.react; - devDependencies.push(`react-dom@${reactVersion}`); - } - } - - if (installServer) { - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 7007'; - } - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [...devDependencies, ...babelDependencies]); + const missingReactDom = + !packageJson.dependencies['react-dom'] && !packageJson.devDependencies['react-dom']; + const reactVersion = packageJson.dependencies.react; + + await baseGenerator(npmOptions, options, 'react-native', { + extraPackages: [ + missingReactDom && reactVersion && `react-dom@${reactVersion}`, + installServer && '@storybook/react-native-server', + ].filter(Boolean), + addScripts: installServer, + addComponents: false, // We copy template-csf as it's wrapped in a storybook folder + }); }; + +export default generator; diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index 7d3b7a68b3bb..4e6be60e3c04 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -21,6 +21,8 @@ export interface FrameworkOptions { extraAddons?: string[]; dirname?: string; staticDir?: string; + addScripts?: boolean; + addComponents?: boolean; } export type Generator = (npmOptions: NpmOptions, options: GeneratorOptions) => Promise; @@ -30,6 +32,8 @@ const defaultOptions: FrameworkOptions = { extraAddons: [], dirname: __dirname, staticDir: undefined, + addScripts: true, + addComponents: true, }; const generator = async ( npmOptions: NpmOptions, @@ -37,7 +41,10 @@ const generator = async ( framework: SupportedFrameworks, options: FrameworkOptions = defaultOptions ) => { - const { extraAddons, extraPackages, dirname, staticDir } = { ...defaultOptions, ...options }; + const { extraAddons, extraPackages, dirname, staticDir, addScripts, addComponents } = { + ...defaultOptions, + ...options, + }; const packages = [ `@storybook/${framework}`, '@storybook/addon-essentials', @@ -49,18 +56,19 @@ const generator = async ( const versionedPackages = await getVersionedPackages(npmOptions, ...packages); configure(extraAddons); - copyComponents(framework, language); + if (addComponents) { + copyComponents(framework, language); + } copyTemplate(dirname || __dirname, storyFormat); const packageJson = await retrievePackageJson(); - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - const staticParameter = staticDir ? `-s ${staticDir}` : ''; - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = `start-storybook -p 6006 ${staticParameter}`.trim(); - packageJson.scripts['build-storybook'] = `build-storybook ${staticParameter}`.trim(); + if (addScripts) { + const staticParameter = staticDir ? `-s ${staticDir}` : ''; + packageJson.scripts = packageJson.scripts || {}; + packageJson.scripts.storybook = `start-storybook -p 6006 ${staticParameter}`.trim(); + packageJson.scripts['build-storybook'] = `build-storybook ${staticParameter}`.trim(); + } writePackageJson(packageJson); From 15f14a3ec34a872667624c50ba33c182714bb509 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Thu, 28 May 2020 23:30:44 +0200 Subject: [PATCH 25/47] Move & clean aurelia --- app/aurelia/src/demo/index.ts | 2 - .../aurelia}/0-Welcome.stories.ts | 2 +- .../aurelia}/1-Button.stories.ts | 2 +- .../cli/src/frameworks/aurelia}/button.ts | 0 .../cli/src/frameworks/aurelia}/welcome.ts | 0 lib/cli/src/generators/AURELIA/index.ts | 46 +++---------------- .../AURELIA/template-csf/.storybook/main.js | 4 -- .../AURELIA/template-mdx/.storybook/main.js | 4 -- .../src/stories/0-Welcome.stories.mdx | 2 +- .../src/stories/1-Button.stories.mdx | 2 +- 10 files changed, 11 insertions(+), 53 deletions(-) delete mode 100644 app/aurelia/src/demo/index.ts rename lib/cli/src/{generators/AURELIA/template-csf/src/stories => frameworks/aurelia}/0-Welcome.stories.ts (77%) rename lib/cli/src/{generators/AURELIA/template-csf/src/stories => frameworks/aurelia}/1-Button.stories.ts (94%) rename {app/aurelia/src/demo => lib/cli/src/frameworks/aurelia}/button.ts (100%) rename {app/aurelia/src/demo => lib/cli/src/frameworks/aurelia}/welcome.ts (100%) delete mode 100644 lib/cli/src/generators/AURELIA/template-csf/.storybook/main.js delete mode 100644 lib/cli/src/generators/AURELIA/template-mdx/.storybook/main.js diff --git a/app/aurelia/src/demo/index.ts b/app/aurelia/src/demo/index.ts deleted file mode 100644 index 9463e32d9b59..000000000000 --- a/app/aurelia/src/demo/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { default as Button } from './button'; -export { default as Welcome } from './welcome'; diff --git a/lib/cli/src/generators/AURELIA/template-csf/src/stories/0-Welcome.stories.ts b/lib/cli/src/frameworks/aurelia/0-Welcome.stories.ts similarity index 77% rename from lib/cli/src/generators/AURELIA/template-csf/src/stories/0-Welcome.stories.ts rename to lib/cli/src/frameworks/aurelia/0-Welcome.stories.ts index 92ddbc26b274..acefc457a070 100644 --- a/lib/cli/src/generators/AURELIA/template-csf/src/stories/0-Welcome.stories.ts +++ b/lib/cli/src/frameworks/aurelia/0-Welcome.stories.ts @@ -1,4 +1,4 @@ -import { Welcome } from '@storybook/aurelia/demo'; +import Welcome from './welcome'; export default { title: 'Welcome', diff --git a/lib/cli/src/generators/AURELIA/template-csf/src/stories/1-Button.stories.ts b/lib/cli/src/frameworks/aurelia/1-Button.stories.ts similarity index 94% rename from lib/cli/src/generators/AURELIA/template-csf/src/stories/1-Button.stories.ts rename to lib/cli/src/frameworks/aurelia/1-Button.stories.ts index fc178de32482..b0bb7cfc9a30 100644 --- a/lib/cli/src/generators/AURELIA/template-csf/src/stories/1-Button.stories.ts +++ b/lib/cli/src/frameworks/aurelia/1-Button.stories.ts @@ -1,7 +1,7 @@ import { action } from '@storybook/addon-actions'; import { linkTo } from '@storybook/addon-links'; -import { Button } from '@storybook/aurelia/demo'; +import Button from './button'; export default { title: 'Button', diff --git a/app/aurelia/src/demo/button.ts b/lib/cli/src/frameworks/aurelia/button.ts similarity index 100% rename from app/aurelia/src/demo/button.ts rename to lib/cli/src/frameworks/aurelia/button.ts diff --git a/app/aurelia/src/demo/welcome.ts b/lib/cli/src/frameworks/aurelia/welcome.ts similarity index 100% rename from app/aurelia/src/demo/welcome.ts rename to lib/cli/src/frameworks/aurelia/welcome.ts diff --git a/lib/cli/src/generators/AURELIA/index.ts b/lib/cli/src/generators/AURELIA/index.ts index 2e8a1e3e091a..36051a82ee74 100644 --- a/lib/cli/src/generators/AURELIA/index.ts +++ b/lib/cli/src/generators/AURELIA/index.ts @@ -1,15 +1,6 @@ -import { - getVersionedPackages, - writePackageJson, - getBabelDependencies, - installDependencies, - getPackageJson, - writeFileAsJson, - copyTemplate, - readFileAsJson, -} from '../../helpers'; -import { Generator } from '../generator'; +import { writeFileAsJson, readFileAsJson } from '../../helpers'; import { StoryFormat } from '../../project_types'; +import baseGenerator, { Generator } from '../generator'; function addStorybookExcludeGlobToTsConfig() { const tsConfigJson = readFileAsJson('tsconfig.json', true); @@ -26,36 +17,13 @@ function addStorybookExcludeGlobToTsConfig() { tsConfigJson.exclude = [...exclude, glob]; writeFileAsJson('tsconfig.json', tsConfigJson); } -const generator: Generator = async (npmOptions, { storyFormat = StoryFormat.CSF }) => { - copyTemplate(__dirname, storyFormat); - const packages = [ - '@storybook/aurelia', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addons', - '@storybook/addon-storysource', - '@storybook/addon-knobs', - '@storybook/addon-options', - '@storybook/addon-a11y', - '@storybook/addon-backgrounds', - 'aurelia', - ]; - if (storyFormat === 'mdx') { - packages.push('@storybook/addon-docs'); - } - - const versionedPackages = await getVersionedPackages(npmOptions, ...packages); - const packageJson = getPackageJson(); - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - writePackageJson(packageJson); +const generator: Generator = async (npmOptions, options) => { addStorybookExcludeGlobToTsConfig(); - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]); + baseGenerator(npmOptions, options, 'aurelia', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + extraPackages: ['aurelia'], + }); }; export default generator; diff --git a/lib/cli/src/generators/AURELIA/template-csf/.storybook/main.js b/lib/cli/src/generators/AURELIA/template-csf/.storybook/main.js deleted file mode 100644 index 16aa97cdc160..000000000000 --- a/lib/cli/src/generators/AURELIA/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.ts'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/AURELIA/template-mdx/.storybook/main.js b/lib/cli/src/generators/AURELIA/template-mdx/.storybook/main.js deleted file mode 100644 index ef8b96bacf01..000000000000 --- a/lib/cli/src/generators/AURELIA/template-mdx/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.(ts|mdx)'], - addons: ['@storybook/addon-docs', '@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/AURELIA/template-mdx/src/stories/0-Welcome.stories.mdx b/lib/cli/src/generators/AURELIA/template-mdx/src/stories/0-Welcome.stories.mdx index 17ad75634de5..531a441afb63 100644 --- a/lib/cli/src/generators/AURELIA/template-mdx/src/stories/0-Welcome.stories.mdx +++ b/lib/cli/src/generators/AURELIA/template-mdx/src/stories/0-Welcome.stories.mdx @@ -1,5 +1,5 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; -import { Welcome } from '@storybook/aurelia/demo'; +import Welcome from './welcome'; diff --git a/lib/cli/src/generators/AURELIA/template-mdx/src/stories/1-Button.stories.mdx b/lib/cli/src/generators/AURELIA/template-mdx/src/stories/1-Button.stories.mdx index 991fc8e92b37..de199019f6c5 100644 --- a/lib/cli/src/generators/AURELIA/template-mdx/src/stories/1-Button.stories.mdx +++ b/lib/cli/src/generators/AURELIA/template-mdx/src/stories/1-Button.stories.mdx @@ -2,7 +2,7 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { action } from '@storybook/addon-actions'; import { linkTo } from '@storybook/addon-links'; -import { Button } from '@storybook/aurelia/demo'; +import Button from './button'; From 5931abc70f6692d3c0e455cbef7bc8b9e8a400ff Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Thu, 28 May 2020 23:40:08 +0200 Subject: [PATCH 26/47] Move and clean Angular --- .../angular}/0-Welcome.stories.ts | 2 +- .../angular}/1-Button.stories.ts | 2 +- .../frameworks/angular}/button.component.ts | 0 .../frameworks/angular}/welcome.component.ts | 0 lib/cli/src/generators/ANGULAR/index.ts | 51 +++---------------- .../ANGULAR/template-csf/.storybook/main.js | 4 -- .../ANGULAR/template-mdx/.storybook/main.js | 4 -- .../src/stories/0-Welcome.stories.mdx | 2 +- .../src/stories/1-Button.stories.mdx | 2 +- 9 files changed, 10 insertions(+), 57 deletions(-) rename lib/cli/src/{generators/ANGULAR/template-csf/src/stories => frameworks/angular}/0-Welcome.stories.ts (77%) rename lib/cli/src/{generators/ANGULAR/template-csf/src/stories => frameworks/angular}/1-Button.stories.ts (94%) rename {app/angular/src/demo => lib/cli/src/frameworks/angular}/button.component.ts (100%) rename {app/angular/src/demo => lib/cli/src/frameworks/angular}/welcome.component.ts (100%) delete mode 100644 lib/cli/src/generators/ANGULAR/template-csf/.storybook/main.js delete mode 100644 lib/cli/src/generators/ANGULAR/template-mdx/.storybook/main.js diff --git a/lib/cli/src/generators/ANGULAR/template-csf/src/stories/0-Welcome.stories.ts b/lib/cli/src/frameworks/angular/0-Welcome.stories.ts similarity index 77% rename from lib/cli/src/generators/ANGULAR/template-csf/src/stories/0-Welcome.stories.ts rename to lib/cli/src/frameworks/angular/0-Welcome.stories.ts index 058c0cc13555..38786fa32607 100644 --- a/lib/cli/src/generators/ANGULAR/template-csf/src/stories/0-Welcome.stories.ts +++ b/lib/cli/src/frameworks/angular/0-Welcome.stories.ts @@ -1,4 +1,4 @@ -import { Welcome } from '@storybook/angular/demo'; +import Welcome from './welcome.component'; export default { title: 'Welcome', diff --git a/lib/cli/src/generators/ANGULAR/template-csf/src/stories/1-Button.stories.ts b/lib/cli/src/frameworks/angular/1-Button.stories.ts similarity index 94% rename from lib/cli/src/generators/ANGULAR/template-csf/src/stories/1-Button.stories.ts rename to lib/cli/src/frameworks/angular/1-Button.stories.ts index 96383ef5d513..7915c779f6cc 100644 --- a/lib/cli/src/generators/ANGULAR/template-csf/src/stories/1-Button.stories.ts +++ b/lib/cli/src/frameworks/angular/1-Button.stories.ts @@ -1,7 +1,7 @@ import { action } from '@storybook/addon-actions'; import { linkTo } from '@storybook/addon-links'; -import { Button } from '@storybook/angular/demo'; +import Button from './button.component'; export default { title: 'Button', diff --git a/app/angular/src/demo/button.component.ts b/lib/cli/src/frameworks/angular/button.component.ts similarity index 100% rename from app/angular/src/demo/button.component.ts rename to lib/cli/src/frameworks/angular/button.component.ts diff --git a/app/angular/src/demo/welcome.component.ts b/lib/cli/src/frameworks/angular/welcome.component.ts similarity index 100% rename from app/angular/src/demo/welcome.component.ts rename to lib/cli/src/frameworks/angular/welcome.component.ts diff --git a/lib/cli/src/generators/ANGULAR/index.ts b/lib/cli/src/generators/ANGULAR/index.ts index f2587a863a8d..3d8a44cbe6f9 100644 --- a/lib/cli/src/generators/ANGULAR/index.ts +++ b/lib/cli/src/generators/ANGULAR/index.ts @@ -5,48 +5,9 @@ import { getAngularAppTsConfigJson, getAngularAppTsConfigPath, } from './angular-helpers'; -import { - retrievePackageJson, - getVersionedPackages, - writePackageJson, - getBabelDependencies, - installDependencies, - writeFileAsJson, - copyTemplate, -} from '../../helpers'; +import { writeFileAsJson } from '../../helpers'; import { StoryFormat } from '../../project_types'; -import { NpmOptions } from '../../NpmOptions'; -import { Generator, GeneratorOptions } from '../generator'; - -async function addDependencies(npmOptions: NpmOptions, { storyFormat }: GeneratorOptions) { - const packages = [ - '@storybook/angular', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addons', - ]; - - if (storyFormat === StoryFormat.MDX) { - packages.push('@storybook/addon-docs'); - } - - const versionedPackages = await getVersionedPackages(npmOptions, ...packages); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - - installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]); -} +import baseGenerator, { Generator } from '../generator'; function editAngularAppTsConfig() { const tsConfigJson = getAngularAppTsConfigJson(); @@ -64,16 +25,16 @@ function editAngularAppTsConfig() { writeFileAsJson(getAngularAppTsConfigPath(), tsConfigJson); } -const generator: Generator = async (npmOptions, { storyFormat, language }) => { +const generator: Generator = async (npmOptions, options) => { if (!isDefaultProjectSet()) { throw new Error( 'Could not find a default project in your Angular workspace.\nSet a defaultProject in your angular.json and re-run the installation.' ); } + baseGenerator(npmOptions, options, 'angular', { + dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, + }); - copyTemplate(__dirname, storyFormat); - - await addDependencies(npmOptions, { storyFormat, language }); editAngularAppTsConfig(); editStorybookTsConfig(path.resolve('./.storybook/tsconfig.json')); }; diff --git a/lib/cli/src/generators/ANGULAR/template-csf/.storybook/main.js b/lib/cli/src/generators/ANGULAR/template-csf/.storybook/main.js deleted file mode 100644 index 16aa97cdc160..000000000000 --- a/lib/cli/src/generators/ANGULAR/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.ts'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/ANGULAR/template-mdx/.storybook/main.js b/lib/cli/src/generators/ANGULAR/template-mdx/.storybook/main.js deleted file mode 100644 index ef8b96bacf01..000000000000 --- a/lib/cli/src/generators/ANGULAR/template-mdx/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.(ts|mdx)'], - addons: ['@storybook/addon-docs', '@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/ANGULAR/template-mdx/src/stories/0-Welcome.stories.mdx b/lib/cli/src/generators/ANGULAR/template-mdx/src/stories/0-Welcome.stories.mdx index 5fc361cd9b67..1abbfd8a65ed 100644 --- a/lib/cli/src/generators/ANGULAR/template-mdx/src/stories/0-Welcome.stories.mdx +++ b/lib/cli/src/generators/ANGULAR/template-mdx/src/stories/0-Welcome.stories.mdx @@ -1,5 +1,5 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; -import { Welcome } from '@storybook/angular/demo'; +import Welcome from './welcome.component'; diff --git a/lib/cli/src/generators/ANGULAR/template-mdx/src/stories/1-Button.stories.mdx b/lib/cli/src/generators/ANGULAR/template-mdx/src/stories/1-Button.stories.mdx index 554bf7dc0dae..d4252b3fcc47 100644 --- a/lib/cli/src/generators/ANGULAR/template-mdx/src/stories/1-Button.stories.mdx +++ b/lib/cli/src/generators/ANGULAR/template-mdx/src/stories/1-Button.stories.mdx @@ -2,7 +2,7 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { action } from '@storybook/addon-actions'; import { linkTo } from '@storybook/addon-links'; -import { Button } from '@storybook/angular/demo'; +import Button from './button.component'; From 29f04737743e46a668f1cba5a74b8f2fbf475559 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Thu, 28 May 2020 23:50:17 +0200 Subject: [PATCH 27/47] Oops --- scripts/run-e2e.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/run-e2e.ts b/scripts/run-e2e.ts index 98ed6ca2a9e4..40e510297d6b 100644 --- a/scripts/run-e2e.ts +++ b/scripts/run-e2e.ts @@ -85,10 +85,7 @@ const initStorybook = async ({ cwd, autoDetect = true, name }: Options) => { logger.info(`🎨 Initializing Storybook with @storybook/cli`); try { const type = autoDetect ? '' : `--type ${name}`; - await exec(`node ../../storybook/lib/cli/dist/generate.js init --skip-install --yes ${type}`, { - cwd, - }); - // await exec(`npx -p @storybook/cli sb init --skip-install --yes ${type}`, { cwd }); + await exec(`npx -p @storybook/cli sb init --skip-install --yes ${type}`, { cwd }); } catch (e) { logger.error(`🚨 Storybook initialization failed`); throw e; From b3a46d8196ab164aaf89b985e0ba6de20a9d37d0 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Fri, 29 May 2020 22:53:14 +0200 Subject: [PATCH 28/47] fix tests --- lib/cli/src/generators/generator.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index 4e6be60e3c04..797ffa1efb44 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -63,6 +63,9 @@ const generator = async ( const packageJson = await retrievePackageJson(); + packageJson.dependencies = packageJson.dependencies || {}; + packageJson.devDependencies = packageJson.devDependencies || {}; + if (addScripts) { const staticParameter = staticDir ? `-s ${staticDir}` : ''; packageJson.scripts = packageJson.scripts || {}; From dde7de421df594a80cc65293b04f0ee0f8b71672 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Fri, 5 Jun 2020 22:46:45 +0200 Subject: [PATCH 29/47] add angular stories back --- app/angular/src/demo/button.component.ts | 26 +++++++++++++++++++++++ app/angular/src/demo/welcome.component.ts | 26 +++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 app/angular/src/demo/button.component.ts create mode 100644 app/angular/src/demo/welcome.component.ts diff --git a/app/angular/src/demo/button.component.ts b/app/angular/src/demo/button.component.ts new file mode 100644 index 000000000000..da804e507b7d --- /dev/null +++ b/app/angular/src/demo/button.component.ts @@ -0,0 +1,26 @@ +import { Component, Input, Output, EventEmitter } from '@angular/core'; + +@Component({ + selector: 'storybook-button-component', + template: ` `, + styles: [ + ` + button { + border: 1px solid #eee; + border-radius: 3px; + background-color: #ffffff; + cursor: pointer; + font-size: 15px; + padding: 3px 10px; + margin: 10px; + } + `, + ], +}) +export default class ButtonComponent { + @Input() + text = ''; + + @Output() + onClick = new EventEmitter(); +} diff --git a/app/angular/src/demo/welcome.component.ts b/app/angular/src/demo/welcome.component.ts new file mode 100644 index 000000000000..da804e507b7d --- /dev/null +++ b/app/angular/src/demo/welcome.component.ts @@ -0,0 +1,26 @@ +import { Component, Input, Output, EventEmitter } from '@angular/core'; + +@Component({ + selector: 'storybook-button-component', + template: ` `, + styles: [ + ` + button { + border: 1px solid #eee; + border-radius: 3px; + background-color: #ffffff; + cursor: pointer; + font-size: 15px; + padding: 3px 10px; + margin: 10px; + } + `, + ], +}) +export default class ButtonComponent { + @Input() + text = ''; + + @Output() + onClick = new EventEmitter(); +} From 4ef5c5523db74e3f7cd2b9d1d54d564ebf1837c5 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Fri, 5 Jun 2020 22:54:40 +0200 Subject: [PATCH 30/47] fix aurelia --- app/aurelia/demo.d.ts | 4 --- app/aurelia/demo.js | 5 ---- .../src/stories/button.ts | 28 +++++++++++++++++++ .../src/stories/mdx.stories.mdx | 12 ++++---- 4 files changed, 33 insertions(+), 16 deletions(-) delete mode 100644 app/aurelia/demo.d.ts delete mode 100644 app/aurelia/demo.js create mode 100644 examples/aurelia-kitchen-sink/src/stories/button.ts diff --git a/app/aurelia/demo.d.ts b/app/aurelia/demo.d.ts deleted file mode 100644 index 0183b7ef451b..000000000000 --- a/app/aurelia/demo.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -declare module '@storybook/aurelia/demo' { - export const Button: any; - export const Welcome: any; -} diff --git a/app/aurelia/demo.js b/app/aurelia/demo.js deleted file mode 100644 index 64bcd548d7e8..000000000000 --- a/app/aurelia/demo.js +++ /dev/null @@ -1,5 +0,0 @@ -/* eslint-disable global-require */ -module.exports = { - Welcome: require('./dist/demo/welcome').default, - Button: require('./dist/demo/button').default, -}; diff --git a/examples/aurelia-kitchen-sink/src/stories/button.ts b/examples/aurelia-kitchen-sink/src/stories/button.ts new file mode 100644 index 000000000000..86cac656b57c --- /dev/null +++ b/examples/aurelia-kitchen-sink/src/stories/button.ts @@ -0,0 +1,28 @@ +import { customElement, bindable } from 'aurelia'; + +@customElement({ + name: 'storybook-button-component', + template: ` + + `, +}) +export default class Button { + @bindable() + text = ''; + + @bindable() + onClick: MouseEvent; +} diff --git a/examples/aurelia-kitchen-sink/src/stories/mdx.stories.mdx b/examples/aurelia-kitchen-sink/src/stories/mdx.stories.mdx index 1d2eebc447a2..cce4f666a6ec 100644 --- a/examples/aurelia-kitchen-sink/src/stories/mdx.stories.mdx +++ b/examples/aurelia-kitchen-sink/src/stories/mdx.stories.mdx @@ -1,10 +1,10 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { CoolButton } from '../cool-button/cool-button'; -import { Button } from '@storybook/aurelia/demo'; import { addComponents } from '@storybook/aurelia'; -import { text, withKnobs, } from '@storybook/addon-knobs'; +import { text, withKnobs } from '@storybook/addon-knobs'; +import Button from './button'; - + # Welcome @@ -15,10 +15,8 @@ This is a test document written in MDX that defines a `CoolButton` story wrapped {{ template: ``, state: { - testText: text('asfdafds', 'asasfdsa') - } + testText: text('asfdafds', 'asasfdsa'), + }, }} - - From 68d66444ab7a7b60869224fb760492c8ad346440 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Fri, 5 Jun 2020 23:17:11 +0200 Subject: [PATCH 31/47] fix welcome story --- app/angular/src/demo/welcome.component.ts | 80 +++++++++++++++++++---- 1 file changed, 66 insertions(+), 14 deletions(-) diff --git a/app/angular/src/demo/welcome.component.ts b/app/angular/src/demo/welcome.component.ts index da804e507b7d..9d97760c1d2c 100644 --- a/app/angular/src/demo/welcome.component.ts +++ b/app/angular/src/demo/welcome.component.ts @@ -1,26 +1,78 @@ -import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { Component, Output, EventEmitter } from '@angular/core'; @Component({ - selector: 'storybook-button-component', - template: ` `, + selector: 'storybook-welcome-component', + template: ` +
+

Welcome to storybook

+

This is a UI component dev environment for your app.

+

+ We've added some basic stories inside the + src/stories directory.
+ A story is a single state of one or more UI components. You can have as many stories as you + want.
+ (Basically a story is like a visual test case.) +

+

+ See these sample + stories for a component + called Button . +

+

+ Just like that, you can add your own components as stories.
+ You can also edit those components and see changes right away.
+ (Try editing the Button stories located at + src/stories/index.js.) +

+

+ Usually we create stories with smaller UI components in the app.
+ Have a look at the + + Writing Stories + + section in our documentation. +

+

+ NOTE:
+ Have a look at the .storybook/webpack.config.js to add + webpack loaders and plugins you are using in this project. +

+
+ `, styles: [ ` - button { - border: 1px solid #eee; - border-radius: 3px; + main { + padding: 15px; + line-height: 1.4; + font-family: 'Helvetica Neue', Helvetica, 'Segoe UI', Arial, freesans, sans-serif; background-color: #ffffff; - cursor: pointer; + } + .note { + opacity: 0.5; + } + .inline-code { font-size: 15px; - padding: 3px 10px; - margin: 10px; + font-weight: 600; + padding: 2px 5px; + border: 1px solid #eae9e9; + border-radius: 4px; + background-color: #f3f2f2; + color: #3a3a3a; + } + a { + color: #1474f3; + text-decoration: none; + border-bottom: 1px solid #1474f3; + padding-bottom: 2px; } `, ], }) -export default class ButtonComponent { - @Input() - text = ''; - +export default class WelcomeComponent { @Output() - onClick = new EventEmitter(); + showApp = new EventEmitter(); } From fde26b373f2ef0f02d4012b144d57ca9029b5db5 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Sat, 6 Jun 2020 10:45:49 +0200 Subject: [PATCH 32/47] remove plugin-external-helpers from fixtures --- lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc | 3 +-- lib/cli/test/fixtures/webpack_react_frozen_lock/package.json | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc b/lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc index e636022c817b..7dd5e9df2340 100644 --- a/lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc +++ b/lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc @@ -1,4 +1,3 @@ { - "presets": ["@babel/preset-react"], - "plugins": ["@babel/plugin-external-helpers"] + "presets": ["@babel/preset-react"] } diff --git a/lib/cli/test/fixtures/webpack_react_frozen_lock/package.json b/lib/cli/test/fixtures/webpack_react_frozen_lock/package.json index 6efbd6282c5f..3ebfc0eed05a 100644 --- a/lib/cli/test/fixtures/webpack_react_frozen_lock/package.json +++ b/lib/cli/test/fixtures/webpack_react_frozen_lock/package.json @@ -12,7 +12,6 @@ }, "devDependencies": { "@babel/core": "^7.3.4", - "@babel/plugin-external-helpers": "7.2.0", "@babel/preset-react": "7.0.0", "babel-core": "^7.0.0-bridge.0", "babel-loader": "^8.0.5", From 6dc85337af52a7cf4641688030c29aa4660b5f25 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Sun, 7 Jun 2020 20:37:36 +0200 Subject: [PATCH 33/47] merge --- .../REACT/template-csf-ts/.storybook/main.js | 4 --- .../src/stories/0-Welcome.stories.tsx | 14 -------- .../src/stories/1-Button.stories.tsx | 34 ------------------- 3 files changed, 52 deletions(-) delete mode 100644 lib/cli/src/generators/REACT/template-csf-ts/.storybook/main.js delete mode 100644 lib/cli/src/generators/REACT/template-csf-ts/src/stories/0-Welcome.stories.tsx delete mode 100644 lib/cli/src/generators/REACT/template-csf-ts/src/stories/1-Button.stories.tsx diff --git a/lib/cli/src/generators/REACT/template-csf-ts/.storybook/main.js b/lib/cli/src/generators/REACT/template-csf-ts/.storybook/main.js deleted file mode 100644 index 523dca65b677..000000000000 --- a/lib/cli/src/generators/REACT/template-csf-ts/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.@(ts|tsx|js|jsx)'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/REACT/template-csf-ts/src/stories/0-Welcome.stories.tsx b/lib/cli/src/generators/REACT/template-csf-ts/src/stories/0-Welcome.stories.tsx deleted file mode 100644 index c76f45f3b4be..000000000000 --- a/lib/cli/src/generators/REACT/template-csf-ts/src/stories/0-Welcome.stories.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react'; -import { linkTo } from '@storybook/addon-links'; -import { Welcome } from '@storybook/react/demo'; - -export default { - title: 'Welcome', - component: Welcome, -}; - -export const ToStorybook = () => ; - -ToStorybook.story = { - name: 'to Storybook', -}; diff --git a/lib/cli/src/generators/REACT/template-csf-ts/src/stories/1-Button.stories.tsx b/lib/cli/src/generators/REACT/template-csf-ts/src/stories/1-Button.stories.tsx deleted file mode 100644 index fdbd42fe76fe..000000000000 --- a/lib/cli/src/generators/REACT/template-csf-ts/src/stories/1-Button.stories.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import React from 'react'; -import { action } from '@storybook/addon-actions'; -import { linkTo } from '@storybook/addon-links'; -import { Button } from '@storybook/react/demo'; - -export default { - title: 'Button', - component: Button, -}; - -export const Text = () => ; - -export const Emoji = () => ( - -); - -Emoji.parameters = { notes: 'My notes on a button with emojis' }; - -export const TextWithAction = () => ( - -); - -TextWithAction.storyName = 'With an action'; -TextWithAction.parameters = { notes: 'My notes on a button with emojis' }; - -export const ButtonWithLinkToAnotherStory = () => ( - -); - -ButtonWithLinkToAnotherStory.storyName = 'button with link to another story'; From 0002cd9924e5ee304a86a0fb5cb4d65333849a9a Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Sun, 7 Jun 2020 22:37:42 +0200 Subject: [PATCH 34/47] fix copy template when needed --- lib/cli/src/generators/ANGULAR/index.ts | 3 ++- lib/cli/src/generators/AURELIA/index.ts | 3 ++- lib/cli/src/generators/EMBER/index.ts | 1 - lib/cli/src/generators/HTML/index.ts | 8 +++++--- lib/cli/src/generators/MARIONETTE/index.ts | 5 +---- lib/cli/src/generators/MARKO/index.ts | 5 +---- lib/cli/src/generators/MITHRIL/index.ts | 5 +---- lib/cli/src/generators/PREACT/index.ts | 5 +---- lib/cli/src/generators/RAX/index.ts | 2 -- lib/cli/src/generators/REACT/index.ts | 8 +++++--- lib/cli/src/generators/REACT_NATIVE/index.ts | 3 ++- lib/cli/src/generators/REACT_SCRIPTS/index.ts | 5 ++++- lib/cli/src/generators/RIOT/index.ts | 1 - lib/cli/src/generators/SFC_VUE/index.ts | 8 +++++--- lib/cli/src/generators/SVELTE/index.ts | 2 -- lib/cli/src/generators/WEB-COMPONENTS/index.ts | 3 +++ lib/cli/src/generators/WEBPACK_REACT/index.ts | 8 +++++--- .../template-csf-ts/.storybook/main.js | 4 ---- .../src/stories/0-Welcome.stories.tsx | 14 -------------- .../src/stories/1-Button.stories.tsx | 18 ------------------ lib/cli/src/generators/generator.ts | 5 ++--- lib/cli/src/helpers.ts | 6 ------ 22 files changed, 39 insertions(+), 83 deletions(-) delete mode 100644 lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/.storybook/main.js delete mode 100644 lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/src/stories/0-Welcome.stories.tsx delete mode 100644 lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/src/stories/1-Button.stories.tsx diff --git a/lib/cli/src/generators/ANGULAR/index.ts b/lib/cli/src/generators/ANGULAR/index.ts index 3d8a44cbe6f9..ca976874feef 100644 --- a/lib/cli/src/generators/ANGULAR/index.ts +++ b/lib/cli/src/generators/ANGULAR/index.ts @@ -5,7 +5,7 @@ import { getAngularAppTsConfigJson, getAngularAppTsConfigPath, } from './angular-helpers'; -import { writeFileAsJson } from '../../helpers'; +import { writeFileAsJson, copyTemplate } from '../../helpers'; import { StoryFormat } from '../../project_types'; import baseGenerator, { Generator } from '../generator'; @@ -34,6 +34,7 @@ const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'angular', { dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, }); + copyTemplate(__dirname, options.storyFormat); editAngularAppTsConfig(); editStorybookTsConfig(path.resolve('./.storybook/tsconfig.json')); diff --git a/lib/cli/src/generators/AURELIA/index.ts b/lib/cli/src/generators/AURELIA/index.ts index 36051a82ee74..b2c8b5c39a7e 100644 --- a/lib/cli/src/generators/AURELIA/index.ts +++ b/lib/cli/src/generators/AURELIA/index.ts @@ -1,4 +1,4 @@ -import { writeFileAsJson, readFileAsJson } from '../../helpers'; +import { writeFileAsJson, readFileAsJson, copyTemplate } from '../../helpers'; import { StoryFormat } from '../../project_types'; import baseGenerator, { Generator } from '../generator'; @@ -24,6 +24,7 @@ const generator: Generator = async (npmOptions, options) => { dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, extraPackages: ['aurelia'], }); + copyTemplate(__dirname, options.storyFormat); }; export default generator; diff --git a/lib/cli/src/generators/EMBER/index.ts b/lib/cli/src/generators/EMBER/index.ts index 5560a8e453b3..f2dcbcfd0433 100644 --- a/lib/cli/src/generators/EMBER/index.ts +++ b/lib/cli/src/generators/EMBER/index.ts @@ -3,7 +3,6 @@ import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'ember', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, extraPackages: [ // babel-plugin-ember-modules-api-polyfill is a peerDep of @storybook/ember 'babel-plugin-ember-modules-api-polyfill', diff --git a/lib/cli/src/generators/HTML/index.ts b/lib/cli/src/generators/HTML/index.ts index 519e6880ac07..ea3ba74c319f 100755 --- a/lib/cli/src/generators/HTML/index.ts +++ b/lib/cli/src/generators/HTML/index.ts @@ -1,10 +1,12 @@ import baseGenerator, { Generator } from '../generator'; import { StoryFormat } from '../../project_types'; +import { copyTemplate } from '../../helpers'; const generator: Generator = async (npmOptions, options) => { - baseGenerator(npmOptions, options, 'html', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, - }); + baseGenerator(npmOptions, options, 'html'); + if (options.storyFormat === StoryFormat.MDX) { + copyTemplate(__dirname, StoryFormat.MDX); + } }; export default generator; diff --git a/lib/cli/src/generators/MARIONETTE/index.ts b/lib/cli/src/generators/MARIONETTE/index.ts index 6f030e5f7856..b75fc68f3699 100644 --- a/lib/cli/src/generators/MARIONETTE/index.ts +++ b/lib/cli/src/generators/MARIONETTE/index.ts @@ -1,10 +1,7 @@ import baseGenerator, { Generator } from '../generator'; -import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { - await baseGenerator(npmOptions, options, 'marionette', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, - }); + await baseGenerator(npmOptions, options, 'marionette'); }; export default generator; diff --git a/lib/cli/src/generators/MARKO/index.ts b/lib/cli/src/generators/MARKO/index.ts index 3c83040bdb61..8a986eb56914 100644 --- a/lib/cli/src/generators/MARKO/index.ts +++ b/lib/cli/src/generators/MARKO/index.ts @@ -1,10 +1,7 @@ import baseGenerator, { Generator } from '../generator'; -import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { - await baseGenerator(npmOptions, options, 'marko', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, - }); + await baseGenerator(npmOptions, options, 'marko'); }; export default generator; diff --git a/lib/cli/src/generators/MITHRIL/index.ts b/lib/cli/src/generators/MITHRIL/index.ts index 5f4f46de1b66..670559b5adba 100644 --- a/lib/cli/src/generators/MITHRIL/index.ts +++ b/lib/cli/src/generators/MITHRIL/index.ts @@ -1,10 +1,7 @@ import baseGenerator, { Generator } from '../generator'; -import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { - baseGenerator(npmOptions, options, 'mithril', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, - }); + baseGenerator(npmOptions, options, 'mithril'); }; export default generator; diff --git a/lib/cli/src/generators/PREACT/index.ts b/lib/cli/src/generators/PREACT/index.ts index edecc76690fb..d600ee291e44 100644 --- a/lib/cli/src/generators/PREACT/index.ts +++ b/lib/cli/src/generators/PREACT/index.ts @@ -1,10 +1,7 @@ import baseGenerator, { Generator } from '../generator'; -import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { - baseGenerator(npmOptions, options, 'preact', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, - }); + baseGenerator(npmOptions, options, 'preact'); }; export default generator; diff --git a/lib/cli/src/generators/RAX/index.ts b/lib/cli/src/generators/RAX/index.ts index b1854a1a6afb..07669769284a 100644 --- a/lib/cli/src/generators/RAX/index.ts +++ b/lib/cli/src/generators/RAX/index.ts @@ -1,6 +1,5 @@ import { getVersions, retrievePackageJson, writePackageJson } from '../../helpers'; import baseGenerator, { Generator } from '../generator'; -import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { const [latestRaxVersion] = await getVersions(npmOptions, 'rax'); @@ -23,7 +22,6 @@ const generator: Generator = async (npmOptions, options) => { writePackageJson(packageJson); baseGenerator(npmOptions, options, 'rax', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, extraPackages: ['rax'], }); }; diff --git a/lib/cli/src/generators/REACT/index.ts b/lib/cli/src/generators/REACT/index.ts index 3d6e7120e850..41f6aaedb6ca 100644 --- a/lib/cli/src/generators/REACT/index.ts +++ b/lib/cli/src/generators/REACT/index.ts @@ -1,10 +1,12 @@ import baseGenerator, { Generator } from '../generator'; import { StoryFormat } from '../../project_types'; +import { copyTemplate } from '../../helpers'; const generator: Generator = async (npmOptions, options) => { - await baseGenerator(npmOptions, options, 'react', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, - }); + await baseGenerator(npmOptions, options, 'react'); + if (options.storyFormat === StoryFormat.MDX) { + copyTemplate(__dirname, StoryFormat.MDX); + } }; export default generator; diff --git a/lib/cli/src/generators/REACT_NATIVE/index.ts b/lib/cli/src/generators/REACT_NATIVE/index.ts index 8dbe9ae44505..1221fcec47e1 100644 --- a/lib/cli/src/generators/REACT_NATIVE/index.ts +++ b/lib/cli/src/generators/REACT_NATIVE/index.ts @@ -1,6 +1,6 @@ import shell from 'shelljs'; import chalk from 'chalk'; -import { retrievePackageJson, paddedLog } from '../../helpers'; +import { retrievePackageJson, paddedLog, copyTemplate } from '../../helpers'; import { NpmOptions } from '../../NpmOptions'; import baseGenerator, { GeneratorOptions } from '../generator'; @@ -41,6 +41,7 @@ const generator = async ( addScripts: installServer, addComponents: false, // We copy template-csf as it's wrapped in a storybook folder }); + copyTemplate(__dirname, options.storyFormat); }; export default generator; diff --git a/lib/cli/src/generators/REACT_SCRIPTS/index.ts b/lib/cli/src/generators/REACT_SCRIPTS/index.ts index 6112ab646032..90250854dca4 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/index.ts +++ b/lib/cli/src/generators/REACT_SCRIPTS/index.ts @@ -2,14 +2,17 @@ import path from 'path'; import fs from 'fs'; import baseGenerator, { Generator } from '../generator'; +import { copyTemplate } from '../../helpers'; import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { await baseGenerator(npmOptions, options, 'react', { extraAddons: ['@storybook/preset-create-react-app'], - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, staticDir: fs.existsSync(path.resolve('./public')) ? 'public' : undefined, }); + if (options.storyFormat === StoryFormat.MDX) { + copyTemplate(__dirname, StoryFormat.MDX); + } }; export default generator; diff --git a/lib/cli/src/generators/RIOT/index.ts b/lib/cli/src/generators/RIOT/index.ts index f9986bb8da87..0b076661013f 100644 --- a/lib/cli/src/generators/RIOT/index.ts +++ b/lib/cli/src/generators/RIOT/index.ts @@ -3,7 +3,6 @@ import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'riot', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, extraPackages: ['riot-tag-loader'], }); }; diff --git a/lib/cli/src/generators/SFC_VUE/index.ts b/lib/cli/src/generators/SFC_VUE/index.ts index a947c486e843..a8f8d021f70b 100644 --- a/lib/cli/src/generators/SFC_VUE/index.ts +++ b/lib/cli/src/generators/SFC_VUE/index.ts @@ -1,10 +1,12 @@ import baseGenerator, { Generator } from '../generator'; import { StoryFormat } from '../../project_types'; +import { copyTemplate } from '../../helpers'; const generator: Generator = async (npmOptions, options) => { - baseGenerator(npmOptions, options, 'vue', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, - }); + baseGenerator(npmOptions, options, 'vue'); + if (options.storyFormat === StoryFormat.MDX) { + copyTemplate(__dirname, StoryFormat.MDX); + } }; export default generator; diff --git a/lib/cli/src/generators/SVELTE/index.ts b/lib/cli/src/generators/SVELTE/index.ts index 3a5a2547678b..d00fe6976db3 100644 --- a/lib/cli/src/generators/SVELTE/index.ts +++ b/lib/cli/src/generators/SVELTE/index.ts @@ -1,9 +1,7 @@ import baseGenerator, { Generator } from '../generator'; -import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'svelte', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, extraPackages: ['svelte', 'svelte-loader'], }); }; diff --git a/lib/cli/src/generators/WEB-COMPONENTS/index.ts b/lib/cli/src/generators/WEB-COMPONENTS/index.ts index 24fb41a2e24f..568297bc9b1c 100755 --- a/lib/cli/src/generators/WEB-COMPONENTS/index.ts +++ b/lib/cli/src/generators/WEB-COMPONENTS/index.ts @@ -1,10 +1,13 @@ import baseGenerator, { Generator } from '../generator'; +import { StoryFormat } from '../../project_types'; +import { copyTemplate } from '../../helpers'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'web-components', { dirname: __dirname, extraPackages: ['lit-html'], }); + copyTemplate(__dirname, StoryFormat.CSF); }; export default generator; diff --git a/lib/cli/src/generators/WEBPACK_REACT/index.ts b/lib/cli/src/generators/WEBPACK_REACT/index.ts index 98bcc8af2986..ba2e379c317e 100644 --- a/lib/cli/src/generators/WEBPACK_REACT/index.ts +++ b/lib/cli/src/generators/WEBPACK_REACT/index.ts @@ -1,10 +1,12 @@ import baseGenerator, { Generator } from '../generator'; import { StoryFormat } from '../../project_types'; +import { copyTemplate } from '../../helpers'; const generator: Generator = async (npmOptions, options) => { - baseGenerator(npmOptions, options, 'react', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, - }); + baseGenerator(npmOptions, options, 'react'); + if (options.storyFormat === StoryFormat.MDX) { + copyTemplate(__dirname, StoryFormat.MDX); + } }; export default generator; diff --git a/lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/.storybook/main.js b/lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/.storybook/main.js deleted file mode 100644 index 523dca65b677..000000000000 --- a/lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../src/**/*.stories.@(ts|tsx|js|jsx)'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/src/stories/0-Welcome.stories.tsx b/lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/src/stories/0-Welcome.stories.tsx deleted file mode 100644 index c76f45f3b4be..000000000000 --- a/lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/src/stories/0-Welcome.stories.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react'; -import { linkTo } from '@storybook/addon-links'; -import { Welcome } from '@storybook/react/demo'; - -export default { - title: 'Welcome', - component: Welcome, -}; - -export const ToStorybook = () => ; - -ToStorybook.story = { - name: 'to Storybook', -}; diff --git a/lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/src/stories/1-Button.stories.tsx b/lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/src/stories/1-Button.stories.tsx deleted file mode 100644 index 6bcfa2146627..000000000000 --- a/lib/cli/src/generators/WEBPACK_REACT/template-csf-ts/src/stories/1-Button.stories.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react'; -import { action } from '@storybook/addon-actions'; -import { Button } from '@storybook/react/demo'; - -export default { - title: 'Button', - component: Button, -}; - -export const Text = () => ; - -export const Emoji = () => ( - -); diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index 797ffa1efb44..c082bb5041bf 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -37,11 +37,11 @@ const defaultOptions: FrameworkOptions = { }; const generator = async ( npmOptions: NpmOptions, - { storyFormat, language }: GeneratorOptions, + { language }: GeneratorOptions, framework: SupportedFrameworks, options: FrameworkOptions = defaultOptions ) => { - const { extraAddons, extraPackages, dirname, staticDir, addScripts, addComponents } = { + const { extraAddons, extraPackages, staticDir, addScripts, addComponents } = { ...defaultOptions, ...options, }; @@ -59,7 +59,6 @@ const generator = async ( if (addComponents) { copyComponents(framework, language); } - copyTemplate(dirname || __dirname, storyFormat); const packageJson = await retrievePackageJson(); diff --git a/lib/cli/src/helpers.ts b/lib/cli/src/helpers.ts index 775d2840ce1a..e2a7a6b289f5 100644 --- a/lib/cli/src/helpers.ts +++ b/lib/cli/src/helpers.ts @@ -333,12 +333,6 @@ export function addToDevDependenciesIfNotPresent( export function copyTemplate(templateRoot: string, storyFormat: StoryFormat) { const templateDir = path.resolve(templateRoot, `template-${storyFormat}/`); - if ( - storyFormat !== StoryFormat.MDX && - templateRoot.match(/generators$/) // Means we're using base config and migrated - ) { - return; - } if (!fs.existsSync(templateDir)) { // Fallback to CSF plain first, in case format is typescript but template is not available. From 5fda409fdcc342a0afcb8f9abcdda643117acfc5 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Sun, 7 Jun 2020 22:49:40 +0200 Subject: [PATCH 35/47] fix build --- lib/cli/src/generators/EMBER/index.ts | 1 - lib/cli/src/generators/RIOT/index.ts | 1 - lib/cli/src/generators/generator.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/lib/cli/src/generators/EMBER/index.ts b/lib/cli/src/generators/EMBER/index.ts index f2dcbcfd0433..e7b9284f03d5 100644 --- a/lib/cli/src/generators/EMBER/index.ts +++ b/lib/cli/src/generators/EMBER/index.ts @@ -1,5 +1,4 @@ import baseGenerator, { Generator } from '../generator'; -import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'ember', { diff --git a/lib/cli/src/generators/RIOT/index.ts b/lib/cli/src/generators/RIOT/index.ts index 0b076661013f..bc7361784bcd 100644 --- a/lib/cli/src/generators/RIOT/index.ts +++ b/lib/cli/src/generators/RIOT/index.ts @@ -1,5 +1,4 @@ import baseGenerator, { Generator } from '../generator'; -import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'riot', { diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index c082bb5041bf..f3fce69efbab 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -6,7 +6,6 @@ import { writePackageJson, getBabelDependencies, installDependencies, - copyTemplate, copyComponents, } from '../helpers'; import configure from './configure'; From eb0cd845e90858dc7f4928a23698df17fb09843b Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 8 Jun 2020 21:53:36 +0200 Subject: [PATCH 36/47] switch to docs over essentials --- lib/cli/src/generators/ANGULAR/index.ts | 7 ++----- lib/cli/src/generators/configure.ts | 7 ++++++- lib/cli/src/generators/generator.ts | 4 +--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/cli/src/generators/ANGULAR/index.ts b/lib/cli/src/generators/ANGULAR/index.ts index ca976874feef..ca5f560dc16a 100644 --- a/lib/cli/src/generators/ANGULAR/index.ts +++ b/lib/cli/src/generators/ANGULAR/index.ts @@ -6,12 +6,11 @@ import { getAngularAppTsConfigPath, } from './angular-helpers'; import { writeFileAsJson, copyTemplate } from '../../helpers'; -import { StoryFormat } from '../../project_types'; import baseGenerator, { Generator } from '../generator'; function editAngularAppTsConfig() { const tsConfigJson = getAngularAppTsConfigJson(); - const glob = '**/*.stories.ts'; + const glob = '**/*.stories.*'; if (!tsConfigJson) { return; } @@ -31,9 +30,7 @@ const generator: Generator = async (npmOptions, options) => { 'Could not find a default project in your Angular workspace.\nSet a defaultProject in your angular.json and re-run the installation.' ); } - baseGenerator(npmOptions, options, 'angular', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, - }); + baseGenerator(npmOptions, options, 'angular'); copyTemplate(__dirname, options.storyFormat); editAngularAppTsConfig(); diff --git a/lib/cli/src/generators/configure.ts b/lib/cli/src/generators/configure.ts index cd9e86432b52..96b12074f6d0 100644 --- a/lib/cli/src/generators/configure.ts +++ b/lib/cli/src/generators/configure.ts @@ -7,7 +7,12 @@ function mainConfigurationGenerator(addons?: string[], custom?: any) { stories: [!hasSrc && '../stories/**/*.stories.*', hasSrc && '../src/**/*.stories.*'].filter( Boolean ), - addons: ['@storybook/addon-essentials', '@storybook/addon-links', ...addons], + addons: [ + '@storybook/addon-actions', + '@storybook/addon-links', + '@storybook/addon-docs', + ...addons, + ], ...custom, }; diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index f3fce69efbab..835682e056a2 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -18,7 +18,6 @@ export type GeneratorOptions = { export interface FrameworkOptions { extraPackages?: string[]; extraAddons?: string[]; - dirname?: string; staticDir?: string; addScripts?: boolean; addComponents?: boolean; @@ -29,7 +28,6 @@ export type Generator = (npmOptions: NpmOptions, options: GeneratorOptions) => P const defaultOptions: FrameworkOptions = { extraPackages: [], extraAddons: [], - dirname: __dirname, staticDir: undefined, addScripts: true, addComponents: true, @@ -46,7 +44,7 @@ const generator = async ( }; const packages = [ `@storybook/${framework}`, - '@storybook/addon-essentials', + '@storybook/addon-docs', '@storybook/addon-actions', '@storybook/addon-links', ...extraPackages, From 5cb901174a4858fe9f50bcae2c9d81db0d6dad18 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 8 Jun 2020 22:15:56 +0200 Subject: [PATCH 37/47] fix build --- lib/cli/src/generators/AURELIA/index.ts | 2 -- lib/cli/src/generators/METEOR/index.ts | 2 -- lib/cli/src/generators/WEB-COMPONENTS/index.ts | 4 +--- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/cli/src/generators/AURELIA/index.ts b/lib/cli/src/generators/AURELIA/index.ts index b2c8b5c39a7e..dd588e5d2297 100644 --- a/lib/cli/src/generators/AURELIA/index.ts +++ b/lib/cli/src/generators/AURELIA/index.ts @@ -1,5 +1,4 @@ import { writeFileAsJson, readFileAsJson, copyTemplate } from '../../helpers'; -import { StoryFormat } from '../../project_types'; import baseGenerator, { Generator } from '../generator'; function addStorybookExcludeGlobToTsConfig() { @@ -21,7 +20,6 @@ function addStorybookExcludeGlobToTsConfig() { const generator: Generator = async (npmOptions, options) => { addStorybookExcludeGlobToTsConfig(); baseGenerator(npmOptions, options, 'aurelia', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, extraPackages: ['aurelia'], }); copyTemplate(__dirname, options.storyFormat); diff --git a/lib/cli/src/generators/METEOR/index.ts b/lib/cli/src/generators/METEOR/index.ts index f638c6d22a8c..0c9eb93c1ba1 100644 --- a/lib/cli/src/generators/METEOR/index.ts +++ b/lib/cli/src/generators/METEOR/index.ts @@ -1,11 +1,9 @@ import fs from 'fs'; import JSON5 from 'json5'; import baseGenerator, { Generator } from '../generator'; -import { StoryFormat } from '../../project_types'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'react', { - dirname: options.storyFormat === StoryFormat.MDX ? __dirname : undefined, extraPackages: ['react', 'react-dom', '@babel/preset-env', '@babel/preset-react'], staticDir: 'dist', }); diff --git a/lib/cli/src/generators/WEB-COMPONENTS/index.ts b/lib/cli/src/generators/WEB-COMPONENTS/index.ts index 568297bc9b1c..18cf796b775e 100755 --- a/lib/cli/src/generators/WEB-COMPONENTS/index.ts +++ b/lib/cli/src/generators/WEB-COMPONENTS/index.ts @@ -1,13 +1,11 @@ import baseGenerator, { Generator } from '../generator'; -import { StoryFormat } from '../../project_types'; import { copyTemplate } from '../../helpers'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'web-components', { - dirname: __dirname, extraPackages: ['lit-html'], }); - copyTemplate(__dirname, StoryFormat.CSF); + copyTemplate(__dirname, options.storyFormat); }; export default generator; From c928b2043368aeaf27e4ad62bb32a539efad7935 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Mon, 8 Jun 2020 22:48:40 +0200 Subject: [PATCH 38/47] make it green --- lib/cli/src/generators/generator.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index 835682e056a2..e592f87e5c32 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -44,12 +44,13 @@ const generator = async ( }; const packages = [ `@storybook/${framework}`, - '@storybook/addon-docs', + // https://github.com/storybookjs/storybook/issues/9103 + framework !== 'angular' && '@storybook/addon-essentials', '@storybook/addon-actions', '@storybook/addon-links', ...extraPackages, ...extraAddons, - ]; + ].filter(Boolean); const versionedPackages = await getVersionedPackages(npmOptions, ...packages); configure(extraAddons); From fbb5d89613d12ca2cc68d146f8ea7b9f5c2cf403 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 9 Jun 2020 08:41:50 +0200 Subject: [PATCH 39/47] Fix yarn 2 --- addons/essentials/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/essentials/src/index.ts b/addons/essentials/src/index.ts index d95fb32acf88..470d8d192f60 100644 --- a/addons/essentials/src/index.ts +++ b/addons/essentials/src/index.ts @@ -35,6 +35,6 @@ export function addons(options: PresetOptions = {}) { const main = requireMain(options.configDir); return ['actions', 'docs', 'backgrounds', 'viewport'] .filter((key) => (options as any)[key] !== false) - .map((key) => `@storybook/addon-${key}`) + .map((key) => require.resolve(`@storybook/addon-${key}`)) .filter((addon) => !checkInstalled(addon, main)); } From 2570a66ae08d16e6110823627878258740785a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Maisse?= Date: Tue, 9 Jun 2020 18:38:12 +0200 Subject: [PATCH 40/47] fix(cli): use the same list of addons to build `main.js` as the one added during init --- lib/cli/src/generators/configure.ts | 9 ++------- lib/cli/src/generators/generator.ts | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/lib/cli/src/generators/configure.ts b/lib/cli/src/generators/configure.ts index 96b12074f6d0..a390c4a0f6ea 100644 --- a/lib/cli/src/generators/configure.ts +++ b/lib/cli/src/generators/configure.ts @@ -1,18 +1,13 @@ import fse from 'fs-extra'; -function mainConfigurationGenerator(addons?: string[], custom?: any) { +function mainConfigurationGenerator(addons: string[], custom?: any) { const hasSrc = fse.existsSync('./src'); const config = { stories: [!hasSrc && '../stories/**/*.stories.*', hasSrc && '../src/**/*.stories.*'].filter( Boolean ), - addons: [ - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addon-docs', - ...addons, - ], + addons, ...custom, }; diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index e592f87e5c32..bc3b9e22b576 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -42,18 +42,20 @@ const generator = async ( ...defaultOptions, ...options, }; - const packages = [ - `@storybook/${framework}`, - // https://github.com/storybookjs/storybook/issues/9103 - framework !== 'angular' && '@storybook/addon-essentials', - '@storybook/addon-actions', + + const addons = [ '@storybook/addon-links', - ...extraPackages, - ...extraAddons, - ].filter(Boolean); + // If angular add only `actions` because docs is buggy for now (https://github.com/storybookjs/storybook/issues/9103) + // for others framework add `essentials` i.e. `actions`, `backgrounds`, `docs`, `viewport` + framework !== 'angular' ? '@storybook/addon-essentials' : '@storybook/addon-actions', + ]; + + const packages = [`@storybook/${framework}`, ...addons, ...extraPackages, ...extraAddons].filter( + Boolean + ); const versionedPackages = await getVersionedPackages(npmOptions, ...packages); - configure(extraAddons); + configure([...addons, ...extraAddons]); if (addComponents) { copyComponents(framework, language); } From 0e8ae86502bf36960c5ead7c30e8bcd80f0bc519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Maisse?= Date: Tue, 9 Jun 2020 18:51:06 +0200 Subject: [PATCH 41/47] fix(cli): add peer deps of storybook addons when init a project Some addons have peer deps that must be added to make everything works, like '@storybook/addon-docs' => 'react-is' --- lib/cli/src/generators/generator.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index bc3b9e22b576..98955265146f 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -50,9 +50,20 @@ const generator = async ( framework !== 'angular' ? '@storybook/addon-essentials' : '@storybook/addon-actions', ]; - const packages = [`@storybook/${framework}`, ...addons, ...extraPackages, ...extraAddons].filter( - Boolean - ); + // ⚠️ Some addons have peer deps that must be added too, like '@storybook/addon-docs' => 'react-is' + const addonsPeerDeps = addons.some( + (addon) => addon === '@storybook/addon-essentials' || addon === '@storybook/addon-docs' + ) + ? ['react-is'] + : []; + + const packages = [ + `@storybook/${framework}`, + ...addons, + ...extraPackages, + ...extraAddons, + ...addonsPeerDeps, + ].filter(Boolean); const versionedPackages = await getVersionedPackages(npmOptions, ...packages); configure([...addons, ...extraAddons]); From 6e68926ef62f16141c5cff739c9bb21964224034 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 9 Jun 2020 22:21:20 +0200 Subject: [PATCH 42/47] PR Feedbacks --- lib/cli/src/generators/ANGULAR/index.ts | 2 +- lib/cli/src/generators/AURELIA/index.ts | 2 +- lib/cli/src/generators/EMBER/index.ts | 2 +- lib/cli/src/generators/HTML/index.ts | 2 +- lib/cli/src/generators/MARIONETTE/index.ts | 2 +- lib/cli/src/generators/MARKO/index.ts | 2 +- lib/cli/src/generators/METEOR/index.ts | 2 +- lib/cli/src/generators/MITHRIL/index.ts | 2 +- lib/cli/src/generators/PREACT/index.ts | 2 +- lib/cli/src/generators/RAX/index.ts | 2 +- lib/cli/src/generators/REACT/index.ts | 2 +- lib/cli/src/generators/REACT_NATIVE/index.ts | 2 +- lib/cli/src/generators/REACT_SCRIPTS/index.ts | 2 +- lib/cli/src/generators/RIOT/index.ts | 2 +- lib/cli/src/generators/SFC_VUE/index.ts | 2 +- lib/cli/src/generators/SVELTE/index.ts | 2 +- lib/cli/src/generators/WEB-COMPONENTS/index.ts | 2 +- lib/cli/src/generators/WEBPACK_REACT/index.ts | 2 +- lib/cli/src/generators/generator.ts | 9 ++++----- lib/cli/src/helpers.ts | 2 +- 20 files changed, 23 insertions(+), 24 deletions(-) diff --git a/lib/cli/src/generators/ANGULAR/index.ts b/lib/cli/src/generators/ANGULAR/index.ts index ca5f560dc16a..dd83f544fbbf 100644 --- a/lib/cli/src/generators/ANGULAR/index.ts +++ b/lib/cli/src/generators/ANGULAR/index.ts @@ -6,7 +6,7 @@ import { getAngularAppTsConfigPath, } from './angular-helpers'; import { writeFileAsJson, copyTemplate } from '../../helpers'; -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; function editAngularAppTsConfig() { const tsConfigJson = getAngularAppTsConfigJson(); diff --git a/lib/cli/src/generators/AURELIA/index.ts b/lib/cli/src/generators/AURELIA/index.ts index dd588e5d2297..4b97428b8b68 100644 --- a/lib/cli/src/generators/AURELIA/index.ts +++ b/lib/cli/src/generators/AURELIA/index.ts @@ -1,5 +1,5 @@ import { writeFileAsJson, readFileAsJson, copyTemplate } from '../../helpers'; -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; function addStorybookExcludeGlobToTsConfig() { const tsConfigJson = readFileAsJson('tsconfig.json', true); diff --git a/lib/cli/src/generators/EMBER/index.ts b/lib/cli/src/generators/EMBER/index.ts index e7b9284f03d5..80cab0f1b789 100644 --- a/lib/cli/src/generators/EMBER/index.ts +++ b/lib/cli/src/generators/EMBER/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'ember', { diff --git a/lib/cli/src/generators/HTML/index.ts b/lib/cli/src/generators/HTML/index.ts index ea3ba74c319f..82b89a06b54a 100755 --- a/lib/cli/src/generators/HTML/index.ts +++ b/lib/cli/src/generators/HTML/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; import { StoryFormat } from '../../project_types'; import { copyTemplate } from '../../helpers'; diff --git a/lib/cli/src/generators/MARIONETTE/index.ts b/lib/cli/src/generators/MARIONETTE/index.ts index b75fc68f3699..c6b3e6d08f4d 100644 --- a/lib/cli/src/generators/MARIONETTE/index.ts +++ b/lib/cli/src/generators/MARIONETTE/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; const generator: Generator = async (npmOptions, options) => { await baseGenerator(npmOptions, options, 'marionette'); diff --git a/lib/cli/src/generators/MARKO/index.ts b/lib/cli/src/generators/MARKO/index.ts index 8a986eb56914..2ba06306d619 100644 --- a/lib/cli/src/generators/MARKO/index.ts +++ b/lib/cli/src/generators/MARKO/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; const generator: Generator = async (npmOptions, options) => { await baseGenerator(npmOptions, options, 'marko'); diff --git a/lib/cli/src/generators/METEOR/index.ts b/lib/cli/src/generators/METEOR/index.ts index 0c9eb93c1ba1..6055685383c6 100644 --- a/lib/cli/src/generators/METEOR/index.ts +++ b/lib/cli/src/generators/METEOR/index.ts @@ -1,6 +1,6 @@ import fs from 'fs'; import JSON5 from 'json5'; -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'react', { diff --git a/lib/cli/src/generators/MITHRIL/index.ts b/lib/cli/src/generators/MITHRIL/index.ts index 670559b5adba..d46d9f52425e 100644 --- a/lib/cli/src/generators/MITHRIL/index.ts +++ b/lib/cli/src/generators/MITHRIL/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'mithril'); diff --git a/lib/cli/src/generators/PREACT/index.ts b/lib/cli/src/generators/PREACT/index.ts index d600ee291e44..7ffb6d6ebff7 100644 --- a/lib/cli/src/generators/PREACT/index.ts +++ b/lib/cli/src/generators/PREACT/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'preact'); diff --git a/lib/cli/src/generators/RAX/index.ts b/lib/cli/src/generators/RAX/index.ts index 07669769284a..a59084beb540 100644 --- a/lib/cli/src/generators/RAX/index.ts +++ b/lib/cli/src/generators/RAX/index.ts @@ -1,5 +1,5 @@ import { getVersions, retrievePackageJson, writePackageJson } from '../../helpers'; -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; const generator: Generator = async (npmOptions, options) => { const [latestRaxVersion] = await getVersions(npmOptions, 'rax'); diff --git a/lib/cli/src/generators/REACT/index.ts b/lib/cli/src/generators/REACT/index.ts index 41f6aaedb6ca..69ffaf26027d 100644 --- a/lib/cli/src/generators/REACT/index.ts +++ b/lib/cli/src/generators/REACT/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; import { StoryFormat } from '../../project_types'; import { copyTemplate } from '../../helpers'; diff --git a/lib/cli/src/generators/REACT_NATIVE/index.ts b/lib/cli/src/generators/REACT_NATIVE/index.ts index 1221fcec47e1..8cb227f09135 100644 --- a/lib/cli/src/generators/REACT_NATIVE/index.ts +++ b/lib/cli/src/generators/REACT_NATIVE/index.ts @@ -2,7 +2,7 @@ import shell from 'shelljs'; import chalk from 'chalk'; import { retrievePackageJson, paddedLog, copyTemplate } from '../../helpers'; import { NpmOptions } from '../../NpmOptions'; -import baseGenerator, { GeneratorOptions } from '../generator'; +import { baseGenerator, GeneratorOptions } from '../generator'; const generator = async ( npmOptions: NpmOptions, diff --git a/lib/cli/src/generators/REACT_SCRIPTS/index.ts b/lib/cli/src/generators/REACT_SCRIPTS/index.ts index 90250854dca4..3695a0297167 100644 --- a/lib/cli/src/generators/REACT_SCRIPTS/index.ts +++ b/lib/cli/src/generators/REACT_SCRIPTS/index.ts @@ -1,7 +1,7 @@ import path from 'path'; import fs from 'fs'; -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; import { copyTemplate } from '../../helpers'; import { StoryFormat } from '../../project_types'; diff --git a/lib/cli/src/generators/RIOT/index.ts b/lib/cli/src/generators/RIOT/index.ts index bc7361784bcd..ba2cb30377db 100644 --- a/lib/cli/src/generators/RIOT/index.ts +++ b/lib/cli/src/generators/RIOT/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'riot', { diff --git a/lib/cli/src/generators/SFC_VUE/index.ts b/lib/cli/src/generators/SFC_VUE/index.ts index a8f8d021f70b..49079bfe1193 100644 --- a/lib/cli/src/generators/SFC_VUE/index.ts +++ b/lib/cli/src/generators/SFC_VUE/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; import { StoryFormat } from '../../project_types'; import { copyTemplate } from '../../helpers'; diff --git a/lib/cli/src/generators/SVELTE/index.ts b/lib/cli/src/generators/SVELTE/index.ts index d00fe6976db3..29ffe349fe09 100644 --- a/lib/cli/src/generators/SVELTE/index.ts +++ b/lib/cli/src/generators/SVELTE/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; const generator: Generator = async (npmOptions, options) => { baseGenerator(npmOptions, options, 'svelte', { diff --git a/lib/cli/src/generators/WEB-COMPONENTS/index.ts b/lib/cli/src/generators/WEB-COMPONENTS/index.ts index 18cf796b775e..e6f86aa9010a 100755 --- a/lib/cli/src/generators/WEB-COMPONENTS/index.ts +++ b/lib/cli/src/generators/WEB-COMPONENTS/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; import { copyTemplate } from '../../helpers'; const generator: Generator = async (npmOptions, options) => { diff --git a/lib/cli/src/generators/WEBPACK_REACT/index.ts b/lib/cli/src/generators/WEBPACK_REACT/index.ts index ba2e379c317e..79aa177f7413 100644 --- a/lib/cli/src/generators/WEBPACK_REACT/index.ts +++ b/lib/cli/src/generators/WEBPACK_REACT/index.ts @@ -1,4 +1,4 @@ -import baseGenerator, { Generator } from '../generator'; +import { baseGenerator, Generator } from '../generator'; import { StoryFormat } from '../../project_types'; import { copyTemplate } from '../../helpers'; diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index 98955265146f..8de164c1c147 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -32,12 +32,13 @@ const defaultOptions: FrameworkOptions = { addScripts: true, addComponents: true, }; -const generator = async ( + +export async function baseGenerator( npmOptions: NpmOptions, { language }: GeneratorOptions, framework: SupportedFrameworks, options: FrameworkOptions = defaultOptions -) => { +) { const { extraAddons, extraPackages, staticDir, addScripts, addComponents } = { ...defaultOptions, ...options, @@ -88,6 +89,4 @@ const generator = async ( const babelDependencies = await getBabelDependencies(npmOptions, packageJson); installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]); -}; - -export default generator; +} diff --git a/lib/cli/src/helpers.ts b/lib/cli/src/helpers.ts index e2a7a6b289f5..b0039b13502e 100644 --- a/lib/cli/src/helpers.ts +++ b/lib/cli/src/helpers.ts @@ -347,7 +347,7 @@ export function copyTemplate(templateRoot: string, storyFormat: StoryFormat) { } export function copyComponents(framework: SupportedFrameworks, language: SupportedLanguage) { - const languageFolderMapping: { [key in SupportedLanguage]: string } = { + const languageFolderMapping: Record = { javascript: 'js', typescript: 'ts', }; From aca53020a4ff70df50719901c156a579feee2b50 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Tue, 9 Jun 2020 22:41:01 +0200 Subject: [PATCH 43/47] Use docs & actions for now --- lib/cli/src/generators/generator.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index 8de164c1c147..0ca15e7077e6 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -46,10 +46,12 @@ export async function baseGenerator( const addons = [ '@storybook/addon-links', - // If angular add only `actions` because docs is buggy for now (https://github.com/storybookjs/storybook/issues/9103) + '@storybook/addon-actions', + // If angular skip `docs` because docs is buggy for now (https://github.com/storybookjs/storybook/issues/9103) // for others framework add `essentials` i.e. `actions`, `backgrounds`, `docs`, `viewport` - framework !== 'angular' ? '@storybook/addon-essentials' : '@storybook/addon-actions', - ]; + // API of essentials needs to be clarified whether we need to add dependencies or not + framework !== 'angular' && '@storybook/addon-docs', + ].filter(Boolean); // ⚠️ Some addons have peer deps that must be added too, like '@storybook/addon-docs' => 'react-is' const addonsPeerDeps = addons.some( From afffa12f5533865f08b3fb83253b60c9fb0e86a7 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Thu, 11 Jun 2020 19:09:45 +0200 Subject: [PATCH 44/47] Revert "remove plugin-external-helpers from fixtures" This reverts commit fde26b373f2ef0f02d4012b144d57ca9029b5db5. --- lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc | 3 ++- lib/cli/test/fixtures/webpack_react_frozen_lock/package.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc b/lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc index 7dd5e9df2340..e636022c817b 100644 --- a/lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc +++ b/lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc @@ -1,3 +1,4 @@ { - "presets": ["@babel/preset-react"] + "presets": ["@babel/preset-react"], + "plugins": ["@babel/plugin-external-helpers"] } diff --git a/lib/cli/test/fixtures/webpack_react_frozen_lock/package.json b/lib/cli/test/fixtures/webpack_react_frozen_lock/package.json index 3ebfc0eed05a..6efbd6282c5f 100644 --- a/lib/cli/test/fixtures/webpack_react_frozen_lock/package.json +++ b/lib/cli/test/fixtures/webpack_react_frozen_lock/package.json @@ -12,6 +12,7 @@ }, "devDependencies": { "@babel/core": "^7.3.4", + "@babel/plugin-external-helpers": "7.2.0", "@babel/preset-react": "7.0.0", "babel-core": "^7.0.0-bridge.0", "babel-loader": "^8.0.5", From bf7616dd46a6d979a3fc2fe262a0852466250f12 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Thu, 11 Jun 2020 19:10:22 +0200 Subject: [PATCH 45/47] move vue --- lib/cli/src/generators/VUE/index.ts | 58 +-------- .../VUE/template-csf/.storybook/main.js | 4 - .../template-csf/stories/0-Welcome.stories.js | 16 --- .../template-csf/stories/1-Button.stories.js | 32 ----- .../VUE/template-csf/stories/MyButton.js | 29 ----- .../VUE/template-csf/stories/Welcome.js | 121 ------------------ 6 files changed, 6 insertions(+), 254 deletions(-) delete mode 100644 lib/cli/src/generators/VUE/template-csf/.storybook/main.js delete mode 100644 lib/cli/src/generators/VUE/template-csf/stories/0-Welcome.stories.js delete mode 100644 lib/cli/src/generators/VUE/template-csf/stories/1-Button.stories.js delete mode 100644 lib/cli/src/generators/VUE/template-csf/stories/MyButton.js delete mode 100644 lib/cli/src/generators/VUE/template-csf/stories/Welcome.js diff --git a/lib/cli/src/generators/VUE/index.ts b/lib/cli/src/generators/VUE/index.ts index 881e44d3415a..49079bfe1193 100644 --- a/lib/cli/src/generators/VUE/index.ts +++ b/lib/cli/src/generators/VUE/index.ts @@ -1,58 +1,12 @@ -import { - retrievePackageJson, - getVersion, - getVersionedPackages, - writePackageJson, - getBabelDependencies, - installDependencies, - addToDevDependenciesIfNotPresent, - copyTemplate, -} from '../../helpers'; +import { baseGenerator, Generator } from '../generator'; import { StoryFormat } from '../../project_types'; -import { Generator } from '../generator'; +import { copyTemplate } from '../../helpers'; -const generator: Generator = async (npmOptions, { storyFormat }) => { - const packages = [ - '@storybook/vue', - '@storybook/addon-actions', - '@storybook/addon-links', - '@storybook/addons', - '@babel/core', - ]; - if (storyFormat === StoryFormat.MDX) { - packages.push('@storybook/addon-docs'); +const generator: Generator = async (npmOptions, options) => { + baseGenerator(npmOptions, options, 'vue'); + if (options.storyFormat === StoryFormat.MDX) { + copyTemplate(__dirname, StoryFormat.MDX); } - const versionedPackages = await getVersionedPackages(npmOptions, ...packages); - - copyTemplate(__dirname, storyFormat); - - const packageJson = await retrievePackageJson(); - - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - - const packageBabelCoreVersion = - packageJson.dependencies['babel-core'] || packageJson.devDependencies['babel-core']; - - // This seems to be the version installed by the Vue CLI, and it is not handled by - // installBabel below. For some reason it leads to the wrong version of @babel/core (a beta) - // being installed - if (packageBabelCoreVersion === '7.0.0-bridge.0') { - addToDevDependenciesIfNotPresent( - packageJson, - '@babel/core', - await getVersion(npmOptions, '@babel/core') - ); - } - - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = 'start-storybook -p 6006'; - packageJson.scripts['build-storybook'] = 'build-storybook'; - - writePackageJson(packageJson); - - const babelDependencies = await getBabelDependencies(npmOptions, packageJson); - installDependencies({ ...npmOptions, packageJson }, [...versionedPackages, ...babelDependencies]); }; export default generator; diff --git a/lib/cli/src/generators/VUE/template-csf/.storybook/main.js b/lib/cli/src/generators/VUE/template-csf/.storybook/main.js deleted file mode 100644 index 3036098563cc..000000000000 --- a/lib/cli/src/generators/VUE/template-csf/.storybook/main.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - stories: ['../stories/**/*.stories.js'], - addons: ['@storybook/addon-actions', '@storybook/addon-links'], -}; diff --git a/lib/cli/src/generators/VUE/template-csf/stories/0-Welcome.stories.js b/lib/cli/src/generators/VUE/template-csf/stories/0-Welcome.stories.js deleted file mode 100644 index 751d3002ef69..000000000000 --- a/lib/cli/src/generators/VUE/template-csf/stories/0-Welcome.stories.js +++ /dev/null @@ -1,16 +0,0 @@ -import { linkTo } from '@storybook/addon-links'; - -import Welcome from './Welcome'; - -export default { - title: 'Welcome', - component: Welcome, -}; - -export const ToStorybook = () => ({ - components: { Welcome }, - template: '', - methods: { action: linkTo('Button') }, -}); - -ToStorybook.storyName = 'to Storybook'; diff --git a/lib/cli/src/generators/VUE/template-csf/stories/1-Button.stories.js b/lib/cli/src/generators/VUE/template-csf/stories/1-Button.stories.js deleted file mode 100644 index 790039811cc5..000000000000 --- a/lib/cli/src/generators/VUE/template-csf/stories/1-Button.stories.js +++ /dev/null @@ -1,32 +0,0 @@ -import { action } from '@storybook/addon-actions'; -import { linkTo } from '@storybook/addon-links'; - -import MyButton from './MyButton'; - -export default { - title: 'Button', - component: MyButton, -}; - -export const Text = () => ({ - components: { MyButton }, - template: 'Hello Button', - methods: { action: action('clicked') }, -}); - -export const TextWithAction = () => ({ - components: { MyButton }, - template: 'Trigger Action', - methods: { action: () => action('This was clicked')() }, -}); - -TextWithAction.storyName = 'With an action'; -TextWithAction.parameters = { notes: 'My notes on a button with emojis' }; - -export const ButtonWithLinkToAnotherStory = () => ({ - components: { MyButton }, - template: 'Go to Welcome Story', - methods: { action: linkTo('Welcome') }, -}); - -ButtonWithLinkToAnotherStory.storyName = 'button with link to another story'; diff --git a/lib/cli/src/generators/VUE/template-csf/stories/MyButton.js b/lib/cli/src/generators/VUE/template-csf/stories/MyButton.js deleted file mode 100644 index 7ed4b85378de..000000000000 --- a/lib/cli/src/generators/VUE/template-csf/stories/MyButton.js +++ /dev/null @@ -1,29 +0,0 @@ -export default { - name: 'my-button', - - data() { - return { - buttonStyles: { - border: '1px solid #eee', - borderRadius: 3, - backgroundColor: '#FFFFFF', - cursor: 'pointer', - fontSize: 15, - padding: '3px 10px', - margin: 10, - }, - }; - }, - - template: ` - - `, - - methods: { - onClick() { - this.$emit('click'); - }, - }, -}; diff --git a/lib/cli/src/generators/VUE/template-csf/stories/Welcome.js b/lib/cli/src/generators/VUE/template-csf/stories/Welcome.js deleted file mode 100644 index 80df0039e05c..000000000000 --- a/lib/cli/src/generators/VUE/template-csf/stories/Welcome.js +++ /dev/null @@ -1,121 +0,0 @@ -// eslint-disable-next-line no-console -const log = () => console.log('Welcome to storybook!'); - -export default { - name: 'welcome', - - props: { - showApp: { - type: Function, - default: log, - }, - }, - - data() { - return { - main: { - padding: 15, - lineHeight: 1.4, - fontFamily: '"Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif', - backgroundColor: '#ffffff', - }, - - logo: { - width: 200, - }, - - link: { - color: '#1474f3', - textDecoration: 'none', - borderBottom: '1px solid #1474f3', - paddingBottom: 2, - }, - - code: { - fontSize: 15, - fontWeight: 600, - padding: '2px 5px', - border: '1px solid #eae9e9', - borderRadius: 4, - backgroundColor: '#f3f2f2', - color: '#3a3a3a', - }, - - note: { - opacity: 0.5, - }, - }; - }, - - template: ` -
-

Welcome to storybook

-

- This is a UI component dev environment for your app. -

-

- We've added some basic stories inside the -
- src/stories -
- directory. -
- A story is a single state of one or more UI components. You can have as many stories as - you want. -
- (Basically a story is like a visual test case.) -

-

- See these sample -
- stories -
- for a component called -
- Button - . -

-

- Just like that, you can add your own components as stories. -
- You can also edit those components and see changes right away. -
- (Try editing the Button component - located at src/stories/Button.js.) -

-

- This is just one thing you can do with Storybook. -
- Have a look at the -
- - Storybook - -
- repo for more information. -

-

- NOTE: -
- Have a look at the -
- .storybook/webpack.config.js -
- to add webpack - loaders and plugins you are using in this project. -

-
- `, - - methods: { - onClick(event) { - event.preventDefault(); - this.showApp(); - }, - }, -}; From 669fdb8b4c92cc8ff51304216495177e15a07ce0 Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Thu, 11 Jun 2020 21:23:52 +0200 Subject: [PATCH 46/47] finish merge --- lib/cli/src/generators/generator.ts | 16 +++++---------- lib/cli/versions.json | 30 ++++++++++++++--------------- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index fc183cf5a4d9..f3e9eda49cda 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -2,7 +2,7 @@ import { NpmOptions } from '../NpmOptions'; import { StoryFormat, SupportedLanguage, SupportedFrameworks } from '../project_types'; import { getBabelDependencies, copyComponents } from '../helpers'; import configure from './configure'; -import { JsPackageManager, writePackageJson } from '../js-package-manager'; +import { JsPackageManager } from '../js-package-manager'; export type GeneratorOptions = { language: SupportedLanguage; @@ -75,18 +75,12 @@ export async function baseGenerator( const packageJson = packageManager.retrievePackageJson(); - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - if (addScripts) { - const staticParameter = staticDir ? `-s ${staticDir}` : ''; - packageJson.scripts = packageJson.scripts || {}; - packageJson.scripts.storybook = `start-storybook -p 6006 ${staticParameter}`.trim(); - packageJson.scripts['build-storybook'] = `build-storybook ${staticParameter}`.trim(); + packageManager.addStorybookCommandInScripts({ + port: 6006, + staticFolder: staticDir, + }); } - - writePackageJson(packageJson); - const babelDependencies = await getBabelDependencies(packageManager, packageJson); packageManager.addDependencies({ ...npmOptions, packageJson }, [ ...versionedPackages, diff --git a/lib/cli/versions.json b/lib/cli/versions.json index 484f75880689..32702f5965be 100644 --- a/lib/cli/versions.json +++ b/lib/cli/versions.json @@ -1,17 +1,17 @@ { - "@storybook/angular": "6.0.0-beta.23", - "@storybook/aurelia": "6.0.0-beta.23", - "@storybook/ember": "6.0.0-beta.23", - "@storybook/html": "6.0.0-beta.23", - "@storybook/marionette": "6.0.0-beta.23", - "@storybook/marko": "6.0.0-beta.23", - "@storybook/mithril": "6.0.0-beta.23", - "@storybook/preact": "6.0.0-beta.23", - "@storybook/rax": "6.0.0-beta.23", - "@storybook/react": "6.0.0-beta.23", - "@storybook/riot": "6.0.0-beta.23", - "@storybook/server": "6.0.0-beta.23", - "@storybook/svelte": "6.0.0-beta.23", - "@storybook/vue": "6.0.0-beta.23", - "@storybook/web-components": "6.0.0-beta.23" + "@storybook/angular": "6.0.0-beta.25", + "@storybook/aurelia": "6.0.0-beta.25", + "@storybook/ember": "6.0.0-beta.25", + "@storybook/html": "6.0.0-beta.25", + "@storybook/marionette": "6.0.0-beta.25", + "@storybook/marko": "6.0.0-beta.25", + "@storybook/mithril": "6.0.0-beta.25", + "@storybook/preact": "6.0.0-beta.25", + "@storybook/rax": "6.0.0-beta.25", + "@storybook/react": "6.0.0-beta.25", + "@storybook/riot": "6.0.0-beta.25", + "@storybook/server": "6.0.0-beta.25", + "@storybook/svelte": "6.0.0-beta.25", + "@storybook/vue": "6.0.0-beta.25", + "@storybook/web-components": "6.0.0-beta.25" } \ No newline at end of file From 6fc491c4e9a3ee67f430bdea0714e86317a9b91a Mon Sep 17 00:00:00 2001 From: tooppaaa Date: Thu, 11 Jun 2020 21:41:14 +0200 Subject: [PATCH 47/47] fix merge --- lib/cli/src/generators/RAX/index.ts | 3 --- lib/cli/src/generators/generator.ts | 4 ++-- lib/cli/src/js-package-manager/JsPackageManager.ts | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/cli/src/generators/RAX/index.ts b/lib/cli/src/generators/RAX/index.ts index 303edb0d022f..fc0ebc038b57 100644 --- a/lib/cli/src/generators/RAX/index.ts +++ b/lib/cli/src/generators/RAX/index.ts @@ -5,9 +5,6 @@ const generator: Generator = async (packageManager, npmOptions, options) => { const [latestRaxVersion] = await packageManager.getVersions('rax'); const packageJson = packageManager.retrievePackageJson(); - packageJson.dependencies = packageJson.dependencies || {}; - packageJson.devDependencies = packageJson.devDependencies || {}; - const raxVersion = packageJson.dependencies.rax || latestRaxVersion; // in case Rax project is not detected, `rax` package is not available either diff --git a/lib/cli/src/generators/generator.ts b/lib/cli/src/generators/generator.ts index f3e9eda49cda..344c3e8438c1 100644 --- a/lib/cli/src/generators/generator.ts +++ b/lib/cli/src/generators/generator.ts @@ -66,8 +66,8 @@ export async function baseGenerator( ...extraAddons, ...addonsPeerDeps, ].filter(Boolean); - const versionedPackages = await packageManager.getVersions(...packages); - + const versionedPackages = await packageManager.getVersionedPackages(...packages); + console.log('versionedPackages', versionedPackages); configure([...addons, ...extraAddons]); if (addComponents) { copyComponents(framework, language); diff --git a/lib/cli/src/js-package-manager/JsPackageManager.ts b/lib/cli/src/js-package-manager/JsPackageManager.ts index eeb52bfa4be7..43ee1fb5435f 100644 --- a/lib/cli/src/js-package-manager/JsPackageManager.ts +++ b/lib/cli/src/js-package-manager/JsPackageManager.ts @@ -129,6 +129,7 @@ export abstract class JsPackageManager { * @param packageNames */ public getVersions(...packageNames: string[]): Promise { + console.log('getVersions', packageNames); return Promise.all(packageNames.map((packageName) => this.getVersion(packageName))); }