Upgrade storybook

diegohaz · diegohaz · Jun 5, 2017 · Jun 3, 2017 · Jun 5, 2017 · Jun 3, 2017
commit 68bcfe4309fb023e59ef0f7b7596e1a13bfe3b64
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,7 +33,8 @@
     }
   },
   "devDependencies": {
-    "@kadira/storybook": "^2.35.2",
+    "@storybook/addon-actions": "^3.0.0",
+    "@storybook/react": "^3.0.0",
     "@webpack-blocks/dev-server2": "^0.4.0",
     "@webpack-blocks/webpack2": "^0.4.0",
     "babel-core": "^6.24.1",

diff --git a/private/storybook/config.js b/private/storybook/config.js
@@ -1,6 +1,6 @@
 // https://github.com/diegohaz/arc/wiki/Storybook
 import React from 'react'
-import { configure, addDecorator } from '@kadira/storybook'
+import { configure, addDecorator } from '@storybook/react'
 import { BrowserRouter } from 'react-router-dom'
 import { ThemeProvider } from 'styled-components'
 import theme from 'components/themes/default'

diff --git a/private/storybook/webpack.config.js b/private/storybook/webpack.config.js
@@ -2,10 +2,10 @@ const baseConfig = require('../../webpack.config')
 
 module.exports = storybookBaseConfig =>
   Object.assign({}, storybookBaseConfig, {
-    resolve: {
-      modulesDirectories: baseConfig.resolve.modules,
-    },
+    resolve: Object.assign({}, storybookBaseConfig.resolve, {
+      modules: baseConfig.resolve.modules,
+    }),
     module: Object.assign({}, storybookBaseConfig.module, {
-      loaders: storybookBaseConfig.module.loaders.concat(baseConfig.module.rules.slice(1)),
+      rules: storybookBaseConfig.module.rules.concat(baseConfig.module.rules.slice(1)),
     }),
   })
diff --git a/src-example/components/atoms/Atom/index.stories.js b/src-example/components/atoms/Atom/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Atom from '.'
 
 storiesOf('Atom', module)

diff --git a/src-example/components/atoms/Badge/index.stories.js b/src-example/components/atoms/Badge/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Badge from '.'
 
 storiesOf('Badge', module)

diff --git a/src-example/components/atoms/Block/index.stories.js b/src-example/components/atoms/Block/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Block from '.'
 
 storiesOf('Block', module)

diff --git a/src-example/components/atoms/Button/index.stories.js b/src-example/components/atoms/Button/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Button from '.'
 
 storiesOf('Button', module)

diff --git a/src-example/components/atoms/Caption/index.stories.js b/src-example/components/atoms/Caption/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Caption from '.'
 
 storiesOf('Caption', module)

diff --git a/src-example/components/atoms/Heading/index.stories.js b/src-example/components/atoms/Heading/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Heading from '.'
 
 storiesOf('Heading', module)

diff --git a/src-example/components/atoms/HorizontalRule/index.stories.js b/src-example/components/atoms/HorizontalRule/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import HorizontalRule from '.'
 
 storiesOf('HorizontalRule', module)

diff --git a/src-example/components/atoms/Icon/index.stories.js b/src-example/components/atoms/Icon/index.stories.js
@@ -1,6 +1,6 @@
 // https://github.com/diegohaz/arc/wiki/Example-components#icon
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Icon from '.'
 
 storiesOf('Icon', module)

diff --git a/src-example/components/atoms/Input/index.stories.js b/src-example/components/atoms/Input/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Input from '.'
 
 storiesOf('Input', module)

diff --git a/src-example/components/atoms/Label/index.stories.js b/src-example/components/atoms/Label/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Label from '.'
 
 storiesOf('Label', module)

diff --git a/src-example/components/atoms/Link/index.stories.js b/src-example/components/atoms/Link/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Link from '.'
 
 storiesOf('Link', module)

diff --git a/src-example/components/atoms/List/index.stories.js b/src-example/components/atoms/List/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import List from '.'
 
 storiesOf('List', module)

diff --git a/src-example/components/atoms/LogoImage/index.stories.js b/src-example/components/atoms/LogoImage/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import LogoImage from '.'
 
 storiesOf('LogoImage', module)

diff --git a/src-example/components/atoms/Paragraph/index.stories.js b/src-example/components/atoms/Paragraph/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Paragraph from '.'
 
 storiesOf('Paragraph', module)

diff --git a/src-example/components/atoms/PreformattedText/index.stories.js b/src-example/components/atoms/PreformattedText/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import PreformattedText from '.'
 
 storiesOf('PreformattedText', module)

diff --git a/src-example/components/atoms/Spinner/index.stories.js b/src-example/components/atoms/Spinner/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Spinner from '.'
 
 storiesOf('Spinner', module)

diff --git a/src-example/components/atoms/TableCell/index.stories.js b/src-example/components/atoms/TableCell/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import TableCell from '.'
 
 storiesOf('TableCell', module)

diff --git a/src-example/components/atoms/TableRow/index.stories.js b/src-example/components/atoms/TableRow/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import TableRow from '.'
 
 storiesOf('TableRow', module)

diff --git a/src-example/components/atoms/Tooltip/index.stories.js b/src-example/components/atoms/Tooltip/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import Tooltip from '.'
 
 storiesOf('Tooltip', module)

diff --git a/src-example/components/molecules/Blockquote/index.stories.js b/src-example/components/molecules/Blockquote/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { Blockquote } from 'components'
 
 storiesOf('Blockquote', module)

diff --git a/src-example/components/molecules/Feature/index.stories.js b/src-example/components/molecules/Feature/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { Feature } from 'components'
 
 storiesOf('Feature', module)

diff --git a/src-example/components/molecules/Field/index.stories.js b/src-example/components/molecules/Field/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { Field } from 'components'
 
 storiesOf('Field', module)

diff --git a/src-example/components/molecules/IconButton/index.stories.js b/src-example/components/molecules/IconButton/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { IconButton } from 'components'
 
 storiesOf('IconButton', module)

diff --git a/src-example/components/molecules/IconLink/index.stories.js b/src-example/components/molecules/IconLink/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { IconLink } from 'components'
 
 storiesOf('IconLink', module)

diff --git a/src-example/components/molecules/Modal/index.stories.js b/src-example/components/molecules/Modal/index.stories.js
@@ -1,5 +1,6 @@
 import React from 'react'
-import { storiesOf, action } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
+import { action } from '@storybook/addon-actions'
 import { Modal } from 'components'
 
 storiesOf('Modal', module)

diff --git a/src-example/components/molecules/Molecule/index.stories.js b/src-example/components/molecules/Molecule/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { Molecule } from 'components'
 
 storiesOf('Molecule', module)

diff --git a/src-example/components/molecules/PrimaryNavigation/index.stories.js b/src-example/components/molecules/PrimaryNavigation/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { PrimaryNavigation } from 'components'
 
 storiesOf('PrimaryNavigation', module)

diff --git a/src-example/components/molecules/Slider/index.stories.js b/src-example/components/molecules/Slider/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { Slider } from 'components'
 
 storiesOf('Slider', module)

diff --git a/src-example/components/molecules/Table/index.stories.js b/src-example/components/molecules/Table/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { Table } from 'components'
 
 storiesOf('Table', module)

diff --git a/src-example/components/organisms/FeatureList/index.stories.js b/src-example/components/organisms/FeatureList/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { FeatureList } from 'components'
 
 storiesOf('FeatureList', module)

diff --git a/src-example/components/organisms/Footer/index.stories.js b/src-example/components/organisms/Footer/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { Footer } from 'components'
 
 storiesOf('Footer', module)

diff --git a/src-example/components/organisms/Header/index.stories.js b/src-example/components/organisms/Header/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { Header } from 'components'
 
 storiesOf('Header', module)

diff --git a/src-example/components/organisms/Hero/index.stories.js b/src-example/components/organisms/Hero/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { Hero } from 'components'
 
 storiesOf('Hero', module)

diff --git a/src-example/components/organisms/Organism/index.stories.js b/src-example/components/organisms/Organism/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { Organism } from 'components'
 
 storiesOf('Organism', module)

diff --git a/src-example/components/pages/GenericPage/index.stories.js b/src-example/components/pages/GenericPage/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { GenericPage } from 'components'
 
 storiesOf('GenericPage', module)

diff --git a/src-example/components/pages/HomePage/index.stories.js b/src-example/components/pages/HomePage/index.stories.js
@@ -1,6 +1,6 @@
 // https://github.com/diegohaz/arc/wiki/Storybook
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { HomePage } from 'components'
 
 storiesOf('HomePage', module)

diff --git a/src-example/components/pages/NotFoundPage/index.stories.js b/src-example/components/pages/NotFoundPage/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { NotFoundPage } from 'components'
 
 storiesOf('NotFoundPage', module)

diff --git a/src-example/components/pages/SamplePage/index.stories.js b/src-example/components/pages/SamplePage/index.stories.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { SamplePage } from 'components'
 
 storiesOf('SamplePage', module)

diff --git a/src/components/pages/HomePage/index.stories.js b/src/components/pages/HomePage/index.stories.js
@@ -1,6 +1,6 @@
 // https://github.com/diegohaz/arc/wiki/Storybook
 import React from 'react'
-import { storiesOf } from '@kadira/storybook'
+import { storiesOf } from '@storybook/react'
 import { HomePage } from 'components'
 
 storiesOf('HomePage', module)