@capacitor/cli 3.4.3 → 3.5.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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))
+
+
+
+
+
 ## [3.4.3](https://github.com/ionic-team/capacitor/compare/3.4.2...3.4.3) (2022-03-04)
 
 

package/dist/declarations.d.ts

@@ -432,6 +432,11 @@ export interface CapacitorConfig {
      */
     includePlugins?: string[];
 }
+export interface Portal {
+    name: string;
+    webDir: string;
+    appId?: string;
+}
 export interface PluginsConfig {
     /**
      * Plugin configuration by class name.
@@ -441,4 +446,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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/cli",
-  "version": "3.4.3",
+  "version": "3.5.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "33e9b342790ddedfb654c589ffde18b101d4cd98"
+  "gitHead": "f03e1a67140c8af25288456f9e99dd6234b50f25"
 }