Skip to content

Commit

Permalink
Update to React 16 and Storybook 3
Browse files Browse the repository at this point in the history
  • Loading branch information
usulpro committed Oct 14, 2017
1 parent ce8cea8 commit cb0364c
Show file tree
Hide file tree
Showing 6 changed files with 6,286 additions and 16 deletions.
Empty file modified .scripts/prepublish.sh
100644 → 100755
Empty file.
3 changes: 1 addition & 2 deletions .storybook/addons.js
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
import '@kadira/storybook/addons';
import '@kadira/storybook-addon-knobs/register';
import '@storybook/addon-knobs/register';
2 changes: 1 addition & 1 deletion .storybook/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// This is an auto generated file with React CDK.
// Do not modify this file.

import { configure } from '@kadira/storybook';
import { configure } from '@storybook/react';

function loadStories() {
require('../src/stories');
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-material-color-picker",
"version": "1.1.0",
"version": "1.1.1",
"description": "React Material Color Picker Component",
"repository": {
"type": "git",
Expand All @@ -18,7 +18,7 @@
"homepage": "https://github.com/sm-react/react-material-color-picker",
"scripts": {
"publish-storybook": ".scripts\\publish_storybook.cmd",
"prepublish": ".scripts\\prepublish.cmd",
"prepublish": ".scripts/prepublish.sh",
"lint": ".scripts\\lint.cmd src",
"lintfix": ".scripts\\lint.cmd src --fix",
"testonly": ".scripts\\test.cmd",
Expand All @@ -28,10 +28,6 @@
"start": "start-storybook -p 9001"
},
"devDependencies": {
"@kadira/react-storybook-addon-info": "^3.2.1",
"@kadira/storybook": "^2.5.2",
"@kadira/storybook-addon-knobs": "^1.0.1",
"@kadira/storybook-addons": "^1.5.0",
"babel-cli": "^6.5.0",
"babel-core": "^6.5.0",
"babel-eslint": "^6.0.2",
Expand All @@ -51,13 +47,17 @@
"git-url-parse": "^6.0.1",
"jsdom": "^8.3.1",
"mocha": "^2.4.5",
"react": "^15.0.0",
"react": "^16.0.0",
"react-addons-test-utils": "^15.0.0",
"react-dom": "^15.0.0",
"sinon": "^1.17.3"
"react-dom": "^16.0.0",
"sinon": "^1.17.3",
"@storybook/addons": "3.2.12",
"@storybook/react": "3.2.12",
"@storybook/addon-knobs": "3.2.12",
"@storybook/addon-info": "3.2.12"
},
"peerDependencies": {
"react": "^0.14.7 || ^15.0.0"
"react": "^0.14.7 || ^15.0.0 || ^16.0.0"
},
"dependencies": {
"babel-runtime": "^6.5.0",
Expand Down
6 changes: 3 additions & 3 deletions src/stories/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { storiesOf, action, setAddon } from '@kadira/storybook';
import infoAddon from '@kadira/react-storybook-addon-info';
import { withKnobs, text, object } from '@kadira/storybook-addon-knobs';
import { storiesOf, action, setAddon } from '@storybook/react';
import infoAddon from '@storybook/addon-info';
import { withKnobs, text, object } from '@storybook/addon-knobs';

// import MaterialColorPicker from 'react-material-color-picker';
import MaterialColorPicker from '../MaterialColorPicker.jsx';
Expand Down
Loading

0 comments on commit cb0364c

Please sign in to comment.