react-native 0.0.0-201c10733 → 0.0.0-268efb102

package/scripts/react_native_pods.rb

@@ -18,7 +18,7 @@ def use_react_native! (options={})
 
   # The Pods which should be included in all projects
   pod 'FBLazyVector', :path => "#{prefix}/Libraries/FBLazyVector"
-  pod 'FBReactNativeSpec', :path => "#{prefix}/Libraries/FBReactNativeSpec"
+  pod 'FBReactNativeSpec', :path => "#{prefix}/React/FBReactNativeSpec"
   pod 'RCTRequired', :path => "#{prefix}/Libraries/RCTRequired"
   pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety"
   pod 'React', :path => "#{prefix}/"
@@ -46,11 +46,13 @@ def use_react_native! (options={})
   pod 'React-callinvoker', :path => "#{prefix}/ReactCommon/callinvoker"
   pod 'React-runtimeexecutor', :path => "#{prefix}/ReactCommon/runtimeexecutor"
   pod 'React-perflogger', :path => "#{prefix}/ReactCommon/reactperflogger"
+  pod 'React-logger', :path => "#{prefix}/ReactCommon/logger"
   pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon"
   pod 'Yoga', :path => "#{prefix}/ReactCommon/yoga", :modular_headers => true
 
   pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec"
   pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec"
+  pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec"
   pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec"
 
   if fabric_enabled
@@ -63,18 +65,21 @@ def use_react_native! (options={})
 
   if hermes_enabled
     pod 'React-hermes', :path => "#{prefix}/ReactCommon/hermes"
-    pod 'hermes-engine'
-    pod 'libevent', :podspec => "#{prefix}/third-party-podspecs/libevent.podspec"
+    pod 'hermes-engine', '~> 0.9.0'
+    pod 'libevent', '~> 2.1.12'
   end
 end
 
 def use_flipper!(versions = {}, configurations: ['Debug'])
-  versions['Flipper'] ||= '~> 0.54.0'
-  versions['Flipper-DoubleConversion'] ||= '1.1.7'
-  versions['Flipper-Folly'] ||= '~> 2.2'
+  versions['Flipper'] ||= '0.99.0'
+  versions['Flipper-Boost-iOSX'] ||= '1.76.0.1.11'
+  versions['Flipper-DoubleConversion'] ||= '3.1.7'
+  versions['Flipper-Fmt'] ||= '7.1.7'
+  versions['Flipper-Folly'] ||= '2.6.7'
   versions['Flipper-Glog'] ||= '0.3.6'
-  versions['Flipper-PeerTalk'] ||= '~> 0.0.4'
-  versions['Flipper-RSocket'] ||= '~> 1.1'
+  versions['Flipper-PeerTalk'] ||= '0.0.4'
+  versions['Flipper-RSocket'] ||= '1.4.3'
+  versions['OpenSSL-Universal'] ||= '1.1.180'
   pod 'FlipperKit', versions['Flipper'], :configurations => configurations
   pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configurations => configurations
   pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configurations => configurations
@@ -83,7 +88,9 @@ def use_flipper!(versions = {}, configurations: ['Debug'])
   # List all transitive dependencies for FlipperKit pods
   # to avoid them being linked in Release builds
   pod 'Flipper', versions['Flipper'], :configurations => configurations
+  pod 'Flipper-Boost-iOSX', versions['Flipper-Boost-iOSX'], :configurations => configurations
   pod 'Flipper-DoubleConversion', versions['Flipper-DoubleConversion'], :configurations => configurations
+  pod 'Flipper-Fmt', versions['Flipper-Fmt'], :configurations => configurations
   pod 'Flipper-Folly', versions['Flipper-Folly'], :configurations => configurations
   pod 'Flipper-Glog', versions['Flipper-Glog'], :configurations => configurations
   pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configurations => configurations
