expo-modules-autolinking 0.3.4 → 0.5.2

package/build/platforms/ios.js

@@ -3,19 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePackageListAsync = exports.resolveModuleAsync = void 0;
+exports.formatArrayOfReactDelegateHandler = exports.generatePackageListAsync = exports.resolveModuleAsync = void 0;
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
-/**
- * Resolves module search result with additional details required for iOS platform.
- */
-async function resolveModuleAsync(packageName, revision, options) {
+async function findPodspecFile(revision) {
     var _a;
-    const [podspecFile] = await fast_glob_1.default('*/*.podspec', {
+    if ((_a = revision.config) === null || _a === void 0 ? void 0 : _a.iosPodspecPath()) {
+        return revision.config.iosPodspecPath();
+    }
+    const [podspecFile] = await (0, fast_glob_1.default)('*/*.podspec', {
         cwd: revision.path,
         ignore: ['**/node_modules/**'],
     });
+    return podspecFile;
+}
+/**
+ * Resolves module search result with additional details required for iOS platform.
+ */
+async function resolveModuleAsync(packageName, revision, options) {
+    var _a, _b, _c;
+    const podspecFile = await findPodspecFile(revision);
     if (!podspecFile) {
         return null;
     }
@@ -26,6 +34,8 @@ async function resolveModuleAsync(packageName, revision, options) {
         podspecDir,
         flags: options.flags,
         modulesClassNames: (_a = revision.config) === null || _a === void 0 ? void 0 : _a.iosModulesClassNames(),
+        appDelegateSubscribers: (_b = revision.config) === null || _b === void 0 ? void 0 : _b.iosAppDelegateSubscribers(),
+        reactDelegateHandlers: (_c = revision.config) === null || _c === void 0 ? void 0 : _c.iosReactDelegateHandlers(),
     };
 }
 exports.resolveModuleAsync = resolveModuleAsync;
@@ -42,9 +52,17 @@ exports.generatePackageListAsync = generatePackageListAsync;
  * Generates the string to put into the generated package list.
  */
 async function generatePackageListFileContentAsync(modules, className) {
-    const modulesToProvide = modules.filter((module) => module.modulesClassNames.length > 0);
-    const pods = modulesToProvide.map((module) => module.podName);
-    const classNames = [].concat(...modulesToProvide.map((module) => module.modulesClassNames));
+    const modulesToImport = modules.filter((module) => module.modulesClassNames.length ||
+        module.appDelegateSubscribers.length ||
+        module.reactDelegateHandlers.length);
+    const pods = modulesToImport.map((module) => module.podName);
+    const modulesClassNames = []
+        .concat(...modulesToImport.map((module) => module.modulesClassNames))
+        .filter(Boolean);
+    const appDelegateSubscribers = []
+        .concat(...modulesToImport.map((module) => module.appDelegateSubscribers))
+        .filter(Boolean);
+    const reactDelegateHandlerModules = modulesToImport.filter((module) => !!module.reactDelegateHandlers.length);
     return `/**
  * Automatically generated by expo-modules-autolinking.
  *
@@ -57,10 +75,40 @@ ${pods.map((podName) => `import ${podName}\n`).join('')}
 @objc(${className})
 public class ${className}: ModulesProvider {
   public override func getModuleClasses() -> [AnyModule.Type] {
-    return [${classNames.map((className) => `\n      ${className}.self`).join(',')}
-    ]
+    return ${formatArrayOfClassNames(modulesClassNames)}
+  }
+
+  public override func getAppDelegateSubscribers() -> [ExpoAppDelegateSubscriber.Type] {
+    return ${formatArrayOfClassNames(appDelegateSubscribers)}
+  }
+
+  public override func getReactDelegateHandlers() -> [ExpoReactDelegateHandlerTupleType] {
+    return ${formatArrayOfReactDelegateHandler(reactDelegateHandlerModules)}
   }
 }
 `;
 }
+/**
+ * Formats an array of class names to Swift's array containing these classes.
+ */
+function formatArrayOfClassNames(classNames) {
+    const indent = '  ';
+    return `[${classNames.map((className) => `\n${indent.repeat(3)}${className}.self`).join(',')}
+${indent.repeat(2)}]`;
+}
+/**
+ * Formats an array of modules to Swift's array containing ReactDelegateHandlers
+ */
+function formatArrayOfReactDelegateHandler(modules) {
+    const values = [];
+    for (const module of modules) {
+        for (const handler of module.reactDelegateHandlers) {
+            values.push(`(packageName: "${module.packageName}", handler: ${handler}.self)`);
+        }
+    }
+    const indent = '  ';
+    return `[${values.map((value) => `\n${indent.repeat(3)}${value}`).join(',')}
+${indent.repeat(2)}]`;
+}
+exports.formatArrayOfReactDelegateHandler = formatArrayOfReactDelegateHandler;
 //# sourceMappingURL=ios.js.map

package/build/platforms/ios.js.map

@@ -1 +1 @@
-{"version":3,"file":"ios.js","sourceRoot":"","sources":["../../src/platforms/ios.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA6B;AAC7B,wDAA0B;AAC1B,gDAAwB;AAIxB;;GAEG;AACI,KAAK,UAAU,kBAAkB,CACtC,WAAmB,EACnB,QAAyB,EACzB,OAAsB;;IAEtB,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,mBAAI,CAAC,aAAa,EAAE;QAC9C,GAAG,EAAE,QAAQ,CAAC,IAAI;QAClB,MAAM,EAAE,CAAC,oBAAoB,CAAC;KAC/B,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,OAAO,GAAG,cAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IAEvE,OAAO;QACL,OAAO;QACP,UAAU;QACV,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,iBAAiB,EAAE,MAAA,QAAQ,CAAC,MAAM,0CAAE,oBAAoB,EAAE;KAC3D,CAAC;AACJ,CAAC;AAvBD,gDAuBC;AAED;;GAEG;AACI,KAAK,UAAU,wBAAwB,CAC5C,OAA2B,EAC3B,UAAkB;IAElB,MAAM,SAAS,GAAG,cAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IACtE,MAAM,oBAAoB,GAAG,MAAM,mCAAmC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE3F,MAAM,kBAAE,CAAC,UAAU,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;AACxD,CAAC;AARD,4DAQC;AAED;;GAEG;AACH,KAAK,UAAU,mCAAmC,CAChD,OAA2B,EAC3B,SAAiB;IAEjB,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzF,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAE5F,OAAO;;;;;;;;EAQP,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/C,SAAS;eACF,SAAS;;cAEV,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,WAAW,SAAS,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;;;CAIjF,CAAC;AACF,CAAC","sourcesContent":["import glob from 'fast-glob';\nimport fs from 'fs-extra';\nimport path from 'path';\n\nimport { ModuleDescriptor, PackageRevision, SearchOptions } from '../types';\n\n/**\n * Resolves module search result with additional details required for iOS platform.\n */\nexport async function resolveModuleAsync(\n  packageName: string,\n  revision: PackageRevision,\n  options: SearchOptions\n): Promise<ModuleDescriptor | null> {\n  const [podspecFile] = await glob('*/*.podspec', {\n    cwd: revision.path,\n    ignore: ['**/node_modules/**'],\n  });\n\n  if (!podspecFile) {\n    return null;\n  }\n\n  const podName = path.basename(podspecFile, path.extname(podspecFile));\n  const podspecDir = path.dirname(path.join(revision.path, podspecFile));\n\n  return {\n    podName,\n    podspecDir,\n    flags: options.flags,\n    modulesClassNames: revision.config?.iosModulesClassNames(),\n  };\n}\n\n/**\n * Generates Swift file that contains all autolinked Swift packages.\n */\nexport async function generatePackageListAsync(\n  modules: ModuleDescriptor[],\n  targetPath: string\n): Promise<void> {\n  const className = path.basename(targetPath, path.extname(targetPath));\n  const generatedFileContent = await generatePackageListFileContentAsync(modules, className);\n\n  await fs.outputFile(targetPath, generatedFileContent);\n}\n\n/**\n * Generates the string to put into the generated package list.\n */\nasync function generatePackageListFileContentAsync(\n  modules: ModuleDescriptor[],\n  className: string\n): Promise<string> {\n  const modulesToProvide = modules.filter((module) => module.modulesClassNames.length > 0);\n  const pods = modulesToProvide.map((module) => module.podName);\n  const classNames = [].concat(...modulesToProvide.map((module) => module.modulesClassNames));\n\n  return `/**\n * Automatically generated by expo-modules-autolinking.\n *\n * This autogenerated class provides a list of classes of native Expo modules,\n * but only these that are written in Swift and use the new API for creating Expo modules.\n */\n\nimport ExpoModulesCore\n${pods.map((podName) => `import ${podName}\\n`).join('')}\n@objc(${className})\npublic class ${className}: ModulesProvider {\n  public override func getModuleClasses() -> [AnyModule.Type] {\n    return [${classNames.map((className) => `\\n      ${className}.self`).join(',')}\n    ]\n  }\n}\n`;\n}\n"]}
+{"version":3,"file":"ios.js","sourceRoot":"","sources":["../../src/platforms/ios.ts"],"names":[],"mappings":"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","sourcesContent":["import glob from 'fast-glob';\nimport fs from 'fs-extra';\nimport path from 'path';\n\nimport { ModuleDescriptor, PackageRevision, SearchOptions } from '../types';\n\nasync function findPodspecFile(revision: PackageRevision): Promise<string | undefined> {\n  if (revision.config?.iosPodspecPath()) {\n    return revision.config.iosPodspecPath();\n  }\n\n  const [podspecFile] = await glob('*/*.podspec', {\n    cwd: revision.path,\n    ignore: ['**/node_modules/**'],\n  });\n\n  return podspecFile;\n}\n\n/**\n * Resolves module search result with additional details required for iOS platform.\n */\nexport async function resolveModuleAsync(\n  packageName: string,\n  revision: PackageRevision,\n  options: SearchOptions\n): Promise<ModuleDescriptor | null> {\n  const podspecFile = await findPodspecFile(revision);\n  if (!podspecFile) {\n    return null;\n  }\n\n  const podName = path.basename(podspecFile, path.extname(podspecFile));\n  const podspecDir = path.dirname(path.join(revision.path, podspecFile));\n\n  return {\n    podName,\n    podspecDir,\n    flags: options.flags,\n    modulesClassNames: revision.config?.iosModulesClassNames(),\n    appDelegateSubscribers: revision.config?.iosAppDelegateSubscribers(),\n    reactDelegateHandlers: revision.config?.iosReactDelegateHandlers(),\n  };\n}\n\n/**\n * Generates Swift file that contains all autolinked Swift packages.\n */\nexport async function generatePackageListAsync(\n  modules: ModuleDescriptor[],\n  targetPath: string\n): Promise<void> {\n  const className = path.basename(targetPath, path.extname(targetPath));\n  const generatedFileContent = await generatePackageListFileContentAsync(modules, className);\n\n  await fs.outputFile(targetPath, generatedFileContent);\n}\n\n/**\n * Generates the string to put into the generated package list.\n */\nasync function generatePackageListFileContentAsync(\n  modules: ModuleDescriptor[],\n  className: string\n): Promise<string> {\n  const modulesToImport = modules.filter(\n    (module) =>\n      module.modulesClassNames.length ||\n      module.appDelegateSubscribers.length ||\n      module.reactDelegateHandlers.length\n  );\n  const pods = modulesToImport.map((module) => module.podName);\n\n  const modulesClassNames = []\n    .concat(...modulesToImport.map((module) => module.modulesClassNames))\n    .filter(Boolean);\n\n  const appDelegateSubscribers = []\n    .concat(...modulesToImport.map((module) => module.appDelegateSubscribers))\n    .filter(Boolean);\n\n  const reactDelegateHandlerModules = modulesToImport.filter(\n    (module) => !!module.reactDelegateHandlers.length\n  );\n\n  return `/**\n * Automatically generated by expo-modules-autolinking.\n *\n * This autogenerated class provides a list of classes of native Expo modules,\n * but only these that are written in Swift and use the new API for creating Expo modules.\n */\n\nimport ExpoModulesCore\n${pods.map((podName) => `import ${podName}\\n`).join('')}\n@objc(${className})\npublic class ${className}: ModulesProvider {\n  public override func getModuleClasses() -> [AnyModule.Type] {\n    return ${formatArrayOfClassNames(modulesClassNames)}\n  }\n\n  public override func getAppDelegateSubscribers() -> [ExpoAppDelegateSubscriber.Type] {\n    return ${formatArrayOfClassNames(appDelegateSubscribers)}\n  }\n\n  public override func getReactDelegateHandlers() -> [ExpoReactDelegateHandlerTupleType] {\n    return ${formatArrayOfReactDelegateHandler(reactDelegateHandlerModules)}\n  }\n}\n`;\n}\n\n/**\n * Formats an array of class names to Swift's array containing these classes.\n */\nfunction formatArrayOfClassNames(classNames: string[]): string {\n  const indent = '  ';\n  return `[${classNames.map((className) => `\\n${indent.repeat(3)}${className}.self`).join(',')}\n${indent.repeat(2)}]`;\n}\n\n/**\n * Formats an array of modules to Swift's array containing ReactDelegateHandlers\n */\nexport function formatArrayOfReactDelegateHandler(modules: ModuleDescriptor[]): string {\n  const values: string[] = [];\n  for (const module of modules) {\n    for (const handler of module.reactDelegateHandlers) {\n      values.push(`(packageName: \"${module.packageName}\", handler: ${handler}.self)`);\n    }\n  }\n  const indent = '  ';\n  return `[${values.map((value) => `\\n${indent.repeat(3)}${value}`).join(',')}\n${indent.repeat(2)}]`;\n}\n"]}

package/build/types.d.ts

@@ -5,6 +5,7 @@ export interface SearchOptions {
     ignorePaths?: string[] | null;
     exclude?: string[] | null;
     platform: SupportedPlatform;
+    silent?: boolean;
     flags?: Record<string, any>;
 }
 export interface ResolveOptions extends SearchOptions {
@@ -15,6 +16,10 @@ export interface GenerateOptions extends ResolveOptions {
     namespace?: string;
     empty?: boolean;
 }
+export interface PatchReactImportsOptions {
+    podsRoot: string;
+    dryRun: boolean;
+}
 export declare type PackageRevision = {
     path: string;
     version: string;
@@ -41,5 +46,26 @@ export interface RawExpoModuleConfig {
          * Names of Swift native modules classes to put to the generated modules provider file.
          */
         modulesClassNames?: string[];
+        /**
+         * Names of Swift classes that hooks into `ExpoAppDelegate` to receive AppDelegate life-cycle events.
+         */
+        appDelegateSubscribers?: string[];
+        /**
+         * Names of Swift classes that implement `ExpoReactDelegateHandler` to hook React instance creation.
+         */
+        reactDelegateHandlers?: string[];
+        /**
+         * Podspec relative path.
+         */
+        podspecPath?: string;
+    };
+    /**
+     * Android-specific config.
+     */
+    android?: {
+        /**
+         * Full names (package + class name) of Kotlin native modules classes to put to the generated package provider file.
+         */
+        modulesClassNames?: string[];
     };
 }

package/build/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import { ExpoModuleConfig } from './ExpoModuleConfig';\n\nexport type SupportedPlatform = 'ios' | 'android' | 'web';\n\nexport interface SearchOptions {\n  // Available in the CLI\n  searchPaths: string[];\n  ignorePaths?: string[] | null;\n  exclude?: string[] | null;\n  platform: SupportedPlatform;\n\n  // Scratched from project's config\n  flags?: Record<string, any>;\n}\n\nexport interface ResolveOptions extends SearchOptions {\n  json?: boolean;\n}\n\nexport interface GenerateOptions extends ResolveOptions {\n  target: string;\n  namespace?: string;\n  empty?: boolean;\n}\n\nexport type PackageRevision = {\n  path: string;\n  version: string;\n  config?: ExpoModuleConfig;\n  duplicates?: PackageRevision[];\n};\n\nexport type SearchResults = {\n  [moduleName: string]: PackageRevision;\n};\n\nexport type ModuleDescriptor = Record<string, any>;\n\n/**\n * Represents a raw config from `expo-module.json`.\n */\nexport interface RawExpoModuleConfig {\n  /**\n   * An array of supported platforms.\n   */\n  platforms?: SupportedPlatform[];\n\n  /**\n   * iOS-specific config.\n   */\n  ios?: {\n    /**\n     * Names of Swift native modules classes to put to the generated modules provider file.\n     */\n    modulesClassNames?: string[];\n  };\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import { ExpoModuleConfig } from './ExpoModuleConfig';\n\nexport type SupportedPlatform = 'ios' | 'android' | 'web';\n\nexport interface SearchOptions {\n  // Available in the CLI\n  searchPaths: string[];\n  ignorePaths?: string[] | null;\n  exclude?: string[] | null;\n  platform: SupportedPlatform;\n  silent?: boolean;\n\n  // Scratched from project's config\n  flags?: Record<string, any>;\n}\n\nexport interface ResolveOptions extends SearchOptions {\n  json?: boolean;\n}\n\nexport interface GenerateOptions extends ResolveOptions {\n  target: string;\n  namespace?: string;\n  empty?: boolean;\n}\n\nexport interface PatchReactImportsOptions {\n  podsRoot: string;\n  dryRun: boolean;\n}\n\nexport type PackageRevision = {\n  path: string;\n  version: string;\n  config?: ExpoModuleConfig;\n  duplicates?: PackageRevision[];\n};\n\nexport type SearchResults = {\n  [moduleName: string]: PackageRevision;\n};\n\nexport type ModuleDescriptor = Record<string, any>;\n\n/**\n * Represents a raw config from `expo-module.json`.\n */\nexport interface RawExpoModuleConfig {\n  /**\n   * An array of supported platforms.\n   */\n  platforms?: SupportedPlatform[];\n\n  /**\n   * iOS-specific config.\n   */\n  ios?: {\n    /**\n     * Names of Swift native modules classes to put to the generated modules provider file.\n     */\n    modulesClassNames?: string[];\n\n    /**\n     * Names of Swift classes that hooks into `ExpoAppDelegate` to receive AppDelegate life-cycle events.\n     */\n    appDelegateSubscribers?: string[];\n\n    /**\n     * Names of Swift classes that implement `ExpoReactDelegateHandler` to hook React instance creation.\n     */\n    reactDelegateHandlers?: string[];\n\n    /**\n     * Podspec relative path.\n     */\n    podspecPath?: string;\n  };\n\n  /**\n   * Android-specific config.\n   */\n  android?: {\n    /**\n     * Full names (package + class name) of Kotlin native modules classes to put to the generated package provider file.\n     */\n    modulesClassNames?: string[];\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-autolinking",
-  "version": "0.3.4",
+  "version": "0.5.2",
   "description": "Scripts that autolink Expo modules.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,8 +44,8 @@
     "chalk": "^4.1.0",
     "commander": "^7.2.0",
     "fast-glob": "^3.2.5",
-    "find-up": "~5.0.0",
+    "find-up": "^5.0.0",
     "fs-extra": "^9.1.0"
   },
-  "gitHead": "f93456e96091501a9b9f99246846cee29336a964"
+  "gitHead": "0546c63f2d7c25315dd709de8a1c7a3478d83564"
 }

package/scripts/android/autolinking_implementation.gradle

@@ -166,6 +166,7 @@ if (rootProject instanceof ProjectDescriptor) {
       return
     }
 
+    println ''
     println 'Using expo modules'
 
     for (module in modules) {
@@ -181,8 +182,10 @@ if (rootProject instanceof ProjectDescriptor) {
         continue
       }
 
-      println "— ${Colors.GREEN}${module.name}${Colors.RESET} (${module.version})"
+      println "  - ${Colors.GREEN}${module.name}${Colors.RESET} (${module.version})"
     }
+
+    println ''
   }
 
   // Adding dependencies

package/scripts/ios/React-Core.modulemap

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

package/scripts/ios/autolinking_manager.rb

@@ -2,6 +2,7 @@ require_relative 'constants'
 require_relative 'package'
 
 # Require extensions to CocoaPods' classes
+require_relative 'cocoapods/sandbox'
 require_relative 'cocoapods/target_definition'
 require_relative 'cocoapods/user_project_integrator'
 

package/scripts/ios/cocoapods/sandbox.rb

@@ -0,0 +1,75 @@
+# Overrides CocoaPods `Sandbox` class to patch podspecs on the fly
+# See: https://github.com/CocoaPods/CocoaPods/blob/master/lib/cocoapods/sandbox.rb
+
+require 'json'
+
+module Pod
+  class Sandbox
+    private
+
+    _original_store_podspec = instance_method(:store_podspec)
+
+    public
+
+    define_method(:store_podspec) do |name, podspec, _external_source, json|
+      spec = _original_store_podspec.bind(self).(name, podspec, _external_source, json)
+      patched_spec = nil
+
+      # Patch `React-Core.podspec` for clang to generate correct submodules for swift integration
+      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.
+        hermes_subspec_index = spec_json['subspecs'].index { |subspec| subspec['name'] == 'Hermes' }
+        if hermes_subspec_index
+          spec_json['subspecs'][hermes_subspec_index]['private_header_files'] ||= [
+            'ReactCommon/hermes/executor/*.h',
+            'ReactCommon/hermes/inspector/*.h',
+            'ReactCommon/hermes/inspector/chrome/*.h',
+            'ReactCommon/hermes/inspector/detail/*.h',
+          ]
+        end
+
+        patched_spec = Specification.from_json(spec_json.to_json)
+
+      # Patch `ReactCommon.podspec` to define module
+      elsif name == 'ReactCommon'
+        spec_json = JSON.parse(podspec.to_pretty_json)
+        spec_json['pod_target_xcconfig']['DEFINES_MODULE'] = 'YES'
+        patched_spec = Specification.from_json(spec_json.to_json)
+      end
+
+      if patched_spec != nil
+        # Store the patched spec with original checksum and local saved file path
+        patched_spec.defined_in_file = spec.defined_in_file
+        patched_spec.instance_variable_set(:@checksum, spec.checksum)
+        @stored_podspecs[spec.name] = patched_spec
+        return patched_spec
+      end
+
+      return spec
+    end # define_method(:store_podspec)
+
+  end # class Sandbox
+end # module Pod

package/scripts/ios/react_import_patcher.rb

@@ -0,0 +1,72 @@
+# Copyright 2018-present 650 Industries. All rights reserved.
+
+module Expo
+  class ReactImportPatcher
+
+    public def initialize(installer, options)
+      @root = installer.sandbox.root
+      @module_dirs = get_module_dirs(installer)
+      @options = options
+    end
+
+    public def run!
+      args = [
+        'node',
+        '--eval',
+        'require(\'expo-modules-autolinking\')(process.argv.slice(1))',
+        'patch-react-imports',
+        '--pods-root',
+        Shellwords.escape(File.expand_path(@root)),
+      ]
+
+      if @options[:dry_run]
+        args.append('--dry-run')
+      end
+
+      @module_dirs.each do |dir|
+        args.append(Shellwords.escape(File.expand_path(dir)))
+      end
+      Pod::UI.message "Executing ReactImportsPatcher node command: #{args.join(' ')}"
+
+      time_begin = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      system(*args)
+      elapsed_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) - time_begin
+      Pod::UI.info "expo_patch_react_imports! took #{elapsed_time.round(4)} seconds to transform files."
+    end
+
+    private def get_module_dirs(installer)
+      unless installer.pods_project
+        Pod::UI.message '`pods_project` not found. This is expected when `:incremental_installation` is enabled in your project\'s Podfile.'
+        return []
+      end
+
+      result = []
+      installer.pods_project.development_pods.children.each do |pod|
+        if pod.is_a?(Xcodeproj::Project::Object::PBXFileReference) && pod.path.end_with?('.xcodeproj')
+          # Support generate_multiple_pod_projects or use_frameworks!
+          project = Xcodeproj::Project.open(File.join(installer.sandbox.root, pod.path))
+          groups = project.groups.select { |group| !(['Dependencies', 'Frameworks', 'Products'].include? group.name) }
+          groups.each do |group|
+            unless group.path.start_with? '../'
+              raise 'CocoaPods does not put pod subprojects inside nested directories'
+            end
+            result.append(group.path[3..])
+          end
+        else
+          unless pod.path.start_with? '../'
+            raise 'CocoaPods does not put pod subgroups inside nested directories'
+          end
+          result.append(pod.path[3..])
+        end
+      end
+
+      return result.select { |dir|
+        # Exclude known dirs unnecessary to patch and reduce processing time
+        !dir.include?('/react-native/') &&
+        !dir.end_with?('/react-native') &&
+        !dir.include?('/expo-')
+      }
+    end
+
+  end # class ReactImportPatcher
+end # module Expo

package/src/ExpoModuleConfig.ts

@@ -20,6 +20,34 @@ export class ExpoModuleConfig {
     return this.rawConfig.ios?.modulesClassNames ?? [];
   }
 
+  /**
+   * Returns a list of names of Swift classes that receives AppDelegate life-cycle events.
+   */
+  iosAppDelegateSubscribers(): string[] {
+    return this.rawConfig.ios?.appDelegateSubscribers ?? [];
+  }
+
+  /**
+   * Returns a list of names of Swift classes that implement `ExpoReactDelegateHandler`.
+   */
+  iosReactDelegateHandlers(): string[] {
+    return this.rawConfig.ios?.reactDelegateHandlers ?? [];
+  }
+
+  /**
+   * Returns a podspec path defined by the module author.
+   */
+  iosPodspecPath(): string | undefined {
+    return this.rawConfig.ios?.podspecPath;
+  }
+
+  /**
+   * Returns a list of names of Kotlin native modules classes to put to the generated package provider file.
+   */
+  androidModulesClassNames() {
+    return this.rawConfig.android?.modulesClassNames ?? [];
+  }
+
   /**
    * Returns serializable raw config.
    */

package/src/ReactImportsPatcher.ts

@@ -0,0 +1,78 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+import glob from 'fast-glob';
+import fs from 'fs-extra';
+import path from 'path';
+
+import { PatchReactImportsOptions } from './types';
+
+/**
+ * Remove all double-quoted react header imports
+ * @param dirs target directories to patch
+ * @param options PatchReactImportsOptions
+ */
+export async function patchReactImportsAsync(dirs: string[], options: PatchReactImportsOptions) {
+  const headerSet = await generateReactHeaderSetAsync(
+    path.join(options.podsRoot, 'Headers', 'Public', 'React-Core', 'React')
+  );
+  await Promise.all(dirs.map((dir) => patchDirAsync(headerSet, dir, options.dryRun)));
+}
+
+/**
+ * Generate `React-Core` public header names as a set, will transform necessary headers based on this set.
+ */
+async function generateReactHeaderSetAsync(reactHeaderDir: string): Promise<Set<string>> {
+  const files = await glob('*.h', { cwd: reactHeaderDir });
+  return new Set(files);
+}
+
+/**
+ * Patch imports from a file
+ * @param headerSet prebuilt React-Core header set
+ * @param file target patch file
+ * @param dryRun true if not writing changes to file
+ */
+export async function patchFileAsync(headerSet: Set<string>, file: string, dryRun: boolean) {
+  let changed = false;
+  const content = await fs.readFile(file, 'utf-8');
+  const transformContent = content.replace(
+    /^#import\s+"(.+)"$/gm,
+    (match: string, headerName: string): string => {
+      // `#import "RCTBridge.h"` -> `#import <React/RCTBridge.h>`
+      if (headerSet.has(headerName)) {
+        changed = true;
+        return `#import <React/${headerName}>`;
+      }
+
+      // `#import "React/RCTBridge.h"` -> `#import <React/RCTBridge.h>`
+      if (headerName.startsWith('React/')) {
+        const name = headerName.substring(6);
+        if (headerSet.has(name)) {
+          changed = true;
+          return `#import <React/${name}>`;
+        }
+      }
+
+      // Otherwise, return original import
+      return match;
+    }
+  );
+
+  if (changed) {
+    console.log(`Patching imports for file: ${file}`);
+  }
+  if (!dryRun) {
+    await fs.writeFile(file, transformContent);
+  }
+}
+
+/**
+ * Patch imports from a directory
+ * @param headerSet prebuilt React-Core header set
+ * @param file target patch file
+ * @param dryRun true if not writing changes to file
+ */
+async function patchDirAsync(headerSet: Set<string>, dir: string, dryRun: boolean) {
+  const files = await glob('**/*.{h,m,mm}', { cwd: dir, absolute: true });
+  return Promise.all(files.map((file) => patchFileAsync(headerSet, file, dryRun)));
+}

package/src/autolinking.ts

@@ -127,13 +127,16 @@ export async function findModulesAsync(providedOptions: SearchOptions): Promise<
   if (options.searchPaths.length <= 1) {
     return results;
   }
-  return filterToProjectDependencies(results);
+  return filterToProjectDependencies(results, providedOptions);
 }
 
 /**
  * Filters out packages that are not the dependencies of the project.
  */
-function filterToProjectDependencies(results: SearchResults) {
+function filterToProjectDependencies(
+  results: SearchResults,
+  options: Pick<SearchOptions, 'silent'> = {}
+) {
   const filteredResults: SearchResults = {};
   const visitedPackages = new Set<string>();
 
@@ -160,11 +163,11 @@ function filterToProjectDependencies(results: SearchResults) {
         } else {
           try {
             dependencyPackageJsonPath = projectRequire.resolve(`${dependencyName}/package.json`);
-          } catch (error) {
+          } catch (error: any) {
             // Some packages don't include package.json in its `exports` field,
             // but none of our packages do that, so it seems fine to just ignore that type of error.
             // Related issue: https://github.com/react-native-community/cli/issues/1168
-            if (error.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED') {
+            if (!options.silent && error.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED') {
               console.warn(
                 chalk.yellow(`⚠️  Cannot resolve the path to "${dependencyName}" package.`)
               );
@@ -285,6 +288,7 @@ export async function generatePackageListAsync(
     console.error(
       chalk.red(`Generating package list is not available for platform: ${options.platform}`)
     );
+    throw e;
   }
 }
 

package/src/index.ts

@@ -1,5 +1,6 @@
 import commander from 'commander';
 
+import { patchReactImportsAsync } from './ReactImportsPatcher';
 import {
   findModulesAsync,
   resolveModulesAsync,
@@ -33,6 +34,7 @@ function registerSearchCommand<OptionsType extends SearchOptions>(
       'The platform that the resulting modules must support. Available options: "ios", "android"',
       'ios'
     )
+    .option('--silent', 'Silence resolution warnings')
     .action(async (searchPaths, providedOptions) => {
       const options = await mergeLinkingOptionsAsync<OptionsType>({
         ...providedOptions,
@@ -53,6 +55,15 @@ function registerResolveCommand<OptionsType extends ResolveOptions>(
   return registerSearchCommand<OptionsType>(commandName, fn);
 }
 
+// Register for `patch-react-imports` command
+function registerPatchReactImportsCommand() {
+  return commander
+    .command('patch-react-imports [paths...]')
+    .requiredOption('--pods-root <podsRoot>', 'The path to `Pods` directory')
+    .option('--dry-run', 'Only list files without writing changes to the file system')
+    .action(patchReactImportsAsync);
+}
+
 module.exports = async function (args: string[]) {
   // Searches for available expo modules.
   registerSearchCommand<SearchOptions & { json?: boolean }>('search', async (results, options) => {
@@ -101,6 +112,8 @@ module.exports = async function (args: string[]) {
       false
     );
 
+  registerPatchReactImportsCommand();
+
   await commander
     .version(require('expo-modules-autolinking/package.json').version)
     .description('CLI command that searches for Expo modules to autolink them.')

package/src/platforms/android.ts

@@ -42,6 +42,7 @@ export async function resolveModuleAsync(
   return {
     projectName: convertPackageNameToProjectName(packageName),
     sourceDir,
+    modulesClassNames: revision.config?.androidModulesClassNames(),
   };
 }
 
@@ -57,32 +58,51 @@ async function generatePackageListFileContentAsync(
     modules.filter((module) => module.packageName !== 'expo')
   );
 
+  const modulesClasses = await findAndroidModules(modules);
+
   return `package ${namespace};
 
 import java.util.Arrays;
 import java.util.List;
 import expo.modules.core.interfaces.Package;
+import expo.modules.kotlin.modules.Module;
+import expo.modules.kotlin.ModulesProvider;
 
-public class ExpoModulesPackageList {
+public class ExpoModulesPackageList implements ModulesProvider {
   private static class LazyHolder {
     static final List<Package> packagesList = Arrays.<Package>asList(
 ${packagesClasses.map((packageClass) => `      new ${packageClass}()`).join(',\n')}
     );
+
+    static final List<Class<? extends Module>> modulesList = Arrays.<Class<? extends Module>>asList(
+      ${modulesClasses.map((moduleClass) => `      ${moduleClass}.class`).join(',\n')}
+    );
   }
 
   public static List<Package> getPackageList() {
     return LazyHolder.packagesList;
   }
+
+  @Override
+  public List<Class<? extends Module>> getModulesList() {
+    return LazyHolder.modulesList;
+  }
 }
 `;
 }
 
+function findAndroidModules(modules: ModuleDescriptor[]): string[] {
+  const modulesToProvide = modules.filter((module) => module.modulesClassNames.length > 0);
+  const classNames = [].concat(...modulesToProvide.map((module) => module.modulesClassNames));
+  return classNames;
+}
+
 async function findAndroidPackagesAsync(modules: ModuleDescriptor[]): Promise<string[]> {
   const classes: string[] = [];
 
   await Promise.all(
     modules.map(async (module) => {
-      const files = await glob('src/**/*Package.{java,kt}', {
+      const files = await glob('**/*Package.{java,kt}', {
         cwd: module.sourceDir,
       });