react-native 0.69.0-rc.0 → 0.69.0-rc.3

package/android/com/facebook/react/react-native/{0.69.0-rc.0/react-native-0.69.0-rc.0.module → 0.69.0-rc.3/react-native-0.69.0-rc.3.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "com.facebook.react",
     "module": "react-native",
-    "version": "0.69.0-rc.0",
+    "version": "0.69.0-rc.3",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -146,13 +146,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.69.0-rc.0-debug.aar",
-          "url": "react-native-0.69.0-rc.0-debug.aar",
-          "size": 34714528,
-          "sha512": "30faeba0bc2fda6f1a4a632075a15201d989adbd9923d42790b82b19a8034a8b923eede616e043863503f3835b8ac078f17c7c3fef00d24a95a8838ff3327f2f",
-          "sha256": "1d6ddcfc314a8a21bad5ff8c3dc07ff3889802303a291149d172fee0668cd762",
-          "sha1": "7ef1109a7e7f05fc3722ae4c4780911b4e218016",
-          "md5": "3e6165f97bc8976b2e9d21ae8d8666c0"
+          "name": "react-native-0.69.0-rc.3-debug.aar",
+          "url": "react-native-0.69.0-rc.3-debug.aar",
+          "size": 34959425,
+          "sha512": "e70e13b01b11750346a012511e9d4c15297d1a97afa47cc9ec8d8efa5b360fb050318ce53844f741f62d365497cbd747cdb6eb27db49e0af0fa70d6deac0cda6",
+          "sha256": "c7ddacc99914b6c4e0db4761fefce8ff64b867c08ac419f2ed3fec61c824f3e3",
+          "sha1": "8c45b9218d3c245003262b5f8d6c27b46c0aaf0d",
+          "md5": "16a69b9c97c483f304c89c6e33fe15b2"
         }
       ]
     },
@@ -288,13 +288,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.69.0-rc.0-debug.aar",
-          "url": "react-native-0.69.0-rc.0-debug.aar",
-          "size": 34714528,
-          "sha512": "30faeba0bc2fda6f1a4a632075a15201d989adbd9923d42790b82b19a8034a8b923eede616e043863503f3835b8ac078f17c7c3fef00d24a95a8838ff3327f2f",
-          "sha256": "1d6ddcfc314a8a21bad5ff8c3dc07ff3889802303a291149d172fee0668cd762",
-          "sha1": "7ef1109a7e7f05fc3722ae4c4780911b4e218016",
-          "md5": "3e6165f97bc8976b2e9d21ae8d8666c0"
+          "name": "react-native-0.69.0-rc.3-debug.aar",
+          "url": "react-native-0.69.0-rc.3-debug.aar",
+          "size": 34959425,
+          "sha512": "e70e13b01b11750346a012511e9d4c15297d1a97afa47cc9ec8d8efa5b360fb050318ce53844f741f62d365497cbd747cdb6eb27db49e0af0fa70d6deac0cda6",
+          "sha256": "c7ddacc99914b6c4e0db4761fefce8ff64b867c08ac419f2ed3fec61c824f3e3",
+          "sha1": "8c45b9218d3c245003262b5f8d6c27b46c0aaf0d",
+          "md5": "16a69b9c97c483f304c89c6e33fe15b2"
         }
       ]
     },
