From 8f6c492429954ff4dcc81429f4ab42bebc203907 Mon Sep 17 00:00:00 2001 From: hawkespoulterva Date: Fri, 23 Aug 2024 15:47:50 -0400 Subject: [PATCH 1/2] just update react and nothing else --- client/package.json | 4 ++-- client/yarn.lock | 32 +++++++++++++------------------- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/client/package.json b/client/package.json index f6c1c6c67a7..f132e14b37f 100644 --- a/client/package.json +++ b/client/package.json @@ -105,10 +105,10 @@ "pluralize": "^7.0.0", "prop-types": "^15.7.2", "rc-collapse": "^1.11.8", - "react": "^16.13.1", + "react": "18.2.0", "react-copy-to-clipboard": "^5.0.1", "react-csv": "^1.1.1", - "react-dom": "^16.13.1", + "react-dom": "18.2.0", "react-draft-wysiwyg": "^1.12.11", "react-highlight-words": "^0.8.0", "react-hook-form": "^6.14.2", diff --git a/client/yarn.lock b/client/yarn.lock index 43195de976b..46105393355 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -13994,15 +13994,13 @@ react-docgen@^5.0.0: node-dir "^0.1.10" strip-indent "^3.0.0" -react-dom@^16.13.1: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz#c1bd37331a0486c078ee54c4740720993b2e0e7f" - integrity sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag== +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" - prop-types "^15.6.2" - scheduler "^0.19.1" + scheduler "^0.23.0" react-dom@^16.9.0: version "16.9.0" @@ -14331,14 +14329,12 @@ react-virtualized@^9.21.2: prop-types "^15.6.0" react-lifecycles-compat "^3.0.4" -react@^16.13.1: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" - integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w== +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" - prop-types "^15.6.2" react@^16.9.0: version "16.9.0" @@ -15132,13 +15128,12 @@ scheduler@^0.18.0: loose-envify "^1.1.0" object-assign "^4.1.1" -scheduler@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== +scheduler@^0.23.0: + version "0.23.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3" + integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ== dependencies: loose-envify "^1.1.0" - object-assign "^4.1.1" schema-utils@2.7.0, schema-utils@^2.6.5, schema-utils@^2.7.0: version "2.7.0" @@ -17658,4 +17653,3 @@ zwitch@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw== - \ No newline at end of file From 7d44be1fabd60c0f0c16d991e904e9b8f199cd24 Mon Sep 17 00:00:00 2001 From: hawkespoulterva Date: Fri, 23 Aug 2024 16:48:33 -0400 Subject: [PATCH 2/2] this should fail everything I hope --- client/app/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client/app/index.js b/client/app/index.js index 2b7de044bc9..01c2a85caf0 100644 --- a/client/app/index.js +++ b/client/app/index.js @@ -9,9 +9,9 @@ import 'pdfjs-dist/web/pdf_viewer.css'; // External Dependencies import React, { Suspense } from 'react'; import ReactOnRails from 'react-on-rails'; -import { render } from 'react-dom'; import { forOwn } from 'lodash'; import { BrowserRouter, Switch } from 'react-router-dom'; +import { createRoot } from 'react-dom/client'; // Internal Dependencies import { storeMetrics } from './util/Metrics'; @@ -157,7 +157,10 @@ const componentWrapper = (component) => (props, railsContext, domNodeId) => { const renderApp = (Component) => { const element = wrapComponent(Component); - render(element, document.getElementById(domNodeId)); + const container = document.getElementById(domNodeId); + const root = createRoot(container); + + root.render(element); }; renderApp(component);