[0.69.3] Bump version numbers

Merge pull request #34214 from Kudo/fix-34102
Fix React-bridging header not found for third party modules
2025-11-01 09:14:26 +00:00 · 2022-07-25 13:00:12 +00:00 · 2022-07-21 06:56:36 +01:00 · 2022-07-21 00:01:21 +08:00 · 2022-07-20 16:56:11 +01:00 · 2022-07-20 12:49:13 +01:00
115 changed files with 2003 additions and 1425 deletions
@@ -246,6 +246,28 @@ commands:
          name: Report size of RNTester.app (analysis-bot)
          command: GITHUB_TOKEN="$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A""$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B" scripts/circleci/report-bundle-size.sh << parameters.platform >> || true

+  with_hermes_sdk_cache_span:
+    parameters:
+      steps:
+        type: steps
+    steps:
+      - run:
+          name: Setup Hermes cache
+          command: |
+            HERMES_CACHE_KEY_FILE="sdks/.hermes-cache-key-file"
+            if [ ! -f "$HERMES_CACHE_KEY_FILE" ]; then
+              git ls-remote https://github.com/facebook/hermes main | cut -f 1 > $HERMES_CACHE_KEY_FILE
+            fi
+      - restore_cache:
+          keys:
+            - v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "sdks/.hermes-cache-key-file" }}
+      - steps: << parameters.steps >>
+      - save_cache:
+          key: v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "sdks/.hermes-cache-key-file" }}
+          paths:
+            - sdks/hermesc
+            - sdks/hermes
+
 # -------------------------
 #          JOBS
 # -------------------------
@@ -417,17 +439,19 @@ jobs:
      - with_brew_cache_span:
          steps:
            - brew_install:
-                package: cmake ninja
+                package: cmake

      - run:
          name: Setup the CocoaPods environment
          command: bundle exec pod setup

-      - with_rntester_pods_cache_span:
+      - with_hermes_sdk_cache_span:
          steps:
-            - run:
-                name: Generate RNTesterPods Workspace
-                command: cd packages/rn-tester && bundle exec pod install --verbose
+            - with_rntester_pods_cache_span:
+                steps:
+                  - run:
+                      name: Generate RNTesterPods Workspace
+                      command: cd packages/rn-tester && bundle exec pod install --verbose

  # -------------------------
  #     JOBS: iOS Unit Tests
@@ -470,7 +494,7 @@ jobs:
      - with_brew_cache_span:
          steps:
            - brew_install:
-                package: watchman cmake ninja
+                package: watchman cmake
            - run:
                name: "Brew: Tap wix/brew"
                command: brew tap wix/brew >/dev/null
@@ -500,11 +524,13 @@ jobs:
          name: Setup the CocoaPods environment
          command: bundle exec pod setup

-      - with_rntester_pods_cache_span:
+      - with_hermes_sdk_cache_span:
          steps:
-            - run:
-                name: Generate RNTesterPods Workspace
-                command: cd packages/rn-tester && bundle exec pod install --verbose
+            - with_rntester_pods_cache_span:
+                steps:
+                  - run:
+                      name: Generate RNTesterPods Workspace
+                      command: cd packages/rn-tester && bundle exec pod install --verbose

      # -------------------------
      # Runs iOS unit tests
@@ -741,13 +767,15 @@ jobs:
      - with_brew_cache_span:
          steps:
            - brew_install:
-                package: cmake ninja
+                package: cmake

-      - run:
-          name: Install CocoaPods dependencies
-          command: |
-            rm -rf packages/rn-tester/Pods
-            cd packages/rn-tester && bundle exec pod install
+      - with_hermes_sdk_cache_span:
+          steps:
+            - run:
+                name: Install CocoaPods dependencies
+                command: |
+                  rm -rf packages/rn-tester/Pods
+                  cd packages/rn-tester && bundle exec pod install

      # The macOS machine can run out of storage if Hermes is enabled and built from source.
      # Since this job does not use the iOS Simulator, deleting it provides a quick way to
@@ -877,33 +905,45 @@ jobs:
  # -------------------------
  prepare_hermes_workspace:
    docker:
-      - image: debian:buster
+      - image: debian:bullseye
    environment:
      - HERMES_WS_DIR: *hermes_workspace_root
+      - HERMES_VERSION_FILE: "sdks/.hermesversion"
    steps:
-      - checkout
      - run:
          name: Install dependencies
          command: |
-            apt-get update
-            apt-get install -y wget git
+            apt update
+            apt install -y wget git curl
+            curl -sL https://deb.nodesource.com/setup_16.x | bash -
+            apt install -y nodejs
+            npm install --global yarn
+      - checkout
+      - run_yarn
      - run:
