@capacitor/ios 3.2.3 → 3.3.1

package/CHANGELOG.md

@@ -3,6 +3,49 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.3.1](https://github.com/ionic-team/capacitor/compare/3.3.0...3.3.1) (2021-11-05)
+
+**Note:** Version bump only for package @capacitor/ios
+
+
+
+
+
+# [3.3.0](https://github.com/ionic-team/capacitor/compare/3.2.5...3.3.0) (2021-11-03)
+
+
+### Bug Fixes
+
+* **core:** avoid crash on logging circular objects ([#5186](https://github.com/ionic-team/capacitor/issues/5186)) ([1451ec8](https://github.com/ionic-team/capacitor/commit/1451ec850a9ef73267a032638e73f1fc440647b9))
+* **ios:** Avoid CDVScreenOrientationDelegate umbrella header warning ([#5156](https://github.com/ionic-team/capacitor/issues/5156)) ([31ec30d](https://github.com/ionic-team/capacitor/commit/31ec30de193aa3117dbb7eda928ef3a365d5667c))
+
+
+
+
+
+## [3.2.5](https://github.com/ionic-team/capacitor/compare/3.2.4...3.2.5) (2021-10-13)
+
+
+### Bug Fixes
+
+* **ios:** proper handling of allowNavigation with multiple wildcard ([#5096](https://github.com/ionic-team/capacitor/issues/5096)) ([cda17a6](https://github.com/ionic-team/capacitor/commit/cda17a6c1504235c1c1e4826830f1d0e2ef2d35c))
+
+
+
+
+
+## [3.2.4](https://github.com/ionic-team/capacitor/compare/3.2.3...3.2.4) (2021-09-27)
+
+
+### Bug Fixes
+
+* **ios:** Add CDVScreenOrientationDelegate protocol on CAPBridgeViewController ([#5070](https://github.com/ionic-team/capacitor/issues/5070)) ([530477d](https://github.com/ionic-team/capacitor/commit/530477d05e1364931f83a30d61d4f9b5cb687b19))
+* **ios:** show correct line number on console logs ([#5073](https://github.com/ionic-team/capacitor/issues/5073)) ([ec41e74](https://github.com/ionic-team/capacitor/commit/ec41e743aa4ba81e791ad446fac461b7f43b46ed))
+
+
+
+
+
 ## [3.2.3](https://github.com/ionic-team/capacitor/compare/3.2.2...3.2.3) (2021-09-15)
 
 **Note:** Version bump only for package @capacitor/ios

package/Capacitor/Capacitor/CAPBridgeViewController+CDVScreenOrientationDelegate.h

@@ -0,0 +1,6 @@
+#import <Capacitor/Capacitor-Swift.h>
+
+@interface CAPBridgeViewController (CDVScreenOrientationDelegate) <CDVScreenOrientationDelegate>
+
+@end
+

package/Capacitor/Capacitor/CAPBridgeViewController+CDVScreenOrientationDelegate.m

@@ -0,0 +1,5 @@
+#import "CAPBridgeViewController+CDVScreenOrientationDelegate.h"
+
+@implementation CAPBridgeViewController (CDVScreenOrientationDelegate)
+
+@end

package/Capacitor/Capacitor/CAPInstanceConfiguration.swift

@@ -52,7 +52,7 @@ extension InstanceConfiguration {
             return false
         }
         // remove any wildcard segments
-        for wildcard in patternComponents.enumerated().filter({ $0.element == "*" }) {
+        for wildcard in patternComponents.enumerated().reversed().filter({ $0.element == "*" }) {
             hostComponents.remove(at: wildcard.offset)
             patternComponents.remove(at: wildcard.offset)
         }

package/Capacitor/Capacitor/Capacitor.modulemap

@@ -1,7 +1,8 @@
 framework module Capacitor {
   umbrella header "Capacitor.h"
   exclude header "CAPBridgedJSTypes.h"
-  
+  exclude header "CAPBridgeViewController+CDVScreenOrientationDelegate.h"
+
   export *
   module * { export * }
-}
+}

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

@@ -167,21 +167,6 @@ const nativeBridge = (function (exports) {
             win.Capacitor = cap;
             win.Ionic.WebView = IonicWebView;
         };
-        const safeStringify = (value) => {
-            const seen = new Set();
-            return JSON.stringify(value, (_k, v) => {
-                if (seen.has(v)) {
-                    if (v === null)
-                        return null;
-                    else
-                        return '...';
-                }
-                if (typeof v === 'object') {
-                    seen.add(v);
-                }
-                return v;
-            });
-        };
         const initLogger = (win, cap) => {
             const BRIDGED_CONSOLE_METHODS = [
                 'debug',
@@ -248,7 +233,7 @@ const nativeBridge = (function (exports) {
             const serializeConsoleMessage = (msg) => {
                 if (typeof msg === 'object') {
                     try {
-                        msg = safeStringify(msg);
+                        msg = JSON.stringify(msg);
                     }
                     catch (e) {
                         // ignore
@@ -258,24 +243,21 @@ const nativeBridge = (function (exports) {
             };
             // patch window.console on iOS and store original console fns
             const isIos = getPlatformId(win) === 'ios';
-            const originalConsole = Object.assign({}, win.console);
             if (win.console && isIos) {
-                for (const logfn of BRIDGED_CONSOLE_METHODS) {
-                    win.console[logfn] = (...args) => {
-                        const msgs = [...args];
-                        originalConsole[logfn](...msgs);
-                        try {
+                Object.defineProperties(win.console, BRIDGED_CONSOLE_METHODS.reduce((props, method) => {
+                    const consoleMethod = win.console[method].bind(win.console);
+                    props[method] = {
+                        value: (...args) => {
+                            const msgs = [...args];
                             cap.toNative('Console', 'log', {
-                                level: logfn,
+                                level: method,
                                 message: msgs.map(serializeConsoleMessage).join(' '),
                             });
-                        }
-                        catch (e) {
-                            // error converting/posting console messages
-                            originalConsole.error(e);
-                        }
+                            return consoleMethod(...args);
+                        },
                     };
-                }
+                    return props;
+                }, {}));
             }
             cap.logJs = (msg, level) => {
                 switch (level) {
@@ -320,7 +302,7 @@ const nativeBridge = (function (exports) {
                 postToNative = data => {
                     var _a;
                     try {
-                        win.androidBridge.postMessage(safeStringify(data));
+                        win.androidBridge.postMessage(JSON.stringify(data));
                     }
                     catch (e) {
                         (_a = win === null || win === void 0 ? void 0 : win.console) === null || _a === void 0 ? void 0 : _a.error(e);
@@ -351,7 +333,7 @@ const nativeBridge = (function (exports) {
                             url: url,
                             line: lineNo,
                             col: columnNo,
-                            errorObject: safeStringify(err),
+                            errorObject: JSON.stringify(err),
                         },
                     };
                     if (err !== null) {
@@ -501,4 +483,4 @@ const nativeBridge = (function (exports) {
 
     return exports;
 
-}({}));
+})({});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "3.2.3",
+  "version": "3.3.1",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -24,10 +24,10 @@
     "xc:build:CapacitorCordova": "cd CapacitorCordova && xcodebuild && cd .."
   },
   "peerDependencies": {
-    "@capacitor/core": "^3.2.0"
+    "@capacitor/core": "^3.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "17bc41fa2e03f29016c8e48de1a6d68510a9f83b"
+  "gitHead": "8ff7434e9b775e6acb05efae23771ee1b18e26c9"
 }