Skip to content

Commit 3556d73

Browse files
committed
misc: Update @sentry/react dependencies to fix types issue
1 parent 9e9f2a4 commit 3556d73

File tree

2 files changed

+66
-41
lines changed

2 files changed

+66
-41
lines changed

packages/react/package.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,24 @@
2727
"react": "15.x || 16.x || 17.x"
2828
},
2929
"devDependencies": {
30+
<<<<<<< Updated upstream
3031
"@sentry-internal/eslint-config-sdk": "6.2.3",
3132
"@testing-library/react": "^10.4.9",
3233
"@testing-library/react-hooks": "^3.3.0",
3334
"@types/history-4": "npm:@types/[email protected]",
3435
"@types/history-5": "npm:@types/[email protected]",
36+
=======
37+
"@sentry-internal/eslint-config-sdk": "6.2.4",
38+
"@testing-library/react": "^11.2.6",
39+
"@testing-library/react-hooks": "^5.1.1",
40+
"@types/history-4": "npm:@types/[email protected]",
41+
"@types/history-5": "npm:@types/[email protected]",
42+
>>>>>>> Stashed changes
3543
"@types/hoist-non-react-statics": "^3.3.1",
36-
"@types/react": "^16.9.35",
37-
"@types/react-router-3": "npm:@types/[email protected].20",
38-
"@types/react-router-4": "npm:@types/react-router@5.0.0",
39-
"@types/react-router-5": "npm:@types/react-router@5.0.0",
44+
"@types/react": "^17.0.3",
45+
"@types/react-router-3": "npm:@types/[email protected].24",
46+
"@types/react-router-4": "npm:@types/react-router@5.1.13",
47+
"@types/react-router-5": "npm:@types/react-router@5.1.13",
4048
"eslint": "7.6.0",
4149
"eslint-plugin-react": "^7.20.5",
4250
"eslint-plugin-react-hooks": "^4.0.8",

yarn.lock

Lines changed: 54 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2705,10 +2705,17 @@
27052705
dependencies:
27062706
highlight.js "^9.15.6"
27072707

2708+
<<<<<<< Updated upstream
27082709
"@testing-library/dom@^7.22.3":
27092710
version "7.30.1"
27102711
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.30.1.tgz#07b6f3ccd7f1f1e34ab0406932073e2971817f3d"
27112712
integrity sha512-RQUvqqq2lxTCOffhSNxpX/9fCoR+nwuQPmG5uhuuEH5KBAzNf2bK3OzBoWjm5zKM78SLjnGRAKt8hRjQA4E46A==
2713+
=======
2714+
"@testing-library/dom@^7.22.3", "@testing-library/dom@^7.28.1":
2715+
version "7.30.2"
2716+
resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.30.2.tgz#a63ae7078235ec6248a8a522b04e696ab49896cc"
2717+
integrity sha512-NJzHILb5De0J0varzT0W00qDTLcbF86etfAyx5ty7iJhpR6eCs+JR99Ls7AMSUG2bWRYIG0u4KTPH6PMcZhlWQ==
2718+
>>>>>>> Stashed changes
27122719
dependencies:
27132720
"@babel/code-frame" "^7.10.4"
27142721
"@babel/runtime" "^7.12.5"
@@ -2719,13 +2726,17 @@
27192726
lz-string "^1.4.4"
27202727
pretty-format "^26.6.2"
27212728

2722-
"@testing-library/react-hooks@^3.3.0":
2723-
version "3.7.0"
2724-
resolved "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.7.0.tgz#6d75c5255ef49bce39b6465bf6b49e2dac84919e"
2725-
integrity sha512-TwfbY6BWtWIHitjT05sbllyLIProcysC0dF0q1bbDa7OHLC6A6rJOYJwZ13hzfz3O4RtOuInmprBozJRyyo7/g==
2729+
"@testing-library/react-hooks@^5.1.1":
2730+
version "5.1.1"
2731+
resolved "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-5.1.1.tgz#1fbaae8a4e8a4a7f97b176c23e1e890c41bbbfa5"
2732+
integrity sha512-52D2XnpelFDefnWpy/V6z2qGNj8JLIvW5DjYtelMvFXdEyWiykSaI7IXHwFy4ICoqXJDmmwHAiFRiFboub/U5g==
27262733
dependencies:
27272734
"@babel/runtime" "^7.12.5"
2728-
"@types/testing-library__react-hooks" "^3.4.0"
2735+
"@types/react" ">=16.9.0"
2736+
"@types/react-dom" ">=16.9.0"
2737+
"@types/react-test-renderer" ">=16.9.0"
2738+
filter-console "^0.1.1"
2739+
react-error-boundary "^3.1.0"
27292740

27302741
"@testing-library/react@^10.4.9":
27312742
version "10.4.9"
@@ -2735,6 +2746,14 @@
27352746
"@babel/runtime" "^7.10.3"
27362747
"@testing-library/dom" "^7.22.3"
27372748

2749+
"@testing-library/react@^11.2.6":
2750+
version "11.2.6"
2751+
resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.6.tgz#586a23adc63615985d85be0c903f374dab19200b"
2752+
integrity sha512-TXMCg0jT8xmuU8BkKMtp8l7Z50Ykew5WNX8UoIKTaLFwKkP2+1YDhOLA2Ga3wY4x29jyntk7EWfum0kjlYiSjQ==
2753+
dependencies:
2754+
"@babel/runtime" "^7.12.5"
2755+
"@testing-library/dom" "^7.28.1"
2756+
27382757
"@tootallnate/once@1":
27392758
version "1.1.2"
27402759
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
@@ -3058,12 +3077,7 @@
30583077
"@types/minimatch" "*"
30593078
"@types/node" "*"
30603079

3061-
"@types/history-4@npm:@types/[email protected]", "@types/history-5@npm:@types/[email protected]":
3062-
version "4.7.7"
3063-
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.7.tgz#613957d900fab9ff84c8dfb24fa3eef0c2a40896"
3064-
integrity sha512-2xtoL22/3Mv6a70i4+4RB7VgbDDORoWwjcqeNysojZA0R7NK17RbY5Gof/2QiFfJgX+KkWghbwJ+d/2SB8Ndzg==
3065-
3066-
"@types/history@*":
3080+
"@types/history-4@npm:@types/[email protected]", "@types/history-5@npm:@types/[email protected]", "@types/history@*":
30673081
version "4.7.8"
30683082
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
30693083
integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
@@ -3249,30 +3263,37 @@
32493263
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
32503264
integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
32513265

3252-
"@types/react-router-3@npm:@types/[email protected]":
3253-
version "3.0.20"
3254-
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-3.0.20.tgz#a711682475ccef70ad9ad9e459859380221e6ee6"
3255-
integrity sha512-0sx2ThGYgblXPf8we/c+umFzP3RCbBp1bbFmd3pO1UaOYnTDno82iql3MQTVqB09rhopKORNfakDU/9xZ4QR6g==
3266+
"@types/react-dom@>=16.9.0":
3267+
version "17.0.3"
3268+
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.3.tgz#7fdf37b8af9d6d40127137865bb3fff8871d7ee1"
3269+
integrity sha512-4NnJbCeWE+8YBzupn/YrJxZ8VnjcJq5iR1laqQ1vkpQgBiA7bwk0Rp24fxsdNinzJY2U+HHS4dJJDPdoMjdJ7w==
3270+
dependencies:
3271+
"@types/react" "*"
3272+
3273+
"@types/react-router-3@npm:@types/[email protected]":
3274+
version "3.0.24"
3275+
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-3.0.24.tgz#f924569538ea78a0b0d70892900a0d99ed6d7354"
3276+
integrity sha512-cSpMXzI0WocB5/UmySAtGlvG5w3m2mNvU6FgYFFWGqt6KywI7Ez+4Z9mEkglcAAGaP+voZjVg+BJP86bkVrSxQ==
32563277
dependencies:
32573278
"@types/history" "^3"
32583279
"@types/react" "*"
32593280

3260-
"@types/react-router-4@npm:@types/react-router@5.0.0", "@types/react-router-5@npm:@types/react-router@5.0.0":
3261-
version "5.0.0"
3262-
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.0.0.tgz#22ae8f55d8af770ea1f755218936f01bfe1bfe27"
3263-
integrity sha512-0JjtJMxkQSyWUHTHaD3GhKf6rcZSUFmcQob8OlPTsbnxnIg2Nh3btkss4uke5CKVRtbCMipGU7My5jtfZQC+jw==
3281+
"@types/react-router-4@npm:@types/react-router@5.1.13", "@types/react-router-5@npm:@types/react-router@5.1.13":
3282+
version "5.1.13"
3283+
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.13.tgz#051c0d229bd48ad90558a1db500708127cc512f7"
3284+
integrity sha512-ZIuaO9Yrln54X6elg8q2Ivp6iK6p4syPsefEYAhRDAoqNh48C8VYUmB9RkXjKSQAJSJV0mbIFCX7I4vZDcHrjg==
32643285
dependencies:
32653286
"@types/history" "*"
32663287
"@types/react" "*"
32673288

3268-
"@types/react-test-renderer@*":
3289+
"@types/react-test-renderer@>=16.9.0":
32693290
version "17.0.1"
32703291
resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-17.0.1.tgz#3120f7d1c157fba9df0118dae20cb0297ee0e06b"
32713292
integrity sha512-3Fi2O6Zzq/f3QR9dRnlnHso9bMl7weKCviFmfF6B4LS1Uat6Hkm15k0ZAQuDz+UBq6B3+g+NM6IT2nr5QgPzCw==
32723293
dependencies:
32733294
"@types/react" "*"
32743295

3275-
"@types/react@*":
3296+
"@types/react@*", "@types/react@>=16.9.0", "@types/react@^17.0.3":
32763297
version "17.0.3"
32773298
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz#ba6e215368501ac3826951eef2904574c262cc79"
32783299
integrity sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg==
@@ -3281,15 +3302,6 @@
32813302
"@types/scheduler" "*"
32823303
csstype "^3.0.2"
32833304

3284-
"@types/react@^16.9.35":
3285-
version "16.14.5"
3286-
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.5.tgz#2c39b5cadefaf4829818f9219e5e093325979f4d"
3287-
integrity sha512-YRRv9DNZhaVTVRh9Wmmit7Y0UFhEVqXqCSw3uazRWMxa2x85hWQZ5BN24i7GXZbaclaLXEcodEeIHsjBA8eAMw==
3288-
dependencies:
3289-
"@types/prop-types" "*"
3290-
"@types/scheduler" "*"
3291-
csstype "^3.0.2"
3292-
32933305
32943306
version "0.0.8"
32953307
resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
@@ -3343,13 +3355,6 @@
33433355
resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a"
33443356
integrity sha512-Lja2xYuuf2B3knEsga8ShbOdsfNOtzT73GyJmZyY7eGl2+ajOqrs8yM5ze0fsSoYwvA6bw7/Qr7OZ7PEEmYwWg==
33453357

3346-
"@types/testing-library__react-hooks@^3.4.0":
3347-
version "3.4.1"
3348-
resolved "https://registry.yarnpkg.com/@types/testing-library__react-hooks/-/testing-library__react-hooks-3.4.1.tgz#b8d7311c6c1f7db3103e94095fe901f8fef6e433"
3349-
integrity sha512-G4JdzEcq61fUyV6wVW9ebHWEiLK2iQvaBuCHHn9eMSbZzVh4Z4wHnUGIvQOYCCYeu5DnUtFyNYuAAgbSaO/43Q==
3350-
dependencies:
3351-
"@types/react-test-renderer" "*"
3352-
33533358
"@types/tough-cookie@*":
33543359
version "4.0.0"
33553360
resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.0.tgz#fef1904e4668b6e5ecee60c52cc6a078ffa6697d"
@@ -9531,6 +9536,11 @@ fill-range@^7.0.1:
95319536
dependencies:
95329537
to-regex-range "^5.0.1"
95339538

9539+
filter-console@^0.1.1:
9540+
version "0.1.1"
9541+
resolved "https://registry.yarnpkg.com/filter-console/-/filter-console-0.1.1.tgz#6242be28982bba7415bcc6db74a79f4a294fa67c"
9542+
integrity sha512-zrXoV1Uaz52DqPs+qEwNJWJFAWZpYJ47UNmpN9q4j+/EYsz85uV0DC9k8tRND5kYmoVzL0W+Y75q4Rg8sRJCdg==
9543+
95349544
filter-obj@^1.1.0:
95359545
version "1.1.0"
95369546
resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b"
@@ -16160,6 +16170,13 @@ react-dom@^16.0.0:
1616016170
prop-types "^15.6.2"
1616116171
scheduler "^0.19.1"
1616216172

16173+
react-error-boundary@^3.1.0:
16174+
version "3.1.1"
16175+
resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-3.1.1.tgz#932c5ca5cbab8ec4fe37fd7b415aa5c3a47597e7"
16176+
integrity sha512-W3xCd9zXnanqrTUeViceufD3mIW8Ut29BUD+S2f0eO2XCOU8b6UrJfY46RDGe5lxCJzfe4j0yvIfh0RbTZhKJw==
16177+
dependencies:
16178+
"@babel/runtime" "^7.12.5"
16179+
1616316180
react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
1616416181
version "16.13.1"
1616516182
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"

0 commit comments

Comments
 (0)