-          name: Set up Hermes workspace
-          command: mkdir -p "$HERMES_WS_DIR/hermes" "$HERMES_WS_DIR/download"
+          name: Set up Hermes workspace and caching
+          command: |
+            mkdir -p "/tmp/hermes" "/tmp/hermes/download" "/tmp/hermes/hermes"
+
+            if [ -f "$HERMES_VERSION_FILE" ]; then
+              cat $HERMES_VERSION_FILE > /tmp/hermes/hermesversion
+            else
+              HERMES_TAG_SHA=$(git ls-remote https://github.com/facebook/hermes main | cut -f 1 | tr -d '[:space:]')
+              echo $HERMES_TAG_SHA > /tmp/hermes/hermesversion
+            fi
+      - restore_cache:
+          key: v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
      - run:
          name: Download Hermes tarball
          command: |
-            HERMES_VERSION_FILE="sdks/.hermesversion"
-            HERMES_TARBALL_URL="https://github.com/facebook/hermes/archive/refs/heads/main.tar.gz"
-            if [ -f "$HERMES_VERSION_FILE" ]; then
-              HERMES_TAG=$(cat $HERMES_VERSION_FILE | tr -d '[:space:]')
-              HERMES_TARBALL_URL="https://github.com/facebook/hermes/archive/refs/tags/$HERMES_TAG.tar.gz"
-              echo "Using Hermes version tagged $HERMES_TAG"
-            else
-              echo "Using Hermes latest version from trunk"
-            fi
-            wget --timestamping -O "$HERMES_WS_DIR/download/hermes.tar.gz" "$HERMES_TARBALL_URL"
-            tar -xzf "$HERMES_WS_DIR/download/hermes.tar.gz" --strip-components=1 -C "$HERMES_WS_DIR/hermes"
+            node scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
+            cp sdks/download/* $HERMES_WS_DIR/download/.
+            cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
+      - save_cache:
+          key: v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
+          paths:
+            - /tmp/hermes/download/
+            - /tmp/hermes/hermes/
      - persist_to_workspace:
          root: *hermes_workspace_root
          paths:
@@ -924,6 +964,8 @@ jobs:
            apt install -y git openssh-client cmake build-essential \
                libreadline-dev libicu-dev zip python3
      - *attach_hermes_workspace
+      - restore_cache:
+          key: v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
      - run:
          name: Set up workspace
          command: |
@@ -931,15 +973,21 @@ jobs:
      - run:
          name: Build HermesC for Linux
          command: |
-            cd /tmp/hermes
-            cmake -S hermes -B build -DHERMES_STATIC_LINK=ON -DCMAKE_BUILD_TYPE=Release \
-              -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True -DCMAKE_CXX_FLAGS=-s -DCMAKE_C_FLAGS=-s \
-              -DCMAKE_EXE_LINKER_FLAGS="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
-            cmake --build build --target check-hermes -j 4
-      - run:
-          name: Package HermesC for Linux
-          command: |
-            cp /tmp/hermes/build/bin/hermesc /tmp/hermes/linux64-bin/.
+            if [ -f /tmp/hermes/linux64-bin/hermesc ]; then
+              echo 'Skipping; Clean "/tmp/hermes/linux64-bin" to rebuild.'
+            else
+              cd /tmp/hermes
+              cmake -S hermes -B build -DHERMES_STATIC_LINK=ON -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True -DCMAKE_CXX_FLAGS=-s -DCMAKE_C_FLAGS=-s \
+                -DCMAKE_EXE_LINKER_FLAGS="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
+              cmake --build build --target check-hermes -j 4
+              cp /tmp/hermes/build/bin/hermesc /tmp/hermes/linux64-bin/.
+            fi
+      - save_cache:
+          key: v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
+          paths:
+            - /tmp/hermes/linux64-bin/
+            - /tmp/hermes/hermes/destroot/
      - store_artifacts:
          path: /tmp/hermes/linux64-bin/
      - persist_to_workspace:
@@ -947,30 +995,59 @@ jobs:
          paths:
            - linux64-bin

-  build_hermesc_macos:
+  build_hermes_macos:
    executor: reactnativeios
    environment:
      - HERMES_WS_DIR: *hermes_workspace_root
    steps:
+      - checkout
      - *attach_hermes_workspace
+      - restore_cache:
+          key: v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
      - run:
          name: Set up workspace
          command: |
            mkdir -p /tmp/hermes/osx-bin
+            mkdir -p ~/react-native/sdks/hermes
+            cp -r $HERMES_WS_DIR/hermes/* ~/react-native/sdks/hermes/.
      - run:
          name: Install dependencies
          command: |
-            brew install cmake ninja
+            brew install cmake
      - run:
-          name: Build HermesC for macOS
+          name: Build the Hermes iOS frameworks
          command: |
-            cd "$HERMES_WS_DIR/hermes"
+            cd ~/react-native/sdks/hermes
+            ./utils/build-ios-framework.sh
+      - run:
+          name: Build the Hermes Mac frameworks
+          command: |
+            cd ~/react-native/sdks/hermes
            ./utils/build-mac-framework.sh
-      - run:
-          name: Package HermesC for macOS
-          command: |
-            cd "$HERMES_WS_DIR/hermes"
            cp build_macosx/bin/hermesc /tmp/hermes/osx-bin/.
+      - run:
+          name: Package the Hermes Apple frameworks
+          command: |
+            cd ~/react-native/sdks/hermes
+            . ./utils/build-apple-framework.sh
+
+            mkdir -p /tmp/cocoapods-package-root/destroot
+            mkdir -p /tmp/hermes/output
+            cp -R ./destroot /tmp/cocoapods-package-root
+            cp LICENSE /tmp/cocoapods-package-root
+
+            tar -C /tmp/cocoapods-package-root/ -czvf /tmp/hermes/output/hermes-runtime-darwin-v$(get_release_version).tar.gz .
+      - save_cache:
+          key: v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
+          paths:
+            - ~/react-native/hermes/build_host_hermesc
+            - ~/react-native/hermes/build_iphoneos
+            - ~/react-native/hermes/build_catalyst
+            - ~/react-native/hermes/build_iphonesimulator
+            - ~/react-native/hermes/build_macosx
+            - ~/react-native/hermes/destroot
+      - store_artifacts:
+          path: /tmp/hermes/output/
      - store_artifacts:
          path: /tmp/hermes/osx-bin/
      - persist_to_workspace:
@@ -989,6 +1066,8 @@ jobs:
      - CMAKE_DIR: 'C:\Program Files\CMake\bin'
    steps:
      - *attach_hermes_workspace
+      - restore_cache:
+          key: v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "tmp/hermes/hermesversion" }}
      - run:
          name: Set up workspace
          command: |
@@ -997,53 +1076,57 @@ jobs:
            New-Item -ItemType Directory $Env:HERMES_WS_DIR\deps
            New-Item -ItemType Directory $Env:HERMES_WS_DIR\win64-bin
            New-Item -ItemType SymbolicLink -Target tmp\hermes\hermes -Path $Env:HERMES_WS_DIR -Name hermes
-      - run:
-          name: Download ICU
-          command: |
-            cd $Env:HERMES_WS_DIR\icu
-            # If Invoke-WebRequest shows a progress bar, it will fail with
-            #   Win32 internal error "Access is denied" 0x5 occurred [...]
-            $progressPreference = 'silentlyContinue'
-            Invoke-WebRequest -Uri "$Env:ICU_URL" -OutFile "icu.zip"
-            Expand-Archive -Path "icu.zip" -DestinationPath "."
-      - run:
-          name: Install dependencies
-          command: |
-            choco install --no-progress cmake --version 3.14.7
-            if (-not $?) { throw "Failed to install CMake" }
-            choco install --no-progress python3
-            if (-not $?) { throw "Failed to install Python" }
-      - run:
-          name: Assemble Windows runtime dependencies
-          command: |
-            cd $Env:HERMES_WS_DIR
-            Copy-Item -Path "icu\bin64\icu*.dll" -Destination "deps"
-            # Include MSVC++ 2015 redistributables
-            Copy-Item -Path "c:\windows\system32\msvcp140.dll" -Destination "deps"
-            Copy-Item -Path "c:\windows\system32\vcruntime140.dll" -Destination "deps"
-            Copy-Item -Path "c:\windows\system32\vcruntime140_1.dll" -Destination "deps"
      - run:
          name: Build HermesC for Windows
          command: |
-            $Env:PATH += ";$Env:CMAKE_DIR;$Env:MSBUILD_DIR"
-            $Env:ICU_ROOT = "$Env:HERMES_WS_DIR\icu"
-            cd $Env:HERMES_WS_DIR
-            cmake -S hermes -B build_release -G 'Visual Studio 16 2019' -Ax64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True -DHERMES_ENABLE_WIN10_ICU_FALLBACK=OFF
-            if (-not $?) { throw "Failed to configure Hermes" }
-            cd build_release
-            cmake --build . --target hermesc --config Release
-            if (-not $?) { throw "Failed to build Hermes" }
-      - run:
-          name: Package HermesC for Windows
-          command: |
-            cd $Env:HERMES_WS_DIR
-            Copy-Item -Path "build_release\bin\Release\hermesc.exe" -Destination "win64-bin"
-            # Include Windows runtime dependencies
-            Copy-Item -Path "deps\*" -Destination "win64-bin"
+            if (-not(Test-Path -Path $Env:HERMES_WS_DIR\win64-bin\hermesc.exe)) {
+              choco install --no-progress cmake --version 3.14.7
+              if (-not $?) { throw "Failed to install CMake" }
+              choco install --no-progress python3
+              if (-not $?) { throw "Failed to install Python" }
+
+              cd $Env:HERMES_WS_DIR\icu
+              # If Invoke-WebRequest shows a progress bar, it will fail with
+              #   Win32 internal error "Access is denied" 0x5 occurred [...]
+              $progressPreference = 'silentlyContinue'
+              Invoke-WebRequest -Uri "$Env:ICU_URL" -OutFile "icu.zip"
+              Expand-Archive -Path "icu.zip" -DestinationPath "."
+
+              cd $Env:HERMES_WS_DIR
+              Copy-Item -Path "icu\bin64\icu*.dll" -Destination "deps"
+              # Include MSVC++ 2015 redistributables
+              Copy-Item -Path "c:\windows\system32\msvcp140.dll" -Destination "deps"
+              Copy-Item -Path "c:\windows\system32\vcruntime140.dll" -Destination "deps"
+              Copy-Item -Path "c:\windows\system32\vcruntime140_1.dll" -Destination "deps"
+
+              $Env:PATH += ";$Env:CMAKE_DIR;$Env:MSBUILD_DIR"
+              $Env:ICU_ROOT = "$Env:HERMES_WS_DIR\icu"
+
+              cmake -S hermes -B build_release -G 'Visual Studio 16 2019' -Ax64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True -DHERMES_ENABLE_WIN10_ICU_FALLBACK=OFF
+              if (-not $?) { throw "Failed to configure Hermes" }
+              cd build_release
+              cmake --build . --target hermesc --config Release
+              if (-not $?) { throw "Failed to build Hermes" }
+
+              cd $Env:HERMES_WS_DIR
+              Copy-Item -Path "build_release\bin\Release\hermesc.exe" -Destination "win64-bin"
+              # Include Windows runtime dependencies
+              Copy-Item -Path "deps\*" -Destination "win64-bin"
+            }
+            else {
+                Write-Host "Skipping; Clean c:\tmp\hermes\win64-bin to rebuild."
+            }
+      - save_cache:
+          key: v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "tmp/hermes/hermesversion" }}
+          paths:
+            - C:\tmp\hermes\win64-bin\
+            - C:\tmp\hermes\hermes\icu\
+            - C:\tmp\hermes\hermes\deps\
+            - C:\tmp\hermes\hermes\build_release\
      - store_artifacts:
-          path: c:\tmp\hermes\win64-bin\
+          path: C:\tmp\hermes\win64-bin\
      - persist_to_workspace:
-          root: c:\tmp\hermes\
+          root: C:\tmp\hermes\
          paths:
            - win64-bin

@@ -1116,6 +1199,11 @@ jobs:
      # END: Stables and nightlies

      - run: node ./scripts/publish-npm.js << parameters.publish_npm_args >>
+      - run:
+          name: Zip Hermes Native Symbols
+          command: zip -r /tmp/hermes-native-symbols.zip ~/react-native/ReactAndroid/hermes-engine/build/intermediates/cmake/
+      - store_artifacts:
+          path: /tmp/hermes-native-symbols.zip

      # START: Commitlies
      # Provide a react-native package for this commit as a Circle CI release artifact.
@@ -1211,7 +1299,7 @@ workflows:
      - build_hermesc_linux:
          requires:
            - prepare_hermes_workspace
-      - build_hermesc_macos:
+      - build_hermes_macos:
          requires:
            - prepare_hermes_workspace
      - build_hermesc_windows:
@@ -1222,7 +1310,7 @@ workflows:
          publish_npm_args: --dry-run
          requires:
            - build_hermesc_linux
-            - build_hermesc_macos
+            - build_hermes_macos
            - build_hermesc_windows
      - test_js:
          run_disabled_tests: false
@@ -1273,12 +1361,15 @@ workflows:
      - prepare_hermes_workspace:
          filters: *only_release_tags
      - build_hermesc_linux:
+          filters: *only_release_tags
          requires:
            - prepare_hermes_workspace
-      - build_hermesc_macos:
+      - build_hermes_macos:
+          filters: *only_release_tags
          requires:
            - prepare_hermes_workspace
      - build_hermesc_windows:
+          filters: *only_release_tags
          requires:
            - prepare_hermes_workspace
      # This job will trigger when a version tag is pushed (by package_release)
@@ -1289,7 +1380,7 @@ workflows:
          filters: *only_release_tags
          requires:
            - build_hermesc_linux
-            - build_hermesc_macos
+            - build_hermes_macos
            - build_hermesc_windows

  analysis:
@@ -1323,16 +1414,15 @@ workflows:
      - build_hermesc_linux:
          requires:
            - prepare_hermes_workspace
-      - build_hermesc_macos:
+      - build_hermes_macos:
          requires:
            - prepare_hermes_workspace
      - build_hermesc_windows:
          requires:
            - prepare_hermes_workspace
-
      - build_npm_package:
          publish_npm_args: --nightly
          requires:
            - build_hermesc_linux
-            - build_hermesc_macos
+            - build_hermes_macos
            - build_hermesc_windows
@@ -115,9 +115,9 @@ package-lock.json
 /packages/rn-tester/NativeModuleExample/ScreenshotManagerSpec*

 # Additional SDKs
-/sdks/.hermesversion
-/sdks/hermes
 /sdks/download
+/sdks/hermes
+/sdks/hermesc

 # Visual studio
 .vscode
@@ -759,7 +759,7 @@ rn_library(
        "//xplat/js:node_modules__react_19shallow_19renderer",
        "//xplat/js:node_modules__regenerator_19runtime",
        "//xplat/js:node_modules__stacktrace_19parser",
-        "//xplat/js:node_modules__use_19subscription",
+        "//xplat/js:node_modules__use_19sync_19external_19store",
        "//xplat/js:node_modules__whatwg_19fetch",
        "//xplat/js/RKJSModules/Libraries/Polyfills:Polyfills",
        "//xplat/js/RKJSModules/Libraries/React:React",
@@ -3,7 +3,7 @@ GEM
  specs:
    CFPropertyList (3.0.5)
      rexml
-    activesupport (6.1.5)
+    activesupport (6.1.6.1)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@@ -45,7 +45,7 @@ GEM
      public_suffix (~> 4.0)
      typhoeus (~> 1.0)
    cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.1)
+    cocoapods-downloader (1.6.3)
    cocoapods-plugins (1.0.0)
      nap
    cocoapods-search (1.0.1)
@@ -63,29 +63,29 @@ GEM
    fuzzy_match (2.0.4)
    gh_inspector (1.1.3)
    httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
      concurrent-ruby (~> 1.0)
-    json (2.6.1)
-    minitest (5.15.0)
+    json (2.6.2)
+    minitest (5.16.2)
    molinillo (0.8.0)
    nanaimo (0.3.0)
    nap (1.1.0)
    netrc (0.11.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
    rexml (3.2.5)
    ruby-macho (2.5.1)
    typhoeus (1.4.0)
      ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
      concurrent-ruby (~> 1.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
      colored2 (~> 3.1)
      nanaimo (~> 0.3.0)
      rexml (~> 3.2.4)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.0)

 PLATFORMS
  ruby
@@ -97,4 +97,4 @@ RUBY VERSION
   ruby 2.7.5p203

 BUNDLED WITH
-   2.3.10
+   2.3.11
@@ -31,24 +31,26 @@ RCT_EXPORT_METHOD(readAsText:(NSDictionary<NSString *, id> *)blob
                  reject:(RCTPromiseRejectBlock)reject)
 {
  RCTBlobManager *blobManager = [_moduleRegistry moduleForName:"BlobModule"];
-  NSData *data = [blobManager resolve:blob];
+  dispatch_async(blobManager.methodQueue, ^{
+    NSData *data = [blobManager resolve:blob];

-  if (data == nil) {
-    reject(RCTErrorUnspecified,
-           [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]], nil);
-  } else {
-    NSStringEncoding stringEncoding;
-
-    if (encoding == nil) {
-      stringEncoding = NSUTF8StringEncoding;
+    if (data == nil) {
+      reject(RCTErrorUnspecified,
+             [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]], nil);
    } else {
-      stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef) encoding));
+      NSStringEncoding stringEncoding;
+
+      if (encoding == nil) {
+        stringEncoding = NSUTF8StringEncoding;
+      } else {
+        stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef) encoding));
+      }
+
+      NSString *text = [[NSString alloc] initWithData:data encoding:stringEncoding];
+
+      resolve(text);
    }
-
-    NSString *text = [[NSString alloc] initWithData:data encoding:stringEncoding];
-
-    resolve(text);
-  }
+  });
 }

 RCT_EXPORT_METHOD(readAsDataURL:(NSDictionary<NSString *, id> *)blob
@@ -56,19 +58,21 @@ RCT_EXPORT_METHOD(readAsDataURL:(NSDictionary<NSString *, id> *)blob
                  reject:(RCTPromiseRejectBlock)reject)
 {
  RCTBlobManager *blobManager = [_moduleRegistry moduleForName:"BlobModule"];
-  NSData *data = [blobManager resolve:blob];
+  dispatch_async(blobManager.methodQueue, ^{
+    NSData *data = [blobManager resolve:blob];

-  if (data == nil) {
-    reject(RCTErrorUnspecified,
-           [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]], nil);
-  } else {
-    NSString *type = [RCTConvert NSString:blob[@"type"]];
-    NSString *text = [NSString stringWithFormat:@"data:%@;base64,%@",
-                      type != nil && [type length] > 0 ? type : @"application/octet-stream",
-                      [data base64EncodedStringWithOptions:0]];
+    if (data == nil) {
+      reject(RCTErrorUnspecified,
+             [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]], nil);
+    } else {
+      NSString *type = [RCTConvert NSString:blob[@"type"]];
+      NSString *text = [NSString stringWithFormat:@"data:%@;base64,%@",
+                        type != nil && [type length] > 0 ? type : @"application/octet-stream",
+                        [data base64EncodedStringWithOptions:0]];

-    resolve(text);
-  }
+      resolve(text);
+    }
+  });
 }

 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
@@ -1,17 +1,17 @@
 /**
+ * @generated by scripts/set-rn-version.js
+ *
 * 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
- * @generated by scripts/set-rn-version.js
 * @flow strict
 */

 exports.version = {
  major: 0,
-  minor: 0,
-  patch: 0,
+  minor: 69,
+  patch: 3,
  prerelease: null,
 };
@@ -34,15 +34,14 @@ function codegenNativeComponent<Props>(
  componentName: string,
  options?: Options,
 ): NativeComponentType<Props> {
-  const errorMessage =
-    "Native Component '" +
-    componentName +
-    "' that calls codegenNativeComponent was not code generated at build time. Please check its definition.";
  if (global.RN$Bridgeless === true) {
+    const errorMessage =
+      "Native Component '" +
+      componentName +
+      "' that calls codegenNativeComponent was not code generated at build time. Please check its definition.";
    console.error(errorMessage);
-  } else {
-    console.warn(errorMessage);
  }
+
  let componentNameInUse =
    options && options.paperComponentName != null
      ? options.paperComponentName
@@ -8,24 +8,18 @@
 * @flow strict-local
 */

-import {useMemo} from 'react';
-import {useSubscription} from 'use-subscription';
+'use strict';
+
+import {useSyncExternalStore} from 'use-sync-external-store/shim';
 import Appearance from './Appearance';
 import type {ColorSchemeName} from './NativeAppearance';

 export default function useColorScheme(): ?ColorSchemeName {
-  const subscription = useMemo(
-    () => ({
-      getCurrentValue: () => Appearance.getColorScheme(),
-      subscribe: callback => {
-        const appearanceSubscription = Appearance.addChangeListener(callback);
-        return () => {
-          appearanceSubscription.remove();
-        };
-      },
-    }),
-    [],
+  return useSyncExternalStore(
+    callback => {
+      const appearanceSubscription = Appearance.addChangeListener(callback);
+      return () => appearanceSubscription.remove();
+    },
+    () => Appearance.getColorScheme(),
  );
-
-  return useSubscription(subscription);
 }
@@ -21,11 +21,11 @@ NSDictionary* RCTGetReactNativeVersion(void)
  static dispatch_once_t onceToken;
  dispatch_once(&onceToken, ^(void){
    __rnVersion = @{
-                    RCTVersionMajor: @(0),
-                    RCTVersionMinor: @(0),
-                    RCTVersionPatch: @(0),
-                    RCTVersionPrerelease: [NSNull null],
-                    };
+                  RCTVersionMajor: @(0),
+                  RCTVersionMinor: @(69),
+                  RCTVersionPatch: @(3),
+                  RCTVersionPrerelease: [NSNull null],
+                  };
  });
  return __rnVersion;
 }
@@ -22,8 +22,14 @@ JSIExecutor::RuntimeInstaller RCTJSIExecutorRuntimeInstaller(JSIExecutor::Runtim
    bindNativeLogger(runtime, iosLoggingBinder);

    PerformanceNow iosPerformanceNowBinder = []() {
-      auto time = std::chrono::system_clock::now().time_since_epoch();
-      return std::chrono::duration_cast<std::chrono::milliseconds>(time).count();
+      auto time = std::chrono::steady_clock::now();
+      auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(
+                          time.time_since_epoch())
+                          .count();
+
+      constexpr double NANOSECONDS_IN_MILLISECOND = 1000000.0;
+
+      return duration / NANOSECONDS_IN_MILLISECOND;
    };
    bindNativePerformanceNow(runtime, iosPerformanceNowBinder);

@@ -35,6 +35,7 @@ Pod::Spec.new do |s|
                             "**/android/*",
  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
  s.header_dir             = "React"
+  s.module_name            = "RCTFabric"
  s.framework              = "JavaScriptCore"
  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Public/React-Codegen\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"" }
  s.xcconfig               = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/RCT-Folly\"", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
@@ -8,6 +8,8 @@
 #import <UIKit/UIKit.h>

 #import <React/RCTComponent.h>
+// Keeps RCTConvert.h here before yoga for clang module to generate correct header imports.
+#import <React/RCTConvert.h>
 #import <React/RCTLayout.h>
 #import <React/RCTRootView.h>
 #import <yoga/Yoga.h>
@@ -1,4 +1,4 @@
-VERSION_NAME=1000.0.0-main
+VERSION_NAME=0.69.3
 GROUP=com.facebook.react

 POM_NAME=ReactNative
@@ -12,6 +12,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsijniprofiler

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi

@@ -13,6 +13,7 @@ ifeq ($(APP_OPTIM),debug)
  LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1

  LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+  LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

  LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi

@@ -38,6 +39,8 @@ else
  LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi

  LOCAL_CPP_FEATURES := exceptions
+  LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+  LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

  LOCAL_STATIC_LIBRARIES := libjsireact libhermes-executor-common-release
  LOCAL_SHARED_LIBRARIES := \
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := mapbufferjni

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/react/common/mapbuffer/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_SHARED_LIBRARIES := \
  libfb \
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := fabricjni

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_SHARED_LIBRARIES := \
  libbutter \
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jscexecutor

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := reactnativeblob

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)

