Skip to content

Commit 9c955c5

Browse files
taiontimdorr
authored andcommitted
Update dependencies (#3600)
1 parent cedd5b8 commit 9c955c5

File tree

6 files changed

+41
-39
lines changed

6 files changed

+41
-39
lines changed

.eslintrc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
2-
"extends": "rackt",
2+
"extends": ["rackt", "plugin:react/recommended"],
33
"globals": {
44
"__DEV__": true
55
},
66
"rules": {
7-
"react/jsx-uses-react": 1,
8-
"react/jsx-no-undef": 2,
7+
"react/display-name": 0,
98
"react/wrap-multilines": 2
109
},
1110
"plugins": [

examples/.eslintrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"rules": {
3+
"react/prop-types": 0
4+
}
5+
}

examples/master-detail/app.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ const App = React.createClass({
2727
},
2828

2929
updateContacts() {
30-
if (!this.isMounted())
31-
return
32-
3330
this.setState({
3431
contacts: ContactStore.getContacts(),
3532
loading: false
@@ -91,9 +88,6 @@ const Contact = withRouter(
9188
},
9289

9390
updateContact() {
94-
if (!this.isMounted())
95-
return
96-
9791
this.setState(this.getStateFromStore())
9892
},
9993

examples/pinterest/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ const Deep = React.createClass({
120120
<p>Params stick around: {this.props.params.one} {this.props.params.two}</p>
121121
<p>
122122
<Link to={{
123-
pathname: `/pictures/0`,
123+
pathname: '/pictures/0',
124124
state: { modal: true, returnTo: this.props.location.pathname }
125125
}}>
126126
Link to picture with Modal
127127
</Link><br/>
128-
<Link to={`/pictures/0`}>
128+
<Link to="/pictures/0">
129129
Without modal
130130
</Link>
131131
</p>

modules/Router.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ const Router = React.createClass({
3838
onError: func,
3939
onUpdate: func,
4040

41+
// Deprecated:
42+
parseQueryString: func,
43+
stringifyQuery: func,
44+
4145
// PRIVATE: For client-side rehydration of server match.
4246
matchContext: object
4347
},

package.json

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,59 +32,59 @@
3232
],
3333
"license": "MIT",
3434
"dependencies": {
35-
"history": "^2.0.1",
36-
"hoist-non-react-statics": "^1.0.5",
35+
"history": "^2.1.2",
36+
"hoist-non-react-statics": "^1.2.0",
3737
"invariant": "^2.2.1",
38-
"warning": "^2.1.0",
38+
"warning": "^3.0.0",
3939
"loose-envify": "^1.2.0"
4040
},
4141
"peerDependencies": {
4242
"react": "^0.14.0 || ^15.0.0"
4343
},
4444
"devDependencies": {
45-
"babel-cli": "^6.7.5",
46-
"babel-core": "^6.7.6",
47-
"babel-eslint": "^5.0.4",
45+
"babel-cli": "^6.10.1",
46+
"babel-core": "^6.10.4",
47+
"babel-eslint": "^6.1.0",
4848
"babel-loader": "^6.2.4",
49-
"babel-plugin-add-module-exports": "^0.1.2",
49+
"babel-plugin-add-module-exports": "^0.2.1",
5050
"babel-plugin-dev-expression": "^0.2.1",
51-
"babel-preset-es2015": "^6.6.0",
51+
"babel-preset-es2015": "^6.9.0",
5252
"babel-preset-es2015-loose": "^7.0.0",
5353
"babel-preset-es2015-loose-native-modules": "^1.0.0",
54-
"babel-preset-react": "^6.5.0",
54+
"babel-preset-react": "^6.11.1",
5555
"babel-preset-stage-1": "^6.5.0",
56-
"babel-register": "^6.7.2",
56+
"babel-register": "^6.9.0",
5757
"bundle-loader": "^0.5.4",
5858
"codecov.io": "^0.1.6",
5959
"coveralls": "^2.11.9",
60-
"cross-env": "^1.0.7",
60+
"cross-env": "^1.0.8",
6161
"css-loader": "^0.23.1",
62-
"eslint": "^1.10.3",
62+
"eslint": "^3.0.0",
6363
"eslint-config-rackt": "^1.1.1",
64-
"eslint-plugin-react": "^3.16.1",
65-
"expect": "^1.18.0",
66-
"express": "^4.13.4",
64+
"eslint-plugin-react": "^5.2.2",
65+
"expect": "^1.20.2",
66+
"express": "^4.14.0",
6767
"express-urlrewrite": "^1.2.0",
6868
"gzip-size": "^3.0.0",
6969
"isparta-loader": "^2.0.0",
70-
"karma": "^0.13.22",
71-
"karma-browserstack-launcher": "^0.1.10",
72-
"karma-chrome-launcher": "^0.2.3",
73-
"karma-coverage": "^0.5.5",
74-
"karma-mocha": "^0.2.2",
75-
"karma-mocha-reporter": "^2.0.1",
70+
"karma": "^1.1.0",
71+
"karma-browserstack-launcher": "^1.0.1",
72+
"karma-chrome-launcher": "^1.0.1",
73+
"karma-coverage": "^1.0.0",
74+
"karma-mocha": "^1.1.1",
75+
"karma-mocha-reporter": "^2.0.4",
7676
"karma-sourcemap-loader": "^0.3.7",
7777
"karma-webpack": "^1.7.0",
78-
"mocha": "^2.4.5",
78+
"mocha": "^2.5.3",
7979
"pretty-bytes": "^3.0.1",
80-
"qs": "^6.1.0",
81-
"react": "^15.0.0",
82-
"react-addons-css-transition-group": "^15.0.0",
83-
"react-addons-test-utils": "^15.0.0",
84-
"react-dom": "^15.0.0",
80+
"qs": "^6.2.0",
81+
"react": "^15.2.0",
82+
"react-addons-css-transition-group": "^15.2.0",
83+
"react-addons-test-utils": "^15.2.0",
84+
"react-dom": "^15.2.0",
8585
"rimraf": "^2.5.2",
8686
"style-loader": "^0.13.1",
87-
"webpack": "^1.12.14",
87+
"webpack": "^1.13.1",
8888
"webpack-dev-middleware": "^1.6.1"
8989
},
9090
"browserify": {

0 commit comments

Comments
 (0)