upgrade react and react-dom 18

remap-keys · May 26, 2024 · e52d4c8 · e52d4c8
1 parent e6178a0
commit e52d4c8
Show file tree

Hide file tree

Showing 5 changed files with 22,179 additions and 16,162 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,11 @@ remap-firestore-export-*/
 firebase-debug.log
 firestore-debug.log
 ui-debug.log
+
+.yarn/*
+!.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/package.json b/package.json
@@ -25,8 +25,8 @@
     "pdf-lib": "^1.16.0",
     "prop-types": "^15.7.2",
     "qs": "^6.10.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-draggable": "^4.4.3",
     "react-google-charts": "^4.0.1",
     "react-helmet-async": "^1.0.9",

diff --git a/src/components/catalog/content/Content.tsx b/src/components/catalog/content/Content.tsx
@@ -84,7 +84,7 @@ type CategoryKeyboardContentProps = {
   organization: IOrganization | null;
 };
 
-const CategoryKeyboardContent: React.FC<CategoryKeyboardContentProps> = ({
+const CategoryKeyboardContent: React.FC<React.PropsWithChildren<CategoryKeyboardContentProps>> = ({
   phase,
   definitionDocument,
   goToIntroduction,