react-native 0.71.4 → 0.72.0-rc.0

package/sdks/hermes-engine/hermes-utils.rb

@@ -6,6 +6,98 @@
 require 'net/http'
 require 'rexml/document'
 
+# This function abort the build if the `HERMES_ENGINE_TARBALL_PATH` ENV variable is set with an invalid path
+def abort_if_invalid_tarball_provided!()
+    if ENV.has_key?('HERMES_ENGINE_TARBALL_PATH') && !File.exist?(ENV['HERMES_ENGINE_TARBALL_PATH'])
+        abort "[Hermes] HERMES_ENGINE_TARBALL_PATH is set, but points to a non-existing file: \"#{ENV['HERMES_ENGINE_TARBALL_PATH']}\"\nIf you don't want to use tarball, run `unset HERMES_ENGINE_TARBALL_PATH`"
+    end
+end
+
+# It computes the right value for the hermes-engine.podspec's source.
+# - To use a specific tarball, install the dependencies with:
+# `HERMES_ENGINE_TARBALL_PATH=<path_to_tarball> bundle exec pod install`
+# - To force a build from source, install the dependencies with:
+# `BUILD_FROM_SOURCE=true bundle exec pod install`
+# If none of the two are provided, Cocoapods will check whether there is a tarball for the current version
+# (either release or nightly). If not, it will fall back building from source (the latest commit on main).
+#
+# Parameters:
+# - build_from_source: boolean to force a build from source.
+# - hermestag_file: path to the hermes tag file.
+# - git: uri to the hermes repository
+# - version: current version of the pod
+# - build_type: build type of the hermes engine. It can be `:release` or `:debug`
+# - react_native_path: path to react native
+#
+# Returns: a properly configured source object
+def compute_hermes_source(build_from_source, hermestag_file, git, version, build_type, react_native_path)
+    source = {}
+
+    if ENV.has_key?('HERMES_ENGINE_TARBALL_PATH')
+        use_tarball(source)
+    elsif build_from_source
+        if File.exist?(hermestag_file)
+            build_from_tagfile(source, git, hermestag_file)
+        else
+            build_hermes_from_source(source, git)
+        end
+    elsif hermes_artifact_exists(release_tarball_url(version, build_type))
+        use_release_tarball(source, version, build_type)
+    elsif hermes_artifact_exists(nightly_tarball_url(version).gsub("\\", ""))
+        use_nightly_tarball(source, react_native_path, version)
+    else
+        build_hermes_from_source(source, git)
+    end
+
+    return source
+end
+
+def use_tarball(source)
+    tarball_path = ENV['HERMES_ENGINE_TARBALL_PATH']
+    putsIfPodPresent("[Hermes] Using pre-built Hermes binaries from local path: #{tarball_path}")
+    source[:http] = "file://#{tarball_path}"
+end
+
+def build_from_tagfile(source, git, hermestag_file)
+    hermestag = File.read(hermestag_file).strip
+    putsIfPodPresent("[Hermes] Building Hermes from source from tag #{hermestag}...")
+    source[:git] = git
+    source[:tag] = hermestag
+end
+
+def use_release_tarball(source, version, build_type)
+    # Sample url from Maven:
+    # https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.71.0/react-native-artifacts-0.71.0-hermes-ios-debug.tar.gz
+    putsIfPodPresent('[Hermes] Using the release tarball from Maven Central', 'info')
+    source[:http] = release_tarball_url(version, build_type)
+end
+
+def release_tarball_url(version, build_type)
+    return "https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
+end
+
+def use_nightly_tarball(source, react_native_path, version)
+    putsIfPodPresent('[Hermes] Nightly version, download pre-built for Hermes')
+    destination_path = download_nightly_hermes(react_native_path, version)
+    # set tarball as hermes engine
+    source[:http] = "file://#{destination_path}"
+end
+
+def putsIfPodPresent(message, level = 'warning')
+    unless Object.const_defined?("Pod::UI")
+        return
+    end
+
+    case level
+    when 'info'
+        Pod::UI.puts message.green
+    when 'error'
+        Pod::UI.puts message.red
+    else
+        Pod::UI.puts message.yellow
+    end
+end
+
 # This function downloads the nightly prebuilt version of Hermes based on the passed version
 # and save it in the node_module/react_native/sdks/downloads folder
 # It then returns the path to the hermes tarball
@@ -15,12 +107,38 @@ require 'rexml/document'
 # - version: the version of React Native that requires the Hermes tarball
 # Returns: the path to the downloaded Hermes tarball
 def download_nightly_hermes(react_native_path, version)
