Get latest master into v3 (#2139)
* Merge branch 'master' into v3-beta * Add send back to v3-beta.
Showing
| ... | @@ -82,8 +82,9 @@ | ... | @@ -82,8 +82,9 @@ |
| "path-match": "1.2.4", | "path-match": "1.2.4", | ||
| "pkg-up": "2.0.0", | "pkg-up": "2.0.0", | ||
| "prop-types": "15.5.10", | "prop-types": "15.5.10", | ||
| "recursive-copy": "^2.0.6", | |||
| "react-hot-loader": "3.0.0-beta.7", | "react-hot-loader": "3.0.0-beta.7", | ||
| "recursive-copy": "^2.0.6", | |||
| "send": "^0.15.3", | |||
| "source-map-support": "0.4.15", | "source-map-support": "0.4.15", | ||
| "strip-ansi": "3.0.1", | "strip-ansi": "3.0.1", | ||
| "styled-jsx": "1.0.3", | "styled-jsx": "1.0.3", | ||
| ... | @@ -91,11 +92,11 @@ | ... | @@ -91,11 +92,11 @@ |
| "unfetch": "2.1.2", | "unfetch": "2.1.2", | ||
| "url": "0.11.0", | "url": "0.11.0", | ||
| "uuid": "3.0.1", | "uuid": "3.0.1", | ||
| "walk": "^2.3.9", | |||
| "webpack": "2.6.0", | "webpack": "2.6.0", | ||
| "webpack-dev-middleware": "1.10.2", | "webpack-dev-middleware": "1.10.2", | ||
| "webpack-hot-middleware": "2.18.0", | "webpack-hot-middleware": "2.18.0", | ||
| "write-file-webpack-plugin": "4.0.2", | "write-file-webpack-plugin": "4.0.2" | ||
| "walk": "^2.3.9" | |||
| }, | }, | ||
| "devDependencies": { | "devDependencies": { | ||
| "babel-eslint": "7.2.3", | "babel-eslint": "7.2.3", | ||
| ... | @@ -107,9 +108,8 @@ | ... | @@ -107,9 +108,8 @@ |
| "cheerio": "0.22.0", | "cheerio": "0.22.0", | ||
| "chromedriver": "2.29.0", | "chromedriver": "2.29.0", | ||
| "coveralls": "2.13.1", | "coveralls": "2.13.1", | ||
| "cross-env": "4.0.0", | |||
| "express": "4.15.2", | |||
| "cross-env": "5.0.0", | "cross-env": "5.0.0", | ||
| "express": "4.15.2", | |||
| "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", | ||
| ... | ... |
This diff is collapsed.
Please
register
or
sign in
to comment