Merge branch 'main' into fix-non-ascii-header-value

.circleci/Dockerfiles/Dockerfile.android

@@ -14,7 +14,7 @@
 # and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
-FROM reactnativecommunity/react-native-android:5.4
+FROM reactnativecommunity/react-native-android:6.0
 
 LABEL Description="React Native Android Test Image"
 LABEL maintainer="Héctor Ramos <hector@fb.com>"

.circleci/config.yml

@@ -102,7 +102,7 @@ executors:
   reactnativeandroid:
     <<: *defaults
     docker:
-      - image: reactnativecommunity/react-native-android:5.4
+      - image: reactnativecommunity/react-native-android:6.0
     resource_class: "xlarge"
     environment:
       - TERM: "dumb"
@@ -132,10 +132,7 @@ commands:
         type: string
     steps:
       - restore_cache:
-            keys:
-              - << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
-              - << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-
-              - << parameters.checkout_base_cache_key >>-{{ arch }}-
+          key: << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
       - checkout
       - save_cache:
           key: << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
@@ -669,10 +666,6 @@ jobs:
             buck build ReactAndroid/src/main/java/com/facebook/react
             buck build ReactAndroid/src/main/java/com/facebook/react/shell
 
-      - run:
-          name: Validate Android Test Environment
-          command: ./scripts/validate-android-test-env.sh
-
       - run:
           name: Run Tests - Android Unit Tests with Buck
           command: buck test ReactAndroid/src/test/... --config build.threads=$BUILD_THREADS --xml ./reports/buck/all-results-raw.xml
@@ -718,10 +711,6 @@ jobs:
       - setup_artifacts
       - run_yarn
 
-      - run:
-          name: Validate Android SDK Install
-          command: ./scripts/validate-android-sdk.sh
-
       # Starting emulator in advance as it takes some time to boot.
       - run:
           name: Create Android Virtual Device
@@ -768,9 +757,11 @@ jobs:
         description: The Android build type. Must be one of "Debug", "Release".
         type: enum
         enum: ["Debug", "Release"]
-      newarchitecture:
-        type: boolean
-        default: false
+      architecture:
+        default: "OldArch"
+        description: Which React Native architecture to use. Must be one of "NewArch", "OldArch".
+        type: enum
+        enum: [ "NewArch", "OldArch" ]
       jsengine:
         default: "Hermes"
         description: Which JavaScript engine to use. Must be one of "Hermes", "JSC".
@@ -783,17 +774,6 @@ jobs:
       - run_yarn
       - attach_workspace:
           at: .
-      - when:
-          condition:
-            equal: ["JSC", << parameters.jsengine >>]
-          steps:
-            - run:
-                name: Set enableHermes in buld.gradle to false
-                command: |
-                  node ./scripts/set-rn-engine.js -e jsc
-                  echo "Hermes disabled."
-                  grep enableHermes: template/android/app/build.gradle
-
       - run:
           name: Create Android template project
           command: |
@@ -804,8 +784,20 @@ jobs:
             yarn
 
       - run:
-          name: Build the template application for << parameters.flavor >> with New Architecture set to << parameters.newarchitecture >>, and using the << parameters.jsengine>> JS engine.
-          command: cd /tmp/$PROJECT_NAME/android/ && ./gradlew assemble<< parameters.flavor >> -PnewArchEnabled=<< parameters.newarchitecture >>
+          name: Build the template application for << parameters.flavor >> with Architecture set to << parameters.architecture >>, and using the << parameters.jsengine>> JS engine.
+          command: |
+            cd /tmp/$PROJECT_NAME/android/
+            if [[ << parameters.architecture >> == "NewArch" ]]; then
+              export ORG_GRADLE_PROJECT_newArchEnabled=true
+            else
+              export ORG_GRADLE_PROJECT_newArchEnabled=false
+            fi
+            if [[ << parameters.jsengine >> == "Hermes" ]]; then
+              export ORG_GRADLE_PROJECT_hermesEnabled=true
+            else
+              export ORG_GRADLE_PROJECT_hermesEnabled=false
+            fi
+            ./gradlew assemble<< parameters.flavor >> -PREACT_NATIVE_MAVEN_LOCAL_REPO=/root/react-native/maven-local
 
   # -------------------------
   #    JOBS: Test iOS Template
@@ -1443,6 +1435,15 @@ jobs:
           command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
       - store_artifacts:
           path: /tmp/hermes-native-symbols.zip
