Skip to content

Core: Module format load accept loader function #7518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shilman merged 6 commits into from
Jul 22, 2019
Merged

Core: Module format load accept loader function #7518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53daa98
FIX: stories not updating after delete
shilman Jul 22, 2019
c334e21
Update storiesOf.load to take req, [req], or loadFn
shilman Jul 22, 2019
ec39d01
Update examples to use new load function
shilman Jul 22, 2019
c75337e
Update examples/official-storybook/config.js
shilman Jul 22, 2019
5800a3d
Update start.js
shilman Jul 22, 2019
e6ded5d
Warn on repeat load calls
shilman Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions examples/angular-cli/.storybook/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ addParameters({
docs: DocsPage,
});

load(require.context('../src/stories', true, /\.stories\.ts$/), module);
load(require.context('../src/stories', true, /\.stories\.mdx$/), module);
load(require.context('../src/stories', true, /\.stories\.(ts|mdx)$/), module);
3 changes: 1 addition & 2 deletions examples/cra-kitchen-sink/.storybook/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ addParameters({
},
});

load(require.context('../src/stories', true, /\.stories\.js$/), module);
load(require.context('../src/stories', true, /\.stories\.mdx$/), module);
load(require.context('../src/stories', true, /\.stories\.(js|mdx)$/), module);
12 changes: 11 additions & 1 deletion examples/cra-react15/.storybook/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,14 @@ addParameters({
},
});

load(require.context('../src/stories', true, /\.stories\.js$/), module);
// test loading function
const loadFn = () => {
// place welcome first, test storiesof files
require('../src/stories/welcome.stories');

// test mixtures of storiesof & module files
const req = require.context('../src/stories', true, /\.stories\.js$/);
return req.keys().map(fname => req(fname));
};

load(loadFn, module);
13 changes: 5 additions & 8 deletions examples/cra-react15/src/stories/welcome.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import React from 'react';
import { storiesOf } from '@storybook/react';
import { linkTo } from '@storybook/addon-links';
import { Welcome } from '@storybook/react/demo';

export default {
title: 'Welcome',
parameters: {
storiesOf('Welcome', module)
.addParameters({
component: Welcome,
},
};

export const story1 = () => <Welcome showApp={linkTo('Button')} />;
story1.story = { name: 'to Storybook' };
})
.add('to Storybook', () => <Welcome showApp={linkTo('Button')} />);
3 changes: 1 addition & 2 deletions examples/html-kitchen-sink/.storybook/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ addParameters({
docs: DocsPage,
});

load(require.context('../stories', true, /\.stories\.js$/), module);
load(require.context('../stories', true, /\.stories\.mdx$/), module);
load(require.context('../stories', true, /\.stories\.(js|mdx)$/), module);
12 changes: 8 additions & 4 deletions examples/official-storybook/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ addParameters({
docs: DocsPage,
});

load(require.context('../../lib/ui/src', true, /\.stories\.js$/), module);
load(require.context('../../lib/components/src', true, /\.stories\.tsx?$/), module);
load(require.context('./stories', true, /\.stories\.js$/), module);
load(require.context('./stories', true, /\.stories\.mdx$/), module);
load(
[
require.context('../../lib/ui/src', true, /\.stories\.(js|tsx?|mdx)$/),
require.context('../../lib/components/src', true, /\.stories\.(js|tsx?|mdx)$/),
require.context('./stories', true, /\.stories\.(js|tsx?|mdx)$/),
],
module
);
Loading