cli: colocate stories and components, centralize main.js #10913

tooppaaa · 2020-05-25T15:03:36Z

Issue: #10901

What I did

Move components from @storybook/< framework >/demo to cli/frameworks/react/js and /ts
Copy stories folder to user src (if any) or to root
mutualise generator

How to test

E2E should be green
use CLI

shilman

This looks great @tooppaaa! Some small nitpicks in the review, but otherwise feels good.

lib/cli/src/frameworks/react/js/0-Welcome.stories.js

shilman · 2020-05-26T00:19:01Z

lib/cli/src/frameworks/react/ts/Welcome.tsx

+  HTMLAttributes,
+} from 'react';
+
+type MainProps = Omit<DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>, 'style'>;


Can we simplify the TypeScript in our welcome component? Otherwise it's very welcoming!

I have in mind of having Welcome being a mdx story and having another more simple/friendly component. Not sure how to simplify this one

Agree with @shilman a simpler type would be great but I'm a React newbie so I don't if we can do better or if there is a workaround.

lib/cli/src/frameworks/react/ts/Welcome.tsx

shilman · 2020-05-26T00:27:56Z

lib/cli/src/helpers.test.ts

@@ -54,4 +56,58 @@ describe('Helpers', () => {
      }).toThrowError(expectedMessage);
    });
  });
