@capacitor/cli 3.2.2 → 3.3.0

package/CHANGELOG.md

@@ -3,6 +3,60 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.3.0](https://github.com/ionic-team/capacitor/compare/3.2.5...3.3.0) (2021-11-03)
+
+
+### Bug Fixes
+
+* **cli:** Add Batch plugin to static list ([#5138](https://github.com/ionic-team/capacitor/issues/5138)) ([9470633](https://github.com/ionic-team/capacitor/commit/94706338c096b30390fa288c9b107e253923a644))
+* **cli:** Add onesignal-cordova-plugin to static pod list ([#5143](https://github.com/ionic-team/capacitor/issues/5143)) ([937e240](https://github.com/ionic-team/capacitor/commit/937e2408f9bb60691e653b70d8b7cb02f540b251))
+* **cli:** detect and register multiple plugins from same package ([#5098](https://github.com/ionic-team/capacitor/issues/5098)) ([25e770c](https://github.com/ionic-team/capacitor/commit/25e770c3f598bf3a1e05e21d607ab3ad70268674))
+
+
+### Features
+
+* **cli:** add support for 'pod install' in VM based environments ([#5144](https://github.com/ionic-team/capacitor/issues/5144)) ([32ecf22](https://github.com/ionic-team/capacitor/commit/32ecf22de0a550756dbfa68b3b17c2333c89a430))
+* **cli:** Allow to configure access origin tags on cordova config.xml ([#5134](https://github.com/ionic-team/capacitor/issues/5134)) ([0841a09](https://github.com/ionic-team/capacitor/commit/0841a093bf73ed4acac9a90be44a8e8a3aedbcdb))
+* **cli:** Allow users to include Cordova plugins to the static list ([#5175](https://github.com/ionic-team/capacitor/issues/5175)) ([664149a](https://github.com/ionic-team/capacitor/commit/664149aadbe80e66dd757315a826ec1ab305edb9))
+
+
+
+
+
+## [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

package/dist/android/update.js

@@ -69,10 +69,12 @@ async function findAndroidPluginClassesInPlugin(plugin) {
     debug('Searching %O source files in %O by %O regex', srcFiles.length, srcPath, classRegex);
     const entries = await Promise.all(srcFiles.map(async (srcFile) => {
         const srcFileContents = await utils_fs_1.readFile(srcFile, { encoding: 'utf-8' });
+        classRegex.lastIndex = 0;
         const classMatch = classRegex.exec(srcFileContents);
         if (classMatch) {
             const className = classMatch[1];
             debug('Searching %O for package by %O regex', srcFile, packageRegex);
+            packageRegex.lastIndex = 0;
             const packageMatch = packageRegex.exec(srcFileContents.substring(0, classMatch.index));
             if (!packageMatch) {
                 errors_1.fatal(`Package could not be parsed from Android plugin.\n` +
@@ -201,6 +203,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");
@@ -152,7 +152,7 @@ async function removePluginFiles(config, platform) {
 }
 exports.removePluginFiles = removePluginFiles;
 async function autoGenerateConfig(config, cordovaPlugins, platform) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     let xmlDir = path_1.join(config.android.resDirAbs, 'xml');
     const fileName = 'config.xml';
     if (platform === 'ios') {
@@ -180,12 +180,22 @@ async function autoGenerateConfig(config, cordovaPlugins, platform) {
             }
         }
     });
+    let accessOriginString = [];
+    if ((_b = (_a = config.app.extConfig) === null || _a === void 0 ? void 0 : _a.cordova) === null || _b === void 0 ? void 0 : _b.accessOrigins) {
+        accessOriginString = await Promise.all(config.app.extConfig.cordova.accessOrigins.map(async (host) => {
+            return `
+  <access origin="${host}" />`;
+        }));
+    }
+    else {
+        accessOriginString.push(`<access origin="*" />`);
+    }
     const pluginEntriesString = await Promise.all(pluginEntries.map(async (item) => {
         const xmlString = await xml_1.writeXML(item);
         return xmlString;
     }));
     let pluginPreferencesString = [];
-    if ((_b = (_a = config.app.extConfig) === null || _a === void 0 ? void 0 : _a.cordova) === null || _b === void 0 ? void 0 : _b.preferences) {
+    if ((_d = (_c = config.app.extConfig) === null || _c === void 0 ? void 0 : _c.cordova) === null || _d === void 0 ? void 0 : _d.preferences) {
         pluginPreferencesString = await Promise.all(Object.entries(config.app.extConfig.cordova.preferences).map(async ([key, value]) => {
             return `
   <preference name="${key}" value="${value}" />`;
@@ -193,7 +203,7 @@ async function autoGenerateConfig(config, cordovaPlugins, platform) {
     }
     const content = `<?xml version='1.0' encoding='utf-8'?>
 <widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-  <access origin="*" />
+  ${accessOriginString.join('')}
   ${pluginEntriesString.join('')}
   ${pluginPreferencesString.join('')}
 </widget>`;
@@ -368,7 +378,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 +386,21 @@ function getIncompatibleCordovaPlugins(platform) {
     return pluginList;
 }
 exports.getIncompatibleCordovaPlugins = getIncompatibleCordovaPlugins;
+function needsStaticPod(plugin, config) {
+    var _a, _b, _c, _d;
+    let pluginList = [
+        'phonegap-plugin-push',
+        '@havesource/cordova-plugin-push',
+        'cordova-plugin-firebasex',
+        '@batch.com/cordova-plugin',
+        'onesignal-cordova-plugin',
+    ];
+    if ((_b = (_a = config.app.extConfig) === null || _a === void 0 ? void 0 : _a.cordova) === null || _b === void 0 ? void 0 : _b.staticPlugins) {
+        pluginList = pluginList.concat((_d = (_c = config.app.extConfig) === null || _c === void 0 ? void 0 : _c.cordova) === null || _d === void 0 ? void 0 : _d.staticPlugins);
+    }
+    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/declarations.d.ts

@@ -387,6 +387,15 @@ export interface CapacitorConfig {
         allowNavigation?: string[];
     };
     cordova?: {
+        /**
+         * Populates <access> tags in the config.xml with the origin set to
+         * the values entered here.
+         * If not provided, a single <access origin="*" /> tag gets included.
+         * It only has effect on a few Cordova plugins that respect the whitelist.
+         *
+         * @since 3.3.0
+         */
+        accessOrigins?: string[];
         /**
          * Configure Cordova preferences.
          *
@@ -395,6 +404,13 @@ export interface CapacitorConfig {
         preferences?: {
             [key: string]: string | undefined;
         };
+        /**
+         * List of Cordova plugins that need to be static but are not
+         * already in the static plugin list.
+         *
+         * @since 3.3.0
+         */
+        staticPlugins?: string[];
     };
     /**
      * Configure plugins.

package/dist/ios/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shouldPodInstall = exports.editProjectSettingsIOS = exports.resolvePlugin = exports.getIOSPlugins = exports.checkCocoaPods = exports.checkIOSPackage = void 0;
+exports.editProjectSettingsIOS = exports.resolvePlugin = exports.getIOSPlugins = exports.checkCocoaPods = exports.checkIOSPackage = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
 const path_1 = require("path");
@@ -69,11 +69,3 @@ async function editProjectSettingsIOS(config) {
     await utils_fs_1.writeFile(pbxPath, pbxContent, { encoding: 'utf-8' });
 }
 exports.editProjectSettingsIOS = editProjectSettingsIOS;
-function shouldPodInstall(config, platformName) {
-    // Don't run pod install or xcodebuild if not on macOS
-    if (config.cli.os !== "mac" /* Mac */ && platformName === 'ios') {
-        return false;
-    }
-    return true;
-}
-exports.shouldPodInstall = shouldPodInstall;

package/dist/ios/update.js

@@ -40,14 +40,9 @@ async function updateIOS(config, deployment) {
 }
 exports.updateIOS = updateIOS;
 async function installCocoaPodsPlugins(config, plugins, deployment) {
-    if (common_2.shouldPodInstall(config, platform)) {
-        await common_1.runTask(`Updating iOS native dependencies with ${colors_1.default.input(`${config.ios.podPath} install`)}`, () => {
-            return updatePodfile(config, plugins, deployment);
-        });
-    }
-    else {
-        log_1.logger.warn('Skipping pod install on unsupported OS');
-    }
+    await common_1.runTask(`Updating iOS native dependencies with ${colors_1.default.input(`${config.ios.podPath} install`)}`, () => {
+        return updatePodfile(config, plugins, deployment);
+    });
 }
 exports.installCocoaPodsPlugins = installCocoaPodsPlugins;
 async function updatePodfile(config, plugins, deployment) {
@@ -57,13 +52,25 @@ async function updatePodfile(config, plugins, deployment) {
     let podfileContent = await utils_fs_1.readFile(podfilePath, { encoding: 'utf-8' });
     podfileContent = podfileContent.replace(/(def capacitor_pods)[\s\S]+?(\nend)/, `$1${dependenciesContent}$2`);
     await utils_fs_1.writeFile(podfilePath, podfileContent, { encoding: 'utf-8' });
-    if (!deployment) {
-        await utils_fs_1.remove(podfileLockPath);
+    const podCommandExists = await subprocess_1.isInstalled('pod');
+    if (podCommandExists) {
+        if (!deployment) {
+            await utils_fs_1.remove(podfileLockPath);
+        }
+        await subprocess_1.runCommand(config.ios.podPath, ['install', ...(deployment ? ['--deployment'] : [])], { cwd: config.ios.nativeProjectDirAbs });
+    }
+    else {
+        log_1.logger.warn('Skipping pod install because CocoaPods is not installed');
+    }
+    const isXcodebuildAvailable = await subprocess_1.isInstalled('xcodebuild');
+    if (isXcodebuildAvailable) {
+        await subprocess_1.runCommand('xcodebuild', ['-project', path_1.basename(`${config.ios.nativeXcodeProjDirAbs}`), 'clean'], {
+            cwd: config.ios.nativeProjectDirAbs,
+        });
+    }
+    else {
+        log_1.logger.warn('Unable to find "xcodebuild". Skipping xcodebuild clean step...');
     }
-    await subprocess_1.runCommand(config.ios.podPath, ['install', ...(deployment ? ['--deployment'] : [])], { cwd: config.ios.nativeProjectDirAbs });
-    await subprocess_1.runCommand('xcodebuild', ['-project', path_1.basename(`${config.ios.nativeXcodeProjDirAbs}`), 'clean'], {
-        cwd: config.ios.nativeProjectDirAbs,
-    });
 }
 async function generatePodFile(config, plugins) {
     const capacitoriOSPath = node_1.resolveNode(config.app.rootDir, '@capacitor/ios', 'package.json');
@@ -103,19 +110,14 @@ async function generatePodFile(config, plugins) {
             });
         });
     });
-    const noPodPlugins = cordovaPlugins.filter(filterNoPods);
-    if (noPodPlugins.length > 0) {
+    const staticPlugins = cordovaPlugins.filter(p => cordova_1.needsStaticPod(p, config));
+    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 +142,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(p => cordova_1.needsStaticPod(p, config));
+    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 +163,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 +297,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, config)) {
             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 +358,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.2",
+  "version": "3.3.0",
   "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": "a02716096b1492b4337f41369ebe951cae331694"
+  "gitHead": "cb7eacd3c69512cf85c03cb06ef9ebf44d32e425"
 }