-    params = "r=snapshots\&g=com.facebook.react\&a=react-native-artifacts\&c=hermes-ios-debug\&e=tar.gz\&v=#{version}-SNAPSHOT"
-    tarball_url = "http://oss.sonatype.org/service/local/artifact/maven/redirect\?#{params}"
+    tarball_url = nightly_tarball_url(version)
 
     destination_folder = "#{react_native_path}/sdks/downloads"
-    destination_path = "#{destination_folder}/hermes-ios.tar.gz"
+    destination_path = "#{destination_folder}/hermes-ios-#{version}.tar.gz"
 
-    `mkdir -p "#{destination_folder}" && curl "#{tarball_url}" -Lo "#{destination_path}"`
+    unless File.exist?(destination_path)
+      # Download to a temporary file first so we don't cache incomplete downloads.
+      tmp_file = "#{destination_folder}/hermes-ios.download"
+      `mkdir -p "#{destination_folder}" && curl "#{tarball_url}" -Lo "#{tmp_file}" && mv "#{tmp_file}" "#{destination_path}"`
+    end
     return destination_path
 end
+
+def nightly_tarball_url(version)
+    params = "r=snapshots\&g=com.facebook.react\&a=react-native-artifacts\&c=hermes-ios-debug\&e=tar.gz\&v=#{version}-SNAPSHOT"
+    return "http://oss.sonatype.org/service/local/artifact/maven/redirect\?#{params}"
+end
+
+def build_hermes_from_source(source, git)
+    putsIfPodPresent('[Hermes] Installing hermes-engine may take slightly longer, building Hermes compiler from source...')
+    source[:git] = git
+    source[:commit] = `git ls-remote https://github.com/facebook/hermes main | cut -f 1`.strip
+end
+
+# This function checks that Hermes artifact exists.
+# As of now it should check it on the Maven repo.
+#
+# Parameters
+# - version: the version of React Native
+# - build_type: debug or release
+def hermes_artifact_exists(tarball_url)
+    # -L is used to follow redirects, useful for the nightlies
+    # I also needed to wrap the url in quotes to avoid escaping & and ?.
+    return (`curl -o /dev/null --silent -Iw '%{http_code}' -L "#{tarball_url}"` == "200")
+end

package/sdks/hermes-engine/utils/build-apple-framework.sh

@@ -129,11 +129,21 @@ function create_universal_framework {
   echo "Creating universal framework for platforms: ${platforms[*]}"
 
   for i in "${!platforms[@]}"; do
-    local hermes_framework_path="${platforms[$i]}/hermes.framework"
+    local platform="${platforms[$i]}"
+    local hermes_framework_path="${platform}/hermes.framework"
+    local dSYM_path="$hermes_framework_path"
+    local dSYM_base_path="$HERMES_PATH/destroot/Library/Frameworks"
+
+    # If the dSYM rename has failed, the dSYM are generated as 0.dSYM
+    # (Apple default name) rather then hermes.framework.dSYM.
+    if [[ -e "$dSYM_base_path/${platform}/0.dSYM" ]]; then
+      dSYM_path="${platform}/0"
+    fi
+
     args+="-framework $hermes_framework_path "
 
     # Path to dSYM must be absolute
-    args+="-debug-symbols $HERMES_PATH/destroot/Library/Frameworks/$hermes_framework_path.dSYM "
+    args+="-debug-symbols $dSYM_base_path/$dSYM_path.dSYM "
   done
 
   mkdir -p universal

package/sdks/hermes-engine/utils/build-hermes-xcode.sh

@@ -63,3 +63,10 @@ echo "Build Apple framework"
   --build "${PODS_ROOT}/hermes-engine/build/${PLATFORM_NAME}" \
   --target "install/strip" \
   -j "$(sysctl -n hw.ncpu)"
+
+echo "Copy Apple framework to destroot/Library/Frameworks"
+
+cp -pfR \
+  "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/${PLATFORM_NAME}/hermes.framework" \
+  "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/ios"
+rm -rf "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/${PLATFORM_NAME}"

package/sdks/hermes-engine/utils/build-hermesc-xcode.sh

@@ -8,9 +8,16 @@ set -x
 
 hermesc_dir_path="$1"
 
-CMAKE_BINARY=${CMAKE_BINARY:-$(command -v cmake | tr -d '\n')}
+# This script is supposed to be executed from Xcode "run script" phase.
+# Xcode sets up its build environment based on the build target.
+# Here we override relevant envvars to make sure that we build hermesc for macosx,
+# even if Xcode build target is iphone, iponesimulator, etc.
+MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion)
+export MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
+SDKROOT=$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+export SDKROOT=$SDKROOT
 
-if ! "$CMAKE_BINARY" -S . -B "$hermesc_dir_path"
+if ! "$CMAKE_BINARY" -S "${PODS_ROOT}/hermes-engine" -B "$hermesc_dir_path"
 then
     echo "Failed to configure Hermesc cmake project."
     exit 1

