@capacitor/cli 3.3.3 → 3.3.4

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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)
 
 

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

@@ -263,38 +263,46 @@ 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) {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "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": "cd8221ed0162454d2ee01dc3bc164de38a81bf43"
+  "gitHead": "bf215b19e0c8186a9124491073feb16f3273a2f9"
 }