From 02e085b8c82b4a9f341f0fe6a4f6e7a79a15e088 Mon Sep 17 00:00:00 2001
From: Jack Hsu <jack.hsu@gmail.com>
Date: Sat, 9 Apr 2022 10:12:16 -0400
Subject: [PATCH] feat(react): update @types/react and other packages

---
 packages/react/migrations.json                | 37 +++++++++++++++++++
 .../files/common/src/main.tsx__tmpl__         |  7 +++-
 packages/react/src/utils/versions.ts          | 16 ++++----
 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/packages/react/migrations.json b/packages/react/migrations.json
index 3378935fc04d2c..d3a844f86f5af9 100644
--- a/packages/react/migrations.json
+++ b/packages/react/migrations.json
@@ -287,6 +287,43 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "13.10.1": {
+      "version": "13.10.1-beta.1",
+      "packages": {
+        "@types/react": {
+          "version": "18.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react-dom": {
+          "version": "18.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/styled-components": {
+          "version": "5.1.25",
+          "alwaysAddToPackageJson": false
+        },
+        "@emotion/react": {
+          "version": "11.9.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/react": {
+          "version": "13.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@reduxjs/toolkit": {
+          "version": "1.8.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-redux": {
+          "version": "7.2.8",
+          "alwaysAddToPackageJson": false
+        },
+        "eslint-plugin-import": {
+          "version": "2.26.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }
diff --git a/packages/react/src/generators/application/files/common/src/main.tsx__tmpl__ b/packages/react/src/generators/application/files/common/src/main.tsx__tmpl__
index 564a677ba41441..df96dd58f96bf2 100644
--- a/packages/react/src/generators/application/files/common/src/main.tsx__tmpl__
+++ b/packages/react/src/generators/application/files/common/src/main.tsx__tmpl__
@@ -1,7 +1,10 @@
 <% if (strict) { %>import { StrictMode } from 'react';<% } %>
-import * as ReactDOM from 'react-dom';
+import * as ReactDOMClient from 'react-dom';
 <% if (routing) { %>import { BrowserRouter } from 'react-router-dom';<% } %>
 
 import App from './app/<%= fileName %>';
 
-ReactDOM.render(<% if (strict) { %><StrictMode><% } %><% if (routing) { %><BrowserRouter><% } %><App /><% if (routing) { %></BrowserRouter><% } %><% if (strict) { %></StrictMode><% } %>, document.getElementById('root'));
+const root = ReactDOMClient.createRoot(document.getElementById('root') as HTMLElement);
+root.render(
+<% if (strict) { %><StrictMode><% } %><% if (routing) { %><BrowserRouter><% } %><App /><% if (routing) { %></BrowserRouter><% } %><% if (strict) { %></StrictMode><% } %>
+);
diff --git a/packages/react/src/utils/versions.ts b/packages/react/src/utils/versions.ts
index 099a99e8b54edb..2c032235862eb3 100755
--- a/packages/react/src/utils/versions.ts
+++ b/packages/react/src/utils/versions.ts
@@ -3,15 +3,15 @@ export const nxVersion = '*';
 export const reactVersion = '18.0.0';
 export const reactDomVersion = '18.0.0';
 export const reactIsVersion = '18.0.0';
-export const typesReactVersion = '17.0.43';
-export const typesReactDomVersion = '17.0.14';
+export const typesReactVersion = '18.0.0';
+export const typesReactDomVersion = '18.0.0';
 export const typesReactIsVersion = '17.0.3';
 
 export const styledComponentsVersion = '5.3.5';
-export const typesStyledComponentsVersion = '5.1.24';
+export const typesStyledComponentsVersion = '5.1.25';
 
 export const emotionStyledVersion = '11.8.1';
-export const emotionReactVersion = '11.8.2';
+export const emotionReactVersion = '11.9.0';
 export const emotionBabelPlugin = '11.7.2';
 
 export const styledJsxVersion = '5.0.2';
@@ -19,14 +19,14 @@ export const styledJsxVersion = '5.0.2';
 export const reactRouterDomVersion = '5.3.0';
 export const typesReactRouterDomVersion = '5.3.3';
 
-export const testingLibraryReactVersion = '12.1.4';
+export const testingLibraryReactVersion = '13.0.0';
 export const testingLibraryReactHooksVersion = '7.0.2';
 
-export const reduxjsToolkitVersion = '1.8.0';
-export const reactReduxVersion = '7.2.6';
+export const reduxjsToolkitVersion = '1.8.1';
+export const reactReduxVersion = '7.2.8';
 export const reactTestRendererVersion = '18.0.0';
 
-export const eslintPluginImportVersion = '2.25.4';
+export const eslintPluginImportVersion = '2.26.0';
 export const eslintPluginJsxA11yVersion = '6.5.1';
 export const eslintPluginReactVersion = '7.29.4';
 export const eslintPluginReactHooksVersion = '4.4.0';