@@ -16,7 +16,7 @@ import java.util.Map;
 public class ReactNativeVersion {
  public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
      "major", 0,
-      "minor", 0,
-      "patch", 0,
+      "minor", 69,
+      "patch", 3,
      "prerelease", null);
 }
@@ -26,6 +26,7 @@ LOCAL_MODULE := reactperfloggerjni

 # Compile all local c++ files
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/reactperflogger/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)
@@ -28,6 +28,7 @@ LOCAL_MODULE := callinvokerholder

 # Compile all local c++ files
 LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/CallInvokerHolder.cpp
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 # Build the files in this directory as a shared library
 include $(BUILD_STATIC_LIBRARY)
@@ -56,6 +57,7 @@ LOCAL_STATIC_LIBRARIES = libcallinvokerholder libreactperfloggerjni

 # Compile all local c++ files
 LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/TurboModuleManager.cpp $(LOCAL_PATH)/ReactCommon/OnLoad.cpp
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 # Build the files in this directory as a shared library
 include $(BUILD_SHARED_LIBRARY)
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := uimanagerjni

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_SHARED_LIBRARIES := \
  libfb \
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := yoga

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jni/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/jni

@@ -47,6 +47,7 @@ LOCAL_MODULE := reactnativeutilsjni

 # Compile all local c++ files.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 ifeq ($(APP_OPTIM),debug)
  # Keep symbols by overriding the strip command invoked by ndk-build.
