fix: react 18 various issues (#4114)

webiny · May 8, 2024 · 4f42a23 · 4f42a23
1 parent a961aae
commit 4f42a23
Show file tree

Hide file tree

Showing 75 changed files with 511 additions and 493 deletions.
diff --git a/apps/admin/package.json b/apps/admin/package.json
@@ -7,7 +7,7 @@
     "@editorjs/list": "^1.6.0",
     "@editorjs/quote": "^2.4.0",
     "@editorjs/underline": "^1.0.0",
-    "@types/react": "18.2.65",
+    "@types/react": "18.3.1",
     "@webiny/app-admin": "0.0.0",
     "@webiny/app-admin-users-cognito": "0.0.0",
     "@webiny/app-form-builder": "0.0.0",
@@ -22,8 +22,8 @@
     "core-js": "^3.0.1",
     "cross-fetch": "^3.0.4",
     "prop-types": "^15.7.2",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "regenerator-runtime": "^0.13.5",
     "theme": "^0.1.0",
     "tslib": "^2.4.0"

diff --git a/apps/website/package.json b/apps/website/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.10.6",
-    "@types/react": "18.2.65",
+    "@types/react": "18.3.1",
     "@webiny/app": "0.0.0",
     "@webiny/app-form-builder": "0.0.0",
     "@webiny/app-page-builder": "0.0.0",
@@ -20,8 +20,8 @@
     "cross-fetch": "^3.0.4",
     "graphql": "^15.7.2",
     "graphql-tag": "^2.12.6",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "regenerator-runtime": "^0.13.5",
     "theme": "^0.1.0"
   },

diff --git a/extensions/theme/package.json b/extensions/theme/package.json
@@ -18,7 +18,7 @@
     "@webiny/utils": "0.0.0",
     "@webiny/validation": "0.0.0",
     "graphql": "^15.7.2",
-    "react": "18.2.0",
+    "react": "18.3.1",
     "react-hamburger-menu": "^1.1.1"
   },
   "devDependencies": {

diff --git a/package.json b/package.json
@@ -38,8 +38,8 @@
     "@types/jest": "^29.5.11",
     "@types/node": "^18.0.0",
     "@types/prettier": "^2.7.3",
-    "@types/react": "18.2.65",
-    "@types/react-dom": "18.2.21",
+    "@types/react": "18.3.1",
+    "@types/react-dom": "18.3.0",
     "@typescript-eslint/eslint-plugin": "^5.5.0",
     "@typescript-eslint/parser": "^5.5.0",
     "adio": "^1.0.1",
@@ -203,22 +203,21 @@
   "resolutions": {
     "@emotion/react": "11.10.8",
     "@octokit/rest": "^20.0.2",
-    "@types/react": "18.2.65",
-    "@types/react-dom": "18.2.21",
     "@types/jsdom": "link:./typings/void",
     "@types/webpack": "^5.28.0",
     "browserify-sign": "^4.2.2",
     "@babel/traverse": "^7.24.0",
+    "@types/react": "18.3.1",
+    "@types/react-dom": "18.3.0",
     "jsdom": "24.0.0",
-    "react": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "follow-redirects": "^1.15.6",
     "crypto-js": "^4.2.0",
     "ip": "^2.0.1",
     "postcss": "^8.4.35",
-    "react-dom": "18.2.0",
     "semver": "7.5.4",
     "typescript": "4.7.4",
-    "codex-tooltip": "1.0.2",
     "@types/eslint": "8.2.1",
     "xml2js": "0.6.2",
     "yargs": "^17.3.1",

diff --git a/packages/app-aco/package.json b/packages/app-aco/package.json
@@ -35,9 +35,9 @@
     "lodash": "^4.17.21",
     "mobx": "^6.9.0",
     "mobx-react-lite": "^3.4.3",
-    "react": "18.2.0",
+    "react": "18.3.1",
     "react-dnd": "^16.0.1",
-    "react-dom": "18.2.0",
+    "react-dom": "18.3.1",
     "react-hotkeyz": "^1.0.4",
     "slugify": "^1.2.9",
     "store": "^2.0.12",
@@ -50,7 +50,7 @@
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
     "@babel/runtime": "^7.24.0",
-    "@types/react": "18.2.65",
+    "@types/react": "18.3.1",
     "@webiny/cli": "0.0.0",
     "@webiny/project-utils": "0.0.0",
     "apollo-client": "^2.6.10",

diff --git a/packages/app-aco/src/dialogs/DialogSetPermissions/UsersTeamsSelection/ListItemMeta.tsx b/packages/app-aco/src/dialogs/DialogSetPermissions/UsersTeamsSelection/ListItemMeta.tsx
@@ -40,7 +40,7 @@ const StyledMenuItem = styled(MenuItem)`
     padding-top: 5px;
     padding-bottom: 5px;
 
-    div:first-of-type {
+    div.selected {
         margin-right: 15px;
         width: 20px;
         height: 20px;
@@ -50,7 +50,7 @@ const StyledMenuItem = styled(MenuItem)`
         }
     }
 
