Merge branch 'master' into switch-to-monorepo

storybookjs · Apr 13, 2017 · f9e9cbf · f9e9cbf
2 parents 6157617 + 14837bc
commit f9e9cbf
Show file tree

Hide file tree

Showing 62 changed files with 236 additions and 183 deletions.
diff --git a/packages/addon-actions/package.json b/packages/addon-actions/package.json
@@ -30,19 +30,19 @@
     "babel-preset-react": "^6.11.1",
     "babel-preset-stage-0": "^6.5.0",
     "react": "^15.5.4",
-    "react-addons-test-utils": "^15.5.1",
     "react-dom": "^15.5.4",
     "react-test-renderer": "^15.5.4",
     "shelljs": "^0.7.3"
   },
   "dependencies": {
     "deep-equal": "^1.0.1",
     "json-stringify-safe": "^5.0.1",
+    "prop-types": "^15.5.7",
     "react-inspector": "^1.1.0"
   },
   "peerDependencies": {
     "@kadira/storybook-addons": "^1.3.0",
-    "react": "^0.14.7 || ^15.0.0",
-    "react-dom": "^0.14.7 || ^15.0.0"
+    "react": "*",
+    "react-dom": "*"
   }
 }
diff --git a/packages/addon-actions/src/components/ActionLogger/index.js b/packages/addon-actions/src/components/ActionLogger/index.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Inspector from 'react-inspector';
 import style from './style';
@@ -51,8 +52,8 @@ class ActionLogger extends Component {
 }
 
 ActionLogger.propTypes = {
-  onClear: React.PropTypes.func,
-  actions: React.PropTypes.array
+  onClear: PropTypes.func,
+  actions: PropTypes.array
 };
 
 export default ActionLogger;
diff --git a/packages/addon-comments/package.json b/packages/addon-comments/package.json
@@ -25,7 +25,6 @@
   "homepage": "https://github.com/kadirahq/storybook-addon-comments#readme",
   "devDependencies": {
     "react": "^15.5.4",
-    "react-addons-test-utils": "^15.5.1",
     "react-dom": "^15.5.4",
     "react-test-renderer": "^15.5.4",
     "babel-loader": "^6.2.5",
@@ -53,8 +52,8 @@
   },
   "peerDependencies": {
     "@kadira/storybook-addons": "^1.5.0",
-    "react": "^0.14.7 || ^15.0.0",
-    "react-dom": "^0.14.7 || ^15.0.0"
+    "react": "*",
+    "react-dom": "*"
   },
   "dependencies": {
     "babel-runtime": "^6.11.6",
@@ -63,6 +62,7 @@
     "insert-css": "^1.0.0",
     "marked": "^0.3.6",
     "moment": "^2.15.1",
+    "prop-types": "^15.5.7",
     "react-render-html": "^0.1.6",
     "react-textarea-autosize": "^4.0.5"
   }

