@capacitor/ios 5.0.0-beta.1 → 5.0.0-beta.2

package/Capacitor/Capacitor/CAPInstanceConfiguration.h

@@ -19,6 +19,7 @@ NS_SWIFT_NAME(InstanceConfiguration)
 @property (nonatomic, readonly) BOOL scrollingEnabled;
 @property (nonatomic, readonly) BOOL allowLinkPreviews;
 @property (nonatomic, readonly) BOOL handleApplicationNotifications;
+@property (nonatomic, readonly) BOOL isWebDebuggable;
 @property (nonatomic, readonly) BOOL cordovaDeployDisabled;
 @property (nonatomic, readonly) UIScrollViewContentInsetAdjustmentBehavior contentInsetAdjustmentBehavior;
 @property (nonatomic, readonly, nonnull) NSURL *appLocation;

package/Capacitor/Capacitor/CAPInstanceConfiguration.m

@@ -37,6 +37,7 @@
         _limitsNavigationsToAppBoundDomains = descriptor.limitsNavigationsToAppBoundDomains;
         _preferredContentMode = descriptor.preferredContentMode;
         _pluginConfigurations = descriptor.pluginConfigurations;
+        _isWebDebuggable = descriptor.isWebDebuggable;
         _legacyConfig = descriptor.legacyConfig;
         // construct the necessary URLs
         _localURL = [[NSURL alloc] initWithString:[NSString stringWithFormat:@"%@://%@", descriptor.urlScheme, descriptor.urlHostname]];
@@ -67,6 +68,7 @@
         _scrollingEnabled = configuration.scrollingEnabled;
         _allowLinkPreviews = configuration.allowLinkPreviews;
         _handleApplicationNotifications = configuration.handleApplicationNotifications;
+        _isWebDebuggable = configuration.isWebDebuggable;
         _cordovaDeployDisabled = configuration.cordovaDeployDisabled;
         _contentInsetAdjustmentBehavior = configuration.contentInsetAdjustmentBehavior;
         // we don't care about internal usage of deprecated APIs and the framework should build cleanly

package/Capacitor/Capacitor/CAPInstanceDescriptor.h

@@ -93,6 +93,11 @@ NS_SWIFT_NAME(InstanceDescriptor)
  @discussion Defaults to @c true. Required to be @c true for notification plugins to work correctly. Set to @c false if your application will handle notifications independently.
  */
 @property (nonatomic, assign) BOOL handleApplicationNotifications;
