feat(expo): upgrade Expo to v52

nrwl · Dec 2, 2024 · fb21d22 · fb21d22
1 parent 3ec5390
commit fb21d22
Show file tree

Hide file tree

Showing 20 changed files with 242 additions and 65 deletions.
diff --git a/packages/detox/migrations.json b/packages/detox/migrations.json
@@ -35,6 +35,19 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.2.0": {
+      "version": "20.2.0-beta.5",
+      "packages": {
+        "detox": {
+          "version": "~20.28.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/jest-dom": {
+          "version": "~6.6.3",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }
diff --git a/packages/detox/src/utils/versions.ts b/packages/detox/src/utils/versions.ts
@@ -1,5 +1,5 @@
 export const nxVersion = require('../../package.json').version;
 
-export const detoxVersion = '~20.18.1';
-export const testingLibraryJestDom = '~6.4.2';
+export const detoxVersion = '~20.28.0';
+export const testingLibraryJestDom = '~6.6.3';
 export const configPluginsDetoxVersion = '~8.0.0'; // only required for expo
diff --git a/packages/expo/migrations.json b/packages/expo/migrations.json
@@ -247,6 +247,83 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.2.0": {
+      "version": "20.2.0-beta.5",
+      "packages": {
+        "expo": {
+          "version": "~52.0.11",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-splash-screen": {
+          "version": "~0.29.13",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-status-bar": {
+          "version": "~2.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/cli": {
+          "version": "~0.21.8",
+          "alwaysAddToPackageJson": false
+        },
+        "babel-preset-expo": {
+          "version": "~12.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react": {
+          "version": "~18.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-dom": {
+          "version": "~18.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-test-renderer": {
+          "version": "~18.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react": {
+          "version": "~18.3.12",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native": {
+          "version": "~0.76.3",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-web": {
+          "version": "~0.19.13",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/metro-config": {
+          "version": "~0.19.4",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/metro-runtime": {
+          "version": "~4.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg-transformer": {
+          "version": "~1.5.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg": {
+          "version": "~15.8.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/react-native": {
+          "version": "~12.9.0",
+          "alwaysAddToPackageJson": false
+        },
+        "jest-expo": {
+          "version": "~52.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@babel/runtime": {
+          "version": "7.26.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }
diff --git a/packages/expo/src/executors/install/install.impl.ts b/packages/expo/src/executors/install/install.impl.ts
@@ -44,10 +44,10 @@ export async function installAndUpdatePackageJson(
 
   await installAsync(
     packages,
-    createInstallOptions({
+    {
       fix: options.fix,
       check: options.check,
-    }),
+    },
     createInstallOptions({ force: options.force })
   );
 

diff --git a/packages/expo/src/utils/versions.ts b/packages/expo/src/utils/versions.ts
@@ -1,27 +1,27 @@
 export const nxVersion = require('../../package.json').version;
 
-export const expoVersion = '~51.0.8';
-export const expoSplashScreenVersion = '~0.27.4';
-export const expoStatusBarVersion = '~1.12.1';
-export const expoCliVersion = '~0.18.13'; // @expo/cli
-export const babelPresetExpoVersion = '~11.0.0';
+export const expoVersion = '~52.0.11';
+export const expoSplashScreenVersion = '~0.29.13';
+export const expoStatusBarVersion = '~2.0.0';
+export const expoCliVersion = '~0.21.8'; // @expo/cli
+export const babelPresetExpoVersion = '~12.0.1';
 
-export const reactVersion = '18.2.0';
-export const reactDomVersion = '18.2.0';
-export const reactTestRendererVersion = '18.2.0';
-export const typesReactVersion = '~18.2.45';
+export const reactVersion = '~18.3.1';
+export const reactDomVersion = '~18.3.1';
+export const reactTestRendererVersion = '~18.3.1';
+export const typesReactVersion = '~18.3.12';
 
-export const reactNativeVersion = '0.74.1';
-export const reactNativeWebVersion = '~0.19.11';
+export const reactNativeVersion = '0.76.3';
+export const reactNativeWebVersion = '~0.19.13';
 
-export const expoMetroConfigVersion = '~0.18.1';
-export const expoMetroRuntimeVersion = '~3.2.1';
+export const expoMetroConfigVersion = '~0.19.4';
+export const expoMetroRuntimeVersion = '~4.0.0';
 
-export const reactNativeSvgTransformerVersion = '1.3.0';
-export const reactNativeSvgVersion = '15.2.0';
+export const reactNativeSvgTransformerVersion = '~1.5.0';
+export const reactNativeSvgVersion = '~15.8.0';
 
-export const testingLibraryReactNativeVersion = '~12.5.0';
+export const testingLibraryReactNativeVersion = '~12.9.0';
 export const testingLibraryJestNativeVersion = '~5.4.3';
-export const jestExpoVersion = '~51.0.2';
+export const jestExpoVersion = '~52.0.2';
 
-export const babelRuntimeVersion = '7.24.5';
+export const babelRuntimeVersion = '~7.26.0';
diff --git a/packages/react-native/migrations.json b/packages/react-native/migrations.json
@@ -220,6 +220,75 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.2.0": {
+      "version": "20.2.0-beta.5",
+      "packages": {
+        "react-native": {
+          "version": "~0.76.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-native-community/cli": {
+          "version": "~15.0.1",
+          "alwaysAddToPackageJson": true
+        },
+        "@react-native-community/cli-platform-android": {
+          "version": "~15.0.1",
+          "alwaysAddToPackageJson": true
+        },
+        "@react-native-community/cli-platform-ios": {
+          "version": "~15.0.1",
+          "alwaysAddToPackageJson": true
+        },
+        "@react-native/babel-preset": {
+          "version": "~0.76.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-native/metro-config": {
+          "version": "~0.76.3",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-web": {
+          "version": "~0.19.13",
+          "alwaysAddToPackageJson": false
+        },
+        "react": {
+          "version": "~18.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-dom": {
+          "version": "~18.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-test-renderer": {
+          "version": "~18.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react": {
+          "version": "~18.3.12",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react-dom": {
+          "version": "~18.3.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/react-native": {
+          "version": "~12.9.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg-transformer": {
+          "version": "~1.5.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg": {
+          "version": "~15.8.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@babel/runtime": {
+          "version": "~7.26.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }
diff --git a/packages/react-native/src/generators/application/files/app/Gemfile.template b/packages/react-native/src/generators/application/files/app/Gemfile.template
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
-# bound in the template on Cocoapods with next React Native release.
-gem 'cocoapods', '>= 1.13', '< 1.15'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
diff --git a/packages/react-native/src/generators/application/files/app/android/app/build.gradle.template b/packages/react-native/src/generators/application/files/app/android/app/build.gradle.template
@@ -8,13 +8,13 @@ apply plugin: "com.facebook.react"
  */
 react {
     /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    // root = file("../")
-    //   The folder where the react-native NPM package is. Default is <%= offsetFromRoot %>../../node_modules/react-native
+    //   The root of your project, i.e. where "package.json" lives. Default is '../..'
+    // root = file("../../")
+    //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
     reactNativeDir = file("<%= offsetFromRoot %>../../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is <%= offsetFromRoot %>../../node_modules/@react-native/codegen
+    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
     codegenDir = file("<%= offsetFromRoot %>../../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is <%= offsetFromRoot %>../../node_modules/react-native/cli.js
+    //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
     cliFile = file("<%= offsetFromRoot %>../../node_modules/react-native/cli.js")
 
     /* Variants */
@@ -45,10 +45,13 @@ react {
 
     /* Hermes Commands */
     //   The hermes compiler command to run. By default it is 'hermesc'
-    hermesCommand = "<%= offsetFromRoot %>node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
+    hermesCommand = "<%= offsetFromRoot %>../../node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
 /**
@@ -114,5 +117,3 @@ dependencies {
         implementation jscFlavor
     }
 }
-
-apply from: file("<%= offsetFromRoot %>../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
diff --git a/...ve/src/generators/application/files/app/android/app/src/main/AndroidManifest.xml.template b/...ve/src/generators/application/files/app/android/app/src/main/AndroidManifest.xml.template
@@ -9,6 +9,7 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme"
+      android:supportsRtl="true"
       android:networkSecurityConfig="@xml/network_security_config">
       <activity
         android:name=".MainActivity"

diff --git a/...ion/files/app/android/app/src/main/java/com/__lowerCaseName__/MainApplication.kt.template b/...ion/files/app/android/app/src/main/java/com/__lowerCaseName__/MainApplication.kt.template
@@ -9,17 +9,18 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.facebook.soloader.SoLoader
 
 class MainApplication : Application(), ReactApplication {
 
   override val reactNativeHost: ReactNativeHost =
       object : DefaultReactNativeHost(this) {
-        override fun getPackages(): List<ReactPackage> {
-          // Packages that cannot be autolinked yet can be added manually here, for example:
-          // packages.add(new MyReactNativePackage());
-          return PackageList(this).packages
-        }
+        override fun getPackages(): List<ReactPackage> =
+            PackageList(this).packages.apply {
+              // Packages that cannot be autolinked yet can be added manually here, for example:
+              // add(MyReactNativePackage())
+            }
 
         override fun getJSMainModuleName(): String = "src/main"
 
@@ -34,7 +35,7 @@ class MainApplication : Application(), ReactApplication {
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, false)
+    SoLoader.init(this, OpenSourceMergedSoMapping)
     if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
       // If you opted-in for the New Architecture, we load the native entry point for this app.
       load()

diff --git a/packages/react-native/src/generators/application/files/app/android/build.gradle.template b/packages/react-native/src/generators/application/files/app/android/build.gradle.template
@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "34.0.0"
-        minSdkVersion = 23
-        compileSdkVersion = 34
+        buildToolsVersion = "35.0.0"
+        minSdkVersion = 24
+        compileSdkVersion = 35
         targetSdkVersion = 34
         ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.22"
+        kotlinVersion = "1.9.24"
     }
     repositories {
         google()

diff --git a/packages/react-native/src/generators/application/files/app/android/gradle.properties b/packages/react-native/src/generators/application/files/app/android/gradle.properties
@@ -21,8 +21,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
@@ -34,7 +32,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
+newArchEnabled=true
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.

diff --git a/...ive/src/generators/application/files/app/android/gradle/wrapper/gradle-wrapper.properties b/...ive/src/generators/application/files/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/packages/react-native/src/generators/application/files/app/android/gradlew.bat b/packages/react-native/src/generators/application/files/app/android/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################