-    div:last-of-type {
+    div.info {
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -138,8 +138,10 @@ export const ListItemMeta = ({
                                 }, 75);
                             }}
                         >
-                            <div>{currentLevel.id === level.id && <Check />}</div>
-                            <div>
+                            <div className="selected">
+                                {currentLevel.id === level.id && <Check />}
+                            </div>
+                            <div className="info">
                                 <Typography use="body1">{level.label}</Typography>
                                 <Typography use="caption">{level.description}</Typography>
                             </div>

diff --git a/packages/app-admin-auth0/package.json b/packages/app-admin-auth0/package.json
@@ -29,8 +29,8 @@
     "graphql": "^15.7.2",
     "graphql-tag": "^2.12.6",
     "lodash": "^4.17.21",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-helmet": "^6.1.0"
   },
   "devDependencies": {

diff --git a/packages/app-admin-cognito/package.json b/packages/app-admin-cognito/package.json
@@ -27,8 +27,8 @@
     "apollo-client": "^2.6.10",
     "apollo-link-context": "^1.0.20",
     "emotion": "^10.0.27",
-    "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",

diff --git a/packages/app-admin-okta/package.json b/packages/app-admin-okta/package.json
@@ -31,8 +31,8 @@
     "graphql": "^15.7.2",
     "graphql-tag": "^2.12.6",
     "lodash": "^4.17.21",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-helmet": "^6.1.0"
   },
   "devDependencies": {

diff --git a/packages/app-admin-rmwc/package.json b/packages/app-admin-rmwc/package.json
@@ -12,9 +12,9 @@
     "@babel/runtime": "^7.24.0",
     "@emotion/styled": "^11.10.6",
     "@material-design-icons/svg": "^0.14.3",
-    "@rmwc/base": "^14.1.2",
-    "@rmwc/provider": "^14.1.2",
-    "@types/react": "18.2.65",
+    "@rmwc/base": "^14.2.2",
+    "@rmwc/provider": "^14.2.2",
+    "@types/react": "18.3.1",
     "@webiny/app": "0.0.0",
     "@webiny/app-admin": "0.0.0",
     "@webiny/app-plugin-admin-welcome-screen": "0.0.0",
@@ -26,8 +26,8 @@
     "classnames": "^2.3.1",
     "emotion": "^10.0.27",
     "lodash": "^4.17.21",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-helmet": "^6.1.0",
     "react-hotkeyz": "^1.0.4",
     "react-transition-group": "^4.4.2",

diff --git a/packages/app-admin-users-cognito/package.json b/packages/app-admin-users-cognito/package.json
@@ -30,8 +30,8 @@
     "graphql": "^15.7.2",
     "graphql-tag": "^2.12.6",
     "lodash": "^4.17.21",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-helmet": "^6.1.0"
   },
   "devDependencies": {

diff --git a/packages/app-admin/package.json b/packages/app-admin/package.json
@@ -19,7 +19,7 @@
     "@material-design-icons/svg": "^0.14.3",
     "@svgr/webpack": "^6.1.1",
     "@types/mime": "^2.0.3",
-    "@types/react": "18.2.65",
+    "@types/react": "18.3.1",
     "@webiny/app": "0.0.0",
     "@webiny/app-security": "0.0.0",
     "@webiny/app-theme": "0.0.0",
@@ -48,8 +48,8 @@
     "lodash": "^4.17.21",
     "mobx": "^6.9.0",
     "prop-types": "^15.7.2",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-hotkeyz": "^1.0.4",
     "react-transition-group": "^4.3.0",
     "store": "^2.0.12"

diff --git a/packages/app-admin/src/base/ui/Menu.tsx b/packages/app-admin/src/base/ui/Menu.tsx
@@ -174,5 +174,3 @@ export const AddMenu = makeDecoratable("AddMenu", ({ children, ...props }: AddMe
 
     return <MenuContext.Provider value={context}>{children}</MenuContext.Provider>;
 });
-
-AddMenu.defaultProps = { tags: [] };
diff --git a/packages/app-apw/package.json b/packages/app-apw/package.json
@@ -14,7 +14,7 @@
     "@emotion/is-prop-valid": "^1.1.1",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
-    "@types/react": "18.2.65",
+    "@types/react": "18.3.1",
     "@webiny/app": "0.0.0",
     "@webiny/app-admin": "0.0.0",
     "@webiny/app-headless-cms": "0.0.0",
@@ -38,8 +38,8 @@
     "graphql-tag": "^2.10.1",
     "lodash": "^4.17.21",
     "prop-types": "^15.7.2",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-helmet": "^6.1.0",
     "react-spinner-material": "1.1.4"
   },