package/sdks/hermes-engine/utils/copy-hermes-xcode.sh

@@ -4,19 +4,4 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-set -x
-
-src="${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/${PLATFORM_NAME}/hermes.framework"
-
-if [[ ! -e "$src" ]]; then
-  echo "$src does not exist."
-  exit 1
-fi
-
-dst1="${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes"
-[ ! -f "$dst1" ] && mkdir -p "$dst1"
-cp -R "$src" "$dst1"
-
-dst2="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-[ ! -f "$dst2" ] && mkdir -p "$dst2"
-cp -R "$src" "$dst2"
+echo "This file is no-op now. Remove \"[RN] Copy Hermes Framework\" script phase from your main target if you don't want to see this message."

package/sdks/hermes-engine/utils/create-dummy-hermes-xcframework.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+set -x
+
+# CocoaPods requires vendored frameworks to exist before `pod install` is run,
+# and to be proper Moch-O binaries in order to auto-link them to the user's Xcode project.
+# This script creates dummy hermes.framework for macosx and ios.
+# They are then get rewritten by `build-hermes-xcode.sh` during Xcode build.
+
+rm -rf destroot
+
+mkdir -p destroot/Library/Frameworks
+
+pushd destroot/Library/Frameworks > /dev/null || exit 1
+
+echo '' > dummy.c
+
+mkdir -p macosx/hermes.framework
+clang dummy.c -dynamiclib -o macosx/hermes.framework/hermes
+
+mkdir -p ios/hermes.framework
+clang dummy.c -dynamiclib -o ios/hermes.framework/hermes
+
+rm dummy.c
+
+popd > /dev/null || exit 1

package/settings.gradle.kts

@@ -1,34 +1 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
 
-pluginManagement {
-  repositories {
-    mavenCentral()
-    google()
-    gradlePluginPortal()
-  }
-}
-
-include(":ReactAndroid", ":ReactAndroid:hermes-engine", ":ReactAndroid:external-artifacts")
-
-// If the ./packages folder exists, then we're inside the React Native repository.
-// If not, a users is consuming this project for a build from source.
-if (File("${rootDir}/packages").exists()) {
-  include(":packages:rn-tester:android:app")
-  // Include this to enable codegen Gradle plugin.
-  includeBuild("packages/react-native-gradle-plugin/")
-}
-
-rootProject.name = "react-native-github"
-
-plugins { id("com.gradle.enterprise").version("3.7.1") }
-
-// If you specify a file inside gradle/gradle-enterprise.gradle.kts
-// you can configure your custom Gradle Enterprise instance
-if (File("./gradle/gradle-enterprise.gradle.kts").exists()) {
-  apply(from = "./gradle/gradle-enterprise.gradle.kts")
-}

package/template/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby File.read(File.join(__dir__, '.ruby-version')).strip
+ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.11', '>= 1.11.3'
+gem 'cocoapods', '~> 1.12'

package/template/__tests__/{App-test.tsx → App.test.tsx}

@@ -6,6 +6,9 @@ import 'react-native';
 import React from 'react';
 import App from '../App';
 
+// Note: import explicitly to use the types shiped with jest.
+import {it} from '@jest/globals';
+
 // Note: test renderer must be required after react-native.
 import renderer from 'react-test-renderer';
 

package/template/_eslintrc.js

@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: '@react-native-community',
+  extends: '@react-native',
 };

package/template/_gitignore

@@ -61,3 +61,6 @@ yarn-error.log
 
 # Temporary files created by Metro to check the health of the file watcher
 .metro-health-check*
+
+# testing
+/coverage

package/template/_watchmanconfig

@@ -1 +1 @@
-{}
+{}

package/template/android/app/build.gradle

@@ -1,8 +1,6 @@
 apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
 
-import com.android.build.OutputFile
-
 /**
  * This is the configuration block to customize your React Native Android app.
  * By default you don't need to apply any configuration, just uncomment the lines you need.
@@ -13,8 +11,8 @@ react {
     // root = file("../")
     //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
     // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
-    // codegenDir = file("../node_modules/react-native-codegen")
+    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
+    // codegenDir = file("../node_modules/@react-native/codegen")
     //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
     // cliFile = file("../node_modules/react-native/cli.js")
 
@@ -52,14 +50,6 @@ react {
     // hermesFlags = ["-O", "-output-source-map"]
 }
 
-/**
- * Set this to true to create four separate APKs instead of one,
- * one for each native architecture. This is useful if you don't
- * use App Bundles (https://developer.android.com/guide/app-bundle/)
- * and want to have separate APKs to upload to the Play Store.
- */
-def enableSeparateBuildPerCPUArchitecture = false
-
 /**
  * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
  */