@@ -309,13 +309,13 @@
       },
       "files": [
         {
-          "name": "react-native-0.69.0-rc.0-debug-sources.jar",
-          "url": "react-native-0.69.0-rc.0-debug-sources.jar",
-          "size": 1027248,
-          "sha512": "7df65f56073978b197391e1cb40146a9a93e002b677e2b6ef28a58e30be86fe0ae3aac1222898abd450f4a55204f87326f68106b554aaab8fcaef57f65bf64df",
-          "sha256": "235c2d788cc0dd7b8bd30ed60cac607a7c2a0fc3c769b1a8cae28c2e89ef50d2",
-          "sha1": "9d0604a0585e185d7fb1777e743dd53aba23abce",
-          "md5": "10cb7014db8e8eeaf580794630359799"
+          "name": "react-native-0.69.0-rc.3-debug-sources.jar",
+          "url": "react-native-0.69.0-rc.3-debug-sources.jar",
+          "size": 1027249,
+          "sha512": "6c187a279fe015ea7ab49d05e24027aa57dbc3200d94ed65e2c6d2db8bf534cbf9184495ea1b66cda4a764268d6980acd363b276f8b8c50e9d0cc8f1e265f5ef",
+          "sha256": "f6bc600265c446623d13bf51e21c1fef4cc5ac49e44bfb3fbaf0d154ec4b544e",
+          "sha1": "669b81bcffd131d7dbc0acfb40c6a46cee76fd19",
+          "md5": "77b9955c8aaf52f495c274c66cf8c542"
         }
       ]
     },
@@ -330,13 +330,13 @@
       },
       "files": [
         {
-          "name": "react-native-0.69.0-rc.0-debug-javadoc.jar",
-          "url": "react-native-0.69.0-rc.0-debug-javadoc.jar",
-          "size": 3746221,
-          "sha512": "956d5b330a12ff4556ce975923b4504a49b327858de2a86927f9e9678226dfb2063da6c191eed900b00c0befa8df16a1cb17b037dbd34f574a2c29f2cb485421",
-          "sha256": "3d2108193adac905bee46d74bd08a6938a364025b1ebf648cf69b50ccbfa83b0",
-          "sha1": "8c4b8ff3d3cae309a3be760f33e20c545f9d0c17",
-          "md5": "970b3c53b0e148a1c883ec7cc55ae0df"
+          "name": "react-native-0.69.0-rc.3-debug-javadoc.jar",
+          "url": "react-native-0.69.0-rc.3-debug-javadoc.jar",
+          "size": 3746094,
+          "sha512": "41aaf880e4db9a533145a3fd2a28b276f6e739212430624fd92241a286ec4dfb4d8a27a4bf49c8e9d112d32d69fc75750b8f9f858754423e11fba3776ee79637",
+          "sha256": "515730ae2391bb73c97c1ce5e0e80d296dacb4612f35ec8cf709520b1fdab677",
+          "sha1": "20b8f15e6b9d6ea79b6a1db33c403bf5bee1b903",
+          "md5": "ee850144a923e4b09d3c9c7fc9836839"
         }
       ]
     },
@@ -472,13 +472,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.69.0-rc.0-release.aar",
-          "url": "react-native-0.69.0-rc.0-release.aar",
-          "size": 13256076,
-          "sha512": "ebcf700531ab4cf5cdcc2b23b0c470fce97a686ef4da08e4a55551e86f4f434f467b80da58c5e9ef9b16cee9911b32dc1c16cb700e9430bc846ee39f915a710b",
-          "sha256": "c20842c56857999d5f0068d07fbe01ccee7d976e3cf9c274b7e669d06d19893f",
-          "sha1": "d0f81f4283689c83d202049581de07f70863e1df",
-          "md5": "fe12fc024181eb8f0615c86e7177f2a7"
+          "name": "react-native-0.69.0-rc.3-release.aar",
+          "url": "react-native-0.69.0-rc.3-release.aar",
+          "size": 13343878,
+          "sha512": "530f8abc5d83e7c0e99c5891cac6542c16b5f2bfed6483d8a3d016a53026897aedca9741a155c45cae1e36aa9b40658c02d38fc737d27bda70775cff9efe82a1",
+          "sha256": "e9fe6a83d3015cb883ed4cd2cf28e74aa4bdda53f458bbb59fe8824f9fb6e549",
+          "sha1": "8eb6cb1eda86e51d12d9b888e4a5309f3644df08",
+          "md5": "7ccbcaa7f2fd257fa34f4fd820c52947"
         }
       ]
     },
