@capacitor/cli 3.3.1 → 3.4.0

package/CHANGELOG.md

@@ -3,6 +3,51 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.4.0](https://github.com/ionic-team/capacitor/compare/3.3.4...3.4.0) (2022-01-19)
+
+**Note:** Version bump only for package @capacitor/cli
+
+
+
+
+
+## [3.3.4](https://github.com/ionic-team/capacitor/compare/3.3.3...3.3.4) (2022-01-05)
+
+
+### Bug Fixes
+
+* **cli:** Escape appName from invalid characters on add ([#5325](https://github.com/ionic-team/capacitor/issues/5325)) ([033f4ee](https://github.com/ionic-team/capacitor/commit/033f4eef59fdb7cc32018b162114511448bc46a6))
+* **cli:** sync failing if Info.plist is localized ([#5333](https://github.com/ionic-team/capacitor/issues/5333)) ([df7a104](https://github.com/ionic-team/capacitor/commit/df7a1041c4e2d9a5a1ceef247ed00f9f8467df76))
+
+
+
+
+
+## [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)
 
 

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/common.js

@@ -56,7 +56,11 @@ exports.resolvePlugin = resolvePlugin;
  */
 async function editProjectSettingsAndroid(config) {
     const appId = config.app.appId;
-    const appName = config.app.appName;
+    const appName = config.app.appName
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/"/g, '\\"')
+        .replace(/'/g, "\\'");
     const manifestPath = path_1.resolve(config.android.srcMainDirAbs, 'AndroidManifest.xml');
     const buildGradlePath = path_1.resolve(config.android.appDirAbs, 'build.gradle');
     let manifestContent = await utils_fs_1.readFile(manifestPath, { encoding: 'utf-8' });
@@ -89,7 +93,7 @@ async function editProjectSettingsAndroid(config) {
     const stringsPath = path_1.resolve(config.android.resDirAbs, 'values/strings.xml');
     let stringsContent = await utils_fs_1.readFile(stringsPath, { encoding: 'utf-8' });
     stringsContent = stringsContent.replace(/com.getcapacitor.myapp/g, appId);
-    stringsContent = stringsContent.replace(/My App/g, appName.replace(/'/g, `\\'`));
+    stringsContent = stringsContent.replace(/My App/g, appName);
     await utils_fs_1.writeFile(stringsPath, stringsContent);
 }
 exports.editProjectSettingsAndroid = editProjectSettingsAndroid;

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/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) {

package/dist/cordova.js

@@ -263,39 +263,47 @@ async function logCordovaManualSteps(cordovaPlugins, config, platform) {
 }
 exports.logCordovaManualSteps = logCordovaManualSteps;
 async function logiOSPlist(configElement, config, plugin) {
-    const plistPath = path_1.resolve(config.ios.nativeTargetDirAbs, 'Info.plist');
-    const xmlMeta = await xml_1.readXML(plistPath);
-    const data = await utils_fs_1.readFile(plistPath, { encoding: 'utf-8' });
-    const plistData = plist_1.default.parse(data);
-    const dict = xmlMeta.plist.dict.pop();
-    if (!dict.key.includes(configElement.$.parent)) {
-        let xml = buildConfigFileXml(configElement);
-        xml = `<key>${configElement.$.parent}</key>${getConfigFileTagContent(xml)}`;
-        log_1.logger.warn(`Configuration required for ${colors_1.default.strong(plugin.id)}.\n` +
-            `Add the following to Info.plist:\n` +
-            xml);
+    let plistPath = path_1.resolve(config.ios.nativeTargetDirAbs, 'Info.plist');
+    if (!(await utils_fs_1.pathExists(plistPath))) {
+        plistPath = path_1.resolve(config.ios.nativeTargetDirAbs, 'Base.lproj', 'Info.plist');
     }
-    else if (configElement.array || configElement.dict) {
-        if (configElement.array &&
-            configElement.array.length > 0 &&
-            configElement.array[0].string) {
-            let xml = '';
-            configElement.array[0].string.map((element) => {
-                const d = plistData[configElement.$.parent];
-                if (Array.isArray(d) && !d.includes(element)) {
-                    xml = xml.concat(`<string>${element}</string>\n`);
+    if (await utils_fs_1.pathExists(plistPath)) {
+        const xmlMeta = await xml_1.readXML(plistPath);
+        const data = await utils_fs_1.readFile(plistPath, { encoding: 'utf-8' });
+        const plistData = plist_1.default.parse(data);
+        const dict = xmlMeta.plist.dict.pop();
+        if (!dict.key.includes(configElement.$.parent)) {
+            let xml = buildConfigFileXml(configElement);
+            xml = `<key>${configElement.$.parent}</key>${getConfigFileTagContent(xml)}`;
+            log_1.logger.warn(`Configuration required for ${colors_1.default.strong(plugin.id)}.\n` +
+                `Add the following to Info.plist:\n` +
+                xml);
+        }
+        else if (configElement.array || configElement.dict) {
+            if (configElement.array &&
+                configElement.array.length > 0 &&
+                configElement.array[0].string) {
+                let xml = '';
+                configElement.array[0].string.map((element) => {
+                    const d = plistData[configElement.$.parent];
+                    if (Array.isArray(d) && !d.includes(element)) {
+                        xml = xml.concat(`<string>${element}</string>\n`);
+                    }
+                });
+                if (xml.length > 0) {
+                    log_1.logger.warn(`Configuration required for ${colors_1.default.strong(plugin.id)}.\n` +
+                        `Add the following in the existing ${colors_1.default.strong(configElement.$.parent)} array of your Info.plist:\n` +
+                        xml);
                 }
-            });
-            if (xml.length > 0) {
-                log_1.logger.warn(`Configuration required for ${colors_1.default.strong(plugin.id)}.\n` +
-                    `Add the following in the existing ${colors_1.default.strong(configElement.$.parent)} array of your Info.plist:\n` +
-                    xml);
             }
-        }
-        else {
-            logPossibleMissingItem(configElement, plugin);
+            else {
+                logPossibleMissingItem(configElement, plugin);
+            }
         }
     }
+    else {
+        logPossibleMissingItem(configElement, plugin);
+    }
 }
 function logPossibleMissingItem(configElement, plugin) {
     let xml = buildConfigFileXml(configElement);
@@ -390,17 +398,20 @@ 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);
+    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/ios/common.js

@@ -58,7 +58,10 @@ exports.resolvePlugin = resolvePlugin;
  */
 async function editProjectSettingsIOS(config) {
     const appId = config.app.appId;
-    const appName = config.app.appName;
+    const appName = config.app.appName
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;');
     const pbxPath = `${config.ios.nativeXcodeProjDirAbs}/project.pbxproj`;
     const plistPath = path_1.resolve(config.ios.nativeTargetDirAbs, 'Info.plist');
     let plistContent = await utils_fs_1.readFile(plistPath, { encoding: 'utf-8' });

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.3.1",
+  "version": "3.4.0",
   "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": "8ff7434e9b775e6acb05efae23771ee1b18e26c9"
+  "gitHead": "4e84c04251167ea8212969fead84b6a1d694b561"
 }