diff --git a/packages/app-audit-logs/package.json b/packages/app-audit-logs/package.json
@@ -29,7 +29,7 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "react": "18.20"
+    "react": "18.3.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",
@@ -39,7 +39,7 @@
     "@babel/preset-typescript": "^7.23.3",
     "@material-design-icons/svg": "^0.14.3",
     "@material-symbols/svg-400": "^0.4.1",
-    "@types/react": "18.2.65",
+    "@types/react": "18.3.1",
     "@webiny/cli": "0.0.0",
     "@webiny/project-utils": "0.0.0",
     "execa": "^5.0.0",

diff --git a/packages/app-cognito-authenticator/package.json b/packages/app-cognito-authenticator/package.json
@@ -14,8 +14,8 @@
   "dependencies": {
     "@aws-amplify/auth": "^5.1.9",
     "lodash": "^4.17.21",
-    "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",

diff --git a/packages/app-file-manager/package.json b/packages/app-file-manager/package.json
@@ -16,7 +16,7 @@
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@material-design-icons/svg": "^0.14.3",
-    "@types/react": "18.2.65",
+    "@types/react": "18.3.1",
     "@webiny/app": "0.0.0",
     "@webiny/app-aco": "0.0.0",
     "@webiny/app-admin": "0.0.0",
@@ -48,10 +48,10 @@
     "mobx": "^6.9.0",
     "mobx-react-lite": "^3.4.3",
     "prop-types": "^15.7.2",
-    "react": "18.2.0",
+    "react": "18.3.1",
     "react-butterfiles": "^1.3.1",
     "react-custom-scrollbars": "^4.2.1",
-    "react-dom": "18.2.0",
+    "react-dom": "18.3.1",
     "react-hotkeyz": "^1.0.4",
     "react-lazy-load": "^3.1.14",
     "zod": "^3.22.4"

diff --git a/packages/app-form-builder/package.json b/packages/app-form-builder/package.json
@@ -25,7 +25,7 @@
     "@material-design-icons/svg": "^0.14.3",
     "@material-symbols/svg-400": "^0.4.1",
     "@svgr/webpack": "^6.1.1",
-    "@types/react": "18.2.65",
+    "@types/react": "18.3.1",
     "@webiny/app": "0.0.0",
     "@webiny/app-admin": "0.0.0",
     "@webiny/app-page-builder": "0.0.0",
@@ -51,10 +51,10 @@
     "json2csv": "^4.5.2",
     "lodash": "^4.17.21",
     "prop-types": "^15.7.2",
-    "react": "18.2.0",
+    "react": "18.3.1",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
-    "react-dom": "18.2.0",
+    "react-dom": "18.3.1",
     "react-google-recaptcha": "^1.1.0",
     "react-hotkeyz": "^1.0.4",
     "shortid": "^2.2.14"

diff --git a/packages/app-graphql-playground/package.json b/packages/app-graphql-playground/package.json
@@ -25,8 +25,8 @@
     "graphql": "^15.7.2",
     "load-script": "^1.0.0",
     "prop-types": "^15.7.2",
-    "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",

diff --git a/packages/app-headless-cms-common/package.json b/packages/app-headless-cms-common/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "@babel/runtime": "^7.24.0",
     "@fortawesome/fontawesome-svg-core": "^1.3.0",
-    "@types/react": "18.2.65",
+    "@types/react": "18.3.1",
     "@webiny/app-security": "0.0.0",
     "@webiny/form": "0.0.0",
     "@webiny/plugins": "0.0.0",
@@ -24,7 +24,7 @@
     "graphql": "^15.7.2",
     "graphql-tag": "^2.12.6",
     "prop-types": "^15.7.2",
-    "react": "18.2.0"
+    "react": "18.3.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",

diff --git a/packages/app-headless-cms/package.json b/packages/app-headless-cms/package.json
@@ -27,7 +27,7 @@
     "@lexical/utils": "^0.12.2",
     "@material-design-icons/svg": "^0.14.3",
     "@svgr/webpack": "^6.1.1",
-    "@types/react": "18.2.65",
+    "@types/react": "18.3.1",
     "@webiny/app": "0.0.0",
     "@webiny/app-aco": "0.0.0",
     "@webiny/app-admin": "0.0.0",
@@ -66,12 +66,12 @@
     "mobx-react-lite": "^3.4.3",
     "prop-types": "^15.7.2",
     "raw.macro": "^0.4.2",
-    "react": "18.2.0",
+    "react": "18.3.1",
     "react-butterfiles": "^1.3.3",
     "react-custom-scrollbars": "^4.2.1",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
-    "react-dom": "18.2.0",
+    "react-dom": "18.3.1",
     "react-helmet": "^6.1.0",
     "react-hotkeyz": "^1.0.4",
     "react-virtualized": "^9.21.2",

diff --git a/packages/app-i18n-content/package.json b/packages/app-i18n-content/package.json
@@ -17,8 +17,8 @@
     "@webiny/plugins": "0.0.0",
     "@webiny/ui": "0.0.0",
     "emotion": "^10.0.17",
-    "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",