@capacitor/cli 5.0.0-alpha.1 → 5.0.0-alpha.2

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 ||
@@ -32,7 +35,7 @@ async function buildAndroid(config, buildOptions) {
             throw e;
         }
     }
-    const releasePath = (0, 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 = [

package/dist/config.js

@@ -17,7 +17,7 @@ exports.CONFIG_FILE_NAME_TS = 'capacitor.config.ts';
 exports.CONFIG_FILE_NAME_JS = 'capacitor.config.js';
 exports.CONFIG_FILE_NAME_JSON = 'capacitor.config.json';
 async function loadConfig() {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const appRootDir = process.cwd();
     const cliRootDir = (0, path_1.dirname)(__dirname);
     const conf = await loadExtConfig(appRootDir);
@@ -41,7 +41,6 @@ async function loadConfig() {
                 version: '1.0.0',
             },
             ...conf,
-            bundledWebRuntime: (_e = conf.extConfig.bundledWebRuntime) !== null && _e !== void 0 ? _e : false,
         },
     };
     debug('config: %O', config);
@@ -338,5 +337,12 @@ function checkExternalConfig(config) {
         log_1.logger.warn(`The ${colors_1.default.strong('hideLogs')} configuration option has been deprecated. ` +
             `Please update to use ${colors_1.default.strong('loggingBehavior')} instead.`);
     }
+    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;

package/dist/cordova.js

@@ -696,16 +696,22 @@ async function writeCordovaAndroidManifest(cordovaPlugins, config, platform) {
                                                 }
                                             }
                                             else {
-                                                let foundRequiredElement = false;
-                                                for (const existingElementItem of existingElement.children) {
-                                                    const foundRequiredElementIn = doesElementMatch(requiredElement, existingElementItem);
-                                                    if (foundRequiredElementIn) {
-                                                        foundRequiredElement = true;
-                                                        break;
-                                                    }
+                                                if (requiredElement.children === undefined &&
+                                                    existingElement.children === undefined) {
+                                                    return true;
                                                 }
-                                                if (!foundRequiredElement) {
-                                                    return false;
+                                                else {
+                                                    let foundRequiredElement = false;
+                                                    for (const existingElementItem of existingElement.children) {
+                                                        const foundRequiredElementIn = doesElementMatch(requiredElement, existingElementItem);
+                                                        if (foundRequiredElementIn) {
+                                                            foundRequiredElement = true;
+                                                            break;
+                                                        }
+                                                    }
+                                                    if (!foundRequiredElement) {
+                                                        return false;
+                                                    }
                                                 }
                                             }
                                         }
@@ -780,8 +786,7 @@ async function writeCordovaAndroidManifest(cordovaPlugins, config, platform) {
         ? cleartextString
         : '';
     let content = `<?xml version='1.0' encoding='utf-8'?>
-<manifest package="capacitor.android.plugins"
-xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest 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')}

package/dist/declarations.d.ts

@@ -33,7 +33,10 @@ export interface CapacitorConfig {
      * will create a `capacitor.js` file that you'll need to add as a script in
      * your `index.html` file.
      *
+     * It's deprecated and will be removed in Capacitor 6
+     *
      * @since 1.0.0
+     * @deprecated 5.0.0
      * @default false
      */
     bundledWebRuntime?: boolean;
@@ -204,6 +207,19 @@ export interface CapacitorConfig {
          * @default 60
          */
         minWebViewVersion?: number;
+        /**
+         * The minimum supported Huawei webview version on Android supported by your app.
+         *
+         * The minimum supported cannot be lower than version `10`, which is required for Capacitor.
+         *
+         * If the device uses a lower WebView version, an error message will be shown on Logcat.
+         * If `server.errorPath` is configured, the WebView will redirect to that file, so can be
+         * used to show a custom error.
+         *
+         * @since 4.6.4
+         * @default 10
+         */
+        minHuaweiWebViewVersion?: number;
         buildOptions?: {
             /**
              * Path to your keystore

package/dist/index.js

@@ -61,7 +61,7 @@ function runProgram(config) {
     commander_1.program
         .command('sync [platform]')
         .description(`${colors_1.default.input('copy')} + ${colors_1.default.input('update')}`)
-        .option('--deployment', "Optional: if provided, Podfile.lock won't be deleted and pod install will use --deployment option")
+        .option('--deployment', 'Optional: if provided, pod install will use --deployment option')
         .option('--inline', 'Optional: if true, all source maps will be inlined for easier debugging on mobile devices', false)
         .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { deployment, inline }) => {
         (0, config_1.checkExternalConfig)(config.app);
@@ -71,7 +71,7 @@ function runProgram(config) {
     commander_1.program
         .command('update [platform]')
         .description(`updates the native plugins and dependencies based on ${colors_1.default.strong('package.json')}`)
-        .option('--deployment', "Optional: if provided, Podfile.lock won't be deleted and pod install will use --deployment option")
+        .option('--deployment', 'Optional: if provided, pod install will use --deployment option')
         .action((0, cli_1.wrapAction)((0, telemetry_1.telemetryAction)(config, async (platform, { deployment }) => {
         (0, config_1.checkExternalConfig)(config.app);
         const { updateCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/update')));
@@ -90,6 +90,7 @@ function runProgram(config) {
         .command('build <platform>')
         .description('builds the release version of the selected platform')
         .option('--scheme <schemeToBuild>', 'iOS Scheme to build')
+        .option('--flavor <flavorToBuild>', 'Android Flavor to build')
         .option('--keystorepath <keystorePath>', 'Path to the keystore')
         .option('--keystorepass <keystorePass>', 'Password to the keystore')
         .option('--keystorealias <keystoreAlias>', 'Key Alias in the keystore')

package/dist/ios/update.js

@@ -48,15 +48,11 @@ exports.installCocoaPodsPlugins = installCocoaPodsPlugins;
 async function updatePodfile(config, plugins, deployment) {
     const dependenciesContent = await generatePodFile(config, plugins);
     const podfilePath = (0, path_1.join)(config.ios.nativeProjectDirAbs, 'Podfile');
-    const podfileLockPath = (0, path_1.join)(config.ios.nativeProjectDirAbs, 'Podfile.lock');
     let podfileContent = await (0, utils_fs_1.readFile)(podfilePath, { encoding: 'utf-8' });
     podfileContent = podfileContent.replace(/(def capacitor_pods)[\s\S]+?(\nend)/, `$1${dependenciesContent}$2`);
     await (0, utils_fs_1.writeFile)(podfilePath, podfileContent, { encoding: 'utf-8' });
     const podCommandExists = await (0, subprocess_1.isInstalled)('pod');
     if (podCommandExists) {
-        if (!deployment) {
-            await (0, utils_fs_1.remove)(podfileLockPath);
-        }
         await (0, subprocess_1.runCommand)(config.ios.podPath, ['install', ...(deployment ? ['--deployment'] : [])], { cwd: config.ios.nativeProjectDirAbs });
     }
     else {

package/dist/tasks/build.js

@@ -17,6 +17,7 @@ async function buildCommand(config, selectedPlatformName, buildOptions) {
     }
     const buildCommandOptions = {
         scheme: buildOptions.scheme || config.ios.scheme,
+        flavor: buildOptions.flavor || config.android.flavor,
         keystorepath: buildOptions.keystorepath || config.android.buildOptions.keystorePath,
         keystorepass: buildOptions.keystorepass || config.android.buildOptions.keystorePassword,
         keystorealias: buildOptions.keystorealias || config.android.buildOptions.keystoreAlias,

package/dist/tasks/init.js

@@ -41,7 +41,6 @@ async function initCommand(config, name, id, webDirFromCLI) {
             appId,
             appName,
             webDir,
-            bundledWebRuntime: false,
             server: {
                 androidScheme: androidScheme,
             },

package/dist/tasks/migrate.js

@@ -12,7 +12,6 @@ const log_1 = require("../log");
 const fs_1 = require("../util/fs");
 const subprocess_1 = require("../util/subprocess");
 const template_1 = require("../util/template");
-const xml_1 = require("../util/xml");
 // eslint-disable-next-line prefer-const
 let allDependencies = {};
 const libs = [
@@ -41,20 +40,25 @@ const plugins = [
     '@capacitor/preferences',
     '@capacitor/push-notifications',
     '@capacitor/screen-reader',
+    '@capacitor/screen-orientation',
     '@capacitor/share',
     '@capacitor/splash-screen',
     '@capacitor/status-bar',
     '@capacitor/text-zoom',
     '@capacitor/toast',
 ];
-const coreVersion = '^4.0.0';
-const pluginVersion = '^4.0.0';
-const gradleVersion = '7.4.2';
+const coreVersion = 'next'; // TODO: Update when Capacitor 5 releases
+const pluginVersion = 'next'; // TODO: Update when Capacitor 5 releases
+const gradleVersion = '7.5';
 async function migrateCommand(config) {
     if (config === null) {
         (0, errors_1.fatal)('Config data missing');
     }
-    const variablesAndClasspaths = await getAndroidVarriablesAndClasspaths(config);
+    const capMajor = await checkCapacitorMajorVersion(config);
+    if (capMajor < 4) {
+        (0, errors_1.fatal)('Migrate can only be used on capacitor 4 and above, please use the CLI in Capacitor 4 to upgrade to 4 first');
+    }
+    const variablesAndClasspaths = await getAndroidVariablesAndClasspaths(config);
     if (!variablesAndClasspaths) {
         (0, errors_1.fatal)('Variable and Classpath info could not be read.');
     }
@@ -65,7 +69,7 @@ async function migrateCommand(config) {
     };
     const monorepoWarning = 'Please note this tool is not intended for use in a mono-repo enviroment, please check out the Ionic vscode extension for this functionality.';
     log_1.logger.info(monorepoWarning);
-    const { migrateconfirm } = await (0, log_1.logPrompt)(`Capacitor 4 sets a deployment target of iOS 13 and Android 12 (SDK 32). \n`, {
+    const { migrateconfirm } = await (0, log_1.logPrompt)(`Capacitor 5 sets a deployment target of iOS 13 and Android 13 (SDK 33). \n`, {
         type: 'text',
         name: 'migrateconfirm',
         message: `Are you sure you want to migrate? (Y/n)`,
@@ -74,83 +78,61 @@ async function migrateCommand(config) {
     if (typeof migrateconfirm === 'string' &&
         migrateconfirm.toLowerCase() === 'y') {
         try {
-            const { npmInstallConfirm } = await (0, log_1.logPrompt)(`Would you like the migrator to run npm install to install the latest versions of capacitor packages? (Those using other package managers should answer N)`, {
+            const { depInstallConfirm } = await (0, log_1.logPrompt)(`Would you like the migrator to run npm, yarn, or pnpm install to install the latest versions of capacitor packages? (Those using other package managers should answer N)`, {
                 type: 'text',
-                name: 'npmInstallConfirm',
-                message: `Run Npm Install? (Y/n)`,
+                name: 'depInstallConfirm',
+                message: `Run Dependency Install? (Y/n)`,
                 initial: 'y',
             });
-            const runNpmInstall = typeof npmInstallConfirm === 'string' &&
-                npmInstallConfirm.toLowerCase() === 'y';
-            try {
-                await (0, common_1.runTask)(`Installing Latest NPM Modules.`, () => {
-                    return installLatestNPMLibs(runNpmInstall, config);
+            const runNpmInstall = typeof depInstallConfirm === 'string' &&
+                depInstallConfirm.toLowerCase() === 'y';
+            let installerType = 'npm';
+            if (runNpmInstall) {
+                const { manager } = await (0, log_1.logPrompt)('What dependency manager do you use?', {
+                    type: 'select',
+                    name: 'manager',
+                    message: `Dependency Management Tool`,
+                    choices: [
+                        { title: 'NPM', value: 'npm' },
+                        { title: 'Yarn', value: 'yarn' },
+                        { title: 'PNPM', value: 'pnpm' },
+                    ],
+                    initial: 0,
                 });
-            }
-            catch (ex) {
-                log_1.logger.error(`npm install failed. Try deleting node_modules folder and running ${colors_1.default.input('npm install --force')} manually.`);
+                installerType = manager;
             }
             try {
-                await (0, common_1.runTask)(`Migrating @capacitor/storage to @capacitor/preferences.`, () => {
-                    return migrateStoragePluginToPreferences(runNpmInstall);
+                await (0, common_1.runTask)(`Installing Latest Modules using ${installerType}.`, () => {
+                    return installLatestLibs(installerType, runNpmInstall, config);
                 });
             }
             catch (ex) {
-                log_1.logger.error(`@capacitor/preferences failed to install. Try deleting node_modules folder and running ${colors_1.default.input('npm install @capacitor/preferences --force')} manually.`);
+                console.log(ex);
+                log_1.logger.error(`${installerType} install failed. Try deleting node_modules folder and running ${colors_1.default.input(`${installerType} install --force`)} manually.`);
             }
+            // Update iOS Projects
             if (allDependencies['@capacitor/ios'] &&
                 (0, utils_fs_1.existsSync)(config.ios.platformDirAbs)) {
-                // Set deployment target to 13.0
-                await (0, common_1.runTask)(`Migrating deployment target to 13.0.`, () => {
-                    return updateFile(config, (0, path_1.join)(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'), 'IPHONEOS_DEPLOYMENT_TARGET = ', ';', '13.0');
-                });
-                // Update Podfile to 13.0
-                await (0, common_1.runTask)(`Migrating Podfile to 13.0.`, () => {
-                    return updateFile(config, (0, path_1.join)(config.ios.nativeProjectDirAbs, 'Podfile'), `platform :ios, '`, `'`, '13.0');
-                });
-                await (0, common_1.runTask)(`Migrating Podfile to use post_install script.`, () => {
-                    return podfileAssertDeploymentTarget((0, path_1.join)(config.ios.nativeProjectDirAbs, 'Podfile'));
+                //Update icon to single 1024 x 1024 icon
+                await (0, common_1.runTask)('Update App Icon to only 1024 x 1024', () => {
+                    return updateAppIcons(config);
                 });
-                // Remove touchesBegan
-                await (0, common_1.runTask)(`Migrating AppDelegate.swift by removing touchesBegan.`, () => {
-                    return updateFile(config, (0, path_1.join)(config.ios.nativeTargetDirAbs, 'AppDelegate.swift'), `override func touchesBegan`, `}`, undefined, true);
-                });
-                // Remove NSAppTransportSecurity
-                await (0, common_1.runTask)(`Migrating Info.plist by removing NSAppTransportSecurity key.`, () => {
-                    return removeKey((0, path_1.join)(config.ios.nativeTargetDirAbs, 'Info.plist'), 'NSAppTransportSecurity');
-                });
-                // Remove USE_PUSH
-                await (0, common_1.runTask)(`Migrating by removing USE_PUSH.`, () => {
-                    return replacePush((0, path_1.join)(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'));
-                });
-                // Remove from App Delegate
-                await (0, common_1.runTask)(`Migrating App Delegate.`, () => {
-                    return replaceIfUsePush(config);
+                //Remove Podfile.lock from .gitignore
+                await (0, common_1.runTask)('Remove Podfile.lock from iOS .gitignore', () => {
+                    return updateIosGitIgnore((0, path_1.join)(config.ios.platformDirAbs, '.gitignore'));
                 });
             }
             if (allDependencies['@capacitor/android'] &&
                 (0, utils_fs_1.existsSync)(config.android.platformDirAbs)) {
-                // AndroidManifest.xml add attribute: <activity android:exported="true"
-                await (0, common_1.runTask)(`Migrating AndroidManifest.xml by adding android:exported attribute to Activity.`, () => {
-                    return updateAndroidManifest((0, path_1.join)(config.android.srcMainDirAbs, 'AndroidManifest.xml'));
-                });
-                // Update build.gradle
-                const { leaveJCenterPrompt } = await (0, log_1.logPrompt)(`Some projects still require JCenter to function. If your project does, please answer yes below.`, {
-                    type: 'text',
-                    name: 'leaveJCenterPrompt',
-                    message: `Keep JCenter if present? (y/N)`,
-                    initial: 'n',
-                });
                 await (0, common_1.runTask)(`Migrating build.gradle file.`, () => {
-                    return updateBuildGradle((0, path_1.join)(config.android.platformDirAbs, 'build.gradle'), typeof leaveJCenterPrompt === 'string' &&
-                        leaveJCenterPrompt.toLowerCase() === 'y', variablesAndClasspaths);
+                    return updateBuildGradle((0, path_1.join)(config.android.platformDirAbs, 'build.gradle'), variablesAndClasspaths);
                 });
-                // Update app.gradle
-                await (0, common_1.runTask)(`Migrating app/build.gradle file.`, () => {
-                    return updateAppBuildGradle((0, path_1.join)(config.android.appDirAbs, 'build.gradle'));
+                // Remove enableJetifier
+                await (0, common_1.runTask)('Remove android.enableJetifier=true from gradle.properties', () => {
+                    return updateGradleProperties((0, path_1.join)(config.android.platformDirAbs, 'gradle.properties'));
                 });
                 // Update gradle-wrapper.properties
-                await (0, common_1.runTask)(`Migrating gradle-wrapper.properties by updating gradle version from 7.0 to ${gradleVersion}.`, () => {
+                await (0, common_1.runTask)(`Migrating gradle-wrapper.properties by updating gradle version to ${gradleVersion}.`, () => {
                     return updateGradleWrapper((0, path_1.join)(config.android.platformDirAbs, 'gradle', 'wrapper', 'gradle-wrapper.properties'));
                 });
                 // Variables gradle
@@ -176,26 +158,18 @@ async function migrateCommand(config) {
                             }
                         }
                         const pluginVariables = {
-                            firebaseMessagingVersion: '23.0.5',
-                            playServicesLocationVersion: '20.0.0',
-                            androidxBrowserVersion: '1.4.0',
-                            androidxMaterialVersion: '1.6.1',
-                            androidxExifInterfaceVersion: '1.3.3',
+                            firebaseMessagingVersion: '23.1.2',
+                            playServicesLocationVersion: '21.0.1',
+                            androidxBrowserVersion: '1.5.0',
+                            androidxMaterialVersion: '1.8.0',
+                            androidxExifInterfaceVersion: '1.3.6',
                         };
                         for (const variable of Object.keys(pluginVariables)) {
                             await updateFile(config, variablesPath, `${variable} = '`, `'`, pluginVariables[variable], true);
                         }
                     })();
                 });
-                // remove init
-                await (0, common_1.runTask)('Migrating MainActivity', () => {
-                    return migrateMainActivity(config);
-                });
                 rimraf_1.default.sync((0, path_1.join)(config.android.appDirAbs, 'build'));
-                // add new splashscreen
-                await (0, common_1.runTask)('Migrate to Android 12 Splashscreen and apply DayNight theme.', () => {
-                    return addNewSplashScreen(config);
-                });
             }
             // Run Cap Sync
             await (0, common_1.runTask)(`Running cap sync.`, () => {
@@ -230,7 +204,14 @@ async function migrateCommand(config) {
     //*/
 }
 exports.migrateCommand = migrateCommand;
-async function installLatestNPMLibs(runInstall, config) {
+async function checkCapacitorMajorVersion(config) {
+    var _a;
+    const capacitorVersion = await (0, common_1.getCoreVersion)(config);
+    const versionArray = (_a = capacitorVersion.match(/([0-9]+)\.([0-9]+)\.([0-9]+)/)) !== null && _a !== void 0 ? _a : [];
+    const majorVersion = parseInt(versionArray[1]);
+    return majorVersion;
+}
+async function installLatestLibs(dependencyManager, runInstall, config) {
     const pkgJsonPath = (0, path_1.join)(config.app.rootDir, 'package.json');
     const pkgJsonFile = readFile(pkgJsonPath);
     if (!pkgJsonFile) {
@@ -258,31 +239,14 @@ async function installLatestNPMLibs(runInstall, config) {
     });
     if (runInstall) {
         rimraf_1.default.sync((0, path_1.join)(config.app.rootDir, 'node_modules/@capacitor/!(cli)'));
-        await (0, subprocess_1.runCommand)('npm', ['i']);
+        await (0, subprocess_1.runCommand)(dependencyManager, ['install']);
     }
     else {
         log_1.logger.info(`Please run an install command with your package manager of choice. (ex: yarn install)`);
     }
 }
-async function migrateStoragePluginToPreferences(runInstall) {
-    if (allDependencies['@capacitor/storage']) {
-        log_1.logger.info('NOTE: @capacitor/storage was renamed to @capacitor/preferences, please be sure to replace occurances in your code.');
-        if (runInstall) {
-            await (0, subprocess_1.getCommandOutput)('npm', ['uninstall', '@capacitor/storage']);
-            await (0, subprocess_1.runCommand)('npm', ['i', `@capacitor/preferences@${pluginVersion}`]);
-        }
-        else {
-            log_1.logger.info(`Please manually uninstall @capacitor/storage and replace it with @capacitor/preferences@${pluginVersion}`);
-        }
-    }
-}
 async function writeBreakingChanges() {
-    const breaking = [
-        '@capacitor/storage',
-        '@capacitor/camera',
-        '@capacitor/push-notifications',
-        '@capacitor/local-notifications',
-    ];
+    const breaking = ['@capacitor/device'];
     const broken = [];
     for (const lib of breaking) {
         if (allDependencies[lib]) {
@@ -290,98 +254,10 @@ async function writeBreakingChanges() {
         }
     }
     if (broken.length > 0) {
-        log_1.logger.info(`IMPORTANT: Review https://capacitorjs.com/docs/updating/4-0#plugins for breaking changes in these plugins that you use: ${broken.join(', ')}.`);
-    }
-    if (allDependencies['@capacitor/android']) {
-        log_1.logger.info('Warning: The Android Gradle plugin was updated and it requires Java 11 to run. You may need to select this in Android Studio.');
+        log_1.logger.info(`IMPORTANT: Review https://capacitorjs.com/docs/updating/5-0#plugins for breaking changes in these plugins that you use: ${broken.join(', ')}.`);
     }
 }
