Skip to content

Commit a94a639

Browse files
authored
Merge pull request #236 from taion/update-deps
Update and clean up dependencies
2 parents 6b4a84a + 30f1b06 commit a94a639

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

karma.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ module.exports = (config) => {
1414

1515
webpack: {
1616
module: {
17-
loaders: [
18-
{ test: /\.js$/, exclude: /node_modules/, loader: 'babel' },
17+
rules: [
18+
{ test: /\.js$/, exclude: /node_modules/, use: 'babel-loader' },
1919
],
2020
},
2121
plugins: [

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@
3838
"babel-runtime": "^6.23.0",
3939
"invariant": "^2.2.2",
4040
"lodash": "^4.17.4",
41-
"prop-types": "^15.5.6",
41+
"prop-types": "^15.5.10",
4242
"react-static-container": "^1.0.1"
4343
},
4444
"peerDependencies": {
45-
"react": ">=0.14.0",
46-
"react-relay": ">=0.6.0",
47-
"react-router": ">=2.3.0"
45+
"react": "^0.14.9 || >=15.3.0",
46+
"react-relay": ">=0.6.0 <1.0.0",
47+
"react-router": "^2.3.0 || ^3.0.0"
4848
},
4949
"devDependencies": {
5050
"babel-cli": "^6.24.1",
5151
"babel-core": "^6.24.1",
52-
"babel-eslint": "^7.2.1",
53-
"babel-loader": "^6.4.1",
52+
"babel-eslint": "^7.2.3",
53+
"babel-loader": "^7.0.0",
5454
"babel-plugin-add-module-exports": "^0.2.1",
5555
"babel-plugin-dev-expression": "^0.2.1",
5656
"babel-plugin-transform-runtime": "^6.23.0",
@@ -61,31 +61,31 @@
6161
"babel-register": "^6.24.1",
6262
"babel-relay-plugin": "^0.10.0",
6363
"chai": "^3.5.0",
64-
"cross-env": "^4.0.0",
64+
"cross-env": "^5.0.0",
6565
"eslint": "^3.19.0",
6666
"eslint-config-4catalyzer-react": "^0.2.0",
67-
"eslint-plugin-import": "^2.2.0",
67+
"eslint-plugin-import": "^2.3.0",
6868
"eslint-plugin-jsx-a11y": "^2.2.3",
6969
"eslint-plugin-react": "^6.10.3",
70-
"graphql": "^0.9.2",
70+
"graphql": "^0.10.1",
7171
"graphql-relay": "^0.5.1",
72-
"karma": "^1.6.0",
73-
"karma-chrome-launcher": "^2.0.0",
72+
"karma": "^1.7.0",
73+
"karma-chrome-launcher": "^2.1.1",
7474
"karma-firefox-launcher": "^1.0.1",
7575
"karma-mocha": "^1.3.0",
7676
"karma-mocha-reporter": "^2.2.3",
7777
"karma-sinon-chai": "^1.3.1",
7878
"karma-sourcemap-loader": "^0.3.7",
79-
"karma-webpack": "^1.8.0",
80-
"mocha": "^3.2.0",
81-
"react": "^15.5.3",
82-
"react-dom": "^15.5.3",
79+
"karma-webpack": "^2.0.3",
80+
"mocha": "^3.4.2",
81+
"react": "^15.5.4",
82+
"react-dom": "^15.5.4",
8383
"react-relay": "^0.10.0",
8484
"react-router": "^2.8.0",
8585
"relay-local-schema": "^0.5.5",
8686
"rimraf": "^2.6.1",
87-
"sinon": "^2.1.0",
88-
"sinon-chai": "^2.9.0",
89-
"webpack": "^1.13.2"
87+
"sinon": "^2.3.2",
88+
"sinon-chai": "^2.10.0",
89+
"webpack": "^2.6.1"
9090
}
9191
}

0 commit comments

Comments
 (0)