From 2d2f334488a5504febe33d405ffc5a2803d50b9a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Mar 2023 17:50:03 +0000
Subject: [PATCH] Update to React 18

---
 .editorconfig                                |  2 +-
 package.json                                 | 14 +++++++-------
 src/components/views/auth/VectorAuthPage.tsx |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 87f4c70ae1d..8587533002d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -26,4 +26,4 @@ trim_trailing_whitespace = true
 indent_size = 4
 
 [package.json]
-indent_size = 2
+indent_size = 4
diff --git a/package.json b/package.json
index ffcc5a27b92..38ed00066a1 100644
--- a/package.json
+++ b/package.json
@@ -67,8 +67,8 @@
         "update:jitsi": "curl -s https://meet.element.io/libs/external_api.min.js > ./res/jitsi_external_api.min.js"
     },
     "resolutions": {
-        "@types/react-dom": "17.0.25",
-        "@types/react": "17.0.80",
+        "@types/react-dom": "18.2.25",
+        "@types/react": "18.2.79",
         "@vector-im/compound-design-tokens": "1.7.0",
         "@vector-im/compound-web": "5.5.0",
         "@floating-ui/react": "0.26.11",
@@ -85,8 +85,8 @@
         "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
         "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
         "matrix-widget-api": "^1.3.1",
-        "react": "17.0.2",
-        "react-dom": "17.0.2",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
         "ua-parser-js": "^1.0.0"
     },
     "devDependencies": {
@@ -113,7 +113,7 @@
         "@principalstudio/html-webpack-inject-preload": "^1.2.7",
         "@sentry/webpack-plugin": "^2.7.1",
         "@svgr/webpack": "^8.0.0",
-        "@testing-library/react": "^12.1.5",
+        "@testing-library/react": "^4",
         "@types/commonmark": "^0.27.9",
         "@types/content-type": "^1.1.8",
         "@types/counterpart": "^0.18.4",
@@ -132,9 +132,9 @@
         "@types/node-fetch": "^2.6.4",
         "@types/pako": "^2.0.3",
         "@types/qrcode": "^1.5.5",
-        "@types/react": "17.0.80",
+        "@types/react": "18.2.79",
         "@types/react-beautiful-dnd": "^13.1.7",
-        "@types/react-dom": "17.0.25",
+        "@types/react-dom": "18.2.25",
         "@types/react-transition-group": "^4.4.9",
         "@types/sanitize-html": "^2.9.5",
         "@types/sdp-transform": "^2.4.9",
diff --git a/src/components/views/auth/VectorAuthPage.tsx b/src/components/views/auth/VectorAuthPage.tsx
index e04dfcefd74..d6ed2c12fa3 100644
--- a/src/components/views/auth/VectorAuthPage.tsx
+++ b/src/components/views/auth/VectorAuthPage.tsx
@@ -19,7 +19,7 @@ import SdkConfig from "matrix-react-sdk/src/SdkConfig";
 
 import VectorAuthFooter from "./VectorAuthFooter";
 
-export default class VectorAuthPage extends React.PureComponent {
+export default class VectorAuthPage extends React.PureComponent<React.PropsWithChildren> {
     private static welcomeBackgroundUrl?: string;
 
     // cache the url as a static to prevent it changing without refreshing