Skip to content

Commit cb0364c

Browse files
committed
Update to React 16 and Storybook 3
1 parent ce8cea8 commit cb0364c

File tree

6 files changed

+6286
-16
lines changed

6 files changed

+6286
-16
lines changed

.scripts/prepublish.sh

100644100755
File mode changed.

.storybook/addons.js

+1-2
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +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';
6+
import { configure } from '@storybook/react';
77

88
function loadStories() {
99
require('../src/stories');

package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-material-color-picker",
3-
"version": "1.1.0",
3+
"version": "1.1.1",
44
"description": "React Material Color Picker Component",
55
"repository": {
66
"type": "git",
@@ -18,7 +18,7 @@
1818
"homepage": "https://github.com/sm-react/react-material-color-picker",
1919
"scripts": {
2020
"publish-storybook": ".scripts\\publish_storybook.cmd",
21-
"prepublish": ".scripts\\prepublish.cmd",
21+
"prepublish": ".scripts/prepublish.sh",
2222
"lint": ".scripts\\lint.cmd src",
2323
"lintfix": ".scripts\\lint.cmd src --fix",
2424
"testonly": ".scripts\\test.cmd",
@@ -28,10 +28,6 @@
2828
"start": "start-storybook -p 9001"
2929
},
3030
"devDependencies": {
31-
"@kadira/react-storybook-addon-info": "^3.2.1",
32-
"@kadira/storybook": "^2.5.2",
33-
"@kadira/storybook-addon-knobs": "^1.0.1",
34-
"@kadira/storybook-addons": "^1.5.0",
3531
"babel-cli": "^6.5.0",
3632
"babel-core": "^6.5.0",
3733
"babel-eslint": "^6.0.2",
@@ -51,13 +47,17 @@
5147
"git-url-parse": "^6.0.1",
5248
"jsdom": "^8.3.1",
5349
"mocha": "^2.4.5",
54-
"react": "^15.0.0",
50+
"react": "^16.0.0",
5551
"react-addons-test-utils": "^15.0.0",
56-
"react-dom": "^15.0.0",
57-
"sinon": "^1.17.3"
52+
"react-dom": "^16.0.0",
53+
"sinon": "^1.17.3",
54+
"@storybook/addons": "3.2.12",
55+
"@storybook/react": "3.2.12",
56+
"@storybook/addon-knobs": "3.2.12",
57+
"@storybook/addon-info": "3.2.12"
5858
},
5959
"peerDependencies": {
60-
"react": "^0.14.7 || ^15.0.0"
60+
"react": "^0.14.7 || ^15.0.0 || ^16.0.0"
6161
},
6262
"dependencies": {
6363
"babel-runtime": "^6.5.0",

src/stories/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
2-
import { storiesOf, action, setAddon } from '@kadira/storybook';
3-
import infoAddon from '@kadira/react-storybook-addon-info';
4-
import { withKnobs, text, object } from '@kadira/storybook-addon-knobs';
2+
import { storiesOf, action, setAddon } from '@storybook/react';
3+
import infoAddon from '@storybook/addon-info';
4+
import { withKnobs, text, object } from '@storybook/addon-knobs';
55

66
// import MaterialColorPicker from 'react-material-color-picker';
77
import MaterialColorPicker from '../MaterialColorPicker.jsx';

0 commit comments

Comments
 (0)