aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-08-25 06:11:14 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-08-25 06:11:14 +0800
commit65120e84e25f70f014bb195539720aa3dc0f8eec (patch)
tree4e41d30d9a3aee4dd8ee113d2a671ef4cb777a27
parent374ee2db329aee32e59d487152b2a3b66e25144d (diff)
downloaddexon-0x-contracts-65120e84e25f70f014bb195539720aa3dc0f8eec.tar.gz
dexon-0x-contracts-65120e84e25f70f014bb195539720aa3dc0f8eec.tar.zst
dexon-0x-contracts-65120e84e25f70f014bb195539720aa3dc0f8eec.zip
Upgrade react-highlight to version that depends on React 16
-rw-r--r--packages/react-shared/package.json2
-rw-r--r--yarn.lock9
2 files changed, 10 insertions, 1 deletions
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index 6f43a9733..b59a6201e 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -47,7 +47,7 @@
"material-ui": "^0.17.1",
"react": "^16.4.2",
"react-dom": "^16.4.2",
- "react-highlight": "0xproject/react-highlight",
+ "react-highlight": "0xproject/react-highlight#e5201e6a6bf276d3a6bf4828252c886c386d3666",
"react-markdown": "^3.2.2",
"react-scroll": "0xproject/react-scroll#similar-to-pr-330",
"react-tap-event-plugin": "^2.0.1"
diff --git a/yarn.lock b/yarn.lock
index 973bdd52f..7a632d705 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11274,6 +11274,15 @@ react-highlight@0xproject/react-highlight:
react "^15.5.4"
react-dom "^15.5.4"
+react-highlight@0xproject/react-highlight#e5201e6a6bf276d3a6bf4828252c886c386d3666:
+ version "0.10.0"
+ resolved "https://codeload.github.com/0xproject/react-highlight/tar.gz/e5201e6a6bf276d3a6bf4828252c886c386d3666"
+ dependencies:
+ highlight.js "^9.11.0"
+ highlightjs-solidity "^1.0.5"
+ react "^16.4.2"
+ react-dom "^16.4.2"
+
react-hot-loader@^4.3.3:
version "4.3.4"
resolved "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.3.4.tgz#4f9bdd55bb20d77a6ae8931fa1c187e5f0ce6279"