@capacitor/cli 3.2.5 → 3.3.3

package/CHANGELOG.md

@@ -3,6 +3,62 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.3.3](https://github.com/ionic-team/capacitor/compare/3.3.2...3.3.3) (2021-12-08)
+
+
+### Bug Fixes
+
+* **android:** restrict android run command to configured flavour ([#5256](https://github.com/ionic-team/capacitor/issues/5256)) ([ba84443](https://github.com/ionic-team/capacitor/commit/ba84443dce9c81e09140def57a60018b527b5bb5))
+* **cli:** Add onesignal-cordova-plugin to the static list again ([#5262](https://github.com/ionic-team/capacitor/issues/5262)) ([e67ca99](https://github.com/ionic-team/capacitor/commit/e67ca9964c5a923d35f5cf41eb802c665563726f))
+
+
+
+
+
+## [3.3.2](https://github.com/ionic-team/capacitor/compare/3.3.1...3.3.2) (2021-11-17)
+
+
+### Bug Fixes
+
+* **cli:** add cordova-plugin-google-analytics to static list ([#5220](https://github.com/ionic-team/capacitor/issues/5220)) ([67a996c](https://github.com/ionic-team/capacitor/commit/67a996c0a6896e32c41ea01822d6435fdd706b84))
+* **cli:** Add plugin to static list if pod has use-frameworks ([#5232](https://github.com/ionic-team/capacitor/issues/5232)) ([8a0518b](https://github.com/ionic-team/capacitor/commit/8a0518be9f6f6a4be4a9f1366cb8dcb191225b9d))
+* **cli:** sync gradle from android folder ([#5233](https://github.com/ionic-team/capacitor/issues/5233)) ([cd779c4](https://github.com/ionic-team/capacitor/commit/cd779c4b6ed4ffc96777be7c94a0af4baca6d6d5))
+
+
+
+
+
+## [3.3.1](https://github.com/ionic-team/capacitor/compare/3.3.0...3.3.1) (2021-11-05)
+
+
+### Bug Fixes
+
+* **cli:** Make config don't error if iOS is missing ([#5212](https://github.com/ionic-team/capacitor/issues/5212)) ([db9f12b](https://github.com/ionic-team/capacitor/commit/db9f12b545994b2ed88098c0168bb051f8191771))
+
+
+
+
+
+# [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)
 
 

package/dist/android/add.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addAndroid = void 0;
+exports.createLocalProperties = exports.addAndroid = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
 const os_1 = require("os");
@@ -13,9 +13,6 @@ async function addAndroid(config) {
     await common_1.runTask(`Adding native android project in ${colors_1.default.strong(config.android.platformDir)}`, async () => {
         return template_1.extractTemplate(config.cli.assets.android.platformTemplateArchiveAbs, config.android.platformDirAbs);
     });
-    await common_1.runTask('Syncing Gradle', async () => {
-        return createLocalProperties(config.android.platformDirAbs);
-    });
 }
 exports.addAndroid = addAndroid;
 async function createLocalProperties(platformDir) {
@@ -47,6 +44,9 @@ sdk.dir=${defaultAndroidPath}
         }
     }
 }
+exports.createLocalProperties = createLocalProperties;
 async function gradleSync(platformDir) {
-    await subprocess_1.runCommand(`${platformDir}/gradlew`, []);
+    await subprocess_1.runCommand(`./gradlew`, [], {
+        cwd: platformDir,
+    });
 }

package/dist/android/run.js

@@ -10,8 +10,10 @@ const native_run_1 = require("../util/native-run");
 const subprocess_1 = require("../util/subprocess");
 const debug = debug_1.default('capacitor:android:run');
 async function runAndroid(config, { target: selectedTarget }) {
+    var _a;
     const target = await common_1.promptForPlatformTarget(await native_run_1.getPlatformTargets('android'), selectedTarget);
-    const gradleArgs = ['assembleDebug'];
+    const arg = `assemble${((_a = config.android) === null || _a === void 0 ? void 0 : _a.flavor) || ''}Debug`;
+    const gradleArgs = [arg];
     debug('Invoking ./gradlew with args: %O', gradleArgs);
     await common_1.runTask('Running Gradle build', async () => subprocess_1.runCommand('./gradlew', gradleArgs, {
         cwd: config.android.platformDirAbs,

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` +

package/dist/config.js

@@ -148,7 +148,7 @@ async function loadCLIConfig(rootDir) {
     };
 }
 async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const name = 'android';
     const platformDir = (_b = (_a = extConfig.android) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : 'android';
     const platformDirAbs = path_1.resolve(rootDir, platformDir);
@@ -160,9 +160,10 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
     const resDir = `${srcMainDir}/res`;
     let apkPath = `${appDir}/build/outputs/apk/`;
     let flavorPrefix = '';
-    if ((_c = extConfig.android) === null || _c === void 0 ? void 0 : _c.flavor) {
-        apkPath = `${apkPath}/${(_d = extConfig.android) === null || _d === void 0 ? void 0 : _d.flavor}`;
-        flavorPrefix = `-${(_e = extConfig.android) === null || _e === void 0 ? void 0 : _e.flavor}`;
+    const flavor = ((_c = extConfig.android) === null || _c === void 0 ? void 0 : _c.flavor) || '';
+    if ((_d = extConfig.android) === null || _d === void 0 ? void 0 : _d.flavor) {
+        apkPath = `${apkPath}/${(_e = extConfig.android) === null || _e === void 0 ? void 0 : _e.flavor}`;
+        flavorPrefix = `-${(_f = extConfig.android) === null || _f === void 0 ? void 0 : _f.flavor}`;
     }
     const apkName = `app${flavorPrefix}-debug.apk`;
     const buildOutputDir = `${apkPath}/debug`;
@@ -191,6 +192,7 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
         apkName,
         buildOutputDir,
         buildOutputDirAbs: path_1.resolve(platformDirAbs, buildOutputDir),
+        flavor,
     };
 }
 async function loadIOSConfig(rootDir, extConfig) {
@@ -251,22 +253,22 @@ function determineOS(os) {
     return "unknown" /* Unknown */;
 }
 async function determineXcodeWorkspaceDirAbs(nativeProjectDirAbs) {
-    const xcodeDir = path_1.resolve(nativeProjectDirAbs, 'App.xcworkspace');
-    if (!(await utils_fs_1.pathExists(xcodeDir))) {
-        errors_1.fatal('Xcode workspace does not exist.\n' +
-            `See the docs for adding the ${colors_1.default.strong('ios')} platform: ${colors_1.default.strong('https://capacitorjs.com/docs/ios#adding-the-ios-platform')}`);
-    }
-    return xcodeDir;
+    return path_1.resolve(nativeProjectDirAbs, 'App.xcworkspace');
 }
 async function determineIOSWebDirAbs(nativeProjectDirAbs, nativeTargetDirAbs, nativeXcodeProjDirAbs) {
     const re = /path\s=\spublic[\s\S]+?sourceTree\s=\s([^;]+)/;
     const pbxprojPath = path_1.resolve(nativeXcodeProjDirAbs, 'project.pbxproj');
-    const pbxproj = await utils_fs_1.readFile(pbxprojPath, { encoding: 'utf8' });
-    const m = pbxproj.match(re);
-    if (m && m[1] === 'SOURCE_ROOT') {
-        log_1.logger.warn(`Using the iOS project root for the ${colors_1.default.strong('public')} directory is deprecated.\n` +
-            `Please follow the Upgrade Guide to move ${colors_1.default.strong('public')} inside the iOS target directory: ${colors_1.default.strong('https://capacitorjs.com/docs/updating/3-0#move-public-into-the-ios-target-directory')}`);
-        return path_1.resolve(nativeProjectDirAbs, 'public');
+    try {
+        const pbxproj = await utils_fs_1.readFile(pbxprojPath, { encoding: 'utf8' });
+        const m = pbxproj.match(re);
+        if (m && m[1] === 'SOURCE_ROOT') {
+            log_1.logger.warn(`Using the iOS project root for the ${colors_1.default.strong('public')} directory is deprecated.\n` +
+                `Please follow the Upgrade Guide to move ${colors_1.default.strong('public')} inside the iOS target directory: ${colors_1.default.strong('https://capacitorjs.com/docs/updating/3-0#move-public-into-the-ios-target-directory')}`);
+            return path_1.resolve(nativeProjectDirAbs, 'public');
+        }
+    }
+    catch (e) {
+        // ignore
     }
     return path_1.resolve(nativeTargetDirAbs, 'public');
 }

package/dist/cordova.js

@@ -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>`;
@@ -376,15 +386,24 @@ function getIncompatibleCordovaPlugins(platform) {
     return pluginList;
 }
 exports.getIncompatibleCordovaPlugins = getIncompatibleCordovaPlugins;
-function needsStaticPod(plugin) {
-    const pluginList = [
+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',
     ];
-    return pluginList.includes(plugin.id);
+    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) || useFrameworks(plugin);
 }
 exports.needsStaticPod = needsStaticPod;
+function useFrameworks(plugin) {
+    const podspecs = plugin_1.getPlatformElement(plugin, 'ios', 'podspec');
+    const frameworkPods = podspecs.filter((podspec) => podspec.pods.filter((pods) => pods.$ && pods.$['use-frameworks'] === 'true').length > 0);
+    return frameworkPods.length > 0;
+}
 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,7 +110,7 @@ async function generatePodFile(config, plugins) {
             });
         });
     });
-    const staticPlugins = cordovaPlugins.filter(cordova_1.needsStaticPod);
+    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`);
@@ -135,7 +142,7 @@ function isFramework(framework) {
     return framework.$.src.split('.').pop().includes('framework');
 }
 async function generateCordovaPodspecs(cordovaPlugins, config) {
-    const staticPlugins = cordovaPlugins.filter(cordova_1.needsStaticPod);
+    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);
@@ -291,7 +298,7 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
         const codeFiles = sourceFiles.concat(headerFiles);
         const frameworks = plugin_1.getPlatformElement(p, platform, 'framework');
         let sourcesFolderName = 'sources';
-        if (cordova_1.needsStaticPod(p)) {
+        if (cordova_1.needsStaticPod(p, config)) {
             sourcesFolderName += 'static';
         }
         const sourcesFolder = path_1.join(config.ios.cordovaPluginsDirAbs, sourcesFolderName, p.name);

package/dist/tasks/add.js

@@ -56,6 +56,11 @@ async function addCommand(config, selectedPlatformName) {
             await editPlatforms(config, platformName);
             if (await utils_fs_1.pathExists(config.app.webDirAbs)) {
                 await sync_1.sync(config, platformName, false);
+                if (platformName === config.android.name) {
+                    await common_2.runTask('Syncing Gradle', async () => {
+                        return add_1.createLocalProperties(config.android.platformDirAbs);
+                    });
+                }
             }
             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.5",
+  "version": "3.3.3",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cc2960572ad70a0272c3ea1c44dbee14acf6e2ec"
+  "gitHead": "cd8221ed0162454d2ee01dc3bc164de38a81bf43"
 }