@@ -96,6 +103,7 @@ def use_flipper!(versions = {}, configurations: ['Debug'])
   pod 'FlipperKit/FlipperKitHighlightOverlay', versions['Flipper'], :configurations => configurations
   pod 'FlipperKit/FlipperKitLayoutTextSearchable', versions['Flipper'], :configurations => configurations
   pod 'FlipperKit/FlipperKitNetworkPlugin', versions['Flipper'], :configurations => configurations
+  pod 'OpenSSL-Universal', versions['OpenSSL-Universal'], :configurations => configurations
 end
 
 def has_pod(installer, name)
@@ -146,55 +154,215 @@ def react_native_post_install(installer)
 end
 
 def use_react_native_codegen!(spec, options={})
-  # The path to react-native (e.g. react_native_path)
-  prefix = options[:path] ||= File.join(__dir__, "..")
+  return if ENV['DISABLE_CODEGEN'] == '1'
 
-  # The path to JavaScript files
-  srcs_dir = options[:srcs_dir] ||= File.join(prefix, "Libraries")
+  # The prefix to react-native
+  prefix = options[:react_native_path] ||= "../.."
 
   # Library name (e.g. FBReactNativeSpec)
-  codegen_modules_library_name = spec.name
-  codegen_modules_output_dir = options[:codegen_modules_output_dir] ||= File.join(prefix, "Libraries/#{codegen_modules_library_name}/#{codegen_modules_library_name}")
-
-  # Run the codegen as part of the Xcode build pipeline.
-  env_vars = "SRCS_DIR=#{srcs_dir}"
-  env_vars += " CODEGEN_MODULES_OUTPUT_DIR=#{codegen_modules_output_dir}"
-  if ENV['USE_FABRIC'] == '1'
-    # We use a different library name for components, as well as an additional set of files.
-    # Eventually, we want these to be part of the same library as #{codegen_modules_library_name} above.
-    codegen_components_library_name = "rncore"
-    codegen_components_output_dir = File.join(prefix, "ReactCommon/react/renderer/components/#{codegen_components_library_name}")
-    env_vars += " CODEGEN_COMPONENTS_OUTPUT_DIR=#{codegen_components_output_dir}"
+  library_name = options[:library_name] ||= "#{spec.name.gsub('_','-').split('-').collect(&:capitalize).join}Spec"
+
+  # Output dir, relative to podspec that invoked this method
+  output_dir = options[:output_dir] ||= "#{library_name}"
+  components_output_dir = "#{output_dir}/react/renderer/components/#{library_name}"
+
+  codegen_config = {
+    "modules" => {
+      :js_srcs_pattern => "Native*.js",
+      :generated_dir => output_dir,
+      :generated_files => [
+        "#{library_name}.h",
+        "#{library_name}-generated.mm"
+      ]
+    },
+    "components" => {
+      :js_srcs_pattern => "*NativeComponent.js",
+      :generated_dir => components_output_dir,
+      :generated_files => [
+        "ComponentDescriptors.h",
+        "EventEmitters.cpp",
+        "EventEmitters.h",
+        "Props.cpp",
+        "Props.h",
+        "RCTComponentViewHelpers.h",
+        "ShadowNodes.cpp",
+        "ShadowNodes.h"
+      ]
+    }
+  }
+
+  # The path to JavaScript files
+  js_srcs_dir = options[:js_srcs_dir] ||= "./"
+  library_type = options[:library_type]
+
+  if library_type
+    js_srcs_pattern = codegen_config[library_type][:js_srcs_pattern]
+  end
+
+  if library_type
+    generated_dirs = [ codegen_config[library_type][:generated_dir] ]
+    generated_files = codegen_config[library_type][:generated_files].map { |filename| "#{codegen_config[library_type][:generated_dir]}/#{filename}" }
+  else
+    generated_dirs = [ codegen_config["modules"][:generated_dir], codegen_config["components"][:generated_dir] ]
+    generated_files = codegen_config["modules"][:generated_files].map { |filename| "#{codegen_config["modules"][:generated_dir]}/#{filename}" }
+    generated_files = generated_files.concat(codegen_config["components"][:generated_files].map { |filename| "#{codegen_config["components"][:generated_dir]}/#{filename}" })
   end
