Merge branch 'master' into master

storybookjs · Oct 29, 2017 · 9c368a4 · 9c368a4
2 parents 50254ea + ec07bb0
commit 9c368a4
Show file tree

Hide file tree

Showing 11 changed files with 3,631 additions and 37 deletions.
diff --git a/examples/cra-kitchen-sink/.storybook/config.js b/examples/cra-kitchen-sink/.storybook/config.js
@@ -1,5 +1,7 @@
 import { configure, setAddon } from '@storybook/react';
 import { setOptions } from '@storybook/addon-options';
+
+// deprecated usage of infoAddon
 import infoAddon from '@storybook/addon-info';
 
 setOptions({
@@ -14,11 +16,15 @@ setOptions({
   hierarchySeparator: /\/|\./,
 });
 
+// deprecated usage of infoAddon
 setAddon(infoAddon);
 
+// put welcome screen at the top of the list so it's the first one displayed
+require('../src/stories/welcome');
+
+const req = require.context('../src/stories', true, /\.stories\.js$/)
 function loadStories() {
-  require('../src/stories/index');
-  require('../src/stories/storybook-components');
+  req.keys().forEach((filename) => req(filename))
 }
 
 configure(loadStories, module);