-async function updateAndroidManifest(filename) {
-    const txt = readFile(filename);
-    if (!txt) {
-        return;
-    }
-    const hasAndroidExportedAlreadySet = new RegExp(/<activity([^>]*(android:exported=")[^>]*)>/g).test(txt);
-    let isAndroidExportedSetToFalse = false;
-    if (hasAndroidExportedAlreadySet) {
-        isAndroidExportedSetToFalse = new RegExp(/<activity([^>]*(android:exported="false")[^>]*)>/g).test(txt);
-    }
-    // AndroidManifest.xml add attribute: <activity android:exported="true"
-    if (hasAndroidExportedAlreadySet && !isAndroidExportedSetToFalse) {
-        return; // Probably already updated manually
-    }
-    let replaced = txt;
-    if (!hasAndroidExportedAlreadySet) {
-        replaced = setAllStringIn(txt, '<activity', ' ', `\n            android:exported="true"\n`);
-    }
-    else {
-        log_1.logger.info(`Found 'android:exported="false"' in your AndroidManifest.xml, if this is not intentional please update it manually to "true".`);
-    }
-    if (txt == replaced) {
-        log_1.logger.error(`Unable to update Android Manifest. Missing <activity> tag`);
-        return;
-    }
-    (0, utils_fs_1.writeFileSync)(filename, replaced, 'utf-8');
-}
-async function updateBuildGradle(filename, leaveJCenter, variablesAndClasspaths) {
-    // In build.gradle add dependencies:
-    // classpath 'com.android.tools.build:gradle:7.2.1'
-    // classpath 'com.google.gms:google-services:4.3.13'
-    const txt = readFile(filename);
-    if (!txt) {
-        return;
-    }
-    const neededDeps = {
-        'com.android.tools.build:gradle': variablesAndClasspaths['com.android.tools.build:gradle'],
-        'com.google.gms:google-services': variablesAndClasspaths['com.google.gms:google-services'],
-    };
-    let replaced = txt;
-    for (const dep of Object.keys(neededDeps)) {
-        if (replaced.includes(`classpath '${dep}`)) {
-            const semver = await Promise.resolve().then(() => tslib_1.__importStar(require('semver')));
-            const firstIndex = replaced.indexOf(dep) + dep.length + 1;
-            const existingVersion = '' + replaced.substring(firstIndex, replaced.indexOf("'", firstIndex));
-            if (semver.gte(neededDeps[dep], existingVersion)) {
-                replaced = setAllStringIn(replaced, `classpath '${dep}:`, `'`, neededDeps[dep]);
-                log_1.logger.info(`Set ${dep} = ${neededDeps[dep]}.`);
-            }
-        }
-    }
-    // Replace jcenter()
-    const lines = replaced.split('\n');
-    let inRepositories = false;
-    let hasMavenCentral = false;
-    let final = '';
-    for (const line of lines) {
-        if (line.includes('repositories {')) {
-            inRepositories = true;
-            hasMavenCentral = false;
-        }
-        else if (line.trim() == '}') {
-            // Make sure we have mavenCentral()
-            if (inRepositories && !hasMavenCentral) {
-                final += '        mavenCentral()\n';
-                log_1.logger.info(`Added mavenCentral().`);
-            }
-            inRepositories = false;
-        }
-        if (inRepositories && line.trim() === 'mavenCentral()') {
-            hasMavenCentral = true;
-        }
-        if (inRepositories && line.trim() === 'jcenter()' && !leaveJCenter) {
-            // skip jCentral()
-            log_1.logger.info(`Removed jcenter().`);
-        }
-        else {
-            final += line + '\n';
-        }
-    }
-    if (txt !== final) {
-        (0, utils_fs_1.writeFileSync)(filename, final, 'utf-8');
-        return;
-    }
-}
-async function getAndroidVarriablesAndClasspaths(config) {
+async function getAndroidVariablesAndClasspaths(config) {
     const tempAndroidTemplateFolder = (0, path_1.join)(config.cli.assetsDirAbs, 'tempAndroidTemplate');
     await (0, template_1.extractTemplate)(config.cli.assets.android.platformTemplateArchiveAbs, tempAndroidTemplateFolder);
     const variablesGradleFile = readFile((0, path_1.join)(tempAndroidTemplateFolder, 'variables.gradle'));
@@ -425,23 +301,6 @@ function readFile(filename) {
         log_1.logger.error(`Unable to read ${filename}. Verify it is not already open. ${err}`);
     }
 }
-async function updateAppBuildGradle(filename) {
-    const txt = readFile(filename);
-    if (!txt) {
-        return;
-    }
-    let replaced = txt;
-    if (!txt.includes('androidx.coordinatorlayout:coordinatorlayout:')) {
-        replaced = replaced.replace('dependencies {', 'dependencies {\n    implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"');
-    }
-    if (!txt.includes('androidx.core:core-splashscreen:')) {
-        replaced = replaced.replace('dependencies {', 'dependencies {\n    implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"');
-    }
-    // const lines = txt.split('\n');
-    if (replaced !== txt) {
-        (0, utils_fs_1.writeFileSync)(filename, replaced, 'utf-8');
-    }
-}
 async function updateGradleWrapper(filename) {
     const txt = readFile(filename);
     if (!txt) {
@@ -465,6 +324,102 @@ async function updateGradleWrapperFiles(platformDir) {
         cwd: platformDir,
     });
 }
+async function updateIosGitIgnore(filename) {
+    const txt = readFile(filename);
+    if (!txt) {
+        return;
+    }
+    const lines = txt.split('\n');
+    let linesToKeep = '';
+    for (const line of lines) {
+        // check for enableJetifier
+        const podfileMatch = line.match(/.+Podfile\.lock/) || [];
+        if (podfileMatch.length == 0) {
+            linesToKeep += line + '\n';
+        }
+    }
+    (0, utils_fs_1.writeFileSync)(filename, linesToKeep, { encoding: 'utf-8' });
+}
+async function updateAppIcons(config) {
+    const iconToKeep = 'AppIcon-512@2x.png';
+    const contentsFile = 'Contents.json';
+    const newContentsFileContents = `{
+    "images" : [
+      {
+        "filename" : "${iconToKeep}",
+        "idiom" : "universal",
+        "platform" : "ios",
+        "size" : "1024x1024"
+      }
+    ],
+    "info" : {
+      "author" : "xcode",
+      "version" : 1
+    }
+}`;
+    const path = (0, path_1.join)(config.ios.platformDirAbs, 'App', 'App', 'Assets.xcassets', 'AppIcon.appiconset');
+    if (!(0, utils_fs_1.existsSync)(path)) {
+        log_1.logger.error(`Unable to find ${path}. Try updating it manually`);
+        return;
+    }
+    if (!(0, utils_fs_1.existsSync)((0, path_1.join)(path, iconToKeep))) {
+        log_1.logger.error(`Unable to find ${iconToKeep}. Try updating it manually`);
+        return;
+    }
+    if (!(0, utils_fs_1.existsSync)((0, path_1.join)(path, contentsFile))) {
+        log_1.logger.error(`Unable to find ${path}. Try updating it manually`);
+        return;
+    }
+    const filenames = (0, utils_fs_1.readdirSync)(path);
+    for (const filename of filenames) {
+        if (filename != iconToKeep && filename != contentsFile) {
+            (0, utils_fs_1.removeSync)((0, path_1.join)(path, filename));
+        }
+    }
+    (0, utils_fs_1.writeFileSync)((0, path_1.join)(path, contentsFile), newContentsFileContents);
+}
+async function updateGradleProperties(filename) {
+    const txt = readFile(filename);
+    if (!txt) {
+        return;
+    }
+    const lines = txt.split('\n');
+    let linesToKeep = '';
+    for (const line of lines) {
+        // check for enableJetifier
+        const jetifierMatch = line.match(/android\.enableJetifier\s*=\s*true/) || [];
+        const commentMatch = line.match(/# Automatically convert third-party libraries to use AndroidX/) || [];
+        if (jetifierMatch.length == 0 && commentMatch.length == 0) {
+            linesToKeep += line + '\n';
+        }
+    }
+    (0, utils_fs_1.writeFileSync)(filename, linesToKeep, { encoding: 'utf-8' });
+}
+async function updateBuildGradle(filename, variablesAndClasspaths) {
+    // In build.gradle add dependencies:
+    // classpath 'com.android.tools.build:gradle:7.4.1'
+    // classpath 'com.google.gms:google-services:4.3.13'
+    const txt = readFile(filename);
+    if (!txt) {
+        return;
+    }
+    const neededDeps = {
+        'com.android.tools.build:gradle': variablesAndClasspaths['com.android.tools.build:gradle'],
+        'com.google.gms:google-services': variablesAndClasspaths['com.google.gms:google-services'],
+    };
+    let replaced = txt;
+    for (const dep of Object.keys(neededDeps)) {
+        if (replaced.includes(`classpath '${dep}`)) {
+            const semver = await Promise.resolve().then(() => tslib_1.__importStar(require('semver')));
+            const firstIndex = replaced.indexOf(dep) + dep.length + 1;
+            const existingVersion = '' + replaced.substring(firstIndex, replaced.indexOf("'", firstIndex));
+            if (semver.gte(neededDeps[dep], existingVersion)) {
+                replaced = setAllStringIn(replaced, `classpath '${dep}:`, `'`, neededDeps[dep]);
+                log_1.logger.info(`Set ${dep} = ${neededDeps[dep]}.`);
+            }
+        }
+    }
+}
 async function updateFile(config, filename, textStart, textEnd, replacement, skipIfNotFound) {
     if (config === null) {
         return false;
@@ -529,176 +484,3 @@ function setAllStringIn(data, start, end, replacement) {
     }
     return result;
 }
-async function replaceIfUsePush(config) {
-    const startLine = '#if USE_PUSH';
-    const endLine = '#endif';
-    const filename = (0, path_1.join)(config.ios.nativeTargetDirAbs, 'AppDelegate.swift');
-    const txt = readFile(filename);
-    if (!txt) {
-        return;
-    }
-    const lines = txt.split('\n');
-    let startLineIndex = null;
-    let endLineIndex = null;
-    for (const [key, item] of lines.entries()) {
-        if (item.includes(startLine)) {
-            startLineIndex = key;
-            break;
-        }
-    }
-    if (startLineIndex !== null) {
-        for (const [key, item] of lines.entries()) {
-            if (item.includes(endLine) && key > startLineIndex) {
-                endLineIndex = key;
-                break;
-            }
-        }
-        if (endLineIndex !== null) {
-            lines[endLineIndex] = '';
-            lines[startLineIndex] = '';
-            (0, utils_fs_1.writeFileSync)(filename, lines.join('\n'), 'utf-8');
-        }
-    }
-}
-async function replacePush(filename) {
-    const txt = readFile(filename);
-    if (!txt) {
-        return;
-    }
-    let replaced = txt;
-    replaced = replaced.replace('DEBUG USE_PUSH', 'DEBUG');
-    replaced = replaced.replace('USE_PUSH', '""');
-    if (replaced != txt) {
-        (0, utils_fs_1.writeFileSync)(filename, replaced, 'utf-8');
-    }
-}
-async function removeKey(filename, key) {
-    const txt = readFile(filename);
-    if (!txt) {
-        return;
-    }
-    let lines = txt.split('\n');
-    let removed = false;
-    let removing = false;
-    lines = lines.filter(line => {
-        if (removing && line.includes('</dict>')) {
-            removing = false;
-            return false;
-        }
-        if (line.includes(`<key>${key}</key`)) {
-            removing = true;
-            removed = true;
-        }
-        return !removing;
-    });
-    if (removed) {
-        (0, utils_fs_1.writeFileSync)(filename, lines.join('\n'), 'utf-8');
-    }
-}
-async function podfileAssertDeploymentTarget(filename) {
-    const txt = readFile(filename);
-    if (!txt) {
-        return;
-    }
-    let replaced = txt;
-    if (!replaced.includes(`require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers`)) {
-        replaced =
-            `require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'\n\n` +
-                txt;
-    }
-    if (replaced.includes('post_install do |installer|')) {
-        if (!replaced.includes(`assertDeploymentTarget(installer)`)) {
-            replaced = replaced.replace('post_install do |installer|', `post_install do |installer|\n  assertDeploymentTarget(installer)\n`);
-        }
-    }
-    else {
-        replaced =
-            replaced +
-                `\n\npost_install do |installer|\n  assertDeploymentTarget(installer)\nend\n`;
-    }
-    (0, utils_fs_1.writeFileSync)(filename, replaced, 'utf-8');
-}
-async function migrateMainActivity(config) {
-    const xmlData = await (0, xml_1.readXML)((0, path_1.join)(config.android.srcMainDirAbs, 'AndroidManifest.xml'));
-    const manifestNode = xmlData.manifest;
-    const applicationChildNodes = manifestNode.application;
-    let mainActivityClassPath = '';
-    applicationChildNodes.find(applicationChildNode => {
-        const activityChildNodes = applicationChildNode.activity;
-        if (!Array.isArray(activityChildNodes)) {
-            return false;
-        }
-        const mainActivityNode = activityChildNodes.find(activityChildNode => {
-            const intentFilterChildNodes = activityChildNode['intent-filter'];
-            if (!Array.isArray(intentFilterChildNodes)) {
-                return false;
-            }
-            return intentFilterChildNodes.find(intentFilterChildNode => {
-                const actionChildNodes = intentFilterChildNode.action;
-                if (!Array.isArray(actionChildNodes)) {
-                    return false;
-                }
-                const mainActionChildNode = actionChildNodes.find(actionChildNode => {
-                    const androidName = actionChildNode.$['android:name'];
-                    return androidName === 'android.intent.action.MAIN';
-                });
-                if (!mainActionChildNode) {
-                    return false;
-                }
-                const categoryChildNodes = intentFilterChildNode.category;
-                if (!Array.isArray(categoryChildNodes)) {
-                    return false;
-                }
-                return categoryChildNodes.find(categoryChildNode => {
-                    const androidName = categoryChildNode.$['android:name'];
-                    return androidName === 'android.intent.category.LAUNCHER';
-                });
-            });
-        });
-        if (mainActivityNode) {
-            mainActivityClassPath = mainActivityNode.$['android:name'];
-        }
-        return mainActivityNode;
-    });
-    const mainActivityClassName = mainActivityClassPath.split('.').pop();
-    const mainActivityPathArray = mainActivityClassPath.split('.');
-    mainActivityPathArray.pop();
-    const mainActivityClassFileName = `${mainActivityClassName}.java`;
-    const mainActivityClassFilePath = (0, path_1.join)((0, path_1.join)(config.android.srcMainDirAbs, 'java'), ...mainActivityPathArray, mainActivityClassFileName);
-    let data = readFile(mainActivityClassFilePath);
-    if (data) {
-        const bindex = data.indexOf('this.init(savedInstanceState');
-        if (bindex !== -1) {
-            const eindex = data.indexOf('}});', bindex) + 4;
-            data = data.replace(data.substring(bindex, eindex), '');
-            data = data.replace('// Initializes the Bridge', '');
-        }
-        const rindex = data.indexOf('registerPlugin');
-        const superLine = 'super.onCreate(savedInstanceState);';
-        if (rindex !== -1) {
-            if (data.indexOf(superLine) < rindex) {
-                const linePadding = rindex - data.indexOf(superLine) - superLine.length - 1;
-                data = data.replace(`${superLine}\n${' '.repeat(linePadding)}`, '');
-                const eindex = data.lastIndexOf('.class);') + 8;
-                data = data.replace(data.substring(bindex, eindex), `${data.substring(bindex, eindex)}\n${' '.repeat(linePadding) + superLine.padStart(linePadding)}`);
-            }
-        }
-        if (bindex == -1 && rindex == -1) {
-            return;
-        }
-        (0, utils_fs_1.writeFileSync)(mainActivityClassFilePath, data);
-    }
-}
-async function addNewSplashScreen(config) {
-    const stylePath = (0, path_1.join)(config.android.srcMainDirAbs, 'res', 'values', 'styles.xml');
-    let stylesXml = readFile(stylePath);
-    if (!stylesXml)
-        return;
-    stylesXml = stylesXml.replace(`parent="AppTheme.NoActionBar"`, `parent="Theme.SplashScreen"`);
-    // revert wrong replaces
-    stylesXml = stylesXml.replace(`name="Theme.SplashScreen"`, `name="AppTheme.NoActionBar"`);
-    stylesXml = stylesXml.replace(`name="Theme.SplashScreenLaunch"`, `name="AppTheme.NoActionBarLaunch"`);
-    // Apply DayNight theme
-    stylesXml = stylesXml.replace(`parent="Theme.AppCompat.NoActionBar"`, `parent="Theme.AppCompat.DayNight.NoActionBar"`);
-    (0, utils_fs_1.writeFileSync)(stylePath, stylesXml);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-alpha.2",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -56,7 +56,7 @@
     "open": "^8.4.0",
     "plist": "^3.0.5",
     "prompts": "^2.4.2",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.4.1",
     "semver": "^7.3.7",
     "tar": "^6.1.11",
     "tslib": "^2.4.0",
@@ -64,24 +64,26 @@
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "@types/jest": "^26.0.4",
+    "@types/jest": "^29.5.0",
     "@types/plist": "^3.0.2",
     "@types/prompts": "^2.0.14",
-    "@types/rimraf": "^3.0.2",
     "@types/semver": "^7.3.10",
     "@types/tar": "^6.1.1",
     "@types/tmp": "^0.2.3",
     "@types/xml2js": "0.4.5",
-    "jest": "^26.1.0",
+    "jest": "^29.5.0",
+    "jest-environment-jsdom": "^29.5.0",
+    "jest-jasmine2": "^29.5.0",
     "tmp": "^0.2.1",
-    "ts-jest": "^26.1.3",
-    "typescript": "~4.9.5"
+    "ts-jest": "^29.0.5",
+    "typescript": "~5.0.2"
   },
   "jest": {
-    "preset": "ts-jest"
+    "preset": "ts-jest",
+    "testRunner": "jest-jasmine2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "76202ca81b8e855df0ef8e5f6a36bd65ed1469a4"
+  "gitHead": "4e4134c2c9c8c52f40d9251924a419a87eca2924"
 }