@@ -106,6 +107,7 @@ LOCAL_MODULE := reactnativejni

 # Compile all local c++ files.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 ifeq ($(APP_OPTIM),debug)
  # Keep symbols by overriding the strip command invoked by ndk-build.
@@ -14,7 +14,8 @@ add_compile_options(
        -fexceptions
        -frtti
        -Wno-unused-lambda-capture
-        -std=c++17)
+        -std=c++17
+        -DWITH_INSPECTOR=1)

 ##########################
 ### React Native Utils ###
@@ -12,8 +12,14 @@ namespace facebook {
 namespace react {

 double reactAndroidNativePerformanceNowHook() {
-  auto time = std::chrono::system_clock::now().time_since_epoch();
-  return std::chrono::duration_cast<std::chrono::milliseconds>(time).count();
+  auto time = std::chrono::steady_clock::now();
+  auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(
+                      time.time_since_epoch())
+                      .count();
+
+  constexpr double NANOSECONDS_IN_MILLISECOND = 1000000.0;
+
+  return duration / NANOSECONDS_IN_MILLISECOND;
 }

 } // namespace react
@@ -5,6 +5,7 @@ include $(CLEAR_VARS)
 # because the react native version does not include anything outside of headers.
 # They are required for Folly futures to compile successfully.
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/asm/$(TARGET_ARCH_ABI)/*.S)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/boost_1_76_0
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/boost_1_76_0
@@ -5,7 +5,7 @@

 require "json"

-package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "package.json")))
+package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']

 source = { :git => 'https://github.com/facebook/react-native.git' }
@@ -28,9 +28,10 @@ Pod::Spec.new do |s|
  s.author                 = "Facebook, Inc. and its affiliates"
  s.platforms              = { :ios => "12.4" }
  s.source                 = source
-  s.source_files           = "**/*.{cpp,h}"
-  s.exclude_files          = "tests"
+  s.source_files           = "react/bridging/**/*.{cpp,h}"
+  s.exclude_files          = "react/bridging/tests"
  s.header_dir             = "react/bridging"
+  s.header_mappings_dir    = "."
  s.compiler_flags         = folly_compiler_flags
  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\"",
                               "USE_HEADERMAP" => "YES",
@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
  s.source                 = source
  s.header_dir             = "ReactCommon" # Use global header_dir for all subspecs for use_frameworks! compatibility
  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Private/React-bridging\"",
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers\"",
                               "USE_HEADERMAP" => "YES",
                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := butter

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := reactnative

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
@@ -16,8 +16,8 @@ namespace facebook::react {

 constexpr struct {
  int32_t Major = 0;
-  int32_t Minor = 0;
-  int32_t Patch = 0;
+  int32_t Minor = 69;
+  int32_t Patch = 3;
  std::string_view Prerelease = "";
 } ReactNativeVersion;

@@ -13,6 +13,7 @@ ifeq ($(APP_OPTIM),debug)
  LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1

  LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+  LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

  LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi
  LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
@@ -30,6 +31,8 @@ else

  LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi
  LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+  LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+  LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

  LOCAL_STATIC_LIBRARIES := libjsireact
  LOCAL_SHARED_LIBRARIES := libhermes libjsi
@@ -11,6 +11,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := hermes-inspector

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/detail/*.cpp $(LOCAL_PATH)/chrome/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_ROOT := $(LOCAL_PATH)/../..

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsi

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jsi/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
@@ -25,6 +26,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jscruntime

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsireact

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/jsireact/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := jsinspector

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := logger

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_config

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_debug
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

@@ -12,6 +12,7 @@ LOCAL_MODULE := react_nativemodule_core
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ReactCommon $(LOCAL_PATH)/platform/android/ReactCommon

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp) $(wildcard $(LOCAL_PATH)/platform/android/ReactCommon/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH) $(LOCAL_PATH)/platform/android/

@@ -16,7 +16,6 @@
 #import <React/RCTModuleMethod.h>
 #import <ReactCommon/CallInvoker.h>
 #import <ReactCommon/TurboModule.h>
-#import <ReactCommon/TurboModuleUtils.h>
 #import <string>
 #import <unordered_map>

@@ -27,6 +26,7 @@
 namespace facebook {
 namespace react {

+class CallbackWrapper;
 class Instance;

 typedef std::weak_ptr<CallbackWrapper> (
@@ -27,6 +27,7 @@
 #import <ReactCommon/TurboCxxModule.h>
 #import <ReactCommon/TurboModuleBinding.h>
 #import <ReactCommon/TurboModulePerfLogger.h>
+#import <ReactCommon/TurboModuleUtils.h>

 using namespace facebook;
 using namespace facebook::react;
@@ -9,6 +9,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := sampleturbomodule
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SHARED_LIBRARIES := \
  libfbjni \
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_animations

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_attributedstring

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_componentregistry
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

@@ -12,6 +12,7 @@ LOCAL_MODULE := rrc_native
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_image

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_modal

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_progressbar

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/android/react/renderer/components/progressbar/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/android/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/android/
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_root

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_scrollview

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_slider

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/platform/android/react/renderer/components/slider/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ $(LOCAL_PATH)/platform/android/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../ $(LOCAL_PATH)/platform/android/
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_switch

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidswitch/react/renderer/components/androidswitch/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/androidswitch/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/androidswitch/
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_text

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_textinput

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/androidtextinput/react/renderer/components/androidtextinput/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/androidtextinput/react/renderer/components/androidtextinput/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/androidtextinput/
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_unimplementedview

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := rrc_view

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_core
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_debug
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_graphics

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/graphics/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_SHARED_LIBRARIES := \
  glog \
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_imagemanager

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/cxx/react/renderer/imagemanager/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_SHARED_LIBRARIES := \
  libfolly_runtime \
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_leakchecker
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_mapbuffer

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_mounting

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
@@ -12,6 +12,7 @@ LOCAL_MODULE := react_render_runtimescheduler
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_scheduler

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_telemetry

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_templateprocessor

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_textlayoutmanager

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/android/react/renderer/textlayoutmanager/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_SHARED_LIBRARIES := \
  glog \
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_uimanager

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_utils

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../
@@ -20,6 +20,7 @@ LOCAL_MODULE := reactperflogger

 # Compile all local c++ files under ./ReactCommon
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/reactperflogger/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 # Build the files in this directory as a shared library
 include $(BUILD_STATIC_LIBRARY)
@@ -11,6 +11,7 @@ LOCAL_MODULE := yogacore

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/yoga/*.cpp)
 LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/yoga/*/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
@@ -1,21 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#else
-#ifndef FOUNDATION_EXPORT
-#if defined(__cplusplus)
-#define FOUNDATION_EXPORT extern "C"
-#else
-#define FOUNDATION_EXPORT extern
-#endif
-#endif
-#endif
-
-#import "yoga/YGEnums.h"
-#import "yoga/YGMacros.h"
-#import "yoga/YGNode.h"
-#import "yoga/YGStyle.h"
-#import "yoga/YGValue.h"
-#import "yoga/Yoga.h"
-
-FOUNDATION_EXPORT double yogaVersionNumber;
-FOUNDATION_EXPORT const unsigned char yogaVersionString[];
@@ -1,6 +0,0 @@
-framework module yoga {
-  umbrella header "Yoga-umbrella.h"
-
-  export *
-  module * { export * }
-}
@@ -47,25 +47,11 @@ Pod::Spec.new do |spec|

  # Set this environment variable when *not* using the `:path` option to install the pod.
  # E.g. when publishing this spec to a spec repo.
-  source_files = 'yoga/**/*.{cpp,h}', 'Yoga-umbrella.h'
-  source_files = source_files.map { |file| File.join('ReactCommon/yoga', file) } if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
+  source_files = 'yoga/**/*.{cpp,h}'
+  source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
  spec.source_files = source_files

-  spec.module_map = 'Yoga.modulemap'
-
-  # CocoaPods custom `module_map` + `header_dir` doesn't put the umbrella header in right place.
-  # Ideally, modulemap should be placed with the umbrella header, that would work for both use_frameworks! mode and non use_frameworks! mode.
-  # This script copy the umbrella header back to right place.
-  spec.script_phase = {
-    :name => 'Copy umbrella header',
-    :input_files => ["$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h"],
-    :output_files => ["$PODS_ROOT/Headers/Private/Yoga/Yoga-umbrella.h"],
-    :execution_position => :before_compile,
-    :shell_path => '/bin/bash',
-
-    # In use_frameworks! mode, the umbrella header will by copied to right place.
-    # This copy command will fail because "$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h" doesn't exist.
-    # The command is just a no-op in use_frameworks! mode.
-    :script => 'cp -f "$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h" "$PODS_ROOT/Headers/Private/Yoga/Yoga-umbrella.h" || true',
-  }
+  header_files = 'yoga/*.h'
+  header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
+  spec.public_header_files = header_files
 end
@@ -7,6 +7,8 @@

 #pragma once

+#ifdef __cplusplus
+
 #include <cstdio>
 #include <cstdint>
 #include "YGEnums.h"
@@ -65,3 +67,5 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
 } // namespace detail
 } // namespace yoga
 } // namespace facebook
