From 52f9f732e2d97a2723b1b9cf2d1b45e939075239 Mon Sep 17 00:00:00 2001 From: Pavel Prichodko <14926950+prichodko@users.noreply.github.com> Date: Mon, 13 Mar 2023 22:24:39 +0100 Subject: [PATCH] unify react versions --- apps/desktop/package.json | 4 +- apps/mobile/package.json | 4 +- apps/web/package.json | 4 +- examples/with-next/package.json | 8 +- examples/with-vite/package.json | 8 +- package.json | 6 +- packages/components/src/popover/popover.tsx | 7 +- packages/status-react/package.json | 4 +- yarn.lock | 85 ++++++++------------- 9 files changed, 52 insertions(+), 78 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 273b5d8b..31a71aa2 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -18,8 +18,8 @@ "devDependencies": { "@tauri-apps/cli": "^1.2.2", "@types/node": "^18.7.10", - "@types/react": "^18.0.15", - "@types/react-dom": "^18.0.6", + "@types/react": "^18.0.28", + "@types/react-dom": "^18.0.11", "@vitejs/plugin-react": "^3.0.0", "typescript": "^4.9.5", "vite": "^4.0.0" diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 1431e240..36131485 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -24,8 +24,8 @@ "expo-splash-screen": "~0.17.5", "expo-status-bar": "^1.4.2", "expo-updates": "^0.15.6", - "react": "18.1.0", - "react-dom": "^18.1.0", + "react": "18.2.0", + "react-dom": "^18.2.0", "react-native": "0.70.5", "react-native-safe-area-context": "4.4.1", "react-native-screens": "~3.18.0", diff --git a/apps/web/package.json b/apps/web/package.json index c4fdfe2b..c563cb3c 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -19,8 +19,8 @@ }, "devDependencies": { "@tamagui/vite-plugin": "1.7.7", - "@types/react": "^18.0.26", - "@types/react-dom": "^18.0.9", + "@types/react": "^18.0.28", + "@types/react-dom": "^18.0.11", "@vitejs/plugin-react-swc": "^3.0.0", "typescript": "^4.9.5", "vite": "^4.0.0" diff --git a/examples/with-next/package.json b/examples/with-next/package.json index d861ba95..b8626f55 100644 --- a/examples/with-next/package.json +++ b/examples/with-next/package.json @@ -12,12 +12,12 @@ "dependencies": { "@status-im/react": "^0.1.1", "next": "12.3.1", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" + "react": "^18.2.0", + "react-dom": "^18.2.0" }, "devDependencies": { - "@types/react": "^16.8.0 || ^17.0.0", - "@types/react-dom": "^16.8.0 || ^17.0.0", + "@types/react": "^18.0.28", + "@types/react-dom": "^18.0.11", "typescript": "^4.9.5" }, "engines": { diff --git a/examples/with-vite/package.json b/examples/with-vite/package.json index 3995ef43..63854916 100644 --- a/examples/with-vite/package.json +++ b/examples/with-vite/package.json @@ -10,12 +10,12 @@ }, "dependencies": { "@status-im/react": "^0.1.1", - "react": "^17.0.0", - "react-dom": "^17.0.0" + "react": "^18.2.0", + "react-dom": "^18.2.0" }, "devDependencies": { - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", + "@types/react": "^18.0.28", + "@types/react-dom": "^18.0.11", "@vitejs/plugin-react": "^2.1.0", "typescript": "^4.9.5", "vite": "^3.1.7" diff --git a/package.json b/package.json index 0775f6f0..7e428dac 100644 --- a/package.json +++ b/package.json @@ -23,11 +23,7 @@ "desktop": "yarn workspace desktop dev", "storybook": "yarn workspace @status-im/components storybook" }, - "resolutions": { - "react": "18.1.0", - "react-dom": "18.1.0", - "react-native-svg": "13.4.0" - }, + "resolutions": {}, "devDependencies": { "@changesets/cli": "^2.23.0", "@tsconfig/strictest": "^1.0.1", diff --git a/packages/components/src/popover/popover.tsx b/packages/components/src/popover/popover.tsx index 5e24ff32..b054f7fb 100644 --- a/packages/components/src/popover/popover.tsx +++ b/packages/components/src/popover/popover.tsx @@ -2,7 +2,6 @@ import { Content, Portal, Root, Trigger } from '@radix-ui/react-popover' import { Stack } from 'tamagui' import type { PopoverContentProps } from '@radix-ui/react-popover' -import type { FunctionComponent } from 'react' interface Props { children: [React.ReactElement, React.ReactElement] @@ -29,7 +28,11 @@ const Popover = (props: Props) => { ) } -const PopoverContent: FunctionComponent = props => { +type ContentProps = { + children: React.ReactNode +} + +const PopoverContent = (props: ContentProps) => { const { children } = props return ( diff --git a/packages/status-react/package.json b/packages/status-react/package.json index 591e69f0..d5d56efe 100644 --- a/packages/status-react/package.json +++ b/packages/status-react/package.json @@ -41,8 +41,8 @@ "@radix-ui/react-label": "^0.1.5", "@radix-ui/react-popover": "^0.1.6", "@radix-ui/react-separator": "^0.1.4", - "@radix-ui/react-toast": "^0.1.1", "@radix-ui/react-tabs": "^1.0.0", + "@radix-ui/react-toast": "^0.1.1", "@radix-ui/react-toggle-group": "^0.1.5", "@radix-ui/react-tooltip": "^1.0.0", "@radix-ui/react-visually-hidden": "^0.1.4", @@ -61,7 +61,7 @@ "@types/emoji-mart": "^3.0.6", "@types/hcaptcha__react-hcaptcha": "^0.1.5", "@types/node": "^16.9.6", - "@types/react": "^17.0.16", + "@types/react": "^18.0.28", "@vitejs/plugin-react": "^1.3.2", "happy-dom": "^5.3.1" }, diff --git a/yarn.lock b/yarn.lock index e1b0bd7a..73c3940b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7061,24 +7061,10 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@^16.8.0 || ^17.0.0": - version "17.0.18" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.18.tgz#8f7af38f5d9b42f79162eea7492e5a1caff70dc2" - integrity sha512-rLVtIfbwyur2iFKykP2w0pl/1unw26b5td16d5xMgp7/yjTHomkyxPYChFoCr/FtEX1lN9wY6lFj1qvKdS5kDw== - dependencies: - "@types/react" "^17" - -"@types/react-dom@^17.0.0": - version "17.0.17" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.17.tgz#2e3743277a793a96a99f1bf87614598289da68a1" - integrity sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg== - dependencies: - "@types/react" "^17" - -"@types/react-dom@^18.0.6", "@types/react-dom@^18.0.9": - version "18.0.10" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.10.tgz#3b66dec56aa0f16a6cc26da9e9ca96c35c0b4352" - integrity sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg== +"@types/react-dom@^18.0.11": + version "18.0.11" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.11.tgz#321351c1459bc9ca3d216aefc8a167beec334e33" + integrity sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw== dependencies: "@types/react" "*" @@ -7089,7 +7075,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^17.0.16": +"@types/react@*": version "17.0.39" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.39.tgz#d0f4cde092502a6db00a1cded6e6bf2abb7633ce" integrity sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug== @@ -7098,7 +7084,7 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@>=16", "@types/react@^18.0.26": +"@types/react@>=16": version "18.0.26" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.26.tgz#8ad59fc01fef8eaf5c74f4ea392621749f0b7917" integrity sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug== @@ -7107,28 +7093,10 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@^16.8.0 || ^17.0.0": - version "17.0.52" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.52.tgz#10d8b907b5c563ac014a541f289ae8eaa9bf2e9b" - integrity sha512-vwk8QqVODi0VaZZpDXQCmEmiOuyjEFPY7Ttaw5vjM112LOq37yz1CDJGrRJwA1fYEq4Iitd5rnjd1yWAc/bT+A== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/react@^17", "@types/react@^17.0.0": - version "17.0.47" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.47.tgz#4ee71aaf4c5a9e290e03aa4d0d313c5d666b3b78" - integrity sha512-mk0BL8zBinf2ozNr3qPnlu1oyVTYq+4V7WA76RgxUAtf0Em/Wbid38KN6n4abEkvO4xMTBWmnP1FtQzgkEiJoA== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/react@^18.0.15": - version "18.0.27" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.27.tgz#d9425abe187a00f8a5ec182b010d4fd9da703b71" - integrity sha512-3vtRKHgVxu3Jp9t718R9BuzoD4NcQ8YJ5XRzsSKxNDiDonD2MXIT1TmSkenxuCycZJoQT5d2vE8LwWJxBC1gmA== +"@types/react@^18.0.28": + version "18.0.28" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.28.tgz#accaeb8b86f4908057ad629a26635fe641480065" + integrity sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -15270,13 +15238,13 @@ react-docgen@6.0.0-alpha.3: resolve "^1.17.0" strip-indent "^3.0.0" -react-dom@18.1.0, "react-dom@^16.8.0 || ^17.0.0", react-dom@^17.0.0, react-dom@^18.1.0, react-dom@^18.2.0: - version "18.1.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.1.0.tgz#7f6dd84b706408adde05e1df575b3a024d7e8a2f" - integrity sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w== +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.22.0" + scheduler "^0.23.0" react-element-to-jsx-string@^15.0.0: version "15.0.0" @@ -15345,10 +15313,10 @@ react-native-screens@~3.18.0: react-freeze "^1.0.0" warn-once "^0.1.0" -react-native-svg@13.4.0, react-native-svg@^13.8.0: - version "13.4.0" - resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-13.4.0.tgz#82399ba0956c454144618aa581e2d748dd3f010a" - integrity sha512-B3TwK+H0+JuRhYPzF21AgqMt4fjhCwDZ9QUtwNstT5XcslJBXC0FoTkdZo8IEb1Sv4suSqhZwlAY6lwOv3tHag== +react-native-svg@^13.8.0: + version "13.8.0" + resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-13.8.0.tgz#b6a22cf77f8098f910490a13aeb160a37e182f97" + integrity sha512-G8Mx6W86da+vFimZBJvA93POw8yz0fgDS5biy6oIjMWVJVQSDzCyzwO/zY0yuZmCDhKSZzogl5m0wXXvW2OcTA== dependencies: css-select "^5.1.0" css-tree "^1.1.3" @@ -15519,10 +15487,10 @@ react-style-singleton@^2.2.1: invariant "^2.2.4" tslib "^2.0.0" -react@18.1.0, "react@^16.8.0 || ^17.0.0", react@^17.0.0, react@^18.2.0: - version "18.1.0" - resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890" - integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ== +react@18.2.0, 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" @@ -16060,6 +16028,13 @@ scheduler@^0.22.0: dependencies: loose-envify "^1.1.0" +scheduler@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" + integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw== + dependencies: + loose-envify "^1.1.0" + "semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"