+/**
+ @brief Enables web debugging by setting isInspectable of  @c WKWebView to @c true on iOS 16.4 and greater
+ @discussion Defaults to true in debug mode and false in production
+ */
+@property (nonatomic, assign) BOOL isWebDebuggable;
 /**
  @brief How the web view will inset its content
  @discussion Set by @c ios.contentInset in the configuration file. Corresponds to @c contentInsetAdjustmentBehavior on WKWebView.

package/Capacitor/Capacitor/CAPInstanceDescriptor.m

@@ -39,6 +39,7 @@ NSString* const CAPInstanceDescriptorDefaultHostname = @"localhost";
     _scrollingEnabled = YES;
     _allowLinkPreviews = YES;
     _handleApplicationNotifications = YES;
+    _isWebDebuggable = NO;
     _contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     _appLocation = location;
     _limitsNavigationsToAppBoundDomains = FALSE;

package/Capacitor/Capacitor/CAPInstanceDescriptor.swift

@@ -134,6 +134,13 @@ internal extension InstanceDescriptor {
             if let handleNotifications = config[keyPath: "ios.handleApplicationNotifications"] as? Bool {
                 handleApplicationNotifications = handleNotifications
             }
+            if let webContentsDebuggingEnabled = config[keyPath: "ios.webContentsDebuggingEnabled"] as? Bool {
+                isWebDebuggable = webContentsDebuggingEnabled
+            } else {
+                #if DEBUG
+                isWebDebuggable = true
+                #endif
+            }
         }
     }
     // swiftlint:enable cyclomatic_complexity

package/Capacitor/Capacitor/Capacitor.h

@@ -12,3 +12,5 @@ FOUNDATION_EXPORT const unsigned char CapacitorVersionString[];
 #import <Capacitor/CAPPluginMethod.h>
 #import <Capacitor/CAPInstanceDescriptor.h>
 #import <Capacitor/CAPInstanceConfiguration.h>
+#import <Capacitor/WKWebView+Capacitor.h>
+

package/Capacitor/Capacitor/CapacitorBridge.swift

@@ -209,6 +209,8 @@ internal class CapacitorBridge: NSObject, CAPBridgeProtocol {
         observers.append(NotificationCenter.default.addObserver(forName: type(of: self).tmpVCAppeared.name, object: .none, queue: .none) { [weak self] _ in
             self?.tmpWindow = nil
         })
+
+        self.setupWebDebugging(configuration: configuration)
     }
 
     deinit {
@@ -418,6 +420,15 @@ internal class CapacitorBridge: NSObject, CAPBridgeProtocol {
         return "\(type(of: self).capacitorSite)docs/\(url)"
     }
 
+    private func setupWebDebugging(configuration: InstanceConfiguration) {
+        let isWebDebuggable = configuration.isWebDebuggable
+        if isWebDebuggable, #unavailable(iOS 16.4) {
+            CAPLog.print("⚡️ Warning: isWebDebuggable only functions as intended on iOS 16.4 and above.")
+        }
+
+        self.webView?.setInspectableIfRequired(isWebDebuggable)
+    }
+
     /**
      Handle a call from JavaScript. First, find the corresponding plugin, construct a selector,
      and perform that selector on the plugin instance.

package/Capacitor/Capacitor/WKWebView+Capacitor.h

@@ -0,0 +1,11 @@
+@import UIKit;
+@import WebKit;
+
+#ifndef WKWebView_Capacitor_h
+#define WKWebView_Capacitor_h
+
+@interface WKWebView (CapacitorInspectablity)
+- (void)setInspectableIfRequired: (BOOL)shouldInspect;
+@end
+
+#endif /* WKWebView_Capacitor_h */

package/Capacitor/Capacitor/WKWebView+Capacitor.m

@@ -13,3 +13,16 @@
     [self _swizzleKeyboardMethods];
 }
 @end
+
+// TODO: Remove this after Xcode 14.3 is required
+@implementation WKWebView (CapacitorInspectablity)
+
+- (void)setInspectableIfRequired: (BOOL)shouldInspect {
+    #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 160400
+    if (@available(iOS 16.4, *)) {
+        self.inspectable = shouldInspect;
+    }
+    #endif
+}
+
+@end

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

@@ -396,6 +396,14 @@ var nativeBridge = (function (exports) {
                                 headers: nativeResponse.headers,
                                 status: nativeResponse.status,
                             });
+                            /*
+                             * copy url to response, `cordova-plugin-ionic` uses this url from the response
+                             * we need `Object.defineProperty` because url is an inherited getter on the Response
+                             * see: https://stackoverflow.com/a/57382543
+                             * */
+                            Object.defineProperty(response, 'url', {
+                                value: nativeResponse.url,
+                            });
                             console.timeEnd(tag);
                             return response;
                         }
@@ -525,10 +533,9 @@ var nativeBridge = (function (exports) {
                                     this._headers = nativeResponse.headers;
                                     this.status = nativeResponse.status;
                                     this.response = nativeResponse.data;
-                                    this.responseText =
-                                        !nativeResponse.headers['Content-Type'].startsWith('application/json')
-                                            ? nativeResponse.data
-                                            : JSON.stringify(nativeResponse.data);
+                                    this.responseText = !nativeResponse.headers['Content-Type'].startsWith('application/json')
+                                        ? nativeResponse.data
+                                        : JSON.stringify(nativeResponse.data);
                                     this.responseURL = nativeResponse.url;
                                     this.readyState = 4;
                                     this.dispatchEvent(new Event('load'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "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-beta.0"
+    "@capacitor/core": "^5.0.0-beta.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "354ffd2062b1c20951bdc9539d99e6c37f54675e"
+  "gitHead": "80b59984c0bf07e0c2d2a6310f7a7ff2679606ab"
 }