+
+#endif
@@ -7,6 +7,8 @@

 #pragma once

+#ifdef __cplusplus
+
 #include "YGValue.h"
 #include "YGMacros.h"
 #include <cmath>
@@ -182,3 +184,5 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
 } // namespace detail
 } // namespace yoga
 } // namespace facebook
+
+#endif
@@ -6,6 +6,9 @@
 */

 #pragma once
+
+#ifdef __cplusplus
+
 #include "YGNode.h"
 #include "Yoga-internal.h"
 #include "CompactValue.h"
@@ -145,3 +148,5 @@ inline YGFloatOptional YGResolveValueMargin(
 }

 void throwLogicalErrorWithMessage(const char* message);
+
+#endif
@@ -6,6 +6,9 @@
 */

 #pragma once
+
+#ifdef __cplusplus
+
 #include "Yoga-internal.h"
 #include "Yoga.h"

@@ -74,3 +77,5 @@ public:
    setCloneNodeCallback(YGCloneNodeFunc{nullptr});
  }
 };
+
+#endif
@@ -7,6 +7,8 @@

 #pragma once

+#ifdef __cplusplus
+
 #include <cmath>
 #include <limits>
 #include "Yoga-internal.h"
@@ -68,3 +70,5 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
 inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
  return lhs < rhs || lhs == rhs;
 }
