Skip to content
This repository was archived by the owner on Jan 5, 2023. It is now read-only.

Commit b42be4e

Browse files
committed
Upgrade to make it comparible with storybook-3.0
1 parent f820005 commit b42be4e

File tree

8 files changed

+2162
-642
lines changed

8 files changed

+2162
-642
lines changed

.storybook/addons.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
import '@kadira/storybook/addons'
2-
import '@kadira/storybook-addon-knobs/register'
1+
import '@storybook/addon-knobs/register'

.storybook/config.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
// This is an auto generated file with React CDK.
44
// Do not modify this file.
55

6-
import { configure } from '@kadira/storybook'
7-
8-
window.STORYBOOK_REACT_CLASSES = {}
6+
import { configure } from '@storybook/react'
97

108
function loadStories () {
119
require('../example/stories')

.storybook/webpack.config.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@
44
// Do not modify this file.
55
// Use `.storybook/user/modify_webpack_config.js instead`.
66

7-
const config = {
7+
const path = require('path')
8+
9+
module.exports = {
810
module: {
9-
loaders: [
10-
{ test: /\.css?$/, loader: 'style!css' },
11-
],
12-
},
11+
rules: [
12+
{
13+
test: /\.(css)$/,
14+
loaders: ['style-loader', 'css-loader'],
15+
include: path.resolve(__dirname, '../')
16+
}
17+
]
18+
}
1319
}
14-
15-
module.exports = config

dist/index.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
99

1010
var _react = require('react');
1111

12-
var _storybookAddonActions = require('@kadira/storybook-addon-actions');
12+
var _addonActions = require('@storybook/addon-actions');
1313

14-
var _storybookAddonKnobs = require('@kadira/storybook-addon-knobs');
14+
var _addonKnobs = require('@storybook/addon-knobs');
1515

1616
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
1717

@@ -43,9 +43,9 @@ var propTypeKnobResolver = exports.propTypeKnobResolver = function propTypeKnobR
4343

4444
/* eslint-disable no-multi-spaces */
4545
// Default simple PropType based knob map.
46-
var propTypeKnobsMap = [{ name: 'string', knob: _storybookAddonKnobs.text }, { name: 'number', knob: _storybookAddonKnobs.number }, { name: 'bool', knob: _storybookAddonKnobs.boolean }, { name: 'func', knob: function knob(name, value) {
47-
return value || (0, _storybookAddonActions.action)(name);
48-
} }, { name: 'object', knob: _storybookAddonKnobs.object }, { name: 'node', knob: _storybookAddonKnobs.text }, { name: 'element', knob: _storybookAddonKnobs.text }];
46+
var propTypeKnobsMap = [{ name: 'string', knob: _addonKnobs.text }, { name: 'number', knob: _addonKnobs.number }, { name: 'bool', knob: _addonKnobs.boolean }, { name: 'func', knob: function knob(name, value) {
47+
return value || (0, _addonActions.action)(name);
48+
} }, { name: 'object', knob: _addonKnobs.object }, { name: 'node', knob: _addonKnobs.text }, { name: 'element', knob: _addonKnobs.text }];
4949

5050
propTypeKnobsMap.forEach(function (_ref2, weight) {
5151
var name = _ref2.name,
@@ -76,7 +76,7 @@ addKnobResolver({
7676
return _extends({}, res, _defineProperty({}, value, value));
7777
}, {});
7878

79-
return (0, _storybookAddonKnobs.select)(propName, _extends({ '': '--' }, options), defaultProps[propName]);
79+
return (0, _addonKnobs.select)(propName, _extends({ '': '--' }, options), defaultProps[propName]);
8080
} catch (e) {}
8181
}
8282
}
@@ -92,6 +92,7 @@ var withSmartKnobs = exports.withSmartKnobs = function withSmartKnobs(story, con
9292

9393
var finalProps = props ? Object.keys(props).reduce(function (acc, n) {
9494
var item = props[n];
95+
9596
if (!item.type) {
9697
console.warn('There is a prop with defaultValue ' + item.defaultValue.value + ' but it wasnt specified on element.propTypes. Check story: "' + context.kind + '".');
9798
return acc;

example/stories/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React from 'react'
2-
import { storiesOf } from '@kadira/storybook'
2+
import { storiesOf } from '@storybook/react'
33
import { withSmartKnobs } from '../../src'
4-
import { withKnobs, select } from '@kadira/storybook-addon-knobs';
4+
import { withKnobs, select } from '@storybook/addon-knobs'
55

66
import SmartKnobedComponent from './SmartKnobedComponent'
77
import SmartKnobedComponentMissingProps from './SmartKnobedComponentMissingProps'
88

9-
const stub = fn => fn();
9+
const stub = fn => fn()
1010

1111
storiesOf('Example of smart Knobs', module)
1212
.addDecorator(withSmartKnobs)
@@ -27,5 +27,5 @@ storiesOf('Smart Knobs with manual knobs', module)
2727
.addDecorator(withSmartKnobs)
2828
.addDecorator(withKnobs)
2929
.add('example', () => (
30-
<SmartKnobedComponent string={ select('string', ['1', '2', '3'], '2') }/>
30+
<SmartKnobedComponent string={ select('string', ['1', '2', '3'], '2') } />
3131
))

package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,23 @@
1313
"author": "",
1414
"license": "MIT",
1515
"peerDependencies": {
16-
"@kadira/storybook-addon-actions": "^3.0.0",
17-
"@kadira/storybook-addon-knobs": "^3.0.0",
16+
"@storybook/addon-knobs": "^3.0.0",
17+
"@storybook/addon-options": "^3.0.0",
18+
"@storybook/react": "^3.0.0",
1819
"react": "^0.14.7 || ^15.0.0"
1920
},
2021
"devDependencies": {
21-
"@kadira/storybook": "^3.0.0",
22-
"@kadira/storybook-addon-knobs": "^9.0.0",
22+
"@storybook/addon-knobs": "^3.0.0",
23+
"@storybook/addon-options": "^3.0.0",
24+
"@storybook/react": "^3.0.0",
2325
"babel-cli": "^6.16.0",
2426
"babel-plugin-react-docgen": "^1.3.0",
2527
"babel-preset-es2015": "^6.16.0",
2628
"babel-preset-react": "^6.16.0",
2729
"babel-preset-stage-0": "^6.16.0",
2830
"css-loader": "^0.25.0",
2931
"eslint-config-taller": "^1.0.2",
32+
"jest": "^20.0.4",
3033
"react": "^0.14.7 || ^15.0.0",
3134
"react-dom": "^15.3.2"
3235
}

src/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { cloneElement } from 'react'
2-
import { action } from '@kadira/storybook-addon-actions'
3-
import { withKnobs, text, boolean, number, object, select } from '@kadira/storybook-addon-knobs'
2+
import { action } from '@storybook/addon-actions'
3+
import { withKnobs, text, boolean, number, object, select } from '@storybook/addon-knobs'
44

55
const knobResolvers = {}
66
export const addKnobResolver = ({ name, resolver, weight = 0 }) => (knobResolvers[name] = { name, resolver, weight })

0 commit comments

Comments
 (0)