6 files changed, 13 insertions, 12 deletions
diff --git a/storybook/config.js b/storybook/config.js
index 9b0f53172..1078059a7 100644
--- a/storybook/config.js
+++ b/storybook/config.js
@@ -1,6 +1,5 @@
-import { configure, setAddon } from '@kadira/storybook';
+import { configure } from '@storybook/react';
 import React from 'react';
-import { storiesOf, action } from '@kadira/storybook';
 import { addLocaleData } from 'react-intl';
 import en from 'react-intl/locale-data/en';
 import '../app/javascript/styles/application.scss';
diff --git a/storybook/stories/autosuggest_textarea.story.js b/storybook/stories/autosuggest_textarea.story.js
index 32d0604e4..65dfe965c 100644
--- a/storybook/stories/autosuggest_textarea.story.js
+++ b/storybook/stories/autosuggest_textarea.story.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { List } from 'immutable';
-import { action, storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import AutosuggestTextarea from 'mastodon/components/autosuggest_textarea';
 
 const props = {
diff --git a/storybook/stories/button.story.js b/storybook/stories/button.story.js
index 3fd45cb82..628deed0a 100644
--- a/storybook/stories/button.story.js
+++ b/storybook/stories/button.story.js
@@ -1,5 +1,6 @@
 import React from 'react';
-import { action, storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import Button from 'mastodon/components/button';
 
 storiesOf('Button', module)
diff --git a/storybook/stories/character_counter.story.js b/storybook/stories/character_counter.story.js
index eb6eae7d8..15a401a25 100644
--- a/storybook/stories/character_counter.story.js
+++ b/storybook/stories/character_counter.story.js
@@ -1,5 +1,6 @@
 import React from 'react';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import CharacterCounter from 'mastodon/features/compose/components/character_counter';
 
 storiesOf('CharacterCounter', module)
diff --git a/storybook/stories/loading_indicator.story.js b/storybook/stories/loading_indicator.story.js
index 84d722d69..3e12f61ca 100644
--- a/storybook/stories/loading_indicator.story.js
+++ b/storybook/stories/loading_indicator.story.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { IntlProvider } from 'react-intl';
-import { storiesOf } from '@kadira/storybook';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import en from 'mastodon/locales/en.json';
 import LoadingIndicator from 'mastodon/components/loading_indicator';
 
diff --git a/storybook/webpack.config.js b/storybook/webpack.config.js
index 8e268077d..054889b03 100644
--- a/storybook/webpack.config.js
+++ b/storybook/webpack.config.js
@@ -2,7 +2,7 @@ const path = require('path');
 
 module.exports = {
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.(jpg|jpeg|png|gif|svg|eot|ttf|woff|woff2)$/i,
         loader: 'url-loader',
@@ -14,10 +14,8 @@ module.exports = {
     ],
   },
   resolve: {
-    modulesDirectories: [
-      path.resolve(__dirname, '..', 'storybook'),
-      path.resolve(__dirname, '..', 'app', 'javascript'),
-      path.resolve(__dirname, '..', 'node_modules'),
-    ],
+    alias: {
+      mastodon: path.resolve(__dirname, '..', 'app', 'javascript', 'mastodon'),
+    },
   },
 };