expo-modules-core 2.3.2 → 2.3.4

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 2.3.4 — 2025-04-11
+
+### 🐛 Bug fixes
+
+- Change registerWebModule to work with minified classes. ([#35946](https://github.com/expo/expo/pull/35946) by [@aleqsio](https://github.com/aleqsio))
+
+## 2.3.3 — 2025-04-11
+
+_This version does not introduce any user-facing changes._
+
 ## 2.3.2 — 2025-04-09
 
 ### 💡 Others

package/android/build.gradle

@@ -23,7 +23,7 @@ if (KOTLIN_MAJOR_VERSION >= 2) {
 }
 
 group = 'host.exp.exponent'
-version = '2.3.2'
+version = '2.3.4'
 
 // List of features that are required by linked modules
 def coreFeatures = project.findProperty("coreFeatures") ?: []
@@ -76,7 +76,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "2.3.2"
+    versionName "2.3.4"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 

package/build/registerWebModule.d.ts

@@ -2,7 +2,8 @@ import type { NativeModule } from './ts-declarations/NativeModule';
 /**
  * Registers a web module.
  * @param moduleImplementation A class that extends `NativeModule`. The class is registered under `globalThis.expo.modules[className]`.
+ * @param moduleName – a name to register the module under `globalThis.expo.modules[className]`.
  * @returns A singleton instance of the class passed into arguments.
  */
-export declare function registerWebModule<EventsMap extends Record<never, never>, ModuleType extends typeof NativeModule<EventsMap>>(moduleImplementation: ModuleType): ModuleType;
+export declare function registerWebModule<EventsMap extends Record<never, never>, ModuleType extends typeof NativeModule<EventsMap>>(moduleImplementation: ModuleType, moduleName: string): ModuleType;
 //# sourceMappingURL=registerWebModule.d.ts.map

package/build/registerWebModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerWebModule.d.ts","sourceRoot":"","sources":["../src/registerWebModule.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnE;;;;GAIG;AAEH,wBAAgB,iBAAiB,CAC/B,SAAS,SAAS,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EACtC,UAAU,SAAS,OAAO,YAAY,CAAC,SAAS,CAAC,EACjD,oBAAoB,EAAE,UAAU,GAAG,UAAU,CAe9C"}
+{"version":3,"file":"registerWebModule.d.ts","sourceRoot":"","sources":["../src/registerWebModule.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnE;;;;;GAKG;AAEH,wBAAgB,iBAAiB,CAC/B,SAAS,SAAS,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,EACtC,UAAU,SAAS,OAAO,YAAY,CAAC,SAAS,CAAC,EACjD,oBAAoB,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,UAAU,CAiBlE"}

package/expo-module-gradle-plugin/src/main/kotlin/expo/modules/plugin/AutolinkingIntegration.kt

@@ -1,7 +1,10 @@
 package expo.modules.plugin
 
 import org.gradle.api.Project
+import java.io.File
 
 interface AutolinkingIntegration {
   fun getExpoDependency(project: Project, name: String): Any
+
+  fun getShouldUsePublicationScriptPath(project: Project): File?
 }

package/expo-module-gradle-plugin/src/main/kotlin/expo/modules/plugin/ProjectConfiguration.kt

@@ -84,7 +84,7 @@ internal fun Project.applyPublishing(expoModulesExtension: ExpoModuleExtension)
       .publications
       .createReleasePublication(publicationInfo)
 
-    createExpoPublishToMavenLocalTask(publicationInfo)
+    createExpoPublishToMavenLocalTask(publicationInfo, expoModulesExtension)
 
     val npmLocalRepositoryRelativePath = "local-maven-repo"
     val npmLocalRepository = URI("file://${project.projectDir.parentFile}/${npmLocalRepositoryRelativePath}")
@@ -93,7 +93,7 @@ internal fun Project.applyPublishing(expoModulesExtension: ExpoModuleExtension)
       mavenRepo.url = npmLocalRepository
     }
 
-    createExpoPublishTask(publicationInfo, npmLocalRepositoryRelativePath)
+    createExpoPublishTask(publicationInfo, expoModulesExtension, npmLocalRepositoryRelativePath)
   }
 }
 

package/expo-module-gradle-plugin/src/main/kotlin/expo/modules/plugin/android/MavenPublicationExtension.kt

@@ -3,7 +3,10 @@
 package expo.modules.plugin.android
 
 import expo.modules.plugin.androidLibraryExtension
+import expo.modules.plugin.gradle.ExpoModuleExtension
 import expo.modules.plugin.publishingExtension
