@capacitor/cli 1.3.0 → 1.5.2

package/assets/electron-template/index.js

@@ -1,6 +1,6 @@
 const { app, BrowserWindow, Menu } = require('electron');
 const isDevMode = require('electron-is-dev');
-const { CapacitorSplashScreen } = require('@capacitor/electron');
+const { CapacitorSplashScreen, configCapacitor } = require('@capacitor/electron');
 
 const path = require('path');
 
@@ -40,6 +40,8 @@ async function createWindow () {
     }
   });
 
+  configCapacitor(mainWindow);
+
   if (isDevMode) {
     // Set our above template to the Menu Object if we are in development mode, dont want users having the devtools.
     Menu.setApplicationMenu(Menu.buildFromTemplate(menuTemplateDev));

package/assets/electron-template/package.json

@@ -10,7 +10,7 @@
     "electron-is-dev": "^1.1.0"
   },
   "devDependencies": {
-    "electron": "^4.0.0"
+    "electron": "^7.0.0"
   },
   "keywords": [
     "capacitor",

package/dist/android/common.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const common_1 = require("../common");
-const plugin_1 = require("../plugin");
+const cordova_1 = require("../cordova");
 const fs_extra_1 = require("fs-extra");
 const fs_1 = require("../util/fs");
 const path_1 = require("path");
-const cordova_1 = require("../cordova");
+const plugin_1 = require("../plugin");
 async function gradleClean(config) {
     await common_1.runCommand(`cd ${config.android.platformDir} && ./gradlew clean`);
 }
@@ -84,7 +84,7 @@ async function editProjectSettingsAndroid(config) {
     const stringsPath = path_1.resolve(config.app.rootDir, config.android.platformDir, 'app/src/main/res/values/strings.xml');
     let stringsContent = await fs_1.readFileAsync(stringsPath, 'utf8');
     stringsContent = stringsContent.replace(/com.getcapacitor.myapp/g, appId);
-    stringsContent = stringsContent.replace(/My App/g, appName.replace(/'/g, "\\'"));
+    stringsContent = stringsContent.replace(/My App/g, appName.replace(/'/g, `\\'`));
     await fs_1.writeFileAsync(stringsPath, stringsContent);
 }
 exports.editProjectSettingsAndroid = editProjectSettingsAndroid;

package/dist/android/open.js

@@ -16,11 +16,30 @@ async function openAndroid(config) {
             await opn(dir, { app: 'android studio', wait: false });
             break;
         case definitions_1.OS.Windows:
-            if (config.windows.androidStudioPath) {
-                opn(dir, { app: config.windows.androidStudioPath, wait: false });
+            let androidStudioPath = config.windows.androidStudioPath;
+            try {
+                if (!fs_1.existsSync(androidStudioPath)) {
+                    let commandResult = await common_1.runCommand('REG QUERY "HKEY_LOCAL_MACHINE\\SOFTWARE\\Android Studio" /v Path');
+                    commandResult = commandResult.replace(/(\r\n|\n|\r)/gm, '');
+                    const ix = commandResult.indexOf('REG_SZ');
+                    if (ix > 0) {
+                        androidStudioPath = commandResult.substring(ix + 6).trim() + '\\bin\\studio64.exe';
+                    }
+                }
+            }
+            catch (e) {
+                androidStudioPath = '';
+            }
+            if (androidStudioPath) {
+                opn(dir, { app: androidStudioPath, wait: false });
             }
             else {
-                common_1.logError('Unable to launch Android Studio. Make sure the latest version of Android Studio is installed');
+                common_1.logError('Android Studio not found. Make sure it\'s installed and configure "windowsAndroidStudioPath" ' +
+                    'in your capacitor.config.json to point to the location of studio64.exe, using JavaScript-escaped paths:\n' +
+                    'Example:\n' +
+                    '{\n' +
+                    '  "windowsAndroidStudioPath": "C:\\\\Program Files\\\\Android\\\\Android Studio\\\\bin\\\\studio64.exe"\n' +
+                    '}');
             }
             break;
         case definitions_1.OS.Linux:
@@ -33,7 +52,7 @@ async function openAndroid(config) {
                     '}');
             };
             try {
-                await opn(dir, { app: config.linux.androidStudioPath, wait: false });
+                await opn(dir, { app: config.linux.androidStudioPath, wait: true });
             }
             catch (e) {
                 linuxError();

package/dist/android/update.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const common_1 = require("../common");
-const plugin_1 = require("../plugin");
 const common_2 = require("./common");
 const cordova_1 = require("../cordova");
 const fs_1 = require("../util/fs");
 const path_1 = require("path");
+const plugin_1 = require("../plugin");
 const platform = 'android';
 async function updateAndroid(config) {
     let plugins = await getPluginsTask(config);
@@ -27,7 +27,7 @@ async function updateAndroid(config) {
     await cordova_1.handleCordovaPluginsJS(cordovaPlugins, config, platform);
     await installGradlePlugins(config, capacitorPlugins, cordovaPlugins);
     await handleCordovaPluginsGradle(config, cordovaPlugins);
-    await writeCordovaAndroidManifest(cordovaPlugins, config);
+    await cordova_1.writeCordovaAndroidManifest(cordovaPlugins, config, platform);
     const incompatibleCordovaPlugins = plugins
         .filter(p => plugin_1.getPluginType(p, platform) === 2 /* Incompatible */);
     plugin_1.printPlugins(incompatibleCordovaPlugins, platform, 'incompatible');
@@ -167,7 +167,7 @@ function copyPluginsNativeFiles(config, cordovaPlugins) {
                     if (resourceFile.$.src.split('.').pop() === 'aar') {
                         fs_1.copySync(plugin_1.getFilePath(config, p, resourceFile.$.src), path_1.join(pluginsPath, 'libs', target.split('/').pop()));
                     }
-                    else if (target !== ".") {
+                    else if (target !== '.') {
                         fs_1.copySync(plugin_1.getFilePath(config, p, resourceFile.$.src), path_1.join(pluginsPath, target));
                     }
                 });
@@ -191,69 +191,3 @@ async function getPluginsTask(config) {
         return androidPlugins;
     });
 }
-async function writeCordovaAndroidManifest(cordovaPlugins, config) {
-    const pluginsFolder = path_1.resolve(config.app.rootDir, 'android', config.android.assets.pluginsFolderName);
-    const manifestPath = path_1.join(pluginsFolder, 'src', 'main', 'AndroidManifest.xml');
-    let rootXMLEntries = [];
-    let applicationXMLEntries = [];
-    cordovaPlugins.map(async (p) => {
-        const editConfig = plugin_1.getPlatformElement(p, platform, 'edit-config');
-        const configFile = plugin_1.getPlatformElement(p, platform, 'config-file');
-        editConfig.concat(configFile).map(async (configElement) => {
-            if (configElement.$ && (configElement.$.target && configElement.$.target.includes('AndroidManifest.xml') || configElement.$.file && configElement.$.file.includes('AndroidManifest.xml'))) {
-                const keys = Object.keys(configElement).filter(k => k !== '$');
-                keys.map(k => {
-                    configElement[k].map((e) => {
-                        const xmlElement = common_1.buildXmlElement(e, k);
-                        const pathParts = getPathParts(configElement.$.parent || configElement.$.target);
-                        if (pathParts.length > 1) {
-                            if (pathParts.pop() === 'application') {
-                                if (!applicationXMLEntries.includes(xmlElement) && !contains(applicationXMLEntries, xmlElement, k)) {
-                                    applicationXMLEntries.push(xmlElement);
-                                }
-                            }
-                            else {
-                                common_1.logInfo(`plugin ${p.id} requires to add \n  ${xmlElement} to your AndroidManifest.xml to work`);
-                            }
-                        }
-                        else {
-                            if (!rootXMLEntries.includes(xmlElement) && !contains(rootXMLEntries, xmlElement, k)) {
-                                rootXMLEntries.push(xmlElement);
-                            }
-                        }
-                    });
-                });
-            }
-        });
-    });
-    let content = `<?xml version='1.0' encoding='utf-8'?>
-<manifest package="capacitor.android.plugins"
-xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:amazon="http://schemas.amazon.com/apk/res/android">
-<application>
-${applicationXMLEntries.join('\n')}
-</application>
-${rootXMLEntries.join('\n')}
-</manifest>`;
-    content = content.replace(new RegExp(('$PACKAGE_NAME').replace('$', '\\$&'), 'g'), config.app.appId);
-    await fs_1.writeFileAsync(manifestPath, content);
-}
-function getPathParts(path) {
-    const rootPath = 'manifest';
-    path = path.replace('/*', rootPath);
-    let parts = path.split('/').filter(part => part !== '');
-    if (parts.length > 1 || parts.includes(rootPath)) {
-        return parts;
-    }
-    return [rootPath, path];
-}
-function contains(a, obj, k) {
-    const element = common_1.parseXML(obj);
-    for (var i = 0; i < a.length; i++) {
-        const current = common_1.parseXML(a[i]);
-        if (element && current && current[k] && element[k] && current[k].$ && element[k].$ && element[k].$["android:name"] === current[k].$["android:name"]) {
-            return true;
-        }
-    }
-    return false;
-}

package/dist/common.js

@@ -19,7 +19,7 @@ async function check(config, checks) {
 }
 exports.check = check;
 async function checkWebDir(config) {
-    const invalidFolders = ["", ".", "..", "../", "./"];
+    const invalidFolders = ['', '.', '..', '../', './'];
     if (invalidFolders.includes(config.app.webDir)) {
         return `"${config.app.webDir}" is not a valid value for webDir`;
     }
@@ -179,7 +179,7 @@ async function getOrCreateConfig(config) {
 exports.getOrCreateConfig = getOrCreateConfig;
 async function mergeConfig(config, settings) {
     const configPath = path_1.join(config.app.rootDir, config.app.extConfigName);
-    await writePrettyJSON(config.app.extConfigFilePath, Object.assign({}, config.app.extConfig, settings));
+    await writePrettyJSON(config.app.extConfigFilePath, Object.assign(Object.assign({}, config.app.extConfig), settings));
     // Store our newly created or found external config as the default
     config.loadExternalConfig();
 }

package/dist/config.js

@@ -4,7 +4,6 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const common_1 = require("./common");
 const definitions_1 = require("./definitions");
-const child_process_1 = require("child_process");
 let Package;
 let ExtConfig;
 class Config {
@@ -85,6 +84,9 @@ class Config {
                 templateName: 'app-template',
                 templateDir: '',
                 pluginsTemplateDir: ''
+            },
+            server: {
+                cleartext: false
             }
         };
         this.plugins = {
@@ -174,22 +176,7 @@ class Config {
         if (this.cli.os !== definitions_1.OS.Windows) {
             return;
         }
-        if (this.app.windowsAndroidStudioPath) {
-            try {
-                if (!fs_1.existsSync(this.app.windowsAndroidStudioPath)) {
-                    const buffer = child_process_1.execSync('REG QUERY "HKEY_LOCAL_MACHINE\\SOFTWARE\\Android Studio" /v Path');
-                    const bufferString = buffer.toString('utf-8').replace(/(\r\n|\n|\r)/gm, '');
-                    const ix = bufferString.indexOf('REG_SZ');
-                    if (ix > 0) {
-                        this.app.windowsAndroidStudioPath = bufferString.substring(ix + 6).trim() + '\\bin\\studio64.exe';
-                    }
-                }
-                this.windows.androidStudioPath = this.app.windowsAndroidStudioPath;
-            }
-            catch (e) {
-                this.windows.androidStudioPath = '';
-            }
-        }
+        this.windows.androidStudioPath = this.app.windowsAndroidStudioPath;
     }
     initLinuxConfig() {
         if (this.app.linuxAndroidStudioPath) {

package/dist/cordova.js

@@ -109,7 +109,7 @@ async function copyPluginsJS(config, cordovaPlugins, platform) {
             // mimics Cordova's module name logic if the name attr is missing
             const name = pluginId + '.' + (jsModule.$.name || path_1.basename(jsModule.$.src, path_1.extname(jsModule.$.src)));
             data = `cordova.define("${name}", function(require, exports, module) { \n${data}\n});`;
-            data = data.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script\s*>/gi, "");
+            data = data.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script\s*>/gi, '');
             await fs_1.writeFileAsync(filePath, data, 'utf8');
         }));
     }));
@@ -208,7 +208,7 @@ async function handleCordovaPluginsJS(cordovaPlugins, config, platform) {
     await autoGenerateConfig(config, cordovaPlugins, platform);
 }
 exports.handleCordovaPluginsJS = handleCordovaPluginsJS;
-async function copyCordovaJSFiles(config, platform) {
+async function getCordovaPlugins(config, platform) {
     const allPlugins = await plugin_1.getPlugins(config);
     let plugins = [];
     if (platform === config.ios.name) {
@@ -217,11 +217,10 @@ async function copyCordovaJSFiles(config, platform) {
     else if (platform === config.android.name) {
         plugins = common_2.getAndroidPlugins(allPlugins);
     }
-    const cordovaPlugins = plugins
+    return plugins
         .filter(p => plugin_1.getPluginType(p, platform) === 1 /* Cordova */);
-    await handleCordovaPluginsJS(cordovaPlugins, config, platform);
 }
-exports.copyCordovaJSFiles = copyCordovaJSFiles;
+exports.getCordovaPlugins = getCordovaPlugins;
 async function logCordovaManualSteps(cordovaPlugins, config, platform) {
     cordovaPlugins.map(p => {
         const editConfig = plugin_1.getPlatformElement(p, platform, 'edit-config');
@@ -251,7 +250,7 @@ async function logiOSPlist(configElement, config, plugin) {
     }
     else if (configElement.array || configElement.dict) {
         if (configElement.array && configElement.array[0] && configElement.array[0].string) {
-            var xml = "";
+            var xml = '';
             configElement.array[0].string.map((element) => {
                 if (!plistData[configElement.$.parent].includes(element)) {
                     xml = xml.concat(`<string>${element}</string>\n`);
@@ -309,7 +308,7 @@ async function checkAndInstallDependencies(config, plugins, platform) {
                         needsUpdate = true;
                     }
                     catch (e) {
-                        common_1.log("\n");
+                        common_1.log('\n');
                         common_1.logError(`couldn't install dependency plugin ${plugin}`);
                     }
                 }
@@ -320,15 +319,15 @@ async function checkAndInstallDependencies(config, plugins, platform) {
 }
 exports.checkAndInstallDependencies = checkAndInstallDependencies;
 function getIncompatibleCordovaPlugins(platform) {
-    let pluginList = ["cordova-plugin-splashscreen", "cordova-plugin-ionic-webview", "cordova-plugin-crosswalk-webview",
-        "cordova-plugin-wkwebview-engine", "cordova-plugin-console", "cordova-plugin-music-controls",
-        "cordova-plugin-add-swift-support", "cordova-plugin-ionic-keyboard", "cordova-plugin-braintree",
-        "@ionic-enterprise/filesystem", "@ionic-enterprise/keyboard", "@ionic-enterprise/splashscreen"];
-    if (platform === "ios") {
-        pluginList.push("cordova-plugin-googlemaps", "cordova-plugin-statusbar", "@ionic-enterprise/statusbar");
+    let pluginList = ['cordova-plugin-splashscreen', 'cordova-plugin-ionic-webview', 'cordova-plugin-crosswalk-webview',
+        'cordova-plugin-wkwebview-engine', 'cordova-plugin-console', 'cordova-plugin-music-controls',
+        'cordova-plugin-add-swift-support', 'cordova-plugin-ionic-keyboard', 'cordova-plugin-braintree',
+        '@ionic-enterprise/filesystem', '@ionic-enterprise/keyboard', '@ionic-enterprise/splashscreen'];
+    if (platform === 'ios') {
+        pluginList.push('cordova-plugin-googlemaps', 'cordova-plugin-statusbar', '@ionic-enterprise/statusbar');
     }
-    if (platform === "android") {
-        pluginList.push("cordova-plugin-compat");
+    if (platform === 'android') {
+        pluginList.push('cordova-plugin-compat');
     }
     return pluginList;
 }
@@ -359,3 +358,80 @@ async function getCordovaPreferences(config) {
     return cordova;
 }
 exports.getCordovaPreferences = getCordovaPreferences;
+async function writeCordovaAndroidManifest(cordovaPlugins, config, platform) {
+    var _a;
+    const pluginsFolder = path_1.resolve(config.app.rootDir, 'android', config.android.assets.pluginsFolderName);
+    const manifestPath = path_1.join(pluginsFolder, 'src', 'main', 'AndroidManifest.xml');
+    let rootXMLEntries = [];
+    let applicationXMLEntries = [];
+    let applicationXMLAttributes = [];
+    cordovaPlugins.map(async (p) => {
+        const editConfig = plugin_1.getPlatformElement(p, platform, 'edit-config');
+        const configFile = plugin_1.getPlatformElement(p, platform, 'config-file');
+        editConfig.concat(configFile).map(async (configElement) => {
+            if (configElement.$ && (configElement.$.target && configElement.$.target.includes('AndroidManifest.xml') || configElement.$.file && configElement.$.file.includes('AndroidManifest.xml'))) {
+                const keys = Object.keys(configElement).filter(k => k !== '$');
+                keys.map(k => {
+                    configElement[k].map((e) => {
+                        const xmlElement = common_1.buildXmlElement(e, k);
+                        const pathParts = getPathParts(configElement.$.parent || configElement.$.target);
+                        if (pathParts.length > 1) {
+                            if (pathParts.pop() === 'application') {
+                                if (configElement.$.mode && configElement.$.mode === 'merge') {
+                                    Object.keys(e.$).map((ek) => {
+                                        applicationXMLAttributes.push(`${ek}="${e.$[ek]}"`);
+                                    });
+                                }
+                                else if (!applicationXMLEntries.includes(xmlElement) && !contains(applicationXMLEntries, xmlElement, k)) {
+                                    applicationXMLEntries.push(xmlElement);
+                                }
+                            }
+                            else {
+                                common_1.logInfo(`plugin ${p.id} requires to add \n  ${xmlElement} to your AndroidManifest.xml to work`);
+                            }
+                        }
+                        else {
+                            if (!rootXMLEntries.includes(xmlElement) && !contains(rootXMLEntries, xmlElement, k)) {
+                                rootXMLEntries.push(xmlElement);
+                            }
+                        }
+                    });
+                });
+            }
+        });
+    });
+    let cleartext = ((_a = config.app.extConfig.server) === null || _a === void 0 ? void 0 : _a.cleartext) ? 'android:usesCleartextTraffic="true"' : '';
+    let content = `<?xml version='1.0' encoding='utf-8'?>
+<manifest package="capacitor.android.plugins"
+xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:amazon="http://schemas.amazon.com/apk/res/android">
+<application ${applicationXMLAttributes.join('\n')}${cleartext}>
+${applicationXMLEntries.join('\n')}
+</application>
+${rootXMLEntries.join('\n')}
+</manifest>`;
+    content = content.replace(new RegExp(('$PACKAGE_NAME').replace('$', '\\$&'), 'g'), config.app.appId);
+    if (fs_extra_1.existsSync(manifestPath)) {
+        await fs_1.writeFileAsync(manifestPath, content);
+    }
+}
+exports.writeCordovaAndroidManifest = writeCordovaAndroidManifest;
+function getPathParts(path) {
+    const rootPath = 'manifest';
+    path = path.replace('/*', rootPath);
+    let parts = path.split('/').filter(part => part !== '');
+    if (parts.length > 1 || parts.includes(rootPath)) {
+        return parts;
+    }
+    return [rootPath, path];
+}
+function contains(a, obj, k) {
+    const element = common_1.parseXML(obj);
+    for (var i = 0; i < a.length; i++) {
+        const current = common_1.parseXML(a[i]);
+        if (element && current && current[k] && element[k] && current[k].$ && element[k].$ && element[k].$['android:name'] === current[k].$['android:name']) {
+            return true;
+        }
+    }
+    return false;
+}

package/dist/index.js

@@ -46,15 +46,17 @@ function run(process, cliBinDir) {
     });
     program
         .command('sync [platform]')
-        .description('updates + copy')
-        .action(platform => {
-        return sync_1.syncCommand(config, platform);
+        .description('copy + update')
+        .option('--deployment', 'Optional: if provided, Podfile.lock won\'t be deleted and pod install will use --deployment option')
+        .action((platform, { deployment }) => {
+        return sync_1.syncCommand(config, platform, deployment);
     });
     program
         .command('update [platform]')
         .description(`updates the native plugins and dependencies based in package.json`)
-        .action(platform => {
-        return update_1.updateCommand(config, platform);
+        .option('--deployment', 'Optional: if provided, Podfile.lock won\'t be deleted and pod install will use --deployment option')
+        .action((platform, { deployment }) => {
+        return update_1.updateCommand(config, platform, deployment);
     });
     program
         .command('copy [platform]')

package/dist/ios/update.js

@@ -7,10 +7,9 @@ const path_1 = require("path");
 const fs_2 = require("fs");
 const plugin_1 = require("../plugin");
 const cordova_1 = require("../cordova");
-//import * as inquirer from 'inquirer';
 exports.updateIOSChecks = [common_1.checkCocoaPods, common_1.checkIOSProject];
 const platform = 'ios';
-async function updateIOS(config) {
+async function updateIOS(config, deployment) {
     let plugins = await getPluginsTask(config);
     const capacitorPlugins = plugins.filter(p => plugin_1.getPluginType(p, platform) === 0 /* Core */);
     plugin_1.printPlugins(capacitorPlugins, 'ios');
@@ -29,7 +28,7 @@ async function updateIOS(config) {
     }
     await cordova_1.handleCordovaPluginsJS(cordovaPlugins, config, platform);
     await generateCordovaPodspecs(cordovaPlugins, config);
-    await installCocoaPodsPlugins(config, plugins);
+    await installCocoaPodsPlugins(config, plugins, deployment);
     await cordova_1.logCordovaManualSteps(cordovaPlugins, config, platform);
     const incompatibleCordovaPlugins = plugins
         .filter(p => plugin_1.getPluginType(p, platform) === 2 /* Incompatible */);
@@ -37,13 +36,13 @@ async function updateIOS(config) {
     await common_2.checkPlatformVersions(config, platform);
 }
 exports.updateIOS = updateIOS;
-async function installCocoaPodsPlugins(config, plugins) {
+async function installCocoaPodsPlugins(config, plugins, deployment) {
     await common_2.runTask('Updating iOS native dependencies with "pod install" (may take several minutes)', () => {
-        return updatePodfile(config, plugins);
+        return updatePodfile(config, plugins, deployment);
     });
 }
 exports.installCocoaPodsPlugins = installCocoaPodsPlugins;
-async function updatePodfile(config, plugins) {
+async function updatePodfile(config, plugins, deployment) {
     const dependenciesContent = generatePodFile(config, plugins);
     const projectName = config.ios.nativeProjectName;
     const projectRoot = path_1.resolve(config.app.rootDir, config.ios.name, projectName);
@@ -53,8 +52,14 @@ async function updatePodfile(config, plugins) {
     podfileContent = podfileContent.replace(/(Automatic Capacitor Pod dependencies, do not delete)[\s\S]*(# Do not delete)/, '$1' + dependenciesContent + '\n  $2');
     podfileContent = podfileContent.replace(/platform :ios, '[^']*'/, `platform :ios, '${config.ios.minVersion}'`);
     await fs_1.writeFileAsync(podfilePath, podfileContent, 'utf8');
-    fs_1.removeSync(podfileLockPath);
-    await common_2.runCommand(`cd "${config.app.rootDir}" && cd "${config.ios.name}" && cd "${projectName}" && pod install && xcodebuild -project App.xcodeproj clean`);
+    let installCommand = 'pod install';
+    if (!deployment) {
+        fs_1.removeSync(podfileLockPath);
+    }
+    else {
+        installCommand += ' --deployment';
+    }
+    await common_2.runCommand(`cd "${config.app.rootDir}" && cd "${config.ios.name}" && cd "${projectName}" && ${installCommand} && xcodebuild -project App.xcodeproj clean`);
 }
 exports.updatePodfile = updatePodfile;
 function generatePodFile(config, plugins) {
@@ -97,7 +102,7 @@ function getFrameworkName(framework) {
     return framework.$.src.substr(0, framework.$.src.indexOf('.')).replace('lib', '');
 }
 function isFramework(framework) {
-    return framework.$.src.split(".").pop() === 'framework';
+    return framework.$.src.split('.').pop() === 'framework';
 }
 async function generateCordovaPodspecs(cordovaPlugins, config) {
     const noPodPlugins = cordovaPlugins.filter(filterNoPods);
@@ -113,6 +118,7 @@ async function generateCordovaPodspec(cordovaPlugins, config, isStatic) {
     let systemLibraries = [];
     let sourceFrameworks = [];
     let frameworkDeps = [];
+    let compilerFlags = [];
     let name = 'CordovaPlugins';
     let sourcesFolderName = 'sources';
     if (isStatic) {
@@ -176,28 +182,37 @@ async function generateCordovaPodspec(cordovaPlugins, config, isStatic) {
         const sourceFiles = plugin_1.getPlatformElement(plugin, platform, 'source-file');
         sourceFiles.map((sourceFile) => {
             if (sourceFile.$.framework && sourceFile.$.framework === 'true') {
-                const fileName = sourceFile.$.src.split("/").pop();
+                const fileName = sourceFile.$.src.split('/').pop();
                 const frameworktPath = path_1.join(sourcesFolderName, plugin.name, fileName);
                 if (!sourceFrameworks.includes(frameworktPath)) {
                     sourceFrameworks.push(frameworktPath);
                 }
             }
+            else if (sourceFile.$['compiler-flags']) {
+                const cFlag = sourceFile.$['compiler-flags'];
+                if (!compilerFlags.includes(cFlag)) {
+                    compilerFlags.push(cFlag);
+                }
+            }
         });
     });
     if (weakFrameworks.length > 0) {
-        frameworkDeps.push(`s.weak_frameworks = '${weakFrameworks.join("', '")}'`);
+        frameworkDeps.push(`s.weak_frameworks = '${weakFrameworks.join(`', '`)}'`);
     }
     if (linkedFrameworks.length > 0) {
-        frameworkDeps.push(`s.frameworks = '${linkedFrameworks.join("', '")}'`);
+        frameworkDeps.push(`s.frameworks = '${linkedFrameworks.join(`', '`)}'`);
     }
     if (systemLibraries.length > 0) {
-        frameworkDeps.push(`s.libraries = '${systemLibraries.join("', '")}'`);
+        frameworkDeps.push(`s.libraries = '${systemLibraries.join(`', '`)}'`);
     }
     if (customFrameworks.length > 0) {
-        frameworkDeps.push(`s.vendored_frameworks = '${customFrameworks.join("', '")}'`);
+        frameworkDeps.push(`s.vendored_frameworks = '${customFrameworks.join(`', '`)}'`);
     }
     if (sourceFrameworks.length > 0) {
-        frameworkDeps.push(`s.vendored_libraries = '${sourceFrameworks.join("', '")}'`);
+        frameworkDeps.push(`s.vendored_libraries = '${sourceFrameworks.join(`', '`)}'`);
+    }
+    if (compilerFlags.length > 0) {
+        frameworkDeps.push(`s.compiler_flags = '${compilerFlags.join(' ')}'`);
     }
     const arcPlugins = cordovaPlugins.filter(filterARCFiles);
     if (arcPlugins.length > 0) {
@@ -206,7 +221,7 @@ async function generateCordovaPodspec(cordovaPlugins, config, isStatic) {
       sna.source_files = 'noarc/**/*.{swift,h,m,c,cc,mm,cpp}'
     end`);
     }
-    const frameworksString = frameworkDeps.join("\n    ");
+    const frameworksString = frameworkDeps.join('\n    ');
     const content = `
   Pod::Spec.new do |s|
     s.name = '${name}'
@@ -245,8 +260,8 @@ function copyPluginsNativeFiles(config, cordovaPlugins) {
         }
         const sourcesFolder = path_1.join(pluginsPath, sourcesFolderName, p.name);
         codeFiles.map((codeFile) => {
-            const fileName = codeFile.$.src.split("/").pop();
-            const fileExt = codeFile.$.src.split(".").pop();
+            const fileName = codeFile.$.src.split('/').pop();
+            const fileExt = codeFile.$.src.split('.').pop();
             let destFolder = sourcesFolderName;
             if (codeFile.$['compiler-flags'] && codeFile.$['compiler-flags'] === '-fno-objc-arc') {
                 destFolder = 'noarc';
@@ -255,7 +270,7 @@ function copyPluginsNativeFiles(config, cordovaPlugins) {
             const fileDest = path_1.join(pluginsPath, destFolder, p.name, fileName);
             fs_1.copySync(filePath, fileDest);
             let fileContent = fs_1.readFileSync(fileDest, 'utf8');
-            if (fileExt === "swift") {
+            if (fileExt === 'swift') {
                 fileContent = 'import Cordova\n' + fileContent;
                 fs_1.writeFileSync(fileDest, fileContent, 'utf8');
             }
@@ -264,11 +279,16 @@ function copyPluginsNativeFiles(config, cordovaPlugins) {
                     fileContent = fileContent.replace('@import Firebase;', '#import <Firebase/Firebase.h>');
                     fs_1.writeFileSync(fileDest, fileContent, 'utf8');
                 }
+                if (fileContent.includes('[NSBundle bundleForClass:[self class]]') || fileContent.includes('[NSBundle bundleForClass:[CDVCapture class]]')) {
+                    fileContent = fileContent.replace('[NSBundle bundleForClass:[self class]]', '[NSBundle mainBundle]');
+                    fileContent = fileContent.replace('[NSBundle bundleForClass:[CDVCapture class]]', '[NSBundle mainBundle]');
+                    fs_1.writeFileSync(fileDest, fileContent, 'utf8');
+                }
             }
         });
         const resourceFiles = plugin_1.getPlatformElement(p, platform, 'resource-file');
         resourceFiles.map((resourceFile) => {
-            const fileName = resourceFile.$.src.split("/").pop();
+            const fileName = resourceFile.$.src.split('/').pop();
             fs_1.copySync(plugin_1.getFilePath(config, p, resourceFile.$.src), path_1.join(pluginsPath, 'resources', fileName));
         });
         frameworks.map((framework) => {

package/dist/plugin.js

@@ -61,7 +61,7 @@ function fixName(name) {
 }
 exports.fixName = fixName;
 function removeScope(name) {
-    var parts = name.split("/");
+    var parts = name.split('/');
     if (parts.length > 1) {
         name = parts[parts.length - 1];
     }
@@ -123,8 +123,8 @@ function getJSModules(p, platform) {
 }
 exports.getJSModules = getJSModules;
 function getFilePath(config, plugin, path) {
-    if (path.startsWith("node_modules")) {
-        let pathSegments = path.split("/").slice(1);
+    if (path.startsWith('node_modules')) {
+        let pathSegments = path.split('/').slice(1);
         if (pathSegments[0].startsWith('@')) {
             pathSegments = [pathSegments[0] + '/' + pathSegments[1], ...pathSegments.slice(2)];
         }

package/dist/tasks/add.js

@@ -29,7 +29,7 @@ async function addCommand(config, selectedPlatformName) {
         await doAdd(config, platformName);
         await editPlatforms(config, platformName);
         if (shouldSync(config, platformName)) {
-            await sync_1.sync(config, platformName);
+            await sync_1.sync(config, platformName, false);
         }
         if (platformName === config.ios.name || platformName === config.android.name) {
             common_3.log(chalk_1.default `\nNow you can run {green {bold npx cap open ${platformName}}} to launch ${platformName === config.ios.name ? 'Xcode' : 'Android Studio'}`);
@@ -104,7 +104,7 @@ async function editPlatforms(config, platformName) {
 }
 function shouldSync(config, platformName) {
     // Don't sync if we're adding the iOS platform not on a mac
-    if (config.cli.os !== definitions_1.OS.Mac && platformName === "ios") {
+    if (config.cli.os !== definitions_1.OS.Mac && platformName === 'ios') {
         return false;
     }
     return true;

package/dist/tasks/copy.js

@@ -33,13 +33,16 @@ async function copy(config, platformName) {
             await copyWebDir(config, config.ios.webDirAbs);
             await copyNativeBridge(config, config.ios.webDirAbs);
             await copyCapacitorConfig(config, path_1.join(config.ios.platformDir, config.ios.nativeProjectName, config.ios.nativeProjectName));
-            await cordova_1.copyCordovaJSFiles(config, platformName);
+            const cordovaPlugins = await cordova_1.getCordovaPlugins(config, platformName);
+            await cordova_1.handleCordovaPluginsJS(cordovaPlugins, config, platformName);
         }
         else if (platformName === config.android.name) {
             await copyWebDir(config, config.android.webDirAbs);
             await copyNativeBridge(config, config.android.webDirAbs);
             await copyCapacitorConfig(config, path_1.join(config.android.platformDir, 'app/src/main/assets'));
-            await cordova_1.copyCordovaJSFiles(config, platformName);
+            const cordovaPlugins = await cordova_1.getCordovaPlugins(config, platformName);
+            await cordova_1.handleCordovaPluginsJS(cordovaPlugins, config, platformName);
+            await cordova_1.writeCordovaAndroidManifest(cordovaPlugins, config, platformName);
         }
         else if (platformName === config.web.name) {
             await copy_1.copyWeb(config);

package/dist/tasks/doctor.js

@@ -30,7 +30,7 @@ async function doctorCore(config) {
 }
 exports.doctorCore = doctorCore;
 async function printInstalledPackages(config) {
-    const packageNames = ["@capacitor/cli", "@capacitor/core", "@capacitor/android", "@capacitor/ios"];
+    const packageNames = ['@capacitor/cli', '@capacitor/core', '@capacitor/android', '@capacitor/ios'];
     await Promise.all(packageNames.map(async (packageName) => {
         let version;
         const packagePath = common_1.resolveNode(config, packageName, 'package.json');

package/dist/tasks/init.js

@@ -39,7 +39,7 @@ async function initCommand(config, name, id, webDir, client) {
                 cordova
             });
         });
-        await common_1.printNextSteps(config, "");
+        await common_1.printNextSteps(config, '');
     }
     catch (e) {
         common_1.log('Usage: npx cap init appName appId\n');

package/dist/tasks/new-plugin.js

@@ -23,61 +23,42 @@ exports.newPluginCommand = newPluginCommand;
 async function newPlugin(config) {
     common_1.log(`${emoji_1.emoji('✏️', '*')}  Creating new Capacitor plugin`);
     const inquirer = await Promise.resolve().then(() => require('inquirer'));
+    const requiredInput = (input) => {
+        if (!input || input.trim() === '') {
+            return false;
+        }
+        return true;
+    };
     const answers = await inquirer.prompt([
         {
             type: 'input',
             name: 'name',
-            message: 'Plugin NPM name (snake-case):',
-            validate: function (input) {
-                if (!input || input.trim() === '') {
-                    return false;
-                }
-                return true;
-            }
+            message: 'Plugin NPM name (kebab-case):',
+            validate: requiredInput
         },
         {
             type: 'input',
             name: 'domain',
             message: 'Plugin id (domain-style syntax. ex: com.example.plugin)',
-            validate: function (input) {
-                if (!input || input.trim() === '') {
-                    return false;
-                }
-                return true;
-            }
+            validate: requiredInput
         },
         {
             type: 'input',
             name: 'className',
             message: 'Plugin class name (ex: AwesomePlugin)',
-            validate: function (input) {
-                if (!input || input.trim() === '') {
-                    return false;
-                }
-                return true;
-            }
+            validate: requiredInput
         },
         {
             type: 'input',
             name: 'description',
             message: 'description:',
-            validate: function (input) {
-                if (!input || input.trim() === '') {
-                    return false;
-                }
-                return true;
-            }
+            validate: requiredInput
         },
         {
             type: 'input',
             name: 'git',
             message: 'git repository:',
-            validate: function (input) {
-                if (!input || input.trim() === '') {
-                    return false;
-                }
-                return true;
-            }
+            validate: requiredInput
         },
         {
             type: 'input',
@@ -204,7 +185,7 @@ function generatePackageJSON(answers) {
         types: 'dist/esm/index.d.ts',
         scripts: {
             'build': 'npm run clean && tsc',
-            'clean': 'rm -rf ./dist',
+            'clean': 'rimraf ./dist',
             'watch': 'tsc --watch',
             'prepublishOnly': 'npm run build'
         },
@@ -214,6 +195,7 @@ function generatePackageJSON(answers) {
             '@capacitor/core': 'latest'
         },
         devDependencies: {
+            'rimraf': '^3.0.0',
             'typescript': '^3.2.4',
             '@capacitor/ios': 'latest',
             '@capacitor/android': 'latest'

package/dist/tasks/sync.js

@@ -7,7 +7,7 @@ const promise_1 = require("../util/promise");
 /**
  * Sync is a copy and an update in one.
  */
-async function syncCommand(config, selectedPlatform) {
+async function syncCommand(config, selectedPlatform, deployment) {
     const then = +new Date;
     const platforms = config.selectPlatforms(selectedPlatform);
     if (platforms.length === 0) {
@@ -16,7 +16,7 @@ async function syncCommand(config, selectedPlatform) {
     }
     try {
         await common_1.check(config, [common_1.checkPackage, common_1.checkWebDir, ...update_1.updateChecks(config, platforms)]);
-        await promise_1.allSerial(platforms.map(platformName => () => sync(config, platformName)));
+        await promise_1.allSerial(platforms.map(platformName => () => sync(config, platformName, deployment)));
         const now = +new Date;
         const diff = (now - then) / 1000;
         common_1.log(`Sync finished in ${diff}s`);
@@ -26,13 +26,13 @@ async function syncCommand(config, selectedPlatform) {
     }
 }
 exports.syncCommand = syncCommand;
-async function sync(config, platformName) {
+async function sync(config, platformName, deployment) {
     try {
         await copy_1.copy(config, platformName);
     }
     catch (e) {
         common_1.logError(e);
     }
-    await update_1.update(config, platformName);
+    await update_1.update(config, platformName, deployment);
 }
 exports.sync = sync;

package/dist/tasks/update.js

@@ -5,7 +5,7 @@ const update_2 = require("../ios/update");
 const promise_1 = require("../util/promise");
 const common_1 = require("../common");
 const chalk_1 = require("chalk");
-async function updateCommand(config, selectedPlatformName) {
+async function updateCommand(config, selectedPlatformName, deployment) {
     const then = +new Date;
     const platforms = config.selectPlatforms(selectedPlatformName);
     if (platforms.length === 0) {
@@ -14,7 +14,7 @@ async function updateCommand(config, selectedPlatformName) {
     }
     try {
         await common_1.check(config, [common_1.checkPackage, ...updateChecks(config, platforms)]);
-        await promise_1.allSerial(platforms.map(platformName => async () => await update(config, platformName)));
+        await promise_1.allSerial(platforms.map(platformName => async () => await update(config, platformName, deployment)));
         const now = +new Date;
         const diff = (now - then) / 1000;
         common_1.log(`Update finished in ${diff}s`);
@@ -46,11 +46,11 @@ function updateChecks(config, platforms) {
     return checks;
 }
 exports.updateChecks = updateChecks;
-async function update(config, platformName) {
+async function update(config, platformName, deployment) {
     try {
         await common_1.runTask(chalk_1.default `{green {bold update}} {bold ${platformName}}`, async () => {
             if (platformName === config.ios.name) {
-                await update_2.updateIOS(config);
+                await update_2.updateIOS(config, deployment);
             }
             else if (platformName === config.android.name) {
                 await update_1.updateAndroid(config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "1.3.0",
+  "version": "1.5.2",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitor.ionicframework.com/",
   "author": "Ionic Team <hi@ionicframework.com> (https://ionicframework.com) ",
@@ -14,7 +14,7 @@
   "main": "./dist/index.js",
   "scripts": {
     "build": "npm run clean && npm run assets && tsc",
-    "clean": "rm -rf ./dist",
+    "clean": "rimraf ./dist",
     "deploy": "np",
     "lint": "tslint --project tsconfig.json",
     "assets": "node scripts/copy-assets.js",
@@ -69,6 +69,7 @@
     "jest": "^23.6.0",
     "mock-fs": "^4.4.2",
     "np": "^2.18.2",
+    "rimraf": "^3.0.0",
     "tmp": "0.0.33",
     "ts-jest": "^23.10.4",
     "tslint": "^5.8.0",