@capacitor/cli 7.6.2 → 7.6.3

package/dist/ios/update.js

@@ -11,6 +11,7 @@ const errors_1 = require("../errors");
 const log_1 = require("../log");
 const plugin_1 = require("../plugin");
 const copy_1 = require("../tasks/copy");
+const migrate_1 = require("../tasks/migrate");
 const fs_1 = require("../util/fs");
 const iosplugin_1 = require("../util/iosplugin");
 const node_1 = require("../util/node");
@@ -59,14 +60,159 @@ async function generateCordovaPackageFiles(cordovaPlugins, config) {
     });
 }
 async function generateCordovaPackageFile(p, config) {
+    var _a;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
+    const platformTag = (0, plugin_1.getPluginPlatform)(p, platform);
+    if ((_a = platformTag.$) === null || _a === void 0 ? void 0 : _a.package) {
+        const packageSwiftPath = (0, path_1.join)(p.rootPath, 'Package.swift');
+        let content = await (0, fs_extra_1.readFile)(packageSwiftPath, { encoding: 'utf-8' });
+        content = content.replace(`apache`, `ionic-team`).replaceAll(`cordova-ios`, `capacitor-swift-pm`);
+        content = (0, migrate_1.setAllStringIn)(content, `url: "https://github.com/ionic-team/capacitor-swift-pm.git",`, `)`, ` from: "${iosPlatformVersion}"`);
+        await (0, fs_extra_1.writeFile)(packageSwiftPath, content);
+    }
+    else {
+        await writeGeneratedPackageSwift(p, config, iosPlatformVersion);
+    }
+}
+function buildBinaryTargetEntries(p, frameworks) {
+    const customXcframeworks = frameworks.filter((f) => f.$.custom === 'true' && f.$.src.endsWith('.xcframework'));
+    const customFrameworks = frameworks.filter((f) => f.$.custom === 'true' && f.$.src.endsWith('.framework'));
+    if (customFrameworks.length > 0) {
+        customFrameworks.forEach((f) => {
+            log_1.logger.warn(`${p.id}: custom .framework files are not supported as binaryTarget in SPM (${f.$.src}). Convert to .xcframework for SPM compatibility.`);
+        });
+    }
+    const binaryTargetsText = customXcframeworks
+        .map((f) => {
+        const name = f.$.src.split('/').pop().replace('.xcframework', '');
+        return `,
+        .binaryTarget(
+            name: "${name}",
+            path: "${f.$.src}"
+        )`;
+    })
+        .join('');
+    const binaryDepsText = customXcframeworks
+        .map((f) => {
+        const name = f.$.src.split('/').pop().replace('.xcframework', '');
+        return `,\n                .target(name: "${name}")`;
+    })
+        .join('');
+    return { binaryTargetsText, binaryDepsText };
+}
+function buildResourcesText(resources) {
+    const resourceEntry = [];
+    for (const resource of resources) {
+        resourceEntry.push(`.copy("resources/${resource.$.src.split('/').pop()}")`);
+    }
+    return resources.length > 0
+        ? `,
+            resources: [
+                ${resourceEntry.join(',\n                ')}
+            ]`
+        : '';
+}
+async function buildDependencyTexts(p, config) {
+    let allDependencies = (0, plugin_1.getPlatformElement)(p, platform, 'dependency');
+    if (p.xml['dependency']) {
+        allDependencies = allDependencies.concat(p.xml['dependency']);
+    }
+    let packageText = '';
+    let productText = '';
+    await Promise.all(allDependencies.map(async (dep) => {
+        let plugin = dep.$.id;
+        if (plugin.includes('@') && plugin.indexOf('@') !== 0) {
+            [plugin] = plugin.split('@');
+        }
+        const depPlugin = await (0, plugin_1.resolvePlugin)(config, plugin);
+        if (depPlugin) {
+            const headerFiles = (0, plugin_1.getPlatformElement)(depPlugin, platform, 'header-file');
+            const resources = (0, plugin_1.getPlatformElement)(depPlugin, platform, 'resource-file');
+            const sourceFiles = (0, plugin_1.getPlatformElement)(depPlugin, platform, 'source-file');
+            if (sourceFiles.length === 0 && headerFiles.length === 0 && resources.length === 0) {
+                return;
+            }
+            packageText += `,\n        .package(name: "${depPlugin.name}", path: "../${depPlugin.name}")`;
+            productText += `,\n                .product(name: "${depPlugin.name}", package: "${depPlugin.name}")`;
+        }
+    }));
+    return { packageText, productText };
+}
+function buildCSettingsText(p, sourceFiles) {
+    var _a;
+    const pluginId = p.id;
+    const allFlags = new Set();
+    for (const sourceFile of sourceFiles) {
+        const flags = (_a = sourceFile.$) === null || _a === void 0 ? void 0 : _a['compiler-flags'];
+        if (flags) {
+            flags
+                .split(/\s+/)
+                .map((f) => f.trim())
+                .filter((f) => f.length > 0)
+                .forEach((f) => allFlags.add(f));
+        }
+    }
+    if (allFlags.size === 0) {
+        return '';
+    }
+    const entries = [];
+    const unsupportedFlags = [];
+    for (const flag of allFlags) {
+        if (flag.startsWith('-D')) {
+            const definition = flag.slice(2);
+            const eqIndex = definition.indexOf('=');
+            if (eqIndex !== -1) {
+                const name = definition.slice(0, eqIndex);
+                const value = definition.slice(eqIndex + 1);
+                entries.push(`                .define("${name}", to: "${value}")`);
+            }
+            else {
+                entries.push(`                .define("${definition}")`);
+            }
+        }
+        else {
+            unsupportedFlags.push(flag);
+        }
+    }
+    if (unsupportedFlags.length > 0) {
+        log_1.logger.warn(`${pluginId}: the following compiler flags are not supported in SPM and were ignored: ${unsupportedFlags.join(', ')}. ` +
+            `This might cause the plugin to fail to compile.`);
+    }
+    if (entries.length === 0) {
+        return '';
+    }
+    return `,
+            cSettings: [
+${entries.join(',\n')}
+            ]`;
+}
+async function writeGeneratedPackageSwift(p, config, iosPlatformVersion) {
     const iosVersion = (0, common_2.getMajoriOSVersion)(config);
     const headerFiles = (0, plugin_1.getPlatformElement)(p, platform, 'header-file');
-    let headersText = '';
-    if (headerFiles.length > 0) {
-        headersText = `,
-            publicHeadersPath: "."`;
+    const headersText = headerFiles.length > 0
+        ? `,
+            publicHeadersPath: "."`
+        : '';
+    const resources = (0, plugin_1.getPlatformElement)(p, platform, 'resource-file');
+    const sourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'source-file');
+    if (sourceFiles.length === 0 && headerFiles.length === 0 && resources.length === 0) {
+        return;
     }
+    const frameworks = (0, plugin_1.getPlatformElement)(p, platform, 'framework');
+    const { binaryTargetsText, binaryDepsText } = buildBinaryTargetEntries(p, frameworks);
+    const cSettingsText = buildCSettingsText(p, sourceFiles);
+    const systemFrameworks = frameworks.filter((f) => !f.$.custom && f.$.src.endsWith('.framework'));
+    const hasWeakFrameworks = systemFrameworks.some((f) => f.$.weak === 'true');
+    const requiredSystemFrameworks = systemFrameworks.filter((f) => f.$.weak !== 'true');
+    const resourcesText = buildResourcesText(resources);
+    const libraryTypeText = hasWeakFrameworks ? `\n            type: .dynamic,` : '';
+    const linkerSettingsText = requiredSystemFrameworks.length > 0
+        ? `,
+            linkerSettings: [
+${requiredSystemFrameworks.map((f) => `                .linkedFramework("${f.$.src.replace('.framework', '')}")`).join(',\n')}
+            ]`
+        : '';
+    const { packageText, productText } = await buildDependencyTexts(p, config);
     const content = `// swift-tools-version: 5.9
 
 import PackageDescription
@@ -76,21 +222,21 @@ let package = Package(
     platforms: [.iOS(.v${iosVersion})],
     products: [
         .library(
-            name: "${p.name}",
+            name: "${p.name}",${libraryTypeText}
             targets: ["${p.name}"]
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "${iosPlatformVersion}")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "${iosPlatformVersion}")${packageText}
     ],
     targets: [
         .target(
             name: "${p.name}",
             dependencies: [
-                .product(name: "Cordova", package: "capacitor-swift-pm")
+                .product(name: "Cordova", package: "capacitor-swift-pm")${binaryDepsText}${productText}
             ],
-            path: "."${headersText}
-        )
+            path: "."${resourcesText}${headersText}${cSettingsText}${linkerSettingsText}
+        )${binaryTargetsText}
     ]
 )`;
     await (0, fs_extra_1.writeFile)((0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'sources', p.name, 'Package.swift'), content);
@@ -354,13 +500,19 @@ function getLinkerFlags(config) {
     return '';
 }
 async function copyPluginsNativeFiles(config, cordovaPlugins) {
+    var _a;
+    const isSPM = (await config.ios.packageManager) === 'SPM';
     for (const p of cordovaPlugins) {
+        const platformTag = (0, plugin_1.getPluginPlatform)(p, platform);
+        if ((_a = platformTag.$) === null || _a === void 0 ? void 0 : _a.package) {
+            continue;
+        }
         const sourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'source-file');
         const headerFiles = (0, plugin_1.getPlatformElement)(p, platform, 'header-file');
         const codeFiles = sourceFiles.concat(headerFiles);
         const frameworks = (0, plugin_1.getPlatformElement)(p, platform, 'framework');
         let sourcesFolderName = 'sources';
-        if ((0, cordova_1.needsStaticPod)(p)) {
+        if (!isSPM && (0, cordova_1.needsStaticPod)(p)) {
             sourcesFolderName += 'static';
         }
         const sourcesFolder = (0, path_1.join)(config.ios.cordovaPluginsDirAbs, sourcesFolderName, p.name);
@@ -371,7 +523,7 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
                 fileName = 'lib' + fileName;
             }
             let destFolder = sourcesFolderName;
-            if (codeFile.$['compiler-flags'] && codeFile.$['compiler-flags'] === '-fno-objc-arc') {
+            if (!isSPM && codeFile.$['compiler-flags'] && codeFile.$['compiler-flags'] === '-fno-objc-arc') {
                 destFolder = 'noarc';
             }
             const filePath = (0, plugin_1.getFilePath)(config, p, codeFile.$.src);
@@ -390,8 +542,13 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
                     }
                     if (fileContent.includes('[NSBundle bundleForClass:[self class]]') ||
                         fileContent.includes('[NSBundle bundleForClass:[CDVCapture class]]')) {
-                        fileContent = fileContent.replace('[NSBundle bundleForClass:[self class]]', '[NSBundle mainBundle]');
-                        fileContent = fileContent.replace('[NSBundle bundleForClass:[CDVCapture class]]', '[NSBundle mainBundle]');
+                        const bundleName = isSPM ? 'SWIFTPM_MODULE_BUNDLE' : '[NSBundle mainBundle]';
+                        fileContent = fileContent.replace('[NSBundle bundleForClass:[self class]]', bundleName);
+                        fileContent = fileContent.replace('[NSBundle bundleForClass:[CDVCapture class]]', bundleName);
+                        await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
+                    }
+                    if (isSPM && fileContent.includes('[NSBundle mainBundle] URLForResource')) {
+                        fileContent = fileContent.replace('[NSBundle mainBundle] URLForResource', 'SWIFTPM_MODULE_BUNDLE URLForResource');
                         await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
                     }
                     if (fileContent.includes('[self.webView superview]') || fileContent.includes('self.webView.superview')) {
@@ -405,7 +562,8 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
         const resourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'resource-file');
         for (const resourceFile of resourceFiles) {
             const fileName = resourceFile.$.src.split('/').pop();
-            await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'resources', fileName));
+            const rootResFolder = isSPM ? sourcesFolder : config.ios.cordovaPluginsDirAbs;
+            await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, resourceFile.$.src), (0, path_1.join)(rootResFolder, 'resources', fileName));
         }
         for (const framework of frameworks) {
             if (framework.$.custom && framework.$.custom === 'true') {

package/dist/tasks/migrate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.patchOldCapacitorPlugins = exports.migrateCommand = void 0;
+exports.patchOldCapacitorPlugins = exports.setAllStringIn = exports.migrateCommand = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -507,6 +507,7 @@ function setAllStringIn(data, start, end, replacement) {
     }
     return result;
 }
+exports.setAllStringIn = setAllStringIn;
 async function updateAndroidManifest(filename) {
     const txt = readFile(filename);
     if (!txt) {

package/dist/util/spm.js

@@ -45,12 +45,12 @@ exports.generatePackageFile = generatePackageFile;
 async function checkPluginsForPackageSwift(config, plugins) {
     const iOSCapacitorPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, 'ios') === 0 /* PluginType.Core */);
     const packageSwiftPluginList = await pluginsWithPackageSwift(iOSCapacitorPlugins);
-    if (plugins.length == packageSwiftPluginList.length) {
-        log_1.logger.debug(`Found ${plugins.length} iOS plugins, ${packageSwiftPluginList.length} have a Package.swift file`);
-        log_1.logger.info('All plugins have a Package.swift file and will be included in Package.swift');
+    if (iOSCapacitorPlugins.length == packageSwiftPluginList.length) {
+        log_1.logger.debug(`Found ${iOSCapacitorPlugins.length} Capacitor iOS plugins, ${packageSwiftPluginList.length} have a Package.swift file`);
+        log_1.logger.info('All Capacitor plugins have a Package.swift file and will be included in Package.swift');
     }
     else {
-        log_1.logger.warn('Some installed packages are not compatable with SPM');
+        log_1.logger.warn('Some installed Capacitor plugins are not compatible with SPM');
     }
     return packageSwiftPluginList;
 }
@@ -84,7 +84,7 @@ async function removeCocoapodsFiles(config) {
 }
 exports.removeCocoapodsFiles = removeCocoapodsFiles;
 async function generatePackageText(config, plugins) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
     const iosVersion = (0, common_2.getMajoriOSVersion)(config);
     let packageSwiftText = `// swift-tools-version: 5.9
@@ -103,11 +103,23 @@ let package = Package(
         .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "${iosPlatformVersion}")`;
     for (const plugin of plugins) {
         if ((0, plugin_1.getPluginType)(plugin, config.ios.name) === 1 /* PluginType.Cordova */) {
-            packageSwiftText += `,\n        .package(name: "${plugin.name}", path: "../../capacitor-cordova-ios-plugins/sources/${plugin.name}")`;
+            const platformTag = (0, plugin_1.getPluginPlatform)(plugin, config.ios.name);
+            if ((_a = platformTag.$) === null || _a === void 0 ? void 0 : _a.package) {
+                const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
+                packageSwiftText += `,\n        .package(name: "${plugin.id}", path: "${relPath}")`;
+            }
+            else {
+                const sourceFiles = (0, plugin_1.getPlatformElement)(plugin, config.ios.name, 'source-file');
+                const headerFiles = (0, plugin_1.getPlatformElement)(plugin, config.ios.name, 'header-file');
+                if (sourceFiles.length === 0 && headerFiles.length === 0) {
+                    continue;
+                }
+                packageSwiftText += `,\n        .package(name: "${plugin.name}", path: "../../capacitor-cordova-ios-plugins/sources/${plugin.name}")`;
+            }
         }
         else {
             const relPath = (0, path_1.relative)(config.ios.nativeXcodeProjDirAbs, plugin.rootPath);
-            packageSwiftText += `,\n        .package(name: "${(_a = plugin.ios) === null || _a === void 0 ? void 0 : _a.name}", path: "${relPath}")`;
+            packageSwiftText += `,\n        .package(name: "${(_b = plugin.ios) === null || _b === void 0 ? void 0 : _b.name}", path: "${relPath}")`;
         }
     }
     packageSwiftText += `
@@ -119,7 +131,21 @@ let package = Package(
                 .product(name: "Capacitor", package: "capacitor-swift-pm"),
                 .product(name: "Cordova", package: "capacitor-swift-pm")`;
     for (const plugin of plugins) {
-        packageSwiftText += `,\n                .product(name: "${(_b = plugin.ios) === null || _b === void 0 ? void 0 : _b.name}", package: "${(_c = plugin.ios) === null || _c === void 0 ? void 0 : _c.name}")`;
+        let pluginText = `,\n                .product(name: "${(_c = plugin.ios) === null || _c === void 0 ? void 0 : _c.name}", package: "${(_d = plugin.ios) === null || _d === void 0 ? void 0 : _d.name}")`;
+        if ((0, plugin_1.getPluginType)(plugin, config.ios.name) === 1 /* PluginType.Cordova */) {
+            const platformTag = (0, plugin_1.getPluginPlatform)(plugin, config.ios.name);
+            if ((_e = platformTag.$) === null || _e === void 0 ? void 0 : _e.package) {
+                pluginText = `,\n                .product(name: "${plugin.id}", package: "${plugin.id}")`;
+            }
+            else {
+                const sourceFiles = (0, plugin_1.getPlatformElement)(plugin, config.ios.name, 'source-file');
+                const headerFiles = (0, plugin_1.getPlatformElement)(plugin, config.ios.name, 'header-file');
+                if (sourceFiles.length === 0 && headerFiles.length === 0) {
+                    pluginText = '';
+                }
+            }
+        }
+        packageSwiftText += pluginText;
     }
     packageSwiftText += `
             ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "7.6.2",
+  "version": "7.6.3",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",