+      - run:
+          name: Zip Maven Artifacts from /tmp/maven-local
+          command: zip -r /tmp/maven-local.zip /tmp/maven-local
+      - store_artifacts:
+          path: /tmp/maven-local.zip
+      - persist_to_workspace:
+          root: /tmp
+          paths:
+            - maven-local
 
       # START: Commitlies
       # Provide a react-native package for this commit as a Circle CI release artifact.
@@ -1491,43 +1492,6 @@ jobs:
                     -d "{\"event_type\": \"publish\", \"client_payload\": { \"version\": \"${CIRCLE_TAG:1}\" }}"
       # END: Stable releases
 
-      # START: Stables and commitlies
-      - when:
-          condition:
-            or:
-              - equal: [ "release", << parameters.release_type >> ]
-              - equal: [ "dry-run", << parameters.release_type >> ]
-          steps:
-            - run:
-                name: Install dependencies
-                command: apt update && apt install -y jq jo
-            - run:
-                name: Create draft GitHub Release and upload Hermes binaries
-                command: |
-                  RELEASE_VERSION=$(cat build/.version)
-                  if [[ << parameters.release_type >> == "release" ]]; then
-                    GIT_TAG=$CIRCLE_TAG
-                  elif [[ << parameters.release_type >> == "dry-run" ]]; then
-                    GIT_TAG=v1000.0.0
-                  fi
-
-                  ARTIFACTS=("")
-                  for build_type in "Debug" "Release"; do
-                    TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js \
-                      --buildType $build_type \
-                      --releaseVersion $RELEASE_VERSION)
-
-                    ARTIFACTS+=("$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME")
-                  done
-
-                  ./scripts/circleci/create_github_release.sh \
-                    << parameters.release_type >> \
-                    $GIT_TAG \
-                    $RELEASE_VERSION \
-                    $GITHUB_TOKEN \
-                    "${ARTIFACTS[@]}"
-      # END: Stable and commitlies
-
   # -------------------------
   #    JOBS: Nightly
   # -------------------------
@@ -1599,7 +1563,7 @@ workflows:
             - build_npm_package
           matrix:
             parameters:
-              newarchitecture: [true, false]
+              architecture: ["NewArch", "OldArch"]
               jsengine: ["Hermes", "JSC"]
               flavor: ["Debug", "Release"]
       - test_buck

.flowconfig

@@ -32,7 +32,6 @@ flow/
 emoji=true
 
 exact_by_default=true
-exact_empty_objects=true
 
 format.bracket_spacing=false
 
@@ -74,4 +73,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.190.1
+^0.192.0

.flowconfig.android

@@ -32,7 +32,6 @@ flow/
 emoji=true
 
 exact_by_default=true
-exact_empty_objects=true
 
 format.bracket_spacing=false
 
@@ -74,4 +73,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.190.1
+^0.192.0

.gitignore

@@ -122,6 +122,7 @@ package-lock.json
 /sdks/download
 /sdks/hermes
 /sdks/hermesc
+/sdks/hermes-engine/build_host_hermesc
 
 # Visual studio
 .vscode

BUCK

@@ -10,6 +10,9 @@ load(
 )
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "CXX",
     "HERMES_BYTECODE_VERSION",
     "IOS",
     "RCT_IMAGE_DATA_DECODER_SOCKET",
@@ -197,7 +200,6 @@ rn_xplat_cxx_library2(
     visibility = ["PUBLIC"],
     deps = [
         "//xplat/folly:dynamic",
-        react_native_xplat_target("jserrorhandler:jserrorhandler"),
     ],
 )
 
@@ -743,6 +745,7 @@ rn_library(
         "//xplat/js:node_modules__abort_19controller",
         "//xplat/js:node_modules__anser",
         "//xplat/js:node_modules__base64_19js",
+        "//xplat/js:node_modules__deprecated_19react_19native_19prop_19types",
         "//xplat/js:node_modules__event_19target_19shim",
         "//xplat/js:node_modules__invariant",
         "//xplat/js:node_modules__memoize_19one",
@@ -1453,3 +1456,28 @@ rn_xplat_cxx_library2(
         "//fbobjc/VendorLib/react-native-maps:react-native-maps",
     ],
 )
