expo-modules-autolinking 3.0.21 → 3.0.22

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 3.0.22 — 2025-11-17
+
+### 🐛 Bug fixes
+
+- Fix [#40651](https://github.com/expo/expo/pull/40651) causing already read versions to be lost depending on traversal order ([#40912](https://github.com/expo/expo/pull/40912) by [@kitten](https://github.com/kitten))
+- [Follow-up] Fix [#40601](https://github.com/expo/expo/pull/40601) assuming case-insensitive path for default derived podspec path in `react-native-config` resolution ([#40894](https://github.com/expo/expo/pull/40894) by [@kitten](https://github.com/kitten)) ([#40931](https://github.com/expo/expo/pull/40931) by [@kitten](https://github.com/kitten))
+
 ## 3.0.21 — 2025-11-07
 
 ### 🐛 Bug fixes

package/build/dependencies/resolution.js

@@ -88,6 +88,12 @@ async function scanDependenciesRecursively(rawPath, { shouldIncludeDependency =
     const maxDepth = limitDepth != null ? limitDepth : MAX_DEPTH;
     const recurse = async (resolution, depth = 0) => {
         const searchResults = Object.create(null);
+        if (_visitedPackagePaths.has(resolution.path)) {
+            return searchResults;
+        }
+        else {
+            _visitedPackagePaths.add(resolution.path);
+        }
         const [nodeModulePaths, packageJson] = await Promise.all([
             getNodeModulePaths(resolution.path),
             (0, utils_1.loadPackageJson)((0, utils_1.fastJoin)(resolution.path, 'package.json')),
@@ -103,17 +109,7 @@ async function scanDependenciesRecursively(rawPath, { shouldIncludeDependency =
             searchResults[modules[idx].name] = modules[idx];
         }
         if (depth + 1 < maxDepth) {
-            const childResults = await Promise.all(modules
-                .filter((resolution) => {
-                if (_visitedPackagePaths.has(resolution.path)) {
-                    return false;
-                }
-                else {
-                    _visitedPackagePaths.add(resolution.path);
-                    return true;
-                }
-            })
-                .map((resolution) => recurse(resolution, depth + 1)));
+            const childResults = await Promise.all(modules.map((resolution) => recurse(resolution, depth + 1)));
             return (0, utils_1.mergeResolutionResults)(childResults, searchResults);
         }
         else {

package/build/dependencies/resolution.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolution.js","sourceRoot":"","sources":["../../src/dependencies/resolution.ts"],"names":[],"mappings":"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","sourcesContent":["import Module from 'node:module';\n\nimport {\n  type ResolutionResult,\n  type DependencyResolution,\n  DependencyResolutionSource,\n} from './types';\nimport {\n  type PackageJson,\n  defaultShouldIncludeDependency,\n  mergeResolutionResults,\n  loadPackageJson,\n  maybeRealpath,\n  fastJoin,\n} from './utils';\n\ndeclare module 'node:module' {\n  export function _nodeModulePaths(base: string): readonly string[];\n}\n\n// NOTE(@kitten): There's no need to search very deep for modules\n// We don't expect native modules to be excessively nested in the dependency tree\nconst MAX_DEPTH = 8;\n\nconst createNodeModulePathsCreator = () => {\n  const _nodeModulePathCache = new Map<string, string | null>();\n  return async function getNodeModulePaths(packagePath: string) {\n    const outputPaths: string[] = [];\n    const nodeModulePaths = Module._nodeModulePaths(packagePath);\n    for (let idx = 0; idx < nodeModulePaths.length; idx++) {\n      const nodeModulePath = nodeModulePaths[idx];\n      let target = _nodeModulePathCache.get(nodeModulePath);\n      if (target === undefined) {\n        target = await maybeRealpath(nodeModulePath);\n        if (idx !== 0) {\n          _nodeModulePathCache.set(nodeModulePath, target);\n        }\n      }\n      if (target != null) {\n        outputPaths.push(target);\n      }\n    }\n    return outputPaths;\n  };\n};\n\nasync function resolveDependencies(\n  packageJson: PackageJson,\n  nodeModulePaths: readonly string[],\n  depth: number,\n  shouldIncludeDependency: (dependencyName: string) => boolean\n): Promise<DependencyResolution[]> {\n  const dependencies: Record<string, string> = Object.create(null);\n  if (packageJson.dependencies != null && typeof packageJson.dependencies === 'object') {\n    Object.assign(dependencies, packageJson.dependencies);\n  }\n  // NOTE(@kitten): Also traverse devDependencies for top-level package.json\n  if (\n    depth === 0 &&\n    packageJson.devDependencies != null &&\n    typeof packageJson.devDependencies === 'object'\n  ) {\n    Object.assign(dependencies, packageJson.devDependencies);\n  }\n  if (packageJson.peerDependencies != null && typeof packageJson.peerDependencies === 'object') {\n    const peerDependenciesMeta =\n      packageJson.peerDependenciesMeta != null &&\n      typeof packageJson.peerDependenciesMeta === 'object'\n        ? (packageJson.peerDependenciesMeta as Record<string, unknown>)\n        : undefined;\n    for (const dependencyName in packageJson.peerDependencies) {\n      // NOTE(@kitten): We only check peer dependencies because some package managers auto-install them\n      // which would mean they'd have no reference in any dependencies. However, optional peer dependencies\n      // don't auto-install and we can skip them\n      if (!isOptionalPeerDependencyMeta(peerDependenciesMeta, dependencyName)) {\n        dependencies[dependencyName] = '';\n      }\n    }\n  }\n\n  const resolveDependency = async (\n    dependencyName: string\n  ): Promise<DependencyResolution | null> => {\n    for (let idx = 0; idx < nodeModulePaths.length; idx++) {\n      const originPath = fastJoin(nodeModulePaths[idx], dependencyName);\n      const nodeModulePath = await maybeRealpath(originPath);\n      if (nodeModulePath != null) {\n        return {\n          source: DependencyResolutionSource.RECURSIVE_RESOLUTION,\n          name: dependencyName,\n          version: '',\n          path: nodeModulePath,\n          originPath,\n          duplicates: null,\n          depth,\n        };\n      }\n    }\n    return null;\n  };\n\n  const modules = await Promise.all(\n    Object.keys(dependencies)\n      .filter((dependencyName) => shouldIncludeDependency(dependencyName))\n      .map((dependencyName) => resolveDependency(dependencyName))\n  );\n\n  return modules.filter((resolution) => resolution != null);\n}\n\ninterface ResolutionOptions {\n  shouldIncludeDependency?(name: string): boolean;\n  limitDepth?: number;\n}\n\nexport async function scanDependenciesRecursively(\n  rawPath: string,\n  { shouldIncludeDependency = defaultShouldIncludeDependency, limitDepth }: ResolutionOptions = {}\n): Promise<ResolutionResult> {\n  const rootPath = await maybeRealpath(rawPath);\n  if (!rootPath) {\n    return {};\n  }\n\n  const _visitedPackagePaths = new Set();\n  const getNodeModulePaths = createNodeModulePathsCreator();\n  const maxDepth = limitDepth != null ? limitDepth : MAX_DEPTH;\n\n  const recurse = async (\n    resolution: DependencyResolution,\n    depth = 0\n  ): Promise<ResolutionResult> => {\n    const searchResults: ResolutionResult = Object.create(null);\n    const [nodeModulePaths, packageJson] = await Promise.all([\n      getNodeModulePaths(resolution.path),\n      loadPackageJson(fastJoin(resolution.path, 'package.json')),\n    ]);\n    if (!packageJson) {\n      return searchResults;\n    } else {\n      resolution.version = packageJson.version || '';\n    }\n\n    const modules = await resolveDependencies(\n      packageJson,\n      nodeModulePaths,\n      depth,\n      shouldIncludeDependency\n    );\n    for (let idx = 0; idx < modules.length; idx++) {\n      searchResults[modules[idx].name] = modules[idx];\n    }\n\n    if (depth + 1 < maxDepth) {\n      const childResults = await Promise.all(\n        modules\n          .filter((resolution) => {\n            if (_visitedPackagePaths.has(resolution.path)) {\n              return false;\n            } else {\n              _visitedPackagePaths.add(resolution.path);\n              return true;\n            }\n          })\n          .map((resolution) => recurse(resolution, depth + 1))\n      );\n      return mergeResolutionResults(childResults, searchResults);\n    } else {\n      return searchResults;\n    }\n  };\n\n  const searchResults = await recurse({\n    source: DependencyResolutionSource.RECURSIVE_RESOLUTION,\n    name: '',\n    version: '',\n    path: rootPath,\n    originPath: rawPath,\n    duplicates: null,\n    depth: -1,\n  });\n\n  return searchResults;\n}\n\nconst isOptionalPeerDependencyMeta = (\n  peerDependenciesMeta: Record<string, unknown> | undefined,\n  packageName: string\n) => {\n  return (\n    peerDependenciesMeta &&\n    peerDependenciesMeta[packageName] != null &&\n    typeof peerDependenciesMeta[packageName] === 'object' &&\n    'optional' in peerDependenciesMeta[packageName] &&\n    !!peerDependenciesMeta[packageName].optional\n  );\n};\n"]}
+{"version":3,"file":"resolution.js","sourceRoot":"","sources":["../../src/dependencies/resolution.ts"],"names":[],"mappings":"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","sourcesContent":["import Module from 'node:module';\n\nimport {\n  type ResolutionResult,\n  type DependencyResolution,\n  DependencyResolutionSource,\n} from './types';\nimport {\n  type PackageJson,\n  defaultShouldIncludeDependency,\n  mergeResolutionResults,\n  loadPackageJson,\n  maybeRealpath,\n  fastJoin,\n} from './utils';\n\ndeclare module 'node:module' {\n  export function _nodeModulePaths(base: string): readonly string[];\n}\n\n// NOTE(@kitten): There's no need to search very deep for modules\n// We don't expect native modules to be excessively nested in the dependency tree\nconst MAX_DEPTH = 8;\n\nconst createNodeModulePathsCreator = () => {\n  const _nodeModulePathCache = new Map<string, string | null>();\n  return async function getNodeModulePaths(packagePath: string) {\n    const outputPaths: string[] = [];\n    const nodeModulePaths = Module._nodeModulePaths(packagePath);\n    for (let idx = 0; idx < nodeModulePaths.length; idx++) {\n      const nodeModulePath = nodeModulePaths[idx];\n      let target = _nodeModulePathCache.get(nodeModulePath);\n      if (target === undefined) {\n        target = await maybeRealpath(nodeModulePath);\n        if (idx !== 0) {\n          _nodeModulePathCache.set(nodeModulePath, target);\n        }\n      }\n      if (target != null) {\n        outputPaths.push(target);\n      }\n    }\n    return outputPaths;\n  };\n};\n\nasync function resolveDependencies(\n  packageJson: PackageJson,\n  nodeModulePaths: readonly string[],\n  depth: number,\n  shouldIncludeDependency: (dependencyName: string) => boolean\n): Promise<DependencyResolution[]> {\n  const dependencies: Record<string, string> = Object.create(null);\n  if (packageJson.dependencies != null && typeof packageJson.dependencies === 'object') {\n    Object.assign(dependencies, packageJson.dependencies);\n  }\n  // NOTE(@kitten): Also traverse devDependencies for top-level package.json\n  if (\n    depth === 0 &&\n    packageJson.devDependencies != null &&\n    typeof packageJson.devDependencies === 'object'\n  ) {\n    Object.assign(dependencies, packageJson.devDependencies);\n  }\n  if (packageJson.peerDependencies != null && typeof packageJson.peerDependencies === 'object') {\n    const peerDependenciesMeta =\n      packageJson.peerDependenciesMeta != null &&\n      typeof packageJson.peerDependenciesMeta === 'object'\n        ? (packageJson.peerDependenciesMeta as Record<string, unknown>)\n        : undefined;\n    for (const dependencyName in packageJson.peerDependencies) {\n      // NOTE(@kitten): We only check peer dependencies because some package managers auto-install them\n      // which would mean they'd have no reference in any dependencies. However, optional peer dependencies\n      // don't auto-install and we can skip them\n      if (!isOptionalPeerDependencyMeta(peerDependenciesMeta, dependencyName)) {\n        dependencies[dependencyName] = '';\n      }\n    }\n  }\n\n  const resolveDependency = async (\n    dependencyName: string\n  ): Promise<DependencyResolution | null> => {\n    for (let idx = 0; idx < nodeModulePaths.length; idx++) {\n      const originPath = fastJoin(nodeModulePaths[idx], dependencyName);\n      const nodeModulePath = await maybeRealpath(originPath);\n      if (nodeModulePath != null) {\n        return {\n          source: DependencyResolutionSource.RECURSIVE_RESOLUTION,\n          name: dependencyName,\n          version: '',\n          path: nodeModulePath,\n          originPath,\n          duplicates: null,\n          depth,\n        };\n      }\n    }\n    return null;\n  };\n\n  const modules = await Promise.all(\n    Object.keys(dependencies)\n      .filter((dependencyName) => shouldIncludeDependency(dependencyName))\n      .map((dependencyName) => resolveDependency(dependencyName))\n  );\n\n  return modules.filter((resolution) => resolution != null);\n}\n\ninterface ResolutionOptions {\n  shouldIncludeDependency?(name: string): boolean;\n  limitDepth?: number;\n}\n\nexport async function scanDependenciesRecursively(\n  rawPath: string,\n  { shouldIncludeDependency = defaultShouldIncludeDependency, limitDepth }: ResolutionOptions = {}\n): Promise<ResolutionResult> {\n  const rootPath = await maybeRealpath(rawPath);\n  if (!rootPath) {\n    return {};\n  }\n\n  const _visitedPackagePaths = new Set();\n  const getNodeModulePaths = createNodeModulePathsCreator();\n  const maxDepth = limitDepth != null ? limitDepth : MAX_DEPTH;\n\n  const recurse = async (\n    resolution: DependencyResolution,\n    depth = 0\n  ): Promise<ResolutionResult> => {\n    const searchResults: ResolutionResult = Object.create(null);\n    if (_visitedPackagePaths.has(resolution.path)) {\n      return searchResults;\n    } else {\n      _visitedPackagePaths.add(resolution.path);\n    }\n    const [nodeModulePaths, packageJson] = await Promise.all([\n      getNodeModulePaths(resolution.path),\n      loadPackageJson(fastJoin(resolution.path, 'package.json')),\n    ]);\n    if (!packageJson) {\n      return searchResults;\n    } else {\n      resolution.version = packageJson.version || '';\n    }\n\n    const modules = await resolveDependencies(\n      packageJson,\n      nodeModulePaths,\n      depth,\n      shouldIncludeDependency\n    );\n    for (let idx = 0; idx < modules.length; idx++) {\n      searchResults[modules[idx].name] = modules[idx];\n    }\n\n    if (depth + 1 < maxDepth) {\n      const childResults = await Promise.all(\n        modules.map((resolution) => recurse(resolution, depth + 1))\n      );\n      return mergeResolutionResults(childResults, searchResults);\n    } else {\n      return searchResults;\n    }\n  };\n\n  const searchResults = await recurse({\n    source: DependencyResolutionSource.RECURSIVE_RESOLUTION,\n    name: '',\n    version: '',\n    path: rootPath,\n    originPath: rawPath,\n    duplicates: null,\n    depth: -1,\n  });\n\n  return searchResults;\n}\n\nconst isOptionalPeerDependencyMeta = (\n  peerDependenciesMeta: Record<string, unknown> | undefined,\n  packageName: string\n) => {\n  return (\n    peerDependenciesMeta &&\n    peerDependenciesMeta[packageName] != null &&\n    typeof peerDependenciesMeta[packageName] === 'object' &&\n    'optional' in peerDependenciesMeta[packageName] &&\n    !!peerDependenciesMeta[packageName].optional\n  );\n};\n"]}

package/build/dependencies/utils.js

@@ -111,6 +111,9 @@ function mergeWithDuplicate(a, b) {
             originPath: duplicate.originPath,
         });
     }
+    else if (!target.version && duplicate.version) {
+        target.version = duplicate.version;
+    }
     if (duplicate.duplicates?.length) {
         duplicates.push(...duplicate.duplicates.filter((child) => duplicates.every((parent) => parent.path !== child.path)));
     }

package/build/dependencies/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/dependencies/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nimport { memoize } from '../utils';\nimport type { DependencyResolution, ResolutionResult } from './types';\n\nconst NODE_MODULES_PATTERN = `${path.sep}node_modules${path.sep}`;\n\n// The default dependencies we exclude don't contain dependency chains leading to autolinked modules\nexport function defaultShouldIncludeDependency(dependencyName: string): boolean {\n  const scopeName =\n    dependencyName[0] === '@' ? dependencyName.slice(1, dependencyName.indexOf('/')) : null;\n  if (\n    scopeName === 'babel' ||\n    scopeName === 'types' ||\n    scopeName === 'eslint' ||\n    scopeName === 'typescript-eslint' ||\n    scopeName === 'testing-library' ||\n    scopeName === 'aws-crypto' ||\n    scopeName === 'aws-sdk'\n  ) {\n    return false;\n  }\n  switch (dependencyName) {\n    case '@expo/cli':\n    case '@expo/config':\n    case '@expo/metro-config':\n    case '@expo/package-manager':\n    case '@expo/prebuild-config':\n    case '@expo/webpack-config':\n    case '@expo/env':\n    case '@react-native/codegen':\n    case '@react-native/community-cli-plugin':\n    case 'eslint':\n    case 'eslint-config-expo':\n    case 'eslint-plugin-expo':\n    case 'eslint-plugin-import':\n    case 'jest-expo':\n    case 'jest':\n    case 'metro':\n    case 'ts-node':\n    case 'typescript':\n    case 'webpack':\n      return false;\n    default:\n      return true;\n  }\n}\n\nexport const fastJoin: (from: string, append: string) => string =\n  path.sep === '/'\n    ? (from, append) => `${from}${path.sep}${append}`\n    : (from, append) =>\n        `${from}${path.sep}${append[0] === '@' ? append.replace('/', path.sep) : append}`;\n\nexport const maybeRealpath = async (target: string): Promise<string | null> => {\n  try {\n    return await fs.promises.realpath(target);\n  } catch {\n    return null;\n  }\n};\n\nexport type PackageJson = Record<string, unknown> & { version?: string };\n\nexport const loadPackageJson = memoize(async function loadPackageJson(\n  jsonPath: string\n): Promise<PackageJson | null> {\n  try {\n    const packageJsonText = await fs.promises.readFile(jsonPath, 'utf8');\n    const json = JSON.parse(packageJsonText);\n    if (typeof json !== 'object' || json == null) {\n      return null;\n    }\n    return json;\n  } catch {\n    return null;\n  }\n});\n\nexport function mergeWithDuplicate(\n  a: DependencyResolution,\n  b: DependencyResolution\n): DependencyResolution {\n  let target: DependencyResolution;\n  let duplicate: DependencyResolution;\n  if (a.depth < b.depth) {\n    target = a;\n    duplicate = b;\n  } else if (b.depth < a.depth) {\n    target = b;\n    duplicate = a;\n  } else {\n    // If both are equal, then the shallowest path wins\n    const pathDepthA = a.originPath.split(NODE_MODULES_PATTERN).length;\n    const pathDepthB = b.originPath.split(NODE_MODULES_PATTERN).length;\n    if (pathDepthA < pathDepthB) {\n      target = a;\n      duplicate = b;\n    } else if (pathDepthB < pathDepthA) {\n      target = b;\n      duplicate = a;\n    } else {\n      target = a;\n      duplicate = b;\n    }\n  }\n  const duplicates = target.duplicates || (target.duplicates = []);\n  if (target.path !== duplicate.path) {\n    duplicates.push({\n      name: duplicate.name,\n      version: duplicate.version,\n      path: duplicate.path,\n      originPath: duplicate.originPath,\n    });\n  }\n  if (duplicate.duplicates?.length) {\n    duplicates.push(\n      ...duplicate.duplicates.filter((child) =>\n        duplicates.every((parent) => parent.path !== child.path)\n      )\n    );\n  }\n  return target;\n}\n\nexport async function filterMapResolutionResult<T extends { name: string }>(\n  results: ResolutionResult,\n  filterMap: (resolution: DependencyResolution) => Promise<T | null> | T | null\n): Promise<Record<string, T>> {\n  const resolutions = await Promise.all(\n    Object.keys(results).map(async (key) => {\n      const resolution = results[key];\n      return resolution ? await filterMap(resolution) : null;\n    })\n  );\n  const output: Record<string, T> = Object.create(null);\n  for (let idx = 0; idx < resolutions.length; idx++) {\n    const resolution = resolutions[idx];\n    if (resolution != null) {\n      output[resolution.name] = resolution;\n    }\n  }\n  return output;\n}\n\nexport function mergeResolutionResults(\n  results: ResolutionResult[],\n  base?: ResolutionResult\n): ResolutionResult {\n  if (base == null && results.length === 1) {\n    return results[0];\n  }\n  const output: ResolutionResult = base == null ? Object.create(null) : base;\n  for (let idx = 0; idx < results.length; idx++) {\n    for (const key in results[idx]) {\n      const resolution = results[idx][key]!;\n      const prevResolution = output[key];\n      if (prevResolution != null) {\n        output[key] = mergeWithDuplicate(prevResolution, resolution);\n      } else {\n        output[key] = resolution;\n      }\n    }\n  }\n  return output;\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/dependencies/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nimport { memoize } from '../utils';\nimport type { DependencyResolution, ResolutionResult } from './types';\n\nconst NODE_MODULES_PATTERN = `${path.sep}node_modules${path.sep}`;\n\n// The default dependencies we exclude don't contain dependency chains leading to autolinked modules\nexport function defaultShouldIncludeDependency(dependencyName: string): boolean {\n  const scopeName =\n    dependencyName[0] === '@' ? dependencyName.slice(1, dependencyName.indexOf('/')) : null;\n  if (\n    scopeName === 'babel' ||\n    scopeName === 'types' ||\n    scopeName === 'eslint' ||\n    scopeName === 'typescript-eslint' ||\n    scopeName === 'testing-library' ||\n    scopeName === 'aws-crypto' ||\n    scopeName === 'aws-sdk'\n  ) {\n    return false;\n  }\n  switch (dependencyName) {\n    case '@expo/cli':\n    case '@expo/config':\n    case '@expo/metro-config':\n    case '@expo/package-manager':\n    case '@expo/prebuild-config':\n    case '@expo/webpack-config':\n    case '@expo/env':\n    case '@react-native/codegen':\n    case '@react-native/community-cli-plugin':\n    case 'eslint':\n    case 'eslint-config-expo':\n    case 'eslint-plugin-expo':\n    case 'eslint-plugin-import':\n    case 'jest-expo':\n    case 'jest':\n    case 'metro':\n    case 'ts-node':\n    case 'typescript':\n    case 'webpack':\n      return false;\n    default:\n      return true;\n  }\n}\n\nexport const fastJoin: (from: string, append: string) => string =\n  path.sep === '/'\n    ? (from, append) => `${from}${path.sep}${append}`\n    : (from, append) =>\n        `${from}${path.sep}${append[0] === '@' ? append.replace('/', path.sep) : append}`;\n\nexport const maybeRealpath = async (target: string): Promise<string | null> => {\n  try {\n    return await fs.promises.realpath(target);\n  } catch {\n    return null;\n  }\n};\n\nexport type PackageJson = Record<string, unknown> & { version?: string };\n\nexport const loadPackageJson = memoize(async function loadPackageJson(\n  jsonPath: string\n): Promise<PackageJson | null> {\n  try {\n    const packageJsonText = await fs.promises.readFile(jsonPath, 'utf8');\n    const json = JSON.parse(packageJsonText);\n    if (typeof json !== 'object' || json == null) {\n      return null;\n    }\n    return json;\n  } catch {\n    return null;\n  }\n});\n\nexport function mergeWithDuplicate(\n  a: DependencyResolution,\n  b: DependencyResolution\n): DependencyResolution {\n  let target: DependencyResolution;\n  let duplicate: DependencyResolution;\n  if (a.depth < b.depth) {\n    target = a;\n    duplicate = b;\n  } else if (b.depth < a.depth) {\n    target = b;\n    duplicate = a;\n  } else {\n    // If both are equal, then the shallowest path wins\n    const pathDepthA = a.originPath.split(NODE_MODULES_PATTERN).length;\n    const pathDepthB = b.originPath.split(NODE_MODULES_PATTERN).length;\n    if (pathDepthA < pathDepthB) {\n      target = a;\n      duplicate = b;\n    } else if (pathDepthB < pathDepthA) {\n      target = b;\n      duplicate = a;\n    } else {\n      target = a;\n      duplicate = b;\n    }\n  }\n  const duplicates = target.duplicates || (target.duplicates = []);\n  if (target.path !== duplicate.path) {\n    duplicates.push({\n      name: duplicate.name,\n      version: duplicate.version,\n      path: duplicate.path,\n      originPath: duplicate.originPath,\n    });\n  } else if (!target.version && duplicate.version) {\n    target.version = duplicate.version;\n  }\n  if (duplicate.duplicates?.length) {\n    duplicates.push(\n      ...duplicate.duplicates.filter((child) =>\n        duplicates.every((parent) => parent.path !== child.path)\n      )\n    );\n  }\n  return target;\n}\n\nexport async function filterMapResolutionResult<T extends { name: string }>(\n  results: ResolutionResult,\n  filterMap: (resolution: DependencyResolution) => Promise<T | null> | T | null\n): Promise<Record<string, T>> {\n  const resolutions = await Promise.all(\n    Object.keys(results).map(async (key) => {\n      const resolution = results[key];\n      return resolution ? await filterMap(resolution) : null;\n    })\n  );\n  const output: Record<string, T> = Object.create(null);\n  for (let idx = 0; idx < resolutions.length; idx++) {\n    const resolution = resolutions[idx];\n    if (resolution != null) {\n      output[resolution.name] = resolution;\n    }\n  }\n  return output;\n}\n\nexport function mergeResolutionResults(\n  results: ResolutionResult[],\n  base?: ResolutionResult\n): ResolutionResult {\n  if (base == null && results.length === 1) {\n    return results[0];\n  }\n  const output: ResolutionResult = base == null ? Object.create(null) : base;\n  for (let idx = 0; idx < results.length; idx++) {\n    for (const key in results[idx]) {\n      const resolution = results[idx][key]!;\n      const prevResolution = output[key];\n      if (prevResolution != null) {\n        output[key] = mergeWithDuplicate(prevResolution, resolution);\n      } else {\n        output[key] = resolution;\n      }\n    }\n  }\n  return output;\n}\n"]}

package/build/reactNativeConfig/iosResolver.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveDependencyConfigImplIosAsync = resolveDependencyConfigImplIosAsync;
-const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
 /** Find first *.podspec file in target directory */
@@ -22,18 +21,15 @@ async function resolveDependencyConfigImplIosAsync(resolution, reactNativeConfig
         // Skip autolinking for this package.
         return null;
     }
-    const mainPackagePodspec = path_1.default.join(resolution.path, path_1.default.basename(resolution.path) + '.podspec');
-    const podspecPath = fs_1.default.existsSync(mainPackagePodspec)
-        ? mainPackagePodspec
-        : await findPodspecFile(resolution.path);
+    const podspecPath = await findPodspecFile(resolution.path);
     if (!podspecPath) {
         return null;
     }
     if (reactNativeConfig === undefined && expoModuleConfig?.supportsPlatform('apple')) {
         // Check if Expo podspec files contain the React Native podspec file
         const overlappingPodspecPath = expoModuleConfig.applePodspecPaths().find((targetFile) => {
-            const expoPodspecPath = path_1.default.join(resolution.path, targetFile);
-            return expoPodspecPath === podspecPath;
+            const expoPodspecPath = path_1.default.normalize(path_1.default.join(resolution.path, targetFile));
+            return expoPodspecPath === path_1.default.normalize(podspecPath);
         });
         // NOTE(@kitten): If we don't have a react-native.config.{js,ts} file and the
         // package is also an Expo module, we only link it as a React Native module

package/build/reactNativeConfig/iosResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"iosResolver.js","sourceRoot":"","sources":["../../src/reactNativeConfig/iosResolver.ts"],"names":[],"mappings":";;;;;AAuBA,kFAyCC;AAhED,4CAAoB;AACpB,gDAAwB;AAOxB,oCAA2C;AAE3C,oDAAoD;AACpD,MAAM,eAAe,GAAG,KAAK,EAAE,UAAkB,EAA0B,EAAE;IAC3E,MAAM,YAAY,GAAG,MAAM,IAAA,uBAAe,EAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;QAClE,OAAO,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,6EAA6E;IAC7E,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;IAC7D,MAAM,eAAe,GAAG,YAAY,CAAC,IAAI,CACvC,CAAC,WAAW,EAAE,EAAE,CAAC,cAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,WAAW,EAAE,KAAK,YAAY,CACvF,CAAC;IACF,OAAO,eAAe,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAC/E,CAAC,CAAC;AAEK,KAAK,UAAU,mCAAmC,CACvD,UAA6C,EAC7C,iBAA2E,EAC3E,gBAA0C;IAE1C,IAAI,iBAAiB,KAAK,IAAI,EAAE,CAAC;QAC/B,qCAAqC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAClC,UAAU,CAAC,IAAI,EACf,cAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,CAC5C,CAAC;IACF,MAAM,WAAW,GAAG,YAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC;QACnD,CAAC,CAAC,kBAAkB;QACpB,CAAC,CAAC,MAAM,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,iBAAiB,KAAK,SAAS,IAAI,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;QACnF,oEAAoE;QACpE,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;YACtF,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAC/D,OAAO,eAAe,KAAK,WAAW,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,6EAA6E;QAC7E,2EAA2E;QAC3E,+CAA+C;QAC/C,IAAI,sBAAsB,IAAI,IAAI,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,OAAO;QACL,WAAW;QACX,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,cAAc,EAAE,iBAAiB,EAAE,cAAc,IAAI,EAAE;QACvD,YAAY,EAAE,iBAAiB,EAAE,YAAY,IAAI,EAAE;KACpD,CAAC;AACJ,CAAC","sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nimport type {\n  RNConfigDependencyIos,\n  RNConfigReactNativePlatformsConfigIos,\n} from './reactNativeConfig.types';\nimport type { ExpoModuleConfig } from '../ExpoModuleConfig';\nimport { listFilesSorted } from '../utils';\n\n/** Find first *.podspec file in target directory */\nconst findPodspecFile = async (targetPath: string): Promise<string | null> => {\n  const podspecFiles = await listFilesSorted(targetPath, (basename) => {\n    return basename.endsWith('.podspec');\n  });\n  // NOTE(@kitten): Compare case-insensitively against basename of derived name\n  const mainBasename = path.basename(targetPath).toLowerCase();\n  const mainPodspecFile = podspecFiles.find(\n    (podspecFile) => path.basename(podspecFile, '.podspec').toLowerCase() === mainBasename\n  );\n  return mainPodspecFile ?? (podspecFiles.length > 0 ? podspecFiles[0] : null);\n};\n\nexport async function resolveDependencyConfigImplIosAsync(\n  resolution: { path: string; version: string },\n  reactNativeConfig: RNConfigReactNativePlatformsConfigIos | null | undefined,\n  expoModuleConfig?: ExpoModuleConfig | null\n): Promise<RNConfigDependencyIos | null> {\n  if (reactNativeConfig === null) {\n    // Skip autolinking for this package.\n    return null;\n  }\n\n  const mainPackagePodspec = path.join(\n    resolution.path,\n    path.basename(resolution.path) + '.podspec'\n  );\n  const podspecPath = fs.existsSync(mainPackagePodspec)\n    ? mainPackagePodspec\n    : await findPodspecFile(resolution.path);\n  if (!podspecPath) {\n    return null;\n  }\n\n  if (reactNativeConfig === undefined && expoModuleConfig?.supportsPlatform('apple')) {\n    // Check if Expo podspec files contain the React Native podspec file\n    const overlappingPodspecPath = expoModuleConfig.applePodspecPaths().find((targetFile) => {\n      const expoPodspecPath = path.join(resolution.path, targetFile);\n      return expoPodspecPath === podspecPath;\n    });\n    // NOTE(@kitten): If we don't have a react-native.config.{js,ts} file and the\n    // package is also an Expo module, we only link it as a React Native module\n    // if both don't point at the same podspec file\n    if (overlappingPodspecPath != null) {\n      return null;\n    }\n  }\n\n  return {\n    podspecPath,\n    version: resolution.version,\n    configurations: reactNativeConfig?.configurations || [],\n    scriptPhases: reactNativeConfig?.scriptPhases || [],\n  };\n}\n"]}
+{"version":3,"file":"iosResolver.js","sourceRoot":"","sources":["../../src/reactNativeConfig/iosResolver.ts"],"names":[],"mappings":";;;;;AAuBA,kFAmCC;AAzDD,gDAAwB;AAOxB,oCAA2C;AAE3C,oDAAoD;AACpD,MAAM,eAAe,GAAG,KAAK,EAAE,UAAkB,EAA0B,EAAE;IAC3E,MAAM,YAAY,GAAG,MAAM,IAAA,uBAAe,EAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;QAClE,OAAO,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,6EAA6E;IAC7E,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;IAC7D,MAAM,eAAe,GAAG,YAAY,CAAC,IAAI,CACvC,CAAC,WAAW,EAAE,EAAE,CAAC,cAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,WAAW,EAAE,KAAK,YAAY,CACvF,CAAC;IACF,OAAO,eAAe,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAC/E,CAAC,CAAC;AAEK,KAAK,UAAU,mCAAmC,CACvD,UAA6C,EAC7C,iBAA2E,EAC3E,gBAA0C;IAE1C,IAAI,iBAAiB,KAAK,IAAI,EAAE,CAAC;QAC/B,qCAAqC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC3D,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,iBAAiB,KAAK,SAAS,IAAI,gBAAgB,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;QACnF,oEAAoE;QACpE,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE;YACtF,MAAM,eAAe,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;YAC/E,OAAO,eAAe,KAAK,cAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QACH,6EAA6E;QAC7E,2EAA2E;QAC3E,+CAA+C;QAC/C,IAAI,sBAAsB,IAAI,IAAI,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,OAAO;QACL,WAAW;QACX,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,cAAc,EAAE,iBAAiB,EAAE,cAAc,IAAI,EAAE;QACvD,YAAY,EAAE,iBAAiB,EAAE,YAAY,IAAI,EAAE;KACpD,CAAC;AACJ,CAAC","sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nimport type {\n  RNConfigDependencyIos,\n  RNConfigReactNativePlatformsConfigIos,\n} from './reactNativeConfig.types';\nimport type { ExpoModuleConfig } from '../ExpoModuleConfig';\nimport { listFilesSorted } from '../utils';\n\n/** Find first *.podspec file in target directory */\nconst findPodspecFile = async (targetPath: string): Promise<string | null> => {\n  const podspecFiles = await listFilesSorted(targetPath, (basename) => {\n    return basename.endsWith('.podspec');\n  });\n  // NOTE(@kitten): Compare case-insensitively against basename of derived name\n  const mainBasename = path.basename(targetPath).toLowerCase();\n  const mainPodspecFile = podspecFiles.find(\n    (podspecFile) => path.basename(podspecFile, '.podspec').toLowerCase() === mainBasename\n  );\n  return mainPodspecFile ?? (podspecFiles.length > 0 ? podspecFiles[0] : null);\n};\n\nexport async function resolveDependencyConfigImplIosAsync(\n  resolution: { path: string; version: string },\n  reactNativeConfig: RNConfigReactNativePlatformsConfigIos | null | undefined,\n  expoModuleConfig?: ExpoModuleConfig | null\n): Promise<RNConfigDependencyIos | null> {\n  if (reactNativeConfig === null) {\n    // Skip autolinking for this package.\n    return null;\n  }\n\n  const podspecPath = await findPodspecFile(resolution.path);\n  if (!podspecPath) {\n    return null;\n  }\n\n  if (reactNativeConfig === undefined && expoModuleConfig?.supportsPlatform('apple')) {\n    // Check if Expo podspec files contain the React Native podspec file\n    const overlappingPodspecPath = expoModuleConfig.applePodspecPaths().find((targetFile) => {\n      const expoPodspecPath = path.normalize(path.join(resolution.path, targetFile));\n      return expoPodspecPath === path.normalize(podspecPath);\n    });\n    // NOTE(@kitten): If we don't have a react-native.config.{js,ts} file and the\n    // package is also an Expo module, we only link it as a React Native module\n    // if both don't point at the same podspec file\n    if (overlappingPodspecPath != null) {\n      return null;\n    }\n  }\n\n  return {\n    podspecPath,\n    version: resolution.version,\n    configurations: reactNativeConfig?.configurations || [],\n    scriptPhases: reactNativeConfig?.scriptPhases || [],\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-autolinking",
-  "version": "3.0.21",
+  "version": "3.0.22",
   "description": "Scripts that autolink Expo modules.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -45,5 +45,5 @@
     "require-from-string": "^2.0.2",
     "resolve-from": "^5.0.0"
   },
-  "gitHead": "d3e95a82fd9d48b0b751c4290216083244b360d2"
+  "gitHead": "6d7c221dc8a1994043c4f2ddcf33a16bf3e508dc"
 }

package/src/dependencies/resolution.ts

@@ -131,6 +131,11 @@ export async function scanDependenciesRecursively(
     depth = 0
   ): Promise<ResolutionResult> => {
     const searchResults: ResolutionResult = Object.create(null);
+    if (_visitedPackagePaths.has(resolution.path)) {
+      return searchResults;
+    } else {
+      _visitedPackagePaths.add(resolution.path);
+    }
     const [nodeModulePaths, packageJson] = await Promise.all([
       getNodeModulePaths(resolution.path),
       loadPackageJson(fastJoin(resolution.path, 'package.json')),
@@ -153,16 +158,7 @@ export async function scanDependenciesRecursively(
 
     if (depth + 1 < maxDepth) {
       const childResults = await Promise.all(
-        modules
-          .filter((resolution) => {
-            if (_visitedPackagePaths.has(resolution.path)) {
-              return false;
-            } else {
-              _visitedPackagePaths.add(resolution.path);
-              return true;
-            }
-          })
-          .map((resolution) => recurse(resolution, depth + 1))
+        modules.map((resolution) => recurse(resolution, depth + 1))
       );
       return mergeResolutionResults(childResults, searchResults);
     } else {

package/src/dependencies/utils.ts

@@ -113,6 +113,8 @@ export function mergeWithDuplicate(
       path: duplicate.path,
       originPath: duplicate.originPath,
     });
+  } else if (!target.version && duplicate.version) {
+    target.version = duplicate.version;
   }
   if (duplicate.duplicates?.length) {
     duplicates.push(

package/src/reactNativeConfig/iosResolver.ts

@@ -31,13 +31,7 @@ export async function resolveDependencyConfigImplIosAsync(
     return null;
   }
 
-  const mainPackagePodspec = path.join(
-    resolution.path,
-    path.basename(resolution.path) + '.podspec'
-  );
-  const podspecPath = fs.existsSync(mainPackagePodspec)
-    ? mainPackagePodspec
-    : await findPodspecFile(resolution.path);
+  const podspecPath = await findPodspecFile(resolution.path);
   if (!podspecPath) {
     return null;
   }
@@ -45,8 +39,8 @@ export async function resolveDependencyConfigImplIosAsync(
   if (reactNativeConfig === undefined && expoModuleConfig?.supportsPlatform('apple')) {
     // Check if Expo podspec files contain the React Native podspec file
     const overlappingPodspecPath = expoModuleConfig.applePodspecPaths().find((targetFile) => {
-      const expoPodspecPath = path.join(resolution.path, targetFile);
-      return expoPodspecPath === podspecPath;
+      const expoPodspecPath = path.normalize(path.join(resolution.path, targetFile));
+      return expoPodspecPath === path.normalize(podspecPath);
     });
     // NOTE(@kitten): If we don't have a react-native.config.{js,ts} file and the
     // package is also an Expo module, we only link it as a React Native module