+
+  if js_srcs_pattern
+    file_list = `find #{js_srcs_dir} -type f -name #{js_srcs_pattern}`.split("\n").sort
+    input_files = file_list.map { |filename| "${PODS_TARGET_SRCROOT}/#{filename}" }
+  else
+    input_files = [ js_srcs_dir ]
+  end
+
+  # Prepare filesystem by creating empty files that will be picked up as references by CocoaPods.
+  prepare_command = "mkdir -p #{generated_dirs.join(" ")} && touch -a #{generated_files.join(" ")}"
+  system(prepare_command) # Always run prepare_command when a podspec uses the codegen, as CocoaPods may skip invoking this command in certain scenarios. Replace with pre_integrate_hook after updating to CocoaPods 1.11
+  spec.prepare_command = prepare_command
+
   spec.script_phase = {
     :name => 'Generate Specs',
-    :input_files => [srcs_dir],
-    :output_files => ["$(DERIVED_FILE_DIR)/codegen-#{codegen_modules_library_name}.log"],
-    :script => "bash -c '#{env_vars} CODEGEN_MODULES_LIBRARY_NAME=#{codegen_modules_library_name} #{File.join(__dir__, "generate-specs.sh")}' | tee \"${SCRIPT_OUTPUT_FILE_0}\"",
+    :input_files => input_files, # This also needs to be relative to Xcode
+    :output_files => ["${DERIVED_FILE_DIR}/codegen-#{library_name}.log"].concat(generated_files.map { |filename| " ${PODS_TARGET_SRCROOT}/#{filename}"} ),
+    # The final generated files will be created when this script is invoked at Xcode build time.
+    :script => %{set -o pipefail
+set -e
+
+RN_DIR=$(cd "$\{PODS_TARGET_SRCROOT\}/#{prefix}" && pwd)
+
+GENERATED_SRCS_DIR="$\{DERIVED_FILE_DIR\}/generated/source/codegen"
+GENERATED_SCHEMA_FILE="$GENERATED_SRCS_DIR/schema.json"
+TEMP_OUTPUT_DIR="$GENERATED_SRCS_DIR/out"
+
+LIBRARY_NAME="#{library_name}"
+OUTPUT_DIR="$\{PODS_TARGET_SRCROOT\}/#{output_dir}"
+
+CODEGEN_REPO_PATH="$RN_DIR/packages/react-native-codegen"
+CODEGEN_NPM_PATH="$RN_DIR/../react-native-codegen"
+CODEGEN_CLI_PATH=""
+
+# Determine path to react-native-codegen
+if [ -d "$CODEGEN_REPO_PATH" ]; then
+  CODEGEN_CLI_PATH=$(cd "$CODEGEN_REPO_PATH" && pwd)
+elif [ -d "$CODEGEN_NPM_PATH" ]; then
+  CODEGEN_CLI_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." >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
+  exit 1
+fi
+
+find_node () {
+  source "$RN_DIR/scripts/find-node.sh"
+
+  NODE_BINARY="${NODE_BINARY:-$(command -v node || true)}"
+  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." >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
+    exit 1
+  fi
+}
+
+setup_dirs () {
+  set +e
+  rm -rf "$GENERATED_SRCS_DIR"
+  set -e
+
+  mkdir -p "$GENERATED_SRCS_DIR" "$TEMP_OUTPUT_DIR"
+
+  # Clear output files
+  > "${SCRIPT_OUTPUT_FILE_0}"
+}
+
+describe () {
+  printf "\\n\\n>>>>> %s\\n\\n\\n" "$1" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
+}
+
+buildCodegenCLI () {
+  if [ ! -d "$CODEGEN_CLI_PATH/lib" ]; then
+    describe "Building react-native-codegen package"
+    bash "$CODEGEN_CLI_PATH/scripts/oss/build.sh"
+  fi
+}
+
+generateCodegenSchemaFromJavaScript () {
+  describe "Generating codegen schema from JavaScript"
+
+  SRCS_PATTERN="#{js_srcs_pattern}"
+  SRCS_DIR="#{js_srcs_dir}"
+  if [ $SRCS_PATTERN ]; then
+    JS_SRCS=$(find "$\{PODS_TARGET_SRCROOT\}"/$SRCS_DIR -type f -name "$SRCS_PATTERN" -print0 | xargs -0)
+    echo "#{file_list}" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
+  else
+    JS_SRCS="$\{PODS_TARGET_SRCROOT\}/$SRCS_DIR"
+    echo "#{js_srcs_dir}" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
+  fi
+
+  "$NODE_BINARY" "$CODEGEN_CLI_PATH/lib/cli/combine/combine-js-to-schema-cli.js" "$GENERATED_SCHEMA_FILE" $JS_SRCS
+}
+
+generateCodegenArtifactsFromSchema () {
+  describe "Generating codegen artifacts from schema"
+  pushd "$RN_DIR" >/dev/null || exit 1
+    "$NODE_BINARY" "scripts/generate-specs-cli.js" ios "$GENERATED_SCHEMA_FILE" "$TEMP_OUTPUT_DIR" "$LIBRARY_NAME"
+  popd >/dev/null || exit 1
+}
+
+moveOutputs () {
+  mkdir -p "$OUTPUT_DIR"
+
+  # Copy all output to output_dir
+  cp -R "$TEMP_OUTPUT_DIR/" "$OUTPUT_DIR" || exit 1
+  echo "$LIBRARY_NAME output has been written to $OUTPUT_DIR:" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
+  ls -1 "$OUTPUT_DIR" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
+}
+
+main () {
+  setup_dirs
+  find_node
+  buildCodegenCLI
+  generateCodegenSchemaFromJavaScript
+  generateCodegenArtifactsFromSchema
+  moveOutputs
+}
+
+main "$@"
+echo 'Done.' >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
+    },
     :execution_position => :before_compile,
     :show_env_vars_in_log => true
   }