diff --git a/packages/addon-comments/src/index.js b/packages/addon-comments/src/index.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 
 const buttonStyles = {
@@ -16,9 +17,9 @@ const Button = ({ children, onClick, style = {} }) => (
 );
 
 Button.propTypes = {
-  children: React.PropTypes.string.isRequired,
-  onClick: React.PropTypes.func,
-  style: React.PropTypes.object
+  children: PropTypes.string.isRequired,
+  onClick: PropTypes.func,
+  style: PropTypes.object
 };
 
 export default Button;
diff --git a/packages/addon-comments/src/manager/components/CommentForm/index.js b/packages/addon-comments/src/manager/components/CommentForm/index.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Textarea from 'react-textarea-autosize';
 import marked from 'marked';
@@ -84,5 +85,5 @@ export default class CommentForm extends Component {
 }
 
 CommentForm.propTypes = {
-  addComment: React.PropTypes.func
+  addComment: PropTypes.func
 };
diff --git a/packages/addon-comments/src/manager/components/CommentItem/index.js b/packages/addon-comments/src/manager/components/CommentItem/index.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 /* eslint jsx-a11y/href-no-hash:0, no-undef:0, no-alert:0 */
 
 import React, { Component } from 'react';
@@ -71,7 +72,7 @@ export default class CommentItem extends Component {
 }
 
 CommentItem.propTypes = {
-  deleteComment: React.PropTypes.func,
-  comment: React.PropTypes.object,
-  ownComment: React.PropTypes.bool
+  deleteComment: PropTypes.func,
+  comment: PropTypes.object,
+  ownComment: PropTypes.bool
 };
diff --git a/packages/addon-comments/src/manager/components/CommentList/index.js b/packages/addon-comments/src/manager/components/CommentList/index.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import style from './style';
 import CommentItem from '../CommentItem';
@@ -50,7 +51,7 @@ export default class CommentList extends Component {
 }
 
 CommentList.propTypes = {
-  comments: React.PropTypes.array,
-  user: React.PropTypes.object,
-  deleteComment: React.PropTypes.func
+  comments: PropTypes.array,
+  user: PropTypes.object,
+  deleteComment: PropTypes.func
 };
diff --git a/packages/addon-comments/src/manager/components/CommentsPanel/index.js b/packages/addon-comments/src/manager/components/CommentsPanel/index.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 /* eslint no-undef: 0 */
 
 import React, { Component } from 'react';
@@ -36,7 +37,7 @@ export default class CommentsPanel extends Component {
 }
 
 CommentsPanel.propTypes = {
-  loading: React.PropTypes.bool,
-  user: React.PropTypes.object,
-  appNotAvailable: React.PropTypes.bool
+  loading: PropTypes.bool,
+  user: PropTypes.object,
+  appNotAvailable: PropTypes.bool
 };
diff --git a/packages/addon-comments/src/manager/containers/CommentsPanel/index.js b/packages/addon-comments/src/manager/containers/CommentsPanel/index.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 /* eslint no-unused-vars:0 */
 
 import React, { Component } from 'react';
@@ -110,5 +111,5 @@ export default class Container extends Component {
 }
 
 Container.propTypes = {
-  api: React.PropTypes.object
+  api: PropTypes.object
 };
diff --git a/packages/addon-graphql/package.json b/packages/addon-graphql/package.json
@@ -27,13 +27,13 @@
     "babel-preset-es2015": "^6.9.0",
     "babel-preset-react": "^6.11.1",
     "babel-preset-stage-0": "^6.5.0",
-    "react": "^15.3.2",
-    "react-dom": "^15.3.2",
+    "react": "^15.5.4",
+    "react-dom": "^15.5.4",
     "shelljs": "^0.7.3"
   },
   "peerDependencies": {
     "@kadira/storybook-addons": "^1.3.0",
-    "react": "^0.14.7 || ^15.0.0"
+    "react": "*"
   },
   "dependencies": {
     "graphiql": "^0.7.8",

diff --git a/packages/addon-info/example/Button.js b/packages/addon-info/example/Button.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 
 const Button = ({ disabled, label, style, onClick }) => (
@@ -9,10 +10,10 @@ const Button = ({ disabled, label, style, onClick }) => (
 Object.assign(Button, {
   displayName: 'Button',
   propTypes: {
-    label: React.PropTypes.string.isRequired,
-    style: React.PropTypes.object,
-    disabled: React.PropTypes.bool,
-    onClick: React.PropTypes.func
+    label: PropTypes.string.isRequired,
+    style: PropTypes.object,
+    disabled: PropTypes.bool,
+    onClick: PropTypes.func
   }
 });
 

diff --git a/packages/addon-info/package.json b/packages/addon-info/package.json
@@ -30,19 +30,19 @@
     "jsdom": "^9.5.0",
     "mocha": "^3.0.2",
     "react": "^15.5.4",
-    "react-addons-test-utils": "^15.5.1",
     "react-dom": "^15.5.4",
     "react-test-renderer": "^15.5.4",
     "react-storybook-addon-backgrounds": "0.0.7",
     "sinon": "^1.17.6"
   },
   "peerDependencies": {
-    "react": "^0.14.7 || ^15.0.0"
+    "react": "*"
   },
   "dependencies": {
     "babel-runtime": "^6.5.0",
     "markdown-to-react-components": "^0.2.1",
-    "react-addons-create-fragment": "^15.3.2"
+    "prop-types": "^15.5.7",
+    "react-addons-create-fragment": "^15.5.3"
   },
   "main": "dist/index.js"
 }
diff --git a/packages/addon-info/src/components/PropTable.js b/packages/addon-info/src/components/PropTable.js
@@ -1,12 +1,13 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import PropVal from './PropVal';
 
 const PropTypesMap = new Map();
-for (const typeName in React.PropTypes) {
-  if (!React.PropTypes.hasOwnProperty(typeName)) {
+for (const typeName in PropTypes) {
+  if (!PropTypes.hasOwnProperty(typeName)) {
     continue;
   }
-  const type = React.PropTypes[typeName];
+  const type = PropTypes[typeName];
   PropTypesMap.set(type, typeName);
   PropTypesMap.set(type.isRequired, typeName);
 }
@@ -90,5 +91,5 @@ export default class PropTable extends React.Component {
 
 PropTable.displayName = 'PropTable';
 PropTable.propTypes = {
-  type: React.PropTypes.func
+  type: PropTypes.func
 };
diff --git a/packages/addon-info/src/components/Story.js b/packages/addon-info/src/components/Story.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import MTRC from 'markdown-to-react-components';
 import PropTable from './PropTable';
@@ -307,15 +308,15 @@ export default class Story extends React.Component {
 
 Story.displayName = 'Story';
 Story.propTypes = {
-  context: React.PropTypes.object,
-  info: React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.node]),
-  propTables: React.PropTypes.arrayOf(React.PropTypes.func),
-  showInline: React.PropTypes.bool,
-  showHeader: React.PropTypes.bool,
-  showSource: React.PropTypes.bool,
-  styles: React.PropTypes.func.isRequired,
-  children: React.PropTypes.oneOfType([React.PropTypes.object, React.PropTypes.array]),
-  mtrcConf: React.PropTypes.object
+  context: PropTypes.object,
+  info: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+  propTables: PropTypes.arrayOf(PropTypes.func),
+  showInline: PropTypes.bool,
+  showHeader: PropTypes.bool,
+  showSource: PropTypes.bool,
+  styles: PropTypes.func.isRequired,
+  children: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+  mtrcConf: PropTypes.object
 };
 
 Story.defaultProps = {

diff --git a/packages/addon-knobs/package.json b/packages/addon-knobs/package.json
@@ -36,7 +36,6 @@
     "mocha": "^3.1.0",
     "raw-loader": "^0.5.1",
     "react": "^15.5.4",
-    "react-addons-test-utils": "^15.5.1",
     "react-dom": "^15.5.4",
     "react-test-renderer": "^15.5.4",
     "sinon": "^1.17.3",
@@ -46,14 +45,15 @@
   },
   "peerDependencies": {
     "@kadira/storybook-addons": "^1.3.0",
-    "react": "^0.14.7 || ^15.0.0",
-    "react-dom": "^0.14.7 || ^15.0.0"
+    "react": "*",
+    "react-dom": "*"
   },
   "dependencies": {
     "babel-runtime": "^6.5.0",
     "deep-equal": "^1.0.1",
     "insert-css": "^1.0.0",
     "moment": "^2.15.0",
+    "prop-types": "^15.5.7",
     "react-color": "^2.4.3",
     "react-datetime": "^2.6.0",
     "react-textarea-autosize": "^4.0.5"

diff --git a/packages/addon-knobs/src/components/Panel.js b/packages/addon-knobs/src/components/Panel.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import PropForm from './PropForm';
 import Types from './types';
@@ -121,7 +122,7 @@ export default class Panel extends React.Component {
 }
 
 Panel.propTypes = {
-  channel: React.PropTypes.object,
-  onReset: React.PropTypes.object,
-  api: React.PropTypes.object
+  channel: PropTypes.object,
+  onReset: PropTypes.object,
+  api: PropTypes.object
 };
diff --git a/packages/addon-knobs/src/components/PropField.js b/packages/addon-knobs/src/components/PropField.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import TypeMap from './types';
 
@@ -60,6 +61,6 @@ export default class PropField extends React.Component {
 }
 
 PropField.propTypes = {
-  onChange: React.PropTypes.func.isRequired,
-  knob: React.PropTypes.object
+  onChange: PropTypes.func.isRequired,
+  knob: PropTypes.object
 };
diff --git a/packages/addon-knobs/src/components/PropForm.js b/packages/addon-knobs/src/components/PropForm.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 
 import PropField from './PropField';
@@ -50,6 +51,6 @@ export default class propForm extends React.Component {
 propForm.displayName = 'propForm';
 
 propForm.propTypes = {
-  knobs: React.PropTypes.array.isRequired,
-  onFieldChange: React.PropTypes.func.isRequired
+  knobs: PropTypes.array.isRequired,
+  onFieldChange: PropTypes.func.isRequired
 };
diff --git a/packages/addon-knobs/src/components/WrapStory.js b/packages/addon-knobs/src/components/WrapStory.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 
 export default class WrapStory extends React.Component {
@@ -60,9 +61,9 @@ export default class WrapStory extends React.Component {
 }
 
 WrapStory.propTypes = {
-  context: React.PropTypes.object,
-  storyFn: React.PropTypes.func,
-  channel: React.PropTypes.object,
-  knobStore: React.PropTypes.object,
-  initialContent: React.PropTypes.object
+  context: PropTypes.object,
+  storyFn: PropTypes.func,
+  channel: PropTypes.object,
+  knobStore: PropTypes.object,
+  initialContent: PropTypes.object
 };
diff --git a/packages/addon-knobs/src/components/types/Array.js b/packages/addon-knobs/src/components/types/Array.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import Textarea from 'react-textarea-autosize';
 
@@ -31,8 +32,8 @@ class ArrayType extends React.Component {
 }
 
 ArrayType.propTypes = {
-  knob: React.PropTypes.object,
-  onChange: React.PropTypes.func
+  knob: PropTypes.object,
+  onChange: PropTypes.func
 };
 
 ArrayType.serialize = function(value) {

diff --git a/packages/addon-knobs/src/components/types/Boolean.js b/packages/addon-knobs/src/components/types/Boolean.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 
 const styles = {
@@ -29,8 +30,8 @@ class BooleanType extends React.Component {
 }
 
 BooleanType.propTypes = {
-  knob: React.PropTypes.object,
-  onChange: React.PropTypes.func
+  knob: PropTypes.object,
+  onChange: PropTypes.func
 };
 
 BooleanType.serialize = function(value) {