Skip to content

Commit

Permalink
Merge pull request #110 from lidofinance/feature/si-1128-fix-ui-lib-b…
Browse files Browse the repository at this point in the history
…uild

React version updated to v18
  • Loading branch information
alx-khramov authored Dec 14, 2023
2 parents c0179c5 + 110e920 commit 0a10c33
Show file tree
Hide file tree
Showing 11 changed files with 71 additions and 65 deletions.
6 changes: 3 additions & 3 deletions apps/demo-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"flatted": "^3.2.7",
"lodash": "^4.17.21",
"next": "12.3.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"reef-knot": "*",
"styled-components": "^5.3.6",
"tiny-invariant": "^1.3.1",
Expand All @@ -38,7 +38,7 @@
"@babel/core": "^7.0.0",
"@types/lodash": "^4.14.196",
"@types/node": "^17.0.12",
"@types/react": "17.0.53",
"@types/react": "18.2.45",
"husky": "^8.0.3",
"next-transpile-modules": "9.0.0",
"tsconfig": "*",
Expand Down
7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"@rollup/plugin-json": "5.0.2",
"@rollup/plugin-node-resolve": "15.0.1",
"@turbo/gen": "^1.10.16",
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.17",
"@types/react": "18.2.45",
"@types/react-dom": "18.2.17",
"@types/styled-components": "5.1.12",
"@typescript-eslint/eslint-plugin": "^5.19.0",
"@typescript-eslint/parser": "^5.19.0",
Expand Down Expand Up @@ -60,9 +60,6 @@
"typescript": "^4.9.5"
},
"dependencies": {},
"resolutions": {
"@types/react": "17.0.53"
},
"engines": {
"node": ">=16.0.0"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/connect-wallet-modal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"@ledgerhq/hw-app-eth": "^6.34.3",
"@ledgerhq/hw-transport-webhid": "^6.27.19",
"@lidofinance/lido-ui": "^3.17.0",
"@types/react": "^18.2.45",
"@types/react-dom": "^18.2.17"
"@types/react": "18.2.45",
"@types/react-dom": "18.2.17"
},
"devDependencies": {
"@reef-knot/core-react": "^1.7.0",
Expand All @@ -54,7 +54,7 @@
"@reef-knot/ledger-connector": "^1.1.0",
"@types/ua-parser-js": "^0.7.36",
"eslint-config-custom": "*",
"react": "^18.2.0",
"react": "18.2.0",
"react-dom": "^18.2.0",
"ua-parser-js": "1.0.33",
"wagmi": "^0.12.19"
Expand All @@ -67,7 +67,7 @@
"@reef-knot/wallets-icons": "^1.0.0",
"@reef-knot/web3-react": "^1.3.0",
"@reef-knot/ledger-connector": "^1.0.1",
"react": ">=17",
"react": ">=18",
"ua-parser-js": "^1.0.33",
"wagmi": "^0.12.19"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/core-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
"@reef-knot/types": "^1.3.0",
"@reef-knot/ui-react": "^1.0.7",
"eslint-config-custom": "*",
"react": "17.0.2",
"react": "18.2.0",
"wagmi": "^0.12.19"
},
"peerDependencies": {
"@reef-knot/wallets-list": "^1.4.1",
"@reef-knot/types": "^1.2.1",
"@reef-knot/ui-react": "^1.0.4",
"react": ">=17",
"react": ">=18",
"wagmi": "^0.12.19"
}
}
4 changes: 2 additions & 2 deletions packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
"dev": "dev=on rollup -c -w"
},
"devDependencies": {
"react": "17.0.2",
"react": "18.2.0",
"wagmi": "^0.12.19"
},
"peerDependencies": {
"react": ">=17",
"react": ">=18",
"wagmi": "^0.12.19"
}
}
12 changes: 6 additions & 6 deletions packages/ui-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@
"use-callback-ref": "1.2.5"
},
"peerDependencies": {
"react": ">=17",
"react-dom": ">=17",
"react-is": ">=17",
"react": ">=18",
"react-dom": ">=18",
"react-is": ">=18",
"styled-components": "5",
"wagmi": "^0.12.19"
},
"devDependencies": {
"@types/react-transition-group": "4.4.2",
"eslint-config-custom": "*",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-is": "17.0.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-is": "18.2.0",
"styled-components": "^5.3.6",
"wagmi": "^0.12.19"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/wallets-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"ua-parser-js": "1.0.33"
},
"peerDependencies": {
"react": ">=17",
"react": ">=18",
"wagmi": "^0.12.19",
"ua-parser-js": "1.0.33"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/wallets-icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
"lint": "eslint --ext ts,tsx,js,mjs ."
},
"peerDependencies": {
"react": ">=17"
"react": ">=18"
},
"devDependencies": {
"@svgr/rollup": "^6.5.1",
"eslint-config-custom": "*",
"react": "17.0.2"
"react": "18.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/wallets-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@
},
"peerDependencies": {
"@reef-knot/types": "^1.2.1",
"react": ">=17"
"react": ">=18"
}
}
6 changes: 3 additions & 3 deletions packages/web3-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
"@testing-library/react": "^12.1.5",
"@testing-library/react-hooks": "^7.0.2",
"@types/jest": "^29.4.0",
"@types/react": "17.0.53",
"@types/react": "18.2.45",
"@types/ua-parser-js": "^0.7.36",
"babel-jest": "^29.3.1",
"babel-loader": "8.2.2",
"babel-plugin-styled-components": "1.13.2",
"eslint-config-custom": "*",
"jest": "^29.4.3",
"jest-environment-jsdom": "^29.4.3",
"react": "17.0.2",
"react": "18.2.0",
"ua-parser-js": "1.0.33"
},
"dependencies": {
Expand All @@ -83,7 +83,7 @@
"@lido-sdk/react": "^2.0.2",
"@reef-knot/core-react": "^1.4.3",
"@reef-knot/ledger-connector": "^1.0.0",
"react": ">=17",
"react": ">=18",
"ua-parser-js": "^1.0.33",
"wagmi": "^0.12.19"
}
Expand Down
81 changes: 45 additions & 36 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3633,6 +3633,13 @@
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==