+import groovy.lang.Binding
+import groovy.lang.GroovyShell
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
@@ -19,7 +22,6 @@ import org.gradle.api.component.SoftwareComponent
 import org.gradle.api.publish.PublicationContainer
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.TaskProvider
-import java.net.URI
 import java.nio.file.Path
 import kotlin.io.path.exists
 import kotlin.io.path.toPath
@@ -85,10 +87,10 @@ internal fun PublicationContainer.createReleasePublication(publicationInfo: Publ
   }
 }
 
-internal fun Project.createExpoPublishTask(publicationInfo: PublicationInfo, pathToRepository: String): TaskProvider<Task> {
+internal fun Project.createExpoPublishTask(publicationInfo: PublicationInfo, expoModulesExtension: ExpoModuleExtension, pathToRepository: String): TaskProvider<Task> {
   val taskProvider = tasks.register("expoPublish") { task ->
     task.doLast {
-      expoPublishBody(publicationInfo, pathToRepository = pathToRepository)
+      expoPublishBody(publicationInfo, expoModulesExtension, pathToRepository = pathToRepository)
     }
   }
   taskProvider.configure { task ->
@@ -130,10 +132,10 @@ internal fun Project.createEmptyExpoPublishToMavenLocalTask(): TaskProvider<Task
   return taskProvider
 }
 
-internal fun Project.createExpoPublishToMavenLocalTask(publicationInfo: PublicationInfo): TaskProvider<Task> {
+internal fun Project.createExpoPublishToMavenLocalTask(publicationInfo: PublicationInfo, expoModulesExtension: ExpoModuleExtension): TaskProvider<Task> {
   val taskProvider = tasks.register("expoPublishToMavenLocal") { task ->
     task.doLast {
-      expoPublishBody(publicationInfo)
+      expoPublishBody(publicationInfo, expoModulesExtension)
     }
   }
   taskProvider.configure { task ->
@@ -147,7 +149,9 @@ internal fun Project.createExpoPublishToMavenLocalTask(publicationInfo: Publicat
   return taskProvider
 }
 
-private fun Project.expoPublishBody(publicationInfo: PublicationInfo, pathToRepository: String? = null) {
+private fun Project.expoPublishBody(publicationInfo: PublicationInfo, expoModulesExtension: ExpoModuleExtension, pathToRepository: String? = null) {
+  validateProjectConfiguration(expoModulesExtension)
+
   if (pathToRepository == null) {
     val mavenLocal = publishingExtension().repositories.mavenLocal()
     val mavenLocalPath = mavenLocal.url.toPath()
@@ -182,6 +186,24 @@ private fun Project.expoPublishBody(publicationInfo: PublicationInfo, pathToRepo
   }.result.get()
 }
 
+private fun Project.validateProjectConfiguration(expoModulesExtension: ExpoModuleExtension) {
+  val shouldUsePublicationScript = expoModulesExtension.autolinking.getShouldUsePublicationScriptPath(this)
+  // If the path to the script is not defined, we assume that we can publish the module.
+  if (shouldUsePublicationScript == null) {
+    return
+  }
+
+  val binding = Binding()
+  binding.setVariable("providers", project.providers)
+  val shell = GroovyShell(javaClass.classLoader, binding)
+
+  val shouldUsePublication = shell.run(shouldUsePublicationScript, emptyArray<String>()) as? Boolean == true
+
+  if (!shouldUsePublication) {
+    throw IllegalStateException("The publication script returned false. Please check the script or your project configuration. You're trying to precompile a non-default configuration.")
+  }
+}
+
 private fun modifyModuleConfig(projectName: String, currentConfig: JsonObject, publicationInfo: PublicationInfo, pathToRepository: String?): JsonObject {
   val publicationObject = JsonObject(mapOf(
     "groupId" to publicationInfo.groupId.toJsonElement(),

package/expo-module-gradle-plugin/src/main/kotlin/expo/modules/plugin/gradle/ExpoModuleExtension.kt

@@ -17,7 +17,7 @@ open class ExpoModuleExtension(val project: Project) {
     project.gradle.extensions.getByType(ExpoGradleHelperExtension::class.java)
   }
 
-  private val autolinking: AutolinkingIntegration by lazy {
+  internal val autolinking: AutolinkingIntegration by lazy {
     AutolinkingIntegrationImpl()
   }
 

package/expo-module-gradle-plugin/src/withAutolinkingPlugin/kotlin/expo/modules/plugin/AutolinkingIntegrationImpl.kt

@@ -1,19 +1,16 @@
 package expo.modules.plugin
 
 import expo.modules.plugin.configuration.ExpoAutolinkingConfig
+import expo.modules.plugin.configuration.GradleProject
 import org.gradle.api.Project
+import java.io.File
 
 class AutolinkingIntegrationImpl : AutolinkingIntegration {
   override fun getExpoDependency(project: Project, name: String): Any {
-    val config = getConfig(project)
-    val dependency = config.allProjects.find { it.name == name }
+    val config = getProjectConfig(project, name)
 
-    if (dependency == null) {
-      throw IllegalStateException("Couldn't find project with name $name in `expo-autolinking-settings` configuration.")
-    }
-
-    if (dependency.usePublication) {
-      val publication = requireNotNull(dependency.publication)
+    if (config.usePublication) {
+      val publication = requireNotNull(config.publication)
       return "${publication.groupId}:${publication.artifactId}:${publication.version}"
     }
 
@@ -21,6 +18,33 @@ class AutolinkingIntegrationImpl : AutolinkingIntegration {
       ?: throw IllegalStateException("Couldn't find project with name $name.")
   }
 
+  override fun getShouldUsePublicationScriptPath(project: Project): File? {
+    val config = getProjectConfig(project)
+    val scriptPath = config.shouldUsePublicationScriptPath
+      ?: return null
+    val scriptFile = File(scriptPath)
+
+    if (!scriptFile.exists()) {
+      project.logger.warn("[ExpoAutolinkingPlugin] The script file does not exist: $scriptFile")
+      return null
+    }
+
+    return scriptFile
+  }
+
+  private fun getProjectConfig(project: Project, projectName: String): GradleProject {
+    val config = getConfig(project)
+    val dependency = config.allProjects.find { it.name == projectName }
+
+    if (dependency == null) {
+      throw IllegalStateException("Couldn't find project with name $projectName in `expo-autolinking-settings` configuration.")
+    }
+
+    return dependency
+  }
+
+  private fun getProjectConfig(project: Project) = getProjectConfig(project, project.name)
+
   private fun getConfig(project: Project): ExpoAutolinkingConfig {
     val gradleExtension = project.gradle.extensions.findByType(ExpoGradleExtension::class.java)
       ?: throw IllegalStateException("`ExpoGradleExtension` not found. Please, make sure that `useExpoModules` was called in `settings.gradle`.")

package/expo-module-gradle-plugin/src/withoutAutolinkingPlugin/kotlin/expo/modules/plugin/AutolinkingIntegrationImpl.kt

@@ -1,10 +1,15 @@
 package expo.modules.plugin
 
 import org.gradle.api.Project
+import java.io.File
 
 class AutolinkingIntegrationImpl : AutolinkingIntegration {
   override fun getExpoDependency(project: Project, name: String): Any {
     return project.rootProject.findProject(":$name")
       ?: throw IllegalStateException("Couldn't find project with name $name.")
   }
+
+  override fun getShouldUsePublicationScriptPath(project: Project): File? {
+    return null
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-native": "^13.1.0",
     "expo-module-scripts": "^4.1.1"
   },
-  "gitHead": "1914bb35d23af23078da37e70988261844436505"
+  "gitHead": "dd2c7150fd75c56505aa6d3f805c14e255649c5d"
 }

package/src/registerWebModule.ts

@@ -4,18 +4,21 @@ import type { NativeModule } from './ts-declarations/NativeModule';
 /**
  * Registers a web module.
  * @param moduleImplementation A class that extends `NativeModule`. The class is registered under `globalThis.expo.modules[className]`.
+ * @param moduleName – a name to register the module under `globalThis.expo.modules[className]`.
  * @returns A singleton instance of the class passed into arguments.
  */
 
 export function registerWebModule<
   EventsMap extends Record<never, never>,
   ModuleType extends typeof NativeModule<EventsMap>,
->(moduleImplementation: ModuleType): ModuleType {
+>(moduleImplementation: ModuleType, moduleName: string): ModuleType {
   ensureNativeModulesAreInstalled();
 
-  const moduleName = moduleImplementation.name;
+  moduleName = moduleName ?? moduleImplementation.name;
   if (!moduleName) {
-    throw new Error('Module implementation must be a class');
+    throw new Error(
+      'Web module implementation is missing a name - it is either not a class or has been minified. Pass the name as a second argument to the `registerWebModule` function.'
+    );
   }
   if (!globalThis?.expo?.modules) {
     globalThis.expo.modules = {};