@capacitor/ios 3.4.3 → 3.5.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.5.0](https://github.com/ionic-team/capacitor/compare/3.4.3...3.5.0) (2022-04-22)
+
+
+### Features
+
+* **ios:** Add overrideable routing for CAPBridgeViewController subclasses ([#5546](https://github.com/ionic-team/capacitor/issues/5546)) ([8875d5e](https://github.com/ionic-team/capacitor/commit/8875d5e2721e8a8ee763ce70cb672db383f36efa))
+
+
+
+
+
 ## [3.4.3](https://github.com/ionic-team/capacitor/compare/3.4.2...3.4.3) (2022-03-04)
 
 **Note:** Version bump only for package @capacitor/ios

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -42,7 +42,7 @@ import Cordova
         setScreenOrientationDefaults()
 
         // get the web view
-        let assetHandler = WebViewAssetHandler()
+        let assetHandler = WebViewAssetHandler(router: router())
         assetHandler.setAssetPath(configuration.appLocation.path)
         let delegationHandler = WebViewDelegationHandler()
         prepareWebView(with: configuration, assetHandler: assetHandler, delegationHandler: delegationHandler)
@@ -89,7 +89,11 @@ import Cordova
         }
         return descriptor
     }
-
+    
+    open func router() -> Router {
+       return _Router()
+    }
+    
     /**
      The WKWebViewConfiguration to use for the webview.
 

package/Capacitor/Capacitor/Router.swift

@@ -0,0 +1,27 @@
+//
+//  Router.swift
+//  Capacitor
+//
+//  Created by Steven Sherry on 3/29/22.
+//  Copyright © 2022 Drifty Co. All rights reserved.
+//
+
+import Foundation
+
+public protocol Router {
+    func route(for path: String) -> String
+}
+
+// swiftlint:disable:next type_name
+internal struct _Router: Router {
+    func route(for path: String) -> String {
+        let pathUrl = URL(string: path)
+       
+        // if the pathUrl is null, then it is an invalid url (meaning it is empty or just plain invalid) then we want to route to /index.html
+        if pathUrl?.pathExtension.isEmpty ?? true {
+            return "/index.html"
+        }
+        
+        return path
+    }
+}

package/Capacitor/Capacitor/WebViewAssetHandler.swift

@@ -3,8 +3,13 @@ import MobileCoreServices
 
 @objc(CAPWebViewAssetHandler)
 internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
-
+    private let router: Router
     private var basePath: String = ""
+    
+    init(router: Router) {
+        self.router = router
+        super.init()
+    }
 
     func setAssetPath(_ assetPath: String) {
         self.basePath = assetPath
@@ -14,14 +19,14 @@ internal class WebViewAssetHandler: NSObject, WKURLSchemeHandler {
         var startPath = self.basePath
         let url = urlSchemeTask.request.url!
         let stringToLoad = url.path
-
+        
+        let resolvedRoute = router.route(for: stringToLoad)
         if stringToLoad.starts(with: CapacitorBridge.fileStartIdentifier) {
             startPath = stringToLoad.replacingOccurrences(of: CapacitorBridge.fileStartIdentifier, with: "")
-        } else if stringToLoad.isEmpty || url.pathExtension.isEmpty {
-            startPath.append("/index.html")
         } else {
-            startPath.append(stringToLoad)
+            startPath.append(resolvedRoute)
         }
+        
         let localUrl = URL.init(string: url.absoluteString)!
         let fileUrl = URL.init(fileURLWithPath: startPath)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "3.4.3",
+  "version": "3.5.0",
   "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.4.0"
+    "@capacitor/core": "^3.5.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "33e9b342790ddedfb654c589ffde18b101d4cd98"
+  "gitHead": "f03e1a67140c8af25288456f9e99dd6234b50f25"
 }