Skip to content

Commit c3177aa

Browse files
committed
Use external PropTypes for better support
1 parent 7c135ae commit c3177aa

8 files changed

+873
-49
lines changed

commonjs/JobProvider.js

+17-13
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ var _react = require('react');
1010

1111
var _react2 = _interopRequireDefault(_react);
1212

13+
var _propTypes = require('prop-types');
14+
15+
var _propTypes2 = _interopRequireDefault(_propTypes);
16+
1317
var _createJobContext = require('./createJobContext');
1418

1519
var _createJobContext2 = _interopRequireDefault(_createJobContext);
@@ -75,16 +79,16 @@ var JobProvider = function (_Component) {
7579
}(_react.Component);
7680

7781
JobProvider.propTypes = {
78-
children: _react.PropTypes.node.isRequired,
79-
jobContext: _react.PropTypes.shape({
80-
getNextId: _react.PropTypes.func.isRequired,
81-
resetIds: _react.PropTypes.func.isRequired,
82-
register: _react.PropTypes.func.isRequired,
83-
get: _react.PropTypes.func.isRequired,
84-
getState: _react.PropTypes.func.isRequired
82+
children: _propTypes2.default.node.isRequired,
83+
jobContext: _propTypes2.default.shape({
84+
getNextId: _propTypes2.default.func.isRequired,
85+
resetIds: _propTypes2.default.func.isRequired,
86+
register: _propTypes2.default.func.isRequired,
87+
get: _propTypes2.default.func.isRequired,
88+
getState: _propTypes2.default.func.isRequired
8589
}),
86-
rehydrateState: _react.PropTypes.shape({
87-
jobs: _react.PropTypes.object.isRequired
90+
rehydrateState: _propTypes2.default.shape({
91+
jobs: _propTypes2.default.object.isRequired
8892
})
8993
};
9094
JobProvider.defaultProps = {
@@ -94,10 +98,10 @@ JobProvider.defaultProps = {
9498
}
9599
};
96100
JobProvider.childContextTypes = {
97-
jobs: _react.PropTypes.shape({
98-
getNextId: _react.PropTypes.func.isRequired,
99-
register: _react.PropTypes.func.isRequired,
100-
get: _react.PropTypes.func.isRequired,
101+
jobs: _propTypes2.default.shape({
102+
getNextId: _propTypes2.default.func.isRequired,
103+
register: _propTypes2.default.func.isRequired,
104+
get: _propTypes2.default.func.isRequired,
101105
getRehydrate: _react2.default.PropTypes.func.isRequired,
102106
removeRehydrate: _react2.default.PropTypes.func.isRequired
103107
}).isRequired

commonjs/withJob.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ var _react = require('react');
1616

1717
var _react2 = _interopRequireDefault(_react);
1818

19+
var _propTypes = require('prop-types');
20+
21+
var _propTypes2 = _interopRequireDefault(_propTypes);
22+
1923
var _utils = require('./utils');
2024

2125
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -152,10 +156,10 @@ function withJob(config) {
152156

153157
ComponentWithJob.displayName = 'WithJob(' + (0, _utils.getDisplayName)(WrappedComponent) + ')';
154158
ComponentWithJob.contextTypes = {
155-
jobs: _react.PropTypes.shape({
156-
getNextId: _react.PropTypes.func.isRequired,
157-
register: _react.PropTypes.func.isRequired,
158-
get: _react.PropTypes.func.isRequired,
159+
jobs: _propTypes2.default.shape({
160+
getNextId: _propTypes2.default.func.isRequired,
161+
register: _propTypes2.default.func.isRequired,
162+
get: _propTypes2.default.func.isRequired,
159163
getRehydrate: _react2.default.PropTypes.func.isRequired,
160164
removeRehydrate: _react2.default.PropTypes.func.isRequired
161165
})

package.json

+2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
]
5757
},
5858
"peerDependencies": {
59+
"prop-types": "^15.0.0",
5960
"react": "^14.0.0 || ^15.0.0"
6061
},
6162
"dependencies": {},
@@ -91,6 +92,7 @@
9192
"prettier-eslint": "4.4.0",
9293
"prettier-eslint-cli": "3.2.0",
9394
"pretty-bytes": "4.0.2",
95+
"prop-types": "15.5.6",
9496
"ramda": "0.23.0",
9597
"react": "15.4.2",
9698
"react-addons-test-utils": "15.4.2",

src/JobProvider.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react'
1+
import React, { Component } from 'react'
2+
import PropTypes from 'prop-types'
23

34
import createJobContext from './createJobContext'
45

src/withJob.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react'
1+
import React, { Component } from 'react'
2+
import PropTypes from 'prop-types'
23
import { getDisplayName, isPromise, propsWithoutInternal } from './utils'
34

45
const validSSRModes = ['resolve', 'defer', 'boundary']

0 commit comments

Comments
 (0)