@capacitor/ios 8.3.2 → 9.0.0-alpha.0

package/Capacitor/Capacitor/CAPApplicationDelegateProxy.swift

@@ -11,7 +11,6 @@ public class ApplicationDelegateProxy: NSObject, UIApplicationDelegate {
             "url": url,
             "options": options
         ])
-        NotificationCenter.default.post(name: NSNotification.Name.CDVPluginHandleOpenURL, object: url)
         lastURL = url
         return true
     }

package/Capacitor/Capacitor/CAPBridgeProtocol.swift

@@ -79,6 +79,9 @@ import WebKit
     func registerPluginType(_ pluginType: CAPPlugin.Type)
     func registerPluginInstance(_ pluginInstance: CAPPlugin)
 
+    // MARK: - Interceptors
+    func registerCallInterceptor(_ name: String, handler: @escaping ([String: Any]) -> Void)
+
     // MARK: - View Presentation
     func showAlertWith(title: String, message: String, buttonTitle: String)
     @available(*, deprecated, message: "Use self?.bridge?.viewController?.present")

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -1,6 +1,5 @@
 import UIKit
 import WebKit
-import Cordova
 
 @objc open class CAPBridgeViewController: UIViewController {
     private var capacitorBridge: CapacitorBridge?
@@ -47,10 +46,10 @@ import Cordova
         // create the bridge
         capacitorBridge = CapacitorBridge(with: configuration,
                                           delegate: self,
-                                          cordovaConfiguration: configDescriptor.cordovaConfiguration,
                                           assetHandler: assetHandler,
                                           delegationHandler: delegationHandler)
         capacitorDidLoad()
+        updateAppLocationIfNeeded()
 
         if configDescriptor.instanceType == .fixed {
             updateBinaryVersion()
@@ -89,18 +88,25 @@ import Cordova
      - Note: This is called early in the View Controller's lifecycle. Not all properties will be set at invocation.
      */
     open func instanceDescriptor() -> InstanceDescriptor {
-        let descriptor = InstanceDescriptor.init()
-        if !isNewBinary && !descriptor.cordovaDeployDisabled {
+        return InstanceDescriptor()
+    }
+
+    /// This function must be called after plugins are loaded or it will have no effect.
+    open func updateAppLocationIfNeeded() {
+        let cordovaPlugin = bridge?.plugin(withName: "__CordovaPlugin")
+        let cordovaDeployDisabled = cordovaPlugin?.perform(Selector(("cordovaDeployDisabled"))).takeUnretainedValue() as? Bool ?? false
+
+        if !isNewBinary && !cordovaDeployDisabled {
             if let persistedPath = KeyValueStore.standard["serverBasePath", as: String.self], !persistedPath.isEmpty {
                 if let libPath = NSSearchPathForDirectoriesInDomains(.libraryDirectory, .userDomainMask, true).first {
-                    descriptor.appLocation = URL(fileURLWithPath: libPath, isDirectory: true)
+                    let serverBasePath = URL(fileURLWithPath: libPath, isDirectory: true)
                         .appendingPathComponent("NoCloud")
                         .appendingPathComponent("ionic_built_snapshots")
                         .appendingPathComponent(URL(fileURLWithPath: persistedPath, isDirectory: true).lastPathComponent)
+                    setServerBasePath(path: serverBasePath.path)
                 }
             }
         }
-        return descriptor
     }
 
     open func router() -> Router {

package/Capacitor/Capacitor/CAPInstanceDescriptor.h

@@ -2,7 +2,7 @@
 #define CAPInstanceDescriptor_h
 
 @import UIKit;
-@import Cordova;
+
 
 typedef NS_ENUM(NSInteger, CAPInstanceType) {
     CAPInstanceTypeFixed NS_SWIFT_NAME(fixed),
@@ -137,7 +137,7 @@ NS_SWIFT_NAME(InstanceDescriptor)
 /**
  @brief The parser used to load the cofiguration for Cordova plugins.
  */
-@property (nonatomic, copy, nonnull) CDVConfigParser *cordovaConfiguration;
+@property (nonatomic, copy, nonnull) NSObject *cordovaConfiguration;
 /**
  @brief Warnings generated during initialization.
  */

package/Capacitor/Capacitor/CAPInstanceDescriptor.m

@@ -45,7 +45,6 @@ NSString* const CAPInstanceDescriptorDefaultHostname = @"localhost";
     _contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     _appLocation = location;
     _limitsNavigationsToAppBoundDomains = FALSE;
-    _cordovaConfiguration = [[CDVConfigParser alloc] init];
     _warnings = 0;
     if (location == nil) {
         _warnings |= CAPInstanceWarningMissingAppDir;

package/Capacitor/Capacitor/CAPInstanceDescriptor.swift

@@ -52,23 +52,6 @@ internal extension InstanceDescriptor {
             warnings.update(with: .missingFile)
         }
 
-        // parse the cordova configuration
-        var configParser: XMLParser?
-        if let cordovaURL = cordovaURL,
-           FileManager.default.fileExists(atPath: cordovaURL.path, isDirectory: &isDirectory),
-           isDirectory.boolValue == false {
-            configParser = XMLParser(contentsOf: cordovaURL)
-        } else {
-            warnings.update(with: .missingCordovaFile)
-            // we don't want to break up string literals
-            // swiftlint:disable:next line_length
-            if let cordovaXML = "<?xml version='1.0' encoding='utf-8'?><widget version=\"1.0.0\" xmlns=\"http://www.w3.org/ns/widgets\" xmlns:cdv=\"http://cordova.apache.org/ns/1.0\"><access origin=\"*\" /></widget>".data(using: .utf8) {
-                configParser = XMLParser(data: cordovaXML)
-            }
-        }
-        configParser?.delegate = cordovaConfiguration
-        configParser?.parse()
-
         // extract our configuration values
         if let config = config {
             // to be removed
@@ -160,7 +143,7 @@ internal extension InstanceDescriptor {
 
 extension InstanceDescriptor {
     @objc public var cordovaDeployDisabled: Bool {
-        return (cordovaConfiguration.settings?["DisableDeploy".lowercased()] as? NSString)?.boolValue ?? false
+        return false
     }
 
     @objc public func normalize() {

package/Capacitor/Capacitor/CapacitorBridge.swift

@@ -1,12 +1,11 @@
 import Foundation
 import Dispatch
 import WebKit
-import Cordova
 
 internal typealias CapacitorPlugin = CAPPlugin & CAPBridgedPlugin
 
 struct RegistrationList: Codable {
-    let packageClassList: Set<String>
+    var packageClassList: Set<String>
 }
 
 /**
@@ -93,10 +92,6 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
             }
         }
     }
-    @available(*, deprecated, message: "obsolete")
-    var tmpWindow: UIWindow?
-    @available(*, deprecated, message: "obsolete")
-    static let tmpVCAppeared = Notification(name: Notification.Name(rawValue: "tmpViewControllerAppeared"))
     public static let capacitorSite = "https://capacitorjs.com/"
     public static let fileStartIdentifier = "/_capacitor_file_"
     public static let httpInterceptorStartIdentifier = "/_capacitor_http_interceptor_"
@@ -117,18 +112,16 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
     @objc public var config: InstanceConfiguration
     // Map of all loaded and instantiated plugins by pluginId -> instance
     var plugins =  [String: CapacitorPlugin]()
-    // Manager for getting Cordova plugins
-    var cordovaPluginManager: CDVPluginManager?
     // Calls we are storing to resolve later
     var storedCalls = ConcurrentDictionary<CAPPluginCall>()
     // Whether to inject the Cordova files
-    private var injectCordovaFiles = false
-    private var cordovaParser: CDVConfigParser?
+    private var cordovaIsPresent = false
     private var injectMiscFiles: [String] = []
     private var canInjectJS: Bool = true
 
     // Background dispatch queue for plugin calls
     open private(set) var dispatchQueue = DispatchQueue(label: "bridge")
+    internal private(set) var callInterceptors: [String: ([String: Any]) -> Void] = [:]
     // Array of block based observers
     var observers: [NSObjectProtocol] = []
 
@@ -205,12 +198,17 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
 
     // MARK: - Initialization
 
-    public init(with configuration: InstanceConfiguration, delegate bridgeDelegate: CAPBridgeDelegate, cordovaConfiguration: CDVConfigParser, assetHandler: WebViewAssetHandler, delegationHandler: WebViewDelegationHandler, autoRegisterPlugins: Bool = true) {
+    @available(*, deprecated, renamed: "init", message: "Use different init")
+    public convenience init(with configuration: InstanceConfiguration, delegate bridgeDelegate: CAPBridgeDelegate, cordovaConfiguration: Any, assetHandler: WebViewAssetHandler, delegationHandler: WebViewDelegationHandler, autoRegisterPlugins: Bool = true) {
+        self.init(with: configuration, delegate: bridgeDelegate, assetHandler: assetHandler, delegationHandler: delegationHandler, autoRegisterPlugins: autoRegisterPlugins)
+    }
+
+    public init(with configuration: InstanceConfiguration, delegate bridgeDelegate: CAPBridgeDelegate, assetHandler: WebViewAssetHandler, delegationHandler: WebViewDelegationHandler, autoRegisterPlugins: Bool = true) {
+
         self.bridgeDelegate = bridgeDelegate
         self.webViewAssetHandler = assetHandler
         self.webViewDelegationHandler = delegationHandler
         self.config = configuration
-        self.cordovaParser = cordovaConfiguration
         self.notificationRouter = NotificationRouter()
         self.notificationRouter.handleApplicationNotifications = configuration.handleApplicationNotifications
         self.autoRegisterPlugins = autoRegisterPlugins
@@ -220,12 +218,9 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
 
         exportCoreJS(localUrl: configuration.localURL.absoluteString)
         registerPlugins()
-        setupCordovaCompatibility()
+        setupListeners()
         exportMiscJS()
         canInjectJS = false
-        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)
     }
@@ -262,31 +257,27 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
         injectMiscFiles.removeAll()
     }
 
-    /**
-     Set up our Cordova compat by loading all known Cordova plugins and injecting their JS.
-     */
-    func setupCordovaCompatibility() {
-        if injectCordovaFiles {
-            exportCordovaJS()
-            registerCordovaPlugins()
-        } else {
-            observers.append(NotificationCenter.default.addObserver(forName: UIApplication.willEnterForegroundNotification, object: nil, queue: OperationQueue.main) { [weak self] (_) in
-                self?.triggerDocumentJSEvent(eventName: "resume")
-            })
-            observers.append(NotificationCenter.default.addObserver(forName: UIApplication.didEnterBackgroundNotification, object: nil, queue: OperationQueue.main) { [weak self] (_) in
-                self?.triggerDocumentJSEvent(eventName: "pause")
-            })
-        }
-    }
-
-    /**
-     Export the core Cordova JS runtime
-     */
-    func exportCordovaJS() {
-        do {
-            try JSExport.exportCordovaJS(userContentController: webViewDelegationHandler.contentController)
-        } catch {
-            type(of: self).fatalError(error, error)
+    func setupListeners() {
+        if !cordovaIsPresent {
+            observers.append(
+                NotificationCenter.default.addObserver(
+                    forName: UIApplication.willEnterForegroundNotification,
+                    object: nil,
+                    queue: .main
+                ) { [weak self] _ in
+                    self?.triggerDocumentJSEvent(eventName: "resume")
+                }
+            )
+
+            observers.append(
+                NotificationCenter.default.addObserver(
+                    forName: UIApplication.didEnterBackgroundNotification,
+                    object: nil,
+                    queue: .main
+                ) { [weak self] _ in
+                    self?.triggerDocumentJSEvent(eventName: "pause")
+                }
+            )
         }
     }
 
@@ -309,14 +300,13 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
             do {
                 if let pluginJSON = Bundle.main.url(forResource: "capacitor.config", withExtension: "json") {
                     let pluginData = try Data(contentsOf: pluginJSON)
-                    let registrationList = try JSONDecoder().decode(RegistrationList.self, from: pluginData)
+                    var registrationList = try JSONDecoder().decode(RegistrationList.self, from: pluginData)
 
                     for plugin in registrationList.packageClassList {
-                        if let pluginClass = NSClassFromString(plugin) {
-                            if pluginClass == CDVPlugin.self {
-                                injectCordovaFiles = true
-                            } else {
-                                pluginList.append(pluginClass)
+                        if let pluginClass = NSClassFromString(plugin), pluginClass is CAPPlugin.Type {
+                            pluginList.append(pluginClass)
+                            if plugin == "CordovaPlugin" {
+                                cordovaIsPresent = true
                             }
                         }
                     }
@@ -393,6 +383,10 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
 
     // MARK: - CAPBridgeProtocol: Call Management
 
+    public func registerCallInterceptor(_ name: String, handler: @escaping ([String: Any]) -> Void) {
+        callInterceptors[name] = handler
+    }
+
     @objc public func saveCall(_ call: CAPPluginCall) {
         storedCalls[call.callbackId] = call
     }
@@ -425,23 +419,6 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
         return self.dispatchQueue
     }
 
-    func registerCordovaPlugins() {
-        guard let cordovaParser = cordovaParser else {
-            return
-        }
-        cordovaPluginManager = CDVPluginManager.init(parser: cordovaParser, viewController: self.viewController, webView: self.getWebView())
-        if cordovaParser.startupPluginNames.count > 0 {
-            for pluginName in cordovaParser.startupPluginNames {
-                _ = cordovaPluginManager?.getCommandInstance(pluginName as? String)
-            }
-        }
-        do {
-            try JSExport.exportCordovaPluginsJS(userContentController: webViewDelegationHandler.contentController)
-        } catch {
-            type(of: self).fatalError(error, error)
-        }
-    }
-
     func reload() {
         self.getWebView()?.reload()
     }
@@ -540,34 +517,6 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
         }
     }
 
-    /**
-     Handle a Cordova call from JavaScript. First, find the corresponding plugin,
-     construct a selector, and perform that selector on the plugin instance.
-     */
-    func handleCordovaJSCall(call: JSCall) {
-        // Create a selector to send to the plugin
-
-        if let plugin = self.cordovaPluginManager?.getCommandInstance(call.pluginId.lowercased()) {
-            let selector = NSSelectorFromString("\(call.method):")
-            if !plugin.responds(to: selector) {
-                CAPLog.print("Error: Plugin \(plugin.className ?? "") does not respond to method call \(selector).")
-                CAPLog.print("Ensure plugin method exists and uses @objc in its declaration")
-                return
-            }
-
-            let arguments: [Any] = call.options["options"] as? [Any] ?? []
-            let pluginCall = CDVInvokedUrlCommand(arguments: arguments,
-                                                  callbackId: call.callbackId,
-                                                  className: plugin.className,
-                                                  methodName: call.method)
-            plugin.perform(selector, with: pluginCall)
-
-        } else {
-            CAPLog.print("Error: Cordova Plugin mapping not found")
-            return
-        }
-    }
-
     func removeAllPluginListeners() {
         for plugin in plugins.values {
             plugin.perform(#selector(CAPPlugin.removeAllListeners(_:)), with: nil)

package/Capacitor/Capacitor/JS.swift

@@ -14,11 +14,11 @@ public typealias JSResultBody = [String: Any]
 /**
  * A call originating from JavaScript land
  */
-internal struct JSCall {
-    let options: [String: Any]
-    let pluginId: String
-    let method: String
-    let callbackId: String
+public struct JSCall {
+    public let options: [String: Any]
+    public let pluginId: String
+    public let method: String
+    public let callbackId: String
 }
 
 internal protocol JSResultProtocol {

package/Capacitor/Capacitor/JSExport.swift

@@ -35,24 +35,6 @@ internal class JSExport {
         }
     }
 
-    static func exportCordovaJS(userContentController: WKUserContentController) throws {
-        guard let cordovaUrl = Bundle.main.url(forResource: "public/cordova", withExtension: "js") else {
-            CAPLog.print("ERROR: Required cordova.js file not found. Cordova plugins will not function!")
-            throw CapacitorBridgeError.errorExportingCoreJS
-        }
-        guard let cordovaPluginsUrl = Bundle.main.url(forResource: "public/cordova_plugins", withExtension: "js") else {
-            CAPLog.print("ERROR: Required cordova_plugins.js file not found. Cordova plugins  will not function!")
-            throw CapacitorBridgeError.errorExportingCoreJS
-        }
-        do {
-            try self.injectFile(fileURL: cordovaUrl, userContentController: userContentController)
-            try self.injectFile(fileURL: cordovaPluginsUrl, userContentController: userContentController)
-        } catch {
-            CAPLog.print("ERROR: Unable to read required cordova files. Cordova plugins will not function!")
-            throw CapacitorBridgeError.errorExportingCoreJS
-        }
-    }
-
     static func exportMiscFileJS(paths: [String], userContentController: WKUserContentController) {
         for path in paths {
             if let miscJSFilePath = Bundle.main.url(forResource: "public/\(path.replacingOccurrences(of: ".js", with: ""))", withExtension: "js") {
@@ -184,28 +166,6 @@ internal class JSExport {
         return lines.joined(separator: "\n")
     }
 
-    static func exportCordovaPluginsJS(userContentController: WKUserContentController) throws {
-        if let pluginsJSFolder = Bundle.main.url(forResource: "public/plugins", withExtension: nil) {
-            self.injectFilesForFolder(folder: pluginsJSFolder, userContentController: userContentController)
-        }
-    }
-
-    static func injectFilesForFolder(folder: URL, userContentController: WKUserContentController) {
-        let fileManager = FileManager.default
-        do {
-            let fileURLs = try fileManager.contentsOfDirectory(at: folder, includingPropertiesForKeys: nil, options: [])
-            for fileURL in fileURLs {
-                if fileURL.hasDirectoryPath {
-                    injectFilesForFolder(folder: fileURL, userContentController: userContentController)
-                } else {
-                    try self.injectFile(fileURL: fileURL, userContentController: userContentController)
-                }
-            }
-        } catch {
-            CAPLog.print("Error while enumerating files")
-        }
-    }
-
     static func injectFile(fileURL: URL, userContentController: WKUserContentController) throws {
         do {
             let data = try String(contentsOf: fileURL, encoding: .utf8)

package/Capacitor/Capacitor/WebViewDelegationHandler.swift

@@ -208,17 +208,8 @@ open class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDelegat
                 }
 
                 bridge.handleJSCall(call: JSCall(options: options, pluginId: pluginId, method: method, callbackId: callbackId))
-            } else if type == "cordova" {
-                let pluginId = dict["service"] as? String ?? ""
-                let method = dict["action"] as? String ?? ""
-                let callbackId = dict["callbackId"] as? String ?? ""
-
-                let args = dict["actionArgs"] as? Array ?? []
-                let options = ["options": args]
-
-                CAPLog.print("To Native Cordova -> ", pluginId, method, callbackId, options)
-
-                bridge.handleCordovaJSCall(call: JSCall(options: options, pluginId: pluginId, method: method, callbackId: callbackId))
+            } else if let handler = bridge.callInterceptors[type] {
+                handler(dict)
             }
         }
     }

package/Capacitor.podspec

@@ -19,6 +19,5 @@ Pod::Spec.new do |s|
   s.module_map = "#{prefix}Capacitor/Capacitor/Capacitor.modulemap"
   s.resources = ["#{prefix}Capacitor/Capacitor/assets/native-bridge.js"]
   s.resource_bundles = { 'Capacitor' => ["#{prefix}Capacitor/Capacitor/PrivacyInfo.xcprivacy"] }
-  s.dependency 'CapacitorCordova'
   s.swift_version = '5.1'
 end

package/CapacitorCordova/CapacitorCordova/Classes/Public/Plugin.swift

@@ -0,0 +1,126 @@
+import Capacitor
+
+@objc(CordovaPlugin)
+public class CordovaPlugin: CAPPlugin, CAPBridgedPlugin {
+    public let jsName = "__CordovaPlugin"
+    public let pluginMethods: [CAPPluginMethod] = []
+    public var identifier: String { jsName }
+
+    private var _cordovaDeployDisabled = false
+
+    override public func load() {
+        injectJavascript()
+        configureRuntime()
+    }
+
+    func configureRuntime() {
+        guard let configURL = Bundle.main.url(forResource: "config", withExtension: "xml") else { fatalError() }
+        guard let bridge, let webView = bridge.webView else { return }
+
+        let cordovaConfigParser = CDVConfigParser()
+
+        let xmlParser = XMLParser(contentsOf: configURL)
+        xmlParser?.delegate = cordovaConfigParser
+        xmlParser?.parse()
+
+        guard let pluginManager = CDVPluginManager(
+            parser: cordovaConfigParser,
+            viewController: bridge.viewController,
+            webView: bridge.webView
+        ) else { return }
+
+        for plugin in cordovaConfigParser.startupPluginNames.compactMap({ $0 as? String }) {
+            _ = pluginManager.getCommandInstance(plugin)
+        }
+
+        exportCordovaPluginsJS(userContentController: webView.configuration.userContentController)
+
+        bridge.registerCallInterceptor("cordova") { [pluginManager] dict in
+            let pluginId = dict["service"] as? String ?? ""
+            let method = dict["action"] as? String ?? ""
+            let callbackId = dict["callbackId"] as? String ?? ""
+
+            let args = dict["actionArgs"] as? Array ?? []
+            let options = ["options": args]
+
+            CAPLog.print("To Native Cordova -> ", pluginId, method, callbackId, options)
+
+            if let plugin = pluginManager.getCommandInstance(pluginId.lowercased()) {
+                let selector = NSSelectorFromString("\(method):")
+                if !plugin.responds(to: selector) {
+                    CAPLog.print("Error: Plugin \(plugin.className ?? "") does not respond to method call \(selector).")
+                    CAPLog.print("Ensure plugin method exists and uses @objc in its declaration")
+                    return
+                }
+
+                let arguments = options["options"] ?? []
+                let pluginCall = CDVInvokedUrlCommand(
+                    arguments: arguments,
+                    callbackId: callbackId,
+                    className: plugin.className,
+                    methodName: method
+                )
+
+                plugin.perform(selector, with: pluginCall)
+
+            } else {
+                CAPLog.print("Error: Cordova Plugin mapping not found")
+                return
+            }
+        }
+
+        _cordovaDeployDisabled = (cordovaConfigParser.settings?["DisableDeploy".lowercased()] as? NSString)?.boolValue ?? false
+    }
+
+    @objc
+    func cordovaDeployDisabled() -> NSNumber {
+        return _cordovaDeployDisabled as NSNumber
+    }
+
+    func injectJavascript() {
+        guard let cordovaUrl = Bundle.main.url(forResource: "public/cordova", withExtension: "js") else {
+            fatalError("ERROR: Required cordova.js file not found. Cordova plugins will not function!")
+        }
+
+        guard let cordovaPluginsUrl = Bundle.main.url(forResource: "public/cordova_plugins", withExtension: "js") else {
+            fatalError("ERROR: Required cordova_plugins.js file not found. Cordova plugins  will not function!")
+        }
+
+        guard let webView = bridge?.webView else { return }
+
+        injectFile(fileURL: cordovaUrl, userContentController: webView.configuration.userContentController)
+        injectFile(fileURL: cordovaPluginsUrl, userContentController: webView.configuration.userContentController)
+    }
+
+    func exportCordovaPluginsJS(userContentController: WKUserContentController) {
+        if let pluginsJSFolder = Bundle.main.url(forResource: "public/plugins", withExtension: nil) {
+            injectFilesForFolder(folder: pluginsJSFolder, userContentController: userContentController)
+        }
+    }
+
+    func injectFile(fileURL: URL, userContentController: WKUserContentController) {
+        do {
+            let data = try String(contentsOf: fileURL, encoding: .utf8)
+            let userScript = WKUserScript(source: data, injectionTime: .atDocumentStart, forMainFrameOnly: true)
+            userContentController.addUserScript(userScript)
+        } catch {
+            fatalError("Unable to inject js file")
+        }
+    }
+
+    func injectFilesForFolder(folder: URL, userContentController: WKUserContentController) {
+        let fileManager = FileManager.default
+        do {
+            let fileURLs = try fileManager.contentsOfDirectory(at: folder, includingPropertiesForKeys: nil, options: [])
+            for fileURL in fileURLs {
+                if fileURL.hasDirectoryPath {
+                    injectFilesForFolder(folder: fileURL, userContentController: userContentController)
+                } else {
+                    injectFile(fileURL: fileURL, userContentController: userContentController)
+                }
+            }
+        } catch {
+            CAPLog.print("Error while enumerating files")
+        }
+    }
+}

package/CapacitorCordova.podspec

@@ -16,11 +16,12 @@ Pod::Spec.new do |s|
   s.authors      = { 'Ionic Team' => 'hi@ionicframework.com' }
   s.source       = { git: 'https://github.com/ionic-team/capacitor', tag: s.version.to_s }
   s.platform     = :ios, 15.0
-  s.source_files = "#{prefix}CapacitorCordova/CapacitorCordova/**/*.{h,m}"
+  s.source_files = "#{prefix}CapacitorCordova/CapacitorCordova/**/*.{h,m,swift}"
   s.public_header_files = "#{prefix}CapacitorCordova/CapacitorCordova/Classes/Public/*.h",
                           "#{prefix}CapacitorCordova/CapacitorCordova/CapacitorCordova.h"
   s.module_map = "#{prefix}CapacitorCordova/CapacitorCordova/CapacitorCordova.modulemap"
   s.resource_bundles = { 'CapacitorCordova' => ["#{prefix}CapacitorCordova/CapacitorCordova/PrivacyInfo.xcprivacy"] }
   s.requires_arc = true
+  s.dependency 'Capacitor', s.version.to_s
   s.framework    = 'WebKit'
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "8.3.2",
+  "version": "9.0.0-alpha.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,7 +25,7 @@
     "xc:build:CapacitorCordova": "cd CapacitorCordova && xcodebuild && cd .."
   },
   "peerDependencies": {
-    "@capacitor/core": "^8.3.0"
+    "@capacitor/core": "^9.0.0-alpha.0"
   },
   "publishConfig": {
     "access": "public"

package/Capacitor/Capacitor/CAPBridgeViewController+CDVScreenOrientationDelegate.h

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

package/Capacitor/Capacitor/CAPBridgeViewController+CDVScreenOrientationDelegate.m

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

package/Capacitor/Capacitor/TmpViewController.swift

@@ -1,8 +0,0 @@
-import UIKit
-
-internal class TmpViewController: UIViewController {
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        NotificationCenter.default.post(CapacitorBridge.tmpVCAppeared)
-    }
-}