Merge pull request #745 from notional-finance/feat/react-update

build: updates react to version 18

apps/web/src/main.tsx

@@ -1,9 +1,9 @@
-import ReactDOM from 'react-dom';
 import { IntlProvider } from 'react-intl';
 import {
   getLanguageTranslation,
   getFromLocalStorage,
 } from '@notional-finance/helpers';
+import { createRoot } from 'react-dom/client';
 import App from './containers/App';
 
 const onI18NError = (err) => {
@@ -15,10 +15,11 @@ const onI18NError = (err) => {
 async function appInit() {
   const { language } = getFromLocalStorage('userSettings');
   const locale = language ? language : navigator.language;
-
   const languageTranslation = await getLanguageTranslation(locale);
+  const container = document.getElementById('root');
+  const root = createRoot(container);
 
-  ReactDOM.render(
+  root.render(
     <IntlProvider
       locale={locale}
       defaultLocale="en"

gcp/data-service/package.json

@@ -12,16 +12,15 @@
   "dependencies": {
     "@apollo/client": "^3.7.0",
     "@datadog/browser-rum": "4.24.1",
+    "@notional-finance/contracts": "file:../../dist/packages/contracts",
     "@notional-finance/core-entities": "file:../../dist/packages/core-entities",
-    "@notional-finance/util": "file:../../dist/packages/util",
     "@notional-finance/multicall": "file:../../dist/packages/multicall",
-    "@notional-finance/contracts": "file:../../dist/packages/contracts",
+    "@notional-finance/util": "file:../../dist/packages/util",
     "cross-fetch": "^3.1.5",
-    "graphql": "^16.6.0",
     "dotenv": "^10.0.0",
-    "react": "^17.0.2",
-    "express": "^4.17.1",
     "ethers": "^5.7.1",
+    "express": "^4.17.1",
+    "graphql": "^16.6.0",
     "knex": "^2.4.2",
     "pg": "^8.11.1",
     "rxjs": "7.5.7",

gcp/data-service/yarn.lock

@@ -2813,7 +2813,7 @@ lodash@^4.17.21, lodash@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-loose-envify@^1.1.0, loose-envify@^1.4.0:
+loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -3276,14 +3276,6 @@ react-is@^17.0.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-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"
-
 rechoir@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"

package.json

@@ -49,13 +49,13 @@
     "pg": "^8.11.3",
     "plausible-tracker": "^0.3.8",
     "protobufjs": "^7.1.1",
-    "react": "^17.0.2",
+    "react": "^18.2.0",
     "react-content-loader": "^6.0.3",
     "react-cookie-consent": "^7.3.1",
     "react-countdown": "^2.3.2",
     "react-countup": "^6.1.1",
     "react-csv": "^2.2.2",
-    "react-dom": "17.0.2",
+    "react-dom": "^18.2.0",
     "react-helmet-async": "^2.0.4",
     "react-intl": "^5.10.15",
     "react-is": "17.0.2",

yarn.lock

@@ -18855,14 +18855,13 @@ react-csv@^2.2.2:
   resolved "https://registry.yarnpkg.com/react-csv/-/react-csv-2.2.2.tgz#5bbf0d72a846412221a14880f294da9d6def9bfb"
   integrity sha512-RG5hOcZKZFigIGE8LxIEV/OgS1vigFQT4EkaHeKgyuCbUAu9Nbd/1RYq++bJcJJ9VOqO/n9TZRADsXNDR4VEpw==
 
-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==
+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"
-    object-assign "^4.1.1"
-    scheduler "^0.20.2"
+    scheduler "^0.23.0"
 
 react-error-boundary@^3.1.0:
   version "3.1.4"
@@ -19081,13 +19080,12 @@ react-youtube@^9.0.2:
     prop-types "15.8.1"
     youtube-player "5.5.2"
 
-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==
+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"
-    object-assign "^4.1.1"
 
 read-cache@^1.0.0:
   version "1.0.0"
@@ -19727,6 +19725,13 @@ scheduler@^0.20.2:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+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"
+
 schema-utils@^2.6.5:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"