From f466b71d96b2119d3e0b82857945dcb6d62aa2f7 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 9 May 2017 22:29:57 +0200 Subject: [PATCH 1/6] UPDATE everything --- examples/cra-storybook/package.json | 4 ++-- examples/test-cra/package.json | 4 ++-- package.json | 10 +++++----- packages/addon-actions/package.json | 6 +++--- packages/addon-comments/package.json | 10 +++++----- packages/addon-graphql/package.json | 2 +- packages/addon-info/package.json | 6 +++--- packages/addon-knobs/package.json | 2 +- packages/addon-notes/package.json | 8 ++++---- packages/addons/package.json | 2 +- packages/channel-websocket/package.json | 2 +- packages/channel/package.json | 2 +- packages/react-native-storybook/package.json | 8 ++++---- packages/react-storybook/demo/package.json | 2 +- packages/react-storybook/package.json | 8 ++++---- packages/storybook-ui/example/package.json | 12 ++++++------ packages/storyshots/package.json | 12 ++++++------ 17 files changed, 50 insertions(+), 50 deletions(-) diff --git a/examples/cra-storybook/package.json b/examples/cra-storybook/package.json index d8c252de2a54..14dad87b3043 100644 --- a/examples/cra-storybook/package.json +++ b/examples/cra-storybook/package.json @@ -7,8 +7,8 @@ "react-scripts": "0.9.5" }, "dependencies": { - "react": "^15.4.2", - "react-dom": "^15.4.2" + "react": "^15.5.4", + "react-dom": "^15.5.4" }, "scripts": { "start": "react-scripts start", diff --git a/examples/test-cra/package.json b/examples/test-cra/package.json index 529cc2645636..2df7940acfee 100644 --- a/examples/test-cra/package.json +++ b/examples/test-cra/package.json @@ -11,8 +11,8 @@ "test": "react-scripts test --env=jsdom" }, "dependencies": { - "react": "^15.4.2", - "react-dom": "^15.4.2" + "react": "^15.5.4", + "react-dom": "^15.5.4" }, "devDependencies": { "@kadira/storybook": "file:../../packages/react-storybook", diff --git a/package.json b/package.json index 553657eb7e37..277d7bea8bf3 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "storybook", "devDependencies": { - "babel-cli": "^6.14.0", + "babel-cli": "^6.24.1", "babel-core": "^6.24.1", "babel-eslint": "^7.2.2", "babel-plugin-transform-runtime": "^6.23.0", - "babel-polyfill": "^6.13.0", + "babel-polyfill": "^6.23.0", "babel-preset-env": "^1.4.0", - "babel-preset-react": "^6.11.1", - "babel-preset-stage-0": "^6.5.0", + "babel-preset-react": "^6.24.1", + "babel-preset-stage-0": "^6.24.1", "codecov": "^2.1.0", "enzyme": "^2.8.2", "enzyme-to-json": "^1.5.1", @@ -20,7 +20,7 @@ "jest": "^20.0.0", "jest-enzyme": "^3.1.0", "lerna": "2.0.0-rc.4", - "prettier": "^1.1.0", + "prettier": "^1.3.0", "react": "^15.5.4", "react-addons-test-utils": "^15.5.1", "react-dom": "^15.5.4", diff --git a/packages/addon-actions/package.json b/packages/addon-actions/package.json index df281f92b732..69bae5ce2181 100644 --- a/packages/addon-actions/package.json +++ b/packages/addon-actions/package.json @@ -27,13 +27,13 @@ "react": "^15.5.4", "react-dom": "^15.5.4", "react-test-renderer": "^15.5.4", - "shelljs": "^0.7.3" + "shelljs": "^0.7.7" }, "dependencies": { "deep-equal": "^1.0.1", "json-stringify-safe": "^5.0.1", - "prop-types": "^15.5.7", - "react-inspector": "^1.1.0" + "prop-types": "^15.5.8", + "react-inspector": "^1.1.2" }, "peerDependencies": { "@kadira/storybook-addons": "*", diff --git a/packages/addon-comments/package.json b/packages/addon-comments/package.json index 85aab1a87271..76c45c9eac52 100644 --- a/packages/addon-comments/package.json +++ b/packages/addon-comments/package.json @@ -23,13 +23,13 @@ "storybook-remote": "start-storybook -p 3006" }, "dependencies": { - "babel-runtime": "^6.11.6", + "babel-runtime": "^6.23.0", "deep-equal": "^1.0.1", "events": "^1.1.1", "insert-css": "^1.0.0", "marked": "^0.3.6", - "moment": "^2.15.1", - "prop-types": "^15.5.7", + "moment": "^2.18.1", + "prop-types": "^15.5.8", "react-render-html": "^0.1.6", "react-textarea-autosize": "^4.0.5" }, @@ -39,11 +39,11 @@ "@kadira/storybook-database-cloud": "*", "@kadira/storybook-deployer": "*", "@kadira/storybook-ui": "*", - "git-url-parse": "^6.0.1", + "git-url-parse": "^6.2.2", "react": "^15.5.4", "react-dom": "^15.5.4", "react-test-renderer": "^15.5.4", - "shelljs": "^0.7.4" + "shelljs": "^0.7.7" }, "peerDependencies": { "@kadira/storybook-addons": "*", diff --git a/packages/addon-graphql/package.json b/packages/addon-graphql/package.json index 2893f38c7242..6e7389b1affd 100644 --- a/packages/addon-graphql/package.json +++ b/packages/addon-graphql/package.json @@ -24,7 +24,7 @@ "@kadira/storybook": "*", "react": "^15.5.4", "react-dom": "^15.5.4", - "shelljs": "^0.7.3" + "shelljs": "^0.7.7" }, "peerDependencies": { "@kadira/storybook-addons": "*", diff --git a/packages/addon-info/package.json b/packages/addon-info/package.json index 01676b839839..7ea04d8f7e5c 100644 --- a/packages/addon-info/package.json +++ b/packages/addon-info/package.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@kadira/storybook": "*", - "git-url-parse": "^6.0.1", + "git-url-parse": "^6.2.2", "react": "^15.5.4", "react-dom": "^15.5.4", "react-storybook-addon-backgrounds": "0.0.7", @@ -25,9 +25,9 @@ "react-dom": "*" }, "dependencies": { - "babel-runtime": "^6.5.0", + "babel-runtime": "^6.23.0", "markdown-to-react-components": "^0.2.1", - "prop-types": "^15.5.7", + "prop-types": "^15.5.8", "react-addons-create-fragment": "^15.5.3" }, "main": "dist/index.js" diff --git a/packages/addon-knobs/package.json b/packages/addon-knobs/package.json index bfbac8f2f47c..0f2c84e1d2ee 100644 --- a/packages/addon-knobs/package.json +++ b/packages/addon-knobs/package.json @@ -21,7 +21,7 @@ "raw-loader": "^0.5.1", "react": "^15.5.4", "react-dom": "^15.5.4", - "style-loader": "^0.13.1", + "style-loader": "^0.17.0", "typescript": "^2.2.2", "typescript-definition-tester": "^0.0.5" }, diff --git a/packages/addon-notes/package.json b/packages/addon-notes/package.json index ee2ea2adada6..fab35d428d7e 100644 --- a/packages/addon-notes/package.json +++ b/packages/addon-notes/package.json @@ -14,17 +14,17 @@ }, "devDependencies": { "@kadira/storybook": "*", - "git-url-parse": "^6.0.1", - "react": "^15.3.2", + "git-url-parse": "^6.2.2", + "react": "^15.5.4", "react-addons-test-utils": "^15.5.1", - "react-dom": "^15.3.2" + "react-dom": "^15.5.4" }, "peerDependencies": { "react": "*", "@kadira/storybook-addons": "*" }, "dependencies": { - "babel-runtime": "^6.5.0" + "babel-runtime": "^6.23.0" }, "main": "dist/index.js", "keywords": [ diff --git a/packages/addons/package.json b/packages/addons/package.json index e9d838b039b1..40b4cc5a8eec 100644 --- a/packages/addons/package.json +++ b/packages/addons/package.json @@ -19,6 +19,6 @@ }, "homepage": "https://github.com/kadirahq/storybook-addons#readme", "devDependencies": { - "shelljs": "^0.7.3" + "shelljs": "^0.7.7" } } diff --git a/packages/channel-websocket/package.json b/packages/channel-websocket/package.json index c0c709c7ed62..7d4ccea376eb 100644 --- a/packages/channel-websocket/package.json +++ b/packages/channel-websocket/package.json @@ -8,7 +8,7 @@ }, "license": "MIT", "devDependencies": { - "shelljs": "^0.7.3" + "shelljs": "^0.7.7" }, "dependencies": { "@kadira/storybook-channel": "^1.0.1" diff --git a/packages/channel/package.json b/packages/channel/package.json index dd269a3e789a..1a743edeb3fe 100644 --- a/packages/channel/package.json +++ b/packages/channel/package.json @@ -8,6 +8,6 @@ }, "license": "MIT", "devDependencies": { - "shelljs": "^0.7.3" + "shelljs": "^0.7.7" } } diff --git a/packages/react-native-storybook/package.json b/packages/react-native-storybook/package.json index 8416cf6ec5f8..cead9b916924 100644 --- a/packages/react-native-storybook/package.json +++ b/packages/react-native-storybook/package.json @@ -39,9 +39,9 @@ "@kadira/storybook-addons": "*", "@kadira/storybook-channel-websocket": "*", "@kadira/storybook-ui": "*", - "autoprefixer": "^6.7.7", + "autoprefixer": "^7.0.1", "babel-core": "^6.24.1", - "babel-loader": "^6.4.1", + "babel-loader": "^7.0.0", "babel-plugin-syntax-async-functions": "^6.13.0", "babel-plugin-syntax-trailing-function-commas": "^6.22.0", "babel-plugin-transform-class-properties": "^6.24.1", @@ -63,9 +63,9 @@ "file-loader": "^0.11.1", "json-loader": "^0.5.4", "json5": "^0.5.1", - "postcss-loader": "^1.3.3", + "postcss-loader": "^2.0.3", "shelljs": "^0.7.7", - "style-loader": "^0.16.1", + "style-loader": "^0.17.0", "url-loader": "^0.5.8", "uuid": "^3.0.1", "webpack": "^2.4.1", diff --git a/packages/react-storybook/demo/package.json b/packages/react-storybook/demo/package.json index a7bed040e68d..0a05f8120ccb 100644 --- a/packages/react-storybook/demo/package.json +++ b/packages/react-storybook/demo/package.json @@ -7,7 +7,7 @@ "@kadira/storybook": "file:../" }, "dependencies": { - "prop-types": "^15.5.7", + "prop-types": "^15.5.8", "react": "^15.5.4", "react-dom": "^15.5.4" }, diff --git a/packages/react-storybook/package.json b/packages/react-storybook/package.json index 28bcc5ffbdf2..e8d26ff96148 100644 --- a/packages/react-storybook/package.json +++ b/packages/react-storybook/package.json @@ -25,9 +25,9 @@ "@kadira/storybook-channel-postmsg": "*", "@kadira/storybook-ui": "*", "airbnb-js-shims": "^1.1.1", - "autoprefixer": "^6.7.7", + "autoprefixer": "^7.0.1", "babel-core": "^6.24.1", - "babel-loader": "^6.4.1", + "babel-loader": "^7.0.0", "babel-plugin-react-docgen": "^1.4.2", "babel-preset-es2015": "^6.24.1", "babel-preset-es2016": "^6.24.1", @@ -48,7 +48,7 @@ "json-stringify-safe": "^5.0.1", "json5": "^0.5.1", "lodash.pick": "^4.4.0", - "postcss-loader": "1.3.3", + "postcss-loader": "^2.0.3", "prop-types": "^15.5.8", "qs": "^6.4.0", "react-modal": "^1.7.6", @@ -56,7 +56,7 @@ "request": "^2.81.0", "serve-favicon": "^2.4.2", "shelljs": "^0.7.7", - "style-loader": "0.16.1", + "style-loader": "^0.17.0", "url-loader": "^0.5.8", "uuid": "^3.0.1", "webpack": "^2.4.1", diff --git a/packages/storybook-ui/example/package.json b/packages/storybook-ui/example/package.json index bd44ab791365..07a88c213979 100644 --- a/packages/storybook-ui/example/package.json +++ b/packages/storybook-ui/example/package.json @@ -8,10 +8,10 @@ "devDependencies": { "babel-core": "^6.0.20", "babel-eslint": "^4.1.3", - "babel-loader": "^6.0.1", - "babel-preset-es2015": "^6.0.15", - "babel-preset-react": "^6.0.15", - "babel-preset-stage-0": "^6.0.15", + "babel-loader": "^7.0.0", + "babel-preset-es2015": "^6.24.1", + "babel-preset-react": "^6.24.1", + "babel-preset-stage-0": "^6.24.1", "eslint": "^1.10.3", "eslint-plugin-react": "^3.6.2", "webpack": "^1.12.2", @@ -19,7 +19,7 @@ }, "dependencies": { "keycode": "^2.1.2", - "react": "^15.0.1", - "react-dom": "^15.0.1" + "react": "^15.5.4", + "react-dom": "^15.5.4" } } diff --git a/packages/storyshots/package.json b/packages/storyshots/package.json index 9739ad9e2b97..a175867301f7 100644 --- a/packages/storyshots/package.json +++ b/packages/storyshots/package.json @@ -14,10 +14,10 @@ "build-storybook": "build-storybook" }, "devDependencies": { - "babel-cli": "^6.14.0", - "babel-plugin-transform-runtime": "^6.15.0", - "babel-preset-es2015": "^6.18.0", - "babel-preset-react": "^6.16.0", + "babel-cli": "^6.24.1", + "babel-plugin-transform-runtime": "^6.23.0", + "babel-preset-es2015": "^6.24.1", + "babel-preset-react": "^6.24.1", "react": "^15.5.4", "react-dom": "^15.5.4" }, @@ -25,8 +25,8 @@ "@kadira/storybook": "*", "@kadira/storybook-addons": "*", "@kadira/storybook-channel": "*", - "babel-runtime": "^6.20.0", - "prop-types": "^15.5.7", + "babel-runtime": "^6.23.0", + "prop-types": "^15.5.8", "read-pkg-up": "^2.0.0" }, "peerDependencies": { From 18781e0b965c4d35ab40bf7b06183c6b507ca25f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 9 May 2017 23:40:20 +0200 Subject: [PATCH 2/6] CHANGE lerna settings to disable concurrency --- lerna.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 7636f0f1f8cb..413fb378438c 100644 --- a/lerna.json +++ b/lerna.json @@ -11,5 +11,6 @@ "packages": [ "packages/*", "examples/*" - ] + ], + "concurrency": 1 } From 6eeadd2f6fc2c8b4a0c9667d76c41a9a4fedfd42 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 10 May 2017 10:18:47 +0200 Subject: [PATCH 3/6] FIX propval --- packages/addon-info/src/components/PropVal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addon-info/src/components/PropVal.js b/packages/addon-info/src/components/PropVal.js index f03af69feb4b..7fe7bf3603c3 100644 --- a/packages/addon-info/src/components/PropVal.js +++ b/packages/addon-info/src/components/PropVal.js @@ -107,7 +107,7 @@ function previewProp(val) { } if (!braceWrap) return content; - return {{ content }}; + return {content}; } export default class PropVal extends React.Component { From 21f752d1a2f07337fbb6eab9f4f30433e7e31668 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 10 May 2017 16:39:10 +0200 Subject: [PATCH 4/6] UPDATE dependencies && UPDATE react-inspector by switching to custom fork --- packages/addon-actions/package.json | 2 +- packages/addon-actions/src/components/ActionLogger/index.js | 2 +- packages/addon-comments/package.json | 2 +- packages/addon-knobs/package.json | 4 ++-- packages/storybook-ui/package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/addon-actions/package.json b/packages/addon-actions/package.json index 69bae5ce2181..487a730b9de8 100644 --- a/packages/addon-actions/package.json +++ b/packages/addon-actions/package.json @@ -33,7 +33,7 @@ "deep-equal": "^1.0.1", "json-stringify-safe": "^5.0.1", "prop-types": "^15.5.8", - "react-inspector": "^1.1.2" + "@storybook/react-inspector": "^1.2.1" }, "peerDependencies": { "@kadira/storybook-addons": "*", diff --git a/packages/addon-actions/src/components/ActionLogger/index.js b/packages/addon-actions/src/components/ActionLogger/index.js index 203d2f1bf4d8..185144d33837 100644 --- a/packages/addon-actions/src/components/ActionLogger/index.js +++ b/packages/addon-actions/src/components/ActionLogger/index.js @@ -1,6 +1,6 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import Inspector from 'react-inspector'; +import Inspector from '@storybook/react-inspector'; import style from './style'; class ActionLogger extends Component { diff --git a/packages/addon-comments/package.json b/packages/addon-comments/package.json index 76c45c9eac52..7dc5794a4175 100644 --- a/packages/addon-comments/package.json +++ b/packages/addon-comments/package.json @@ -31,7 +31,7 @@ "moment": "^2.18.1", "prop-types": "^15.5.8", "react-render-html": "^0.1.6", - "react-textarea-autosize": "^4.0.5" + "react-textarea-autosize": "^4.3.0" }, "devDependencies": { "@kadira/storybook": "*", diff --git a/packages/addon-knobs/package.json b/packages/addon-knobs/package.json index 0f2c84e1d2ee..03e86f7fd688 100644 --- a/packages/addon-knobs/package.json +++ b/packages/addon-knobs/package.json @@ -37,8 +37,8 @@ "moment": "^2.18.1", "prop-types": "^15.5.8", "react-color": "^2.11.4", - "react-datetime": "^2.8.9", - "react-textarea-autosize": "^4.0.5" + "react-datetime": "^2.8.10", + "react-textarea-autosize": "^4.3.0" }, "main": "dist/index.js", "typings": "./storybook-addon-knobs.d.ts" diff --git a/packages/storybook-ui/package.json b/packages/storybook-ui/package.json index c049b0d7dda5..135ee1738bbf 100644 --- a/packages/storybook-ui/package.json +++ b/packages/storybook-ui/package.json @@ -30,7 +30,7 @@ "prop-types": "^15.5.8", "qs": "^6.4.0", "react-fuzzy": "^0.3.3", - "react-inspector": "^1.1.2", + "@storybook/react-inspector": "^1.2.1", "react-komposer": "^2.0.0", "react-modal": "^1.7.6", "react-split-pane": "^0.1.63", From 50254849f85929355082324e5591ce04b733f8b8 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 10 May 2017 21:46:34 +0200 Subject: [PATCH 5/6] UPDATE react-fuzzy by switching to custom fork --- packages/storybook-ui/package.json | 4 ++-- packages/storybook-ui/src/modules/ui/components/search_box.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/storybook-ui/package.json b/packages/storybook-ui/package.json index 135ee1738bbf..8b8c3ce8eee1 100644 --- a/packages/storybook-ui/package.json +++ b/packages/storybook-ui/package.json @@ -17,6 +17,8 @@ "react-dom": "*" }, "dependencies": { + "@storybook/react-inspector": "^1.2.1", + "@storybook/react-fuzzy": "^0.4.0", "babel-runtime": "^6.23.0", "deep-equal": "^1.0.1", "events": "^1.1.1", @@ -29,8 +31,6 @@ "podda": "^1.2.2", "prop-types": "^15.5.8", "qs": "^6.4.0", - "react-fuzzy": "^0.3.3", - "@storybook/react-inspector": "^1.2.1", "react-komposer": "^2.0.0", "react-modal": "^1.7.6", "react-split-pane": "^0.1.63", diff --git a/packages/storybook-ui/src/modules/ui/components/search_box.js b/packages/storybook-ui/src/modules/ui/components/search_box.js index 28c58f073175..843766275625 100644 --- a/packages/storybook-ui/src/modules/ui/components/search_box.js +++ b/packages/storybook-ui/src/modules/ui/components/search_box.js @@ -1,6 +1,6 @@ import PropTypes from 'prop-types'; import React from 'react'; -import FuzzySearch from 'react-fuzzy'; +import FuzzySearch from '@storybook/react-fuzzy'; import { features } from '../../../libs/key_events'; import { baseFonts } from './theme'; From d26c0865931d71db9635b31a2e45395cdeac0293 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 10 May 2017 22:02:23 +0200 Subject: [PATCH 6/6] CHANGE cra-storybook example to use prop-types --- examples/cra-storybook/package.json | 3 ++- examples/cra-storybook/src/stories/Button.js | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/cra-storybook/package.json b/examples/cra-storybook/package.json index 14dad87b3043..10c0605cc5cf 100644 --- a/examples/cra-storybook/package.json +++ b/examples/cra-storybook/package.json @@ -8,7 +8,8 @@ }, "dependencies": { "react": "^15.5.4", - "react-dom": "^15.5.4" + "react-dom": "^15.5.4", + "prop-types": "^15.5.9" }, "scripts": { "start": "react-scripts start", diff --git a/examples/cra-storybook/src/stories/Button.js b/examples/cra-storybook/src/stories/Button.js index f4288d393484..6332f58dc1b6 100644 --- a/examples/cra-storybook/src/stories/Button.js +++ b/examples/cra-storybook/src/stories/Button.js @@ -1,4 +1,5 @@ import React from 'react'; +import PropTypes from 'prop-types'; const buttonStyles = { border: '1px solid #eee', @@ -17,8 +18,8 @@ const Button = ({ children, onClick }) => ( ); Button.propTypes = { - children: React.PropTypes.string.isRequired, - onClick: React.PropTypes.func, + children: PropTypes.string.isRequired, + onClick: PropTypes.func, }; export default Button;