Skip to content

Commit bf7a90e

Browse files
committed
fix: resolve @types/react-dom to 18.x for web-demo
The root resolutions block still pinned @types/react and @types/react-dom to 17.x. Yarn deduped both the 17.x pin and the new ^18.0.0 devDep from web-demo into a single lockfile entry resolving to 17.0.16. npm then found 17.0.16 in the tree while web-demo declared ^18.0.0, causing ERESOLVE on the new npm-install-compatibility CI job. Bumps the resolutions pins to ^18.0.0 and splits the yarn lockfile entries so ^18.0.0 resolves to 18.3.7 / 18.3.28. TICKET: VL-5111
1 parent 3b42c62 commit bf7a90e

2 files changed

Lines changed: 17 additions & 4 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
"jspdf": ">=4.2.1",
7272
"@ethereumjs/util": "8.0.3",
7373
"@types/keyv": "3.1.4",
74-
"@types/react": "17.0.24",
75-
"@types/react-dom": "17.0.16",
74+
"@types/react": "^18.0.0",
75+
"@types/react-dom": "^18.0.0",
7676
"@solana/web3.js": "1.95.8",
7777
"**/nise/**/path-to-regexp": "8.4.0",
7878
"**/express/**/path-to-regexp": "0.1.13",

yarn.lock

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6118,14 +6118,19 @@
61186118
resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz"
61196119
integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
61206120

6121-
"@types/react-dom@17.0.16", "@types/react-dom@^18.0.0":
6121+
"@types/react-dom@17.0.16":
61226122
version "17.0.16"
61236123
resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.16.tgz#7caba93cf2806c51e64d620d8dff4bae57e06cc4"
61246124
integrity sha512-DWcXf8EbMrO/gWnQU7Z88Ws/p16qxGpPyjTKTpmBSFKeE+HveVubqGO1CVK7FrwlWD5MuOcvh8gtd0/XO38NdQ==
61256125
dependencies:
61266126
"@types/react" "^17"
61276127

6128-
"@types/react@*", "@types/react@17.0.24", "@types/react@^17", "@types/react@^18.0.0":
6128+
"@types/react-dom@^18.0.0":
6129+
version "18.3.7"
6130+
resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz"
6131+
integrity sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==
6132+
6133+
"@types/react@*", "@types/react@17.0.24", "@types/react@^17":
61296134
version "17.0.24"
61306135
resolved "https://registry.npmjs.org/@types/react/-/react-17.0.24.tgz#7e1b3f78d0fc53782543f9bce6d949959a5880bd"
61316136
integrity sha512-eIpyco99gTH+FTI3J7Oi/OH8MZoFMJuztNRimDOJwH4iGIsKV2qkGnk4M9VzlaVWeEEWLWSQRy0FEA0Kz218cg==
@@ -6134,6 +6139,14 @@
61346139
"@types/scheduler" "*"
61356140
csstype "^3.0.2"
61366141

6142+
"@types/react@^18.0.0":
6143+
version "18.3.28"
6144+
resolved "https://registry.npmjs.org/@types/react/-/react-18.3.28.tgz"
6145+
integrity sha512-z9VXpC7MWrhfWipitjNdgCauoMLRdIILQsAEV+ZesIzBq/oUlxk0m3ApZuMFCXdnS4U7KrI+l3WRUEGQ8K1QKw==
6146+
dependencies:
6147+
"@types/prop-types" "*"
6148+
csstype "^3.2.2"
6149+
61376150
"@types/responselike@^1.0.0":
61386151
version "1.0.3"
61396152
resolved "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz"

0 commit comments

Comments
 (0)