@@ -78,16 +68,6 @@ def enableProguardInReleaseBuilds = false
  */
 def jscFlavor = 'org.webkit:android-jsc:+'
 
-/**
- * Private function to get the list of Native Architectures you want to build.
- * This reads the value from reactNativeArchitectures in your gradle.properties
- * file and works together with the --active-arch-only flag of react-native run-android.
- */
-def reactNativeArchitectures() {
-    def value = project.getProperties().get("reactNativeArchitectures")
-    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
 android {
     ndkVersion rootProject.ext.ndkVersion
 
@@ -101,15 +81,6 @@ android {
         versionCode 1
         versionName "1.0"
     }
-
-    splits {
-        abi {
-            reset()
-            enable enableSeparateBuildPerCPUArchitecture
-            universalApk false  // If true, also generate a universal APK
-            include (*reactNativeArchitectures())
-        }
-    }
     signingConfigs {
         debug {
             storeFile file('debug.keystore')
@@ -130,22 +101,6 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
-
-    // applicationVariants are e.g. debug, release
-    applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            // For each separate APK per architecture, set a unique version code as described here:
-            // https://developer.android.com/studio/build/configure-apk-splits.html
-            // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
-            def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
-            def abi = output.getFilter(OutputFile.ABI)
-            if (abi != null) {  // null for the universal-debug, universal-release variants
-                output.versionCodeOverride =
-                        defaultConfig.versionCode * 1000 + versionCodes.get(abi)
-            }
-
-        }
-    }
 }
 
 dependencies {

package/template/android/app/src/main/java/com/helloworld/MainActivity.java

@@ -27,9 +27,6 @@ public class MainActivity extends ReactActivity {
         this,
         getMainComponentName(),
         // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-        DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled
-        // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18).
-        DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled
-        );
+        DefaultNewArchitectureEntryPoint.getFabricEnabled());
   }
 }

package/template/android/app/src/main/res/drawable/rn_edit_text_material.xml

@@ -20,7 +20,7 @@
        android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
 
     <selector>
-        <!-- 
+        <!--
           This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
           The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
           NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'

package/template/android/build.gradle

@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.3.1")
+        classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
     }
 }

package/template/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/template/android/gradle.properties

@@ -25,7 +25,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.125.0
+FLIPPER_VERSION=0.182.0
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using

package/template/android/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

package/template/android/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

package/template/android/settings.gradle

@@ -1,4 +1,4 @@
 rootProject.name = 'HelloWorld'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
-includeBuild('../node_modules/react-native-gradle-plugin')
+includeBuild('../node_modules/@react-native/gradle-plugin')

package/template/app.json

@@ -1,4 +1,4 @@
 {
   "name": "HelloWorld",
   "displayName": "HelloWorld"
-}
+}

package/template/ios/HelloWorld/AppDelegate.mm

@@ -23,14 +23,4 @@
 #endif
 }
 
-/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
-///
-/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
-/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
-/// @return: `true` if the `concurrentRoot` feature is enabled. Otherwise, it returns `false`.
-- (BOOL)concurrentRootEnabled
-{
-  return true;
-}
-
 @end

package/template/ios/Podfile

@@ -1,5 +1,9 @@
-require_relative '../node_modules/react-native/scripts/react_native_pods'
-require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+# Resolve react_native_pods.rb with node to allow for hoisting
+require Pod::Executable.execute_command('node', ['-p',
+  'require.resolve(
+    "react-native/scripts/react_native_pods.rb",
+    {paths: [process.argv[1]]},
+  )', __dir__]).strip
 
 platform :ios, min_ios_version_supported
 prepare_react_native_project!
@@ -30,8 +34,6 @@ target 'HelloWorld' do
   use_react_native!(
     :path => config[:reactNativePath],
     # Hermes is now enabled by default. Disable by setting this flag to false.
-    # Upcoming versions of React Native may rely on get_default_flags(), but
-    # we make it explicit here to aid in the React Native upgrade process.
     :hermes_enabled => flags[:hermes_enabled],
     :fabric_enabled => flags[:fabric_enabled],
     # Enables Flipper.
@@ -49,10 +51,10 @@ target 'HelloWorld' do
   end
 
   post_install do |installer|
+    # https://github.com/facebook/react-native/blob/main/scripts/react_native_pods.rb#L197-L202
     react_native_post_install(
       installer,
-      # Set `mac_catalyst_enabled` to `true` in order to apply patches
-      # necessary for Mac Catalyst builds
+      config[:reactNativePath],
       :mac_catalyst_enabled => false
     )
     __apply_Xcode_12_5_M1_post_install_workaround(installer)

package/template/jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  preset: 'react-native',
+};