Skip to content

Commit 5c176d3

Browse files
ctrlplusbctrlplusb
committed
Updates dependencies and fixes React >= 15.5 issues
1 parent da1d25d commit 5c176d3

File tree

9 files changed

+862
-495
lines changed

9 files changed

+862
-495
lines changed

‎commonjs/JobProvider.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ JobProvider.childContextTypes = {
102102
getNextId: _propTypes2.default.func.isRequired,
103103
register: _propTypes2.default.func.isRequired,
104104
get: _propTypes2.default.func.isRequired,
105-
getRehydrate: _react2.default.PropTypes.func.isRequired,
106-
removeRehydrate: _react2.default.PropTypes.func.isRequired
105+
getRehydrate: _propTypes2.default.func.isRequired,
106+
removeRehydrate: _propTypes2.default.func.isRequired
107107
}).isRequired
108108
};
109109
exports.default = JobProvider;

‎commonjs/withJob.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ function withJob(config) {
160160
getNextId: _propTypes2.default.func.isRequired,
161161
register: _propTypes2.default.func.isRequired,
162162
get: _propTypes2.default.func.isRequired,
163-
getRehydrate: _react2.default.PropTypes.func.isRequired,
164-
removeRehydrate: _react2.default.PropTypes.func.isRequired
163+
getRehydrate: _propTypes2.default.func.isRequired,
164+
removeRehydrate: _propTypes2.default.func.isRequired
165165
})
166166
};
167167

‎package.json

+28-27
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,22 @@
6262
"dependencies": {},
6363
"devDependencies": {
6464
"app-root-dir": "1.0.2",
65-
"babel-cli": "6.24.0",
66-
"babel-core": "6.24.0",
67-
"babel-eslint": "7.2.1",
68-
"babel-jest": "19.0.0",
69-
"babel-loader": "6.4.1",
70-
"babel-plugin-transform-class-properties": "6.23.0",
65+
"babel-cli": "6.24.1",
66+
"babel-core": "6.24.1",
67+
"babel-eslint": "7.2.3",
68+
"babel-jest": "20.0.0",
69+
"babel-loader": "7.0.0",
70+
"babel-plugin-transform-class-properties": "6.24.1",
7171
"babel-polyfill": "6.23.0",
72-
"babel-preset-env": "1.3.2",
73-
"babel-preset-latest": "6.24.0",
74-
"babel-preset-react": "6.23.0",
75-
"babel-preset-stage-3": "6.22.0",
76-
"babel-register": "6.24.0",
77-
"codecov": "2.1.0",
72+
"babel-preset-env": "1.4.0",
73+
"babel-preset-latest": "6.24.1",
74+
"babel-preset-react": "6.24.1",
75+
"babel-preset-stage-3": "6.24.1",
76+
"babel-register": "6.24.1",
77+
"codecov": "2.2.0",
7878
"cross-env": "4.0.0",
79-
"enzyme": "2.8.0",
80-
"enzyme-to-json": "1.5.0",
79+
"enzyme": "2.8.2",
80+
"enzyme-to-json": "1.5.1",
8181
"eslint": "3.19.0",
8282
"eslint-config-airbnb": "14.1.0",
8383
"eslint-plugin-import": "2.2.0",
@@ -86,23 +86,24 @@
8686
"gzip-size": "3.0.0",
8787
"husky": "0.13.3",
8888
"in-publish": "2.0.0",
89-
"jest": "19.0.2",
90-
"lint-staged": "^3.4.0",
91-
"prettier": "^0.22.0",
92-
"prettier-eslint": "4.4.0",
93-
"prettier-eslint-cli": "3.2.0",
89+
"jest": "20.0.0",
90+
"lint-staged": "3.4.1",
91+
"prettier": "1.3.1",
92+
"prettier-eslint": "6.2.1",
93+
"prettier-eslint-cli": "3.4.3",
9494
"pretty-bytes": "4.0.2",
95-
"prop-types": "15.5.6",
95+
"prop-types": "15.5.9",
9696
"ramda": "0.23.0",
97-
"react": "15.4.2",
98-
"react-addons-test-utils": "15.4.2",
99-
"react-async-bootstrapper": "^1.0.0",
100-
"react-dom": "15.4.2",
97+
"react": "15.5.4",
98+
"react-addons-test-utils": "15.5.1",
99+
"react-async-bootstrapper": "1.1.1",
100+
"react-dom": "15.5.4",
101+
"react-test-renderer": "15.5.4",
101102
"readline-sync": "1.4.7",
102103
"rimraf": "2.6.1",
103-
"sinon": "2.1.0",
104-
"webpack": "2.3.3",
105-
"webpack-dev-middleware": "1.10.1",
104+
"sinon": "2.2.0",
105+
"webpack": "2.5.1",
106+
"webpack-dev-middleware": "1.10.2",
106107
"webpack-hot-middleware": "2.18.0"
107108
}
108109
}

