@capgo/inappbrowser 8.0.0 → 8.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/inappbrowser",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -10,11 +10,12 @@
     "android/src/main/",
     "android/build.gradle",
     "dist/",
-    "ios/Plugin/",
+    "ios/Sources/",
+    "Package.swift",
     "CapgoInappbrowser.podspec"
   ],
-  "author": "Martin Donadieu",
-  "license": "MIT",
+  "author": "Martin Donadieu <martin@capgo.app>",
+  "license": "MPL-2.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Cap-go/capacitor-inappbrowser.git"
@@ -30,13 +31,13 @@
   ],
   "scripts": {
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin && cd ..",
+    "verify:ios": "xcodebuild -scheme CapgoInappbrowser -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
-    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --autocorrect --format",
-    "eslint": "eslint . --ext ts",
-    "prettier": "prettier --config .prettierrc.js \"**/*.{css,html,ts,js,java}\"",
+    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
+    "eslint": "eslint .",
+    "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api InAppBrowserPlugin --output-readme README.md --output-json dist/docs.json",
     "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
@@ -45,34 +46,33 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^5.0.3",
-    "@capacitor/cli": "^5.0.3",
-    "@capacitor/core": "^5.0.3",
-    "@capacitor/docgen": "^0.2.1",
-    "@capacitor/ios": "^5.0.3",
-    "@ionic/eslint-config": "^0.3.0",
-    "@ionic/prettier-config": "^3.0.0",
-    "@ionic/swiftlint-config": "^1.1.2",
-    "@typescript-eslint/eslint-plugin": "^5.59.7",
-    "@typescript-eslint/parser": "^5.59.7",
-    "eslint": "^8.41.0",
-    "eslint-plugin-import": "^2.27.5",
-    "husky": "^8.0.3",
-    "prettier": "^2.8.8",
-    "prettier-plugin-java": "^2.1.0",
-    "rimraf": "^5.0.1",
-    "rollup": "^3.23.0",
-    "swiftlint": "^1.0.2",
-    "typescript": "^5.0.4"
+    "@capacitor/android": "^8.0.0",
+    "@capacitor/cli": "^8.0.0",
+    "@capacitor/core": "^8.0.0",
+    "@capacitor/docgen": "^0.3.1",
+    "@capacitor/ios": "^8.0.0",
+    "@ionic/eslint-config": "^0.4.0",
+    "@ionic/prettier-config": "^4.0.0",
+    "@ionic/swiftlint-config": "^2.0.0",
+    "@types/node": "^24.10.1",
+    "eslint": "^8.57.1",
+    "eslint-plugin-import": "^2.31.0",
+    "husky": "^9.1.7",
+    "prettier": "^3.6.2",
+    "prettier-plugin-java": "^2.7.7",
+    "rimraf": "^6.1.0",
+    "rollup": "^4.53.2",
+    "swiftlint": "^2.0.0",
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@capacitor/core": "^5.0.0"
+    "@capacitor/core": ">=8.0.0"
   },
-  "prettier": "@ionic/prettier-config",
-  "swiftlint": "@ionic/swiftlint-config",
   "eslintConfig": {
     "extends": "@ionic/eslint-config/recommended"
   },
+  "prettier": "@ionic/prettier-config",
+  "swiftlint": "@ionic/swiftlint-config",
   "capacitor": {
     "ios": {
       "src": "ios"

package/ios/Plugin/Assets.xcassets/Back.imageset/Contents.json

@@ -1,26 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Back.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Back@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Back@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}

package/ios/Plugin/Assets.xcassets/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

package/ios/Plugin/Assets.xcassets/Forward.imageset/Contents.json

@@ -1,26 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "Forward.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Forward@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "Forward@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}

package/ios/Plugin/InAppBrowserPlugin.h

@@ -1,10 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for Plugin.
-FOUNDATION_EXPORT double PluginVersionNumber;
-
-//! Project version string for Plugin.
-FOUNDATION_EXPORT const unsigned char PluginVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Plugin/PublicHeader.h>
-

package/ios/Plugin/InAppBrowserPlugin.m

