expo-modules-autolinking 0.5.4 → 0.5.5

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.5.5 — 2022-01-05
+
+### 🐛 Bug fixes
+
+- Fix `umbrella directory '../../Public/React-Core/React' not found` build error when in `use_frameworks!` mode. ([#15773](https://github.com/expo/expo/pull/15773) by [@kudo](https://github.com/kudo))
+
 ## 0.5.4 — 2021-12-29
 
 ### 🐛 Bug fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-autolinking",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Scripts that autolink Expo modules.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -47,5 +47,5 @@
     "find-up": "^5.0.0",
     "fs-extra": "^9.1.0"
   },
-  "gitHead": "a4ab2a9da154d6d78cc7eaafed5a263aba693ec8"
+  "gitHead": "81d318c3ac2db24ba192d2b3fc5a2dd1bbd8bd4d"
 }

package/scripts/ios/autolinking_manager.rb

@@ -2,8 +2,10 @@ require_relative 'constants'
 require_relative 'package'
 
 # Require extensions to CocoaPods' classes
+require_relative 'cocoapods/pod_target'
 require_relative 'cocoapods/sandbox'
 require_relative 'cocoapods/target_definition'
+require_relative 'cocoapods/umbrella_header_generator'
 require_relative 'cocoapods/user_project_integrator'
 
 module Expo

package/scripts/ios/cocoapods/pod_target.rb

@@ -0,0 +1,50 @@
+module Pod
+  class PodTarget
+    private
+
+    _original_module_map_path = instance_method(:module_map_path)
+
+    public
+
+    # CocoaPods's default modulemap did not generate submodules correctly
+    # `ios/Pods/Headers/Public/React/React-Core.modulemap`
+    # ```
+    # module React {
+    #   umbrella header "React-Core-umbrella.h"
+    #
+    #   export *
+    #   module * { export * }
+    # }
+    # ```
+    # clang will generate submodules for headers relative to the umbrella header directory.
+    # https://github.com/llvm/llvm-project/blob/2782cb8da0b3c180fa7c8627cb255a026f3d25a2/clang/lib/Lex/ModuleMap.cpp#L1133
+    # In this case, it is `ios/Pods/Headers/Public/React`.
+    # But the React public headers are placed in `ios/Pods/Headers/Public/React-Core/React`, so clang cannot find the headers and generate submodules.
+    #
+    # This case happens when a pod's name different to its module name, e.g. the pod name is `React-Core` but the module name is `React` since it defines header_dir as `React`.
+    # To fix the issue, we rewrite the `module_map_path` and `umbrella_header_path` to be with the public headers,
+    # i.e. `ios/Pods/Headers/Public/React-Core/React/React-Core.modulemap` and `ios/Pods/Headers/Public/React-Core/React/React-Core-umbrella.h`
+    #
+    def rewrite_module_dir
+      if ['React-Core'].include?(name) && product_module_name != name
+        return sandbox.public_headers.root + name + product_module_name
+      end
+      return nil
+    end
+
+    def umbrella_header_path
+      if dir = self.rewrite_module_dir
+        return dir + "#{label}-umbrella.h"
+      end
+      super
+    end
+
+    define_method(:module_map_path) do
+      if dir = self.rewrite_module_dir
+        return dir + "#{label}.modulemap"
+      end
+      _original_module_map_path.bind(self).()
+    end
+
+  end # class PodTarget
+end # module Pod

package/scripts/ios/cocoapods/sandbox.rb

@@ -19,25 +19,6 @@ module Pod
       if name == 'React-Core'
         spec_json = JSON.parse(spec.to_pretty_json)
 
-        # CocoaPods's default modulemap did not generate submodules correctly
-        # `ios/Pods/Headers/Public/React/React-Core.modulemap`
-        # ```
-        # module React {
-        #   umbrella header "React-Core-umbrella.h"
-        #
-        #   export *
-        #   module * { export * }
-        # }
-        # ```
-        # clang will generate submodules for headers relative to the umbrella header directory.
-        # https://github.com/llvm/llvm-project/blob/2782cb8da0b3c180fa7c8627cb255a026f3d25a2/clang/lib/Lex/ModuleMap.cpp#L1133
-        # In this case, it is `ios/Pods/Headers/Public/React`.
-        # But React headers are placed in `ios/Pods/Headers/Public/React-Core/React`, so clang cannot find the headers and generate submodules.
-        # We patch `React-Core.podspec` to use custom modulemap and use `umbrella "../../Public/React-Core/React"` for clang to generate submodules correctly.
-        # Since CocoaPods generates the umbrella headers based on public headers,
-        # it is pretty safe to replace the umbrella header with the `umbrella` directory search inside the public headers directory.
-        spec_json['module_map'] ||= File.join(__dir__, '..', 'React-Core.modulemap')
-
         # clang module does not support objc++.
         # We should put Hermes headers inside private headers directory.
         # Otherwise, clang will throw errors in building module.

package/scripts/ios/cocoapods/umbrella_header_generator.rb

@@ -0,0 +1,22 @@
+module Pod
+  module Generator
+    class UmbrellaHeader
+      private
+
+      _original_generate = instance_method(:generate)
+
+      public
+
+      define_method (:generate) do
+        if self.target.is_a?(Pod::PodTarget) && self.target.rewrite_module_dir
+          # If we write the `umbrella_header_path`, the import headers are in the same directory,
+          # e.g. `#import "React/RCTBridge.h"` -> `#import "RCTBridge.h"`
+          self.imports = self.imports.map { |import| import.basename }
+        end
+
+        _original_generate.bind(self).()
+      end
+
+    end # class UmbrellaHeader
+  end # module Generator
+end # module Pod

package/scripts/ios/React-Core.modulemap

@@ -1,6 +0,0 @@
-module React {
-  umbrella "../../Public/React-Core/React"
-
-  export *
-  module * { export * }
-}