Merge master into next-export.
Showing
| ... | @@ -79,7 +79,7 @@ | ... | @@ -79,7 +79,7 @@ |
| "mz": "2.6.0", | "mz": "2.6.0", | ||
| "path-match": "1.2.4", | "path-match": "1.2.4", | ||
| "pkg-up": "2.0.0", | "pkg-up": "2.0.0", | ||
| "prop-types": "15.5.9", | "prop-types": "15.5.10", | ||
| "react-hot-loader": "3.0.0-beta.6", | "react-hot-loader": "3.0.0-beta.6", | ||
| "send": "0.15.2", | "send": "0.15.2", | ||
| "source-map-support": "0.4.15", | "source-map-support": "0.4.15", | ||
| ... | @@ -96,7 +96,7 @@ | ... | @@ -96,7 +96,7 @@ |
| }, | }, | ||
| "devDependencies": { | "devDependencies": { | ||
| "babel-eslint": "7.2.3", | "babel-eslint": "7.2.3", | ||
| "babel-jest": "18.0.0", | "babel-jest": "20.0.1", | ||
| "babel-plugin-istanbul": "4.1.3", | "babel-plugin-istanbul": "4.1.3", | ||
| "babel-plugin-transform-remove-strict-mode": "0.0.2", | "babel-plugin-transform-remove-strict-mode": "0.0.2", | ||
| "babel-preset-es2015": "6.24.1", | "babel-preset-es2015": "6.24.1", | ||
| ... | @@ -106,13 +106,14 @@ | ... | @@ -106,13 +106,14 @@ |
| "coveralls": "2.13.1", | "coveralls": "2.13.1", | ||
| "cross-env": "4.0.0", | "cross-env": "4.0.0", | ||
| "express": "4.15.2", | "express": "4.15.2", | ||
| "cross-env": "5.0.0", | |||
| "fly": "2.0.6", | "fly": "2.0.6", | ||
| "fly-babel": "2.1.1", | "fly-babel": "2.1.1", | ||
| "fly-clear": "1.0.1", | "fly-clear": "1.0.1", | ||
| "fly-esnext": "2.0.1", | "fly-esnext": "2.0.1", | ||
| "fly-watch": "1.1.1", | "fly-watch": "1.1.1", | ||
| "husky": "0.13.3", | "husky": "0.13.3", | ||
| "jest-cli": "19.0.1", | "jest-cli": "20.0.1", | ||
| "lint-staged": "^3.4.0", | "lint-staged": "^3.4.0", | ||
| "node-fetch": "1.6.3", | "node-fetch": "1.6.3", | ||
| "node-notifier": "5.1.2", | "node-notifier": "5.1.2", | ||
| ... | ... |
Please
register
or
sign in
to comment