+
+#endif
@@ -6,6 +6,9 @@
 */

 #pragma once
+
+#ifdef __cplusplus
+
 #include "BitUtils.h"
 #include "YGFloatOptional.h"
 #include "Yoga-internal.h"
@@ -85,3 +88,5 @@ public:
  bool operator==(YGLayout layout) const;
  bool operator!=(YGLayout layout) const { return !(*this == layout); }
 };
+
+#endif
@@ -6,7 +6,11 @@
 */

 #ifdef DEBUG
+
 #pragma once
+
+#ifdef __cplusplus
+
 #include <string>

 #include "Yoga.h"
@@ -22,4 +26,7 @@ void YGNodeToString(

 } // namespace yoga
 } // namespace facebook
+
+#endif
+
 #endif
@@ -6,6 +6,9 @@
 */

 #pragma once
+
+#ifdef __cplusplus
+
 #include <algorithm>
 #include <array>
 #include <cmath>
@@ -148,3 +151,5 @@ static const float kDefaultFlexShrink = 0.0f;
 static const float kWebDefaultFlexShrink = 1.0f;

 extern bool YGFloatsEqual(const float a, const float b);
+
+#endif
@@ -7,6 +7,8 @@

 #pragma once

+#ifdef __cplusplus
+
 #include "YGEnums.h"

 struct YGNode;