+end
+
+# This provides a post_install workaround for build issues related Xcode 12.5 and Apple Silicon (M1) machines.
+# Call this in the app's main Podfile's post_install hook.
+# See https://github.com/facebook/react-native/issues/31480#issuecomment-902912841 for more context.
+# Actual fix was authored by https://github.com/mikehardy.
+# New app template will call this for now until the underlying issue is resolved.
+def __apply_Xcode_12_5_M1_post_install_workaround(installer)
+  # Apple Silicon builds require a library path tweak for Swift library discovery to resolve Swift-related "symbol not found".
+  # Note: this was fixed via https://github.com/facebook/react-native/commit/eb938863063f5535735af2be4e706f70647e5b90
+  # Keeping this logic here but commented out for future reference.
+  #
+  # installer.aggregate_targets.each do |aggregate_target|
+  #   aggregate_target.user_project.native_targets.each do |target|
+  #     target.build_configurations.each do |config|
+  #       config.build_settings['LIBRARY_SEARCH_PATHS'] = ['$(SDKROOT)/usr/lib/swift', '$(inherited)']
+  #     end
+  #   end
+  #   aggregate_target.user_project.save
+  # end
 
-  # Since the generated files are not guaranteed to exist when CocoaPods is run, we need to create
-  # empty files to ensure the references are included in the resulting Pods Xcode project.
-  mkdir_command = "mkdir -p #{codegen_modules_output_dir}"
-  generated_filenames = [ "#{codegen_modules_library_name}.h", "#{codegen_modules_library_name}-generated.mm" ]
-  generated_files = generated_filenames.map { |filename| File.join(codegen_modules_output_dir, filename) }
-
-  if ENV['USE_FABRIC'] == '1'
-    mkdir_command += " #{codegen_components_output_dir}"
-    components_generated_filenames = [
-      "ComponentDescriptors.h",
-      "EventEmitters.cpp",
-      "EventEmitters.h",
-      "Props.cpp",
-      "Props.h",
-      "RCTComponentViewHelpers.h",
-      "ShadowNodes.cpp",
-      "ShadowNodes.h"
-    ]
-    generated_files = generated_files.concat(components_generated_filenames.map { |filename| File.join(codegen_components_output_dir, filename) })
+  # Flipper podspecs are still targeting an older iOS deployment target, and may cause an error like:
+  #   "error: thread-local storage is not supported for the current target"
+  # The most reliable known workaround is to bump iOS deployment target to match react-native (iOS 11 now).
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+      end
   end
 