@@ -614,13 +614,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.69.0-rc.0-release.aar",
-          "url": "react-native-0.69.0-rc.0-release.aar",
-          "size": 13256076,
-          "sha512": "ebcf700531ab4cf5cdcc2b23b0c470fce97a686ef4da08e4a55551e86f4f434f467b80da58c5e9ef9b16cee9911b32dc1c16cb700e9430bc846ee39f915a710b",
-          "sha256": "c20842c56857999d5f0068d07fbe01ccee7d976e3cf9c274b7e669d06d19893f",
-          "sha1": "d0f81f4283689c83d202049581de07f70863e1df",
-          "md5": "fe12fc024181eb8f0615c86e7177f2a7"
+          "name": "react-native-0.69.0-rc.3-release.aar",
+          "url": "react-native-0.69.0-rc.3-release.aar",
+          "size": 13343878,
+          "sha512": "530f8abc5d83e7c0e99c5891cac6542c16b5f2bfed6483d8a3d016a53026897aedca9741a155c45cae1e36aa9b40658c02d38fc737d27bda70775cff9efe82a1",
+          "sha256": "e9fe6a83d3015cb883ed4cd2cf28e74aa4bdda53f458bbb59fe8824f9fb6e549",
+          "sha1": "8eb6cb1eda86e51d12d9b888e4a5309f3644df08",
+          "md5": "7ccbcaa7f2fd257fa34f4fd820c52947"
         }
       ]
     },
@@ -635,13 +635,13 @@
       },
       "files": [
         {
-          "name": "react-native-0.69.0-rc.0-release-sources.jar",
-          "url": "react-native-0.69.0-rc.0-release-sources.jar",
-          "size": 1027230,
-          "sha512": "c20e5c1ccd0f9a14c6f0a048c85eb120ca21e50148c645941da4a673f2fe891fd2418501f07db4217b32f2527e4b4614564c9388c4d6af9df80769142a3e89d6",
-          "sha256": "720d44e43401f57ce6304c946f0e3c01df952bb8772a27f1ee3db6c8f2248cfd",
-          "sha1": "0b9b39e4a63b82c50d4675c7f716e5eefb698d57",
-          "md5": "239db3082048daaa9e7138d68e6e4890"
+          "name": "react-native-0.69.0-rc.3-release-sources.jar",
+          "url": "react-native-0.69.0-rc.3-release-sources.jar",
+          "size": 1027231,
+          "sha512": "9a8c45574b12b1eec9a196ed2cfcbd2521259c9f84046f8ab44e8929ba671f5909b6497fc1e00ee61301d3e69ac1b02b3002fe191e4dfd2fc2ae65fc3529e822",
+          "sha256": "d210dd4ae88e9b24a827437779f984f30cbf3192c88d063bc1c57ae89d7b85f8",
+          "sha1": "48855107612411463cfb40bcdaef4ae9e3606ac2",
+          "md5": "e7e8bde065242ff10b05821e926b7819"
         }
       ]
     },
@@ -656,13 +656,13 @@
       },
       "files": [
         {
-          "name": "react-native-0.69.0-rc.0-release-javadoc.jar",
-          "url": "react-native-0.69.0-rc.0-release-javadoc.jar",
-          "size": 3746664,
-          "sha512": "1037d8b0aea1fad0545cde0901e268017628031da50303ebc2db3533d636d45e418d4f967d9260f56c0c4eefdcd2d7e004b1415a8a57d0442a633b188e44b143",
-          "sha256": "75d9b7fee6c5161fd6ef134d27066f656a25f4e728eba042b56a861e3c812e36",
-          "sha1": "35b9ca0523e613b160bb0dd4e8c6b826a00836a2",
-          "md5": "f59cccdd978a4a9b6243701c8979c78d"
+          "name": "react-native-0.69.0-rc.3-release-javadoc.jar",
+          "url": "react-native-0.69.0-rc.3-release-javadoc.jar",
+          "size": 3745970,
+          "sha512": "0ea6a7e83a90c8b6066d02a2ac15efb67aa8ef9845dc2601de1b7dca1269a6f329881941edd05c3eeea14560a3d517c48902661bc5bfff1c69848f1addcc15ec",
+          "sha256": "16314469bfda7866337acc49dcadefaedc6c486c4e6cb1e7fbd1633f08ee0110",
+          "sha1": "e668c9c47519112fe5eb40dcf9ee7484ba9e4852",
+          "md5": "3d4e9750ae355b16db9945711f9d39ae"
         }
       ]
     }

