Skip to content
Merged
Show file tree
Hide file tree
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
20 changes: 20 additions & 0 deletions cli/src/declarations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,13 @@ export interface CapacitorConfig {
* @since 8.3.0
*/
packageTraits?: { [pluginId: string]: string[] };
/**
* Define options to apply to the package.
* The key is the plugin ID (e.g. `@capacitor-community/device`)
*
* @since 8.4.0
*/
packageOptions?: { [pluginId: string]: PackageOptions };
};
};
};
Expand Down Expand Up @@ -799,3 +806,16 @@ export interface PluginsConfig {
animation?: 'FADE' | 'NONE';
};
}

export interface PackageOptions {
/**
* Create a symlink to the plugin folder instead of pointing to the plugin path.
* Useful when plugin names conflict.
*/
symlink?: boolean;
/**
* Useful to avoid target name conflicts in dependencies
* [see](https://docs.swift.org/swiftpm/documentation/packagemanagerdocs/modulealiasing/)
*/
moduleAliases?: { [target: string]: string };
}
3 changes: 3 additions & 0 deletions cli/src/ios/update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,9 @@ async function copyPluginsNativeFiles(config: Config, cordovaPlugins: Plugin[])

async function removePluginsNativeFiles(config: Config) {
await remove(config.ios.cordovaPluginsDirAbs);
if ((await config.ios.packageManager) === 'SPM') {
await remove(join(config.ios.nativeProjectDirAbs, 'CapApp-SPM', 'symlinks'));
}
await extractTemplate(config.cli.assets.ios.cordovaPluginsTemplateArchiveAbs, config.ios.cordovaPluginsDirAbs);
}

Expand Down
21 changes: 18 additions & 3 deletions cli/src/util/spm.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { pathExists, existsSync, readFileSync, writeFileSync, remove, move, mkdtemp } from 'fs-extra';
import { ensureSymlink, pathExists, existsSync, readFileSync, writeFileSync, remove, move, mkdtemp } from 'fs-extra';
import { tmpdir } from 'os';
import { join, relative, resolve } from 'path';
import type { PlistObject } from 'plist';
Expand Down Expand Up @@ -100,6 +100,7 @@ export async function generatePackageText(config: Config, plugins: Plugin[]): Pr
const iosPlatformVersion = await getCapacitorPackageVersion(config, config.ios.name);
const iosVersion = getMajoriOSVersion(config);
const packageTraits = config.app.extConfig.experimental?.ios?.spm?.packageTraits ?? {};
const packageOptions = config.app.extConfig.experimental?.ios?.spm?.packageOptions ?? {};
const swiftToolsVersion = config.app.extConfig.experimental?.ios?.spm?.swiftToolsVersion ?? '5.9';

let packageSwiftText = `// swift-tools-version: ${swiftToolsVersion}
Expand Down Expand Up @@ -132,7 +133,13 @@ let package = Package(
packageSwiftText += `,\n .package(name: "${plugin.name}", path: "../../capacitor-cordova-ios-plugins/sources/${plugin.name}")`;
}
} else {
const relPath = relative(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
const options = packageOptions[plugin.id];
const symlink = options?.symlink;
const symlinkFolder = join('symlinks', plugin.name);
const relPath = symlink ? symlinkFolder : relative(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
if (symlink) {
await ensureSymlink(plugin.rootPath, resolve(config.ios.nativeProjectDirAbs, 'CapApp-SPM', symlinkFolder));
}
const traits = packageTraits[plugin.id];
const traitsSuffix = traits?.length
? `, traits: [${traits
Expand All @@ -156,7 +163,15 @@ let package = Package(
.product(name: "Cordova", package: "capacitor-swift-pm")`;

for (const plugin of plugins) {
let pluginText = `,\n .product(name: "${plugin.ios?.name}", package: "${plugin.ios?.name}")`;
const aliases = Object.entries(packageOptions[plugin.id]?.moduleAliases ?? {});
const aliasText = aliases?.length
? `, moduleAliases: [${aliases
.map(([target, replacement]) => {
return `"${target}": "${replacement}"`;
})
.join(', ')}]`
: '';
let pluginText = `,\n .product(name: "${plugin.ios?.name}", package: "${plugin.ios?.name}"${aliasText})`;
if (getPluginType(plugin, config.ios.name) === PluginType.Cordova) {
const platformTag = getPluginPlatform(plugin, config.ios.name);
if (platformTag.$?.package) {
Expand Down
Loading