From cac1f30a162937583c15a1285363fd51a9df4841 Mon Sep 17 00:00:00 2001
From: Emily Xiong <xiongemi@gmail.com>
Date: Mon, 9 Jan 2023 11:43:06 -0500
Subject: [PATCH] fix(expo): fixing version conflict of react (#14144)

---
 packages/expo/src/generators/init/init.ts         |  8 +++-----
 packages/expo/src/utils/versions.ts               |  5 +++++
 packages/react-native/src/generators/init/init.ts | 10 +++++-----
 packages/react-native/src/utils/versions.ts       |  5 +++++
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/packages/expo/src/generators/init/init.ts b/packages/expo/src/generators/init/init.ts
index 63fdf4a0a3..7499540472 100644
--- a/packages/expo/src/generators/init/init.ts
+++ b/packages/expo/src/generators/init/init.ts
@@ -25,14 +25,12 @@ import {
   easCliVersion,
   deprecatedExpoCliVersion,
   expoWebpackConfig,
-} from '../../utils/versions';
-
-import {
-  reactDomVersion,
   reactVersion,
   reactTestRendererVersion,
   typesReactVersion,
-} from '@nrwl/react/src/utils/versions';
+  reactDomVersion,
+} from '../../utils/versions';
+
 import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
 import { jestInitGenerator } from '@nrwl/jest';
 import { detoxInitGenerator } from '@nrwl/detox';
diff --git a/packages/expo/src/utils/versions.ts b/packages/expo/src/utils/versions.ts
index bc15bff7b3..d5844b2062 100644
--- a/packages/expo/src/utils/versions.ts
+++ b/packages/expo/src/utils/versions.ts
@@ -10,6 +10,11 @@ export const expoCliVersion = '0.4.10'; // @expo/cli
 export const easCliVersion = '3.1.1';
 export const babelPresetExpoVersion = '~9.2.2';
 
+export const reactVersion = '18.1.0';
+export const reactDomVersion = '18.1.0';
+export const reactTestRendererVersion = '18.1.0';
+export const typesReactVersion = '18.0.26';
+
 export const reactNativeVersion = '0.70.5';
 export const typesReactNativeVersion = '0.70.7';
 export const reactNativeWebVersion = '~0.18.10';
diff --git a/packages/react-native/src/generators/init/init.ts b/packages/react-native/src/generators/init/init.ts
index e5a423b83a..fcce186663 100644
--- a/packages/react-native/src/generators/init/init.ts
+++ b/packages/react-native/src/generators/init/init.ts
@@ -13,17 +13,13 @@ import { addBabelInputs } from '@nrwl/js/src/utils/add-babel-inputs';
 
 import { jestInitGenerator } from '@nrwl/jest';
 import { detoxInitGenerator } from '@nrwl/detox';
-import {
-  reactTestRendererVersion,
-  reactVersion,
-  typesReactVersion,
-} from '@nrwl/react/src/utils/versions';
 
 import {
   babelRuntimeVersion,
   jestReactNativeVersion,
   metroVersion,
   nxVersion,
+  reactDomVersion,
   reactNativeAsyncStorageAsyncStorageVersion,
   reactNativeCommunityCli,
   reactNativeCommunityCliAndroid,
@@ -32,10 +28,13 @@ import {
   reactNativeSvgTransformerVersion,
   reactNativeSvgVersion,
   reactNativeVersion,
+  reactTestRendererVersion,
+  reactVersion,
   testingLibraryJestNativeVersion,
   testingLibraryReactNativeVersion,
   typesNodeVersion,
   typesReactNativeVersion,
+  typesReactVersion,
 } from '../../utils/versions';
 
 import { addGitIgnoreEntry } from './lib/add-git-ignore-entry';
@@ -76,6 +75,7 @@ export function updateDependencies(host: Tree) {
     host,
     {
       react: reactVersion,
+      'react-dom': reactDomVersion,
       'react-native': reactNativeVersion,
     },
     {
diff --git a/packages/react-native/src/utils/versions.ts b/packages/react-native/src/utils/versions.ts
index 65a7050b50..728a1b17e7 100644
--- a/packages/react-native/src/utils/versions.ts
+++ b/packages/react-native/src/utils/versions.ts
@@ -11,6 +11,11 @@ export const reactNativeCommunityCli = '9.3.2';
 export const reactNativeCommunityCliIos = '9.3.0';
 export const reactNativeCommunityCliAndroid = '9.3.1';
 
+export const reactVersion = '18.1.0';
+export const reactDomVersion = '18.1.0';
+export const reactTestRendererVersion = '18.1.0';
+export const typesReactVersion = '18.0.26';
+
 export const reactNativeConfigVersion = '1.4.11';
 export const reactNativeAsyncStorageAsyncStorageVersion = '1.17.11';