More testing

Author: NickGerleman

packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec

@@ -37,7 +37,7 @@ header_search_paths = [
   "${PODS_ROOT}/Headers/Public/FlipperKit",
   "$(PODS_ROOT)/Headers/Public/ReactCommon",
   "$(PODS_ROOT)/Headers/Public/React-RCTFabric",
-  "$(PODS_ROOT)/Headers/Private/Yoga",
+  # "$(PODS_ROOT)/Headers/Private/Yoga",
 ].concat(use_hermes ? [
   "$(PODS_ROOT)/Headers/Public/React-hermes",
   "$(PODS_ROOT)/Headers/Public/hermes-engine"

packages/react-native/React/React-RCTFabric.podspec

@@ -27,7 +27,7 @@ header_search_paths = [
   "\"$(PODS_ROOT)/DoubleConversion\"",
   "\"$(PODS_ROOT)/RCT-Folly\"",
   "\"$(PODS_ROOT)/Headers/Private/React-Core\"",
-  "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
+  # "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
   "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"",
   "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"",
 

packages/react-native/ReactCommon/React-Fabric.podspec

@@ -82,7 +82,7 @@ Pod::Spec.new do |s|
       "\"$(PODS_ROOT)/boost\"",
       "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"",
       "\"$(PODS_ROOT)/RCT-Folly\"",
-      "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
+     # "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
     ]
 
     if ENV['USE_FRAMEWORKS']
@@ -127,7 +127,6 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/activityindicator/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/activityindicator/tests"
       sss.header_dir           = "react/renderer/components/activityindicator"
-      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
     end
 
     ss.subspec "image" do |sss|
@@ -230,7 +229,7 @@ Pod::Spec.new do |s|
       sss.source_files         = "react/renderer/components/view/**/*.{m,mm,cpp,h}"
       sss.exclude_files        = "react/renderer/components/view/tests"
       sss.header_dir           = "react/renderer/components/view"
-
+      # ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/Yoga\"" }
     end
   end
 

packages/react-native/ReactCommon/yoga/Yoga.podspec

@@ -51,7 +51,12 @@ Pod::Spec.new do |spec|
   source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
   spec.source_files = source_files
 
-  header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
-  header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
-  spec.public_header_files = header_files
+  public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
+  public_header_files = File.join('ReactCommon/yoga', public_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
+  spec.public_header_files = public_header_files
+
+  # Fabric must be able to access private headers (which should not be included in the umbrella header)
+  all_header_files = 'yoga/**/*.h'
+  all_header_files = File.join('ReactCommon/yoga', all_header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
+  spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files)
 end

packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb

@@ -547,7 +547,7 @@ def get_podspec_no_fabric_no_script
               "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
               "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
               "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
-              "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
+             # "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
             ].join(' ')
           },
           'dependencies': {

packages/react-native/scripts/cocoapods/codegen_utils.rb

@@ -83,7 +83,7 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa
           "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
           "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
           "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
-          "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
+         # "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
         ]
         framework_search_paths = []