expo-modules-core 1.2.0 → 1.2.2

package/CHANGELOG.md

@@ -10,6 +10,19 @@
 
 ### 💡 Others
 
+## 1.2.2 — 2023-02-14
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed convertible implementation for `URL` type to support unencoded UTF8 urls and file paths. ([#21139](https://github.com/expo/expo/pull/21139) by [@tsapeta](https://github.com/tsapeta))
+- Fixed AppDelegateSubscriber broken when running on iOS dynamic framework or static framework mode. ([#21206](https://github.com/expo/expo/pull/21206) by [@kudo](https://github.com/kudo))
+
+## 1.2.1 — 2023-02-09
+
+### 🐛 Bug fixes
+
+- Fix crash when reloading app while expo-av video is playing. ([#21118](https://github.com/expo/expo/pull/21118) by [@janicduplessis](https://github.com/janicduplessis))
+
 ## 1.2.0 — 2023-02-03
 
 ### 🎉 New features

package/README.md

@@ -1,4 +1,11 @@
-# expo-modules-core
+<p>
+  <a href="https://docs.expo.dev/modules/">
+    <img
+      src="../../.github/resources/expo-modules-core.svg"
+      alt="expo-modules-core"
+      height="64" />
+  </a>
+</p>
 
 The core of Expo Modules architecture.
 

package/android/ExpoModulesCorePlugin.gradle

@@ -4,7 +4,7 @@ class KotlinExpoModulesCorePlugin implements Plugin<Project> {
       project.ext.kotlinVersion = {
         project.rootProject.ext.has("kotlinVersion")
             ? project.rootProject.ext.get("kotlinVersion")
-            : "1.6.10"
+            : "1.8.10"
       }
     }
   }

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.2.0'
+version = '1.2.2'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -25,7 +25,7 @@ buildscript {
     if (ext.has("kotlinVersion")) {
       ext.kotlinVersion()
     } else {
-      ext.safeExtGet("kotlinVersion", "1.6.10")
+      ext.safeExtGet("kotlinVersion", "1.8.10")
     }
   }
 
@@ -173,7 +173,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.2.0"
+    versionName "1.2.2"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/ios/AppDelegates/EXAppDelegateWrapper.mm

@@ -42,7 +42,7 @@
   return _expoAppDelegate;
 }
 
-#if __has_include(<React-RCTAppDelegate/RCTAppDelegate.h>)
+#if __has_include(<React-RCTAppDelegate/RCTAppDelegate.h>) || __has_include(<React_RCTAppDelegate/RCTAppDelegate.h>)
 
 - (UIView *)findRootView:(UIApplication *)application
 {

package/ios/Swift/Arguments/Convertibles.swift

@@ -13,11 +13,10 @@ import CoreGraphics
 
 extension URL: Convertible {
   public static func convert(from value: Any?) throws -> Self {
-    if let uri = value as? String, let url = URL(string: uri) {
-      // `URL(string:)` is an optional init but it doesn't imply it's a valid URL,
-      // so here we don't check for the correctness of the URL.
-      // If it has no scheme, we assume it was the file path.
-      return url.scheme != nil ? url : URL(fileURLWithPath: uri)
+    if let value = value as? String, let encodedValue = percentEncodeUrlString(value), let url = URL(string: encodedValue) {
+      // If it has no scheme, we assume it was the file path which needs to be recreated to be recognized as the file url.
+      // Notice that it uses the decoded value as the file path doesn't have to be percent-encoded.
+      return url.scheme != nil ? url : URL(fileURLWithPath: value)
     }
     throw Conversions.ConvertingException<URL>(value)
   }

package/ios/Swift/Utilities.swift

@@ -26,3 +26,21 @@ internal func toNSError(_ error: Error) -> NSError {
   }
   return error as NSError
 }
+
+/**
+ Makes sure the url string is percent encoded. If the given string is already encoded, it's decoded first.
+ Note that it encodes only characters that are not allowed in the url query and '#' that indicates the fragment part.
+ */
+internal func percentEncodeUrlString(_ url: String) -> String? {
+  // The value may come unencoded or already encoded, so first we try to decode it.
+  // `removingPercentEncoding` returns nil when the string contains an invalid percent-encoded sequence,
+  // but that usually means the value came unencoded, so it falls back to the given string.
+  let decodedString = url.removingPercentEncoding ?? url
+
+  // A `CharacterSet` with all query-allowed characters and the hash which is not allowed in the query,
+  // but it must stay unencoded to indicate the start of the url fragment part.
+  let allowedCharactersSet = CharacterSet.urlQueryAllowed.union(CharacterSet(charactersIn: "#"))
+
+  // Do the percent encoding, but note that it may still return nil when it's not possible to encode for some reason.
+  return decodedString.addingPercentEncoding(withAllowedCharacters: allowedCharactersSet)
+}

package/ios/Swift/Views/ComponentData.swift

@@ -76,7 +76,7 @@ private func createEventSetter(eventName: String, bridge: RCTBridge?) -> RCTProp
     installEventDispatcher(forEvent: eventName, onView: target) { [weak target] (body: [String: Any]) in
       if let target = target {
         let componentEvent = RCTComponentEvent(name: eventName, viewTag: target.reactTag, body: body)
-        bridge?.eventDispatcher().send(componentEvent)
+        bridge?.eventDispatcher()?.send(componentEvent)
       }
     }
   }

package/ios/Tests/ConvertiblesSpec.swift

@@ -16,6 +16,62 @@ class ConvertiblesSpec: ExpoSpec {
         expect(url.absoluteString) == remoteUrlString
       }
 
+      it("converts from url with unencoded query") {
+        let query = "param=🥓"
+        let urlString = "https://expo.dev/?\(query)"
+        let url = try URL.convert(from: urlString)
+
+        if #available(iOS 16.0, *) {
+          expect(url.query(percentEncoded: true)) == "param=%F0%9F%A5%93"
+          expect(url.query(percentEncoded: false)) == query
+        }
+        expect(url.query) == "param=%F0%9F%A5%93"
+        expect(url.absoluteString) == "https://expo.dev/?param=%F0%9F%A5%93"
+        expect(url.absoluteString.removingPercentEncoding) == urlString
+      }
+
+      it("converts from url with encoded query") {
+        let query = "param=%F0%9F%A5%93"
+        let urlString = "https://expo.dev/?\(query)"
+        let url = try URL.convert(from: urlString)
+
+        if #available(iOS 16.0, *) {
+          expect(url.query(percentEncoded: true)) == query
+          expect(url.query(percentEncoded: false)) == "param=🥓"
+        }
+        expect(url.query) == query
+        expect(url.absoluteString) == urlString
+        expect(url.absoluteString.removingPercentEncoding) == "https://expo.dev/?param=🥓"
+      }
+
+      it("converts from url containing percent character") {
+        // The percent character alone requires percent-encoding to `%25`.
+        let query = "param=%"
+        let urlString = "https://expo.dev/?\(query)"
+        let url = try URL.convert(from: urlString)
+
+        if #available(iOS 16.0, *) {
+          expect(url.query(percentEncoded: true)) == "param=%25"
+          expect(url.query(percentEncoded: false)) == query
+        }
+        expect(url.query) == "param=%25"
+        expect(url.absoluteString) == "https://expo.dev/?param=%25"
+        expect(url.absoluteString.removingPercentEncoding) == urlString
+      }
+
+      it("converts from url containing the anchor") {
+        // The hash is not allowed in the query (requires percent-encoding),
+        // but we want it to be recognized as the beginning of the fragment,
+        // thus it cannot be percent-encoded.
+        let query = "param=#expo"
+        let urlString = "https://expo.dev/?\(query)"
+        let url = try URL.convert(from: urlString)
+
+        expect(url.query) == "param="
+        expect(url.fragment) == "expo"
+        expect(url.absoluteString) == urlString
+      }
+
       it("converts from file url") {
         let fileUrlString = "file:///expo/tmp"
         let url = try URL.convert(from: fileUrlString)
@@ -29,11 +85,30 @@ class ConvertiblesSpec: ExpoSpec {
         let filePath = "/expo/image.png"
         let url = try URL.convert(from: filePath)
 
+        expect(url.scheme) == "file"
         expect(url.path) == filePath
         expect(url.absoluteString) == "file://\(filePath)"
         expect(url.isFileURL) == true
       }
 
+      it("converts from file path with UTF8 characters") {
+        let filePath = "/中文ÅÄÖąÓśĆñ.gif"
+        let url = try URL.convert(from: filePath)
+
+        expect(url.scheme) == "file"
+        expect(url.path) == filePath
+        expect(url.isFileURL) == true
+      }
+
+      it("converts from file path containing percent character") {
+        let filePath = "/%.png"
+        let url = try URL.convert(from: filePath)
+
+        expect(url.scheme) == "file"
+        expect(url.path) == filePath
+        expect(url.isFileURL) == true
+      }
+
       it("throws when no string") {
         expect { try URL.convert(from: 29.5) }.to(
           throwError(errorType: Conversions.ConvertingException<URL>.self)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "1815e2eaad8c753588c7b1eb74420174a28e01f4"
+  "gitHead": "c8107d57eabaedff5d53bc8036d062db12a473c8"
 }