@capacitor/cli 3.4.1 → 3.5.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 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)
+
+
+### 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/update.js

@@ -166,7 +166,11 @@ 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 isKotlinVersionInVariablesGradle = (await getVariablesGradleFile(config)).includes('kotlin_version');
+    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.4.32';
     const frameworksArray = [];
     let prefsArray = [];
     const applyArray = [];
@@ -193,10 +197,24 @@ 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:` +
+            (isKotlinVersionInVariablesGradle
+                ? '$kotlin_version'
+                : kotlinVersionString) +
+            `"\n$8`);
+        buildGradle = buildGradle.replace(/(ext\s{)/, `$1\n    kotlin_version = project.hasProperty('kotlin_version') ? rootProject.ext.kotlin_version : '${kotlinVersionString}'\n    androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.6.0'`);
+        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 +226,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 +296,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

@@ -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.1",
+  "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": "bc7b49ff2ad242fecff7bcb3900c627ff6880f7b"
+  "gitHead": "f03e1a67140c8af25288456f9e99dd6234b50f25"
 }