package/android/com/facebook/react/react-native/0.69.0-rc.3/react-native-0.69.0-rc.3.module.md5

@@ -0,0 +1 @@
+4390721ef4e4dd87d5b0ad4d177b0864

package/android/com/facebook/react/react-native/0.69.0-rc.3/react-native-0.69.0-rc.3.module.sha1

@@ -0,0 +1 @@
+4d75693c732ebf3ed6a07fed2eba6172e644cb36

package/android/com/facebook/react/react-native/0.69.0-rc.3/react-native-0.69.0-rc.3.module.sha256

@@ -0,0 +1 @@
+61d3cfcd642b1451ce8695ae50936dc4997708381a2fc39de621ddf2b49285d7

package/android/com/facebook/react/react-native/0.69.0-rc.3/react-native-0.69.0-rc.3.module.sha512

@@ -0,0 +1 @@
+6a1b8c512b95d5c827ccd0310fb94ec01070167f8748f9daf172f31aa5cfb6a1cd1ca24eeee2661d507ec8a7515dbe42fff7dfa2e30c8683a9efc82c16c70d5e

package/android/com/facebook/react/react-native/{0.69.0-rc.0/react-native-0.69.0-rc.0.pom → 0.69.0-rc.3/react-native-0.69.0-rc.3.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.69.0-rc.0</version>
+  <version>0.69.0-rc.3</version>
   <packaging>pom</packaging>
   <name>ReactNative</name>
   <description>A framework for building native apps with React</description>

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

@@ -0,0 +1 @@
+c55bd3b6c66442a244981f8868caa467

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

@@ -0,0 +1 @@
+82ef457f3a65fd22e7638ff874f1304c88bda23f

package/android/com/facebook/react/react-native/0.69.0-rc.3/react-native-0.69.0-rc.3.pom.sha256

@@ -0,0 +1 @@
+990dfe43f1cb913798a5e6aea0b082a105d3f3577028169fe83d07495b2e3297

package/android/com/facebook/react/react-native/0.69.0-rc.3/react-native-0.69.0-rc.3.pom.sha512

@@ -0,0 +1 @@
+1cc1df0a4cdd6f65204f5db0447f98776719af56a6569d186a19ed8722472307125f11655bfc6fd60f9b49293ca8bbdfdb9b469748e5412c6f021ba218ba8b6e

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

@@ -3,11 +3,11 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <latest>0.69.0-rc.0</latest>
-    <release>0.69.0-rc.0</release>
+    <latest>0.69.0-rc.3</latest>
+    <release>0.69.0-rc.3</release>
     <versions>
-      <version>0.69.0-rc.0</version>
+      <version>0.69.0-rc.3</version>
     </versions>
-    <lastUpdated>20220428145644</lastUpdated>
+    <lastUpdated>20220524161304</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-c63b16d9cfb6ca7f0f03681ea82a26ff
+cd3a78ecc1a27e1a2aa0f3407173f29c

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

@@ -1 +1 @@
-61de3d39fa2f59dc4ba7bc81c1ff5f8457594aa8
+9c15a56439cb47032fa2e1e1c97f9fc74847e45d

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

@@ -1 +1 @@
-55b31b3efda72be6da5249379e267a6a8ce0876eda195c471728d8005c995835
+b289e87788eecdbd264a9cb3390697afd2ea97bf94d11043a2460d68c9041219

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

@@ -1 +1 @@
-98ba064d344290c8b4b3d94fd9ba992872b898269b904523ccaac8a9aec12e1c4e8f9893c468b3874ba27177634b6f2e4d1132c45c3bcc0146cac4ac0380c329
+a71b17a1e5f905d4cf2ebc5f3bd3f987844a3e5136613209501222089f19a6f489dd2387ff4909b431f67ba70c5f02b83261da33c92fde21cc09960040a4dd68

package/flow/{use-subscription.js → use-sync-external-store.js}

@@ -11,9 +11,9 @@
 
 'use strict';
 
-declare module 'use-subscription' {
-  declare export function useSubscription<Value>(subscription: {|
-    getCurrentValue: () => Value,
+declare module 'use-sync-external-store/shim' {
+  declare export function useSyncExternalStore<Value>(
     subscribe: (callback: Function) => () => void,
-  |}): Value;
+    getCurrentValue: () => Value,
+  ): Value;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.69.0-rc.0",
+  "version": "0.69.0-rc.3",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -52,6 +52,9 @@
     "scripts/react_native_pods_utils/script_phases.sh",
     "scripts/react_native_pods.rb",
     "scripts/react-native-xcode.sh",
+    "scripts/hermes/hermes-utils.js",
+    "scripts/hermes/prepare-hermes-for-build.js",
+    "sdks/hermes-engine",
     "sdks/hermesc",
     "template.config.js",
     "template",
@@ -89,9 +92,9 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^27.0.1",
-    "@react-native-community/cli": "^8.0.0-alpha.4",
-    "@react-native-community/cli-platform-android": "^8.0.0-alpha.3",
-    "@react-native-community/cli-platform-ios": "^8.0.0-alpha.3",
+    "@react-native-community/cli": "^8.0.0",
+    "@react-native-community/cli-platform-android": "^8.0.0",
+    "@react-native-community/cli-platform-ios": "^8.0.0",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
@@ -103,9 +106,10 @@
     "invariant": "^2.2.4",
     "jsc-android": "^250230.2.1",
     "memoize-one": "^5.0.0",
-    "metro-react-native-babel-transformer": "0.70.1",
-    "metro-runtime": "0.70.1",
-    "metro-source-map": "0.70.1",
+    "metro-react-native-babel-transformer": "0.70.3",
+    "metro-runtime": "0.70.3",
+    "metro-source-map": "0.70.3",
+    "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
@@ -115,16 +119,17 @@
     "react-shallow-renderer": "16.14.1",
     "regenerator-runtime": "^0.13.2",
     "scheduler": "^0.21.0",
+    "shelljs": "^0.8.5",
     "stacktrace-parser": "^0.1.3",
-    "use-subscription": ">=1.0.0 <1.6.0",
+    "use-sync-external-store": "^1.0.0",
     "whatwg-fetch": "^3.0.0",
     "ws": "^6.1.4",
-    "react-native-codegen": "^0.0.15"
+    "react-native-codegen": "^0.69.1"
   },
   "devDependencies": {
     "flow-bin": "^0.176.3",
-    "react": "17.0.2",
-    "react-test-renderer": "17.0.2",
+    "react": "18.0.0",
+    "react-test-renderer": "18.0.0",
     "@babel/core": "^7.14.0",
     "@babel/generator": "^7.14.0",
     "@babel/plugin-transform-regenerator": "^7.0.0",
@@ -154,7 +159,7 @@
     "jest": "^26.6.3",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.13.1",
-    "metro-babel-register": "0.70.1",
+    "metro-babel-register": "0.70.3",
     "mkdirp": "^0.5.1",
     "prettier": "^2.4.1",
     "shelljs": "^0.8.5",

package/scripts/hermes/hermes-utils.js

@@ -0,0 +1,171 @@
+/**
+ * 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.
+ *
+ * @format
+ */
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const {echo, exec, exit} = require('shelljs');
+
+const SDKS_DIR = path.normalize(path.join(__dirname, '..', '..', 'sdks'));
+const HERMES_DIR = path.join(SDKS_DIR, 'hermes');
+const HERMES_TAG_FILE_PATH = path.join(SDKS_DIR, '.hermesversion');
+const HERMES_TARBALL_BASE_URL = 'https://github.com/facebook/hermes/tarball/';
+const HERMES_TARBALL_DOWNLOAD_DIR = path.join(SDKS_DIR, 'download');
+const MACOS_BIN_DIR = path.join(SDKS_DIR, 'hermesc', 'osx-bin');
+const MACOS_HERMESC_PATH = path.join(MACOS_BIN_DIR, 'hermesc');
+const MACOS_IMPORT_HERMESC_PATH = path.join(
+  MACOS_BIN_DIR,
+  'ImportHermesc.cmake',
+);
+
+function prepareFileSystem() {
+  if (!fs.existsSync(SDKS_DIR)) {
+    fs.mkdirSync(SDKS_DIR, {recursive: true});
+  }
+
+  if (!fs.existsSync(HERMES_DIR)) {
+    fs.mkdirSync(HERMES_DIR, {recursive: true});
+  }
+
+  if (!fs.existsSync(HERMES_TARBALL_DOWNLOAD_DIR)) {
+    fs.mkdirSync(HERMES_TARBALL_DOWNLOAD_DIR, {recursive: true});
+  }
+}
+
+function readHermesTag() {
+  if (fs.existsSync(HERMES_TAG_FILE_PATH)) {
+    const data = fs.readFileSync(HERMES_TAG_FILE_PATH, {
+      encoding: 'utf8',
+      flag: 'r',
+    });
+    return data.trim();
+  } else {
+    return 'main';
+  }
+}
+
+function setHermesTag(hermesTag) {
+  if (readHermesTag() === hermesTag) {
+    // No need to update.
+    return;
+  }
+
+  prepareFileSystem();
+
+  fs.writeFileSync(HERMES_TAG_FILE_PATH, hermesTag.trim());
+  console.log('Hermes tag has been updated. Please commit your changes.');
+}
+
+function getHermesTagSHA(hermesTag) {
+  return exec(
+    `git ls-remote https://github.com/facebook/hermes ${hermesTag} | cut -f 1`,
+    {silent: true},
+  ).trim();
+}
+
+function getHermesTarballDownloadPath(hermesTag) {
+  const hermesTagSHA = getHermesTagSHA(hermesTag);
+  return `${HERMES_TARBALL_DOWNLOAD_DIR}/hermes-${hermesTagSHA}.tgz`;
+}
+
+function downloadHermesTarball() {
+  const hermesTag = readHermesTag();
+  const hermesTagSHA = getHermesTagSHA(hermesTag);
+  const hermesTarballDownloadPath = getHermesTarballDownloadPath(hermesTag);
+  let hermesTarballUrl = HERMES_TARBALL_BASE_URL + hermesTag;
+
+  prepareFileSystem();
+
+  if (fs.existsSync(hermesTarballDownloadPath)) {
+    return;
+  }
+
+  echo(`[Hermes] Downloading Hermes source code for commit ${hermesTagSHA}`);
+  if (exec(`curl ${hermesTarballUrl} -Lo ${hermesTarballDownloadPath}`).code) {
+    echo('[Hermes] Failed to download Hermes tarball.');
+    exit(1);
+    return;
+  }
+}
+
+function expandHermesTarball() {
+  const hermesTag = readHermesTag();
+  const hermesTagSHA = getHermesTagSHA(hermesTag);
+  const hermesTarballDownloadPath = getHermesTarballDownloadPath(hermesTag);
+
+  prepareFileSystem();
+
+  if (!fs.existsSync(hermesTarballDownloadPath)) {
+    echo(
+      `[Hermes] Failed to expand Hermes tarball, no file found at ${hermesTarballDownloadPath}.`,
+    );
+    exit(1);
+    return;
+  }
+
+  echo(`[Hermes] Expanding Hermes tarball for commit ${hermesTagSHA}`);
+  if (
+    exec(
+      `tar -zxf ${hermesTarballDownloadPath} --strip-components=1 --directory ${HERMES_DIR}`,
+    ).code
+  ) {
+    echo('[Hermes] Failed to expand Hermes tarball.');
+    exit(1);
+    return;
+  }
+}
+
+function copyBuildScripts() {
+  fs.copyFileSync(
+    `${SDKS_DIR}/hermes-engine/hermes-engine.podspec`,
+    `${HERMES_DIR}/hermes-engine.podspec`,
+  );
+  fs.copyFileSync(
+    `${SDKS_DIR}/hermes-engine/utils/build-apple-framework.sh`,
+    `${HERMES_DIR}/utils/build-apple-framework.sh`,
+  );
+  fs.copyFileSync(
+    `${SDKS_DIR}/hermes-engine/utils/build-ios-framework.sh`,
+    `${HERMES_DIR}/utils/build-ios-framework.sh`,
+  );
+  fs.copyFileSync(
+    `${SDKS_DIR}/hermes-engine/utils/build-mac-framework.sh`,
+    `${HERMES_DIR}/utils/build-mac-framework.sh`,
+  );
+}
+
+function shouldUsePrebuiltHermesC(os) {
+  if (os === 'macos') {
+    return fs.existsSync(MACOS_HERMESC_PATH);
+  }
+
+  return false;
+}
+
+function configureMakeForPrebuiltHermesC() {
+  const IMPORT_HERMESC_TEMPLATE = `add_executable(native-hermesc IMPORTED)
+set_target_properties(native-hermesc PROPERTIES
+  IMPORTED_LOCATION "${MACOS_HERMESC_PATH}"
+  )`;
+
+  fs.mkdirSync(MACOS_BIN_DIR, {recursive: true});
+  fs.writeFileSync(MACOS_IMPORT_HERMESC_PATH, IMPORT_HERMESC_TEMPLATE);
+}
+
+module.exports = {
+  configureMakeForPrebuiltHermesC,
+  copyBuildScripts,
+  downloadHermesTarball,
+  expandHermesTarball,
+  getHermesTagSHA,
+  readHermesTag,
+  setHermesTag,
+  shouldUsePrebuiltHermesC,
+};

package/scripts/hermes/prepare-hermes-for-build.js

@@ -0,0 +1,31 @@
+/**
+ * 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.
+ *
+ * @format
+ */
+
+'use strict';
+
+/**
+ * This script prepares Hermes to be built as part of the
+ * iOS build pipeline on macOS.
+ */
+const {
+  configureMakeForPrebuiltHermesC,
+  copyBuildScripts,
+  downloadHermesTarball,
+  expandHermesTarball,
+  shouldUsePrebuiltHermesC,
+} = require('./hermes-utils');
+
+downloadHermesTarball();
+expandHermesTarball();
+copyBuildScripts();
+
+if (shouldUsePrebuiltHermesC('macos')) {
+  console.log('[Hermes] Using pre-built HermesC');
+  configureMakeForPrebuiltHermesC();
+}

package/scripts/react_native_pods.rb

@@ -44,7 +44,7 @@ def use_react_native! (options={})
   pod 'FBLazyVector', :path => "#{prefix}/Libraries/FBLazyVector"
   pod 'FBReactNativeSpec', :path => "#{prefix}/React/FBReactNativeSpec"
   pod 'RCTRequired', :path => "#{prefix}/Libraries/RCTRequired"
-  pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety"
+  pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety", :modular_headers => true
   pod 'React', :path => "#{prefix}/"
   pod 'React-Core', :path => "#{prefix}/"
   pod 'React-CoreModules', :path => "#{prefix}/React/CoreModules"
@@ -72,13 +72,13 @@ def use_react_native! (options={})
   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 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon", :modular_headers => true
   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"
+  pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true
 
   if ENV['USE_CODEGEN_DISCOVERY'] == '1'
     app_path = options[:app_path]
@@ -96,7 +96,7 @@ def use_react_native! (options={})
     generate_react_codegen_podspec!(react_codegen_spec)
   end
 
-  pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR
+  pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true
 
   if fabric_enabled
     checkAndGenerateEmptyThirdPartyProvider!(prefix)
@@ -104,15 +104,14 @@ def use_react_native! (options={})
     pod 'React-rncore', :path => "#{prefix}/ReactCommon"
     pod 'React-graphics', :path => "#{prefix}/ReactCommon/react/renderer/graphics"
     pod 'React-jsi/Fabric', :path => "#{prefix}/ReactCommon/jsi"
-    pod 'React-RCTFabric', :path => "#{prefix}/React"
+    pod 'React-RCTFabric', :path => "#{prefix}/React", :modular_headers => true
     pod 'RCT-Folly/Fabric', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec"
   end
 
   if hermes_enabled
+    system("(cd #{prefix} && node scripts/hermes/prepare-hermes-for-build)")
     pod 'React-hermes', :path => "#{prefix}/ReactCommon/hermes"
-    Pod::UI.puts "[Hermes] Building Hermes from source"
-    hermes_source_path = downloadAndConfigureHermesSource(prefix)
-    pod 'hermes-engine', :path => "#{hermes_source_path}/hermes-engine.podspec"
+    pod 'hermes-engine', :path => "#{prefix}/sdks/hermes/hermes-engine.podspec"
     pod 'libevent', '~> 2.1.12'
   end
 
@@ -143,10 +142,10 @@ end
 def use_flipper!(versions = {}, configurations: ['Debug'])
   versions['Flipper'] ||= '0.125.0'
   versions['Flipper-Boost-iOSX'] ||= '1.76.0.1.11'
-  versions['Flipper-DoubleConversion'] ||= '3.2.0'
+  versions['Flipper-DoubleConversion'] ||= '3.2.0.1'
   versions['Flipper-Fmt'] ||= '7.1.7'
   versions['Flipper-Folly'] ||= '2.6.10'
-  versions['Flipper-Glog'] ||= '0.5.0.4'
+  versions['Flipper-Glog'] ||= '0.5.0.5'
   versions['Flipper-PeerTalk'] ||= '0.0.4'
   versions['Flipper-RSocket'] ||= '1.4.3'
   versions['OpenSSL-Universal'] ||= '1.1.1100'
@@ -665,45 +664,6 @@ def use_react_native_codegen!(spec, options={})
   }
 end
 
-def downloadAndConfigureHermesSource(react_native_path)
-  hermes_tarball_base_url = "https://github.com/facebook/hermes/tarball/"
-  sdks_dir = "#{react_native_path}/sdks"
-  download_dir = "#{sdks_dir}/download"
-  hermes_dir = "#{sdks_dir}/hermes"
-  hermes_tag_file = "#{sdks_dir}/.hermesversion"
-  system("mkdir -p #{hermes_dir} #{download_dir}")
-
-  if (File.exist?(hermes_tag_file))
-    hermes_tag = File.read(hermes_tag_file).strip
-  else
-    hermes_tag = "main"
-  end
-
-  hermes_tarball_url = hermes_tarball_base_url + hermes_tag
-  hermes_tag_sha = %x[git ls-remote https://github.com/facebook/hermes #{hermes_tag} | cut -f 1].strip
-  hermes_tarball_path = "#{download_dir}/hermes-#{hermes_tag_sha}.tar.gz"
-
-  if (!File.exist?(hermes_tarball_path))
-    Pod::UI.puts "[Hermes] Downloading Hermes source code (#{hermes_tarball_url})"
-    system("curl #{hermes_tarball_url} -Lo #{hermes_tarball_path}")
-  end
-  Pod::UI.puts "[Hermes] Extracting Hermes (#{hermes_tag_sha})"
-  system("tar -zxf #{hermes_tarball_path} --strip-components=1 --directory #{hermes_dir}")
-
-  hermesc_macos_path = "#{sdks_dir}/hermesc/macos/build_host_hermesc"
-  hermesc_macos_link = "#{hermes_dir}/utils/build_host_hermesc"
-  if (File.exist?(hermesc_macos_path))
-    # If hermesc is present, create a symbolic link in the hermes source directory to avoid re-building hermesc
-    Pod::UI.puts "[Hermes] Using pre-compiled Hermes Compiler from #{hermesc_macos_path}"
-    system("ln -s #{hermesc_macos_path} #{hermesc_macos_link}")
-  end
-
-  # TODO: Integrate this temporary hermes-engine.podspec into the actual one located in facebook/hermes
-  system("cp #{sdks_dir}/hermes-engine.podspec #{hermes_dir}/hermes-engine.podspec")
-
-  hermes_dir
-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.