react-native 0.64.0-rc.3 → 0.64.2

package/React/Views/RefreshControl/RCTRefreshControl.m

@@ -41,6 +41,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 {
   [super layoutSubviews];
 
+  // Fix for bug #7976
+  if (self.backgroundColor == nil) {
+    self.backgroundColor = [UIColor clearColor];
+  }
+  
   // If the control is refreshing when mounted we need to call
   // beginRefreshing in layoutSubview or it doesn't work.
   if (_currentRefreshingState && _isInitialRender) {

package/React.podspec

@@ -39,7 +39,7 @@ Pod::Spec.new do |s|
   s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.cocoapods_version      = ">= 1.2.0"
+  s.cocoapods_version      = ">= 1.10.1"
 
   s.dependency "React-Core", version
   s.dependency "React-Core/DevSupport", version

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.64.0-rc.3
+VERSION_NAME=0.64.2
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/OnLoad.cpp

@@ -7,7 +7,9 @@
 
 #include <../instrumentation/HermesMemoryDumper.h>
 #include <HermesExecutorFactory.h>
+#include <android/log.h>
 #include <fbjni/fbjni.h>
+#include <glog/logging.h>
 #include <hermes/Public/GCConfig.h>
 #include <hermes/Public/RuntimeConfig.h>
 #include <jni.h>
@@ -21,6 +23,13 @@
 namespace facebook {
 namespace react {
 
+static void hermesFatalHandler(const std::string &reason) {
+  LOG(ERROR) << "Hermes Fatal: " << reason << "\n";
+  __android_log_assert(nullptr, "Hermes", "%s", reason.c_str());
+}
+
+static std::once_flag flag;
+
 static ::hermes::vm::RuntimeConfig makeRuntimeConfig(jlong heapSizeMB) {
   namespace vm = ::hermes::vm;
   auto gcConfigBuilder =
@@ -62,6 +71,9 @@ class HermesExecutorHolder
       jni::alias_ref<jclass>) {
     JReactMarker::setLogPerfMarkerIfNeeded();
 
+    std::call_once(flag, []() {
+      facebook::hermes::HermesRuntime::setFatalHandler(hermesFatalHandler);
+    });
     return makeCxxInstance(
         std::make_unique<HermesExecutorFactory>(installBindings));
   }
@@ -71,6 +83,9 @@ class HermesExecutorHolder
       jlong heapSizeMB) {
     JReactMarker::setLogPerfMarkerIfNeeded();
     auto runtimeConfig = makeRuntimeConfig(heapSizeMB);
+    std::call_once(flag, []() {
+      facebook::hermes::HermesRuntime::setFatalHandler(hermesFatalHandler);
+    });
     return makeCxxInstance(std::make_unique<HermesExecutorFactory>(
         installBindings, JSIExecutor::defaultTimeoutInvoker, runtimeConfig));
   }

package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java

@@ -756,6 +756,7 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
         return;
       }
       mDeviceRotation = rotation;
+      DisplayMetricsHolder.initDisplayMetrics(getContext().getApplicationContext());
       emitOrientationChanged(rotation);
     }
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 64,
-      "patch", 0,
-      "prerelease", "rc.3");
+      "patch", 2,
+      "prerelease", null);
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java

@@ -86,9 +86,18 @@ public class UIManagerHelper {
       }
     }
     CatalystInstance catalystInstance = context.getCatalystInstance();
