PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3306 from matrix-org/t3chguy/react16_2

Browse source 
Bump matrix-react-test-utils for React 16 compatibility
This commit is contained in:
Michael Telatynski 2019-08-12 18:19:11 +01:00 committed by GitHub
commit e3348c6184
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -148,7 +148,7 @@
"karma-summary-reporter": "^1.5.1", "karma-summary-reporter": "^1.5.1",
"karma-webpack": "^4.0.0-beta.0", "karma-webpack": "^4.0.0-beta.0",
"matrix-mock-request": "^1.2.3", "matrix-mock-request": "^1.2.3",
"matrix-react-test-utils": "^0.1.1", "matrix-react-test-utils": "^0.2.2",
"mocha": "^5.0.5", "mocha": "^5.0.5",
"react-addons-test-utils": "^15.4.0", "react-addons-test-utils": "^15.4.0",
"require-json": "0.0.1", "require-json": "0.0.1",

15
yarn.lock
View file

@ -5061,13 +5061,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0" bluebird "^3.5.0"
expect "^1.20.2" expect "^1.20.2"
matrix-react-test-utils@^0.1.1: matrix-react-test-utils@^0.2.2:
version "0.1.1" version "0.2.2"
resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.1.1.tgz#b548844d0ebe338ea1b9c8f16474c30d17c3bdf4" resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853"
integrity sha1-tUiETQ6+M46hucjxZHTDDRfDvfQ= integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ==
dependencies:
react "^15.6.1"
react-dom "^15.6.1"
md5.js@^1.3.4: md5.js@^1.3.4:
version "1.3.5" version "1.3.5"
@ -6373,7 +6370,7 @@ react-beautiful-dnd@^4.0.1:
redux-thunk "^2.2.0" redux-thunk "^2.2.0"
reselect "^3.0.1" reselect "^3.0.1"
react-dom@^15.6.0, react-dom@^15.6.1: react-dom@^15.6.0:
version "15.6.2" version "15.6.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
integrity sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA= integrity sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=
@ -6436,7 +6433,7 @@ react-redux@^5.0.6:
react-is "^16.6.0" react-is "^16.6.0"
react-lifecycles-compat "^3.0.0" react-lifecycles-compat "^3.0.0"
react@^15.6.0, react@^15.6.1: react@^15.6.0:
version "15.6.2" version "15.6.2"
resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
integrity sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI= integrity sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=