@@ -36,3 +38,5 @@ struct Log {
 } // namespace detail
 } // namespace yoga
 } // namespace facebook
+
+#endif
@@ -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;
 }
@@ -20,12 +20,13 @@ module.exports = {
  // the correct images are loaded for components. Essentially
  // require('img1.png') becomes `Object { "testUri": 'path/to/img1.png' }` in
  // the Jest snapshot.
-  process: (_, filename) =>
-    `module.exports = {
+  process: (_, filename) => ({
+    code: `module.exports = {
      testUri:
        ${JSON.stringify(
          path.relative(__dirname, filename).replace(/\\/g, '/'),
        )}
    };`,
+  }),
  getCacheKey: createCacheKeyFunction([__filename]),
 };
@@ -1,7 +1,6 @@
 {
  "name": "react-native",
-  "private": true,
-  "version": "1000.0.0",
+  "version": "0.69.3",
  "bin": "./cli.js",
  "description": "A framework for building native apps using React",
  "license": "MIT",
@@ -42,6 +41,11 @@
    "scripts/generate-artifacts.js",
    "scripts/generate-provider-cli.js",
    "scripts/generate-specs-cli.js",
+    "scripts/codegen/codegen-utils.js",
+    "scripts/codegen/generate-artifacts-executor.js",
+    "scripts/codegen/generate-specs-cli-executor.js",
+    "scripts/hermes/hermes-utils.js",
+    "scripts/hermes/prepare-hermes-for-build.js",
    "scripts/ios-configure-glog.sh",
    "scripts/xcode/with-environment.sh",
    "scripts/launchPackager.bat",
@@ -52,7 +56,10 @@
    "scripts/react_native_pods_utils/script_phases.rb",
    "scripts/react_native_pods_utils/script_phases.sh",
    "scripts/react_native_pods.rb",
+    "scripts/cocoapods",
    "scripts/react-native-xcode.sh",
+    "sdks/.hermesversion",
+    "sdks/hermes-engine",
    "sdks/hermesc",
    "template.config.js",
    "template",
@@ -85,18 +92,14 @@
    "test-android-e2e": "yarn run docker-build-android && yarn run test-android-run-e2e",
    "test-ios": "./scripts/objc-test.sh test"
  },
-  "workspaces": [
-    "packages/!(eslint-config-react-native-community)",
-    "repo-config"
-  ],
  "peerDependencies": {
    "react": "18.0.0"
  },
  "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.3",
+    "@react-native-community/cli-platform-android": "^8.0.2",
+    "@react-native-community/cli-platform-ios": "^8.0.2",
    "@react-native/assets": "1.0.0",
    "@react-native/normalize-color": "2.0.0",
    "@react-native/polyfills": "2.0.0",
@@ -108,27 +111,65 @@
    "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",
    "react-devtools-core": "4.24.0",
    "react-native-gradle-plugin": "^0.0.7",
    "react-refresh": "^0.4.0",
-    "react-shallow-renderer": "16.14.1",
+    "react-shallow-renderer": "16.15.0",
    "regenerator-runtime": "^0.13.2",
    "scheduler": "^0.21.0",
    "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"
+    "ws": "^6.1.4",
+    "react-native-codegen": "^0.69.1"
  },
  "devDependencies": {
    "flow-bin": "^0.176.3",
    "react": "18.0.0",
-    "react-test-renderer": "^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",
+    "@react-native-community/eslint-plugin": "*",
+    "@react-native/eslint-plugin-specs": ">0.0.2",
+    "@reactions/component": "^2.0.2",
+    "async": "^3.2.2",
+    "babel-eslint": "^10.1.0",
+    "clang-format": "^1.2.4",
+    "connect": "^3.6.5",
+    "coveralls": "^3.1.1",
+    "eslint": "^7.32.0",
+    "eslint-config-fb-strict": "^26.0.0",
+    "eslint-config-fbjs": "^3.1.1",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-babel": "^5.3.1",
+    "eslint-plugin-eslint-comments": "^3.2.0",
+    "eslint-plugin-flowtype": "^7.0.0",
+    "eslint-plugin-jest": "^25.2.4",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-react": "^7.26.1",
+    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-plugin-react-native": "^3.11.0",
+    "eslint-plugin-relay": "^1.8.2",
+    "inquirer": "^7.1.0",
+    "jest": "^26.6.3",
+    "jest-junit": "^10.0.0",
+    "jscodeshift": "^0.13.1",
+    "metro-babel-register": "0.70.3",
+    "mkdirp": "^0.5.1",
+    "prettier": "^2.4.1",
+    "shelljs": "^0.8.5",
+    "signedsource": "^1.0.0",
+    "ws": "^6.1.4",
+    "yargs": "^15.3.1"
  },
  "codegenConfig": {
    "libraries": [
@@ -148,4 +189,4 @@
      }
    ]
  }
-}
+}
@@ -1,6 +1,6 @@
 {
  "name": "react-native-codegen",
-  "version": "0.0.15",
+  "version": "0.69.1",
  "description": "⚛️ Code generation tools for React Native",
  "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/react-native-codegen",
  "repository": {
@@ -77,6 +77,7 @@ LOCAL_MODULE := react_codegen_${libraryName}
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/${libraryName}/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/${libraryName}

@@ -49,6 +49,7 @@ LOCAL_MODULE := react_codegen_SampleWithUppercaseName
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/SampleWithUppercaseName/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/SampleWithUppercaseName

@@ -157,6 +158,7 @@ LOCAL_MODULE := react_codegen_complex_objects
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/complex_objects/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/complex_objects

@@ -265,6 +267,7 @@ LOCAL_MODULE := react_codegen_empty_native_modules
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/empty_native_modules/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/empty_native_modules

@@ -373,6 +376,7 @@ LOCAL_MODULE := react_codegen_native_modules_with_type_aliases
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/native_modules_with_type_aliases

@@ -489,6 +493,7 @@ LOCAL_MODULE := react_codegen_real_module_example
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/real_module_example/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/real_module_example

@@ -597,6 +602,7 @@ LOCAL_MODULE := react_codegen_simple_native_modules
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/simple_native_modules/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/simple_native_modules

@@ -713,6 +719,7 @@ LOCAL_MODULE := react_codegen_two_modules_different_files
 LOCAL_C_INCLUDES := $(LOCAL_PATH)

 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/react/renderer/components/two_modules_different_files/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))

 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/two_modules_different_files

@@ -8,6 +8,8 @@ platform :ios, '12.4'
 install! 'cocoapods', :deterministic_uuids => false

 USE_FRAMEWORKS = ENV['USE_FRAMEWORKS'] == '1'
+IN_CI = ENV['CI'] == 'true'
+
@prefix_path = "../.."

 if USE_FRAMEWORKS
@@ -15,7 +17,7 @@ if USE_FRAMEWORKS
  use_frameworks!
 end

-def pods(options = {})
+def pods(options = {}, use_flipper: false)
  project 'RNTesterPods.xcodeproj'

  fabric_enabled = true
@@ -31,6 +33,7 @@ def pods(options = {})
    path: @prefix_path,
    fabric_enabled: fabric_enabled,
    hermes_enabled: hermes_enabled,
+    flipper_configuration: use_flipper ? FlipperConfiguration.enabled : FlipperConfiguration.disabled,
    app_path: "#{Dir.pwd}",
    config_file_dir: "#{Dir.pwd}/node_modules",
  )
@@ -46,10 +49,7 @@ def pods(options = {})
 end

 target 'RNTester' do
-  pods()
-  if !USE_FRAMEWORKS
-    use_flipper!
-  end
+  pods({}, :use_flipper => !IN_CI && !USE_FRAMEWORKS)
 end

 target 'RNTesterUnitTests' do
@@ -410,7 +410,6 @@
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				68CD48B71D2BCB2C007E06A9 /* Build JS Bundle */,
 				5CF0FD27207FC6EC00C13D65 /* Start Metro */,
-				2FCDFB64B37634EC8EC3139B /* [CP] Embed Pods Frameworks */,
 				A8DE6393E2BB72D8FBBF6C27 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
@@ -551,23 +550,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		2FCDFB64B37634EC8EC3139B /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		4930FC87997EBCAD361CEF12 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -913,6 +895,7 @@
 					"-ObjC",
 					"-lc++",
 				);
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../..";
 				SDKROOT = iphoneos;
 				WARNING_CFLAGS = (
 					"-Wextra",
@@ -989,6 +972,7 @@
 					"-ObjC",
 					"-lc++",
 				);
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../..";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 				WARNING_CFLAGS = (
@@ -15,9 +15,10 @@ LOCAL_PATH := $(THIS_DIR)

 include $(CLEAR_VARS)
 LOCAL_MODULE := rntester_appmodules
-# Note: Build the react-native-codegen output along with other app-specific C++ files.
+# Note: We are linking against react_codegen_rntester hence no need to built the react-native-codegen output.
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
 LOCAL_SHARED_LIBRARIES := \
  libfabricjni \
@@ -39,12 +39,12 @@
    "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",
-    "react": "17.0.2",
-    "react-native-codegen": "^0.0.15",
-    "react-test-renderer": "17.0.2",
+    "react": "18.0.0",
+    "react-native-codegen": "^0.69.1",
+    "react-test-renderer": "18.0.0",
    "shelljs": "^0.8.5",
    "signedsource": "^1.0.0",
    "ws": "^6.1.4",
@@ -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.
+
+# Helper class to configure flipper
+class FlipperConfiguration
+    attr_reader :flipper_enabled
+    attr_reader :configurations
+    attr_reader :versions
+
+    def initialize(flipper_enabled, configurations, versions)
+        @flipper_enabled = flipper_enabled
+        @configurations = configurations
+        @versions = versions
+    end
+
+    def self.enabled(configurations = ["Debug"], versions = {})
+        FlipperConfiguration.new(true, configurations, versions)
+    end
+
+    def self.disabled
+        FlipperConfiguration.new(false, [], {})
+    end
+
+    def == (other)
+        return @flipper_enabled == other.flipper_enabled &&
+            @configurations == other.configurations &&
+            @versions == other.versions
+    end
+  end
--- a/Show More
+++ b/Show More