‎src/JobProvider.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@ class JobProvider extends Component {
1616
rehydrateState: PropTypes.shape({
1717
jobs: PropTypes.object.isRequired,
1818
}),
19-
};
19+
}
2020

2121
static defaultProps = {
2222
jobContext: null,
2323
rehydrateState: {
2424
jobs: {},
2525
},
26-
};
26+
}
2727

2828
static childContextTypes = {
2929
jobs: PropTypes.shape({
3030
getNextId: PropTypes.func.isRequired,
3131
register: PropTypes.func.isRequired,
3232
get: PropTypes.func.isRequired,
33-
getRehydrate: React.PropTypes.func.isRequired,
34-
removeRehydrate: React.PropTypes.func.isRequired,
33+
getRehydrate: PropTypes.func.isRequired,
34+
removeRehydrate: PropTypes.func.isRequired,
3535
}).isRequired,
36-
};
36+
}
3737

3838
constructor(props, context) {
3939
super(props, context)

‎src/__tests__/integration.test.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable react/prop-types */
22

33
import React from 'react'
4-
import { renderToString, renderToStaticMarkup } from 'react-dom/server'
4+
import { renderToStaticMarkup } from 'react-dom/server'
55
import asyncBootstrapper from 'react-async-bootstrapper'
66
import { mount } from 'enzyme'
77
import { resolveAfter, rejectAfter } from '../../tools/tests/helpers'
@@ -21,7 +21,6 @@ function ResultRenderer({ jobResult, children }) {
2121
)
2222
}
2323
const ErrorComponent = ({ error }) => <div>{error ? error.message : null}</div>
24-
const LoadingComponent = () => <div>Loading...</div>
2524

2625
const createComponents = () => ({
2726
Hello: withJob({ work: () => resolveAfter(workTime, 'Hello') })(
@@ -57,7 +56,7 @@ const createApp = (context, state) => {
5756
describe('integration tests', () => {
5857
it('render server and client', () => {
5958
// we have to delete the window to emulate a server only environment
60-
let windowTemp = global.window
59+
const windowTemp = global.window
6160
delete global.window
6261

6362
// Server side render
@@ -101,12 +100,14 @@ describe('integration tests', () => {
101100
.then(
102101
clientRenderWrapper =>
103102
new Promise(resolve =>
104-
setTimeout(() => resolve(clientRenderWrapper), 100)),
103+
setTimeout(() => resolve(clientRenderWrapper), 100),
104+
),
105105
)
106106
// Now a full render should have occured on client
107107
// SNAPSHOT 4
108108
.then(clientRenderWrapper =>
109-
expect(clientRenderWrapper).toMatchSnapshot())
109+
expect(clientRenderWrapper).toMatchSnapshot(),
110+
)
110111
)
111112
})
112113
})

‎tools/tests/helpers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const rejectAfter = (time, error) =>
1818
export function warningsToErrors() {
1919
// Ensure console.warnings become thrown errors.
2020
beforeAll(() => {
21-
sinon.stub(console, 'error', (warning) => {
21+
sinon.stub(console, 'error').callsFake((warning) => {
2222
throw new Error(warning)
2323
})
2424
})

‎umd/react-jobs.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ return /******/ (function(modules) { // webpackBootstrap
1616
/******/ function __webpack_require__(moduleId) {
1717
/******/
1818
/******/ // Check if module is in cache
19-
/******/ if(installedModules[moduleId])
19+
/******/ if(installedModules[moduleId]) {
2020
/******/ return installedModules[moduleId].exports;
21-
/******/
21+
/******/ }
2222
/******/ // Create a new module (and put it into the cache)
2323
/******/ var module = installedModules[moduleId] = {
2424
/******/ i: moduleId,
@@ -231,8 +231,8 @@ JobProvider.childContextTypes = {
231231
getNextId: _propTypes2.default.func.isRequired,
232232
register: _propTypes2.default.func.isRequired,
233233
get: _propTypes2.default.func.isRequired,
234-
getRehydrate: _react2.default.PropTypes.func.isRequired,
235-
removeRehydrate: _react2.default.PropTypes.func.isRequired
234+
getRehydrate: _propTypes2.default.func.isRequired,
235+
removeRehydrate: _propTypes2.default.func.isRequired
236236
}).isRequired
237237
};
238238
exports.default = JobProvider;
@@ -404,8 +404,8 @@ function withJob(config) {
404404
getNextId: _propTypes2.default.func.isRequired,
405405
register: _propTypes2.default.func.isRequired,
406406
get: _propTypes2.default.func.isRequired,
407-
getRehydrate: _react2.default.PropTypes.func.isRequired,
408-
removeRehydrate: _react2.default.PropTypes.func.isRequired
407+
getRehydrate: _propTypes2.default.func.isRequired,
408+
removeRehydrate: _propTypes2.default.func.isRequired
409409
})
410410
};
411411

‎umd/react-jobs.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)