fix: inject cordova files if a cordova plugin is present (#7363)

ionic-team · Mar 21, 2024 · ce9d505 · ce9d505
1 parent 318c316
commit ce9d505
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/cli/src/util/iosplugin.ts b/cli/src/util/iosplugin.ts
@@ -7,6 +7,7 @@ import {
 } from '@ionic/utils-fs';
 import { resolve } from 'path';
 
+import { getCordovaPlugins } from '../cordova';
 import type { Config } from '../definitions';
 import type { Plugin } from '../plugin';
 
@@ -75,5 +76,9 @@ export async function generateIOSPackageJSON(
 ): Promise<void> {
   const fileList = await getPluginFiles(plugins);
   const classList = await findPluginClasses(fileList);
+  const cordovaPlugins = await getCordovaPlugins(config, 'ios');
+  if (cordovaPlugins.length > 0) {
+    classList.push('CDVPlugin');
+  }
   writePluginJSON(config, classList);
 }
diff --git a/ios/Capacitor/Capacitor/CapacitorBridge.swift b/ios/Capacitor/Capacitor/CapacitorBridge.swift
@@ -293,10 +293,11 @@ open class CapacitorBridge: NSObject, CAPBridgeProtocol {
 
                     for plugin in registrationList.packageClassList {
                         if let pluginClass = NSClassFromString(plugin) {
-                            if class_getSuperclass(pluginClass) == CDVPlugin.self {
+                            if pluginClass == CDVPlugin.self {
                                 injectCordovaFiles = true
+                            } else {
+                                pluginList.append(pluginClass)
                             }
-                            pluginList.append(pluginClass)
                         }
                     }
                 }