Migrated to storybook3 with the necessary webpack config changes (#628)

jquense · Nov 28, 2017 · bfc1450 · bfc1450
1 parent fd91e81
commit bfc1450
Show file tree

Hide file tree

Showing 5 changed files with 3,025 additions and 2,332 deletions.
diff --git a/.storybook/config.js b/.storybook/config.js
@@ -1,4 +1,4 @@
-import { configure } from '@kadira/storybook';
+import { configure } from '@storybook/react';
 
 function loadStories() {
   require('../stories');

diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
@@ -3,10 +3,10 @@ const Autoprefixer = require('less-plugin-autoprefix');
 
 module.exports = {
   resolve: {
-    extensions: ['', '.js', '.jsx']
+    extensions: ['.js', '.jsx']
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.css?$/,
         loaders: [ 'style', 'raw' ],
@@ -16,7 +16,20 @@ module.exports = {
       },
       {
         test: /\.less?$/,
-        loader: 'style-loader!css-loader!less-loader',
+        use: [
+          'style-loader',
+          'css-loader',
+          {
+            loader: 'less-loader',
+            options: {
+              plugins: [
+                new Autoprefixer({
+                  browsers: ['last 2 versions', 'ie >= 10']
+                })
+              ]
+            },
+          }
+        ],
         include: [
           path.resolve(__dirname, '../')
         ]
@@ -26,13 +39,5 @@ module.exports = {
       {test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file'},
       {test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=image/svg+xml'}
     ]
-  },
-
-  lessLoader: {
-    lessPlugins: [
-      new Autoprefixer({
-        browsers: ['last 2 versions', 'ie >= 10']
-      })
-    ]
   }
 };
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "react-dom": "^15.3.0 || ^16.0.0"
   },
   "devDependencies": {
-    "@kadira/storybook": "^1.28.1",
+    "@storybook/react": "3.2.16",
     "babel-cli": "^6.7.5",
     "babel-core": "^6.7.6",
     "babel-eslint": "^6.0.2",
@@ -58,7 +58,7 @@
     "eslint-plugin-import": "^2.0.0",
     "eslint-plugin-react": "^6.8.0",
     "globalize": "^0.1.1",
-    "less": "^2.7.2",
+    "less": "^2.7.3",
     "less-plugin-autoprefix": "^1.5.1",
     "markdown-jsx-loader": "^2.0.1",
     "marked": "^0.3.5",

diff --git a/stories/Calendar.js b/stories/Calendar.js
@@ -1,4 +1,4 @@
-import { storiesOf, action } from '@kadira/storybook';
+import { storiesOf, action } from '@storybook/react';
 import moment from 'moment';
 import React from 'react';