aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Millman <brandon@0xproject.com>2019-01-18 02:26:26 +0800
committerGitHub <noreply@github.com>2019-01-18 02:26:26 +0800
commit4143baa27a0afc70f34749c968c22998d8930f63 (patch)
tree5c67057f9b6bd0b29fa1d4bb18bdf9a7d7fc6cd9
parent5816279d68a2926025d54d007f04020052c46e9b (diff)
parent7b266bc762e1b37a84a855e71963a9b612c3abdd (diff)
downloaddexon-sol-tools-4143baa27a0afc70f34749c968c22998d8930f63.tar
dexon-sol-tools-4143baa27a0afc70f34749c968c22998d8930f63.tar.gz
dexon-sol-tools-4143baa27a0afc70f34749c968c22998d8930f63.tar.bz2
dexon-sol-tools-4143baa27a0afc70f34749c968c22998d8930f63.tar.lz
dexon-sol-tools-4143baa27a0afc70f34749c968c22998d8930f63.tar.xz
dexon-sol-tools-4143baa27a0afc70f34749c968c22998d8930f63.tar.zst
dexon-sol-tools-4143baa27a0afc70f34749c968c22998d8930f63.zip
Merge pull request #1523 from 0xProject/fix/react-shared/react-highlight-dep
[react-shared] Change react-highlight dep to reference fork by branch instead of commit
-rw-r--r--packages/react-shared/package.json2
-rw-r--r--yarn.lock27
2 files changed, 2 insertions, 27 deletions
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index 47d36ca66..4be4742b0 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -52,7 +52,7 @@
"material-ui": "^0.20.0",
"react": "^16.5.2",
"react-dom": "^16.5.2",
- "react-highlight": "0xproject/react-highlight#699ac4d9529e33520bff4b9bd9c624d21efbba75",
+ "react-highlight": "0xproject/react-highlight#fix/react-version",
"react-markdown": "^3.2.2",
"react-router-dom": "^4.1.1",
"react-scroll": "0xproject/react-scroll#pr-330-and-replace-state",
diff --git a/yarn.lock b/yarn.lock
index 3996c494e..c7c19b4f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13549,15 +13549,6 @@ react-dom@^16.3.2:
object-assign "^4.1.1"
prop-types "^15.6.0"
-react-dom@^16.4.2:
- version "16.7.0"
- resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.7.0.tgz#a17b2a7ca89ee7390bc1ed5eb81783c7461748b8"
- dependencies:
- loose-envify "^1.1.0"
- object-assign "^4.1.1"
- prop-types "^15.6.2"
- scheduler "^0.12.0"
-
react-dom@^16.5.2:
version "16.5.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7"
@@ -13609,7 +13600,7 @@ react-helmet@^5.2.0:
prop-types "^15.5.4"
react-side-effect "^1.1.0"
-react-highlight@0xproject/react-highlight#699ac4d9529e33520bff4b9bd9c624d21efbba75:
+react-highlight@0xproject/react-highlight#fix/react-version:
version "1.0.0"
resolved "https://codeload.github.com/0xproject/react-highlight/tar.gz/699ac4d9529e33520bff4b9bd9c624d21efbba75"
dependencies:
@@ -13899,15 +13890,6 @@ react@^16.3.2:
object-assign "^4.1.1"
prop-types "^15.6.0"
-react@^16.4.2:
- version "16.7.0"
- resolved "https://registry.yarnpkg.com/react/-/react-16.7.0.tgz#b674ec396b0a5715873b350446f7ea0802ab6381"
- dependencies:
- loose-envify "^1.1.0"
- object-assign "^4.1.1"
- prop-types "^15.6.2"
- scheduler "^0.12.0"
-
react@^16.5.2:
version "16.5.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42"
@@ -14790,13 +14772,6 @@ schedule@^0.5.0:
dependencies:
object-assign "^4.1.1"
-scheduler@^0.12.0:
- version "0.12.0"
- resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.12.0.tgz#8ab17699939c0aedc5a196a657743c496538647b"
- dependencies:
- loose-envify "^1.1.0"
- object-assign "^4.1.1"
-
schema-utils@^0.4.4:
version "0.4.7"
resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"