From 0bf6b1a39fb780a281a35d73ce8d749476f67249 Mon Sep 17 00:00:00 2001
From: Michael Shilman <michael@lab80.co>
Date: Sat, 20 Jul 2019 17:09:08 +0800
Subject: [PATCH] CLI templates: Riot => module format

---
 .../RIOT/template/.storybook/config.js        |  9 ++------
 .../RIOT/template/stories/Button.stories.js   | 22 ++++++++++++++++++
 .../RIOT/template/stories/Welcome.stories.js  | 14 +++++++++++
 .../RIOT/template/stories/index.stories.js    | 23 -------------------
 4 files changed, 38 insertions(+), 30 deletions(-)
 create mode 100644 lib/cli/generators/RIOT/template/stories/Button.stories.js
 create mode 100644 lib/cli/generators/RIOT/template/stories/Welcome.stories.js
 delete mode 100644 lib/cli/generators/RIOT/template/stories/index.stories.js

diff --git a/lib/cli/generators/RIOT/template/.storybook/config.js b/lib/cli/generators/RIOT/template/.storybook/config.js
index d0b40b70cc6..7b3495417db 100644
--- a/lib/cli/generators/RIOT/template/.storybook/config.js
+++ b/lib/cli/generators/RIOT/template/.storybook/config.js
@@ -1,9 +1,4 @@
-import { configure } from '@storybook/riot';
+import { load } from '@storybook/riot';
 
 // automatically import all files ending in *.stories.js
-const req = require.context('../stories', true, /\.stories\.js$/);
-function loadStories() {
-  req.keys().forEach(filename => req(filename));
-}
-
-configure(loadStories, module);
+load(require.context('../stories', true, /\.stories\.js$/), module);
diff --git a/lib/cli/generators/RIOT/template/stories/Button.stories.js b/lib/cli/generators/RIOT/template/stories/Button.stories.js
new file mode 100644
index 00000000000..6b63839bdec
--- /dev/null
+++ b/lib/cli/generators/RIOT/template/stories/Button.stories.js
@@ -0,0 +1,22 @@
+import { mount } from '@storybook/riot';
+
+/* eslint-disable-next-line import/no-webpack-loader-syntax */
+import MyButtonRaw from 'raw-loader!./MyButton.tag';
+import './MyButton.tag';
+
+export default {
+  title: 'Button',
+};
+
+export const text = () => ({
+  tags: ['<my-button>Hello Button</my-button>'],
+});
+
+export const scenario = () => ({
+  tags: [{ content: MyButtonRaw, boundAs: 'MyButton' }],
+  template: '<MyButton>With scenario</MyButton>',
+});
+
+export const emoji = () => ({
+  tags: ['<my-button>😀 😎 👍 💯</my-button>'],
+});
diff --git a/lib/cli/generators/RIOT/template/stories/Welcome.stories.js b/lib/cli/generators/RIOT/template/stories/Welcome.stories.js
new file mode 100644
index 00000000000..aa73a890514
--- /dev/null
+++ b/lib/cli/generators/RIOT/template/stories/Welcome.stories.js
@@ -0,0 +1,14 @@
+import { mount } from '@storybook/riot';
+import { linkTo } from '@storybook/addon-links';
+
+import './Welcome.tag';
+
+export default {
+  title: 'Welcome',
+};
+
+export const toStorybook = () => mount('welcome', { showApp: () => linkTo('Button') });
+
+toStorybook.story = {
+  name: 'to Storybook',
+};
diff --git a/lib/cli/generators/RIOT/template/stories/index.stories.js b/lib/cli/generators/RIOT/template/stories/index.stories.js
deleted file mode 100644
index ffc636bfab0..00000000000
--- a/lib/cli/generators/RIOT/template/stories/index.stories.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { mount, storiesOf } from '@storybook/riot';
-import { linkTo } from '@storybook/addon-links';
-
-/* eslint-disable-next-line import/no-webpack-loader-syntax */
-import MyButtonRaw from 'raw-loader!./MyButton.tag';
-import './MyButton.tag';
-import './Welcome.tag';
-
-storiesOf('Welcome', module).add('to Storybook', () =>
-  mount('welcome', { showApp: () => linkTo('Button') })
-);
-
-storiesOf('Button', module)
-  .add('with text', () => ({
-    tags: ['<my-button>Hello Button</my-button>'],
-  }))
-  .add('with scenario', () => ({
-    tags: [{ content: MyButtonRaw, boundAs: 'MyButton' }],
-    template: '<MyButton>With scenario</MyButton>',
-  }))
-  .add('with some emoji', () => ({
-    tags: ['<my-button>😀 😎 👍 💯</my-button>'],
-  }));