@capacitor/cli 3.2.1 → 3.2.5

package/CHANGELOG.md

@@ -3,6 +3,48 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.2.5](https://github.com/ionic-team/capacitor/compare/3.2.4...3.2.5) (2021-10-13)
+
+
+### Bug Fixes
+
+* **cli:** create only static pod if needed ([#5099](https://github.com/ionic-team/capacitor/issues/5099)) ([8304744](https://github.com/ionic-team/capacitor/commit/83047445562a52cc927c7c77d55b48288cfc1fcc))
+
+
+
+
+
+## [3.2.4](https://github.com/ionic-team/capacitor/compare/3.2.3...3.2.4) (2021-09-27)
+
+
+### Bug Fixes
+
+* **cli:** await sync on add to avoid telemetry hang ([833bc20](https://github.com/ionic-team/capacitor/commit/833bc20525a2558e03cd0e56c6765ce6828cdfac))
+
+
+
+
+
+## [3.2.3](https://github.com/ionic-team/capacitor/compare/3.2.2...3.2.3) (2021-09-15)
+
+
+### Bug Fixes
+
+* Add SalesforceMobileSDK-CordovaPlugin to iOS incompatible list ([#5031](https://github.com/ionic-team/capacitor/issues/5031)) ([6f3f79f](https://github.com/ionic-team/capacitor/commit/6f3f79f412b77b0c90988226ec5ade5d0198c706))
+* Define cordovaConfig gradle variable ([#5024](https://github.com/ionic-team/capacitor/issues/5024)) ([55c217e](https://github.com/ionic-team/capacitor/commit/55c217e6898d0270c23c3a7158a5102e9b84ff40))
+
+
+
+
+
+## [3.2.2](https://github.com/ionic-team/capacitor/compare/3.2.1...3.2.2) (2021-09-02)
+
+**Note:** Version bump only for package @capacitor/cli
+
+
+
+
+
 ## [3.2.1](https://github.com/ionic-team/capacitor/compare/3.2.0...3.2.1) (2021-09-01)
 
 **Note:** Version bump only for package @capacitor/cli

package/dist/android/update.js

@@ -201,6 +201,7 @@ ext {
   cdvMinSdkVersion = project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : ${config.android.minVersion}
   // Plugin gradle extensions can append to this to have code run at the end.
   cdvPluginPostBuildExtras = []
+  cordovaConfig = [:]
 }`;
     await utils_fs_1.writeFile(path_1.join(config.android.cordovaPluginsDirAbs, 'cordova.variables.gradle'), cordovaVariables);
 }

package/dist/cordova.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeCordovaAndroidManifest = exports.getCordovaPreferences = exports.getIncompatibleCordovaPlugins = exports.checkPluginDependencies = exports.logCordovaManualSteps = exports.getCordovaPlugins = exports.handleCordovaPluginsJS = exports.autoGenerateConfig = exports.removePluginFiles = exports.createEmptyCordovaJS = exports.copyCordovaJS = exports.copyPluginsJS = exports.generateCordovaPluginsJSFile = void 0;
+exports.writeCordovaAndroidManifest = exports.getCordovaPreferences = exports.needsStaticPod = exports.getIncompatibleCordovaPlugins = exports.checkPluginDependencies = exports.logCordovaManualSteps = exports.getCordovaPlugins = exports.handleCordovaPluginsJS = exports.autoGenerateConfig = exports.removePluginFiles = exports.createEmptyCordovaJS = exports.copyCordovaJS = exports.copyPluginsJS = exports.generateCordovaPluginsJSFile = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
 const path_1 = require("path");
@@ -368,7 +368,7 @@ function getIncompatibleCordovaPlugins(platform) {
         'cordova-support-google-services',
     ];
     if (platform === 'ios') {
-        pluginList.push('cordova-plugin-statusbar', '@ionic-enterprise/statusbar');
+        pluginList.push('cordova-plugin-statusbar', '@ionic-enterprise/statusbar', 'SalesforceMobileSDK-CordovaPlugin');
     }
     if (platform === 'android') {
         pluginList.push('cordova-plugin-compat');
@@ -376,6 +376,15 @@ function getIncompatibleCordovaPlugins(platform) {
     return pluginList;
 }
 exports.getIncompatibleCordovaPlugins = getIncompatibleCordovaPlugins;
+function needsStaticPod(plugin) {
+    const pluginList = [
+        'phonegap-plugin-push',
+        '@havesource/cordova-plugin-push',
+        'cordova-plugin-firebasex',
+    ];
+    return pluginList.includes(plugin.id);
+}
+exports.needsStaticPod = needsStaticPod;
 async function getCordovaPreferences(config) {
     var _a, _b, _c, _d, _e;
     const configXml = path_1.join(config.app.rootDir, 'config.xml');

package/dist/ios/update.js

@@ -103,19 +103,14 @@ async function generatePodFile(config, plugins) {
             });
         });
     });
-    const noPodPlugins = cordovaPlugins.filter(filterNoPods);
-    if (noPodPlugins.length > 0) {
+    const staticPlugins = cordovaPlugins.filter(cordova_1.needsStaticPod);
+    const noStaticPlugins = cordovaPlugins.filter(el => !staticPlugins.includes(el));
+    if (noStaticPlugins.length > 0) {
         pods.push(`  pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'\n`);
     }
-    const podPlugins = cordovaPlugins.filter(el => !noPodPlugins.includes(el));
-    const podSwiftPlugins = podPlugins.filter(filterSwift);
-    const podObjCPlugins = podPlugins.filter(el => !podSwiftPlugins.includes(el));
-    if (podObjCPlugins.length > 0) {
+    if (staticPlugins.length > 0) {
         pods.push(`  pod 'CordovaPluginsStatic', :path => '../capacitor-cordova-ios-plugins'\n`);
     }
-    if (podSwiftPlugins.length > 0) {
-        pods.push(`  pod 'CordovaPluginsStaticSwift', :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`);
@@ -140,15 +135,12 @@ function isFramework(framework) {
     return framework.$.src.split('.').pop().includes('framework');
 }
 async function generateCordovaPodspecs(cordovaPlugins, config) {
-    const noPodPlugins = cordovaPlugins.filter(filterNoPods);
-    const podPlugins = cordovaPlugins.filter(el => !noPodPlugins.includes(el));
-    const podSwiftPlugins = podPlugins.filter(filterSwift);
-    const podObjCPlugins = podPlugins.filter(el => !podSwiftPlugins.includes(el));
-    generateCordovaPodspec(noPodPlugins, config, false, false);
-    generateCordovaPodspec(podObjCPlugins, config, true, false);
-    generateCordovaPodspec(podSwiftPlugins, config, true, true);
+    const staticPlugins = cordovaPlugins.filter(cordova_1.needsStaticPod);
+    const noStaticPlugins = cordovaPlugins.filter(el => !staticPlugins.includes(el));
+    generateCordovaPodspec(noStaticPlugins, config, false);
+    generateCordovaPodspec(staticPlugins, config, true);
 }
-async function generateCordovaPodspec(cordovaPlugins, config, isStatic, isSwift) {
+async function generateCordovaPodspec(cordovaPlugins, config, isStatic) {
     const weakFrameworks = [];
     const linkedFrameworks = [];
     const customFrameworks = [];
@@ -164,10 +156,6 @@ async function generateCordovaPodspec(cordovaPlugins, config, isStatic, isSwift)
         frameworkDeps.push('s.static_framework = true');
         sourcesFolderName += 'static';
     }
-    if (isSwift) {
-        name += 'Swift';
-        sourcesFolderName += 'swift';
-    }
     cordovaPlugins.map((plugin) => {
         const frameworks = plugin_1.getPlatformElement(plugin, platform, 'framework');
         frameworks.map((framework) => {
@@ -302,14 +290,9 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
         const headerFiles = plugin_1.getPlatformElement(p, platform, 'header-file');
         const codeFiles = sourceFiles.concat(headerFiles);
         const frameworks = plugin_1.getPlatformElement(p, platform, 'framework');
-        const podFrameworks = frameworks.filter((framework) => framework.$.type && framework.$.type === 'podspec');
-        const podspecs = plugin_1.getPlatformElement(p, platform, 'podspec');
         let sourcesFolderName = 'sources';
-        if (podFrameworks.length > 0 || podspecs.length > 0) {
+        if (cordova_1.needsStaticPod(p)) {
             sourcesFolderName += 'static';
-            if (filterSwift(p)) {
-                sourcesFolderName += 'swift';
-            }
         }
         const sourcesFolder = path_1.join(config.ios.cordovaPluginsDirAbs, sourcesFolderName, p.name);
         for (const codeFile of codeFiles) {
@@ -368,17 +351,6 @@ async function removePluginsNativeFiles(config) {
     await utils_fs_1.remove(config.ios.cordovaPluginsDirAbs);
     await template_1.extractTemplate(config.cli.assets.ios.cordovaPluginsTemplateArchiveAbs, config.ios.cordovaPluginsDirAbs);
 }
-function filterNoPods(plugin) {
-    const frameworks = plugin_1.getPlatformElement(plugin, platform, 'framework');
-    const podFrameworks = frameworks.filter((framework) => framework.$.type && framework.$.type === 'podspec');
-    const podspecs = plugin_1.getPlatformElement(plugin, platform, 'podspec');
-    return podFrameworks.length === 0 && podspecs.length === 0;
-}
-function filterSwift(plugin) {
-    const sourceFiles = plugin_1.getPlatformElement(plugin, platform, 'source-file');
-    const swiftFiles = sourceFiles.filter((sf) => sf.$.src && sf.$.src.split('.').pop() === 'swift');
-    return swiftFiles.length > 0;
-}
 function filterResources(plugin) {
     const resources = plugin_1.getPlatformElement(plugin, platform, 'resource-file');
     return resources.length > 0;

package/dist/tasks/add.js

@@ -55,7 +55,7 @@ async function addCommand(config, selectedPlatformName) {
             await doAdd(config, platformName);
             await editPlatforms(config, platformName);
             if (await utils_fs_1.pathExists(config.app.webDirAbs)) {
-                sync_1.sync(config, platformName, false);
+                await sync_1.sync(config, platformName, false);
             }
             else {
                 log_1.logger.warn(`${colors_1.default.success(colors_1.default.strong('sync'))} could not run--missing ${colors_1.default.strong(config.app.webDir)} directory.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "3.2.1",
+  "version": "3.2.5",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -52,12 +52,12 @@
     "debug": "^4.2.0",
     "env-paths": "^2.2.0",
     "kleur": "^4.1.1",
-    "native-run": "^1.4.0",
-    "open": "^7.1.0",
+    "native-run": "^1.5.0",
+    "open": "^7.4.2",
     "plist": "^3.0.2",
     "prompts": "^2.3.2",
     "semver": "^7.3.2",
-    "tar": "^6.0.5",
+    "tar": "^6.1.11",
     "tslib": "^2.1.0",
     "xml2js": "^0.4.23"
   },
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f088f6b88f3ba6d490b9df42b05d1ea36dab7b47"
+  "gitHead": "cc2960572ad70a0272c3ea1c44dbee14acf6e2ec"
 }