@capacitor/cli 4.7.3 → 5.0.0-alpha.2

package/dist/android/add.js

@@ -10,14 +10,14 @@ const common_1 = require("../common");
 const subprocess_1 = require("../util/subprocess");
 const template_1 = require("../util/template");
 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 (0, common_1.runTask)(`Adding native android project in ${colors_1.default.strong(config.android.platformDir)}`, async () => {
+        return (0, template_1.extractTemplate)(config.cli.assets.android.platformTemplateArchiveAbs, config.android.platformDirAbs);
     });
 }
 exports.addAndroid = addAndroid;
 async function createLocalProperties(platformDir) {
-    const defaultAndroidPath = path_1.join(os_1.homedir(), 'Library/Android/sdk');
-    if (await utils_fs_1.pathExists(defaultAndroidPath)) {
+    const defaultAndroidPath = (0, path_1.join)((0, os_1.homedir)(), 'Library/Android/sdk');
+    if (await (0, utils_fs_1.pathExists)(defaultAndroidPath)) {
         const localSettings = `
 ## This file is automatically generated by Android Studio.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
@@ -30,7 +30,7 @@ async function createLocalProperties(platformDir) {
 # header note.
 sdk.dir=${defaultAndroidPath}
   `;
-        await utils_fs_1.writeFile(path_1.join(platformDir, 'local.properties'), localSettings, {
+        await (0, utils_fs_1.writeFile)((0, path_1.join)(platformDir, 'local.properties'), localSettings, {
             encoding: 'utf-8',
         });
         // Only sync if we were able to create the local properties above, otherwise
@@ -46,7 +46,7 @@ sdk.dir=${defaultAndroidPath}
 }
 exports.createLocalProperties = createLocalProperties;
 async function gradleSync(platformDir) {
-    await subprocess_1.runCommand(`./gradlew`, [], {
+    await (0, subprocess_1.runCommand)(`./gradlew`, [], {
         cwd: platformDir,
     });
 }

package/dist/android/build.js

@@ -8,10 +8,13 @@ const common_1 = require("../common");
 const log_1 = require("../log");
 const subprocess_1 = require("../util/subprocess");
 async function buildAndroid(config, buildOptions) {
-    var _a;
+    var _a, _b;
     const releaseType = (_a = buildOptions.androidreleasetype) !== null && _a !== void 0 ? _a : 'AAB';
     const releaseTypeIsAAB = releaseType === 'AAB';
-    const arg = releaseTypeIsAAB ? ':app:bundleRelease' : 'assembleRelease';
+    const flavor = (_b = buildOptions.flavor) !== null && _b !== void 0 ? _b : '';
+    const arg = releaseTypeIsAAB
+        ? `:app:bundle${flavor}Release`
+        : `assemble${flavor}Release`;
     const gradleArgs = [arg];
     if (!buildOptions.keystorepath ||
         !buildOptions.keystorealias ||
@@ -20,7 +23,7 @@ async function buildAndroid(config, buildOptions) {
         throw 'Missing options. Please supply all options for android signing. (Keystore Path, Keystore Password, Keystore Key Alias, Keystore Key Password)';
     }
     try {
-        await common_1.runTask('Running Gradle build', async () => subprocess_1.runCommand('./gradlew', gradleArgs, {
+        await (0, common_1.runTask)('Running Gradle build', async () => (0, subprocess_1.runCommand)('./gradlew', gradleArgs, {
             cwd: config.android.platformDirAbs,
         }));
     }
@@ -32,7 +35,7 @@ async function buildAndroid(config, buildOptions) {
             throw e;
         }
     }
-    const releasePath = path_1.join(config.android.appDirAbs, 'build', 'outputs', releaseTypeIsAAB ? 'bundle' : 'apk', 'release');
+    const releasePath = (0, path_1.join)(config.android.appDirAbs, 'build', 'outputs', releaseTypeIsAAB ? 'bundle' : 'apk', buildOptions.flavor ? `${flavor}Release` : 'release');
     const unsignedReleaseName = `app${config.android.flavor ? `-${config.android.flavor}` : ''}-release${releaseTypeIsAAB ? '' : '-unsigned'}.${releaseType.toLowerCase()}`;
     const signedReleaseName = unsignedReleaseName.replace(`-release${releaseTypeIsAAB ? '' : '-unsigned'}.${releaseType.toLowerCase()}`, `-release-signed.${releaseType.toLowerCase()}`);
     const signingArgs = [
@@ -47,15 +50,15 @@ async function buildAndroid(config, buildOptions) {
         '-storepass',
         buildOptions.keystorepass,
         `-signedjar`,
-        `${path_1.join(releasePath, signedReleaseName)}`,
-        `${path_1.join(releasePath, unsignedReleaseName)}`,
+        `${(0, path_1.join)(releasePath, signedReleaseName)}`,
+        `${(0, path_1.join)(releasePath, unsignedReleaseName)}`,
         buildOptions.keystorealias,
     ];
-    await common_1.runTask('Signing Release', async () => {
-        await subprocess_1.runCommand('jarsigner', signingArgs, {
+    await (0, common_1.runTask)('Signing Release', async () => {
+        await (0, subprocess_1.runCommand)('jarsigner', signingArgs, {
             cwd: config.android.platformDirAbs,
         });
     });
-    log_1.logSuccess(`Successfully generated ${signedReleaseName} at: ${releasePath}`);
+    (0, log_1.logSuccess)(`Successfully generated ${signedReleaseName} at: ${releasePath}`);
 }
 exports.buildAndroid = buildAndroid;

package/dist/android/common.js

@@ -8,7 +8,7 @@ const cordova_1 = require("../cordova");
 const plugin_1 = require("../plugin");
 const fs_1 = require("../util/fs");
 async function checkAndroidPackage(config) {
-    return common_1.checkCapacitorPlatform(config, 'android');
+    return (0, common_1.checkCapacitorPlatform)(config, 'android');
 }
 exports.checkAndroidPackage = checkAndroidPackage;
 async function getAndroidPlugins(allPlugins) {
@@ -23,24 +23,24 @@ async function resolvePlugin(plugin) {
         let pluginFilesPath = plugin.manifest.android.src
             ? plugin.manifest.android.src
             : platform;
-        const absolutePath = path_1.join(plugin.rootPath, pluginFilesPath, plugin.id);
+        const absolutePath = (0, path_1.join)(plugin.rootPath, pluginFilesPath, plugin.id);
         // Android folder shouldn't have subfolders, but they used to, so search for them for compatibility reasons
-        if (await utils_fs_1.pathExists(absolutePath)) {
-            pluginFilesPath = path_1.join(platform, plugin.id);
+        if (await (0, utils_fs_1.pathExists)(absolutePath)) {
+            pluginFilesPath = (0, path_1.join)(platform, plugin.id);
         }
         plugin.android = {
-            type: 0 /* Core */,
-            path: fs_1.convertToUnixPath(pluginFilesPath),
+            type: 0 /* PluginType.Core */,
+            path: (0, fs_1.convertToUnixPath)(pluginFilesPath),
         };
     }
     else if (plugin.xml) {
         plugin.android = {
-            type: 1 /* Cordova */,
+            type: 1 /* PluginType.Cordova */,
             path: 'src/' + platform,
         };
-        if (cordova_1.getIncompatibleCordovaPlugins(platform).includes(plugin.id) ||
-            !plugin_1.getPluginPlatform(plugin, platform)) {
-            plugin.android.type = 2 /* Incompatible */;
+        if ((0, cordova_1.getIncompatibleCordovaPlugins)(platform).includes(plugin.id) ||
+            !(0, plugin_1.getPluginPlatform)(plugin, platform)) {
+            plugin.android.type = 2 /* PluginType.Incompatible */;
         }
     }
     else {
@@ -61,39 +61,37 @@ async function editProjectSettingsAndroid(config) {
         .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' });
-    manifestContent = manifestContent.replace(/com.getcapacitor.myapp/g, `${appId}`);
-    await utils_fs_1.writeFile(manifestPath, manifestContent, { encoding: 'utf-8' });
+    const buildGradlePath = (0, path_1.resolve)(config.android.appDirAbs, 'build.gradle');
     const domainPath = appId.split('.').join('/');
     // Make the package source path to the new plugin Java file
-    const newJavaPath = path_1.resolve(config.android.srcMainDirAbs, `java/${domainPath}`);
-    if (!(await utils_fs_1.pathExists(newJavaPath))) {
-        await utils_fs_1.mkdirp(newJavaPath);
+    const newJavaPath = (0, path_1.resolve)(config.android.srcMainDirAbs, `java/${domainPath}`);
+    if (!(await (0, utils_fs_1.pathExists)(newJavaPath))) {
+        await (0, utils_fs_1.mkdirp)(newJavaPath);
     }
-    await utils_fs_1.copy(path_1.resolve(config.android.srcMainDirAbs, 'java/com/getcapacitor/myapp/MainActivity.java'), path_1.resolve(newJavaPath, 'MainActivity.java'));
+    await (0, utils_fs_1.copy)((0, path_1.resolve)(config.android.srcMainDirAbs, 'java/com/getcapacitor/myapp/MainActivity.java'), (0, path_1.resolve)(newJavaPath, 'MainActivity.java'));
     if (appId.split('.')[1] !== 'getcapacitor') {
-        await utils_fs_1.remove(path_1.resolve(config.android.srcMainDirAbs, 'java/com/getcapacitor'));
+        await (0, utils_fs_1.remove)((0, path_1.resolve)(config.android.srcMainDirAbs, 'java/com/getcapacitor'));
     }
     // Remove our template 'com' folder if their ID doesn't have it
     if (appId.split('.')[0] !== 'com') {
-        await utils_fs_1.remove(path_1.resolve(config.android.srcMainDirAbs, 'java/com/'));
+        await (0, utils_fs_1.remove)((0, path_1.resolve)(config.android.srcMainDirAbs, 'java/com/'));
     }
     // Update the package in the MainActivity java file
-    const activityPath = path_1.resolve(newJavaPath, 'MainActivity.java');
-    let activityContent = await utils_fs_1.readFile(activityPath, { encoding: 'utf-8' });
+    const activityPath = (0, path_1.resolve)(newJavaPath, 'MainActivity.java');
+    let activityContent = await (0, utils_fs_1.readFile)(activityPath, { encoding: 'utf-8' });
     activityContent = activityContent.replace(/package ([^;]*)/, `package ${appId}`);
-    await utils_fs_1.writeFile(activityPath, activityContent, { encoding: 'utf-8' });
+    await (0, utils_fs_1.writeFile)(activityPath, activityContent, { encoding: 'utf-8' });
     // Update the applicationId in build.gradle
-    let gradleContent = await utils_fs_1.readFile(buildGradlePath, { encoding: 'utf-8' });
+    let gradleContent = await (0, utils_fs_1.readFile)(buildGradlePath, { encoding: 'utf-8' });
     gradleContent = gradleContent.replace(/applicationId "[^"]+"/, `applicationId "${appId}"`);
-    await utils_fs_1.writeFile(buildGradlePath, gradleContent, { encoding: 'utf-8' });
+    // Update the namespace in build.gradle
+    gradleContent = gradleContent.replace(/namespace "[^"]+"/, `namespace "${appId}"`);
+    await (0, utils_fs_1.writeFile)(buildGradlePath, gradleContent, { encoding: 'utf-8' });
     // Update the settings in res/values/strings.xml
-    const stringsPath = path_1.resolve(config.android.resDirAbs, 'values/strings.xml');
-    let stringsContent = await utils_fs_1.readFile(stringsPath, { encoding: 'utf-8' });
+    const stringsPath = (0, path_1.resolve)(config.android.resDirAbs, 'values/strings.xml');
+    let stringsContent = await (0, utils_fs_1.readFile)(stringsPath, { encoding: 'utf-8' });
     stringsContent = stringsContent.replace(/com.getcapacitor.myapp/g, appId);
     stringsContent = stringsContent.replace(/My App/g, appName);
-    await utils_fs_1.writeFile(stringsPath, stringsContent);
+    await (0, utils_fs_1.writeFile)(stringsPath, stringsContent);
 }
 exports.editProjectSettingsAndroid = editProjectSettingsAndroid;

package/dist/android/doctor.js

@@ -13,48 +13,48 @@ const xml_1 = require("../util/xml");
 async function doctorAndroid(config) {
     var _a;
     try {
-        await common_1.check([
+        await (0, common_1.check)([
             checkAndroidInstalled,
             () => checkGradlew(config),
             () => checkAppSrcDirs(config),
         ]);
-        log_1.logSuccess('Android looking great! 👌');
+        (0, log_1.logSuccess)('Android looking great! 👌');
     }
     catch (e) {
-        if (!errors_1.isFatal(e)) {
-            errors_1.fatal((_a = e.stack) !== null && _a !== void 0 ? _a : e);
+        if (!(0, errors_1.isFatal)(e)) {
+            (0, errors_1.fatal)((_a = e.stack) !== null && _a !== void 0 ? _a : e);
         }
         throw e;
     }
 }
 exports.doctorAndroid = doctorAndroid;
 async function checkAppSrcDirs(config) {
-    if (!(await utils_fs_1.pathExists(config.android.appDirAbs))) {
+    if (!(await (0, utils_fs_1.pathExists)(config.android.appDirAbs))) {
         return `${colors_1.default.strong(config.android.appDir)} directory is missing in ${colors_1.default.strong(config.android.platformDir)}`;
     }
-    if (!(await utils_fs_1.pathExists(config.android.srcMainDirAbs))) {
+    if (!(await (0, utils_fs_1.pathExists)(config.android.srcMainDirAbs))) {
         return `${colors_1.default.strong(config.android.srcMainDir)} directory is missing in ${colors_1.default.strong(config.android.platformDir)}`;
     }
-    if (!(await utils_fs_1.pathExists(config.android.assetsDirAbs))) {
+    if (!(await (0, utils_fs_1.pathExists)(config.android.assetsDirAbs))) {
         return `${colors_1.default.strong(config.android.assetsDir)} directory is missing in ${colors_1.default.strong(config.android.platformDir)}`;
     }
-    if (!(await utils_fs_1.pathExists(config.android.webDirAbs))) {
+    if (!(await (0, utils_fs_1.pathExists)(config.android.webDirAbs))) {
         return `${colors_1.default.strong(config.android.webDir)} directory is missing in ${colors_1.default.strong(config.android.platformDir)}`;
     }
-    const appSrcMainAssetsWwwIndexHtmlDir = path_1.join(config.android.webDirAbs, 'index.html');
-    if (!(await utils_fs_1.pathExists(appSrcMainAssetsWwwIndexHtmlDir))) {
+    const appSrcMainAssetsWwwIndexHtmlDir = (0, path_1.join)(config.android.webDirAbs, 'index.html');
+    if (!(await (0, utils_fs_1.pathExists)(appSrcMainAssetsWwwIndexHtmlDir))) {
         return `${colors_1.default.strong('index.html')} file is missing in ${colors_1.default.strong(config.android.webDirAbs)}`;
     }
     return checkAndroidManifestFile(config);
 }
 async function checkAndroidManifestFile(config) {
     const manifestFileName = 'AndroidManifest.xml';
-    const manifestFilePath = path_1.join(config.android.srcMainDirAbs, manifestFileName);
-    if (!(await utils_fs_1.pathExists(manifestFilePath))) {
+    const manifestFilePath = (0, path_1.join)(config.android.srcMainDirAbs, manifestFileName);
+    if (!(await (0, utils_fs_1.pathExists)(manifestFilePath))) {
         return `${colors_1.default.strong(manifestFileName)} is missing in ${colors_1.default.strong(config.android.srcMainDir)}`;
     }
     try {
-        const xmlData = await xml_1.readXML(manifestFilePath);
+        const xmlData = await (0, xml_1.readXML)(manifestFilePath);
         return checkAndroidManifestData(config, xmlData);
     }
     catch (e) {
@@ -124,16 +124,16 @@ async function checkPackage(config, packageId, mainActivityClassPath) {
     if (mainActivityClassPath.indexOf(packageId) !== 0) {
         return (`MainActivity ${mainActivityClassPath} is not in manifest package ${colors_1.default.input(packageId)}.\n` + `Please update the packages to be the same.`);
     }
-    const appSrcMainJavaDir = path_1.join(config.android.srcMainDirAbs, 'java');
-    if (!(await utils_fs_1.pathExists(appSrcMainJavaDir))) {
+    const appSrcMainJavaDir = (0, path_1.join)(config.android.srcMainDirAbs, 'java');
+    if (!(await (0, utils_fs_1.pathExists)(appSrcMainJavaDir))) {
         return `${colors_1.default.strong('java')} directory is missing in ${colors_1.default.strong(appSrcMainJavaDir)}`;
     }
     let checkPath = appSrcMainJavaDir;
     const packageParts = packageId.split('.');
     for (const packagePart of packageParts) {
         try {
-            fs_1.accessSync(path_1.join(checkPath, packagePart));
-            checkPath = path_1.join(checkPath, packagePart);
+            (0, fs_1.accessSync)((0, path_1.join)(checkPath, packagePart));
+            checkPath = (0, path_1.join)(checkPath, packagePart);
         }
         catch (e) {
             return (`${colors_1.default.strong(packagePart)} is missing in ${checkPath}.\n` +
@@ -142,19 +142,19 @@ async function checkPackage(config, packageId, mainActivityClassPath) {
     }
     const mainActivityClassName = mainActivityClassPath.split('.').pop();
     const mainActivityClassFileName = `${mainActivityClassName}.java`;
-    const mainActivityClassFilePath = path_1.join(checkPath, mainActivityClassFileName);
-    if (!(await utils_fs_1.pathExists(mainActivityClassFilePath))) {
+    const mainActivityClassFilePath = (0, path_1.join)(checkPath, mainActivityClassFileName);
+    if (!(await (0, utils_fs_1.pathExists)(mainActivityClassFilePath))) {
         return `Main activity file (${mainActivityClassFileName}) is missing in ${checkPath}`;
     }
     return checkBuildGradle(config, packageId);
 }
 async function checkBuildGradle(config, packageId) {
     const fileName = 'build.gradle';
-    const filePath = path_1.join(config.android.appDirAbs, fileName);
-    if (!(await utils_fs_1.pathExists(filePath))) {
+    const filePath = (0, path_1.join)(config.android.appDirAbs, fileName);
+    if (!(await (0, utils_fs_1.pathExists)(filePath))) {
         return `${colors_1.default.strong(fileName)} file is missing in ${colors_1.default.strong(config.android.appDir)}`;
     }
-    let fileContent = await utils_fs_1.readFile(filePath, { encoding: 'utf-8' });
+    let fileContent = await (0, utils_fs_1.readFile)(filePath, { encoding: 'utf-8' });
     fileContent = fileContent.replace(/'|"/g, '').replace(/\s+/g, ' ');
     const searchFor = `applicationId ${packageId}`;
     if (fileContent.indexOf(searchFor) === -1) {
@@ -164,8 +164,8 @@ async function checkBuildGradle(config, packageId) {
 }
 async function checkGradlew(config) {
     const fileName = 'gradlew';
-    const filePath = path_1.join(config.android.platformDirAbs, fileName);
-    if (!(await utils_fs_1.pathExists(filePath))) {
+    const filePath = (0, path_1.join)(config.android.platformDirAbs, fileName);
+    if (!(await (0, utils_fs_1.pathExists)(filePath))) {
         return `${colors_1.default.strong(fileName)} file is missing in ${colors_1.default.strong(config.android.platformDir)}`;
     }
     return null;

package/dist/android/open.js

@@ -7,15 +7,15 @@ const debug_1 = tslib_1.__importDefault(require("debug"));
 const open_1 = tslib_1.__importDefault(require("open"));
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const log_1 = require("../log");
-const debug = debug_1.default('capacitor:android:open');
+const debug = (0, debug_1.default)('capacitor:android:open');
 async function openAndroid(config) {
     const androidStudioPath = await config.android.studioPath;
     const dir = config.android.platformDirAbs;
     try {
-        if (!(await utils_fs_1.pathExists(androidStudioPath))) {
+        if (!(await (0, utils_fs_1.pathExists)(androidStudioPath))) {
             throw new Error(`Android Studio does not exist at: ${androidStudioPath}`);
         }
-        await open_1.default(dir, { app: { name: androidStudioPath }, wait: false });
+        await (0, open_1.default)(dir, { app: { name: androidStudioPath }, wait: false });
         log_1.logger.info(`Opening Android project at: ${colors_1.default.strong(config.android.platformDir)}.`);
     }
     catch (e) {

package/dist/android/run.js

@@ -8,16 +8,16 @@ const colors_1 = tslib_1.__importDefault(require("../colors"));
 const common_1 = require("../common");
 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, flavor: selectedFlavor }) {
+const debug = (0, debug_1.default)('capacitor:android:run');
+async function runAndroid(config, { target: selectedTarget, flavor: selectedFlavor, forwardPorts: selectedPorts, }) {
     var _a;
-    const target = await common_1.promptForPlatformTarget(await native_run_1.getPlatformTargets('android'), selectedTarget);
+    const target = await (0, common_1.promptForPlatformTarget)(await (0, native_run_1.getPlatformTargets)('android'), selectedTarget);
     const runFlavor = selectedFlavor || ((_a = config.android) === null || _a === void 0 ? void 0 : _a.flavor) || '';
     const arg = `assemble${runFlavor}Debug`;
     const gradleArgs = [arg];
     debug('Invoking ./gradlew with args: %O', gradleArgs);
     try {
-        await common_1.runTask('Running Gradle build', async () => subprocess_1.runCommand('./gradlew', gradleArgs, {
+        await (0, common_1.runTask)('Running Gradle build', async () => (0, subprocess_1.runCommand)('./gradlew', gradleArgs, {
             cwd: config.android.platformDirAbs,
         }));
     }
@@ -31,9 +31,12 @@ async function runAndroid(config, { target: selectedTarget, flavor: selectedFlav
     }
     const pathToApk = `${config.android.platformDirAbs}/${config.android.appDir}/build/outputs/apk${runFlavor !== '' ? '/' + runFlavor : ''}/debug`;
     const apkName = `app${runFlavor !== '' ? '-' + runFlavor : ''}-debug.apk`;
-    const apkPath = path_1.resolve(pathToApk, apkName);
+    const apkPath = (0, path_1.resolve)(pathToApk, apkName);
     const nativeRunArgs = ['android', '--app', apkPath, '--target', target.id];
+    if (selectedPorts) {
+        nativeRunArgs.push('--forward', `${selectedPorts}`);
+    }
     debug('Invoking native-run with args: %O', nativeRunArgs);
-    await common_1.runTask(`Deploying ${colors_1.default.strong(apkName)} to ${colors_1.default.input(target.id)}`, async () => native_run_1.runNativeRun(nativeRunArgs));
+    await (0, common_1.runTask)(`Deploying ${colors_1.default.strong(apkName)} to ${colors_1.default.input(target.id)}`, async () => (0, native_run_1.runNativeRun)(nativeRunArgs));
 }
 exports.runAndroid = runAndroid;