From 4f33b50b288e1f63a2425ed1cfd3a46bbafefc59 Mon Sep 17 00:00:00 2001 From: Evgeny Kochetkov Date: Tue, 13 Jun 2017 15:28:11 +0300 Subject: [PATCH] migrate to storybook v3 Closes #3 --- .storybook/addons.js | 2 -- .storybook/config.js | 2 +- example/basicUsage.story.js | 2 +- index.js | 6 +++--- package.json | 4 ++-- register.js | 10 +++++----- src/index.js | 2 +- src/register.js | 2 +- 8 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.storybook/addons.js b/.storybook/addons.js index a09d793..d33eec8 100644 --- a/.storybook/addons.js +++ b/.storybook/addons.js @@ -1,3 +1 @@ -import '@kadira/storybook/addons'; - import '../src/register'; diff --git a/.storybook/config.js b/.storybook/config.js index 46bc5f3..0902d96 100644 --- a/.storybook/config.js +++ b/.storybook/config.js @@ -1,4 +1,4 @@ -import { configure, setAddon } from '@kadira/storybook' +import { configure, setAddon } from '@storybook/react' import staticMarkup from '../src/' diff --git a/example/basicUsage.story.js b/example/basicUsage.story.js index 670f310..49bd9e4 100644 --- a/example/basicUsage.story.js +++ b/example/basicUsage.story.js @@ -1,5 +1,5 @@ import React from 'react'; -import { storiesOf } from '@kadira/storybook'; +import { storiesOf } from '@storybook/react'; import { ShowStaticMarkup } from '../src' diff --git a/index.js b/index.js index c09edec..4375c16 100644 --- a/index.js +++ b/index.js @@ -29,9 +29,9 @@ var _react = require('react'); var _react2 = _interopRequireDefault(_react); -var _storybookAddons = require('@kadira/storybook-addons'); +var _addons = require('@storybook/addons'); -var _storybookAddons2 = _interopRequireDefault(_storybookAddons); +var _addons2 = _interopRequireDefault(_addons); var _pretty = require('pretty'); @@ -59,7 +59,7 @@ var ShowStaticMarkup = exports.ShowStaticMarkup = function (_React$Component) { var markup = (0, _pretty2.default)(_server2.default.renderToStaticMarkup(children)); - var channel = _storybookAddons2.default.getChannel(); + var channel = _addons2.default.getChannel(); channel.emit('evgenykochetkov/static-markup/show-markup', markup); return children; diff --git a/package.json b/package.json index 19900a9..0fd96dd 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ }, "license": "ISC", "devDependencies": { - "@kadira/storybook": "^2.33.1", "@kadira/storybook-deployer": "^1.2.0", "babel-cli": "^6.18.0", "babel-core": "^6.18.2", @@ -32,7 +31,8 @@ "babel-preset-react": "^6.16.0", "babel-preset-stage-2": "^6.18.0", "react": "^15.4.1", - "react-dom": "^15.4.1" + "react-dom": "^15.4.1", + "@storybook/react": "3.1.3" }, "dependencies": { "pretty": "^2.0.0" diff --git a/register.js b/register.js index 3776399..9bf73d8 100644 --- a/register.js +++ b/register.js @@ -24,9 +24,9 @@ var _react = require('react'); var _react2 = _interopRequireDefault(_react); -var _storybookAddons = require('@kadira/storybook-addons'); +var _addons = require('@storybook/addons'); -var _storybookAddons2 = _interopRequireDefault(_storybookAddons); +var _addons2 = _interopRequireDefault(_addons); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -121,12 +121,12 @@ var StaticMarkup = function (_React$Component) { // Register the addon with a unique name. -_storybookAddons2.default.register('evgenykochetkov/static-markup', function (api) { +_addons2.default.register('evgenykochetkov/static-markup', function (api) { // Also need to set a unique name to the panel. - _storybookAddons2.default.addPanel('evgenykochetkov/static-markup/panel', { + _addons2.default.addPanel('evgenykochetkov/static-markup/panel', { title: 'Static Markup', render: function render() { - return _react2.default.createElement(StaticMarkup, { channel: _storybookAddons2.default.getChannel(), api: api }); + return _react2.default.createElement(StaticMarkup, { channel: _addons2.default.getChannel(), api: api }); } }); }); \ No newline at end of file diff --git a/src/index.js b/src/index.js index 8360e7f..990cbb6 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,5 @@ import React from 'react' -import addons from '@kadira/storybook-addons'; +import addons from '@storybook/addons'; import pretty from 'pretty'; import ReactDOMServer from 'react-dom/server' diff --git a/src/register.js b/src/register.js index 677eb72..a2cd4fb 100644 --- a/src/register.js +++ b/src/register.js @@ -1,5 +1,5 @@ import React from 'react'; -import addons from '@kadira/storybook-addons'; +import addons from '@storybook/addons'; const styles = { markupPanel: {