-  spec.prepare_command = "#{mkdir_command} && touch #{generated_files.reduce() { |str, file| str + " " + file }}"
+  # But... doing so caused another issue in Flipper:
+  #   "Time.h:52:17: error: typedef redefinition with different types"
+  # We need to make a patch to RCT-Folly - set `__IPHONE_10_0` to our iOS target + 1.
+  # See https://github.com/facebook/flipper/issues/834 for more details.
+  `sed -i -e  $'s/__IPHONE_10_0/__IPHONE_12_0/' #{installer.sandbox.root}/RCT-Folly/folly/portability/Time.h`
 end

package/template/_flowconfig

@@ -23,11 +23,10 @@ node_modules/react-native/flow/
 [options]
 emoji=true
 
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
 exact_by_default=true
 
+format.bracket_spacing=false
+
 module.file_ext=.js
 module.file_ext=.json
 module.file_ext=.ios.js
@@ -63,4 +62,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.143.1
+^0.160.2

package/template/_gitignore

@@ -28,6 +28,7 @@ build/
 .gradle
 local.properties
 *.iml
+*.hprof
 
 # node.js
 #

package/template/android/app/build.gradle

@@ -120,16 +120,16 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
+/**
+ * Architectures to build native code for in debug.
+ */
+def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
+
 android {
     ndkVersion rootProject.ext.ndkVersion
 
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     defaultConfig {
         applicationId "com.helloworld"
         minSdkVersion rootProject.ext.minSdkVersion
@@ -156,6 +156,11 @@ android {
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
+            if (nativeArchitectures) {
+                ndk {
+                    abiFilters nativeArchitectures.split(',')
+                }
+            }
         }
         release {
             // Caution! In production, you need to generate your own keystore file.
@@ -191,7 +196,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-      exclude group:'com.facebook.fbjni'
+        exclude group:'com.facebook.fbjni'
     }
 
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
@@ -215,7 +220,7 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
     into 'libs'
 }
 

package/template/android/app/src/main/res/values/styles.xml

@@ -3,7 +3,6 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="android:textColor">#000000</item>
     </style>
 
 </resources>

package/template/android/build.gradle

@@ -2,18 +2,18 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "29.0.3"
+        buildToolsVersion = "30.0.2"
         minSdkVersion = 21
-        compileSdkVersion = 29
-        targetSdkVersion = 29
-        ndkVersion = "20.1.5948944"
+        compileSdkVersion = 30
+        targetSdkVersion = 30
+        ndkVersion = "21.4.7075529"
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.1.0")
+        classpath("com.android.tools.build:gradle:4.2.2")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -21,7 +21,7 @@ buildscript {
 
 allprojects {
     repositories {
-        mavenLocal()
+        mavenCentral()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url("$rootDir/../node_modules/react-native/android")
@@ -32,7 +32,6 @@ allprojects {
         }
 
         google()
-        jcenter()
         maven { url 'https://www.jitpack.io' }
     }
 }

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

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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.99.0

package/template/ios/HelloWorld.xcodeproj/project.pbxproj

@@ -435,6 +435,7 @@
 					"$(inherited)",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"\"$(SDKROOT)/usr/lib/swift\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
@@ -492,6 +493,7 @@
 					"$(inherited)",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"\"$(SDKROOT)/usr/lib/swift\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",

package/template/ios/Podfile

@@ -25,5 +25,6 @@ target 'HelloWorld' do
 
   post_install do |installer|
     react_native_post_install(installer)
+    __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
 end

package/template/package.json

@@ -10,8 +10,8 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "react": "17.0.1",
-    "react-native": "0.0.0-201c10733"
+    "react": "17.0.2",
+    "react-native": "0.0.0-268efb102"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
@@ -20,9 +20,8 @@
     "babel-jest": "^26.6.3",
     "eslint": "7.14.0",
     "jest": "^26.6.3",
-    "metro-react-native-babel-preset": "^0.64.0",
-    "react-native-codegen": "^0.0.6",
-    "react-test-renderer": "17.0.1"
+    "metro-react-native-babel-preset": "^0.66.2",
+    "react-test-renderer": "17.0.2"
   },
   "jest": {
     "preset": "react-native"

package/third-party-podspecs/DoubleConversion.podspec

@@ -21,6 +21,6 @@ Pod::Spec.new do |spec|
   spec.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/DoubleConversion\"" }
 
   # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => "10.0" }
+  spec.platforms = { :ios => "11.0" }
 
 end

package/third-party-podspecs/RCT-Folly.podspec

@@ -3,27 +3,32 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
+folly_release_version = '2021.06.28.00'
+
 Pod::Spec.new do |spec|
   spec.name = 'RCT-Folly'
-  spec.version = '2020.01.13.00'
+  # Patched to v2 to address https://github.com/react-native-community/releases/issues/251
+  spec.version = folly_release_version + '-v2'
   spec.license = { :type => 'Apache License, Version 2.0' }
   spec.homepage = 'https://github.com/facebook/folly'
   spec.summary = 'An open-source C++ library developed and used at Facebook.'
   spec.authors = 'Facebook'
   spec.source = { :git => 'https://github.com/facebook/folly.git',
-                  :tag => "v#{spec.version}" }
+                  :tag => "v#{folly_release_version}" }
   spec.module_name = 'folly'
   spec.header_mappings_dir = '.'
