@capacitor/cli 3.5.0 → 4.0.0-alpha.2

package/CHANGELOG.md

@@ -3,34 +3,21 @@
 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)
+# [4.0.0-alpha.2](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.2) (2022-05-12)
 
 
 ### 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))
+* **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.4.3](https://github.com/ionic-team/capacitor/compare/3.4.2...3.4.3) (2022-03-04)
+# [4.0.0-alpha.1](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.1) (2022-03-25)
 
-
-### 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))
+**Note:** Version bump only for package @capacitor/cli
 
 
 

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,11 +166,7 @@ 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 = [];
@@ -197,24 +193,10 @@ 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 {
@@ -226,27 +208,6 @@ 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) {
@@ -296,16 +257,12 @@ async function getPluginsTask(config) {
         return androidPlugins;
     });
 }
-async function getVariablesGradleFile(config) {
+async function replaceFrameworkVariables(config, prefsArray, frameworkString) {
     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/config.js

@@ -171,7 +171,7 @@ async function loadAndroidConfig(rootDir, extConfig, cliConfig) {
     const studioPath = promise_1.lazy(() => determineAndroidStudioPath(cliConfig.os));
     return {
         name,
-        minVersion: '21',
+        minVersion: '22',
         studioPath,
         platformDir,
         platformDirAbs,
@@ -213,7 +213,7 @@ async function loadIOSConfig(rootDir, extConfig) {
     const cordovaPluginsDir = 'capacitor-cordova-ios-plugins';
     return {
         name,
-        minVersion: '12.0',
+        minVersion: '13.0',
         platformDir,
         platformDirAbs,
         scheme,

package/dist/declarations.d.ts

@@ -314,6 +314,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?: {
         /**
@@ -432,11 +443,6 @@ export interface CapacitorConfig {
      */
     includePlugins?: string[];
 }
-export interface Portal {
-    name: string;
-    webDir: string;
-    appId?: string;
-}
 export interface PluginsConfig {
     /**
      * Plugin configuration by class name.
@@ -446,13 +452,4 @@ 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,7 +9,6 @@ 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) {
@@ -44,41 +43,21 @@ 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) {
-            if (usesCapacitorPortals) {
-                await copyFederatedWebDirs(config, await config.ios.webDirAbs);
-            }
-            else {
-                await copyWebDir(config, await config.ios.webDirAbs, config.app.webDirAbs);
-            }
+            await copyWebDir(config, await config.ios.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) {
-            if (usesCapacitorPortals) {
-                await copyFederatedWebDirs(config, config.android.webDirAbs);
-            }
-            else {
-                await copyWebDir(config, config.android.webDirAbs, config.app.webDirAbs);
-            }
+            await copyWebDir(config, config.android.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) {
-            if (usesCapacitorPortals) {
-                log_1.logger.info('Capacitor Portals Plugin installed, skipping web bundling...');
-            }
-            else {
-                await copy_1.copyWeb(config);
-            }
+            await copy_1.copyWeb(config);
         }
         else {
             throw `Platform ${platformName} is not valid.`;
@@ -97,8 +76,9 @@ async function copyCapacitorConfig(config, nativeAbsDir) {
         });
     });
 }
-async function copyWebDir(config, nativeAbsDir, webAbsDir) {
+async function copyWebDir(config, nativeAbsDir) {
     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))) {
@@ -111,25 +91,3 @@ async function copyWebDir(config, nativeAbsDir, webAbsDir) {
         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.5.0",
+  "version": "4.0.0-alpha.2",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -44,21 +44,21 @@
     "watch": "npm run assets && tsc -w"
   },
   "dependencies": {
-    "@ionic/cli-framework-output": "^2.2.1",
+    "@ionic/cli-framework-output": "^2.2.4",
     "@ionic/utils-fs": "^3.1.5",
-    "@ionic/utils-subprocess": "^2.1.6",
-    "@ionic/utils-terminal": "^2.3.0",
+    "@ionic/utils-subprocess": "^2.1.10",
+    "@ionic/utils-terminal": "^2.3.2",
     "commander": "^6.0.0",
-    "debug": "^4.2.0",
+    "debug": "^4.3.4",
     "env-paths": "^2.2.0",
-    "kleur": "^4.1.1",
+    "kleur": "^4.1.4",
     "native-run": "^1.5.0",
     "open": "^7.4.2",
-    "plist": "^3.0.2",
-    "prompts": "^2.3.2",
-    "semver": "^7.3.2",
+    "plist": "^3.0.5",
+    "prompts": "^2.4.2",
+    "semver": "^7.3.7",
     "tar": "^6.1.11",
-    "tslib": "^2.1.0",
+    "tslib": "^2.4.0",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
@@ -85,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f03e1a67140c8af25288456f9e99dd6234b50f25"
+  "gitHead": "5c588d5bd15b2b939c6efc25b7db9d6af29afae0"
 }