@capacitor/cli 4.0.1-alpha.0 → 4.0.1

package/CHANGELOG.md

@@ -3,7 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [4.0.1-alpha.0](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.1-alpha.0) (2022-03-25)
+## [4.0.1](https://github.com/ionic-team/capacitor/compare/4.0.0...4.0.1) (2022-07-28)
+
+
+### Bug Fixes
+
+* **cli:** Correct Splash theme update ([#5805](https://github.com/ionic-team/capacitor/issues/5805)) ([25b82a8](https://github.com/ionic-team/capacitor/commit/25b82a84425bf09b2be45b213788b0e13982b9b3))
+* **cli:** Revert some splash migration errors ([#5806](https://github.com/ionic-team/capacitor/issues/5806)) ([471feed](https://github.com/ionic-team/capacitor/commit/471feedc07bef357ac798fcba664bd373e9f8ebf))
+
+
+
+
+
+# [4.0.0](https://github.com/ionic-team/capacitor/compare/4.0.0-beta.2...4.0.0) (2022-07-27)
+
+
+### Features
+
+* **android:** Add android.minWebviewVersion configuration option ([#5768](https://github.com/ionic-team/capacitor/issues/5768)) ([ad83827](https://github.com/ionic-team/capacitor/commit/ad838279e9cd190ce6f1a020a0ac9e3916786324))
+* **cli:** add migrator for cap3 to cap4 ([#5762](https://github.com/ionic-team/capacitor/issues/5762)) ([7cb660a](https://github.com/ionic-team/capacitor/commit/7cb660a34d9a87274761d4492d0d77c9ef44ace8))
+* Add option for custom error page ([#5723](https://github.com/ionic-team/capacitor/issues/5723)) ([e8bdef3](https://github.com/ionic-team/capacitor/commit/e8bdef3b4634e4ad45fa8fc34c7c0ab8dfa383f3))
+
+
+
+
+
+# [4.0.0-beta.2](https://github.com/ionic-team/capacitor/compare/4.0.0-beta.1...4.0.0-beta.2) (2022-07-08)
+
+**Note:** Version bump only for package @capacitor/cli
+
+
+
+
+
+# [4.0.0-beta.1](https://github.com/ionic-team/capacitor/compare/4.0.0-beta.0...4.0.0-beta.1) (2022-06-27)
 
 **Note:** Version bump only for package @capacitor/cli
 
@@ -11,6 +44,93 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+# [4.0.0-beta.0](https://github.com/ionic-team/capacitor/compare/3.6.0...4.0.0-beta.0) (2022-06-17)
+
+
+### Features
+
+* **android:** Use java 11 ([#5552](https://github.com/ionic-team/capacitor/issues/5552)) ([e47959f](https://github.com/ionic-team/capacitor/commit/e47959fcbd6a89b97b1275a5814fdb4e7ce30672))
+* **ios:** Add preferredContentMode configuration option ([#5583](https://github.com/ionic-team/capacitor/issues/5583)) ([5b6dfa3](https://github.com/ionic-team/capacitor/commit/5b6dfa3fe29c85632546b299f03cc04a77cf7475))
+
+
+
+
+
+# [3.6.0](https://github.com/ionic-team/capacitor/compare/3.5.1...3.6.0) (2022-06-17)
+
+
+### Features
+
+* **android:** update support for Portals for Capacitor to include Live Updates ([#5660](https://github.com/ionic-team/capacitor/issues/5660)) ([62f0a5e](https://github.com/ionic-team/capacitor/commit/62f0a5eaa40776aad79dbf8f8c0900037d3cc97e))
+
+
+
+
+
+# [4.0.0-alpha.2](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.2) (2022-05-12)
+
+
+### Features
+
+* **android:** Use java 11 ([#5552](https://github.com/ionic-team/capacitor/issues/5552)) ([e47959f](https://github.com/ionic-team/capacitor/commit/e47959fcbd6a89b97b1275a5814fdb4e7ce30672))
+* **ios:** Add preferredContentMode configuration option ([#5583](https://github.com/ionic-team/capacitor/issues/5583)) ([5b6dfa3](https://github.com/ionic-team/capacitor/commit/5b6dfa3fe29c85632546b299f03cc04a77cf7475))
+
+
+
+
+
+## [3.5.1](https://github.com/ionic-team/capacitor/compare/3.5.0...3.5.1) (2022-05-04)
+
+
+### Bug Fixes
+
+* **android:** move initialFocus on webview into config ([#5579](https://github.com/ionic-team/capacitor/issues/5579)) ([8b4e861](https://github.com/ionic-team/capacitor/commit/8b4e861514b0fbe08e9296f49c280234f54742e1))
+
+
+
+
+
+# [3.5.0](https://github.com/ionic-team/capacitor/compare/3.4.3...3.5.0) (2022-04-22)
+
+
+### Features
+
+* **cli:** support capacitor portals plugin changes needed ([#5558](https://github.com/ionic-team/capacitor/issues/5558)) ([6810a19](https://github.com/ionic-team/capacitor/commit/6810a19ae2bbda1f4b2afad61d37ca822ca157f5))
+
+
+
+
+
+# [4.0.0-alpha.1](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.1) (2022-03-25)
+
+**Note:** Version bump only for package @capacitor/cli
+
+
+
+
+
+
+## [3.4.3](https://github.com/ionic-team/capacitor/compare/3.4.2...3.4.3) (2022-03-04)
+
+
+### Bug Fixes
+
+* **cli:** avoid srcFiles is not iterable on kotlinNeededCheck ([#5481](https://github.com/ionic-team/capacitor/issues/5481)) ([3c2b579](https://github.com/ionic-team/capacitor/commit/3c2b579c6edb1fc69d85689b268eb92067b7821b))
+
+
+
+
+
+## [3.4.2](https://github.com/ionic-team/capacitor/compare/3.4.1...3.4.2) (2022-03-03)
+
+
+### Bug Fixes
+
+* **android:** compatibility with cordova kotlin plugins ([#5438](https://github.com/ionic-team/capacitor/issues/5438)) ([55bf004](https://github.com/ionic-team/capacitor/commit/55bf004897b3feb280ab6b6575d2a2c1a0a183e2))
+
+
+
+
 ## [3.4.1](https://github.com/ionic-team/capacitor/compare/3.4.0...3.4.1) (2022-02-09)
 
 

package/dist/android/open.js

@@ -15,7 +15,7 @@ async function openAndroid(config) {
         if (!(await utils_fs_1.pathExists(androidStudioPath))) {
             throw new Error(`Android Studio does not exist at: ${androidStudioPath}`);
         }
-        await open_1.default(dir, { app: androidStudioPath, wait: false });
+        await 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/update.js

@@ -141,8 +141,8 @@ project(':${getGradlePackageName(p.id)}').projectDir = new File('${relativePlugi
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_1_8
-      targetCompatibility JavaVersion.VERSION_1_8
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
   }
 }
 
@@ -166,7 +166,10 @@ if (hasProperty('postBuildExtras')) {
 }
 exports.installGradlePlugins = installGradlePlugins;
 async function handleCordovaPluginsGradle(config, cordovaPlugins) {
+    var _a, _b, _c;
     const pluginsGradlePath = path_1.join(config.android.cordovaPluginsDirAbs, 'build.gradle');
+    const kotlinNeeded = await kotlinNeededCheck(config, cordovaPlugins);
+    const kotlinVersionString = (_c = (_b = (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.preferences) === null || _b === void 0 ? void 0 : _b.GradlePluginKotlinVersion) !== null && _c !== void 0 ? _c : '1.7.0';
     const frameworksArray = [];
     let prefsArray = [];
     const applyArray = [];
@@ -193,10 +196,21 @@ async function handleCordovaPluginsGradle(config, cordovaPlugins) {
     })
         .join('\n');
     frameworkString = await replaceFrameworkVariables(config, prefsArray, frameworkString);
+    if (kotlinNeeded) {
+        frameworkString += `\n    implementation "androidx.core:core-ktx:$androidxCoreKTXVersion"`;
+        frameworkString += `\n    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"`;
+    }
     const applyString = applyArray.join('\n');
     let buildGradle = await utils_fs_1.readFile(pluginsGradlePath, { encoding: 'utf-8' });
     buildGradle = buildGradle.replace(/(SUB-PROJECT DEPENDENCIES START)[\s\S]*(\/\/ SUB-PROJECT DEPENDENCIES END)/, '$1\n' + frameworkString.concat('\n') + '    $2');
     buildGradle = buildGradle.replace(/(PLUGIN GRADLE EXTENSIONS START)[\s\S]*(\/\/ PLUGIN GRADLE EXTENSIONS END)/, '$1\n' + applyString.concat('\n') + '$2');
+    if (kotlinNeeded) {
+        buildGradle = buildGradle.replace(/(buildscript\s{\n(\t|\s{4})repositories\s{\n((\t{2}|\s{8}).+\n)+(\t|\s{4})}\n(\t|\s{4})dependencies\s{\n(\t{2}|\s{8}).+)\n((\t|\s{4})}\n}\n)/, `$1\n        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"\n$8`);
+        buildGradle = buildGradle.replace(/(ext\s{)/, `$1\n    androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.8.0'`);
+        buildGradle = buildGradle.replace(/(buildscript\s{)/, `$1\n    ext.kotlin_version = project.hasProperty('kotlin_version') ? rootProject.ext.kotlin_version : '${kotlinVersionString}'`);
+        buildGradle = buildGradle.replace(/(apply\splugin:\s'com\.android\.library')/, `$1\napply plugin: 'kotlin-android'`);
+        buildGradle = buildGradle.replace(/(compileOptions\s{\n((\t{2}|\s{8}).+\n)+(\t|\s{4})})\n(})/, `$1\n    sourceSets {\n        main.java.srcDirs += 'src/main/kotlin'\n    }\n$5`);
+    }
     await utils_fs_1.writeFile(pluginsGradlePath, buildGradle);
     const cordovaVariables = `// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 ext {
@@ -208,6 +222,27 @@ ext {
     await utils_fs_1.writeFile(path_1.join(config.android.cordovaPluginsDirAbs, 'cordova.variables.gradle'), cordovaVariables);
 }
 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') {
+        for (const plugin of cordovaPlugins) {
+            const androidPlatform = plugin_1.getPluginPlatform(plugin, platform);
+            const sourceFiles = androidPlatform['source-file'];
+            if (sourceFiles) {
+                for (const srcFile of sourceFiles) {
+                    if (/^.*\.kt$/.test(srcFile['$'].src)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+    else {
+        return true;
+    }
+}
 async function copyPluginsNativeFiles(config, cordovaPlugins) {
     const pluginsPath = path_1.join(config.android.cordovaPluginsDirAbs, 'src', 'main');
     for (const p of cordovaPlugins) {
@@ -257,12 +292,16 @@ async function getPluginsTask(config) {
         return androidPlugins;
     });
 }
-async function replaceFrameworkVariables(config, prefsArray, frameworkString) {
+async function getVariablesGradleFile(config) {
     const variablesFile = path_1.resolve(config.android.platformDirAbs, 'variables.gradle');
     let variablesGradle = '';
     if (await utils_fs_1.pathExists(variablesFile)) {
         variablesGradle = await utils_fs_1.readFile(variablesFile, { encoding: 'utf-8' });
     }
+    return variablesGradle;
+}
+async function replaceFrameworkVariables(config, prefsArray, frameworkString) {
+    const variablesGradle = await getVariablesGradleFile(config);
     prefsArray.map((preference) => {
         if (!variablesGradle.includes(preference.$.name)) {
             frameworkString = frameworkString.replace(new RegExp(('$' + preference.$.name).replace('$', '\\$&'), 'g'), preference.$.default);

package/dist/declarations.d.ts

@@ -184,6 +184,22 @@ export interface CapacitorConfig {
          * @since 3.1.0
          */
         flavor?: string;
+        /**
+         * Whether to give the webview initial focus.
+         *
+         * @since 3.5.1
+         * @default true
+         */
+        initialFocus?: boolean;
+        /**
+         * The minimum supported webview version on Android supported by your app.
+         *
+         * The minimum supported cannot be lower than version `55`, which is required for Capacitor.
+         *
+         * @since 4.0.0
+         * @default 60
+         */
+        minWebViewVersion?: number;
     };
     ios?: {
         /**
@@ -314,6 +330,17 @@ export interface CapacitorConfig {
          * @default false
          */
         limitsNavigationsToAppBoundDomains?: boolean;
+        /**
+         * The content mode for the web view to use when it loads and renders web content.
+         *
+         * - 'recommended': The content mode that is appropriate for the current device.
+         * - 'desktop': The content mode that represents a desktop experience.
+         * - 'mobile': The content mode that represents a mobile experience.
+         *
+         * @since 4.0.0
+         * @default recommended
+         */
+        preferredContentMode?: 'recommended' | 'desktop' | 'mobile';
     };
     server?: {
         /**
@@ -385,6 +412,13 @@ export interface CapacitorConfig {
          * @default []
          */
         allowNavigation?: string[];
+        /**
+         * Specify path to a local html page to display in case of errors.
+         *
+         * @since 4.0.0
+         * @default null
+         */
+        errorPath?: string;
     };
     cordova?: {
         /**
@@ -432,6 +466,18 @@ export interface CapacitorConfig {
      */
     includePlugins?: string[];
 }
+export interface Portal {
+    name: string;
+    webDir: string;
+    liveUpdateConfig?: LiveUpdateConfig;
+}
+export interface LiveUpdateConfig {
+    appId: string;
+    channel: string;
+    autoUpdateMethod: AutoUpdateMethod;
+    maxVersions?: number;
+}
+export declare type AutoUpdateMethod = 'none' | 'background';
 export interface PluginsConfig {
     /**
      * Plugin configuration by class name.
@@ -441,4 +487,13 @@ export interface PluginsConfig {
     [key: string]: {
         [key: string]: any;
     } | undefined;
+    /**
+     * Capacitor Portals plugin configuration
+     *
+     * @since 3.5.0
+     */
+    Portals?: {
+        shell: Portal;
+        apps: Portal[];
+    };
 }

package/dist/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runProgram = exports.run = void 0;
 const tslib_1 = require("tslib");
-const commander_1 = tslib_1.__importDefault(require("commander"));
+const commander_1 = require("commander");
 const colors_1 = tslib_1.__importDefault(require("./colors"));
 const config_1 = require("./config");
 const errors_1 = require("./errors");
@@ -27,8 +27,8 @@ async function run() {
 }
 exports.run = run;
 function runProgram(config) {
-    commander_1.default.version(config.cli.package.version);
-    commander_1.default
+    commander_1.program.version(config.cli.package.version);
+    commander_1.program
         .command('config', { hidden: true })
         .description(`print evaluated Capacitor config`)
         .option('--json', 'Print in JSON format')
@@ -36,14 +36,14 @@ function runProgram(config) {
         const { configCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/config')));
         await configCommand(config, json);
     }));
-    commander_1.default
+    commander_1.program
         .command('create [directory] [name] [id]', { hidden: true })
         .description('Creates a new Capacitor project')
         .action(cli_1.wrapAction(async () => {
         const { createCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/create')));
         await createCommand();
     }));
-    commander_1.default
+    commander_1.program
         .command('init [appName] [appId]')
         .description(`Initialize Capacitor configuration`)
         .option('--web-dir <value>', 'Optional: Directory of your projects built web assets')
@@ -51,14 +51,14 @@ function runProgram(config) {
         const { initCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/init')));
         await initCommand(config, appName, appId, webDir);
     })));
-    commander_1.default
+    commander_1.program
         .command('serve', { hidden: true })
         .description('Serves a Capacitor Progressive Web App in the browser')
         .action(cli_1.wrapAction(async () => {
         const { serveCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/serve')));
         await serveCommand();
     }));
-    commander_1.default
+    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")
@@ -67,7 +67,7 @@ function runProgram(config) {
         const { syncCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/sync')));
         await syncCommand(config, platform, deployment);
     })));
-    commander_1.default
+    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")
@@ -76,7 +76,7 @@ function runProgram(config) {
         const { updateCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/update')));
         await updateCommand(config, platform, deployment);
     })));
-    commander_1.default
+    commander_1.program
         .command('copy [platform]')
         .description('copies the web app build into the native app')
         .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform) => {
@@ -84,7 +84,7 @@ function runProgram(config) {
         const { copyCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/copy')));
         await copyCommand(config, platform);
     })));
-    commander_1.default
+    commander_1.program
         .command(`run [platform]`)
         .description(`runs ${colors_1.default.input('sync')}, then builds and deploys the native app`)
         .option('--list', 'list targets, then quit')
@@ -96,14 +96,14 @@ function runProgram(config) {
         const { runCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/run')));
         await runCommand(config, platform, { list, target, sync });
     })));
-    commander_1.default
+    commander_1.program
         .command('open [platform]')
         .description('opens the native project workspace (Xcode for iOS)')
         .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform) => {
         const { openCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/open')));
         await openCommand(config, platform);
     })));
-    commander_1.default
+    commander_1.program
         .command('add [platform]')
         .description('add a native platform project')
         .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform) => {
@@ -111,7 +111,7 @@ function runProgram(config) {
         const { addCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/add')));
         await addCommand(config, platform);
     })));
-    commander_1.default
+    commander_1.program
         .command('ls [platform]')
         .description('list installed Cordova and Capacitor plugins')
         .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform) => {
@@ -119,7 +119,7 @@ function runProgram(config) {
         const { listCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/list')));
         await listCommand(config, platform);
     })));
-    commander_1.default
+    commander_1.program
         .command('doctor [platform]')
         .description('checks the current setup for common errors')
         .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform) => {
@@ -127,35 +127,42 @@ function runProgram(config) {
         const { doctorCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/doctor')));
         await doctorCommand(config, platform);
     })));
-    commander_1.default
+    commander_1.program
         .command('telemetry [on|off]', { hidden: true })
         .description('enable or disable telemetry')
         .action(cli_1.wrapAction(async (onOrOff) => {
         const { telemetryCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/telemetry')));
         await telemetryCommand(onOrOff);
     }));
-    commander_1.default
+    commander_1.program
         .command('📡', { hidden: true })
         .description('IPC receiver command')
         .action(() => {
         // no-op: IPC messages are received via `process.on('message')`
     });
-    commander_1.default
+    commander_1.program
         .command('plugin:generate', { hidden: true })
         .description('start a new Capacitor plugin')
         .action(cli_1.wrapAction(async () => {
         const { newPluginCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/new-plugin')));
         await newPluginCommand();
     }));
-    commander_1.default.arguments('[command]').action(cli_1.wrapAction(async (cmd) => {
+    commander_1.program
+        .command('migrate')
+        .description('Migrate your current Capacitor app to the latest major version of Capacitor.')
+        .action(cli_1.wrapAction(async () => {
+        const { migrateCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/migrate')));
+        await migrateCommand(config);
+    }));
+    commander_1.program.arguments('[command]').action(cli_1.wrapAction(async (cmd) => {
         if (typeof cmd === 'undefined') {
             log_1.output.write(`\n  ${emoji_1.emoji('⚡️', '--')}  ${colors_1.default.strong('Capacitor - Cross-Platform apps with JavaScript and the Web')}  ${emoji_1.emoji('⚡️', '--')}\n\n`);
-            commander_1.default.outputHelp();
+            commander_1.program.outputHelp();
         }
         else {
             errors_1.fatal(`Unknown command: ${colors_1.default.input(cmd)}`);
         }
     }));
-    commander_1.default.parse(process.argv);
+    commander_1.program.parse(process.argv);
 }
 exports.runProgram = runProgram;

package/dist/tasks/copy.js

@@ -9,6 +9,7 @@ const common_1 = require("../common");
 const cordova_1 = require("../cordova");
 const errors_1 = require("../errors");
 const log_1 = require("../log");
+const plugin_1 = require("../plugin");
 const promise_1 = require("../util/promise");
 const copy_1 = require("../web/copy");
 async function copyCommand(config, selectedPlatformName) {
@@ -43,21 +44,41 @@ async function copy(config, platformName) {
             throw result;
         }
         await common_1.runPlatformHook(config, platformName, config.app.rootDir, 'capacitor:copy:before');
+        const allPlugins = await plugin_1.getPlugins(config, platformName);
+        let usesCapacitorPortals = false;
+        if (allPlugins.filter(plugin => plugin.id === '@ionic-enterprise/capacitor-portals').length > 0) {
+            usesCapacitorPortals = true;
+        }
         if (platformName === config.ios.name) {
-            await copyWebDir(config, await config.ios.webDirAbs);
+            if (usesCapacitorPortals) {
+                await copyFederatedWebDirs(config, await config.ios.webDirAbs);
+            }
+            else {
+                await copyWebDir(config, await config.ios.webDirAbs, config.app.webDirAbs);
+            }
             await copyCapacitorConfig(config, config.ios.nativeTargetDirAbs);
             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);
+            if (usesCapacitorPortals) {
+                await copyFederatedWebDirs(config, config.android.webDirAbs);
+            }
+            else {
+                await copyWebDir(config, config.android.webDirAbs, config.app.webDirAbs);
+            }
             await copyCapacitorConfig(config, config.android.assetsDirAbs);
             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);
+            if (usesCapacitorPortals) {
+                log_1.logger.info('Capacitor Portals Plugin installed, skipping web bundling...');
+            }
+            else {
+                await copy_1.copyWeb(config);
+            }
         }
         else {
             throw `Platform ${platformName} is not valid.`;
@@ -76,9 +97,8 @@ async function copyCapacitorConfig(config, nativeAbsDir) {
         });
     });
 }
-async function copyWebDir(config, nativeAbsDir) {
+async function copyWebDir(config, nativeAbsDir, webAbsDir) {
     var _a;
-    const webAbsDir = config.app.webDirAbs;
     const webRelDir = path_1.basename(webAbsDir);
     const nativeRelDir = path_1.relative(config.app.rootDir, nativeAbsDir);
     if (((_a = config.app.extConfig.server) === null || _a === void 0 ? void 0 : _a.url) && !(await utils_fs_1.pathExists(webAbsDir))) {
@@ -91,3 +111,25 @@ async function copyWebDir(config, nativeAbsDir) {
         return utils_fs_1.copy(webAbsDir, nativeAbsDir);
     });
 }
+async function copyFederatedWebDirs(config, nativeAbsDir) {
+    var _a, _b;
+    log_1.logger.info('Capacitor Portals Plugin Loaded - Copying Web Assets');
+    if (!((_b = (_a = config.app.extConfig) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.Portals)) {
+        throw `Capacitor Portals plugin is present but no valid config is defined.`;
+    }
+    const portalsConfig = config.app.extConfig.plugins.Portals;
+    if (!isPortal(portalsConfig.shell)) {
+        throw `Capacitor Portals plugin is present but no valid Shell application is defined in the config.`;
+    }
+    if (!portalsConfig.apps.every(isPortal)) {
+        throw `Capacitor Portals plugin is present but there is a problem with the apps defined in the config.`;
+    }
+    await Promise.all([...portalsConfig.apps, portalsConfig.shell].map(app => {
+        const appDir = path_1.resolve(config.app.rootDir, app.webDir);
+        return copyWebDir(config, path_1.resolve(nativeAbsDir, app.name), appDir);
+    }));
+}
+function isPortal(config) {
+    return (config.webDir !== undefined &&
+        config.name !== undefined);
+}

package/dist/tasks/migrate.js

@@ -0,0 +1,638 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateCommand = void 0;
+const tslib_1 = require("tslib");
+const utils_fs_1 = require("@ionic/utils-fs");
+const path_1 = require("path");
+const rimraf_1 = tslib_1.__importDefault(require("rimraf"));
+const common_1 = require("../common");
+const errors_1 = require("../errors");
+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 = [
+    '@capacitor/core',
+    '@capacitor/cli',
+    '@capacitor/ios',
+    '@capacitor/android',
+];
+const plugins = [
+    '@capacitor/action-sheet',
+    '@capacitor/app',
+    '@capacitor/app-launcher',
+    '@capacitor/browser',
+    '@capacitor/camera',
+    '@capacitor/clipboard',
+    '@capacitor/device',
+    '@capacitor/dialog',
+    '@capacitor/filesystem',
+    '@capacitor/geolocation',
+    '@capacitor/google-maps',
+    '@capacitor/haptics',
+    '@capacitor/keyboard',
+    '@capacitor/local-notifications',
+    '@capacitor/motion',
+    '@capacitor/network',
+    '@capacitor/push-notifications',
+    '@capacitor/screen-reader',
+    '@capacitor/share',
+    '@capacitor/splash-screen',
+    '@capacitor/status-bar',
+    '@capacitor/text-zoom',
+    '@capacitor/toast',
+];
+const coreVersion = '^4.0.0';
+const pluginVersion = '^4.0.0';
+async function migrateCommand(config) {
+    if (config === null) {
+        errors_1.fatal('Config data missing');
+    }
+    const variablesAndClasspaths = await getAndroidVarriablesAndClasspaths(config);
+    if (!variablesAndClasspaths) {
+        errors_1.fatal('Variable and Classpath info could not be read.');
+    }
+    //*
+    allDependencies = {
+        ...config.app.package.dependencies,
+        ...config.app.package.devDependencies,
+    };
+    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 log_1.logPrompt(`Capacitor 4 sets a deployment target of iOS 13 and Android 12 (SDK 32). \n`, {
+        type: 'text',
+        name: 'migrateconfirm',
+        message: `Are you sure you want to migrate? (Y/n)`,
+        initial: 'y',
+    });
+    if (typeof migrateconfirm === 'string' &&
+        migrateconfirm.toLowerCase() === 'y') {
+        try {
+            const { npmInstallConfirm } = await 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)`, {
+                type: 'text',
+                name: 'npmInstallConfirm',
+                message: `Run Npm Install? (Y/n)`,
+                initial: 'y',
+            });
+            const runNpmInstall = typeof npmInstallConfirm === 'string' &&
+                npmInstallConfirm.toLowerCase() === 'y';
+            await common_1.runTask(`Installing Latest NPM Modules.`, () => {
+                return installLatestNPMLibs(runNpmInstall, config);
+            });
+            await common_1.runTask(`Migrating @capacitor/storage to @capacitor/preferences.`, () => {
+                return migrateStoragePluginToPreferences(runNpmInstall);
+            });
+            if (allDependencies['@capacitor/ios'] &&
+                utils_fs_1.existsSync(config.ios.platformDirAbs)) {
+                // Set deployment target to 13.0
+                await common_1.runTask(`Migrating deployment target to 13.0.`, () => {
+                    return updateFile(config, path_1.join(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'), 'IPHONEOS_DEPLOYMENT_TARGET = ', ';', '13.0');
+                });
+                // Update Podfile to 13.0
+                await common_1.runTask(`Migrating Podfile to 13.0.`, () => {
+                    return updateFile(config, path_1.join(config.ios.nativeProjectDirAbs, 'Podfile'), `platform :ios, '`, `'`, '13.0');
+                });
+                await common_1.runTask(`Migrating Podfile to use post_install script.`, () => {
+                    return podfileAssertDeploymentTarget(path_1.join(config.ios.nativeProjectDirAbs, 'Podfile'));
+                });
+                // Remove touchesBegan
+                await common_1.runTask(`Migrating AppDelegate.swift by removing touchesBegan.`, () => {
+                    return updateFile(config, path_1.join(config.ios.nativeTargetDirAbs, 'AppDelegate.swift'), `override func touchesBegan`, `}`, undefined, true);
+                });
+                // Remove NSAppTransportSecurity
+                await common_1.runTask(`Migrating Info.plist by removing NSAppTransportSecurity key.`, () => {
+                    return removeKey(path_1.join(config.ios.nativeTargetDirAbs, 'Info.plist'), 'NSAppTransportSecurity');
+                });
+                // Remove USE_PUSH
+                await common_1.runTask(`Migrating by removing USE_PUSH.`, () => {
+                    return replacePush(path_1.join(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'));
+                });
+                // Remove from App Delegate
+                await common_1.runTask(`Migrating App Delegate.`, () => {
+                    return replaceIfUsePush(config);
+                });
+            }
+            if (allDependencies['@capacitor/android'] &&
+                utils_fs_1.existsSync(config.android.platformDirAbs)) {
+                // AndroidManifest.xml add attribute: <activity android:exported="true"
+                await common_1.runTask(`Migrating AndroidManifest.xml by adding android:exported attribute to Activity.`, () => {
+                    return updateAndroidManifest(path_1.join(config.android.srcMainDirAbs, 'AndroidManifest.xml'));
+                });
+                // Update build.gradle
+                const { leaveJCenterPrompt } = await 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 common_1.runTask(`Migrating build.gradle file.`, () => {
+                    return updateBuildGradle(path_1.join(config.android.platformDirAbs, 'build.gradle'), typeof leaveJCenterPrompt === 'string' &&
+                        leaveJCenterPrompt.toLowerCase() === 'y', variablesAndClasspaths);
+                });
+                // Update app.gradle
+                await common_1.runTask(`Migrating app/build.gradle file.`, () => {
+                    return updateAppBuildGradle(path_1.join(config.android.appDirAbs, 'build.gradle'));
+                });
+                // Update gradle-wrapper.properties
+                await common_1.runTask(`Migrating gradle-wrapper.properties by updating gradle version from 7.0 to 7.4.2.`, () => {
+                    return updateGradleWrapper(path_1.join(config.android.platformDirAbs, 'gradle', 'wrapper', 'gradle-wrapper.properties'));
+                });
+                // Variables gradle
+                await common_1.runTask(`Migrating variables.gradle file.`, () => {
+                    return (async () => {
+                        for (const variable of Object.keys(variablesAndClasspaths.variables)) {
+                            if (!(await updateFile(config, path_1.join(config.android.platformDirAbs, 'variables.gradle'), `${variable} = '`, `'`, variablesAndClasspaths.variables[variable].toString(), true))) {
+                                const didWork = await updateFile(config, path_1.join(config.android.platformDirAbs, 'variables.gradle'), `${variable} = `, `\n`, variablesAndClasspaths.variables[variable].toString(), true);
+                                if (!didWork) {
+                                    let file = readFile(path_1.join(config.android.platformDirAbs, 'variables.gradle'));
+                                    if (file) {
+                                        file = file.replace('}', `    ${variable} = '${variablesAndClasspaths.variables[variable].toString()}'\n}`);
+                                        utils_fs_1.writeFileSync(path_1.join(config.android.platformDirAbs, 'variables.gradle'), file);
+                                    }
+                                }
+                            }
+                        }
+                    })();
+                });
+                // remove init
+                await common_1.runTask('Migrating MainActivity by removing init().', () => {
+                    return removeOldInitAndroid(config);
+                });
+                rimraf_1.default.sync(path_1.join(config.android.appDirAbs, 'build'));
+                // add new splashscreen
+                await common_1.runTask('Migrate to Android 12 Splashscreen and apply DayNight theme.', () => {
+                    return addNewSplashScreen(config);
+                });
+            }
+            // Run Cap Sync
+            await common_1.runTask(`Running cap sync.`, () => {
+                return subprocess_1.getCommandOutput('npx', ['cap', 'sync']);
+            });
+            // Write all breaking changes
+            await common_1.runTask(`Writing breaking changes.`, () => {
+                return writeBreakingChanges();
+            });
+            log_1.logSuccess(`Migration to Capacitor ${coreVersion} is complete. Run and test your app!`);
+        }
+        catch (err) {
+            errors_1.fatal(`Failed to migrate: ${err}`);
+        }
+    }
+    else {
+        errors_1.fatal(`User canceled migration.`);
+    }
+    //*/
+}
+exports.migrateCommand = migrateCommand;
+async function installLatestNPMLibs(runInstall, config) {
+    const pkgJsonPath = path_1.join(config.app.rootDir, 'package.json');
+    const pkgJsonFile = readFile(pkgJsonPath);
+    if (!pkgJsonFile) {
+        return;
+    }
+    const pkgJson = JSON.parse(pkgJsonFile);
+    for (const devDepKey of Object.keys(pkgJson['devDependencies'])) {
+        if (libs.includes(devDepKey)) {
+            pkgJson['devDependencies'][devDepKey] = coreVersion;
+        }
+        else if (plugins.includes(devDepKey)) {
+            pkgJson['devDependencies'][devDepKey] = pluginVersion;
+        }
+    }
+    for (const depKey of Object.keys(pkgJson['dependencies'])) {
+        if (libs.includes(depKey)) {
+            pkgJson['dependencies'][depKey] = coreVersion;
+        }
+        else if (plugins.includes(depKey)) {
+            pkgJson['dependencies'][depKey] = pluginVersion;
+        }
+    }
+    utils_fs_1.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2), {
+        encoding: 'utf-8',
+    });
+    if (runInstall) {
+        rimraf_1.default.sync(path_1.join(config.app.rootDir, 'package-lock.json'));
+        rimraf_1.default.sync(path_1.join(config.app.rootDir, 'node_modules/@capacitor/!(cli)'));
+        await subprocess_1.getCommandOutput('npm', ['i']);
+    }
+    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 subprocess_1.getCommandOutput('npm', ['uninstall', '@capacitor/storage']);
+            await subprocess_1.getCommandOutput('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 broken = [];
+    for (const lib of breaking) {
+        if (allDependencies[lib]) {
+            broken.push(lib);
+        }
+    }
+    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.');
+    }
+}
+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;
+    }
+    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.10'
+    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}`)) {
+            replaced = txt.replace('dependencies {', `dependencies {\n        classpath '${dep}:${neededDeps[dep]}'`);
+        }
+        else {
+            // Update
+            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) {
+        utils_fs_1.writeFileSync(filename, final, 'utf-8');
+        return;
+    }
+}
+async function getAndroidVarriablesAndClasspaths(config) {
+    const tempAndroidTemplateFolder = path_1.join(config.cli.assetsDirAbs, 'tempAndroidTemplate');
+    await template_1.extractTemplate(config.cli.assets.android.platformTemplateArchiveAbs, tempAndroidTemplateFolder);
+    const variablesGradleFile = readFile(path_1.join(tempAndroidTemplateFolder, 'variables.gradle'));
+    const buildGradleFile = readFile(path_1.join(tempAndroidTemplateFolder, 'build.gradle'));
+    if (!variablesGradleFile || !buildGradleFile) {
+        return;
+    }
+    fs_1.deleteFolderRecursive(tempAndroidTemplateFolder);
+    const firstIndxOfCATBGV = buildGradleFile.indexOf(`classpath 'com.android.tools.build:gradle:`) + 42;
+    const firstIndxOfCGGGS = buildGradleFile.indexOf(`com.google.gms:google-services:`) + 31;
+    const comAndroidToolsBuildGradleVersion = '' +
+        buildGradleFile.substring(firstIndxOfCATBGV, buildGradleFile.indexOf("'", firstIndxOfCATBGV));
+    const comGoogleGmsGoogleServices = '' +
+        buildGradleFile.substring(firstIndxOfCGGGS, buildGradleFile.indexOf("'", firstIndxOfCGGGS));
+    const variablesGradleAsJSON = JSON.parse(variablesGradleFile
+        .replace('ext ', '')
+        .replace(/=/g, ':')
+        .replace(/\n/g, ',')
+        .replace(/,([^:]+):/g, function (_k, p1) {
+        return `,"${p1}":`;
+    })
+        .replace('{,', '{')
+        .replace(',}', '}')
+        .replace(/\s/g, '')
+        .replace(/'/g, '"'));
+    return {
+        'variables': variablesGradleAsJSON,
+        'com.android.tools.build:gradle': comAndroidToolsBuildGradleVersion,
+        'com.google.gms:google-services': comGoogleGmsGoogleServices,
+    };
+}
+function readFile(filename) {
+    try {
+        if (!utils_fs_1.existsSync(filename)) {
+            log_1.logger.error(`Unable to find ${filename}. Try updating it manually`);
+            return;
+        }
+        return utils_fs_1.readFileSync(filename, 'utf-8');
+    }
+    catch (err) {
+        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) {
+        utils_fs_1.writeFileSync(filename, replaced, 'utf-8');
+    }
+}
+async function updateGradleWrapper(filename) {
+    const txt = readFile(filename);
+    if (!txt) {
+        return;
+    }
+    const replaced = setAllStringIn(txt, 'distributionUrl=', '\n', 
+    // eslint-disable-next-line no-useless-escape
+    `https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip`);
+    utils_fs_1.writeFileSync(filename, replaced, 'utf-8');
+}
+async function updateFile(config, filename, textStart, textEnd, replacement, skipIfNotFound) {
+    if (config === null) {
+        return false;
+    }
+    const path = filename;
+    let txt = readFile(path);
+    if (!txt) {
+        return false;
+    }
+    if (txt.includes(textStart)) {
+        if (replacement) {
+            txt = setAllStringIn(txt, textStart, textEnd, replacement);
+            utils_fs_1.writeFileSync(path, txt, { encoding: 'utf-8' });
+        }
+        else {
+            // Replacing in code so we need to count the number of brackets to find the end of the function in swift
+            const lines = txt.split('\n');
+            let replaced = '';
+            let keep = true;
+            let brackets = 0;
+            for (const line of lines) {
+                if (line.includes(textStart)) {
+                    keep = false;
+                }
+                if (!keep) {
+                    brackets += (line.match(/{/g) || []).length;
+                    brackets -= (line.match(/}/g) || []).length;
+                    if (brackets == 0) {
+                        keep = true;
+                    }
+                }
+                else {
+                    replaced += line + '\n';
+                }
+            }
+            utils_fs_1.writeFileSync(path, replaced, { encoding: 'utf-8' });
+        }
+        return true;
+    }
+    else if (!skipIfNotFound) {
+        log_1.logger.error(`Unable to find "${textStart}" in ${filename}. Try updating it manually`);
+    }
+    return false;
+}
+function setAllStringIn(data, start, end, replacement) {
+    let position = 0;
+    let result = data;
+    let replaced = true;
+    while (replaced) {
+        const foundIdx = result.indexOf(start, position);
+        if (foundIdx == -1) {
+            replaced = false;
+        }
+        else {
+            const idx = foundIdx + start.length;
+            position = idx + replacement.length;
+            result =
+                result.substring(0, idx) +
+                    replacement +
+                    result.substring(result.indexOf(end, idx));
+        }
+    }
+    return result;
+}
+async function replaceIfUsePush(config) {
+    const startLine = '#if USE_PUSH';
+    const endLine = '#endif';
+    const filename = 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] = '';
+            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) {
+        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) {
+        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`;
+    }
+    utils_fs_1.writeFileSync(filename, replaced, 'utf-8');
+}
+async function removeOldInitAndroid(config) {
+    const xmlData = await xml_1.readXML(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 = path_1.join(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)
+            return;
+        const eindex = data.indexOf('}});', bindex) + 4;
+        data = data.replace(data.substring(bindex, eindex), '');
+        data = data.replace('// Initializes the Bridge', '');
+        utils_fs_1.writeFileSync(mainActivityClassFilePath, data);
+    }
+}
+async function addNewSplashScreen(config) {
+    const stylePath = 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"`);
+    utils_fs_1.writeFileSync(stylePath, stylesXml);
+}

package/dist/util/fs.js

@@ -1,7 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToUnixPath = void 0;
+exports.deleteFolderRecursive = exports.convertToUnixPath = void 0;
+const utils_fs_1 = require("@ionic/utils-fs");
+const path_1 = require("path");
 const convertToUnixPath = (path) => {
     return path.replace(/\\/g, '/');
 };
 exports.convertToUnixPath = convertToUnixPath;
+const deleteFolderRecursive = (directoryPath) => {
+    if (utils_fs_1.existsSync(directoryPath)) {
+        utils_fs_1.readdirSync(directoryPath).forEach(file => {
+            const curPath = path_1.join(directoryPath, file);
+            if (utils_fs_1.lstatSync(curPath).isDirectory()) {
+                exports.deleteFolderRecursive(curPath);
+            }
+            else {
+                utils_fs_1.unlinkSync(curPath);
+            }
+        });
+        utils_fs_1.rmdirSync(directoryPath);
+    }
+};
+exports.deleteFolderRecursive = deleteFolderRecursive;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "4.0.1-alpha.0",
+  "version": "4.0.1",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -44,37 +44,35 @@
     "watch": "npm run assets && tsc -w"
   },
   "dependencies": {
-    "@ionic/cli-framework-output": "^2.2.1",
-    "@ionic/utils-fs": "^3.1.5",
-    "@ionic/utils-subprocess": "^2.1.6",
-    "@ionic/utils-terminal": "^2.3.0",
-    "commander": "^6.0.0",
-    "debug": "^4.2.0",
+    "@ionic/cli-framework-output": "^2.2.5",
+    "@ionic/utils-fs": "^3.1.6",
+    "@ionic/utils-subprocess": "^2.1.11",
+    "@ionic/utils-terminal": "^2.3.3",
+    "commander": "^9.3.0",
+    "debug": "^4.3.4",
     "env-paths": "^2.2.0",
-    "kleur": "^4.1.1",
-    "native-run": "^1.5.0",
-    "open": "^7.4.2",
-    "plist": "^3.0.2",
-    "prompts": "^2.3.2",
-    "semver": "^7.3.2",
+    "kleur": "^4.1.4",
+    "native-run": "^1.6.0",
+    "open": "^8.4.0",
+    "plist": "^3.0.5",
+    "prompts": "^2.4.2",
+    "rimraf": "^3.0.2",
+    "semver": "^7.3.7",
     "tar": "^6.1.11",
-    "tslib": "^2.1.0",
+    "tslib": "^2.4.0",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
-    "@types/debug": "^4.1.5",
-    "@types/fs-extra": "^9.0.1",
+    "@types/debug": "^4.1.7",
     "@types/jest": "^26.0.4",
-    "@types/open": "^6.1.0",
     "@types/plist": "^3.0.2",
-    "@types/prompts": "^2.0.8",
-    "@types/semver": "^7.3.1",
-    "@types/slice-ansi": "^4.0.0",
-    "@types/tar": "^4.0.4",
-    "@types/tmp": "^0.2.0",
+    "@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",
-    "rimraf": "^3.0.2",
     "tmp": "^0.2.1",
     "ts-jest": "^26.1.3",
     "typescript": "~4.1.2"
@@ -85,5 +83,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7faec09fd724a0af7436f3d30c83856b7bb5ce51"
+  "gitHead": "a14824b660ccd39b7ed150a26debb15e9a161303"
 }