-  spec.dependency 'boost-for-react-native'
+  spec.dependency 'boost'
   spec.dependency 'DoubleConversion'
   spec.dependency 'glog'
-  spec.compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_PTHREAD=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation'
+  spec.dependency 'fmt' , '~> 6.2.1'
+  spec.compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_PTHREAD=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-documentation -faligned-new'
   spec.source_files = 'folly/String.cpp',
                       'folly/Conv.cpp',
                       'folly/Demangle.cpp',
                       'folly/FileUtil.cpp',
                       'folly/Format.cpp',
                       'folly/lang/SafeAssert.cpp',
+                      'folly/lang/ToAscii.cpp',
                       'folly/ScopeGuard.cpp',
                       'folly/Unicode.cpp',
                       'folly/dynamic.cpp',
@@ -35,9 +40,12 @@ Pod::Spec.new do |spec|
                       'folly/hash/SpookyHashV2.cpp',
                       'folly/lang/Assume.cpp',
                       'folly/lang/CString.cpp',
+                      'folly/lang/Exception.cpp',
                       'folly/memory/detail/MallocImpl.cpp',
                       'folly/net/NetOps.cpp',
                       'folly/portability/SysUio.cpp',
+                      'folly/system/ThreadId.h',
+                      'folly/system/ThreadId.cpp',
                       'folly/*.h',
                       'folly/container/*.h',
                       'folly/container/detail/*.h',
@@ -64,13 +72,13 @@ Pod::Spec.new do |spec|
                         'folly/net/*.h',
                         'folly/net/detail/*.h',
                         'folly/portability/*.h'
-  spec.libraries           = "stdc++"
+  spec.libraries           = "stdc++", "c++abi" # NOTE Apple-only: Keep c++abi here due to https://github.com/react-native-community/releases/issues/251
   spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include/\"" }
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include/\"" }
 
   # TODO: The boost spec should really be selecting these files so that dependents of Folly can also access the required headers.
