@capacitor/cli 6.2.0 → 7.0.0-alpha.2

package/dist/android/build.js

@@ -12,9 +12,7 @@ async function buildAndroid(config, buildOptions) {
     const releaseType = (_a = buildOptions.androidreleasetype) !== null && _a !== void 0 ? _a : 'AAB';
     const releaseTypeIsAAB = releaseType === 'AAB';
     const flavor = (_b = buildOptions.flavor) !== null && _b !== void 0 ? _b : '';
-    const arg = releaseTypeIsAAB
-        ? `:app:bundle${flavor}Release`
-        : `assemble${flavor}Release`;
+    const arg = releaseTypeIsAAB ? `:app:bundle${flavor}Release` : `assemble${flavor}Release`;
     const gradleArgs = [arg];
     try {
         await (0, common_1.runTask)('Running Gradle build', async () => (0, subprocess_1.runCommand)('./gradlew', gradleArgs, {

package/dist/android/common.js

@@ -20,9 +20,7 @@ async function resolvePlugin(plugin) {
     var _a;
     const platform = 'android';
     if ((_a = plugin.manifest) === null || _a === void 0 ? void 0 : _a.android) {
-        let pluginFilesPath = plugin.manifest.android.src
-            ? plugin.manifest.android.src
-            : platform;
+        let pluginFilesPath = plugin.manifest.android.src ? plugin.manifest.android.src : platform;
         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 (0, utils_fs_1.pathExists)(absolutePath)) {
@@ -38,8 +36,7 @@ async function resolvePlugin(plugin) {
             type: 1 /* PluginType.Cordova */,
             path: 'src/' + platform,
         };
-        if ((0, cordova_1.getIncompatibleCordovaPlugins)(platform).includes(plugin.id) ||
-            !(0, plugin_1.getPluginPlatform)(plugin, platform)) {
+        if ((0, cordova_1.getIncompatibleCordovaPlugins)(platform).includes(plugin.id) || !(0, plugin_1.getPluginPlatform)(plugin, platform)) {
             plugin.android.type = 2 /* PluginType.Incompatible */;
         }
     }

package/dist/android/doctor.js

@@ -12,11 +12,7 @@ const xml_1 = require("../util/xml");
 async function doctorAndroid(config) {
     var _a;
     try {
-        await (0, common_1.check)([
-            checkAndroidInstalled,
-            () => checkGradlew(config),
-            () => checkAppSrcDirs(config),
-        ]);
+        await (0, common_1.check)([checkAndroidInstalled, () => checkGradlew(config), () => checkAppSrcDirs(config)]);
         (0, log_1.logSuccess)('Android looking great! 👌');
     }
     catch (e) {
@@ -70,22 +66,22 @@ async function checkAndroidManifestData(config, xmlData) {
         return `Missing ${colors_1.default.input('<application>')} XML node as a child node of ${colors_1.default.input('<manifest>')} in ${colors_1.default.strong(config.android.srcMainDir)}`;
     }
     let mainActivityClassPath = '';
-    const mainApplicationNode = applicationChildNodes.find(applicationChildNode => {
+    const mainApplicationNode = applicationChildNodes.find((applicationChildNode) => {
         const activityChildNodes = applicationChildNode.activity;
         if (!Array.isArray(activityChildNodes)) {
             return false;
         }
-        const mainActivityNode = activityChildNodes.find(activityChildNode => {
+        const mainActivityNode = activityChildNodes.find((activityChildNode) => {
             const intentFilterChildNodes = activityChildNode['intent-filter'];
             if (!Array.isArray(intentFilterChildNodes)) {
                 return false;
             }
-            return intentFilterChildNodes.find(intentFilterChildNode => {
+            return intentFilterChildNodes.find((intentFilterChildNode) => {
                 const actionChildNodes = intentFilterChildNode.action;
                 if (!Array.isArray(actionChildNodes)) {
                     return false;
                 }
-                const mainActionChildNode = actionChildNodes.find(actionChildNode => {
+                const mainActionChildNode = actionChildNodes.find((actionChildNode) => {
                     const androidName = actionChildNode.$['android:name'];
                     return androidName === 'android.intent.action.MAIN';
                 });
@@ -96,7 +92,7 @@ async function checkAndroidManifestData(config, xmlData) {
                 if (!Array.isArray(categoryChildNodes)) {
                     return false;
                 }
-                return categoryChildNodes.find(categoryChildNode => {
+                return categoryChildNodes.find((categoryChildNode) => {
                     const androidName = categoryChildNode.$['android:name'];
                     return androidName === 'android.intent.category.LAUNCHER';
                 });
@@ -122,7 +118,7 @@ async function checkPackage(config, mainActivityClassPath) {
     }
     const mainActivityClassName = mainActivityClassPath.split('.').pop();
     const srcFiles = await (0, utils_fs_1.readdirp)(appSrcMainJavaDir, {
-        filter: entry => !entry.stats.isDirectory() &&
+        filter: (entry) => !entry.stats.isDirectory() &&
             ['.java', '.kt'].includes((0, path_1.extname)(entry.path)) &&
             mainActivityClassName === (0, path_1.parse)(entry.path).name,
     });

package/dist/android/run.js

@@ -9,7 +9,7 @@ const common_1 = require("../common");
 const native_run_1 = require("../util/native-run");
 const subprocess_1 = require("../util/subprocess");
 const debug = (0, debug_1.default)('capacitor:android:run');
-async function runAndroid(config, { target: selectedTarget, flavor: selectedFlavor, forwardPorts: selectedPorts, }) {
+async function runAndroid(config, { target: selectedTarget, flavor: selectedFlavor, forwardPorts: selectedPorts }) {
     var _a;
     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) || '';

package/dist/android/update.js

@@ -20,11 +20,11 @@ const platform = 'android';
 const debug = (0, debug_1.default)('capacitor:android:update');
 async function updateAndroid(config) {
     const plugins = await getPluginsTask(config);
-    const capacitorPlugins = plugins.filter(p => (0, plugin_1.getPluginType)(p, platform) === 0 /* PluginType.Core */);
+    const capacitorPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 0 /* PluginType.Core */);
     (0, plugin_1.printPlugins)(capacitorPlugins, 'android');
     await writePluginsJson(config, capacitorPlugins);
     await removePluginsNativeFiles(config);
-    const cordovaPlugins = plugins.filter(p => (0, plugin_1.getPluginType)(p, platform) === 1 /* PluginType.Cordova */);
+    const cordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 1 /* PluginType.Cordova */);
     await (0, migrate_1.patchOldCapacitorPlugins)(config);
     if (cordovaPlugins.length > 0) {
         await copyPluginsNativeFiles(config, cordovaPlugins);
@@ -37,7 +37,7 @@ async function updateAndroid(config) {
     await installGradlePlugins(config, capacitorPlugins, cordovaPlugins);
     await handleCordovaPluginsGradle(config, cordovaPlugins);
     await (0, cordova_1.writeCordovaAndroidManifest)(cordovaPlugins, config, platform);
-    const incompatibleCordovaPlugins = plugins.filter(p => (0, plugin_1.getPluginType)(p, platform) === 2 /* PluginType.Incompatible */);
+    const incompatibleCordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 2 /* PluginType.Incompatible */);
     (0, plugin_1.printPlugins)(incompatibleCordovaPlugins, platform, 'incompatible');
     await (0, common_1.checkPlatformVersions)(config, platform);
 }
@@ -63,8 +63,7 @@ async function findAndroidPluginClassesInPlugin(plugin) {
     }
     const srcPath = (0, path_1.resolve)(plugin.rootPath, plugin.android.path, 'src/main');
     const srcFiles = await (0, utils_fs_1.readdirp)(srcPath, {
-        filter: entry => !entry.stats.isDirectory() &&
-            ['.java', '.kt'].includes((0, path_1.extname)(entry.path)),
+        filter: (entry) => !entry.stats.isDirectory() && ['.java', '.kt'].includes((0, path_1.extname)(entry.path)),
     });
     const classRegex = /^@(?:CapacitorPlugin|NativePlugin)[\s\S]+?class ([\w]+)/gm;
     const packageRegex = /^package ([\w.]+);?$/gm;
@@ -79,8 +78,7 @@ async function findAndroidPluginClassesInPlugin(plugin) {
             packageRegex.lastIndex = 0;
             const packageMatch = packageRegex.exec(srcFileContents.substring(0, classMatch.index));
             if (!packageMatch) {
-                (0, errors_1.fatal)(`Package could not be parsed from Android plugin.\n` +
-                    `Location: ${colors_1.default.strong(srcFile)}`);
+                (0, errors_1.fatal)(`Package could not be parsed from Android plugin.\n` + `Location: ${colors_1.default.strong(srcFile)}`);
             }
             const packageName = packageMatch[1];
             const classpath = `${packageName}.${className}`;
@@ -107,7 +105,7 @@ async function installGradlePlugins(config, capacitorPlugins, cordovaPlugins) {
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('${relativeCapcitorAndroidPath}')
 ${capacitorPlugins
-        .map(p => {
+        .map((p) => {
         if (!p.android) {
             return '';
         }
@@ -121,7 +119,7 @@ project(':${getGradlePackageName(p.id)}').projectDir = new File('${relativePlugi
     const applyArray = [];
     const frameworksArray = [];
     let prefsArray = [];
-    cordovaPlugins.map(p => {
+    cordovaPlugins.map((p) => {
         const relativePluginPath = (0, fs_1.convertToUnixPath)((0, path_1.relative)(dependencyPath, p.rootPath));
         const frameworks = (0, plugin_1.getPlatformElement)(p, platform, 'framework');
         frameworks.map((framework) => {
@@ -156,7 +154,7 @@ android {
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
 ${capacitorPlugins
-        .map(p => {
+        .map((p) => {
         return `    implementation project(':${getGradlePackageName(p.id)}')`;
     })
         .join('\n')}
@@ -181,7 +179,7 @@ async function handleCordovaPluginsGradle(config, cordovaPlugins) {
     let prefsArray = [];
     const applyArray = [];
     applyArray.push(`apply from: "cordova.variables.gradle"`);
-    cordovaPlugins.map(p => {
+    cordovaPlugins.map((p) => {
         const relativePluginPath = (0, fs_1.convertToUnixPath)((0, path_1.relative)(config.android.cordovaPluginsDirAbs, p.rootPath));
         const frameworks = (0, plugin_1.getPlatformElement)(p, platform, 'framework');
         frameworks.map((framework) => {
@@ -198,7 +196,7 @@ async function handleCordovaPluginsGradle(config, cordovaPlugins) {
         prefsArray = prefsArray.concat((0, plugin_1.getAllElements)(p, platform, 'preference'));
     });
     let frameworkString = frameworksArray
-        .map(f => {
+        .map((f) => {
         if (f.startsWith('platform(')) {
             return `    implementation ${f}`;
         }
@@ -236,8 +234,7 @@ ext {
 exports.handleCordovaPluginsGradle = handleCordovaPluginsGradle;
 async function kotlinNeededCheck(config, cordovaPlugins) {
     var _a, _b;
-    if (((_b = (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.preferences) === null || _b === void 0 ? void 0 : _b.GradlePluginKotlinEnabled) !==
-        'true') {
+    if (((_b = (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.preferences) === null || _b === void 0 ? void 0 : _b.GradlePluginKotlinEnabled) !== 'true') {
         for (const plugin of cordovaPlugins) {
             const androidPlatform = (0, plugin_1.getPluginPlatform)(plugin, platform);
             const sourceFiles = androidPlatform['source-file'];
@@ -268,9 +265,7 @@ async function copyPluginsNativeFiles(config, cordovaPlugins) {
                     if (fileName.split('.').pop() === 'aidl') {
                         baseFolder = 'aidl/';
                     }
-                    const target = sourceFile.$['target-dir']
-                        .replace('app/src/main/', '')
-                        .replace('src/', baseFolder);
+                    const target = sourceFile.$['target-dir'].replace('app/src/main/', '').replace('src/', baseFolder);
                     await (0, utils_fs_1.copy)((0, plugin_1.getFilePath)(config, p, sourceFile.$.src), (0, path_1.join)(pluginsPath, target, fileName));
                 }
             }

package/dist/common.js

@@ -13,8 +13,8 @@ const monorepotools_1 = require("./util/monorepotools");
 const node_1 = require("./util/node");
 const subprocess_1 = require("./util/subprocess");
 async function check(checks) {
-    const results = await Promise.all(checks.map(f => f()));
-    const errors = results.filter(r => r != null);
+    const results = await Promise.all(checks.map((f) => f()));
+    const errors = results.filter((r) => r != null);
     if (errors.length > 0) {
         throw errors.join('\n');
     }
@@ -93,12 +93,20 @@ async function checkAppDir(config, dir) {
 exports.checkAppDir = checkAppDir;
 async function checkAppId(config, id) {
     if (!id) {
-        return `Invalid App ID. Must be in Java package form with no dashes (ex: com.example.app)`;
+        return `Invalid App ID. App ID is required and cannot be blank.`;
     }
-    if (/^[a-z][a-z0-9_]*(\.[a-z0-9_]+)+$/.test(id.toLowerCase())) {
+    if (/^[a-zA-Z][\w]*(?:\.[a-zA-Z][\w]*)+$/.test(id.toLowerCase())) {
         return null;
     }
-    return `Invalid App ID "${id}". Must be in Java package form with no dashes (ex: com.example.app)`;
+    return `
+    Invalid App ID "${id}". Your App ID must meet the following requirements to be valid on both iOS and Android:
+    - Must be in Java package form with no dashes (ex: com.example.app)
+    - It must have at least two segments (one or more dots).
+    - Each segment must start with a letter.
+    - All characters must be alphanumeric or an underscore [a-zA-Z][a-zA-Z0-9]+.
+
+    If you would like to skip validation, run "cap init" with the "--skip-appid-validation" flag.
+  `;
 }
 exports.checkAppId = checkAppId;
 async function checkAppName(config, name) {
@@ -110,7 +118,7 @@ async function checkAppName(config, name) {
 }
 exports.checkAppName = checkAppName;
 async function wait(time) {
-    return new Promise(resolve => setTimeout(resolve, time));
+    return new Promise((resolve) => setTimeout(resolve, time));
 }
 exports.wait = wait;
 async function runHooks(config, platformName, dir, hook) {
@@ -152,7 +160,7 @@ async function runPlatformHook(config, platformName, platformDir, hook) {
         p.on('close', () => {
             resolve();
         });
-        p.on('error', err => {
+        p.on('error', (err) => {
             reject(err);
         });
     });
@@ -229,8 +237,7 @@ async function selectPlatforms(config, selectedPlatformName) {
         }
         else if (!(await getProjectPlatformDirectory(config, platformName))) {
             if (platformName === 'web') {
-                (0, errors_1.fatal)(`Could not find the web platform directory.\n` +
-                    `Make sure ${colors_1.default.strong(config.app.webDir)} exists.`);
+                (0, errors_1.fatal)(`Could not find the web platform directory.\n` + `Make sure ${colors_1.default.strong(config.app.webDir)} exists.`);
             }
             (0, errors_1.fatal)(`${colors_1.default.strong(platformName)} platform has not been added yet.\n` +
                 `See the docs for adding the ${colors_1.default.strong(platformName)} platform: ${colors_1.default.strong(`https://capacitorjs.com/docs/${platformName}#adding-the-${platformName}-platform`)}`);
@@ -275,7 +282,7 @@ async function promptForPlatform(platforms, promptMessage, selectedPlatformName)
                 type: 'select',
                 name: 'mode',
                 message: promptMessage,
-                choices: platforms.map(p => ({ title: p, value: p })),
+                choices: platforms.map((p) => ({ title: p, value: p })),
             },
         ], { onCancel: () => process.exit(1) });
         return answers.mode.toLowerCase().trim();
@@ -283,15 +290,14 @@ async function promptForPlatform(platforms, promptMessage, selectedPlatformName)
     const platformName = selectedPlatformName.toLowerCase().trim();
     if (!(await isValidPlatform(platformName))) {
         const knownPlatforms = await getKnownPlatforms();
-        (0, errors_1.fatal)(`Invalid platform: ${colors_1.default.input(platformName)}.\n` +
-            `Valid platforms include: ${knownPlatforms.join(', ')}`);
+        (0, errors_1.fatal)(`Invalid platform: ${colors_1.default.input(platformName)}.\n` + `Valid platforms include: ${knownPlatforms.join(', ')}`);
     }
     return platformName;
 }
 exports.promptForPlatform = promptForPlatform;
 async function promptForPlatformTarget(targets, selectedTarget) {
     const { prompt } = await Promise.resolve().then(() => tslib_1.__importStar(require('prompts')));
-    const validTargets = targets.filter(t => t.id !== undefined);
+    const validTargets = targets.filter((t) => t.id !== undefined);
     if (!selectedTarget) {
         if (validTargets.length === 1) {
             return validTargets[0];
@@ -302,7 +308,7 @@ async function promptForPlatformTarget(targets, selectedTarget) {
                     type: 'select',
                     name: 'target',
                     message: 'Please choose a target device:',
-                    choices: validTargets.map(t => ({
+                    choices: validTargets.map((t) => ({
                         title: `${getPlatformTargetName(t)} (${t.id})`,
                         value: t,
                     })),
@@ -312,19 +318,16 @@ async function promptForPlatformTarget(targets, selectedTarget) {
         }
     }
     const targetID = selectedTarget.trim();
-    const target = targets.find(t => t.id === targetID);
+    const target = targets.find((t) => t.id === targetID);
     if (!target) {
-        (0, errors_1.fatal)(`Invalid target ID: ${colors_1.default.input(targetID)}.\n` +
-            `Valid targets are: ${targets.map(t => t.id).join(', ')}`);
+        (0, errors_1.fatal)(`Invalid target ID: ${colors_1.default.input(targetID)}.\n` + `Valid targets are: ${targets.map((t) => t.id).join(', ')}`);
     }
     return target;
 }
 exports.promptForPlatformTarget = promptForPlatformTarget;
 function getPlatformTargetName(target) {
     var _a, _b, _c;
-    return `${(_c = (_b = (_a = target.name) !== null && _a !== void 0 ? _a : target.model) !== null && _b !== void 0 ? _b : target.id) !== null && _c !== void 0 ? _c : '?'}${target.virtual
-        ? ` (${target.platform === 'ios' ? 'simulator' : 'emulator'})`
-        : ''}`;
+    return `${(_c = (_b = (_a = target.name) !== null && _a !== void 0 ? _a : target.model) !== null && _b !== void 0 ? _b : target.id) !== null && _c !== void 0 ? _c : '?'}${target.virtual ? ` (${target.platform === 'ios' ? 'simulator' : 'emulator'})` : ''}`;
 }
 exports.getPlatformTargetName = getPlatformTargetName;
 async function getAddedPlatforms(config) {
@@ -343,8 +346,7 @@ async function checkPlatformVersions(config, platform) {
     const semver = await Promise.resolve().then(() => tslib_1.__importStar(require('semver')));
     const coreVersion = await getCoreVersion(config);
     const platformVersion = await getCapacitorPackageVersion(config, platform);
-    if (semver.diff(coreVersion, platformVersion) === 'minor' ||
-        semver.diff(coreVersion, platformVersion) === 'major') {
+    if (semver.diff(coreVersion, platformVersion) === 'minor' || semver.diff(coreVersion, platformVersion) === 'major') {
         log_1.logger.warn(`${colors_1.default.strong('@capacitor/core')}${colors_1.default.weak(`@${coreVersion}`)} version doesn't match ${colors_1.default.strong(`@capacitor/${platform}`)}${colors_1.default.weak(`@${platformVersion}`)} version.\n` +
             `Consider updating to a matching version, e.g. w/ ${colors_1.default.input(`npm install @capacitor/core@${platformVersion}`)}`);
     }
@@ -386,9 +388,7 @@ async function checkJDKMajorVersion() {
         if (typeof firstVersionNumber === 'number' && firstVersionNumber != 1) {
             return firstVersionNumber;
         }
-        else if (typeof secondVersionNumber === 'number' &&
-            firstVersionNumber == 1 &&
-            secondVersionNumber < 9) {
+        else if (typeof secondVersionNumber === 'number' && firstVersionNumber == 1 && secondVersionNumber < 9) {
             return secondVersionNumber;
         }
         else {

package/dist/config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkExternalConfig = exports.writeConfig = exports.loadConfig = exports.CONFIG_FILE_NAME_JSON = exports.CONFIG_FILE_NAME_JS = exports.CONFIG_FILE_NAME_TS = void 0;
+exports.writeConfig = exports.loadConfig = exports.CONFIG_FILE_NAME_JSON = exports.CONFIG_FILE_NAME_JS = exports.CONFIG_FILE_NAME_TS = void 0;
 const tslib_1 = require("tslib");
 const utils_fs_1 = require("@ionic/utils-fs");
 const debug_1 = tslib_1.__importDefault(require("debug"));
@@ -88,9 +88,7 @@ async function loadExtConfigTS(rootDir, extConfigName, extConfigFilePath) {
         }
         const ts = require(tsPath); // eslint-disable-line @typescript-eslint/no-var-requires
         const extConfigObject = (0, node_1.requireTS)(ts, extConfigFilePath);
-        const extConfig = extConfigObject.default
-            ? await extConfigObject.default
-            : extConfigObject;
+        const extConfig = extConfigObject.default ? await extConfigObject.default : extConfigObject;
         return {
             extConfigType: 'ts',
             extConfigName,
@@ -196,7 +194,7 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
     };
     return {
         name,
-        minVersion: '22',
+        minVersion: '23',
         studioPath,
         platformDir,
         platformDirAbs,
@@ -239,7 +237,7 @@ async function loadIOSConfig(rootDir, extConfig) {
     const cordovaPluginsDir = 'capacitor-cordova-ios-plugins';
     return {
         name,
-        minVersion: '13.0',
+        minVersion: '14.0',
         platformDir,
         platformDirAbs,
         scheme,
@@ -386,13 +384,3 @@ const config: CapacitorConfig = ${(0, js_1.formatJSObject)(extConfig)};
 
 export default config;\n`;
 }
-function checkExternalConfig(config) {
-    if (typeof config.extConfig.bundledWebRuntime !== 'undefined') {
-        let actionMessage = `Can be safely deleted.`;
-        if (config.extConfig.bundledWebRuntime === true) {
-            actionMessage = `Please, use a bundler to bundle Capacitor and its plugins.`;
-        }
-        log_1.logger.warn(`The ${colors_1.default.strong('bundledWebRuntime')} configuration option has been deprecated. ${actionMessage}`);
-    }
-}
-exports.checkExternalConfig = checkExternalConfig;