@capacitor/ios 5.0.0-alpha.1 → 5.0.0-beta.0

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -287,7 +287,6 @@ extension CAPBridgeViewController {
         aWebView.scrollView.bounces = false
         aWebView.scrollView.contentInsetAdjustmentBehavior = configuration.contentInsetAdjustmentBehavior
         aWebView.allowsLinkPreview = configuration.allowLinkPreviews
-        aWebView.configuration.preferences.setValue(true, forKey: "allowFileAccessFromFileURLs")
         aWebView.scrollView.isScrollEnabled = configuration.scrollingEnabled
         if let overrideUserAgent = configuration.overridenUserAgentString {
             aWebView.customUserAgent = overrideUserAgent

package/Capacitor/Capacitor/CAPPlugin+LoadInstance.swift

@@ -12,6 +12,7 @@ extension CAPBridgedPlugin where Self: CAPPlugin {
         webView = bridge.webView
         shouldStringifyDatesInCalls = true
         retainedEventArguments = [:]
+        eventListeners = [:]
         pluginId = identifier
         pluginName = jsName
         load()

package/Capacitor/Capacitor/CAPPlugin.h

@@ -13,7 +13,7 @@
 @property (nonatomic, strong, nonnull) NSString *pluginId;
 @property (nonatomic, strong, nonnull) NSString *pluginName;
 @property (nonatomic, strong, nullable) NSMutableDictionary<NSString *, NSMutableArray<CAPPluginCall *>*> *eventListeners;
-@property (nonatomic, strong, nullable) NSMutableDictionary<NSString *, id> *retainedEventArguments;
+@property (nonatomic, strong, nullable) NSMutableDictionary<NSString *, NSMutableArray<id> *> *retainedEventArguments;
 @property (nonatomic, assign) BOOL shouldStringifyDatesInCalls;
 
 - (instancetype _Nonnull) initWithBridge:(id<CAPBridgeProtocol> _Nonnull) bridge pluginId:(NSString* _Nonnull) pluginId pluginName:(NSString* _Nonnull) pluginName DEPRECATED_MSG_ATTRIBUTE("This initializer is deprecated and is not suggested for use. Any data set through this init method will be overridden when it is loaded on the bridge.");

package/Capacitor/Capacitor/CAPPlugin.m

@@ -52,13 +52,17 @@
 }
 
 - (void)sendRetainedArgumentsForEvent:(NSString *)eventName {
-  id retained = [self.retainedEventArguments objectForKey:eventName];
-  if (retained == nil) {
-    return;
-  }
-  
-  [self notifyListeners:eventName data:retained];
-  [self.retainedEventArguments removeObjectForKey:eventName];
+    // copy retained args and null source to prevent potential race conditions
+    NSMutableArray *retained = [self.retainedEventArguments objectForKey:eventName];
+    if (retained == nil) {
+        return;
+    }
+    
+    [self.retainedEventArguments removeObjectForKey:eventName];
+    
+    for(id data in retained) {
+        [self notifyListeners:eventName data:data];
+    }
 }
 
 - (void)removeEventListener:(NSString *)eventName listener:(CAPPluginCall *)listener {
@@ -79,7 +83,12 @@
   NSArray<CAPPluginCall *> *listenersForEvent = [self.eventListeners objectForKey:eventName];
   if(listenersForEvent == nil || [listenersForEvent count] == 0) {
     if (retain == YES) {
-      [self.retainedEventArguments setObject:data forKey:eventName];
+        
+        if ([self.retainedEventArguments objectForKey:eventName] == nil) {
+            [self.retainedEventArguments setObject:[[NSMutableArray alloc] init] forKey:eventName];
+        }
+        
+        [[self.retainedEventArguments objectForKey:eventName] addObject:data];
     }
     return;
   }

package/Capacitor/Capacitor/CAPWebView.swift

@@ -157,7 +157,6 @@ extension CAPWebView {
         webView.scrollView.bounces = false
         webView.scrollView.contentInsetAdjustmentBehavior = configuration.contentInsetAdjustmentBehavior
         webView.allowsLinkPreview = configuration.allowLinkPreviews
-        webView.configuration.preferences.setValue(true, forKey: "allowFileAccessFromFileURLs")
         webView.scrollView.isScrollEnabled = configuration.scrollingEnabled
 
         if let overrideUserAgent = configuration.overridenUserAgentString {

package/Capacitor/Capacitor/Plugins/HttpRequestHandler.swift

@@ -31,7 +31,7 @@ public enum ResponseType: String {
 /// - Returns: The parsed value or an error
 func tryParseJson(_ data: Data) -> Any {
     do {
-        return try JSONSerialization.jsonObject(with: data, options: .mutableContainers)
+        return try JSONSerialization.jsonObject(with: data, options: [.mutableContainers, .fragmentsAllowed])
     } catch {
         return error.localizedDescription
     }

package/Capacitor/Capacitor/assets/native-bridge.js

@@ -384,9 +384,13 @@ var nativeBridge = (function (exports) {
                                 data: (options === null || options === void 0 ? void 0 : options.body) ? options.body : undefined,
                                 headers: headers,
                             });
-                            const data = typeof nativeResponse.data === 'string'
+                            let data = !nativeResponse.headers['Content-Type'].startsWith('application/json')
                                 ? nativeResponse.data
                                 : JSON.stringify(nativeResponse.data);
+                            // use null data for 204 No Content HTTP response
+                            if (nativeResponse.status === 204) {
+                                data = null;
+                            }
                             // intercept & parse response before returning
                             const response = new Response(data, {
                                 headers: nativeResponse.headers,
@@ -522,7 +526,7 @@ var nativeBridge = (function (exports) {
                                     this.status = nativeResponse.status;
                                     this.response = nativeResponse.data;
                                     this.responseText =
-                                        typeof nativeResponse.data === 'string'
+                                        !nativeResponse.headers['Content-Type'].startsWith('application/json')
                                             ? nativeResponse.data
                                             : JSON.stringify(nativeResponse.data);
                                     this.responseURL = nativeResponse.url;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-beta.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -25,10 +25,10 @@
     "xc:build:CapacitorCordova": "cd CapacitorCordova && xcodebuild && cd .."
   },
   "peerDependencies": {
-    "@capacitor/core": "^5.0.0-alpha.0"
+    "@capacitor/core": "^5.0.0-alpha.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "76202ca81b8e855df0ef8e5f6a36bd65ed1469a4"
+  "gitHead": "51a548b97129998de8c403b2a8eb0421135af812"
 }