@capacitor/cli 8.3.2 → 9.0.0-alpha.0

package/dist/android/update.js

@@ -9,6 +9,7 @@ const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 const cordova_1 = require("../cordova");
 const errors_1 = require("../errors");
+const log_1 = require("../log");
 const plugin_1 = require("../plugin");
 const copy_1 = require("../tasks/copy");
 const fs_1 = require("../util/fs");
@@ -22,10 +23,12 @@ async function updateAndroid(config) {
     const plugins = await getPluginsTask(config);
     const capacitorPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 0 /* PluginType.Core */);
     (0, plugin_1.printPlugins)(capacitorPlugins, 'android');
-    await writePluginsJson(config, capacitorPlugins);
-    await removePluginsNativeFiles(config);
     const cordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 1 /* PluginType.Cordova */);
-    if (cordovaPlugins.length > 0) {
+    const enableCordova = cordovaPlugins.length > 0;
+    await writePluginsJson(config, capacitorPlugins, enableCordova);
+    await removePluginsNativeFiles(config);
+    if (enableCordova) {
+        log_1.logger.info('Found Cordova Plugins: Including Android Cordova Support');
         await copyPluginsNativeFiles(config, cordovaPlugins);
     }
     if (!(await (0, fs_extra_1.pathExists)(config.android.webDirAbs))) {
@@ -34,8 +37,10 @@ async function updateAndroid(config) {
     await (0, cordova_1.handleCordovaPluginsJS)(cordovaPlugins, config, platform);
     await (0, cordova_1.checkPluginDependencies)(plugins, platform, (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.failOnUninstalledPlugins);
     await installGradlePlugins(config, capacitorPlugins, cordovaPlugins);
-    await handleCordovaPluginsGradle(config, cordovaPlugins);
-    await (0, cordova_1.writeCordovaAndroidManifest)(cordovaPlugins, config, platform);
+    if (enableCordova) {
+        await handleCordovaPluginsGradle(config, cordovaPlugins);
+        await (0, cordova_1.writeCordovaAndroidManifest)(cordovaPlugins, config, platform);
+    }
     const incompatibleCordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 2 /* PluginType.Incompatible */);
     (0, plugin_1.printPlugins)(incompatibleCordovaPlugins, platform, 'incompatible');
     await (0, common_1.checkPlatformVersions)(config, platform);
@@ -44,8 +49,14 @@ exports.updateAndroid = updateAndroid;
 function getGradlePackageName(id) {
     return id.replace('@', '').replace('/', '-');
 }
-async function writePluginsJson(config, plugins) {
+async function writePluginsJson(config, plugins, includeCordova) {
     const classes = await findAndroidPluginClasses(plugins);
+    if (includeCordova) {
+        classes.push({
+            pkg: '@capacitor/android',
+            classpath: 'com.getcapacitor.cordova.CordovaPlugin',
+        });
+    }
     const pluginsJsonPath = (0, path_1.resolve)(config.android.assetsDirAbs, 'capacitor.plugins.json');
     await (0, fs_extra_1.writeJSON)(pluginsJsonPath, classes, { spaces: '\t' });
 }
@@ -96,13 +107,25 @@ async function installGradlePlugins(config, capacitorPlugins, cordovaPlugins) {
         (0, errors_1.fatal)(`Unable to find ${colors_1.default.strong('node_modules/@capacitor/android')}.\n` +
             `Are you sure ${colors_1.default.strong('@capacitor/android')} is installed?`);
     }
+    const enableCordova = cordovaPlugins.length > 0;
     const capacitorAndroidPath = (0, path_1.resolve)((0, path_1.dirname)(capacitorAndroidPackagePath), 'capacitor');
+    const capacitorCordovaAndroidPath = (0, path_1.resolve)((0, path_1.dirname)(capacitorAndroidPackagePath), 'capacitor-cordova');
     const settingsPath = config.android.platformDirAbs;
     const dependencyPath = config.android.appDirAbs;
     const relativeCapcitorAndroidPath = (0, fs_1.convertToUnixPath)((0, path_1.relative)(settingsPath, capacitorAndroidPath));
+    const relativeCapacitorCordovaAndroidPath = (0, fs_1.convertToUnixPath)((0, path_1.relative)(settingsPath, capacitorCordovaAndroidPath));
+    const cdvIncludeText = enableCordova
+        ? `
+include ':capacitor-cordova-android'
+project(':capacitor-cordova-android').projectDir = new File('${relativeCapacitorCordovaAndroidPath}')
+
+include ':capacitor-cordova-android-plugins'
+project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')`
+        : '';
     const settingsLines = `// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('${relativeCapcitorAndroidPath}')
+${cdvIncludeText}
 ${capacitorPlugins
         .map((p) => {
         if (!p.android) {
@@ -139,6 +162,20 @@ project(':${getGradlePackageName(p.id)}').projectDir = new File('${relativePlugi
         });
         prefsArray = prefsArray.concat((0, plugin_1.getAllElements)(p, platform, 'preference'));
     });
+    const cdvRepoApplyText = enableCordova
+        ? `
+repositories {
+    flatDir{
+        dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
+    }
+}
+
+apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
+`
+        : '';
+    const cdvDependencyText = enableCordova
+        ? `    implementation project(':capacitor-cordova-android')\n    implementation project(':capacitor-cordova-android-plugins')\n`
+        : '';
     let frameworkString = frameworksArray.join('\n');
     frameworkString = await replaceFrameworkVariables(config, prefsArray, frameworkString);
     const dependencyLines = `// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
@@ -149,10 +186,9 @@ android {
       targetCompatibility JavaVersion.VERSION_21
   }
 }
-
-apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
+${cdvRepoApplyText}
 dependencies {
-${capacitorPlugins
+${cdvDependencyText}${capacitorPlugins
         .map((p) => {
         return `    implementation project(':${getGradlePackageName(p.id)}')`;
     })

package/dist/ios/update.js

@@ -11,13 +11,12 @@ 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 cordova_ios_1 = require("../util/cordova-ios");
 const fs_1 = require("../util/fs");
 const iosplugin_1 = require("../util/iosplugin");
 const node_1 = require("../util/node");
 const spm_1 = require("../util/spm");
 const subprocess_1 = require("../util/subprocess");
-const template_1 = require("../util/template");
 const common_2 = require("./common");
 const platform = 'ios';
 async function updateIOS(config, deployment) {
@@ -31,10 +30,12 @@ async function updateIOS(config, deployment) {
 exports.updateIOS = updateIOS;
 async function updatePluginFiles(config, plugins, deployment) {
     var _a;
-    await removePluginsNativeFiles(config);
+    await (0, cordova_ios_1.removePluginsNativeFiles)(config);
     const cordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 1 /* PluginType.Cordova */);
-    if (cordovaPlugins.length > 0) {
-        await copyPluginsNativeFiles(config, cordovaPlugins);
+    const enableCordova = cordovaPlugins.length > 0;
+    if (enableCordova) {
+        log_1.logger.info('Found Cordova Plugins: Including iOS Cordova Support');
+        await (0, cordova_ios_1.copyPluginsNativeFiles)(config, cordovaPlugins);
     }
     if (!(await (0, fs_extra_1.pathExists)(await config.ios.webDirAbs))) {
         await (0, copy_1.copy)(config, platform);
@@ -42,218 +43,38 @@ async function updatePluginFiles(config, plugins, deployment) {
     await (0, cordova_1.handleCordovaPluginsJS)(cordovaPlugins, config, platform);
     await (0, cordova_1.checkPluginDependencies)(plugins, platform, (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.failOnUninstalledPlugins);
     if ((await config.ios.packageManager) === 'SPM') {
-        await generateCordovaPackageFiles(cordovaPlugins, config);
+        if (enableCordova) {
+            await (0, cordova_ios_1.generateCordovaPackageFiles)(cordovaPlugins, config);
+        }
         const validSPMPackages = await (0, spm_1.checkPluginsForPackageSwift)(config, plugins);
         await (0, spm_1.generatePackageFile)(config, validSPMPackages.concat(cordovaPlugins));
     }
     else {
-        await generateCordovaPodspecs(cordovaPlugins, config);
-        await installCocoaPodsPlugins(config, plugins, deployment);
-    }
-    await (0, cordova_1.logCordovaManualSteps)(cordovaPlugins, config, platform);
-    const incompatibleCordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 2 /* PluginType.Incompatible */);
-    (0, plugin_1.printPlugins)(incompatibleCordovaPlugins, platform, 'incompatible');
-}
-async function generateCordovaPackageFiles(cordovaPlugins, config) {
-    cordovaPlugins.map((plugin) => {
-        generateCordovaPackageFile(plugin, 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);
-        }
+        await installCocoaPodsPlugins(config, plugins, deployment, enableCordova);
     }
-    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 (enableCordova) {
+        await (0, cordova_1.logCordovaManualSteps)(cordovaPlugins, config, platform);
+        const incompatibleCordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 2 /* PluginType.Incompatible */);
+        (0, plugin_1.printPlugins)(incompatibleCordovaPlugins, platform, 'incompatible');
     }
-    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');
-    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;
+async function installCocoaPodsPlugins(config, plugins, deployment, enableCordova) {
+    if (enableCordova) {
+        const cordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 1 /* PluginType.Cordova */);
+        await (0, cordova_ios_1.generateCordovaPodspecs)(cordovaPlugins, config);
     }
-    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
-
-let package = Package(
-    name: "${p.name}",
-    platforms: [.iOS(.v${iosVersion})],
-    products: [
-        .library(
-            name: "${p.name}",${libraryTypeText}
-            targets: ["${p.name}"]
-        )
-    ],
-    dependencies: [
-        .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")${binaryDepsText}${productText}
-            ],
-            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);
-}
-async function installCocoaPodsPlugins(config, plugins, deployment) {
     await (0, common_1.runTask)(`Updating iOS native dependencies with ${colors_1.default.input(`${await config.ios.podPath} install`)}`, () => {
-        return updatePodfile(config, plugins, deployment);
+        return updatePodfile(config, plugins, deployment, enableCordova);
     });
 }
 exports.installCocoaPodsPlugins = installCocoaPodsPlugins;
-async function updatePodfile(config, plugins, deployment) {
-    const dependenciesContent = await generatePodFile(config, plugins);
+async function updatePodfile(config, plugins, deployment, enableCordova) {
+    const dependenciesContent = await generatePodFile(config, plugins, enableCordova);
     const relativeCapacitoriOSPath = await getRelativeCapacitoriOSPath(config);
     const podfilePath = (0, path_1.join)(config.ios.nativeProjectDirAbs, 'Podfile');
     let podfileContent = await (0, fs_extra_1.readFile)(podfilePath, { encoding: 'utf-8' });
     podfileContent = podfileContent.replace(/(def capacitor_pods)[\s\S]+?(\nend)/, `$1${dependenciesContent}$2`);
-    podfileContent = podfileContent.replace(/(require_relative)[\s\S]+?(@capacitor\/ios\/scripts\/pods_helpers')/, `require_relative '${relativeCapacitoriOSPath}/scripts/pods_helpers'`);
+    podfileContent = podfileContent.replace(/(require_relative)[\s\S]+?(ios\/scripts\/pods_helpers')/, `require_relative '${relativeCapacitoriOSPath}/scripts/pods_helpers'`);
     await (0, fs_extra_1.writeFile)(podfilePath, podfileContent, { encoding: 'utf-8' });
     const podPath = await config.ios.podPath;
     const useBundler = (await config.ios.packageManager) === 'bundler';
@@ -288,306 +109,24 @@ async function getRelativeCapacitoriOSPath(config) {
     }
     return (0, fs_1.convertToUnixPath)((0, path_1.relative)(config.ios.nativeProjectDirAbs, await (0, fs_extra_1.realpath)((0, path_1.dirname)(capacitoriOSPath))));
 }
-async function generatePodFile(config, plugins) {
+async function generatePodFile(config, plugins, enableCordova) {
     const relativeCapacitoriOSPath = await getRelativeCapacitoriOSPath(config);
     const capacitorPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 0 /* PluginType.Core */);
+    const cordovaPodlines = (0, cordova_ios_1.cordovaPodfileLines)(config, plugins);
     const pods = await Promise.all(capacitorPlugins.map(async (p) => {
         if (!p.ios) {
             return '';
         }
         return `  pod '${p.ios.name}', :path => '${(0, fs_1.convertToUnixPath)((0, path_1.relative)(config.ios.nativeProjectDirAbs, await (0, fs_extra_1.realpath)(p.rootPath)))}'\n`;
     }));
-    const cordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 1 /* PluginType.Cordova */);
-    cordovaPlugins.map(async (p) => {
-        const podspecs = (0, plugin_1.getPlatformElement)(p, platform, 'podspec');
-        podspecs.map((podspec) => {
-            podspec.pods.map((pPods) => {
-                pPods.pod.map((pod) => {
-                    if (pod.$.git) {
-                        let gitRef = '';
-                        if (pod.$.tag) {
-                            gitRef = `, :tag => '${pod.$.tag}'`;
-                        }
-                        else if (pod.$.branch) {
-                            gitRef = `, :branch => '${pod.$.branch}'`;
-                        }
-                        else if (pod.$.commit) {
-                            gitRef = `, :commit => '${pod.$.commit}'`;
-                        }
-                        pods.push(`  pod '${pod.$.name}', :git => '${pod.$.git}'${gitRef}\n`);
-                    }
-                });
-            });
-        });
-    });
-    const staticPlugins = cordovaPlugins.filter((p) => (0, cordova_1.needsStaticPod)(p));
-    const noStaticPlugins = cordovaPlugins.filter((el) => !staticPlugins.includes(el));
-    if (noStaticPlugins.length > 0) {
-        pods.push(`  pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'\n`);
-    }
-    if (staticPlugins.length > 0) {
-        pods.push(`  pod 'CordovaPluginsStatic', :path => '../capacitor-cordova-ios-plugins'\n`);
-    }
-    const resourcesPlugins = cordovaPlugins.filter(filterResources);
-    if (resourcesPlugins.length > 0) {
-        pods.push(`  pod 'CordovaPluginsResources', :path => '../capacitor-cordova-ios-plugins'\n`);
-    }
-    return `
-  pod 'Capacitor', :path => '${relativeCapacitoriOSPath}'
-  pod 'CapacitorCordova', :path => '${relativeCapacitoriOSPath}'
-${pods.join('').trimRight()}`;
-}
-function getFrameworkName(framework) {
-    if (isFramework(framework)) {
-        if (framework.$.custom && framework.$.custom === 'true') {
-            return framework.$.src;
-        }
-        return framework.$.src.substr(0, framework.$.src.indexOf('.'));
-    }
-    return framework.$.src.substr(0, framework.$.src.indexOf('.')).replace('lib', '');
-}
-function isFramework(framework) {
-    return framework.$.src.split('.').pop().includes('framework');
-}
-async function generateCordovaPodspecs(cordovaPlugins, config) {
-    const staticPlugins = cordovaPlugins.filter((p) => (0, cordova_1.needsStaticPod)(p));
-    const noStaticPlugins = cordovaPlugins.filter((el) => !staticPlugins.includes(el));
-    generateCordovaPodspec(noStaticPlugins, config, false);
-    generateCordovaPodspec(staticPlugins, config, true);
-}
-async function generateCordovaPodspec(cordovaPlugins, config, isStatic) {
-    const weakFrameworks = [];
-    const linkedFrameworks = [];
-    const customFrameworks = [];
-    const systemLibraries = [];
-    const sourceFrameworks = [];
-    const frameworkDeps = [];
-    const compilerFlags = [];
-    let prefsArray = [];
-    let name = 'CordovaPlugins';
-    let sourcesFolderName = 'sources';
-    if (isStatic) {
-        name += 'Static';
-        frameworkDeps.push('s.static_framework = true');
-        sourcesFolderName += 'static';
-    }
-    cordovaPlugins.map((plugin) => {
-        const frameworks = (0, plugin_1.getPlatformElement)(plugin, platform, 'framework');
-        frameworks.map((framework) => {
-            if (!framework.$.type) {
-                const name = getFrameworkName(framework);
-                if (isFramework(framework)) {
-                    if (framework.$.weak && framework.$.weak === 'true') {
-                        if (!weakFrameworks.includes(name)) {
-                            weakFrameworks.push(name);
-                        }
-                    }
-                    else if (framework.$.custom && framework.$.custom === 'true') {
-                        const frameworktPath = (0, path_1.join)(sourcesFolderName, plugin.name, name);
-                        if (!customFrameworks.includes(frameworktPath)) {
-                            customFrameworks.push(frameworktPath);
-                        }
-                    }
-                    else {
-                        if (!linkedFrameworks.includes(name)) {
-                            linkedFrameworks.push(name);
-                        }
-                    }
-                }
-                else {
-                    if (!systemLibraries.includes(name)) {
-                        systemLibraries.push(name);
-                    }
-                }
-            }
-            else if (framework.$.type && framework.$.type === 'podspec') {
-                let depString = `s.dependency '${framework.$.src}'`;
-                if (framework.$.spec && framework.$.spec !== '') {
-                    depString += `, '${framework.$.spec}'`;
-                }
-                if (!frameworkDeps.includes(depString)) {
-                    frameworkDeps.push(depString);
-                }
-            }
-        });
-        prefsArray = prefsArray.concat((0, plugin_1.getAllElements)(plugin, platform, 'preference'));
-        const podspecs = (0, plugin_1.getPlatformElement)(plugin, platform, 'podspec');
-        podspecs.map((podspec) => {
-            podspec.pods.map((pods) => {
-                pods.pod.map((pod) => {
-                    let depString = `s.dependency '${pod.$.name}'`;
-                    if (pod.$.spec && pod.$.spec !== '') {
-                        depString += `, '${pod.$.spec}'`;
-                    }
-                    if (!frameworkDeps.includes(depString)) {
-                        frameworkDeps.push(depString);
-                    }
-                });
-            });
-        });
-        const sourceFiles = (0, plugin_1.getPlatformElement)(plugin, platform, 'source-file');
-        sourceFiles.map((sourceFile) => {
-            if (sourceFile.$.framework && sourceFile.$.framework === 'true') {
-                let fileName = sourceFile.$.src.split('/').pop();
-                if (!fileName.startsWith('lib')) {
-                    fileName = 'lib' + fileName;
-                }
-                const frameworktPath = (0, path_1.join)(sourcesFolderName, plugin.name, fileName);
-                if (!sourceFrameworks.includes(frameworktPath)) {
-                    sourceFrameworks.push(frameworktPath);
-                }
-            }
-            else if (sourceFile.$['compiler-flags']) {
-                const cFlag = sourceFile.$['compiler-flags'];
-                if (!compilerFlags.includes(cFlag)) {
-                    compilerFlags.push(cFlag);
-                }
-            }
-        });
-    });
-    const onlySystemLibraries = systemLibraries.filter((library) => removeNoSystem(library, sourceFrameworks));
-    if (weakFrameworks.length > 0) {
-        frameworkDeps.push(`s.weak_frameworks = '${weakFrameworks.join(`', '`)}'`);
-    }
-    if (linkedFrameworks.length > 0) {
-        frameworkDeps.push(`s.frameworks = '${linkedFrameworks.join(`', '`)}'`);
-    }
-    if (onlySystemLibraries.length > 0) {
-        frameworkDeps.push(`s.libraries = '${onlySystemLibraries.join(`', '`)}'`);
-    }
-    if (customFrameworks.length > 0) {
-        frameworkDeps.push(`s.vendored_frameworks = '${customFrameworks.join(`', '`)}'`);
-        frameworkDeps.push(`s.exclude_files = 'sources/**/*.framework/Headers/*.h', 'sources/**/*.framework/PrivateHeaders/*.h'`);
-    }
-    if (sourceFrameworks.length > 0) {
-        frameworkDeps.push(`s.vendored_libraries = '${sourceFrameworks.join(`', '`)}'`);
-    }
-    if (compilerFlags.length > 0) {
-        frameworkDeps.push(`s.compiler_flags = '${compilerFlags.join(' ')}'`);
-    }
-    const arcPlugins = cordovaPlugins.filter(filterARCFiles);
-    if (arcPlugins.length > 0) {
-        frameworkDeps.push(`s.subspec 'noarc' do |sna|
-      sna.requires_arc = false
-      sna.source_files = 'noarc/**/*.{swift,h,m,c,cc,mm,cpp}'
-    end`);
+    let podfileString = '\n';
+    podfileString += `  pod 'Capacitor', :path => '${relativeCapacitoriOSPath}'\n`;
+    if (enableCordova) {
+        podfileString += `  pod 'CapacitorCordova', :path => '${relativeCapacitoriOSPath}'\n`;
+        podfileString += cordovaPodlines.join('').trimEnd() + '\n';
     }
-    let frameworksString = frameworkDeps.join('\n    ');
-    frameworksString = await replaceFrameworkVariables(config, prefsArray, frameworksString);
-    const content = `
-  Pod::Spec.new do |s|
-    s.name = '${name}'
-    s.version = '${config.cli.package.version}'
-    s.summary = 'Autogenerated spec'
-    s.license = 'Unknown'
-    s.homepage = 'https://example.com'
-    s.authors = { 'Capacitor Generator' => 'hi@example.com' }
-    s.source = { :git => 'https://github.com/ionic-team/does-not-exist.git', :tag => '${config.cli.package.version}' }
-    s.source_files = '${sourcesFolderName}/**/*.{swift,h,m,c,cc,mm,cpp}'
-    s.ios.deployment_target  = '${config.ios.minVersion}'
-    s.xcconfig = {'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1 WK_WEB_VIEW_ONLY=1' }
-    s.dependency 'CapacitorCordova'${getLinkerFlags(config)}
-    s.swift_version  = '5.1'
-    ${frameworksString}
-  end`;
-    await (0, fs_extra_1.writeFile)((0, path_1.join)(config.ios.cordovaPluginsDirAbs, `${name}.podspec`), content);
-}
-function getLinkerFlags(config) {
-    var _a;
-    if ((_a = config.app.extConfig.ios) === null || _a === void 0 ? void 0 : _a.cordovaLinkerFlags) {
-        return `\n    s.pod_target_xcconfig = { 'OTHER_LDFLAGS' => '${config.app.extConfig.ios.cordovaLinkerFlags.join(' ')}' }`;
-    }
-    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 (!isSPM && (0, cordova_1.needsStaticPod)(p)) {
-            sourcesFolderName += 'static';
-        }
-        const sourcesFolder = (0, path_1.join)(config.ios.cordovaPluginsDirAbs, sourcesFolderName, p.name);
-        for (const codeFile of codeFiles) {
-            let fileName = codeFile.$.src.split('/').pop();
-            const fileExt = codeFile.$.src.split('.').pop();
-            if (fileExt === 'a' && !fileName.startsWith('lib')) {
-                fileName = 'lib' + fileName;
-            }
-            let destFolder = sourcesFolderName;
-            if (!isSPM && codeFile.$['compiler-flags'] && codeFile.$['compiler-flags'] === '-fno-objc-arc') {
-                destFolder = 'noarc';
-            }
-            const filePath = (0, plugin_1.getFilePath)(config, p, codeFile.$.src);
-            const fileDest = (0, path_1.join)(config.ios.cordovaPluginsDirAbs, destFolder, p.name, fileName);
-            await (0, fs_extra_1.copy)(filePath, fileDest);
-            if (!codeFile.$.framework) {
-                let fileContent = await (0, fs_extra_1.readFile)(fileDest, { encoding: 'utf-8' });
-                if (fileExt === 'swift') {
-                    fileContent = 'import Cordova\n' + fileContent;
-                    await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
-                }
-                else {
-                    if (fileContent.includes('@import Firebase;')) {
-                        fileContent = fileContent.replace('@import Firebase;', '#import <Firebase/Firebase.h>');
-                        await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
-                    }
-                    if (fileContent.includes('[NSBundle bundleForClass:[self class]]') ||
-                        fileContent.includes('[NSBundle bundleForClass:[CDVCapture class]]')) {
-                        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')) {
-                        fileContent = fileContent.replace(/\[self.webView superview\]/g, 'self.viewController.view');
-                        fileContent = fileContent.replace(/self.webView.superview/g, 'self.viewController.view');
-                        await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
-                    }
-                }
-            }
-        }
-        const resourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'resource-file');
-        for (const resourceFile of resourceFiles) {
-            const fileName = resourceFile.$.src.split('/').pop();
-            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') {
-                await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, framework.$.src), (0, path_1.join)(sourcesFolder, framework.$.src));
-            }
-        }
-    }
-}
-async function removePluginsNativeFiles(config) {
-    await (0, fs_extra_1.remove)(config.ios.cordovaPluginsDirAbs);
-    await (0, template_1.extractTemplate)(config.cli.assets.ios.cordovaPluginsTemplateArchiveAbs, config.ios.cordovaPluginsDirAbs);
-}
-function filterResources(plugin) {
-    const resources = (0, plugin_1.getPlatformElement)(plugin, platform, 'resource-file');
-    return resources.length > 0;
-}
-function filterARCFiles(plugin) {
-    const sources = (0, plugin_1.getPlatformElement)(plugin, platform, 'source-file');
-    const sourcesARC = sources.filter((sourceFile) => sourceFile.$['compiler-flags'] && sourceFile.$['compiler-flags'] === '-fno-objc-arc');
-    return sourcesARC.length > 0;
-}
-function removeNoSystem(library, sourceFrameworks) {
-    const libraries = sourceFrameworks.filter((framework) => framework.includes(library));
-    return libraries.length === 0;
+    podfileString += pods.join('').trimEnd();
+    return podfileString;
 }
 async function getPluginsTask(config) {
     return await (0, common_1.runTask)('Updating iOS plugins', async () => {
@@ -596,9 +135,3 @@ async function getPluginsTask(config) {
         return iosPlugins;
     });
 }
-async function replaceFrameworkVariables(config, prefsArray, frameworkString) {
-    prefsArray.map((preference) => {
-        frameworkString = frameworkString.replace(new RegExp(('$' + preference.$.name).replace('$', '\\$&'), 'g'), preference.$.default);
-    });
-    return frameworkString;
-}

package/dist/tasks/migrate.js

@@ -4,7 +4,7 @@ exports.setAllStringIn = exports.migrateCommand = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const rimraf_1 = require("rimraf");
+const rimraf_1 = tslib_1.__importDefault(require("rimraf"));
 const semver_1 = require("semver");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
@@ -233,7 +233,7 @@ async function migrateCommand(config, noprompt, packagemanager) {
                         }
                     })();
                 });
-                rimraf_1.rimraf.sync((0, path_1.join)(config.android.appDirAbs, 'build'));
+                rimraf_1.default.sync((0, path_1.join)(config.android.appDirAbs, 'build'));
             }
             // Write all breaking changes
             await (0, common_1.runTask)(`Writing breaking changes.`, () => {
@@ -289,7 +289,7 @@ async function installLatestLibs(dependencyManager, runInstall, config) {
         encoding: 'utf-8',
     });
     if (runInstall) {
-        rimraf_1.rimraf.sync((0, path_1.join)(config.app.rootDir, 'node_modules/@capacitor/!(cli)'));
+        rimraf_1.default.sync((0, path_1.join)(config.app.rootDir, 'node_modules/@capacitor/!(cli)'));
         await (0, subprocess_1.runCommand)(dependencyManager, ['install']);
         if (dependencyManager == 'yarn') {
             await (0, subprocess_1.runCommand)(dependencyManager, ['upgrade']);

package/dist/tasks/run.js

@@ -16,9 +16,6 @@ const sync_1 = require("./sync");
 async function runCommand(config, selectedPlatformName, options) {
     var _a, _b, _c;
     options.host = (_b = (_a = options.host) !== null && _a !== void 0 ? _a : livereload_1.CapLiveReloadHelper.getIpAddress()) !== null && _b !== void 0 ? _b : 'localhost';
-    if (!options.https && !options.port) {
-        options.port = '3000';
-    }
     if (selectedPlatformName && !(await (0, common_1.isValidPlatform)(selectedPlatformName))) {
         const platformDir = (0, common_1.resolvePlatform)(config, selectedPlatformName);
         if (platformDir) {

package/dist/util/cordova-ios.js

@@ -0,0 +1,357 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateCordovaPackageFile = exports.generateCordovaPackageFiles = exports.cordovaPodfileLines = exports.filterARCFiles = exports.removePluginsNativeFiles = exports.copyPluginsNativeFiles = exports.generateCordovaPodspecs = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const common_1 = require("../common");
+const cordova_1 = require("../cordova");
+const common_2 = require("../ios/common");
+const plugin_1 = require("../plugin");
+const template_1 = require("../util/template");
+const platform = 'ios';
+async function generateCordovaPodspecs(cordovaPlugins, config) {
+    const staticPlugins = cordovaPlugins.filter((p) => (0, cordova_1.needsStaticPod)(p));
+    const noStaticPlugins = cordovaPlugins.filter((el) => !staticPlugins.includes(el));
+    generateCordovaPodspec(noStaticPlugins, config, false);
+    generateCordovaPodspec(staticPlugins, config, true);
+}
+exports.generateCordovaPodspecs = generateCordovaPodspecs;
+async function generateCordovaPodspec(cordovaPlugins, config, isStatic) {
+    const weakFrameworks = [];
+    const linkedFrameworks = [];
+    const customFrameworks = [];
+    const systemLibraries = [];
+    const sourceFrameworks = [];
+    const frameworkDeps = [];
+    const compilerFlags = [];
+    let prefsArray = [];
+    let name = 'CordovaPlugins';
+    let sourcesFolderName = 'sources';
+    if (isStatic) {
+        name += 'Static';
+        frameworkDeps.push('s.static_framework = true');
+        sourcesFolderName += 'static';
+    }
+    cordovaPlugins.map((plugin) => {
+        const frameworks = (0, plugin_1.getPlatformElement)(plugin, platform, 'framework');
+        frameworks.map((framework) => {
+            if (!framework.$.type) {
+                const name = getFrameworkName(framework);
+                if (isFramework(framework)) {
+                    if (framework.$.weak && framework.$.weak === 'true') {
+                        if (!weakFrameworks.includes(name)) {
+                            weakFrameworks.push(name);
+                        }
+                    }
+                    else if (framework.$.custom && framework.$.custom === 'true') {
+                        const frameworktPath = (0, path_1.join)(sourcesFolderName, plugin.name, name);
+                        if (!customFrameworks.includes(frameworktPath)) {
+                            customFrameworks.push(frameworktPath);
+                        }
+                    }
+                    else {
+                        if (!linkedFrameworks.includes(name)) {
+                            linkedFrameworks.push(name);
+                        }
+                    }
+                }
+                else {
+                    if (!systemLibraries.includes(name)) {
+                        systemLibraries.push(name);
+                    }
+                }
+            }
+            else if (framework.$.type && framework.$.type === 'podspec') {
+                let depString = `s.dependency '${framework.$.src}'`;
+                if (framework.$.spec && framework.$.spec !== '') {
+                    depString += `, '${framework.$.spec}'`;
+                }
+                if (!frameworkDeps.includes(depString)) {
+                    frameworkDeps.push(depString);
+                }
+            }
+        });
+        prefsArray = prefsArray.concat((0, plugin_1.getAllElements)(plugin, platform, 'preference'));
+        const podspecs = (0, plugin_1.getPlatformElement)(plugin, platform, 'podspec');
+        podspecs.map((podspec) => {
+            podspec.pods.map((pods) => {
+                pods.pod.map((pod) => {
+                    let depString = `s.dependency '${pod.$.name}'`;
+                    if (pod.$.spec && pod.$.spec !== '') {
+                        depString += `, '${pod.$.spec}'`;
+                    }
+                    if (!frameworkDeps.includes(depString)) {
+                        frameworkDeps.push(depString);
+                    }
+                });
+            });
+        });
+        const sourceFiles = (0, plugin_1.getPlatformElement)(plugin, platform, 'source-file');
+        sourceFiles.map((sourceFile) => {
+            if (sourceFile.$.framework && sourceFile.$.framework === 'true') {
+                let fileName = sourceFile.$.src.split('/').pop();
+                if (!fileName.startsWith('lib')) {
+                    fileName = 'lib' + fileName;
+                }
+                const frameworktPath = (0, path_1.join)(sourcesFolderName, plugin.name, fileName);
+                if (!sourceFrameworks.includes(frameworktPath)) {
+                    sourceFrameworks.push(frameworktPath);
+                }
+            }
+            else if (sourceFile.$['compiler-flags']) {
+                const cFlag = sourceFile.$['compiler-flags'];
+                if (!compilerFlags.includes(cFlag)) {
+                    compilerFlags.push(cFlag);
+                }
+            }
+        });
+    });
+    const onlySystemLibraries = systemLibraries.filter((library) => removeNoSystem(library, sourceFrameworks));
+    if (weakFrameworks.length > 0) {
+        frameworkDeps.push(`s.weak_frameworks = '${weakFrameworks.join(`', '`)}'`);
+    }
+    if (linkedFrameworks.length > 0) {
+        frameworkDeps.push(`s.frameworks = '${linkedFrameworks.join(`', '`)}'`);
+    }
+    if (onlySystemLibraries.length > 0) {
+        frameworkDeps.push(`s.libraries = '${onlySystemLibraries.join(`', '`)}'`);
+    }
+    if (customFrameworks.length > 0) {
+        frameworkDeps.push(`s.vendored_frameworks = '${customFrameworks.join(`', '`)}'`);
+        frameworkDeps.push(`s.exclude_files = 'sources/**/*.framework/Headers/*.h', 'sources/**/*.framework/PrivateHeaders/*.h'`);
+    }
+    if (sourceFrameworks.length > 0) {
+        frameworkDeps.push(`s.vendored_libraries = '${sourceFrameworks.join(`', '`)}'`);
+    }
+    if (compilerFlags.length > 0) {
+        frameworkDeps.push(`s.compiler_flags = '${compilerFlags.join(' ')}'`);
+    }
+    const arcPlugins = cordovaPlugins.filter(filterARCFiles);
+    if (arcPlugins.length > 0) {
+        frameworkDeps.push(`s.subspec 'noarc' do |sna|
+      sna.requires_arc = false
+      sna.source_files = 'noarc/**/*.{swift,h,m,c,cc,mm,cpp}'
+    end`);
+    }
+    let frameworksString = frameworkDeps.join('\n    ');
+    frameworksString = await replaceFrameworkVariables(config, prefsArray, frameworksString);
+    const content = `
+  Pod::Spec.new do |s|
+    s.name = '${name}'
+    s.version = '${config.cli.package.version}'
+    s.summary = 'Autogenerated spec'
+    s.license = 'Unknown'
+    s.homepage = 'https://example.com'
+    s.authors = { 'Capacitor Generator' => 'hi@example.com' }
+    s.source = { :git => 'https://github.com/ionic-team/does-not-exist.git', :tag => '${config.cli.package.version}' }
+    s.source_files = '${sourcesFolderName}/**/*.{swift,h,m,c,cc,mm,cpp}'
+    s.ios.deployment_target  = '${config.ios.minVersion}'
+    s.xcconfig = {'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1 WK_WEB_VIEW_ONLY=1' }
+    s.dependency 'CapacitorCordova'${getLinkerFlags(config)}
+    s.swift_version  = '5.1'
+    ${frameworksString}
+  end`;
+    await (0, fs_extra_1.writeFile)((0, path_1.join)(config.ios.cordovaPluginsDirAbs, `${name}.podspec`), content);
+}
+function getLinkerFlags(config) {
+    var _a;
+    if ((_a = config.app.extConfig.ios) === null || _a === void 0 ? void 0 : _a.cordovaLinkerFlags) {
+        return `\n    s.pod_target_xcconfig = { 'OTHER_LDFLAGS' => '${config.app.extConfig.ios.cordovaLinkerFlags.join(' ')}' }`;
+    }
+    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 (!isSPM && (0, cordova_1.needsStaticPod)(p)) {
+            sourcesFolderName += 'static';
+        }
+        const sourcesFolder = (0, path_1.join)(config.ios.cordovaPluginsDirAbs, sourcesFolderName, p.name);
+        for (const codeFile of codeFiles) {
+            let fileName = codeFile.$.src.split('/').pop();
+            const fileExt = codeFile.$.src.split('.').pop();
+            if (fileExt === 'a' && !fileName.startsWith('lib')) {
+                fileName = 'lib' + fileName;
+            }
+            let destFolder = sourcesFolderName;
+            if (!isSPM && codeFile.$['compiler-flags'] && codeFile.$['compiler-flags'] === '-fno-objc-arc') {
+                destFolder = 'noarc';
+            }
+            const filePath = (0, plugin_1.getFilePath)(config, p, codeFile.$.src);
+            const fileDest = (0, path_1.join)(config.ios.cordovaPluginsDirAbs, destFolder, p.name, fileName);
+            await (0, fs_extra_1.copy)(filePath, fileDest);
+            if (!codeFile.$.framework) {
+                let fileContent = await (0, fs_extra_1.readFile)(fileDest, { encoding: 'utf-8' });
+                if (fileExt === 'swift') {
+                    fileContent = 'import Cordova\n' + fileContent;
+                    await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
+                }
+                else {
+                    if (fileContent.includes('@import Firebase;')) {
+                        fileContent = fileContent.replace('@import Firebase;', '#import <Firebase/Firebase.h>');
+                        await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
+                    }
+                    if (fileContent.includes('[NSBundle bundleForClass:[self class]]') ||
+                        fileContent.includes('[NSBundle bundleForClass:[CDVCapture class]]')) {
+                        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')) {
+                        fileContent = fileContent.replace(/\[self.webView superview\]/g, 'self.viewController.view');
+                        fileContent = fileContent.replace(/self.webView.superview/g, 'self.viewController.view');
+                        await (0, fs_extra_1.writeFile)(fileDest, fileContent, { encoding: 'utf-8' });
+                    }
+                }
+            }
+        }
+        const resourceFiles = (0, plugin_1.getPlatformElement)(p, platform, 'resource-file');
+        for (const resourceFile of resourceFiles) {
+            const fileName = resourceFile.$.src.split('/').pop();
+            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') {
+                await (0, fs_extra_1.copy)((0, plugin_1.getFilePath)(config, p, framework.$.src), (0, path_1.join)(sourcesFolder, framework.$.src));
+            }
+        }
+    }
+}
+exports.copyPluginsNativeFiles = copyPluginsNativeFiles;
+async function removePluginsNativeFiles(config) {
+    await (0, fs_extra_1.remove)(config.ios.cordovaPluginsDirAbs);
+    await (0, template_1.extractTemplate)(config.cli.assets.ios.cordovaPluginsTemplateArchiveAbs, config.ios.cordovaPluginsDirAbs);
+}
+exports.removePluginsNativeFiles = removePluginsNativeFiles;
+function filterARCFiles(plugin) {
+    const sources = (0, plugin_1.getPlatformElement)(plugin, platform, 'source-file');
+    const sourcesARC = sources.filter((sourceFile) => sourceFile.$['compiler-flags'] && sourceFile.$['compiler-flags'] === '-fno-objc-arc');
+    return sourcesARC.length > 0;
+}
+exports.filterARCFiles = filterARCFiles;
+function removeNoSystem(library, sourceFrameworks) {
+    const libraries = sourceFrameworks.filter((framework) => framework.includes(library));
+    return libraries.length === 0;
+}
+async function replaceFrameworkVariables(config, prefsArray, frameworkString) {
+    prefsArray.map((preference) => {
+        frameworkString = frameworkString.replace(new RegExp(('$' + preference.$.name).replace('$', '\\$&'), 'g'), preference.$.default);
+    });
+    return frameworkString;
+}
+function getFrameworkName(framework) {
+    if (isFramework(framework)) {
+        if (framework.$.custom && framework.$.custom === 'true') {
+            return framework.$.src;
+        }
+        return framework.$.src.substr(0, framework.$.src.indexOf('.'));
+    }
+    return framework.$.src.substr(0, framework.$.src.indexOf('.')).replace('lib', '');
+}
+function isFramework(framework) {
+    return framework.$.src.split('.').pop().includes('framework');
+}
+function cordovaPodfileLines(config, plugins) {
+    const pods = [];
+    const cordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 1 /* PluginType.Cordova */);
+    cordovaPlugins.map(async (p) => {
+        const podspecs = (0, plugin_1.getPlatformElement)(p, platform, 'podspec');
+        podspecs.map((podspec) => {
+            podspec.pods.map((pPods) => {
+                pPods.pod.map((pod) => {
+                    if (pod.$.git) {
+                        let gitRef = '';
+                        if (pod.$.tag) {
+                            gitRef = `, :tag => '${pod.$.tag}'`;
+                        }
+                        else if (pod.$.branch) {
+                            gitRef = `, :branch => '${pod.$.branch}'`;
+                        }
+                        else if (pod.$.commit) {
+                            gitRef = `, :commit => '${pod.$.commit}'`;
+                        }
+                        pods.push(`  pod '${pod.$.name}', :git => '${pod.$.git}'${gitRef}\n`);
+                    }
+                });
+            });
+        });
+    });
+    const staticPlugins = cordovaPlugins.filter((p) => (0, cordova_1.needsStaticPod)(p));
+    const noStaticPlugins = cordovaPlugins.filter((el) => !staticPlugins.includes(el));
+    if (noStaticPlugins.length > 0) {
+        pods.push(`  pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'\n`);
+    }
+    if (staticPlugins.length > 0) {
+        pods.push(`  pod 'CordovaPluginsStatic', :path => '../capacitor-cordova-ios-plugins'\n`);
+    }
+    const resourcesPlugins = cordovaPlugins.filter(filterResources);
+    if (resourcesPlugins.length > 0) {
+        pods.push(`  pod 'CordovaPluginsResources', :path => '../capacitor-cordova-ios-plugins'\n`);
+    }
+    return pods;
+}
+exports.cordovaPodfileLines = cordovaPodfileLines;
+function filterResources(plugin) {
+    const resources = (0, plugin_1.getPlatformElement)(plugin, platform, 'resource-file');
+    return resources.length > 0;
+}
+async function generateCordovaPackageFiles(cordovaPlugins, config) {
+    cordovaPlugins.map((plugin) => {
+        generateCordovaPackageFile(plugin, config);
+    });
+}
+exports.generateCordovaPackageFiles = generateCordovaPackageFiles;
+async function generateCordovaPackageFile(p, config) {
+    const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
+    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 content = `// swift-tools-version: 5.9
+
+import PackageDescription
+
+let package = Package(
+    name: "${p.name}",
+    platforms: [.iOS(.v${iosVersion})],
+    products: [
+        .library(
+            name: "${p.name}",
+            targets: ["${p.name}"]
+        )
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "${iosPlatformVersion}")
+    ],
+    targets: [
+        .target(
+            name: "${p.name}",
+            dependencies: [
+                .product(name: "Cordova", package: "capacitor-swift-pm")
+            ],
+            path: "."${headersText}
+        )
+    ]
+)`;
+    await (0, fs_extra_1.writeFile)((0, path_1.join)(config.ios.cordovaPluginsDirAbs, 'sources', p.name, 'Package.swift'), content);
+}
+exports.generateCordovaPackageFile = generateCordovaPackageFile;

package/dist/util/iosplugin.js

@@ -60,6 +60,7 @@ async function generateIOSPackageJSON(config, plugins) {
     const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, 'ios');
     if (cordovaPlugins.length > 0) {
         classList.push('CDVPlugin');
+        classList.push('CordovaPlugin');
     }
     writePluginJSON(config, classList);
 }

package/dist/util/livereload.js

@@ -93,8 +93,7 @@ class CapLiveReload {
             .filter(Boolean);
         return !all.length ? loopback(family) : all[0];
     }
-    // TODO remove on next major as it's unused
-    async editExtConfigForLiveReload(config, platformName, options, rootConfigChange = false) {
+    async editCapConfigForLiveReload(config, platformName, options) {
         const platformAbsPath = platformName == config.ios.name
             ? config.ios.nativeTargetDirAbs
             : platformName == config.android.name
@@ -102,30 +101,7 @@ class CapLiveReload {
                 : null;
         if (platformAbsPath == null)
             throw new Error('Platform not found.');
-        const capConfigPath = rootConfigChange
-            ? config.app.extConfigFilePath
-            : (0, path_1.join)(platformAbsPath, 'capacitor.config.json');
-        const configJson = { ...config.app.extConfig };
-        this.configJsonToRevertTo.json = JSON.stringify(configJson, null, 2);
-        this.configJsonToRevertTo.platformPath = capConfigPath;
-        const url = `http://${options.host}:${options.port}`;
-        configJson.server = {
-            url,
-        };
-        return configJson;
-    }
-    // TODO remove rootConfigChange param on next major as it's unused
-    async editCapConfigForLiveReload(config, platformName, options, rootConfigChange = false) {
-        const platformAbsPath = platformName == config.ios.name
-            ? config.ios.nativeTargetDirAbs
-            : platformName == config.android.name
-                ? config.android.assetsDirAbs
-                : null;
-        if (platformAbsPath == null)
-            throw new Error('Platform not found.');
-        const capConfigPath = rootConfigChange
-            ? config.app.extConfigFilePath
-            : (0, path_1.join)(platformAbsPath, 'capacitor.config.json');
+        const capConfigPath = (0, path_1.join)(platformAbsPath, 'capacitor.config.json');
         const configJson = (0, fs_extra_1.readJSONSync)(capConfigPath);
         this.configJsonToRevertTo.json = JSON.stringify(configJson, null, 2);
         this.configJsonToRevertTo.platformPath = capConfigPath;

package/dist/util/spm.js

@@ -7,6 +7,7 @@ const path_1 = require("path");
 const plist_1 = require("plist");
 const tar_1 = require("tar");
 const common_1 = require("../common");
+const cordova_1 = require("../cordova");
 const errors_1 = require("../errors");
 const common_2 = require("../ios/common");
 const log_1 = require("../log");
@@ -87,6 +88,8 @@ async function generatePackageText(config, plugins) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
     const iosVersion = (0, common_2.getMajoriOSVersion)(config);
+    const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, 'ios');
+    const enableCordova = cordovaPlugins.length > 0;
     const packageTraits = (_d = (_c = (_b = (_a = config.app.extConfig.experimental) === null || _a === void 0 ? void 0 : _a.ios) === null || _b === void 0 ? void 0 : _b.spm) === null || _c === void 0 ? void 0 : _c.packageTraits) !== null && _d !== void 0 ? _d : {};
     const swiftToolsVersion = (_h = (_g = (_f = (_e = config.app.extConfig.experimental) === null || _e === void 0 ? void 0 : _e.ios) === null || _f === void 0 ? void 0 : _f.spm) === null || _g === void 0 ? void 0 : _g.swiftToolsVersion) !== null && _h !== void 0 ? _h : '5.9';
     let packageSwiftText = `// swift-tools-version: ${swiftToolsVersion}
@@ -139,8 +142,10 @@ let package = Package(
         .target(
             name: "CapApp-SPM",
             dependencies: [
-                .product(name: "Capacitor", package: "capacitor-swift-pm"),
-                .product(name: "Cordova", package: "capacitor-swift-pm")`;
+                .product(name: "Capacitor", package: "capacitor-swift-pm"),`;
+    if (enableCordova) {
+        packageSwiftText += `                .product(name: "Cordova", package: "capacitor-swift-pm")`;
+    }
     for (const plugin of plugins) {
         let pluginText = `,\n                .product(name: "${(_l = plugin.ios) === null || _l === void 0 ? void 0 : _l.name}", package: "${(_m = plugin.ios) === null || _m === void 0 ? void 0 : _m.name}")`;
         if ((0, plugin_1.getPluginType)(plugin, config.ios.name) === 1 /* PluginType.Cordova */) {

package/package.json

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