-    return uiManagerType == FABRIC
-        ? (UIManager) catalystInstance.getJSIModule(JSIModuleType.UIManager)
-        : catalystInstance.getNativeModule(UIManagerModule.class);
+    try {
+      return uiManagerType == FABRIC
+          ? (UIManager) catalystInstance.getJSIModule(JSIModuleType.UIManager)
+          : catalystInstance.getNativeModule(UIManagerModule.class);
+    } catch (IllegalArgumentException ex) {
+      // TODO T67518514 Clean this up once we migrate everything over to bridgeless mode
+      ReactSoftException.logSoftException(
+          "UIManagerHelper",
+          new ReactNoCrashSoftException(
+              "Cannot get UIManager for UIManagerType: " + uiManagerType));
+      return catalystInstance.getNativeModule(UIManagerModule.class);
+    }
   }
 
   /**

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -419,11 +419,10 @@ public class ReactEditText extends AppCompatEditText
   @Override
   public void setInputType(int type) {
     Typeface tf = super.getTypeface();
-    // Input type password defaults to monospace font, so we need to re-apply the font
-    super.setTypeface(tf);
-
     super.setInputType(type);
     mStagedInputType = type;
+    // Input type password defaults to monospace font, so we need to re-apply the font
+    super.setTypeface(tf);
 
     /**
      * If set forces multiline on input, because of a restriction on Android source that enables

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,8 +17,8 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 64;
-  int32_t Patch = 0;
-  std::string_view Prerelease = "rc.3";
+  int32_t Patch = 2;
+  std::string_view Prerelease = "";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/android/com/facebook/react/react-native/0.64.2/react-native-0.64.2-javadoc.jar.md5

@@ -0,0 +1 @@
+e8a3a3f036a7a55542771d47423f418a

package/android/com/facebook/react/react-native/0.64.2/react-native-0.64.2-javadoc.jar.sha1

@@ -0,0 +1 @@
+9a9a2a82e3c0ccab2be64811dbcf410daaad0606

package/android/com/facebook/react/react-native/0.64.2/react-native-0.64.2-sources.jar.md5

@@ -0,0 +1 @@
+800c212ea74543460073cf215e14ecc1

package/android/com/facebook/react/react-native/0.64.2/react-native-0.64.2-sources.jar.sha1

@@ -0,0 +1 @@
+e7cc76356f65928f018b08474ee2d7531da0c6a7

package/android/com/facebook/react/react-native/0.64.2/react-native-0.64.2.aar.md5

@@ -0,0 +1 @@
+a1f4484c294eb3e3e436da5edee9c0c5

package/android/com/facebook/react/react-native/0.64.2/react-native-0.64.2.aar.sha1

@@ -0,0 +1 @@
+01a1fcfa725f135acc21e96ed71ff432b1fc553f

package/android/com/facebook/react/react-native/{0.64.0-rc.3/react-native-0.64.0-rc.3.pom → 0.64.2/react-native-0.64.2.pom}

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.64.0-rc.3</version>
+  <version>0.64.2</version>
   <packaging>aar</packaging>
   <name>ReactNative</name>
   <description>A framework for building native apps with React</description>

package/android/com/facebook/react/react-native/0.64.2/react-native-0.64.2.pom.md5

@@ -0,0 +1 @@
+389f95f84193a6364d9a78816107b307

package/android/com/facebook/react/react-native/0.64.2/react-native-0.64.2.pom.sha1

@@ -0,0 +1 @@
+48fcceb199d9f1fa6010c5e9e54d824cb21ce869

package/android/com/facebook/react/react-native/maven-metadata.xml

@@ -3,10 +3,10 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <release>0.64.0-rc.3</release>
+    <release>0.64.2</release>
     <versions>
-      <version>0.64.0-rc.3</version>
+      <version>0.64.2</version>
     </versions>
-    <lastUpdated>20210205214620</lastUpdated>
+    <lastUpdated>20210603172949</lastUpdated>
   </versioning>
 </metadata>

package/android/com/facebook/react/react-native/maven-metadata.xml.md5

@@ -1 +1 @@
-11ae1bcb22c1790acd75ec488eecd092
+bbff08476171883317414c491685e186

package/android/com/facebook/react/react-native/maven-metadata.xml.sha1

@@ -1 +1 @@
-06d09162330ca9c0d9d5eab4fb59598882ee70b6
+9cd18d3514fed67424012c4c3b34b3e533a63c7a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.64.0-rc.3",
+  "version": "0.64.2",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -46,6 +46,7 @@
     "scripts/packager.sh",
     "scripts/react_native_pods.rb",
     "scripts/react-native-xcode.sh",
+    "scripts/find-node.sh",
     "template.config.js",
     "template",
     "third-party-podspecs"
@@ -83,9 +84,9 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^26.5.0",
-    "@react-native-community/cli": "^5.0.1-alpha.0",
-    "@react-native-community/cli-platform-android": "^5.0.1-alpha.0",
-    "@react-native-community/cli-platform-ios": "^5.0.1-alpha.0",
+    "@react-native-community/cli": "^5.0.1-alpha.1",
+    "@react-native-community/cli-platform-android": "^5.0.1-alpha.1",
+    "@react-native-community/cli-platform-ios": "^5.0.1-alpha.1",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "1.0.0",
     "@react-native/polyfills": "1.0.0",
@@ -105,6 +106,7 @@
     "promise": "^8.0.3",
     "prop-types": "^15.7.2",
     "react-devtools-core": "^4.6.0",
+    "react-native-codegen": "^0.0.6",
     "react-refresh": "^0.4.0",
     "regenerator-runtime": "^0.13.2",
     "scheduler": "^0.20.1",

package/react.gradle

@@ -28,17 +28,11 @@ def detectCliPath(config) {
     if (config.cliPath) {
         return config.cliPath
     }
-
-    def cliPath = ["node", "-e", "console.log(require('react-native/cli').bin);"].execute([], projectDir).text.trim()
-
-    if (cliPath) {
-        return cliPath
-    } else if (new File("${projectDir}/../../node_modules/react-native/cli.js").exists()) {
+    if (new File("${projectDir}/../../node_modules/react-native/cli.js").exists()) {
         return "${projectDir}/../../node_modules/react-native/cli.js"
-    } else {
-        throw new Exception("Couldn't determine CLI location. " +
-            "Please set `project.ext.react.cliPath` to the path of the react-native cli.js");
     }
+    throw new Exception("Couldn't determine CLI location. " +
+             "Please set `project.ext.react.cliPath` to the path of the react-native cli.js");
 }
 
 def composeSourceMapsPath = config.composeSourceMapsPath ?: "node_modules/react-native/scripts/compose-source-maps.js"

package/scripts/find-node.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+set -e
+
+# Define NVM_DIR and source the nvm.sh setup script
+[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"
+
+if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
+  . "$HOME/.nvm/nvm.sh"
+elif [[ -x "$(command -v brew)" && -s "$(brew --prefix nvm)/nvm.sh" ]]; then
+  . "$(brew --prefix nvm)/nvm.sh"
+fi
+
+# Set up the nodenv node version manager if present
+if [[ -x "$HOME/.nodenv/bin/nodenv" ]]; then
+  eval "$("$HOME/.nodenv/bin/nodenv" init -)"
+elif [[ -x "$(command -v brew)" && -x "$(brew --prefix nodenv)/bin/nodenv" ]]; then
+  eval "$("$(brew --prefix nodenv)/bin/nodenv" init -)"
+fi
+
+# Set up the ndenv of anyenv if preset
+if [[ ! -x node && -d ${HOME}/.anyenv/bin ]]; then
+  export PATH=${HOME}/.anyenv/bin:${PATH}
+  if [[ "$(anyenv envs | grep -c ndenv )" -eq 1 ]]; then
+    eval "$(anyenv init -)"
+  fi
+fi
+
+# Support Homebrew on M1
+HOMEBREW_M1_BIN=/opt/homebrew/bin
+if [[ -d $HOMEBREW_M1_BIN && ! $PATH =~ $HOMEBREW_M1_BIN ]]; then
+  export PATH="$HOMEBREW_M1_BIN:$PATH"
+fi

package/scripts/generate-specs-cli.js

@@ -25,7 +25,7 @@ const path = require('path');
 
 const GENERATORS = {
   android: ['modulesAndroid'],
-  ios: ['componentsIOS', 'modulesIOS'],
+  ios: ['modulesIOS'],
 };
 
 function generateSpec(

package/scripts/generate-specs.sh

@@ -27,6 +27,10 @@ set -e
 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 TEMP_DIR=$(mktemp -d /tmp/react-native-codegen-XXXXXXXX)
 RN_DIR=$(cd "$THIS_DIR/.." && pwd)
+
+# find node path
+source "$RN_DIR/scripts/find-node.sh"
+
 NODE_BINARY="${NODE_BINARY:-$(command -v node || true)}"
 USE_FABRIC="${USE_FABRIC:-0}"
 
@@ -53,33 +57,19 @@ main() {
   TEMP_OUTPUT_DIR="$TEMP_DIR/out"
   SCHEMA_FILE="$TEMP_DIR/schema.json"
 
-  CODEGEN_REPO_PATH="$RN_DIR/packages/react-native-codegen"
-  CODEGEN_NPM_PATH="$RN_DIR/../react-native-codegen"
-
-if [ -z "$NODE_BINARY" ]; then
+  if [ -z "$NODE_BINARY" ]; then
     echo "Error: Could not find node. Make sure it is in bash PATH or set the NODE_BINARY environment variable." 1>&2
     exit 1
   fi
 
-  if [ -d "$CODEGEN_REPO_PATH" ]; then
-    CODEGEN_PATH=$(cd "$CODEGEN_REPO_PATH" && pwd)
-  elif [ -d "$CODEGEN_NPM_PATH" ]; then
-    CODEGEN_PATH=$(cd "$CODEGEN_NPM_PATH" && pwd)
-  else
-    echo "Error: Could not determine react-native-codegen location. Try running 'yarn install' or 'npm install' in your project root." 1>&2
-    exit 1
-  fi
+  CODEGEN_PATH=$("$NODE_BINARY" -e "console.log(require('path').dirname(require.resolve('react-native-codegen/package.json')))")
 
+  # Special case for running CodeGen from source: build it
   if [ ! -d "$CODEGEN_PATH/lib" ]; then
     describe "Building react-native-codegen package"
     bash "$CODEGEN_PATH/scripts/oss/build.sh"
   fi
 
-  if [ -z "$NODE_BINARY" ]; then
-    echo "Error: Could not find node. Make sure it is in bash PATH or set the NODE_BINARY environment variable." 1>&2
-    exit 1
-  fi
-
   describe "Generating schema from flow types"
   "$NODE_BINARY" "$CODEGEN_PATH/lib/cli/combine/combine-js-to-schema-cli.js" "$SCHEMA_FILE" "$SRCS_DIR"
 

package/scripts/react-native-xcode.sh

@@ -64,9 +64,6 @@ PROJECT_ROOT=${PROJECT_ROOT:-"$REACT_NATIVE_DIR/../.."}
 
 cd "$PROJECT_ROOT" || exit
 
-# Define NVM_DIR and source the nvm.sh setup script
-[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"
-
 # Define entry file
 if [[ "$ENTRY_FILE" ]]; then
   # Use ENTRY_FILE defined by user
@@ -82,26 +79,8 @@ if [[ $DEV != true && ! -f "$ENTRY_FILE" ]]; then
   exit 2
 fi
 
-if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
-  . "$HOME/.nvm/nvm.sh"
-elif [[ -x "$(command -v brew)" && -s "$(brew --prefix nvm)/nvm.sh" ]]; then
-  . "$(brew --prefix nvm)/nvm.sh"
-fi
-
-# Set up the nodenv node version manager if present
-if [[ -x "$HOME/.nodenv/bin/nodenv" ]]; then
-  eval "$("$HOME/.nodenv/bin/nodenv" init -)"
-elif [[ -x "$(command -v brew)" && -x "$(brew --prefix nodenv)/bin/nodenv" ]]; then
-  eval "$("$(brew --prefix nodenv)/bin/nodenv" init -)"
-fi
-
-# Set up the ndenv of anyenv if preset
-if [[ ! -x node && -d ${HOME}/.anyenv/bin ]]; then
-  export PATH=${HOME}/.anyenv/bin:${PATH}
-  if [[ "$(anyenv envs | grep -c ndenv )" -eq 1 ]]; then
-    eval "$(anyenv init -)"
-  fi
-fi
+# find node path
+source "$REACT_NATIVE_DIR/scripts/find-node.sh"
 
 # check and assign NODE_BINARY env
 # shellcheck source=/dev/null

package/scripts/react_native_pods.rb

@@ -64,17 +64,17 @@ def use_react_native! (options={})
   if hermes_enabled
     pod 'React-Core/Hermes', :path => "#{prefix}/"
     pod 'hermes-engine', '~> 0.7.2'
-    pod 'libevent', :podspec => "#{prefix}/third-party-podspecs/libevent.podspec"
+    pod 'libevent', '~> 2.1.12'
   end
 end
 
 def use_flipper!(versions = {}, configurations: ['Debug'])
-  versions['Flipper'] ||= '~> 0.54.0'
+  versions['Flipper'] ||= '~> 0.75.1'
   versions['Flipper-DoubleConversion'] ||= '1.1.7'
-  versions['Flipper-Folly'] ||= '~> 2.2'
+  versions['Flipper-Folly'] ||= '~> 2.5.3'
   versions['Flipper-Glog'] ||= '0.3.6'
   versions['Flipper-PeerTalk'] ||= '~> 0.0.4'
-  versions['Flipper-RSocket'] ||= '~> 1.1'
+  versions['Flipper-RSocket'] ||= '~> 1.3'
   pod 'FlipperKit', versions['Flipper'], :configurations => configurations
   pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configurations => configurations
   pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configurations => configurations
@@ -138,10 +138,26 @@ def exclude_architectures(installer)
 end
 
 def react_native_post_install(installer)
+  pods_prefix = File.dirname(installer.pods_project.path)
+
   if has_pod(installer, 'Flipper')
     flipper_post_install(installer)
   end
 
+  ## Fix for RTC-Folly on iOS 14.5 - makes Hermes work again
+  find_and_replace(
+    "#{pods_prefix}/RCT-Folly/folly/synchronization/DistributedMutex-inl.h",
+    'atomic_notify_one(state)',
+    'folly::atomic_notify_one(state)'
+  )
+
+  find_and_replace(
+    "#{pods_prefix}Pods/RCT-Folly/folly/synchronization/DistributedMutex-inl.h",
+    'atomic_wait_until(&state, previous | data, deadline)',
+    'folly::atomic_wait_until(&state, previous | data, deadline)'
+  )
+
+  ## Exclude `i386` from valid architectures when building with Hermes on iOS
   exclude_architectures(installer)
 end
 
@@ -199,3 +215,18 @@ def use_react_native_codegen!(spec, options={})
 
   spec.prepare_command = "#{mkdir_command} && touch #{generated_files.reduce() { |str, file| str + " " + file }}"
 end
+
+# Local method for the Xcode 12.5 fix
+def find_and_replace(dir, findstr, replacestr)
+  Dir[dir].each do |name|
+    text = File.read(name)
+    replace = text.gsub(findstr, replacestr)
+    replaced = text.index(replacestr)
+    next if !replaced.nil? || text == replace
+
+    puts "Patching #{name}"
+    File.open(name, 'w') { |file| file.puts replace }
+    $stdout.flush
+  end
+  Dir["#{dir}*/"].each(&method(:find_and_replace))
+end

