Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions cli/src/ios/update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,14 @@ export async function updateIOS(config: Config, deployment: boolean): Promise<vo
}

async function updatePluginFiles(config: Config, plugins: Plugin[], deployment: boolean) {
const isSPM = (await config.ios.packageManager) === 'SPM';
await removePluginsNativeFiles(config);
const cordovaPlugins = plugins.filter((p) => getPluginType(p, platform) === PluginType.Cordova);
let cordovaPlugins = plugins.filter((p) => getPluginType(p, platform) === PluginType.Cordova);
let incompatibleCordovaPlugins = plugins.filter((p) => getPluginType(p, platform) === PluginType.Incompatible);
if (isSPM) {
incompatibleCordovaPlugins = incompatibleCordovaPlugins.concat(cordovaPlugins.filter((p) => needsSPMDep(p)));
cordovaPlugins = cordovaPlugins.filter((p) => !needsSPMDep(p));
Comment on lines +52 to +53

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Propagate SPM-incompatible Cordova plugins to dependency checks

When SPM is enabled, this code removes some Cordova plugins from cordovaPlugins for installation, but those plugins keep PluginType.Cordova. checkPluginDependencies() later recomputes Cordova plugins from type and still treats these skipped plugins as installed, so dependents will not be reported as missing dependencies even though the plugin was excluded from native integration. In projects where a compatible Cordova plugin depends on one of these skipped CocoaPods-based plugins, this can produce unresolved native references without any warning.

Useful? React with 👍 / 👎.

}
if (cordovaPlugins.length > 0) {
await copyPluginsNativeFiles(config, cordovaPlugins);
}
Expand All @@ -54,7 +60,7 @@ async function updatePluginFiles(config: Config, plugins: Plugin[], deployment:
}
await handleCordovaPluginsJS(cordovaPlugins, config, platform);
await checkPluginDependencies(plugins, platform, config.app.extConfig.cordova?.failOnUninstalledPlugins);
if ((await config.ios.packageManager) === 'SPM') {
if (isSPM) {
await generateCordovaPackageFiles(cordovaPlugins, config);

const validSPMPackages = await checkPluginsForPackageSwift(config, plugins);
Expand All @@ -66,7 +72,6 @@ async function updatePluginFiles(config: Config, plugins: Plugin[], deployment:
}
await logCordovaManualSteps(cordovaPlugins, config, platform);

const incompatibleCordovaPlugins = plugins.filter((p) => getPluginType(p, platform) === PluginType.Incompatible);
printPlugins(incompatibleCordovaPlugins, platform, 'incompatible');
}

Expand Down Expand Up @@ -682,3 +687,9 @@ async function replaceFrameworkVariables(config: Config, prefsArray: any[], fram
});
return frameworkString;
}

function needsSPMDep(plugin: Plugin): boolean {
const podspecs = getPlatformElement(plugin, 'ios', 'podspec');
const platformTag = getPluginPlatform(plugin, platform);
return podspecs.length > 0 && !platformTag.$?.package;
}
Loading