[chore] Migrate storybook dependencies. Still some work to do with we…

…bpack-config
sanity-io · Sep 10, 2017 · 5132adb · 5132adb
1 parent 42b4640
commit 5132adb
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 11 deletions.
diff --git a/packages/@sanity/storybook/package.json b/packages/@sanity/storybook/package.json
@@ -21,16 +21,18 @@
   },
   "homepage": "https://github.com/sanity-io/sanity#readme",
   "dependencies": {
-    "@kadira/storybook": "^2.35.3",
-    "@kadira/storybook-addon-knobs": "^1.7.1",
-    "@kadira/storybook-addons": "^1.6.1",
+    "@storybook/react": "^3.2.8",
+    "@storybook/addons": "^3.2.6",
+    "@storybook/addon-knobs": "^3.2.8",
     "@sanity/server": "^0.111.2",
     "normalize.css": "^5.0.0",
     "react-addons-create-fragment": "^15.4.2",
     "shelljs": "^0.7.6"
   },
   "devDependencies": {
     "babel-eslint": "^7.2.1",
-    "eslint": "^3.19.0"
+    "eslint": "^3.19.0",
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1"
   }
 }
diff --git a/packages/@sanity/storybook/src/addons/Knobs.js b/packages/@sanity/storybook/src/addons/Knobs.js
@@ -1 +1 @@
-module.exports = require('@kadira/storybook-addon-knobs')
+module.exports = require('@storybook/addon-knobs')
diff --git a/packages/@sanity/storybook/src/addons/sanity/Sanity.js b/packages/@sanity/storybook/src/addons/sanity/Sanity.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types'
 import React, { PureComponent } from 'react'; // eslint-disable-line no-unused-vars
-import addons from '@kadira/storybook-addons'
+import addons from '@storybook/addons'
 import parts from 'sanity:debug'
 import extractPropTypes from './extractPropTypes'
 

diff --git a/packages/@sanity/storybook/src/addons/sanity/SanityPanel.js b/packages/@sanity/storybook/src/addons/sanity/SanityPanel.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types'
 /* eslint-disable react/no-multi-comp */
 import React from 'react'
-import addons from '@kadira/storybook-addons'
+import addons from '@storybook/addons'
 import PropTable from './PropTable'
 import styles from './styles/SanityPanel.css'
 

diff --git a/packages/@sanity/storybook/src/config/addons.js b/packages/@sanity/storybook/src/config/addons.js
@@ -1,3 +1,3 @@
-import '@kadira/storybook/addons'
-import '@kadira/storybook-addon-knobs/register'
+import '@storybook/addons'
+import '@storybook/addon-knobs/register'
 import '../addons/sanity/SanityPanel'
diff --git a/packages/@sanity/storybook/src/config/webpack.config.js b/packages/@sanity/storybook/src/config/webpack.config.js
@@ -1,5 +1,8 @@
 const sanityServer = require('@sanity/server')
 
+// todo: do something with this, according to https://storybook.js.org/configurations/custom-webpack-config/
+const genDefaultConfig = require('@storybook/react/dist/server/config/defaults/webpack.config.js')
+
 // This is very hacky, but I couldn't figure out a way to pass config from
 // the parent task onto this configuration, which we need to infer the base
 // path of the Sanity project in question, along with listener options et all.

diff --git a/packages/@sanity/storybook/src/index.js b/packages/@sanity/storybook/src/index.js
@@ -1,4 +1,4 @@
-const storyBook = require('@kadira/storybook')
+const storyBook = require('@storybook/react')
 const sortByName = (storyA, storyB) => (storyB.name || '').localeCompare(storyA.name || '')
 const registerStoryKind = storyBook.storiesOf
 

diff --git a/packages/@sanity/storybook/src/server/server.js b/packages/@sanity/storybook/src/server/server.js
@@ -3,7 +3,7 @@
 /* eslint-disable no-process-exit, no-console */
 const path = require('path')
 const express = require('express')
-const middleware = require('@kadira/storybook/dist/server/middleware')
+const middleware = require('@storybook/react/dist/server/middleware')
 const webpackConfig = require('../config/webpack.config')
 const storybook = middleware.default || middleware