"@types/[email protected]":
version "18.2.17"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.17.tgz#375c55fab4ae671bd98448dcfa153268d01d6f64"
integrity sha512-rvrT/M7Df5eykWFxn6MYt5Pem/Dbyc1N8Y0S9Mrkw2WFCRiqUgw9P7ul2NpwsXCSM1DVdENzdG9J5SreqfAIWg==
dependencies:
"@types/react" "*"

"@types/react-dom@<18.0.0":
version "17.0.20"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.20.tgz#e0c8901469d732b36d8473b40b679ad899da1b53"
Expand All @@ -3647,13 +3654,6 @@
dependencies:
"@types/react" "*"

"@types/react-dom@^18.2.17":
version "18.2.17"
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.17.tgz#375c55fab4ae671bd98448dcfa153268d01d6f64"
integrity sha512-rvrT/M7Df5eykWFxn6MYt5Pem/Dbyc1N8Y0S9Mrkw2WFCRiqUgw9P7ul2NpwsXCSM1DVdENzdG9J5SreqfAIWg==
dependencies:
"@types/react" "*"

"@types/react-test-renderer@>=16.9.0":
version "18.0.1"
resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-18.0.1.tgz#d3f308912fcc4491e4fbc134b906bb65bdee73f6"
Expand All @@ -3668,10 +3668,19 @@
dependencies:
"@types/react" "*"

"@types/react@*", "@types/[email protected]", "@types/react@>=16.9.0", "@types/react@^17", "@types/react@^18.2.45":
version "17.0.53"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.53.tgz#10d4d5999b8af3d6bc6a9369d7eb953da82442ab"
integrity sha512-1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw==
"@types/react@*", "@types/[email protected]", "@types/react@>=16.9.0":
version "18.2.45"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.45.tgz#253f4fac288e7e751ab3dc542000fb687422c15c"
integrity sha512-TtAxCNrlrBp8GoeEp1npd5g+d/OejJHFxS3OWmrPBMFaVQMSN0OFySozJio5BHxTuTeug00AVXVAjfDSfk+lUg==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
csstype "^3.0.2"

"@types/react@^17":
version "17.0.73"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.73.tgz#23a663c803b18d8b7f4f2bb9b467f2f3fd70787a"
integrity sha512-6AcjgPIVsXTIsFDgsGW0iQhvg0xb2vt2qAWgXyncnVNRaW9ZXTTwAh7RQoh7PzK1AhjPoGDvUBkdAREih9n5oQ==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
Expand Down Expand Up @@ -9295,7 +9304,15 @@ [email protected]:
raf "^3.4.1"
tiny-warning "^1.0.3"

[email protected], react-dom@^17.0.2:
[email protected], react-dom@^18.2.0:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
dependencies:
loose-envify "^1.1.0"
scheduler "^0.23.0"

react-dom@^17.0.2:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
Expand All @@ -9304,35 +9321,27 @@ [email protected], react-dom@^17.0.2:
object-assign "^4.1.1"
scheduler "^0.20.2"

react-dom@^18.2.0:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
dependencies:
loose-envify "^1.1.0"
scheduler "^0.23.0"

react-error-boundary@^3.1.0:
version "3.1.4"
resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-3.1.4.tgz#255db92b23197108757a888b01e5b729919abde0"
integrity sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==
dependencies:
"@babel/runtime" "^7.12.5"

react-is@17.0.2, react-is@^17.0.1:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
react-is@18.2.0, react-is@^18.0.0:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==

react-is@^16.13.1, react-is@^16.7.0:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==

react-is@^18.0.0:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
react-is@^17.0.1:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==

react-jazzicon@^1.0.4:
version "1.0.4"
Expand All @@ -9358,21 +9367,21 @@ react-transition-group@4:
loose-envify "^1.4.0"
prop-types "^15.6.2"

[email protected], react@^17.0.2:
[email protected]:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
dependencies:
loose-envify "^1.1.0"

react@^17.0.2:
version "17.0.2"
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

react@^18.2.0:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
dependencies:
loose-envify "^1.1.0"

read-pkg-up@^7.0.1:
version "7.0.1"
resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
Expand Down

0 comments on commit 0a10c33

Please sign in to comment.