+
+rn_xplat_cxx_library2(
+    name = "RCTWebPerformance",
+    srcs = glob([
+        "Libraries/WebPerformance/**/*.cpp",
+    ]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [("Libraries/WebPerformance", "*.h")],
+        prefix = "RCTWebPerformance",
+    ),
+    fbandroid_compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+    ],
+    labels = [
+        "depslint_never_remove",
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+    ],
+    platforms = (ANDROID, APPLE, CXX),
+    visibility = ["PUBLIC"],
+    deps = [
+        ":FBReactNativeSpecJSI",
+    ],
+)

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## v0.70.5
+
+### Fixed
+
+- Force dependencies resolution to minor series for 0.70 ([59407a4d34](https://github.com/facebook/react-native/commit/59407a4d3442dddb7f4c29049bf56bbc345f950f) by [@cortinico](https://github.com/cortinico))
+
+## v0.70.4
+
+### Changed
+
+- Bump CLI to 9.2.1 ([a24c8946e0](https://github.com/facebook/react-native/commit/a24c8946e065ca89048e574abd7c2dc0434a350b) by [@kelset](https://github.com/kelset))
+- Bump react-native-codegen to 0.70.6 ([866021b58c](https://github.com/facebook/react-native/commit/866021b58c28a1f1c394294ddc4ed69d4ecef10a) by [@dmytrorykun](https://github.com/dmytrorykun))
+
+### Fixed
+
+- Load react-native.config.js from correct path during codegen ([74fda10702](https://github.com/facebook/react-native/commit/74fda1070266df13e1b58680a670dde3acf9d205) by [@krystofwoldrich](https://github.com/krystofwoldrich))
+
+#### iOS specific
+
+- Fix error in the Codegen template for ThirdPartyFabricComponentsProvider ([2f6b2127d9](https://github.com/facebook/react-native/commit/2f6b2127d933094f864523749d13cfbb140b5b63) by [@gispada](https://github.com/gispada))
+- Center text if line height isn't 0 ([70cc27c901](https://github.com/facebook/react-native/commit/70cc27c901aeb447910e30ac3ceac85990d3c16d) by [@sammy-SC](https://github.com/sammy-SC))
+
 ## v0.70.3
 
 ### Fixed
@@ -251,6 +273,12 @@
 - Add GitHub token permissions for workflows ([3da3d82320](https://github.com/facebook/react-native/commit/3da3d82320bd035c6bd361a82ea12a70dba4e851) by [@varunsh-coder](https://github.com/varunsh-coder))
 - Bump RCT-Folly to 2021-07-22 ([68f3a42fc7](https://github.com/facebook/react-native/commit/68f3a42fc7380051714253f43b42175de361f8bd) by [@luissantana](https://github.com/luissantana))
 
+## v0.69.7
+
+### Fixed
+
+- Force dependencies resolution to minor series for 0.69 ([c4da74c463](https://github.com/facebook/react-native/commit/c4da74c4636cbbd6bbf681d39a8a8cca49f11f56) by [@Titozzz](https://github.com/Titozzz))
+
 ## v0.69.6
 
 ### Changed
@@ -545,6 +573,12 @@
 
 - Encode URL params in URLSearchParams.toString() ([1042a8012f](https://github.com/facebook/react-native/commit/1042a8012fb472bd5c882b469fe507dd6279d562) by [@sshic](https://github.com/sshic))
 
+## v0.68.5
+
+### Fixed
+
+- Force dependencies resolution to minor series for 0.68 ([edcb3ca996](https://github.com/facebook/react-native/commit/edcb3ca996fb3296762af300a36c1d46356f1b24) by [@Titozzz](https://github.com/Titozzz))
+
 ## v0.68.4
 
 ### Changed
@@ -807,6 +841,13 @@
 
 - Remove RCTUIManagerObserver from RCTNativeAnimatedTurboModule ([e9ed115bab](https://github.com/facebook/react-native/commit/e9ed115babbc82968380dae22fa928d4ce3cd6da) by [@p-sun](https://github.com/p-sun))
 
+## v0.67.5
+
+🚨 **IMPORTANT:** This is an exceptional release on an unsupported version. We recommend you upgrade to one of [the supported versions, listed here](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported).
+
+### Fixed
+
+- Force dependencies resolution to minor series for 0.67 ([9f2acda1b8](https://github.com/facebook/react-native/commit/9f2acda1b807e790b3e7562ce3436b93bcc2ad09) by [@cortinico](https://github.com/cortinico))
 
 ## v0.67.4
 
@@ -949,6 +990,14 @@
 
 - Avoiding logging root view params outside of dev / debug mode builds ([e612d3a116](https://github.com/facebook/react-native/commit/e612d3a116f39ab354169643bab0d4bb9cfc1a85) by [@sterlingwes](https://github.com/sterlingwes))
 
+## v0.66.5
+
+🚨 **IMPORTANT:** This is an exceptional release on an unsupported version. We recommend you upgrade to one of [the supported versions, listed here](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported).
+
+### Fixed
+
+- Force dependencies resolution to minor series for 0.66 ([201824c89e](https://github.com/facebook/react-native/commit/201824c89ecebd749ba7e603415edbe6a5b9b73d) by [@cortinico](https://github.com/cortinico))
+
 ## v0.66.4
 
 ### Fixed
@@ -1119,6 +1168,14 @@
 - <TextInput> content is reset when emoji is entered at the max length ([f3b8d4976f](https://github.com/facebook/react-native/commit/f3b8d4976f8608c2cda1f071923f14b6d4538967))
 - Use `actionName` in accessibility event callback ([fed6ad5bad](https://github.com/facebook/react-native/commit/fed6ad5badb4196a1895370fc81c522572cb34b4) by [@ShikaSD](https://github.com/ShikaSD))
 
+## v0.65.3
+
+🚨 **IMPORTANT:** This is an exceptional release on an unsupported version. We recommend you upgrade to one of [the supported versions, listed here](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported).
+
+### Fixed
+
+- Force dependencies resolution to minor series for 0.65 ([9548eaea74](https://github.com/facebook/react-native/commit/9548eaea74c6ad242c015d1984503c4b7eb19b6f) by [@kelset](https://github.com/kelset))
+
 ## v0.65.2
 
 ### Fixed
@@ -1358,6 +1415,15 @@
 - Fix builds on Xcode 12.5 ([36b58a824e](https://github.com/facebook/react-native/commit/36b58a824ea20daa22fe7c528a3bf0ff4e6a4cb5) by [@PeteTheHeat](https://github.com/PeteTheHeat))
 - Fix running React Native project with Xcode 12 in Release on iPhone Simulator ([fdcacd7f76](https://github.com/facebook/react-native/commit/fdcacd7f76ea8ca6dafda32ac431c8adc7bdad00) by [@grabbou](https://github.com/grabbou))
 
+## v0.64.4
+
+🚨 **IMPORTANT:** This is an exceptional release on an unsupported version. We recommend you upgrade to one of [the supported versions, listed here](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported).
+
+### Fixed
+
+- Add an afterEvaluate to solve AGP 4.1.x configuration resolution ([667f1bd21a](https://github.com/facebook/react-native/commit/667f1bd21abfdda19e56f8bbf0520fddba3102ed) by [@cortinico](https://github.com/cortinico))
+- Force dependencies resolution to minor series for 0.64 ([a6a183ad81](https://github.com/facebook/react-native/commit/a6a183ad8106d67e3befce842138e82fb1e136fd) by [@kelset](https://github.com/kelset))
+
 ## v0.64.3
 
 ### Fixed
@@ -1621,6 +1687,15 @@
 - Fix crash inside RCTRedBox when trying to present same UIViewController twice ([46c77dc296](https://github.com/facebook/react-native/commit/46c77dc296dfab754356cd9346a01dae8d4869f4) by [@sammy-SC](https://github.com/sammy-SC))
 - Fix outdated CocoaPods version requirement in a React.podspec ([8a6ac1fef3](https://github.com/facebook/react-native/commit/8a6ac1fef369071405a3bf14a89924c66f28d192) by [@sunnylqm](https://github.com/sunnylqm))
 
+## v0.63.5
+
+🚨 **IMPORTANT:** This is an exceptional release on an unsupported version. We recommend you upgrade to one of [the supported versions, listed here](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported).
+
+### Fixed
+
+- Add an afterEvaluate to solve AGP 3.x configuration resolution ([473a36099c](https://github.com/facebook/react-native/commit/473a36099c80de08591e3cb51687f7d531145ee3) by [@cortinico](https://github.com/cortinico))
+- Force dependencies resolution to minor series for 0.63 ([28cc286cc4](https://github.com/facebook/react-native/commit/28cc286cc4d43b9fe5153d779ea3eecf4d72c51e) by [@cortinico](https://github.com/cortinico))
+
 ## v0.63.4
 
 ### Changed