@capgo/capacitor-patch 8.3.3 → 8.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-patch",
-  "version": "8.3.3",
+  "version": "8.3.5",
   "description": "Capacitor plugin for applying vetted Capgo patches during cap sync and cap update.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -53,6 +53,7 @@
     "watch": "tsc --watch",
     "prepublishOnly": "bun run build",
     "check:wiring": "node scripts/check-capacitor-plugin-wiring.mjs",
+    "check:cap9-deprecated": "node scripts/check-cap9-deprecated.mjs",
     "changelog:ai": "node scripts/generate-ai-changelog.mjs"
   },
   "dependencies": {

package/patches/catalog.json

@@ -206,6 +206,29 @@
     },
     "patchFile": "patches/upstream-pr-7535-android.patch"
   },
+  {
+    "id": "upstream-pr-7540-ios",
+    "title": "fix(iOS): change hardcoded config path when using custom config file for auto register plugins (ios)",
+    "recommended": false,
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/ios",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/7540",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-7540",
+      "author": "tossaro",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-7540-ios.patch"
+  },
   {
     "id": "upstream-pr-7599-ios",
     "title": "fix(ios): allow enabling gesture navigation via config (#3808) (ios)",
@@ -505,6 +528,52 @@
     },
     "patchFile": "patches/upstream-pr-8271-core.patch"
   },
+  {
+    "id": "upstream-pr-8272-core",
+    "title": "fix(core): fix buildUrlParams array handling and replace deprecated substr (core)",
+    "recommended": false,
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/core",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/8272",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-8272",
+      "author": "maniktyagi04",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-8272-core.patch"
+  },
+  {
+    "id": "upstream-pr-8274-cli",
+    "title": "feat: Enable copying native resource files from Capacitor plugins to … (cli)",
+    "recommended": false,
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/cli",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/8274",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-8274",
+      "author": "White-D-coder",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-8274-cli.patch"
+  },
   {
     "id": "upstream-pr-8275-android",
     "title": "fix(android): preserve file chooser callback across activity recreation (android)",
@@ -528,6 +597,29 @@
     },
     "patchFile": "patches/upstream-pr-8275-android.patch"
   },
+  {
+    "id": "upstream-pr-8284-cli",
+    "title": "feat: allow spm platforms to select os without being overwritten (cli)",
+    "recommended": false,
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/cli",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/8284",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-8284",
+      "author": "WcaleNieWolny",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-8284-cli.patch"
+  },
   {
     "id": "upstream-pr-8304-ios",
     "title": "fix(http): Fix throwing data URI requests on iOS (ios)",
@@ -551,6 +643,121 @@
     },
     "patchFile": "patches/upstream-pr-8304-ios.patch"
   },
+  {
+    "id": "upstream-pr-8364-android",
+    "title": "Add method to disable autosuggestion (android)",
+    "recommended": false,
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/android",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/8364",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-8364",
+      "author": "tyilo",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-8364-android.patch"
+  },
+  {
+    "id": "upstream-pr-8383-android",
+    "title": "fix(android): allow synchronous replies on the modern bridge (android)",
+    "recommended": false,
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/android",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/8383",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-8383",
+      "author": "richavos",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-8383-android.patch"
+  },
+  {
+    "id": "upstream-pr-8400-android",
+    "title": "fix(android): add null check for plugin annotation in getPermissionStates (android)",
+    "recommended": false,
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/android",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/8400",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-8400",
+      "author": "robingenz",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-8400-android.patch"
+  },
+  {
+    "id": "upstream-pr-8403-android",
+    "title": "fix(http): correctly serialize Blob objects in request bodies and FormData (android)",
+    "recommended": false,
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/android",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/8403",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-8403",
+      "author": "vamsi2246",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-8403-android.patch"
+  },
+  {
+    "id": "upstream-pr-8403-ios",
+    "title": "fix(http): correctly serialize Blob objects in request bodies and FormData (ios)",
+    "recommended": false,
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/ios",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/8403",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-8403",
+      "author": "vamsi2246",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-8403-ios.patch"
+  },
   {
     "id": "upstream-pr-8418-android",
     "title": "fix(android): range request truncation (android)",
@@ -667,5 +874,76 @@
       "status": "not-merged-as-of-2026-05-12"
     },
     "patchFile": "patches/upstream-pr-8458-cli.patch"
+  },
+  {
+    "id": "upstream-pr-8478-android",
+    "title": "fix(http): support binary request bodies (android)",
+    "recommended": false,
+    "supersedes": ["upstream-pr-8403-android"],
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/android",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/8478",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-8478",
+      "author": "iamanaws",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-8478-android.patch"
+  },
+  {
+    "id": "upstream-pr-8478-ios",
+    "title": "fix(http): support binary request bodies (ios)",
+    "recommended": false,
+    "supersedes": ["upstream-pr-8403-ios"],
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/ios",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/8478",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-8478",
+      "author": "iamanaws",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-8478-ios.patch"
+  },
+  {
+    "id": "upstream-pr-8520-ios",
+    "title": "fix(ios): retain WKHTTPCookieStore observer so cookie sync works (ios)",
+    "recommended": false,
+    "phase": "package",
+    "target": {
+      "type": "package",
+      "packageName": "@capacitor/ios",
+      "versionRange": ">=8.0.0 <9.0.0"
+    },
+    "source": {
+      "upstreamPullRequest": "https://github.com/ionic-team/capacitor/pull/8520",
+      "capacitorPlusBranch": "https://github.com/Cap-go/capacitor-plus/tree/sync/upstream-pr-8520",
+      "author": "Cybertron01Z",
+      "authorAssociation": "external"
+    },
+    "upstream": {
+      "state": "open",
+      "mergedAt": null,
+      "status": "not-merged"
+    },
+    "patchFile": "patches/upstream-pr-8520-ios.patch"
   }
 ]