@@ -1,17 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <Capacitor/Capacitor.h>
-
-// Define the plugin using the CAP_PLUGIN Macro, and
-// each method the plugin supports using the CAP_PLUGIN_METHOD macro.
-CAP_PLUGIN(InAppBrowserPlugin, "InAppBrowser",
-           CAP_PLUGIN_METHOD(openWebView, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(clearCookies, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(open, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setUrl, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(show, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(close, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(hide, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(executeScript, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(insertCSS, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(removeAllListeners, CAPPluginReturnPromise);
-)

package/ios/Plugin/InAppBrowserPlugin.swift

@@ -1,203 +0,0 @@
-import Foundation
-import Capacitor
-
-/**
- * Please read the Capacitor iOS Plugin Development Guide
- * here: https://capacitorjs.com/docs/plugins/ios
- */
-@objc(InAppBrowserPlugin)
-public class InAppBrowserPlugin: CAPPlugin {
-    var navigationWebViewController: UINavigationController?
-    private var privacyScreen: UIImageView?
-    private var isSetupDone = false
-    var currentPluginCall: CAPPluginCall?
-    var isPresentAfterPageLoad = false
-    var webViewController: WKWebViewController?
-
-    private func setup() {
-        self.isSetupDone = true
-
-        #if swift(>=4.2)
-        NotificationCenter.default.addObserver(self, selector: #selector(appDidBecomeActive(_:)), name: UIApplication.didBecomeActiveNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(appWillResignActive(_:)), name: UIApplication.willResignActiveNotification, object: nil)
-        #else
-        NotificationCenter.default.addObserver(self, selector: #selector(appDidBecomeActive(_:)), name: .UIApplicationDidBecomeActive, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(appWillResignActive(_:)), name: .UIApplicationWillResignActive, object: nil)
-        #endif
-    }
-
-    func presentView() {
-        self.bridge?.viewController?.present(self.navigationWebViewController!, animated: true, completion: {
-            self.currentPluginCall?.resolve()
-        })
-    }
-
-    func clearCookies() {
-        HTTPCookieStorage.shared.cookies?.forEach(HTTPCookieStorage.shared.deleteCookie)
-    }
-
-    @objc func openWebView(_ call: CAPPluginCall) {
-        if !self.isSetupDone {
-            self.setup()
-        }
-        self.currentPluginCall = call
-
-        guard let urlString = call.getString("url") else {
-            call.reject("Must provide a URL to open")
-            return
-        }
-
-        if urlString.isEmpty {
-            call.reject("URL must not be empty")
-            return
-        }
-
-        let headers = call.getObject("headers", [:]).mapValues { String(describing: $0 as Any) }
-
-        var disclaimerContent = call.getObject("shareDisclaimer")
-        let toolbarType = call.getString("toolbarType", "")
-        let backgroundColor = call.getString("backgroundColor", "black") == "white" ? UIColor.white : UIColor.black
-        if toolbarType != "activity" {
-            disclaimerContent = nil
-        }
-
-        self.isPresentAfterPageLoad = call.getBool("isPresentAfterPageLoad", false)
-
-        DispatchQueue.main.async {
-            let url = URL(string: urlString)
-
-            if self.isPresentAfterPageLoad {
-                self.webViewController = WKWebViewController.init(url: url!, headers: headers)
-            } else {
-                self.webViewController = WKWebViewController.init()
-                self.webViewController?.setHeaders(headers: headers)
-            }
-
-            self.webViewController?.source = .remote(url!)
-            self.webViewController?.leftNavigaionBarItemTypes = self.getToolbarItems(toolbarType: toolbarType)
-            self.webViewController?.toolbarItemTypes = []
-            self.webViewController?.doneBarButtonItemPosition = .right
-            self.webViewController?.capBrowserPlugin = self
-            self.webViewController?.title = call.getString("title", "New Window")
-            self.webViewController?.shareSubject = call.getString("shareSubject")
-            self.webViewController?.shareDisclaimer = disclaimerContent
-            self.navigationWebViewController = UINavigationController.init(rootViewController: self.webViewController!)
-            self.navigationWebViewController?.navigationBar.isTranslucent = false
-            self.navigationWebViewController?.toolbar.isTranslucent = false
-            self.navigationWebViewController?.navigationBar.backgroundColor = backgroundColor
-            self.navigationWebViewController?.toolbar.backgroundColor = backgroundColor
-            self.navigationWebViewController?.modalPresentationStyle = .fullScreen
-            if toolbarType == "blank" {
-                self.navigationWebViewController?.navigationBar.isHidden = true
-            }
-            if !self.isPresentAfterPageLoad {
-                self.presentView()
-            }
-        }
-    }
-
-    func getToolbarItems(toolbarType: String) -> [BarButtonItemType] {
-        var result: [BarButtonItemType] = []
-        if toolbarType == "activity" {
-            result.append(.activity)
-        } else if toolbarType == "navigation" {
-            result.append(.back)
-            result.append(.forward)
-        }
-        return result
-    }
-
-    @objc func setUrl(_ call: CAPPluginCall) {
-        guard let url = call.getString("url") else {
-            call.reject("Cannot get new url to set")
-            return
-        }
-        self.webViewController?.load(remote: URL(string: url)!)
-        call.resolve()
-    }
-
-    @objc func open(_ call: CAPPluginCall) {
-        if !self.isSetupDone {
-            self.setup()
-        }
-
-        self.currentPluginCall = call
-
-        guard let urlString = call.getString("url") else {
-            call.reject("Must provide a URL to open")
-            return
-        }
-
-        if urlString.isEmpty {
-            call.reject("URL must not be empty")
-            return
-        }
-
-        let headers = call.getObject("headers", [:]).mapValues { String(describing: $0 as Any) }
-
-        self.isPresentAfterPageLoad = call.getBool("isPresentAfterPageLoad", false)
-
-        DispatchQueue.main.async {
-            let url = URL(string: urlString)
-
-            if self.isPresentAfterPageLoad {
-                self.webViewController = WKWebViewController.init(url: url!, headers: headers)
-            } else {
-                self.webViewController = WKWebViewController.init()
-                self.webViewController?.setHeaders(headers: headers)
-            }
-
-            self.webViewController?.source = .remote(url!)
-            self.webViewController?.leftNavigaionBarItemTypes = [.reload]
-            self.webViewController?.toolbarItemTypes = [.back, .forward, .activity]
-            self.webViewController?.capBrowserPlugin = self
-            self.webViewController?.hasDynamicTitle = true
-            self.navigationWebViewController = UINavigationController.init(rootViewController: self.webViewController!)
-            self.navigationWebViewController?.navigationBar.isTranslucent = false
-            self.navigationWebViewController?.toolbar.isTranslucent = false
-            self.navigationWebViewController?.navigationBar.backgroundColor = .white
-            self.navigationWebViewController?.toolbar.backgroundColor = .white
-            self.navigationWebViewController?.modalPresentationStyle = .fullScreen
-            if !self.isPresentAfterPageLoad {
-                self.presentView()
-            }
-        }
-    }
-
-    @objc func close(_ call: CAPPluginCall) {
-        DispatchQueue.main.async {
-            self.navigationWebViewController?.dismiss(animated: true, completion: nil)
-            call.resolve()
-        }
-    }
-
-    private func showPrivacyScreen() {
-        if privacyScreen == nil {
-            self.privacyScreen = UIImageView()
-            if let launchImage = UIImage(named: "LaunchImage") {
-                privacyScreen!.image = launchImage
-                privacyScreen!.frame = UIScreen.main.bounds
-                privacyScreen!.contentMode = .scaleAspectFill
-                privacyScreen!.isUserInteractionEnabled = false
-            } else if let launchImage = UIImage(named: "Splash") {
-                privacyScreen!.image = launchImage
-                privacyScreen!.frame = UIScreen.main.bounds
-                privacyScreen!.contentMode = .scaleAspectFill
-                privacyScreen!.isUserInteractionEnabled = false
-            }
-        }
-        self.navigationWebViewController?.view.addSubview(self.privacyScreen!)
-    }
-
-    private func hidePrivacyScreen() {
-        self.privacyScreen?.removeFromSuperview()
-    }
-
-    @objc func appDidBecomeActive(_ notification: NSNotification) {
-        self.hidePrivacyScreen()
-    }
-
-    @objc func appWillResignActive(_ notification: NSNotification) {
-        self.showPrivacyScreen()
-    }
-}

package/ios/Plugin/Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>