package/template/_editorconfig

@@ -0,0 +1,3 @@
+# Windows files
+[*.bat]
+end_of_line = crlf

package/template/_gitattributes

@@ -0,0 +1,3 @@
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf

package/template/android/gradle.properties

@@ -25,4 +25,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.54.0
+FLIPPER_VERSION=0.75.1

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "17.0.1",
-    "react-native": "0.64.0-rc.3"
+    "react-native": "0.64.2"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
@@ -21,7 +21,6 @@
     "eslint": "7.14.0",
     "jest": "^26.6.3",
     "metro-react-native-babel-preset": "^0.64.0",
-    "react-native-codegen": "^0.0.7",
     "react-test-renderer": "17.0.1"
   },
   "jest": {

package/android/com/facebook/react/react-native/0.64.0-rc.3/react-native-0.64.0-rc.3-javadoc.jar.md5

@@ -1 +0,0 @@
-32110b1ad48a82637f3784735dbd3b19

package/android/com/facebook/react/react-native/0.64.0-rc.3/react-native-0.64.0-rc.3-javadoc.jar.sha1

@@ -1 +0,0 @@
-e259bd69dd7e634132b9e0e48963143a6453fa93

package/android/com/facebook/react/react-native/0.64.0-rc.3/react-native-0.64.0-rc.3-sources.jar.md5

@@ -1 +0,0 @@
-5aadb210cdbad1f43d2a906bfc205ffc

package/android/com/facebook/react/react-native/0.64.0-rc.3/react-native-0.64.0-rc.3-sources.jar.sha1

@@ -1 +0,0 @@
-e86de9cb86f79b778e215c6a69f230994b41227b

package/android/com/facebook/react/react-native/0.64.0-rc.3/react-native-0.64.0-rc.3.aar.md5

@@ -1 +0,0 @@
-9082cf595af1061296e0a274bd73c1bc

package/android/com/facebook/react/react-native/0.64.0-rc.3/react-native-0.64.0-rc.3.aar.sha1

@@ -1 +0,0 @@
-1fa4f8db66e914ba7f16f0f43393ecdf2e0043ec

package/android/com/facebook/react/react-native/0.64.0-rc.3/react-native-0.64.0-rc.3.pom.md5

@@ -1 +0,0 @@
-37557cdfec0612ab2d05c812283aa240

package/android/com/facebook/react/react-native/0.64.0-rc.3/react-native-0.64.0-rc.3.pom.sha1

@@ -1 +0,0 @@
-c81792f2faf5e32ed1ae1b5ef8946df729c744ac