-  spec.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\"" }
+  spec.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"" }
 
   spec.default_subspec = 'Default'
 
@@ -84,6 +92,7 @@ Pod::Spec.new do |spec|
                           'folly/detail/Futex.cpp',
                           'folly/synchronization/ParkingLot.cpp',
                           'folly/portability/Malloc.cpp'
+
     fabric.preserve_paths = 'folly/concurrency/CacheLocality.h',
                             'folly/synchronization/ParkingLot.h',
                             'folly/synchronization/SanitizeThread.h',
@@ -102,16 +111,27 @@ Pod::Spec.new do |spec|
                            'folly/system/{ThreadId,ThreadName,HardwareConcurrency}.{h,cpp}',
                            'folly/synchronization/*.{h,cpp}',
                            'folly/synchronization/detail/*.{h,cpp}',
+                           'folly/Try.cpp',
+                           'folly/concurrency/CacheLocality.cpp',
                            'folly/experimental/{ExecutionObserver,ReadMostlySharedPtr,SingleWriterFixedHashMap,TLRefCount}.{h,cpp}',
-                           'folly/io/async/{AsyncTimeout,DelayedDestruction,DelayedDestructionBase,EventBase,EventBaseManager,EventBaseBackendBase,EventHandler,EventUtil,HHWheelTimer,HHWheelTimer-fwd,NotificationQueue,Request,TimeoutManager,VirtualEventBase}.{h,cpp}',
+                           'folly/io/async/{AtomicNotificationQueue,AtomicNotificationQueue-inl,AsyncTimeout,DelayedDestruction,DelayedDestructionBase,EventBase,EventBaseLocal,EventBaseManager,EventBaseAtomicNotificationQueue,EventBaseAtomicNotificationQueue-inl,EventBaseBackendBase,EventHandler,EventUtil,HHWheelTimer,HHWheelTimer-fwd,NotificationQueue,Request,TimeoutManager,VirtualEventBase}.{h,cpp}',
                            'folly/io/{Cursor,Cursor-inl,IOBuf,IOBufQueue}.{h,cpp}',
                            'folly/tracing/StaticTracepoint.{h,cpp}',
-                           'folly/{Executor,ExceptionWrapper,ExceptionWrapper-inl,FileUtil,Singleton,SharedMutex}.{h,cpp}',
+                           'folly/tracing/AsyncStack.{h,cpp}',
+                           'folly/tracing/AsyncStack-inl.h',
+                           'folly/{Executor,ExceptionString,ExceptionWrapper,ExceptionWrapper-inl,FileUtil,Singleton,SharedMutex}.{h,cpp}',
                            'folly/detail/{AsyncTrace,AtFork,Futex,Futex-inl,MemoryIdler,SingletonStackTrace,StaticSingletonManager,ThreadLocalDetail}.{h,cpp}',
                            'folly/lang/SafeAssert.{h,cpp}',
                            'folly/memory/MallctlHelper.{h,cpp}',
                            'folly/portability/{GFlags,SysUio}.{h,cpp}',
-                           'folly/chrono/Hardware.{h,cpp}'
+                           'folly/portability/SysMembarrier.cpp',
+                           'folly/chrono/Hardware.{h,cpp}',
+                           'folly/experimental/coro/Traits.{h,cpp}',
+                           'folly/fibers/*.{h,cpp}',
+                           'folly/experimental/coro/Coroutine.{h,cpp}',
+                           'folly/fibers/Baton-inl.h',
+                           'folly/experimental/**/*.h',
+                           'folly/system/Pid.{h,cpp}'
                           # TODO: Perhaps some of the wildcards above can be further trimmed down with some of these:
                           #
                           #  'folly/executors/{DrivableExecutor,InlineExecutor,QueuedImmediateExecutor,TimedDrivableExecutor}.{h,cpp}',