expo-modules-autolinking 3.1.0-canary-20251008-6acbc1c → 3.1.0-canary-20251009-9919e08

package/CHANGELOG.md

@@ -7,15 +7,18 @@
 ### 🎉 New features
 
 - Added support for cli command extensions in the interactive devtools menu ([#39598](https://github.com/expo/expo/pull/39598) by [@chrfalch](https://github.com/chrfalch))
+- [Android] Sync flavor dimensions and product flavors from app to expo module ([#40238](https://github.com/expo/expo/pull/40238) by [@kosmydel](https://github.com/kosmydel))
 
 ### 🐛 Bug fixes
 
+- [iOS] Added build phase script for a workaround to autolinking-generated react-native-config output not being used in ReactCodegen script phase due to temp output directory. ([#40219](https://github.com/expo/expo/pull/40219) by [@chrfalch](https://github.com/chrfalch))
 - [Android] Fix passing exclude options. ([#40014](https://github.com/expo/expo/pull/40014) by [@jakex7](https://github.com/jakex7))
 
 ### 💡 Others
 
 - [Android] Move generate-package-list to Gradle task ([#39917](https://github.com/expo/expo/pull/39917) by [@jakex7](https://github.com/jakex7))
 - [Android] Use module name from `expo-module.config.json`. ([#39985](https://github.com/expo/expo/pull/39985) by [@jakex7](https://github.com/jakex7))
+- Check `react-native` and `react-native-tvos` for duplicates in the verify command explicitly ([#40180](https://github.com/expo/expo/pull/40180) by [@kitten](https://github.com/kitten))
 
 ## 3.0.14 - 2025-10-01
 

package/android/expo-gradle-plugin/expo-autolinking-plugin/src/main/kotlin/expo/modules/plugin/ExpoAutolinkingPlugin.kt

@@ -1,6 +1,7 @@
 package expo.modules.plugin
 
 import com.android.build.api.variant.AndroidComponentsExtension
+import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.internal.tasks.factory.dependsOn
 import expo.modules.plugin.configuration.ExpoModule
 import expo.modules.plugin.text.Colors
@@ -27,6 +28,9 @@ open class ExpoAutolinkingPlugin : Plugin<Project> {
     project.logger.quiet("")
     project.logger.quiet("Using expo modules")
 
+    val appProject = findAppProject(project.rootProject)
+    appProject?.let { copyAppDimensionsAndFlavorsToProject(project, it) }
+
     val (prebuiltProjects, projects) = config.allProjects.partition { project ->
       project.usePublication
     }
@@ -88,4 +92,79 @@ open class ExpoAutolinkingPlugin : Plugin<Project> {
       it.modules = modules
     }
   }
+
+  private fun findAppProject(root: Project): Project? {
+    return root.allprojects.firstOrNull { it.plugins.hasPlugin("com.android.application") }
+  }
+
+  private fun copyAppDimensionsAndFlavorsToProject(
+    project: Project,
+    appProject: Project
+  ) {
+    val appAndroid = appProject.extensions.findByName("android") as? BaseExtension ?: run {
+      return
+    }
+    val consumerAndroid = project.extensions.findByName("android") as? BaseExtension ?: run {
+      return
+    }
+
+    val appDimensions = syncFlavorDimensions(project, consumerAndroid, appAndroid)
+    copyMissingProductFlavors(project, consumerAndroid, appAndroid, appDimensions)
+  }
+
+  private fun syncFlavorDimensions(
+    project: Project,
+    consumerAndroid: BaseExtension,
+    appAndroid: BaseExtension
+  ): List<String> {
+    val appDimensions = appAndroid
+      .flavorDimensionList
+      .takeIf { it.isNotEmpty() }
+      ?: return emptyList()
+
+    val consumerDimensions = (consumerAndroid.flavorDimensionList).toMutableList()
+    val dimensionsAdded = appDimensions.any { dimension ->
+      if (dimension !in consumerDimensions) {
+        consumerDimensions.add(dimension)
+        true
+      } else {
+        false
+      }
+    }
+
+    if (dimensionsAdded) {
+      consumerAndroid.flavorDimensions(*consumerDimensions.toTypedArray())
+      project.logger.quiet("  -> Copied/merged flavorDimensions: ${consumerDimensions.joinToString()}")
+    }
+
+    return appDimensions
+  }
+
+  private fun copyMissingProductFlavors(
+    project: Project,
+    consumerAndroid: BaseExtension,
+    appAndroid: BaseExtension,
+    appDimensions: List<String>
+  ) {
+    val appFlavors = appAndroid.productFlavors
+    val consumerFlavors = consumerAndroid.productFlavors
+    val existingFlavorNames = consumerFlavors.map { it.name }.toSet()
+
+    appFlavors.forEach { appFlavor ->
+      if (appFlavor.name !in existingFlavorNames) {
+        val dimension = appFlavor.dimension ?: appDimensions.singleOrNull()
+
+        consumerFlavors.create(appFlavor.name).apply {
+          this.dimension = dimension
+          appFlavor.applicationIdSuffix?.let { this.applicationIdSuffix = it }
+          appFlavor.versionNameSuffix?.let { this.versionNameSuffix = it }
+          if (appFlavor.manifestPlaceholders.isNotEmpty()) {
+            this.manifestPlaceholders.putAll(appFlavor.manifestPlaceholders)
+          }
+        }
+
+        project.logger.quiet("  -> Created flavor '${appFlavor.name}' (dimension='$dimension') in :${project.path}")
+      }
+    }
+  }
 }

package/android/expo-gradle-plugin/expo-autolinking-plugin-shared/src/main/kotlin/expo/modules/plugin/text/Emojis.kt

@@ -2,4 +2,5 @@ package expo.modules.plugin.text
 
 object Emojis {
   const val INFORMATION = "\u2139\uFE0F"
+  const val GEAR = "\u2699"
 }

package/android/expo-gradle-plugin/expo-autolinking-settings-plugin/src/main/kotlin/expo/modules/plugin/ExpoAutolinkingSettingsPlugin.kt

@@ -1,15 +1,21 @@
 package expo.modules.plugin
 
+import expo.modules.plugin.gradle.addBuildCache
 import expo.modules.plugin.gradle.beforeRootProject
+import expo.modules.plugin.gradle.loadLocalProperties
+import expo.modules.plugin.utils.getPropertiesPrefixedBy
 import org.gradle.api.Plugin
 import org.gradle.api.initialization.Settings
 import java.io.File
+import java.util.Properties
 
 open class ExpoAutolinkingSettingsPlugin : Plugin<Settings> {
   override fun apply(settings: Settings) {
     // Adds a property to the settings that indicates that the `expo-autolinking-plugin` is available.
     settings.gradle.extensions.extraProperties.set("expoAutolinkingSettingsPlugin", true)
 
+    settings.addBuildCache()
+
     // Creates an extension that allows users to link expo modules and add additional configuration.
     settings.extensions.create("expoAutolinking", ExpoAutolinkingSettingsExtension::class.java, settings)
 

package/android/expo-gradle-plugin/expo-autolinking-settings-plugin/src/main/kotlin/expo/modules/plugin/gradle/SettingsExtension.kt

@@ -3,8 +3,16 @@ package expo.modules.plugin.gradle
 import expo.modules.plugin.configuration.GradleAarProject
 import expo.modules.plugin.configuration.GradlePlugin
 import expo.modules.plugin.configuration.GradleProject
+import expo.modules.plugin.text.Colors
+import expo.modules.plugin.text.Emojis
+import expo.modules.plugin.text.withColor
+import expo.modules.plugin.utils.getPropertiesPrefixedBy
 import org.gradle.api.initialization.Settings
+import org.gradle.api.logging.Logging
+import org.gradle.caching.http.HttpBuildCache
 import java.io.File
+import java.net.URI
+import java.util.Properties
 
 internal fun Settings.linkProject(project: GradleProject) {
   include(":${project.name}")
@@ -23,3 +31,51 @@ internal fun Settings.linkAarProject(aarProject: GradleAarProject) {
   }
   project(":${aarProject.name}").projectDir = projectDir
 }
+
+internal fun Settings.loadLocalProperties(): Properties {
+  return Properties().apply {
+    val localPropertiesFile = File(settings.rootDir, "local.properties")
+    if (localPropertiesFile.exists()) {
+      localPropertiesFile.reader().use(::load)
+    }
+  }
+}
+
+internal fun Settings.addBuildCache() {
+  val localProperties = settings
+    .loadLocalProperties()
+
+  val remoteCacheConfigPrefix = "expo.cache.remote."
+  val remoteCacheConfig = settings.getPropertiesPrefixedBy(remoteCacheConfigPrefix) +
+    localProperties.getPropertiesPrefixedBy(remoteCacheConfigPrefix)
+
+  val url = remoteCacheConfig["url"] ?: return
+  val username = remoteCacheConfig["username"]
+  val password = remoteCacheConfig["password"]
+  val readonly = remoteCacheConfig["read-only"]?.toBoolean() ?: false
+  val isUnsafe = url.startsWith("http://")
+
+  val logger = Logging.getLogger(Settings::class.java)
+
+  logger.quiet("${Emojis.GEAR} Configuring remote build cache: ${url.withColor(Colors.GREEN)} (username: ${username.withColor(Colors.GREEN)}, read-only: ${readonly.toString().withColor(Colors.GREEN)})")
+
+  settings.buildCache { configuration ->
+    configuration.remote(HttpBuildCache::class.java) { cache ->
+      cache.url = URI.create(url)
+
+      if (username != null && password != null) {
+        cache.credentials {
+          it.username = username
+          it.password = password
+        }
+      }
+
+      cache.isPush = !readonly
+
+      if (isUnsafe) {
+        cache.isAllowInsecureProtocol = true
+        cache.isAllowUntrustedServer = true
+      }
+    }
+  }
+}

package/android/expo-gradle-plugin/expo-autolinking-settings-plugin/src/main/kotlin/expo/modules/plugin/utils/PropertiesExtension.kt

@@ -0,0 +1,25 @@
+package expo.modules.plugin.utils
+
+import org.gradle.api.initialization.Settings
+import java.util.Properties
+
+internal fun Properties.getPropertiesPrefixedBy(prefix: String): Map<String, String> {
+  return entries
+    .mapNotNull { (key, value) ->
+      if (key !is String || value !is String) {
+        return@mapNotNull null
+      }
+
+      if (key.startsWith(prefix)) {
+        key.removePrefix(prefix) to value
+      } else {
+        null
+      }
+    }
+    .toMap()
+}
+
+internal fun Settings.getPropertiesPrefixedBy(prefix: String): Map<String, String> {
+  val prefixedProperty = providers.gradlePropertiesPrefixedBy(prefix).get()
+  return prefixedProperty.mapKeys { (key, _) -> key.removePrefix(prefix) }
+}

package/build/commands/verifyCommand.js

@@ -10,6 +10,8 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const autolinkingOptions_1 = require("./autolinkingOptions");
 const dependencies_1 = require("../dependencies");
+// NOTE(@kitten): These are excluded explicitly, but we want to include them for the verify command explicitly
+const INCLUDE_PACKAGES = ['react-native', 'react-native-tvos'];
 function verifyCommand(cli) {
     return (0, autolinkingOptions_1.registerAutolinkingArguments)(cli.command('verify'))
         .option('-v, --verbose', 'Output all results instead of just warnings.', () => true, false)
@@ -20,7 +22,7 @@ function verifyCommand(cli) {
         const autolinkingOptionsLoader = (0, autolinkingOptions_1.createAutolinkingOptionsLoader)(commandArguments);
         const appRoot = await autolinkingOptionsLoader.getAppRoot();
         const linker = (0, dependencies_1.makeCachedDependenciesLinker)({ projectRoot: appRoot });
-        const results = (0, dependencies_1.mergeResolutionResults)(await Promise.all(platforms.map((platform) => (0, dependencies_1.scanDependencyResolutionsForPlatform)(linker, platform))));
+        const results = (0, dependencies_1.mergeResolutionResults)(await Promise.all(platforms.map((platform) => (0, dependencies_1.scanDependencyResolutionsForPlatform)(linker, platform, INCLUDE_PACKAGES))));
         await verifySearchResults(results, {
             appRoot,
             verbose: !!commandArguments.verbose,

package/build/commands/verifyCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyCommand.js","sourceRoot":"","sources":["../../src/commands/verifyCommand.ts"],"names":[],"mappings":"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","sourcesContent":["import chalk from 'chalk';\nimport commander from 'commander';\nimport fs from 'fs';\nimport path from 'path';\n\nimport {\n  AutolinkingCommonArguments,\n  createAutolinkingOptionsLoader,\n  registerAutolinkingArguments,\n} from './autolinkingOptions';\nimport {\n  type BaseDependencyResolution,\n  type DependencyResolution,\n  type ResolutionResult,\n  DependencyResolutionSource,\n  makeCachedDependenciesLinker,\n  mergeResolutionResults,\n  scanDependencyResolutionsForPlatform,\n} from '../dependencies';\n\ninterface VerifyArguments extends AutolinkingCommonArguments {\n  verbose?: boolean | null;\n  json?: boolean | null;\n}\n\nexport function verifyCommand(cli: commander.CommanderStatic) {\n  return registerAutolinkingArguments(cli.command('verify'))\n    .option('-v, --verbose', 'Output all results instead of just warnings.', () => true, false)\n    .option('-j, --json', 'Output results in the plain JSON format.', () => true, false)\n    .option(\n      '-p, --platform [platform]',\n      'The platform to validate native modules for. Available options: \"android\", \"ios\", \"both\"',\n      'both'\n    )\n    .action(async (commandArguments: VerifyArguments) => {\n      const platforms =\n        commandArguments.platform === 'both' ? ['android', 'ios'] : [commandArguments.platform!];\n      const autolinkingOptionsLoader = createAutolinkingOptionsLoader(commandArguments);\n      const appRoot = await autolinkingOptionsLoader.getAppRoot();\n      const linker = makeCachedDependenciesLinker({ projectRoot: appRoot });\n      const results = mergeResolutionResults(\n        await Promise.all(\n          platforms.map((platform) => scanDependencyResolutionsForPlatform(linker, platform))\n        )\n      );\n      await verifySearchResults(results, {\n        appRoot,\n        verbose: !!commandArguments.verbose,\n        json: !!commandArguments.json,\n      });\n    });\n}\n\ninterface VerifyOptions {\n  appRoot: string;\n  verbose?: boolean;\n  json?: boolean;\n}\n\ninterface VerifyGroups {\n  reactNativeProjectConfig: DependencyResolution[];\n  searchPaths: DependencyResolution[];\n  dependencies: DependencyResolution[];\n  duplicates: DependencyResolution[];\n}\n\n/**\n * Verifies the search results by checking whether there are no duplicates.\n */\nexport async function verifySearchResults(\n  results: ResolutionResult,\n  options: VerifyOptions\n): Promise<void> {\n  const { appRoot } = options;\n\n  async function getHumanReadableDependency(dependency: BaseDependencyResolution): Promise<string> {\n    let version = dependency.version || null;\n    if (!version) {\n      try {\n        const pkgContents = await fs.promises.readFile(\n          path.join(dependency.path, 'package.json'),\n          'utf8'\n        );\n        const pkg: unknown = JSON.parse(pkgContents);\n        if (pkg && typeof pkg === 'object' && 'version' in pkg && typeof pkg.version === 'string') {\n          version = pkg.version;\n        }\n      } catch (error) {\n        version = null;\n      }\n    }\n    const relative = path.relative(appRoot, dependency.originPath);\n    return version\n      ? `${dependency.name}@${version} (at: ${relative})`\n      : `${dependency.name} at: ${relative}`;\n  }\n\n  const groups: VerifyGroups = {\n    reactNativeProjectConfig: [],\n    searchPaths: [],\n    dependencies: [],\n    duplicates: [],\n  };\n\n  for (const moduleName in results) {\n    const revision = results[moduleName];\n    if (!revision) {\n      continue;\n    } else if (revision.duplicates?.length) {\n      groups.duplicates.push(revision);\n    } else {\n      switch (revision.source) {\n        case DependencyResolutionSource.RN_CLI_LOCAL:\n          groups.reactNativeProjectConfig.push(revision);\n          break;\n        case DependencyResolutionSource.SEARCH_PATH:\n          groups.searchPaths.push(revision);\n          break;\n        case DependencyResolutionSource.RECURSIVE_RESOLUTION:\n          groups.dependencies.push(revision);\n          break;\n      }\n    }\n  }\n\n  if (options.json) {\n    console.log(JSON.stringify(groups));\n    return;\n  }\n\n  if (options.verbose) {\n    const sortResolutions = (resolutions: DependencyResolution[]) =>\n      [...resolutions].sort((a, b) => a.name.localeCompare(b.name));\n\n    if (groups.reactNativeProjectConfig.length) {\n      console.log(\n        `🔎  Found ${groups.reactNativeProjectConfig.length} modules from React Native project config`\n      );\n      for (const revision of sortResolutions(groups.reactNativeProjectConfig)) {\n        console.log(` - ${await getHumanReadableDependency(revision)}`);\n      }\n    }\n\n    if (groups.searchPaths.length) {\n      console.log(`🔎  Found ${groups.searchPaths.length} modules in search paths`);\n      for (const revision of sortResolutions(groups.searchPaths)) {\n        console.log(` - ${await getHumanReadableDependency(revision)}`);\n      }\n    }\n\n    console.log(`🔎  Found ${groups.dependencies.length} modules in dependencies`);\n    for (const revision of sortResolutions(groups.dependencies)) {\n      console.log(` - ${await getHumanReadableDependency(revision)}`);\n    }\n  }\n\n  if (groups.duplicates.length) {\n    for (const revision of groups.duplicates) {\n      console.warn(`⚠️  Found duplicate installations for ${chalk.green(revision.name)}`);\n      const revisions = [revision, ...(revision.duplicates ?? [])];\n      for (let idx = 0; idx < revisions.length; idx++) {\n        const prefix = idx !== revisions.length - 1 ? '├─' : '└─';\n        const duplicate = revisions[idx];\n        console.log(`  ${prefix} ${await getHumanReadableDependency(duplicate)}`);\n      }\n    }\n\n    console.warn(\n      '⚠️  Multiple versions of the same module may introduce some side effects or compatibility issues.\\n' +\n        `Resolve your dependency issues and deduplicate your dependencies. Learn more: https://expo.fyi/resolving-dependency-issues`\n    );\n  } else {\n    console.log('✅ Everything is fine!');\n  }\n}\n"]}
+{"version":3,"file":"verifyCommand.js","sourceRoot":"","sources":["../../src/commands/verifyCommand.ts"],"names":[],"mappings":"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","sourcesContent":["import chalk from 'chalk';\nimport commander from 'commander';\nimport fs from 'fs';\nimport path from 'path';\n\nimport {\n  AutolinkingCommonArguments,\n  createAutolinkingOptionsLoader,\n  registerAutolinkingArguments,\n} from './autolinkingOptions';\nimport {\n  type BaseDependencyResolution,\n  type DependencyResolution,\n  type ResolutionResult,\n  DependencyResolutionSource,\n  makeCachedDependenciesLinker,\n  mergeResolutionResults,\n  scanDependencyResolutionsForPlatform,\n} from '../dependencies';\n\n// NOTE(@kitten): These are excluded explicitly, but we want to include them for the verify command explicitly\nconst INCLUDE_PACKAGES = ['react-native', 'react-native-tvos'];\n\ninterface VerifyArguments extends AutolinkingCommonArguments {\n  verbose?: boolean | null;\n  json?: boolean | null;\n}\n\nexport function verifyCommand(cli: commander.CommanderStatic) {\n  return registerAutolinkingArguments(cli.command('verify'))\n    .option('-v, --verbose', 'Output all results instead of just warnings.', () => true, false)\n    .option('-j, --json', 'Output results in the plain JSON format.', () => true, false)\n    .option(\n      '-p, --platform [platform]',\n      'The platform to validate native modules for. Available options: \"android\", \"ios\", \"both\"',\n      'both'\n    )\n    .action(async (commandArguments: VerifyArguments) => {\n      const platforms =\n        commandArguments.platform === 'both' ? ['android', 'ios'] : [commandArguments.platform!];\n      const autolinkingOptionsLoader = createAutolinkingOptionsLoader(commandArguments);\n      const appRoot = await autolinkingOptionsLoader.getAppRoot();\n      const linker = makeCachedDependenciesLinker({ projectRoot: appRoot });\n      const results = mergeResolutionResults(\n        await Promise.all(\n          platforms.map((platform) =>\n            scanDependencyResolutionsForPlatform(linker, platform, INCLUDE_PACKAGES)\n          )\n        )\n      );\n      await verifySearchResults(results, {\n        appRoot,\n        verbose: !!commandArguments.verbose,\n        json: !!commandArguments.json,\n      });\n    });\n}\n\ninterface VerifyOptions {\n  appRoot: string;\n  verbose?: boolean;\n  json?: boolean;\n}\n\ninterface VerifyGroups {\n  reactNativeProjectConfig: DependencyResolution[];\n  searchPaths: DependencyResolution[];\n  dependencies: DependencyResolution[];\n  duplicates: DependencyResolution[];\n}\n\n/**\n * Verifies the search results by checking whether there are no duplicates.\n */\nexport async function verifySearchResults(\n  results: ResolutionResult,\n  options: VerifyOptions\n): Promise<void> {\n  const { appRoot } = options;\n\n  async function getHumanReadableDependency(dependency: BaseDependencyResolution): Promise<string> {\n    let version = dependency.version || null;\n    if (!version) {\n      try {\n        const pkgContents = await fs.promises.readFile(\n          path.join(dependency.path, 'package.json'),\n          'utf8'\n        );\n        const pkg: unknown = JSON.parse(pkgContents);\n        if (pkg && typeof pkg === 'object' && 'version' in pkg && typeof pkg.version === 'string') {\n          version = pkg.version;\n        }\n      } catch (error) {\n        version = null;\n      }\n    }\n    const relative = path.relative(appRoot, dependency.originPath);\n    return version\n      ? `${dependency.name}@${version} (at: ${relative})`\n      : `${dependency.name} at: ${relative}`;\n  }\n\n  const groups: VerifyGroups = {\n    reactNativeProjectConfig: [],\n    searchPaths: [],\n    dependencies: [],\n    duplicates: [],\n  };\n\n  for (const moduleName in results) {\n    const revision = results[moduleName];\n    if (!revision) {\n      continue;\n    } else if (revision.duplicates?.length) {\n      groups.duplicates.push(revision);\n    } else {\n      switch (revision.source) {\n        case DependencyResolutionSource.RN_CLI_LOCAL:\n          groups.reactNativeProjectConfig.push(revision);\n          break;\n        case DependencyResolutionSource.SEARCH_PATH:\n          groups.searchPaths.push(revision);\n          break;\n        case DependencyResolutionSource.RECURSIVE_RESOLUTION:\n          groups.dependencies.push(revision);\n          break;\n      }\n    }\n  }\n\n  if (options.json) {\n    console.log(JSON.stringify(groups));\n    return;\n  }\n\n  if (options.verbose) {\n    const sortResolutions = (resolutions: DependencyResolution[]) =>\n      [...resolutions].sort((a, b) => a.name.localeCompare(b.name));\n\n    if (groups.reactNativeProjectConfig.length) {\n      console.log(\n        `🔎  Found ${groups.reactNativeProjectConfig.length} modules from React Native project config`\n      );\n      for (const revision of sortResolutions(groups.reactNativeProjectConfig)) {\n        console.log(` - ${await getHumanReadableDependency(revision)}`);\n      }\n    }\n\n    if (groups.searchPaths.length) {\n      console.log(`🔎  Found ${groups.searchPaths.length} modules in search paths`);\n      for (const revision of sortResolutions(groups.searchPaths)) {\n        console.log(` - ${await getHumanReadableDependency(revision)}`);\n      }\n    }\n\n    console.log(`🔎  Found ${groups.dependencies.length} modules in dependencies`);\n    for (const revision of sortResolutions(groups.dependencies)) {\n      console.log(` - ${await getHumanReadableDependency(revision)}`);\n    }\n  }\n\n  if (groups.duplicates.length) {\n    for (const revision of groups.duplicates) {\n      console.warn(`⚠️  Found duplicate installations for ${chalk.green(revision.name)}`);\n      const revisions = [revision, ...(revision.duplicates ?? [])];\n      for (let idx = 0; idx < revisions.length; idx++) {\n        const prefix = idx !== revisions.length - 1 ? '├─' : '└─';\n        const duplicate = revisions[idx];\n        console.log(`  ${prefix} ${await getHumanReadableDependency(duplicate)}`);\n      }\n    }\n\n    console.warn(\n      '⚠️  Multiple versions of the same module may introduce some side effects or compatibility issues.\\n' +\n        `Resolve your dependency issues and deduplicate your dependencies. Learn more: https://expo.fyi/resolving-dependency-issues`\n    );\n  } else {\n    console.log('✅ Everything is fine!');\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-autolinking",
-  "version": "3.1.0-canary-20251008-6acbc1c",
+  "version": "3.1.0-canary-20251009-9919e08",
   "description": "Scripts that autolink Expo modules.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -34,7 +34,7 @@
   "license": "MIT",
   "homepage": "https://github.com/expo/expo/tree/main/packages/expo-modules-autolinking#readme",
   "devDependencies": {
-    "expo-module-scripts": "5.0.8-canary-20251008-6acbc1c",
+    "expo-module-scripts": "5.0.8-canary-20251009-9919e08",
     "memfs": "^3.2.0",
     "minimatch": "^9.0.0"
   },

package/scripts/ios/cocoapods/installer.rb

@@ -22,10 +22,91 @@ module Pod
   class Installer
     private
 
+    _original_run_podfile_post_install_hooks = instance_method(:run_podfile_post_install_hooks)
     _original_run_podfile_pre_install_hooks = instance_method(:run_podfile_pre_install_hooks)
+    _script_phase_name = '[Expo Autolinking] Run Codegen with autolinking'
 
     public
 
+    define_method(:run_podfile_post_install_hooks) do
+      # Call original implementation first
+      _original_run_podfile_post_install_hooks.bind(self).()
+
+      # Next we'll perform an Expo workaround for Codegen in React Native where it uses the wrong output path for
+      # the generated files. This can be remove when the following PR is merged and released upstream:
+      # https://github.com/facebook/react-native/pull/54066
+      # TODO: chrfalch - remove when RN PR is released
+      # Find the ReactCodegen pod target in the pods project
+      react_codegen_native_target = self.pods_project.targets.find { |target| target.name == 'ReactCodegen' }
+
+      if react_codegen_native_target
+        # Check if the build phase already exists
+        already_exists = react_codegen_native_target.build_phases.any? do |phase|
+          phase.is_a?(Xcodeproj::Project::Object::PBXShellScriptBuildPhase) && phase.name == _script_phase_name
+        end
+
+        if !already_exists
+          Pod::UI.puts "[Expo] ".blue + "Adding '#{_script_phase_name}' build phase to ReactCodegen"
+
+          # Create the new shell script build phase
+          phase = react_codegen_native_target.new_shell_script_build_phase(_script_phase_name)
+          phase.shell_path = '/bin/sh'
+          phase.shell_script = <<~SH
+            # Remove this step when the fix is merged and released.
+            # See: https://github.com/facebook/react-native/pull/54066
+
+            # This re-runs Codegen without the broken "scripts/react_native_pods_utils/script_phases.sh" script, causing Codegen to run without autolinking.
+            # Instead of using "script_phases.sh" which always runs inside DerivedData, we run it in the normal "/ios" folder
+            # See: https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods_utils/script_phases.sh
+            pushd "$PODS_ROOT/../" > /dev/null
+              RCT_SCRIPT_POD_INSTALLATION_ROOT="$PODS_ROOT/.."
+            popd >/dev/null
+
+            export RCT_SCRIPT_RN_DIR="$REACT_NATIVE_PATH" # This is set by Expo
+            export RCT_SCRIPT_APP_PATH="$RCT_SCRIPT_POD_INSTALLATION_ROOT/.."
+            export RCT_SCRIPT_OUTPUT_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT"
+            export RCT_SCRIPT_TYPE="withCodegenDiscovery"
+
+            # This is the broken script that runs inside DerivedData, meaning it can't find the autolinking result in `ios/build/generated/autolinking.json`.
+            # Resulting in Codegen running with it's own autolinking, not discovering transitive peer dependencies.
+            # export SCRIPT_PHASES_SCRIPT="$RCT_SCRIPT_RN_DIR/scripts/react_native_pods_utils/script_phases.sh"
+            export WITH_ENVIRONMENT="$RCT_SCRIPT_RN_DIR/scripts/xcode/with-environment.sh"
+
+            # Start of workaround code
+
+            # Load the $NODE_BINARY from the "with-environment.sh" script
+            source "$WITH_ENVIRONMENT"
+
+            # Run this script directly in the right folders:
+            # https://github.com/facebook/react-native/blob/3f7f9d8fb8beb41408d092870a7c7cac58029a4d/packages/react-native/scripts/react_native_pods_utils/script_phases.sh#L96-L101
+            pushd "$RCT_SCRIPT_RN_DIR" >/dev/null || exit 1
+              set -x
+              "$NODE_BINARY" "scripts/generate-codegen-artifacts.js" --path "$RCT_SCRIPT_APP_PATH" --outputPath "$RCT_SCRIPT_OUTPUT_DIR" --targetPlatform "ios"
+              set +x
+            popd >/dev/null || exit 1
+
+            # End of workaround code
+          SH
+
+          # Find the index of the "Compile Sources" phase (PBXSourcesBuildPhase)
+          compile_sources_index = react_codegen_native_target.build_phases.find_index do |p|
+            p.is_a?(Xcodeproj::Project::Object::PBXSourcesBuildPhase)
+          end
+
+          if compile_sources_index
+            # Remove the phase from its current position (it was added at the end)
+            react_codegen_native_target.build_phases.delete(phase)
+            # Insert it before the "Compile Sources" phase
+            react_codegen_native_target.build_phases.insert(compile_sources_index, phase)
+          else
+            Pod::UI.puts "[Expo] ".yellow + "Could not find 'Compile Sources' phase, build phase added at default position"
+          end
+        end
+      else
+        Pod::UI.puts "[Expo] ".yellow + "ReactCodegen target not found in pods project"
+      end
+    end
+
     define_method(:run_podfile_pre_install_hooks) do
       # Call original implementation first
       _original_run_podfile_pre_install_hooks.bind(self).()

package/src/commands/verifyCommand.ts

@@ -18,6 +18,9 @@ import {
   scanDependencyResolutionsForPlatform,
 } from '../dependencies';
 
+// NOTE(@kitten): These are excluded explicitly, but we want to include them for the verify command explicitly
+const INCLUDE_PACKAGES = ['react-native', 'react-native-tvos'];
+
 interface VerifyArguments extends AutolinkingCommonArguments {
   verbose?: boolean | null;
   json?: boolean | null;
@@ -40,7 +43,9 @@ export function verifyCommand(cli: commander.CommanderStatic) {
       const linker = makeCachedDependenciesLinker({ projectRoot: appRoot });
       const results = mergeResolutionResults(
         await Promise.all(
-          platforms.map((platform) => scanDependencyResolutionsForPlatform(linker, platform))
+          platforms.map((platform) =>
+            scanDependencyResolutionsForPlatform(linker, platform, INCLUDE_PACKAGES)
+          )
         )
       );
       await verifySearchResults(results, {