aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbitpshr <mail@bitpshr.net>2018-07-16 09:38:08 +0800
committerbitpshr <mail@bitpshr.net>2018-07-19 20:04:17 +0800
commit7ed0df4f05b91bff2cde836195973b700e5c5e83 (patch)
treecbf9e6796da960abbbfa51ccadaf321647ba4fd1
parentd02c160db5525caaccf9c137076f9ef8948b7080 (diff)
downloadtangerine-wallet-browser-7ed0df4f05b91bff2cde836195973b700e5c5e83.tar
tangerine-wallet-browser-7ed0df4f05b91bff2cde836195973b700e5c5e83.tar.gz
tangerine-wallet-browser-7ed0df4f05b91bff2cde836195973b700e5c5e83.tar.bz2
tangerine-wallet-browser-7ed0df4f05b91bff2cde836195973b700e5c5e83.tar.lz
tangerine-wallet-browser-7ed0df4f05b91bff2cde836195973b700e5c5e83.tar.xz
tangerine-wallet-browser-7ed0df4f05b91bff2cde836195973b700e5c5e83.tar.zst
tangerine-wallet-browser-7ed0df4f05b91bff2cde836195973b700e5c5e83.zip
Pin @material-ui/core@1.2.0 to maintain React 15 compat
-rw-r--r--package-lock.json20
-rw-r--r--package.json2
2 files changed, 15 insertions, 7 deletions
diff --git a/package-lock.json b/package-lock.json
index db70a6ed3..6f42ae640 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -250,9 +250,9 @@
}
},
"@material-ui/core": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-1.4.0.tgz",
- "integrity": "sha512-Jymq67Hp9XbtzsENkpSl6DeG99wOdNhUCJnnEGcxSlGGBrERRkZxzVRkt4+2v1OyAD8+9NCK3hOOa7DH4Cl4zA==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-1.2.0.tgz",
+ "integrity": "sha512-7rh/FAmdmWsjRYJlOEUT2NajlpvC+I28cbGUq0dNFdOHTcxRL/xsUraFvAEFBXvsLrzLkzNPl3mA2Svn80aLVw==",
"requires": {
"@babel/runtime": "^7.0.0-beta.42",
"@types/jss": "^9.5.3",
@@ -264,7 +264,6 @@
"deepmerge": "^2.0.1",
"dom-helpers": "^3.2.1",
"hoist-non-react-statics": "^2.5.0",
- "is-plain-object": "^2.0.4",
"jss": "^9.3.3",
"jss-camel-case": "^6.0.0",
"jss-default-unit": "^8.0.2",
@@ -274,12 +273,12 @@
"jss-vendor-prefixer": "^7.0.0",
"keycode": "^2.1.9",
"normalize-scroll-left": "^0.1.2",
- "popper.js": "^1.0.0",
"prop-types": "^15.6.0",
"react-event-listener": "^0.6.0",
"react-jss": "^8.1.0",
+ "react-popper": "^0.10.0",
"react-transition-group": "^2.2.1",
- "recompose": "^0.27.0",
+ "recompose": "^0.26.0 || ^0.27.0",
"scroll": "^2.0.3",
"warning": "^4.0.1"
},
@@ -22602,6 +22601,15 @@
"integrity": "sha512-p84kBqGaMoa7VYT0vZ/aOYRfJB+gw34yjpda1Z5KeLflg70HipZOT+MXQenEhdkPAABuE2Astq4zEPdMqUQxcg==",
"dev": true
},
+ "react-popper": {
+ "version": "0.10.4",
+ "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-0.10.4.tgz",
+ "integrity": "sha1-rypBXqIike3VBGeNev2opu4ylao=",
+ "requires": {
+ "popper.js": "^1.14.1",
+ "prop-types": "^15.6.1"
+ }
+ },
"react-redux": {
"version": "5.0.7",
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
diff --git a/package.json b/package.json
index a31262174..b432bd729 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
]
},
"dependencies": {
- "@material-ui/core": "^1.0.0",
+ "@material-ui/core": "1.2.0",
"abi-decoder": "^1.0.9",
"asmcrypto.js": "0.22.0",
"async": "^2.5.0",