@capacitor/cli 4.0.1-alpha.0 → 4.0.2-nightly-76f28e70.0

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

@@ -130,7 +130,12 @@ project(':${getGradlePackageName(p.id)}').projectDir = new File('${relativePlugi
                 applyArray.push(`apply from: "${relativePluginPath}/${framework.$.src}"`);
             }
             else if (!framework.$.type && !framework.$.custom) {
-                frameworksArray.push(`    implementation "${framework.$.src}"`);
+                if (framework.$.src.startsWith('platform(')) {
+                    frameworksArray.push(`    implementation ${framework.$.src}`);
+                }
+                else {
+                    frameworksArray.push(`    implementation "${framework.$.src}"`);
+                }
             }
         });
         prefsArray = prefsArray.concat(plugin_1.getAllElements(p, platform, 'preference'));
@@ -141,8 +146,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 +171,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 = [];
@@ -189,14 +197,30 @@ async function handleCordovaPluginsGradle(config, cordovaPlugins) {
     });
     let frameworkString = frameworksArray
         .map(f => {
-        return `    implementation "${f}"`;
+        if (f.startsWith('platform(')) {
+            return `    implementation ${f}`;
+        }
+        else {
+            return `    implementation "${f}"`;
+        }
     })
         .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 +232,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 +302,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,23 +51,24 @@ 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")
-        .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform, { deployment }) => {
+        .option('--inline', 'Optional: if true, all source maps will be inlined for easier debugging on mobile devices', false)
+        .action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform, { deployment, inline }) => {
         config_1.checkExternalConfig(config.app);
         const { syncCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/sync')));
-        await syncCommand(config, platform, deployment);
+        await syncCommand(config, platform, deployment, inline);
     })));
-    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 +77,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 +85,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 +97,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 +112,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 +120,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 +128,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/add.js

@@ -55,7 +55,7 @@ async function addCommand(config, selectedPlatformName) {
             await doAdd(config, platformName);
             await editPlatforms(config, platformName);
             if (await utils_fs_1.pathExists(config.app.webDirAbs)) {
-                await sync_1.sync(config, platformName, false);
+                await sync_1.sync(config, platformName, false, false);
                 if (platformName === config.android.name) {
                     await common_2.runTask('Syncing Gradle', async () => {
                         return add_1.createLocalProperties(config.android.platformDirAbs);

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);
+}