+
+  it.each`
+    language        | exists          | expected


WHOA!!! 😍

lib/cli/src/generators/configure.ts

…ries

tooppaaa · 2020-06-08T21:32:22Z

gaetanmaisse

Now let's take a look at this pb with Yarn 2 😄 🙃

gaetanmaisse · 2020-06-09T11:21:05Z

lib/cli/src/frameworks/react/ts/Welcome.tsx

+  HTMLAttributes,
+} from 'react';
+
+type MainProps = Omit<DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>, 'style'>;


Agree with @shilman a simpler type would be great but I'm a React newbie so I don't if we can do better or if there is a workaround.

lib/cli/src/helpers.ts

lib/cli/src/generators/generator.ts

gaetanmaisse · 2020-06-09T12:10:41Z

lib/cli/src/generators/configure.ts

+    addons: [
+      '@storybook/addon-actions',
+      '@storybook/addon-links',
+      '@storybook/addon-docs',


Shouldn't it be @storybook/addon-essentials instead?

See 2570a66

gaetanmaisse · 2020-06-09T12:30:29Z

Yarn 2 issue seems related to this line: https://github.com/storybookjs/storybook/blob/next/lib/core/src/server/presets.js#L124

Edit: Or not 🙃

I added 2 commits, I will check the new errors and continue to 🔍 asap

…dded during init

Some addons have peer deps that must be added to make everything works, like '@storybook/addon-docs' => 'react-is'

gaetanmaisse · 2020-06-09T16:54:33Z

lib/cli/src/generators/generator.ts

+  const addonsPeerDeps = addons.some(
+    (addon) => addon === '@storybook/addon-essentials' || addon === '@storybook/addon-docs'
+  )
+    ? ['react-is']
+    : [];


@shilman any reason to have react-is as a peerDep and not a regular dep? I'm guessing because having multiples different versions in a single project leads to chaos💥?

lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc

lib/cli/test/fixtures/webpack_react_frozen_lock/package.json

This reverts commit fde26b3.

…ries

tooppaaa · 2020-06-12T15:03:33Z

Closing in favor of #11136

tooppaaa added 4 commits May 25, 2020 16:08

rename generator

dae9d40

CLI: react stories

5597f5a

fix build

b2d5744

fixes

fb1a124

tooppaaa added the cli label May 25, 2020

tooppaaa requested review from shilman, yannbf, ndelangen and gaetanmaisse May 25, 2020 15:03

tooppaaa requested review from igor-dv and stijnkoopal as code owners May 25, 2020 15:03

tooppaaa self-assigned this May 25, 2020

tooppaaa added the maintenance User-facing maintenance tasks label May 25, 2020

tooppaaa added 5 commits May 25, 2020 17:20

fix tests

8434dcc

fix unit test

8673294

fix lint

2b5372e

fix tests

93eaae0

fix unit test

665163d

shilman reviewed May 26, 2020

View reviewed changes

ndelangen approved these changes May 26, 2020

View reviewed changes

Feedbacks

7cf2595

tooppaaa commented May 26, 2020

View reviewed changes

lib/cli/src/generators/configure.ts Show resolved Hide resolved

tooppaaa added 8 commits May 26, 2020 22:10

Move ember

f535af4

Move Meteor

2783b12

Move mithril

79d6b00

Move preact

06e3c14

Move rax

fb3845d

Move riot

5ba3eef

Move svelte

ba37d85

Move marko and cleanup

4722220

tooppaaa added 7 commits June 7, 2020 20:36

Merge remote-tracking branch 'origin/next' into tech/colocateReactSto…

6802976

…ries

merge

6dc8533

fix copy template when needed

0002cd9

fix build

5fda409

switch to docs over essentials

eb0cd84

fix build

5cb9011

make it green

c928b20

Fix yarn 2

fbb5d89

gaetanmaisse mentioned this pull request Jun 9, 2020

CLI: refactor to simplify works with multiple package managers #11074

Merged

gaetanmaisse approved these changes Jun 9, 2020

View reviewed changes

gaetanmaisse reviewed Jun 9, 2020

View reviewed changes

gaetanmaisse added 2 commits June 9, 2020 18:39

fix(cli): use the same list of addons to build main.js as the one a…

2570a66

…dded during init

fix(cli): add peer deps of storybook addons when init a project

0e8ae86

Some addons have peer deps that must be added to make everything works, like '@storybook/addon-docs' => 'react-is'

gaetanmaisse reviewed Jun 9, 2020

View reviewed changes

tooppaaa added 2 commits June 9, 2020 22:21

PR Feedbacks

6e68926

Use docs & actions for now

aca5302

tooppaaa commented Jun 9, 2020

View reviewed changes

lib/cli/test/fixtures/webpack_react_frozen_lock/.babelrc Outdated Show resolved Hide resolved

lib/cli/test/fixtures/webpack_react_frozen_lock/package.json Outdated Show resolved Hide resolved

ndelangen and others added 3 commits June 10, 2020 15:41

Merge branch 'next' into tech/colocateReactStories

d7113b5

Revert "remove plugin-external-helpers from fixtures"

afffa12

This reverts commit fde26b3.

move vue

bf7616d

tooppaaa mentioned this pull request Jun 11, 2020

CLI: consistent welcome-component in all generators #10794

Closed

4 tasks

tooppaaa added 3 commits June 11, 2020 20:17

Merge remote-tracking branch 'origin/next' into tech/colocateReactSto…

638b51e

…ries

finish merge

669fdb8

fix merge

6fc491c

tooppaaa mentioned this pull request Jun 11, 2020

cli: colocate stories and components, centralize main.js #11136

Merged

tooppaaa closed this Jun 12, 2020

stof deleted the tech/colocateReactStories branch May 25, 2022 09:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cli: colocate stories and components, centralize main.js #10913

cli: colocate stories and components, centralize main.js #10913

tooppaaa commented May 25, 2020 •

edited

Loading

shilman left a comment

shilman May 26, 2020

tooppaaa May 26, 2020

gaetanmaisse Jun 9, 2020

shilman May 26, 2020

tooppaaa commented Jun 8, 2020 •

edited

Loading

gaetanmaisse left a comment

gaetanmaisse Jun 9, 2020

gaetanmaisse Jun 9, 2020

gaetanmaisse Jun 9, 2020

gaetanmaisse commented Jun 9, 2020 •

edited

Loading

gaetanmaisse Jun 9, 2020

tooppaaa commented Jun 12, 2020

cli: colocate stories and components, centralize main.js #10913

cli: colocate stories and components, centralize main.js #10913

Conversation

tooppaaa commented May 25, 2020 • edited Loading

What I did

How to test

shilman left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tooppaaa commented Jun 8, 2020 • edited Loading

gaetanmaisse left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gaetanmaisse commented Jun 9, 2020 • edited Loading

Choose a reason for hiding this comment

tooppaaa commented Jun 12, 2020

tooppaaa commented May 25, 2020 •

edited

Loading

tooppaaa commented Jun 8, 2020 •

edited

Loading

gaetanmaisse commented Jun 9, 2020 •

edited

Loading