expo-modules-autolinking 0.3.0 → 0.3.4

package/README.md

@@ -13,7 +13,7 @@ For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-
 
 # Installation in bare React Native projects
 
-For bare React Native projects, you must ensure that you have [installed and configured the `react-native-unimodules` package](https://github.com/expo/expo/tree/master/packages/react-native-unimodules) before continuing.
+For bare React Native projects, you must ensure that you have [installed and configured the `expo` package](https://docs.expo.dev/bare/installing-expo-modules/) before continuing.
 
 ### Add the package to your npm dependencies
 

package/build/platforms/ios.js

@@ -45,16 +45,19 @@ 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));
-    return `// Automatically generated by expo-modules-autolinking.
-import ExpoModulesCore
-
-${pods.map((podName) => `import ${podName}`).join('\n')}
+    return `/**
+ * Automatically generated by expo-modules-autolinking.
+ *
+ * This autogenerated class provides a list of classes of native Expo modules,
+ * but only these that are written in Swift and use the new API for creating Expo modules.
+ */
 
+import ExpoModulesCore
+${pods.map((podName) => `import ${podName}\n`).join('')}
 @objc(${className})
 public class ${className}: ModulesProvider {
-  public override func exportedModules() -> [AnyModule.Type] {
-    return [
-      ${classNames.map((className) => `${className}.self`).join(',\n      ')}
+  public override func getModuleClasses() -> [AnyModule.Type] {
+    return [${classNames.map((className) => `\n      ${className}.self`).join(',')}
     ]
   }
 }

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;;;EAGP,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;QAE/C,SAAS;eACF,SAAS;;;QAGhB,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,SAAS,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;;;;CAI3E,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 `// Automatically generated by expo-modules-autolinking.\nimport ExpoModulesCore\n\n${pods.map((podName) => `import ${podName}`).join('\\n')}\n\n@objc(${className})\npublic class ${className}: ModulesProvider {\n  public override func exportedModules() -> [AnyModule.Type] {\n    return [\n      ${classNames.map((className) => `${className}.self`).join(',\\n      ')}\n    ]\n  }\n}\n`;\n}\n"]}
+{"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"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-autolinking",
-  "version": "0.3.0",
+  "version": "0.3.4",
   "description": "Scripts that autolink Expo modules.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -34,10 +34,10 @@
   "license": "MIT",
   "homepage": "https://github.com/expo/expo/tree/master/packages/expo-modules-autolinking#readme",
   "devDependencies": {
+    "@expo/spawn-async": "^1.5.0",
     "@tsconfig/node12": "^1.0.9",
     "@types/fs-extra": "^9.0.11",
     "expo-module-scripts": "~2.0.0",
-    "@expo/spawn-async": "1.5.0",
     "tempy": "^0.7.1"
   },
   "dependencies": {
@@ -47,5 +47,5 @@
     "find-up": "~5.0.0",
     "fs-extra": "^9.1.0"
   },
-  "gitHead": "fe23a511edf816a3fea58d74856c2749a9de1463"
+  "gitHead": "f93456e96091501a9b9f99246846cee29336a964"
 }

package/scripts/android/autolinking_implementation.gradle

@@ -44,7 +44,7 @@ class ExpoAutolinkingManager {
     String[] args = convertOptionsToCommandArgs('resolve', this.options)
     args += ['--json']
 
-    String output = exec(args)
+    String output = exec(args, projectDir)
     Object json = new JsonSlurper().parseText(output)
 
     cachedResolvingResults = json
@@ -84,11 +84,11 @@ class ExpoAutolinkingManager {
       args += '--empty'
     }
 
-    exec(args)
+    exec(args, project.rootDir)
   }
 
-  static String exec(String[] commandArgs) {
-    Process proc = commandArgs.execute()
+  static String exec(String[] commandArgs, File dir) {
+    Process proc = commandArgs.execute(null, dir)
     StringBuffer outputStream = new StringBuffer()
     proc.waitForProcessOutput(outputStream, System.err)
     return outputStream.toString()

package/scripts/ios/autolinking_manager.rb

@@ -57,7 +57,7 @@ module Expo
 
     # Spawns `expo-module-autolinking generate-package-list` command.
     public def generate_package_list(target_name, target_path)
-      IO.popen(generate_package_list_command_args(target_path))
+      Process.wait IO.popen(generate_package_list_command_args(target_path)).pid
     end
 
     # If there is any package to autolink.
@@ -65,16 +65,6 @@ module Expo
       @packages.empty?
     end
 
-    # Bool that is true when Swift modules are enabled
-    public def uses_swift_modules?
-      $ExpoUseSwiftModules
-    end
-
-    # Returns whether there is at least one package that needs to be included in the generated modules provider.
-    public def needs_provider_generation?
-      uses_swift_modules? && @packages.find { |package| package.modules_class_names.any? }.present?
-    end
-
     # Filters only these packages that needs to be included in the generated modules provider.
     public def packages_to_generate
       @packages.select { |package| package.modules_class_names.any? }

package/scripts/ios/project_integrator.rb

@@ -8,7 +8,7 @@ module Expo
       # Find the targets that use expo modules and need the modules provider
       targets_with_modules_provider = targets.select do |target|
         autolinking_manager = target.target_definition.autolinking_manager
-        autolinking_manager.present? && autolinking_manager.needs_provider_generation?
+        autolinking_manager.present?
       end
 
       # Find existing PBXGroup for modules providers.

package/src/platforms/ios.ts

@@ -56,16 +56,19 @@ async function generatePackageListFileContentAsync(
   const pods = modulesToProvide.map((module) => module.podName);
   const classNames = [].concat(...modulesToProvide.map((module) => module.modulesClassNames));
 
-  return `// Automatically generated by expo-modules-autolinking.
-import ExpoModulesCore
-
-${pods.map((podName) => `import ${podName}`).join('\n')}
+  return `/**
+ * Automatically generated by expo-modules-autolinking.
+ *
+ * This autogenerated class provides a list of classes of native Expo modules,
+ * but only these that are written in Swift and use the new API for creating Expo modules.
+ */
 
+import ExpoModulesCore
+${pods.map((podName) => `import ${podName}\n`).join('')}
 @objc(${className})
 public class ${className}: ModulesProvider {
-  public override func exportedModules() -> [AnyModule.Type] {
-    return [
-      ${classNames.map((className) => `${className}.self`).join(',\n      ')}
+  public override func getModuleClasses() -> [AnyModule.Type] {
+    return [${classNames.map((className) => `\n      ${className}.self`).join(',')}
     ]
   }
 }