Merge remote-tracking branch 'upstream/master'

mui · Dec 29, 2019 · 3928d6a · 3928d6a
2 parents 19143e3 + a5a7bdb
commit 3928d6a
Show file tree

Hide file tree

Showing 5 changed files with 391 additions and 266 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -21,8 +21,8 @@
     "@babel/plugin-transform-object-assign": "^7.7.4",
     "@date-io/core": "^1.3.9",
     "@date-io/date-fns": "^1.3.11",
-    "@emotion/core": "^10.0.22",
-    "@emotion/styled": "^10.0.23",
+    "@emotion/core": "^10.0.27",
+    "@emotion/styled": "^10.0.27",
     "@material-ui/core": "^4.1.2",
     "@material-ui/docs": "^4.0.0-beta.0",
     "@material-ui/icons": "^4.2.1",

diff --git a/package.json b/package.json
@@ -112,7 +112,7 @@
     "karma-webpack": "^4.0.2",
     "lerna": "^3.16.4",
     "mocha": "^6.2.0",
-    "nyc": "^14.1.1",
+    "nyc": "^15.0.0",
     "prettier": "1.17.0",
     "pretty-bytes": "^5.3.0",
     "prop-types": "^15.7.2",

diff --git a/packages/material-ui-benchmark/package.json b/packages/material-ui-benchmark/package.json
@@ -24,12 +24,12 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@emotion/core": "^10.0.22",
-    "@emotion/styled": "^10.0.23",
+    "@emotion/core": "^10.0.27",
+    "@emotion/styled": "^10.0.27",
     "benchmark": "^2.1.4",
-    "emotion": "^10.0.23",
-    "emotion-server": "^10.0.17",
-    "emotion-theming": "^10.0.19",
+    "emotion": "^10.0.27",
+    "emotion-server": "^10.0.27",
+    "emotion-theming": "^10.0.27",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "react-jss": "^10.0.0",

diff --git a/packages/material-ui-styles/package.json b/packages/material-ui-styles/package.json
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.4.4",
-    "@emotion/hash": "^0.7.1",
+    "@emotion/hash": "^0.7.4",
     "@material-ui/types": "^4.1.1",
     "@material-ui/utils": "^4.7.1",
     "clsx": "^1.0.2",