Skip to content

Commit

Permalink
Merge 1bc624a into 362e4cb
Browse files Browse the repository at this point in the history
  • Loading branch information
tisto committed Sep 10, 2018
2 parents 362e4cb + 1bc624a commit 3e5dcc1
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 22 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -4,6 +4,7 @@

### Added

* Upgrade React to 16.5 @tisto
* Upgrade React to 16.4.2 to fix a server-side vunerability @tisto

### Changes
Expand Down
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -199,11 +199,11 @@
"prop-types": "15.6.1",
"raven": "2.4.2",
"raven-js": "3.24.0",
"react": "16.4.2",
"react": "16.5.0",
"react-cookie": "1.0.5",
"react-dnd": "2.6.0",
"react-dnd-html5-backend": "2.6.0",
"react-dom": "16.4.2",
"react-dom": "16.5.0",
"react-dropzone": "4.2.9",
"react-helmet": "5.2.0",
"react-inline-css": "2.3.1",
Expand Down Expand Up @@ -286,7 +286,7 @@
"react-addons-test-utils": "15.6.2",
"react-stateless-wrapper": "1.0.7",
"react-templates": "0.6.1",
"react-test-renderer": "16.4.2",
"react-test-renderer": "16.5.0",
"react-transform-catch-errors": "1.0.2",
"react-transform-hmr": "1.0.4",
"redbox-react": "1.5.0",
Expand Down
51 changes: 32 additions & 19 deletions yarn.lock
Expand Up @@ -10055,6 +10055,13 @@ prop-types@^15.6.0:
loose-envify "^1.3.1"
object-assign "^4.1.1"

prop-types@^15.6.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
dependencies:
loose-envify "^1.3.1"
object-assign "^4.1.1"

proxy-addr@~2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
Expand Down Expand Up @@ -10376,14 +10383,14 @@ react-dock@^0.2.4:
lodash.debounce "^3.1.1"
prop-types "^15.5.8"

react-dom@16.4.2:
version "16.4.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.2.tgz#4afed569689f2c561d2b8da0b819669c38a0bda4"
react-dom@16.5.0:
version "16.5.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.0.tgz#57704e5718669374b182a17ea79a6d24922cb27d"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"
prop-types "^15.6.2"
schedule "^0.3.0"

react-dropzone@4.2.9:
version "4.2.9"
Expand Down Expand Up @@ -10442,9 +10449,9 @@ react-intl@2.4.0:
intl-relativeformat "^2.0.0"
invariant "^2.1.1"

react-is@^16.4.2:
version "16.4.2"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.2.tgz#84891b56c2b6d9efdee577cc83501dfc5ecead88"
react-is@^16.5.0:
version "16.5.0"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.5.0.tgz#2ec7c192709698591efe13722fab3ef56144ba55"

react-json-tree@^0.11.0:
version "0.11.0"
Expand Down Expand Up @@ -10602,14 +10609,14 @@ react-templates@0.6.1:
optionator "0.8.2"
text-table "0.2.0"

react-test-renderer@16.4.2:
version "16.4.2"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.4.2.tgz#4e03eca9359bb3210d4373f7547d1364218ef74e"
react-test-renderer@16.5.0:
version "16.5.0"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.5.0.tgz#1aeca0edc4f27f63265dcaed80ba82e11e762f56"
dependencies:
fbjs "^0.8.16"
object-assign "^4.1.1"
prop-types "^15.6.0"
react-is "^16.4.2"
prop-types "^15.6.2"
react-is "^16.5.0"
schedule "^0.3.0"

react-transform-catch-errors@1.0.2:
version "1.0.2"
Expand All @@ -10622,14 +10629,14 @@ react-transform-hmr@1.0.4:
global "^4.3.0"
react-proxy "^1.1.7"

react@16.4.2:
version "16.4.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.4.2.tgz#2cd90154e3a9d9dd8da2991149fdca3c260e129f"
react@16.5.0:
version "16.5.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.5.0.tgz#f2c1e754bf9751a549d9c6d9aca41905beb56575"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"
prop-types "^15.6.2"
schedule "^0.3.0"

read-all-stream@^3.0.0:
version "3.1.0"
Expand Down Expand Up @@ -11471,6 +11478,12 @@ sax@^1.2.4, sax@~1.2.1, sax@~1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"

schedule@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.3.0.tgz#1be2ab2fc2e768536269ce7326efb478d6c045e8"
dependencies:
object-assign "^4.1.1"

schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.3, schema-utils@^0.4.5:
version "0.4.5"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
Expand Down

0 comments on commit 3e5dcc1

Please sign in to comment.