package/patches/upstream-pr-7540-ios.patch

@@ -0,0 +1,84 @@
+diff --git a/Capacitor/Capacitor/CAPInstanceConfiguration.h b/Capacitor/Capacitor/CAPInstanceConfiguration.h
+index 171dbb46..ac52df02 100644
+--- a/Capacitor/Capacitor/CAPInstanceConfiguration.h
++++ b/Capacitor/Capacitor/CAPInstanceConfiguration.h
+@@ -13,6 +13,7 @@ NS_SWIFT_NAME(InstanceConfiguration)
+ @property (nonatomic, readonly, nonnull) NSArray<NSString*> *allowedNavigationHostnames;
+ @property (nonatomic, readonly, nonnull) NSURL *localURL;
+ @property (nonatomic, readonly, nonnull) NSURL *serverURL;
++@property (nonatomic, readonly, nullable) NSURL *configURL;
+ @property (nonatomic, readonly, nullable) NSString *errorPath;
+ @property (nonatomic, readonly, nonnull) NSDictionary *pluginConfigurations;
+ @property (nonatomic, readonly) BOOL loggingEnabled;
+diff --git a/Capacitor/Capacitor/CAPInstanceConfiguration.m b/Capacitor/Capacitor/CAPInstanceConfiguration.m
+index d6b7785e..a8e2c0f1 100644
+--- a/Capacitor/Capacitor/CAPInstanceConfiguration.m
++++ b/Capacitor/Capacitor/CAPInstanceConfiguration.m
+@@ -49,6 +49,13 @@
+         else {
+             _serverURL = _localURL;
+         }
++
++        if (descriptor.configUrl != nil) {
++            _configURL = descriptor.configUrl;
++        }
++        else {
++            _configURL = [[NSBundle mainBundle] URLForResource:@"capacitor.config" withExtension:@"json"];
++        }
+         _errorPath = descriptor.errorPath;
+         // extract the one value we care about from the cordova configuration
+         _cordovaDeployDisabled = [descriptor cordovaDeployDisabled];
+@@ -63,6 +70,7 @@
+         _allowedNavigationHostnames = [[configuration allowedNavigationHostnames] copy];
+         _localURL = [[configuration localURL] copy];
+         _serverURL = [[configuration serverURL] copy];
++        _configURL = [[configuration configURL] copy];
+         _errorPath = [[configuration errorPath] copy];
+         _pluginConfigurations = [[configuration pluginConfigurations] copy];
+         _loggingEnabled = configuration.loggingEnabled;
+diff --git a/Capacitor/Capacitor/CAPInstanceDescriptor.h b/Capacitor/Capacitor/CAPInstanceDescriptor.h
+index f477ef55..d4d02203 100644
+--- a/Capacitor/Capacitor/CAPInstanceDescriptor.h
++++ b/Capacitor/Capacitor/CAPInstanceDescriptor.h
+@@ -68,6 +68,11 @@ NS_SWIFT_NAME(InstanceDescriptor)
+  @discussion Defaults to nil, in which case the server URL will be constructed from @c urlScheme and @c urlHostname. If set, it will override the other properties. Set by @c server.url in the configuration file.
+  */
+ @property (nonatomic, copy, nullable) NSString *serverURL;
++/**
++ @brief The file URL from which Capacitor will load configuration
++ @discussion Defaults to @c capacitor.config.json located at the root of the application bundle.
++ */
++@property (nonatomic, copy, nullable) NSURL *configUrl;
+ /**
+  @brief The JSON dictionary that contains the plugin-specific configuration information.
+  @discussion Set by @c plugins in the configuration file.
+diff --git a/Capacitor/Capacitor/CAPInstanceDescriptor.swift b/Capacitor/Capacitor/CAPInstanceDescriptor.swift
+index a7eff5f6..db8c8f7d 100644
+--- a/Capacitor/Capacitor/CAPInstanceDescriptor.swift
++++ b/Capacitor/Capacitor/CAPInstanceDescriptor.swift
+@@ -30,6 +30,8 @@ internal extension InstanceDescriptor {
+     // swiftlint:disable function_body_length
+     // swiftlint:disable:next identifier_name
+     @objc func _parseConfiguration(at capacitorURL: URL?, cordovaConfiguration cordovaURL: URL?) {
++        configUrl = capacitorURL
++
+         // sanity check that the app directory is valid
+         var isDirectory: ObjCBool = ObjCBool(false)
+         if warnings.contains(.missingAppDir) == false,
+diff --git a/Capacitor/Capacitor/CapacitorBridge.swift b/Capacitor/Capacitor/CapacitorBridge.swift
+index 7b8b9b99..c4a91e2a 100644
+--- a/Capacitor/Capacitor/CapacitorBridge.swift
++++ b/Capacitor/Capacitor/CapacitorBridge.swift
+@@ -306,8 +306,10 @@
+ 
+         if autoRegisterPlugins {
+             do {
+-                if let pluginJSON = Bundle.main.url(forResource: "capacitor.config", withExtension: "json") {
+-                    let pluginData = try Data(contentsOf: pluginJSON)
++                let configFileURL = (config.configURL?.isFileURL == true ? config.configURL : nil)
++                    ?? Bundle.main.url(forResource: "capacitor.config", withExtension: "json")
++                if let configFileURL = configFileURL {
++                    let pluginData = try Data(contentsOf: configFileURL)
+                     let registrationList = try JSONDecoder().decode(RegistrationList.self, from: pluginData)
+ 
+                     for plugin in registrationList.packageClassList {

package/patches/upstream-pr-8272-core.patch

@@ -0,0 +1,62 @@
+diff --git a/dist/index.cjs.js b/dist/index.cjs.js
+index 34d371f..e1f2a3b 100644
+--- a/dist/index.cjs.js
++++ b/dist/index.cjs.js
+@@ -435,13 +435,16 @@
+         let encodedValue;
+         let item;
+         if (Array.isArray(value)) {
++            if (value.length === 0) {
++                return accumulator;
++            }
+             item = '';
+             value.forEach((str) => {
+                 encodedValue = shouldEncode ? encodeURIComponent(str) : str;
+                 item += `${key}=${encodedValue}&`;
+             });
+             // last character will always be "&" so slice it off
+-            item.slice(0, -1);
++            item = item.slice(0, -1);
+         }
+         else {
+             encodedValue = shouldEncode ? encodeURIComponent(value) : value;
+@@ -450,7 +453,7 @@
+         return `${accumulator}&${item}`;
+     }, '');
+     // Remove initial "&" from the reduce
+-    return output.substr(1);
++    return output.substring(1);
+ };
+ /**
+  * Build the RequestInit object based on the options passed into the initial request
+diff --git a/dist/index.js b/dist/index.js
+index fb980f2..f4e5d6c 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -431,13 +431,16 @@
+         let encodedValue;
+         let item;
+         if (Array.isArray(value)) {
++            if (value.length === 0) {
++                return accumulator;
++            }
+             item = '';
+             value.forEach((str) => {
+                 encodedValue = shouldEncode ? encodeURIComponent(str) : str;
+                 item += `${key}=${encodedValue}&`;
+             });
+             // last character will always be "&" so slice it off
+-            item.slice(0, -1);
++            item = item.slice(0, -1);
+         }
+         else {
+             encodedValue = shouldEncode ? encodeURIComponent(value) : value;
+@@ -446,7 +449,7 @@
+         return `${accumulator}&${item}`;
+     }, '');
+     // Remove initial "&" from the reduce
+-    return output.substr(1);
++    return output.substring(1);
+ };
+ /**
+  * Build the RequestInit object based on the options passed into the initial request

package/patches/upstream-pr-8274-cli.patch

@@ -0,0 +1,39 @@
+diff --git a/dist/android/update.js b/dist/android/update.js
+index 5e3b058..a3f4b5c 100644
+--- a/dist/android/update.js
++++ b/dist/android/update.js
+@@ -28,6 +28,7 @@ async function updateAndroid(config) {
+     if (cordovaPlugins.length > 0) {
+         await copyPluginsNativeFiles(config, cordovaPlugins);
+     }
++    await copyPluginsNativeFiles(config, capacitorPlugins);
+     if (!(await (0, fs_extra_1.pathExists)(config.android.webDirAbs))) {
+         await (0, copy_1.copy)(config, platform);
+     }
+diff --git a/dist/plugin.js b/dist/plugin.js
+index 3be0fa0..db03dd0 100644
+--- a/dist/plugin.js
++++ b/dist/plugin.js
+@@ -38,6 +38,10 @@ async function resolvePlugin(config, name) {
+         if (!meta) {
+             return null;
+         }
++        const pluginXMLPath = (0, path_1.join)(rootPath, 'plugin.xml');
++        const xmlMeta = (await (0, fs_extra_1.pathExists)(pluginXMLPath))
++            ? await (0, xml_1.readXML)(pluginXMLPath)
++            : null;
+         if (meta.capacitor) {
+             return {
+                 id: name,
+@@ -46,10 +50,9 @@ async function resolvePlugin(config, name) {
+                 rootPath,
+                 repository: meta.repository,
+                 manifest: meta.capacitor,
++                xml: xmlMeta ? xmlMeta.plugin : undefined,
+             };
+         }
+-        const pluginXMLPath = (0, path_1.join)(rootPath, 'plugin.xml');
+-        const xmlMeta = await (0, xml_1.readXML)(pluginXMLPath);
+         return {
+             id: name,
+             name: fixName(name),

package/patches/upstream-pr-8284-cli.patch

@@ -0,0 +1,46 @@
+diff --git a/dist/util/spm.js b/dist/util/spm.js
+index 81877e7..169e9d0 100644
+--- a/dist/util/spm.js
++++ b/dist/util/spm.js
+@@ -86,7 +86,7 @@
+ async function generatePackageText(config, plugins) {
+     var _a, _b, _c;
+     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
+-    const iosVersion = (0, common_2.getMajoriOSVersion)(config);
++    const iosVersion = (0, common_2.getMajorMinoriOSVersion)(config);
+     let packageSwiftText = `// swift-tools-version: 5.9
+ import PackageDescription
+ 
+diff --git a/dist/ios/common.js b/dist/ios/common.js
+index 8e5a1b2..f3c2d8e 100644
+--- a/dist/ios/common.js
++++ b/dist/ios/common.js
+@@ -114,3 +114,28 @@
+     return iosVersion;
+ }
+ exports.getMajoriOSVersion = getMajoriOSVersion;
++
++function getMajorMinoriOSVersion(config) {
++    const pbx = (0, fs_extra_1.readFileSync)((0, path_1.join)(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'), 'utf-8');
++    const searchString = 'IPHONEOS_DEPLOYMENT_TARGET = ';
++    const startIndex = pbx.indexOf(searchString);
++    if (startIndex === -1) {
++        return '';
++    }
++    const valueStart = startIndex + searchString.length;
++    const endIndex = pbx.indexOf(';', valueStart);
++    const newlineIndex = pbx.indexOf('\n', valueStart);
++    const actualEnd = endIndex !== -1 && newlineIndex !== -1
++        ? Math.min(endIndex, newlineIndex)
++        : endIndex !== -1
++            ? endIndex
++            : newlineIndex !== -1
++                ? newlineIndex
++                : pbx.length;
++    let iosVersion = pbx.substring(valueStart, actualEnd).trim();
++    if (iosVersion.endsWith('.0')) {
++        iosVersion = iosVersion.slice(0, -2);
++    }
++    return iosVersion;
++}
++exports.getMajorMinoriOSVersion = getMajorMinoriOSVersion;

package/patches/upstream-pr-8364-android.patch

@@ -0,0 +1,62 @@
+diff --git a/capacitor/src/main/java/com/getcapacitor/CapacitorWebView.java b/capacitor/src/main/java/com/getcapacitor/CapacitorWebView.java
+index 22f6f972..d30529b7 100644
+--- a/capacitor/src/main/java/com/getcapacitor/CapacitorWebView.java
++++ b/capacitor/src/main/java/com/getcapacitor/CapacitorWebView.java
+@@ -2,6 +2,7 @@ package com.getcapacitor;
+ 
+ import android.content.Context;
+ import android.os.Build;
++import android.text.InputType;
++import android.view.inputmethod.InputMethodManager;
+ import android.util.AttributeSet;
+ import android.util.TypedValue;
+ import android.view.KeyEvent;
+@@ -17,6 +18,7 @@ public class CapacitorWebView extends WebView {
+ 
+     private BaseInputConnection capInputConnection;
+     private Bridge bridge;
++    private boolean autosuggestionEnabled = true;
+ 
+     public CapacitorWebView(Context context, AttributeSet attrs) {
+         super(context, attrs);
+@@ -26,6 +28,10 @@ public class CapacitorWebView extends WebView {
+         this.bridge = bridge;
+     }
+ 
++    public void setAutosuggestionEnabled(boolean enabled) {
++        autosuggestionEnabled = enabled;
++        InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
++        if (imm != null) {
++            imm.restartInput(this);
++        }
++    }
++
+     @Override
+     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+         CapConfig config;
+@@ -36,13 +42,23 @@ public class CapacitorWebView extends WebView {
+         }
+ 
+         boolean captureInput = config.isInputCaptured();
++        InputConnection inputConnection;
+         if (captureInput) {
+             if (capInputConnection == null) {
+                 capInputConnection = new BaseInputConnection(this, false);
+             }
+-            return capInputConnection;
++            inputConnection = capInputConnection;
++        } else {
++            inputConnection = super.onCreateInputConnection(outAttrs);
+         }
+-        return super.onCreateInputConnection(outAttrs);
++
++        if (!autosuggestionEnabled) {
++            // See https://stackoverflow.com/a/28009054/640584
++            outAttrs.inputType &= ~EditorInfo.TYPE_MASK_VARIATION;
++            outAttrs.inputType |= InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD;
++        }
++
++        return inputConnection;
+     }
+ 
+     @Override

package/patches/upstream-pr-8383-android.patch

@@ -0,0 +1,26 @@
+diff --git a/capacitor/src/main/java/com/getcapacitor/MessageHandler.java b/capacitor/src/main/java/com/getcapacitor/MessageHandler.java
+index dc91c9b0..1499deec 100644
+--- a/capacitor/src/main/java/com/getcapacitor/MessageHandler.java
++++ b/capacitor/src/main/java/com/getcapacitor/MessageHandler.java
+@@ -26,8 +26,7 @@ public class MessageHandler {
+         if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER) && !bridge.getConfig().isUsingLegacyBridge()) {
+             WebViewCompat.WebMessageListener capListener = (view, message, sourceOrigin, isMainFrame, replyProxy) -> {
+                 if (isMainFrame) {
+-                    postMessage(message.getData());
+-                    javaScriptReplyProxy = replyProxy;
++                    onModernBridgeMessage(message.getData(), replyProxy);
+                 } else {
+                     Logger.warn("Plugin execution is allowed in Main Frame only");
+                 }
+@@ -42,6 +41,11 @@ public class MessageHandler {
+         }
+     }
+ 
++    void onModernBridgeMessage(String data, JavaScriptReplyProxy replyProxy) {
++        javaScriptReplyProxy = replyProxy;
++        postMessage(data);
++    }
++
+     /**
+      * The main message handler that will be called from JavaScript
+      * to send a message to the native bridge.

package/patches/upstream-pr-8400-android.patch

@@ -0,0 +1,82 @@
+diff --git a/capacitor/src/main/java/com/getcapacitor/Bridge.java b/capacitor/src/main/java/com/getcapacitor/Bridge.java
+index d4995fbb..32eebd73 100644
+--- a/capacitor/src/main/java/com/getcapacitor/Bridge.java
++++ b/capacitor/src/main/java/com/getcapacitor/Bridge.java
+@@ -1214,42 +1214,44 @@ public class Bridge {
+     protected Map<String, PermissionState> getPermissionStates(Plugin plugin) {
+         Map<String, PermissionState> permissionsResults = new HashMap<>();
+         CapacitorPlugin annotation = plugin.getPluginHandle().getPluginAnnotation();
+-        for (Permission perm : annotation.permissions()) {
+-            // If a permission is defined with no permission constants, return GRANTED for it.
+-            // Otherwise, get its true state.
+-            if (perm.strings().length == 0 || (perm.strings().length == 1 && perm.strings()[0].isEmpty())) {
+-                String key = perm.alias();
+-                if (!key.isEmpty()) {
+-                    PermissionState existingResult = permissionsResults.get(key);
+-
+-                    // auto set permission state to GRANTED if the alias is empty.
+-                    if (existingResult == null) {
+-                        permissionsResults.put(key, PermissionState.GRANTED);
+-                    }
+-                }
+-            } else {
+-                for (String permString : perm.strings()) {
+-                    String key = perm.alias().isEmpty() ? permString : perm.alias();
+-                    PermissionState permissionStatus;
+-                    if (ActivityCompat.checkSelfPermission(this.getContext(), permString) == PackageManager.PERMISSION_GRANTED) {
+-                        permissionStatus = PermissionState.GRANTED;
+-                    } else {
+-                        permissionStatus = PermissionState.PROMPT;
+-
+-                        // Check if there is a cached permission state for the "Never ask again" state
+-                        SharedPreferences prefs = getContext().getSharedPreferences(PERMISSION_PREFS_NAME, Activity.MODE_PRIVATE);
+-                        String state = prefs.getString(permString, null);
+-
+-                        if (state != null) {
+-                            permissionStatus = PermissionState.byState(state);
++        if (annotation != null) {
++            for (Permission perm : annotation.permissions()) {
++                // If a permission is defined with no permission constants, return GRANTED for it.
++                // Otherwise, get its true state.
++                if (perm.strings().length == 0 || (perm.strings().length == 1 && perm.strings()[0].isEmpty())) {
++                    String key = perm.alias();
++                    if (!key.isEmpty()) {
++                        PermissionState existingResult = permissionsResults.get(key);
++
++                        // auto set permission state to GRANTED if the alias is empty.
++                        if (existingResult == null) {
++                            permissionsResults.put(key, PermissionState.GRANTED);
+                         }
+                     }
++                } else {
++                    for (String permString : perm.strings()) {
++                        String key = perm.alias().isEmpty() ? permString : perm.alias();
++                        PermissionState permissionStatus;
++                        if (ActivityCompat.checkSelfPermission(this.getContext(), permString) == PackageManager.PERMISSION_GRANTED) {
++                            permissionStatus = PermissionState.GRANTED;
++                        } else {
++                            permissionStatus = PermissionState.PROMPT;
++
++                            // Check if there is a cached permission state for the "Never ask again" state
++                            SharedPreferences prefs = getContext().getSharedPreferences(PERMISSION_PREFS_NAME, Activity.MODE_PRIVATE);
++                            String state = prefs.getString(permString, null);
++
++                            if (state != null) {
++                                permissionStatus = PermissionState.byState(state);
++                            }
++                        }
+ 
+-                    PermissionState existingResult = permissionsResults.get(key);
++                        PermissionState existingResult = permissionsResults.get(key);
+ 
+-                    // multiple permissions with the same alias must all be true, otherwise all false.
+-                    if (existingResult == null || existingResult == PermissionState.GRANTED) {
+-                        permissionsResults.put(key, permissionStatus);
++                        // multiple permissions with the same alias must all be true, otherwise all false.
++                        if (existingResult == null || existingResult == PermissionState.GRANTED) {
++                            permissionsResults.put(key, permissionStatus);
++                        }
+                     }
+                 }
+             }
++        }

package/patches/upstream-pr-8403-android.patch

@@ -0,0 +1,30 @@
+diff --git a/capacitor/src/main/assets/native-bridge.js b/capacitor/src/main/assets/native-bridge.js
+index f5e7cc44..000b49a9 100644
+--- a/capacitor/src/main/assets/native-bridge.js
++++ b/capacitor/src/main/assets/native-bridge.js
+@@ -48,14 +48,14 @@ var nativeBridge = (function (exports) {
+         const newFormData = [];
+         for (const pair of formData.entries()) {
+             const [key, value] = pair;
+-            if (value instanceof File) {
++            if (typeof Blob !== 'undefined' && value instanceof Blob) {
+                 const base64File = await readFileAsBase64(value);
+                 newFormData.push({
+                     key,
+                     value: base64File,
+                     type: 'base64File',
+                     contentType: value.type,
+-                    fileName: value.name,
++                    fileName: value.name || 'blob',
+                 });
+             }
+             else {
+@@ -128,7 +128,7 @@ var nativeBridge = (function (exports) {
+                 type: 'formData',
+             };
+         }
+-        else if (body instanceof File) {
++        else if (typeof Blob !== 'undefined' && body instanceof Blob) {
+             const fileData = await readFileAsBase64(body);
+             return {
+                 data: fileData,

package/patches/upstream-pr-8403-ios.patch

@@ -0,0 +1,30 @@
+diff --git a/Capacitor/Capacitor/assets/native-bridge.js b/Capacitor/Capacitor/assets/native-bridge.js
+index f5e7cc44..000b49a9 100644
+--- a/Capacitor/Capacitor/assets/native-bridge.js
++++ b/Capacitor/Capacitor/assets/native-bridge.js
+@@ -48,14 +48,14 @@ var nativeBridge = (function (exports) {
+         const newFormData = [];
+         for (const pair of formData.entries()) {
+             const [key, value] = pair;
+-            if (value instanceof File) {
++            if (typeof Blob !== 'undefined' && value instanceof Blob) {
+                 const base64File = await readFileAsBase64(value);
+                 newFormData.push({
+                     key,
+                     value: base64File,
+                     type: 'base64File',
+                     contentType: value.type,
+-                    fileName: value.name,
++                    fileName: value.name || 'blob',
+                 });
+             }
+             else {
+@@ -128,7 +128,7 @@ var nativeBridge = (function (exports) {
+                 type: 'formData',
+             };
+         }
+-        else if (body instanceof File) {
++        else if (typeof Blob !== 'undefined' && body instanceof Blob) {
+             const fileData = await readFileAsBase64(body);
+             return {
+                 data: fileData,

package/patches/upstream-pr-8478-android.patch

@@ -0,0 +1,212 @@
+diff --git a/capacitor/src/main/assets/native-bridge.js b/capacitor/src/main/assets/native-bridge.js
+index f5e7cc44..742cf3f 100644
+--- a/capacitor/src/main/assets/native-bridge.js
++++ b/capacitor/src/main/assets/native-bridge.js
+@@ -44,18 +44,45 @@
+         reader.onerror = reject;
+         reader.readAsBinaryString(file);
+     });
++    const readArrayBufferAsBase64 = (arrayBuffer) => {
++        const bytes = new Uint8Array(arrayBuffer);
++        const chunkSize = 0x8000;
++        let binary = '';
++        for (let i = 0; i < bytes.length; i += chunkSize) {
++            binary += String.fromCharCode(...bytes.subarray(i, i + chunkSize));
++        }
++        return btoa(binary);
++    };
++    const readBlobAsBase64 = (blob) => new Promise((resolve, reject) => {
++        const reader = new FileReader();
++        reader.onload = () => {
++            const result = reader.result;
++            resolve(result.indexOf(',') >= 0 ? result.split(',')[1] : result);
++        };
++        reader.onerror = reject;
++        reader.readAsDataURL(blob);
++    });
++    const readDataViewAsBase64 = (dataView) => readArrayBufferAsBase64(dataView.buffer.slice(dataView.byteOffset, dataView.byteOffset + dataView.byteLength));
++    const base64StringToArrayBuffer = (base64) => {
++        const binary = atob(base64);
++        const bytes = new Uint8Array(binary.length);
++        for (let i = 0; i < binary.length; i++) {
++            bytes[i] = binary.charCodeAt(i);
++        }
++        return bytes.buffer;
++    };
+     const convertFormData = async (formData) => {
+         const newFormData = [];
+         for (const pair of formData.entries()) {
+             const [key, value] = pair;
+-            if (value instanceof File) {
++            if (typeof Blob !== 'undefined' && value instanceof Blob) {
+                 const base64File = await readFileAsBase64(value);
+                 newFormData.push({
+                     key,
+                     value: base64File,
+                     type: 'base64File',
+                     contentType: value.type,
+-                    fileName: value.name,
++                    fileName: value.name || 'blob',
+                 });
+             }
+             else {
+@@ -65,9 +92,31 @@
+         return newFormData;
+     };
+     const convertBody = async (body, contentType) => {
+-        if (body instanceof ReadableStream || body instanceof Uint8Array) {
++        if (body instanceof File) {
++            const fileData = await readFileAsBase64(body);
++            return {
++                data: fileData,
++                type: 'file',
++                headers: { 'Content-Type': body.type },
++            };
++        }
++        else if (typeof Blob !== 'undefined' && body instanceof Blob) {
++            return {
++                data: await readBlobAsBase64(body),
++                type: 'binary',
++                headers: { 'Content-Type': contentType || body.type || 'application/octet-stream' },
++            };
++        }
++        else if (body instanceof ArrayBuffer) {
++            return {
++                data: readArrayBufferAsBase64(body),
++                type: 'binary',
++                headers: { 'Content-Type': contentType || 'application/octet-stream' },
++            };
++        }
++        if ((typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) || body instanceof Uint8Array) {
+             let encodedData;
+-            if (body instanceof ReadableStream) {
++            if (typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) {
+                 const reader = body.getReader();
+                 const chunks = [];
+                 while (true) {
+@@ -87,7 +136,9 @@
+             else {
+                 encodedData = body;
+             }
+-            let data = new TextDecoder().decode(encodedData);
++            let data = (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('image')) || contentType === 'application/octet-stream'
++                ? readDataViewAsBase64(encodedData)
++                : new TextDecoder().decode(encodedData);
+             let type;
+             if (contentType === 'application/json') {
+                 try {
+@@ -102,7 +153,7 @@
+                 type = 'formData';
+             }
+             else if (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('image')) {
+-                type = 'image';
++                type = 'binary';
+             }
+             else if (contentType === 'application/octet-stream') {
+                 type = 'binary';
+@@ -128,14 +179,6 @@
+                 type: 'formData',
+             };
+         }
+-        else if (body instanceof File) {
+-            const fileData = await readFileAsBase64(body);
+-            return {
+-                data: fileData,
+-                type: 'file',
+-                headers: { 'Content-Type': body.type },
+-            };
+-        }
+         return { data: body, type: 'json' };
+     };
+     const CAPACITOR_HTTP_INTERCEPTOR = '/_capacitor_http_interceptor_';
+@@ -531,15 +574,18 @@
+                                 data: requestData,
+                                 dataType: type,
+                                 headers: nativeHeaders,
++                                responseType: 'arraybuffer',
+                             });
+                             const contentType = nativeResponse.headers['Content-Type'] || nativeResponse.headers['content-type'];
+-                            let data = (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('application/json'))
+-                                ? JSON.stringify(nativeResponse.data)
+-                                : nativeResponse.data;
+                             // use null data for 204 No Content HTTP response
+-                            if (nativeResponse.status === 204) {
+-                                data = null;
+-                            }
++                            const normalizedContentType = contentType === null || contentType === void 0 ? void 0 : contentType.toLowerCase();
++                            const data = nativeResponse.status === 204
++                                ? null
++                                : (normalizedContentType === null || normalizedContentType === void 0 ? void 0 : normalizedContentType.startsWith('application/json'))
++                                    ? JSON.stringify(nativeResponse.data)
++                                    : typeof nativeResponse.data === 'string'
++                                        ? base64StringToArrayBuffer(nativeResponse.data)
++                                        : base64StringToArrayBuffer(String(nativeResponse.data));
+                             // intercept & parse response before returning
+                             const response = new Response(data, {
+                                 headers: nativeResponse.headers,
+diff --git a/capacitor/src/main/java/com/getcapacitor/plugin/util/CapacitorHttpUrlConnection.java b/capacitor/src/main/java/com/getcapacitor/plugin/util/CapacitorHttpUrlConnection.java
+index 6180d642..c2f966ae 100644
+--- a/capacitor/src/main/java/com/getcapacitor/plugin/util/CapacitorHttpUrlConnection.java
++++ b/capacitor/src/main/java/com/getcapacitor/plugin/util/CapacitorHttpUrlConnection.java
+@@ -1,6 +1,5 @@
+ package com.getcapacitor.plugin.util;
+ 
+-import android.os.Build;
+ import android.os.LocaleList;
+ import android.text.TextUtils;
+ import com.getcapacitor.Bridge;
+@@ -19,7 +18,6 @@ import java.net.URL;
+ import java.net.URLEncoder;
+ import java.net.UnknownServiceException;
+ import java.nio.charset.StandardCharsets;
+-import java.util.Base64;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Locale;
+@@ -209,13 +207,8 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
+                 dataString = call.getString("data");
+             }
+             this.writeRequestBody(dataString != null ? dataString : "");
+-        } else if (bodyType != null && bodyType.equals("file")) {
+-            try (DataOutputStream os = new DataOutputStream(connection.getOutputStream())) {
+-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+-                    os.write(Base64.getDecoder().decode(body.toString()));
+-                }
+-                os.flush();
+-            }
++        } else if (bodyType != null && (bodyType.equals("file") || bodyType.equals("binary"))) {
++            this.writeRequestBody(decodeBase64RequestBody(body.toString()));
+         } else if (contentType.contains("application/x-www-form-urlencoded")) {
+             try {
+                 JSObject obj = body.toJSObject();
+@@ -252,6 +245,17 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
+         }
+     }
+ 
++    private void writeRequestBody(byte[] body) throws IOException {
++        try (DataOutputStream os = new DataOutputStream(connection.getOutputStream())) {
++            os.write(body);
++            os.flush();
++        }
++    }
++
++    private static byte[] decodeBase64RequestBody(String body) {
++        return android.util.Base64.decode(body, android.util.Base64.DEFAULT);
++    }
++
+     private void writeObjectRequestBody(JSObject object) throws IOException, JSONException {
+         try (DataOutputStream os = new DataOutputStream(connection.getOutputStream())) {
+             Iterator<String> keys = object.keys();
+@@ -296,11 +300,7 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
+                         os.writeBytes("Content-Transfer-Encoding: binary" + lineEnd);
+                         os.writeBytes(lineEnd);
+ 
+-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+-                            os.write(Base64.getDecoder().decode(value));
+-                        } else {
+-                            os.write(android.util.Base64.decode(value, android.util.Base64.DEFAULT));
+-                        }
++                        os.write(decodeBase64RequestBody(value));
+ 
+                         os.writeBytes(lineEnd);
+                     }

package/patches/upstream-pr-8478-ios.patch

@@ -0,0 +1,159 @@
+diff --git a/Capacitor/Capacitor/Plugins/CapacitorUrlRequest.swift b/Capacitor/Capacitor/Plugins/CapacitorUrlRequest.swift
+index 34433368..8308c3d7 100644
+--- a/Capacitor/Capacitor/Plugins/CapacitorUrlRequest.swift
++++ b/Capacitor/Capacitor/Plugins/CapacitorUrlRequest.swift
+@@ -172,7 +172,7 @@ open class CapacitorUrlRequest: NSObject, URLSessionTaskDelegate {
+     }
+ 
+     public func getRequestData(_ body: JSValue, _ contentType: String, _ dataType: String? = nil) throws -> Data? {
+-        if dataType == "file" {
++        if dataType == "file" || dataType == "binary" {
+             guard let stringData = body as? String else {
+                 throw CapacitorUrlRequestError.serializationError("[ data ] argument could not be parsed as string")
+             }
+diff --git a/Capacitor/Capacitor/assets/native-bridge.js b/Capacitor/Capacitor/assets/native-bridge.js
+index f5e7cc44..742cf3f 100644
+--- a/Capacitor/Capacitor/assets/native-bridge.js
++++ b/Capacitor/Capacitor/assets/native-bridge.js
+@@ -44,18 +44,45 @@
+         reader.onerror = reject;
+         reader.readAsBinaryString(file);
+     });
++    const readArrayBufferAsBase64 = (arrayBuffer) => {
++        const bytes = new Uint8Array(arrayBuffer);
++        const chunkSize = 0x8000;
++        let binary = '';
++        for (let i = 0; i < bytes.length; i += chunkSize) {
++            binary += String.fromCharCode(...bytes.subarray(i, i + chunkSize));
++        }
++        return btoa(binary);
++    };
++    const readBlobAsBase64 = (blob) => new Promise((resolve, reject) => {
++        const reader = new FileReader();
++        reader.onload = () => {
++            const result = reader.result;
++            resolve(result.indexOf(',') >= 0 ? result.split(',')[1] : result);
++        };
++        reader.onerror = reject;
++        reader.readAsDataURL(blob);
++    });
++    const readDataViewAsBase64 = (dataView) => readArrayBufferAsBase64(dataView.buffer.slice(dataView.byteOffset, dataView.byteOffset + dataView.byteLength));
++    const base64StringToArrayBuffer = (base64) => {
++        const binary = atob(base64);
++        const bytes = new Uint8Array(binary.length);
++        for (let i = 0; i < binary.length; i++) {
++            bytes[i] = binary.charCodeAt(i);
++        }
++        return bytes.buffer;
++    };
+     const convertFormData = async (formData) => {
+         const newFormData = [];
+         for (const pair of formData.entries()) {
+             const [key, value] = pair;
+-            if (value instanceof File) {
++            if (typeof Blob !== 'undefined' && value instanceof Blob) {
+                 const base64File = await readFileAsBase64(value);
+                 newFormData.push({
+                     key,
+                     value: base64File,
+                     type: 'base64File',
+                     contentType: value.type,
+-                    fileName: value.name,
++                    fileName: value.name || 'blob',
+                 });
+             }
+             else {
+@@ -65,9 +92,31 @@
+         return newFormData;
+     };
+     const convertBody = async (body, contentType) => {
+-        if (body instanceof ReadableStream || body instanceof Uint8Array) {
++        if (body instanceof File) {
++            const fileData = await readFileAsBase64(body);
++            return {
++                data: fileData,
++                type: 'file',
++                headers: { 'Content-Type': body.type },
++            };
++        }
++        else if (typeof Blob !== 'undefined' && body instanceof Blob) {
++            return {
++                data: await readBlobAsBase64(body),
++                type: 'binary',
++                headers: { 'Content-Type': contentType || body.type || 'application/octet-stream' },
++            };
++        }
++        else if (body instanceof ArrayBuffer) {
++            return {
++                data: readArrayBufferAsBase64(body),
++                type: 'binary',
++                headers: { 'Content-Type': contentType || 'application/octet-stream' },
++            };
++        }
++        if ((typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) || body instanceof Uint8Array) {
+             let encodedData;
+-            if (body instanceof ReadableStream) {
++            if (typeof ReadableStream !== 'undefined' && body instanceof ReadableStream) {
+                 const reader = body.getReader();
+                 const chunks = [];
+                 while (true) {
+@@ -87,7 +136,9 @@
+             else {
+                 encodedData = body;
+             }
+-            let data = new TextDecoder().decode(encodedData);
++            let data = (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('image')) || contentType === 'application/octet-stream'
++                ? readDataViewAsBase64(encodedData)
++                : new TextDecoder().decode(encodedData);
+             let type;
+             if (contentType === 'application/json') {
+                 try {
+@@ -102,7 +153,7 @@
+                 type = 'formData';
+             }
+             else if (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('image')) {
+-                type = 'image';
++                type = 'binary';
+             }
+             else if (contentType === 'application/octet-stream') {
+                 type = 'binary';
+@@ -128,14 +179,6 @@
+                 type: 'formData',
+             };
+         }
+-        else if (body instanceof File) {
+-            const fileData = await readFileAsBase64(body);
+-            return {
+-                data: fileData,
+-                type: 'file',
+-                headers: { 'Content-Type': body.type },
+-            };
+-        }
+         return { data: body, type: 'json' };
+     };
+     const CAPACITOR_HTTP_INTERCEPTOR = '/_capacitor_http_interceptor_';
+@@ -531,15 +574,18 @@
+                                 data: requestData,
+                                 dataType: type,
+                                 headers: nativeHeaders,
++                                responseType: 'arraybuffer',
+                             });
+                             const contentType = nativeResponse.headers['Content-Type'] || nativeResponse.headers['content-type'];
+-                            let data = (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('application/json'))
+-                                ? JSON.stringify(nativeResponse.data)
+-                                : nativeResponse.data;
+                             // use null data for 204 No Content HTTP response
+-                            if (nativeResponse.status === 204) {
+-                                data = null;
+-                            }
++                            const normalizedContentType = contentType === null || contentType === void 0 ? void 0 : contentType.toLowerCase();
++                            const data = nativeResponse.status === 204
++                                ? null
++                                : (normalizedContentType === null || normalizedContentType === void 0 ? void 0 : normalizedContentType.startsWith('application/json'))
++                                    ? JSON.stringify(nativeResponse.data)
++                                    : typeof nativeResponse.data === 'string'
++                                        ? base64StringToArrayBuffer(nativeResponse.data)
++                                        : base64StringToArrayBuffer(String(nativeResponse.data));
+                             // intercept & parse response before returning
+                             const response = new Response(data, {
+                                 headers: nativeResponse.headers,

package/patches/upstream-pr-8520-ios.patch

@@ -0,0 +1,46 @@
+diff --git a/Capacitor/Capacitor/CAPBridgeViewController.swift b/Capacitor/Capacitor/CAPBridgeViewController.swift
+index a7285213..8d8cf088 100644
+--- a/Capacitor/Capacitor/CAPBridgeViewController.swift
++++ b/Capacitor/Capacitor/CAPBridgeViewController.swift
+@@ -10,6 +10,12 @@ import Cordova
+ 
+     public fileprivate(set) var webView: WKWebView?
+ 
++    // WKHTTPCookieStore does not retain observers, so we hold a strong reference here
++    // (else it deallocs immediately and `cookiesDidChange` never fires) plus the store
++    // it was added to, so the observer can be removed in `deinit` as the docs require.
++    private var cookieObserver: CapacitorWKCookieObserver?
++    private var cookieObserverStore: WKHTTPCookieStore?
++
+     public var isStatusBarVisible = true
+     public var statusBarStyle: UIStatusBarStyle = .default
+     public var statusBarAnimation: UIStatusBarAnimation = .fade
+@@ -27,6 +33,12 @@ import Cordova
+         return false
+     }()
+ 
++    deinit {
++        if let cookieObserver = cookieObserver {
++            cookieObserverStore?.remove(cookieObserver)
++        }
++    }
++
+     override public final func loadView() {
+         // load the configuration and set the logging flag
+         let configDescriptor = instanceDescriptor()
+@@ -118,7 +130,11 @@ import Cordova
+      */
+     open func webViewConfiguration(for instanceConfiguration: InstanceConfiguration) -> WKWebViewConfiguration {
+         let webViewConfiguration = WKWebViewConfiguration()
+-        webViewConfiguration.websiteDataStore.httpCookieStore.add(CapacitorWKCookieObserver())
++        let cookieObserver = CapacitorWKCookieObserver()
++        let cookieStore = webViewConfiguration.websiteDataStore.httpCookieStore
++        if let existingObserver = self.cookieObserver {
++            cookieObserverStore?.remove(existingObserver)
++        }
++        cookieStore.add(cookieObserver)
++        self.cookieObserver = cookieObserver
++        self.cookieObserverStore = cookieStore
+         webViewConfiguration.allowsInlineMediaPlayback = true
+         webViewConfiguration.suppressesIncrementalRendering = false
+         webViewConfiguration.allowsAirPlayForMediaPlayback = true