@capacitor/cli 9.0.0-alpha.6 → 9.0.0-alpha.7

package/dist/android/update.js

@@ -24,11 +24,14 @@ async function updateAndroid(config) {
     const capacitorPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 0 /* PluginType.Core */);
     (0, plugin_1.printPlugins)(capacitorPlugins, 'android');
     const cordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 1 /* PluginType.Cordova */);
-    const enableCordova = cordovaPlugins.length > 0;
+    const enableCordova = cordovaPlugins.length > 0 || config.app.forceCordova;
     await writePluginsJson(config, capacitorPlugins, enableCordova);
     await removePluginsNativeFiles(config);
     if (enableCordova) {
         log_1.logger.info('Found Cordova Plugins: Including Android Cordova Support');
+        if (config.app.forceCordova) {
+            log_1.logger.info('Cordova support installation has been forced');
+        }
         await copyPluginsNativeFiles(config, cordovaPlugins);
     }
     if (!(await (0, fs_extra_1.pathExists)(config.android.webDirAbs))) {
@@ -75,7 +78,7 @@ async function findAndroidPluginClassesInPlugin(plugin) {
     const srcFiles = await (0, fs_1.readdirp)(srcPath, {
         filter: (entry) => !entry.stats.isDirectory() && ['.java', '.kt'].includes((0, path_1.extname)(entry.path)),
     });
-    const classRegex = /^@(?:CapacitorPlugin|NativePlugin)[\s\S]+?class ([\w]+)/gm;
+    const classRegex = /^@CapacitorPlugin[\s\S]+?class ([\w]+)/gm;
     const packageRegex = /^package ([\w.]+);?$/gm;
     debug('Searching %O source files in %O by %O regex', srcFiles.length, srcPath, classRegex);
     const entries = await Promise.all(srcFiles.map(async (srcFile) => {
@@ -107,7 +110,7 @@ async function installGradlePlugins(config, capacitorPlugins, cordovaPlugins) {
         (0, errors_1.fatal)(`Unable to find ${colors_1.default.strong('node_modules/@capacitor/android')}.\n` +
             `Are you sure ${colors_1.default.strong('@capacitor/android')} is installed?`);
     }
-    const enableCordova = cordovaPlugins.length > 0;
+    const enableCordova = cordovaPlugins.length > 0 || config.app.forceCordova;
     const capacitorAndroidPath = (0, path_1.resolve)((0, path_1.dirname)(capacitorAndroidPackagePath), 'capacitor');
     const capacitorCordovaAndroidPath = (0, path_1.resolve)((0, path_1.dirname)(capacitorAndroidPackagePath), 'capacitor-cordova');
     const settingsPath = config.android.platformDirAbs;

package/dist/config.js

@@ -20,7 +20,7 @@ exports.CONFIG_FILE_NAME_TS = 'capacitor.config.ts';
 exports.CONFIG_FILE_NAME_JS = 'capacitor.config.js';
 exports.CONFIG_FILE_NAME_JSON = 'capacitor.config.json';
 async function loadConfig() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const appRootDir = process.cwd();
     const cliRootDir = (0, path_1.dirname)(__dirname);
     const conf = await loadExtConfig(appRootDir);
@@ -41,6 +41,7 @@ async function loadConfig() {
     const appId = (_a = conf.extConfig.appId) !== null && _a !== void 0 ? _a : '';
     const appName = (_b = conf.extConfig.appName) !== null && _b !== void 0 ? _b : '';
     const webDir = (_c = conf.extConfig.webDir) !== null && _c !== void 0 ? _c : 'www';
+    const forceCordova = (_d = conf.extConfig.forceCordovaInclusion) !== null && _d !== void 0 ? _d : false;
     const cli = await loadCLIConfig(cliRootDir);
     const config = {
         android: await loadAndroidConfig(appRootDir, conf.extConfig, cli),
@@ -53,7 +54,8 @@ async function loadConfig() {
             appName,
             webDir,
             webDirAbs: (0, path_1.resolve)(appRootDir, webDir),
-            package: (_d = (await (0, fn_1.tryFn)(fs_extra_1.readJSON, (0, path_1.resolve)(appRootDir, 'package.json')))) !== null && _d !== void 0 ? _d : {
+            forceCordova,
+            package: (_e = (await (0, fn_1.tryFn)(fs_extra_1.readJSON, (0, path_1.resolve)(appRootDir, 'package.json')))) !== null && _e !== void 0 ? _e : {
                 name: appName,
                 version: '1.0.0',
                 ...depsForNx,
@@ -87,7 +89,7 @@ async function loadExtConfigTS(rootDir, extConfigName, extConfigFilePath) {
                 `To use ${colors_1.default.strong(extConfigName)} files, you must install TypeScript in your project, e.g. w/ ${colors_1.default.input('npm install -D typescript')}`);
         }
         const ts = require(tsPath); // eslint-disable-line @typescript-eslint/no-var-requires
-        const extConfigObject = (0, node_1.requireTS)(ts, extConfigFilePath);
+        const extConfigObject = (await (0, node_1.requireTS)(ts, extConfigFilePath));
         const extConfig = extConfigObject.default ? await extConfigObject.default : extConfigObject;
         return {
             extConfigType: 'ts',

package/dist/cordova.js

@@ -754,13 +754,26 @@ async function writeCordovaAndroidManifest(cordovaPlugins, config, platform, cle
         });
     });
     const cleartextString = 'android:usesCleartextTraffic="true"';
-    const cleartextValue = (cleartext || ((_a = config.app.extConfig.server) === null || _a === void 0 ? void 0 : _a.cleartext)) && !applicationXMLAttributes.includes(cleartextString)
-        ? cleartextString
+    const networkSecurityConfigValue = cleartext || ((_a = config.app.extConfig.server) === null || _a === void 0 ? void 0 : _a.cleartext) || applicationXMLAttributes.includes(cleartextString)
+        ? 'android:networkSecurityConfig="@xml/network_security_config"'
         : '';
+    const networkSecurityConfigDir = (0, path_1.join)(config.android.cordovaPluginsDirAbs, 'src', 'main', 'res', 'xml');
+    const networkSecurityConfigPath = (0, path_1.join)(networkSecurityConfigDir, 'network_security_config.xml');
+    if (networkSecurityConfigValue) {
+        await (0, fs_extra_1.ensureDir)(networkSecurityConfigDir);
+        await (0, fs_extra_1.writeFile)(networkSecurityConfigPath, `<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
+`);
+    }
+    else if (await (0, fs_extra_1.pathExists)(networkSecurityConfigPath)) {
+        await (0, fs_extra_1.remove)(networkSecurityConfigPath);
+    }
     let content = `<?xml version='1.0' encoding='utf-8'?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 xmlns:amazon="http://schemas.amazon.com/apk/res/android">
-<application ${applicationXMLAttributes.join('\n')} ${cleartextValue}>
+<application ${applicationXMLAttributes.filter((attr) => !attr.includes('android:usesCleartextTraffic')).join('\n')} ${networkSecurityConfigValue}>
 ${applicationXMLEntries.join('\n')}
 </application>
 ${rootXMLEntries.join('\n')}

package/dist/declarations.d.ts

@@ -76,6 +76,14 @@ export interface CapacitorConfig {
      * @default true
      */
     initialFocus?: boolean;
+    /**
+     * If set, will include Cordova support libraries regardless
+     * of whether or not they are needed by plugins.
+     *
+     * @since 9.0.0
+     * @default false
+     */
+    forceCordovaInclusion?: boolean;
     android?: {
         /**
          * Specify a custom path to the native Android project.
@@ -520,6 +528,46 @@ export interface CapacitorConfig {
                 packageOptions?: {
                     [pluginId: string]: PackageOptions;
                 };
+                /**
+                 * Override which Capacitor Swift package the generated `Package.swift` depends on.
+                 *
+                 * By default the generated package pins the git tag matching the installed
+                 * `@capacitor/ios` version, which is correct for both stable and pre-release versions
+                 * and matches what CocoaPods resolves.
+                 *
+                 * Set this only when developing against an unreleased Capacitor, such as a local
+                 * checkout or a feature branch. Exactly one of `path`, `branch`, `revision`, `exact`,
+                 * or `from` must be set. `path` points at the repository root (the directory containing
+                 * `Package.swift`) and may be relative to the app.
+                 *
+                 * The `CAPACITOR_IOS_PACKAGE` environment variable takes precedence over this setting,
+                 * so a checkout can be redirected without editing committed configuration.
+                 *
+                 * Note that `branch` and `revision` builds are not reproducible and decouple the native
+                 * code from the `@capacitor/core` JavaScript bridge it is versioned against.
+                 *
+                 * @since 9.0.0
+                 * @example { "path": "../capacitor" }
+                 * @example { "branch": "next" }
+                 */
+                capacitorPackage?: {
+                    /**
+                     * Repository to fetch from. Ignored when `path` is set.
+                     *
+                     * @default 'https://github.com/ionic-team/capacitor'
+                     */
+                    url?: string;
+                    /** Path to a local Capacitor repository root. */
+                    path?: string;
+                    /** Branch to track. */
+                    branch?: string;
+                    /** Exact commit to pin. */
+                    revision?: string;
+                    /** Exact version tag to pin. */
+                    exact?: string;
+                    /** Minimum version tag, allowing compatible upgrades. */
+                    from?: string;
+                };
             };
         };
     };
@@ -709,13 +757,31 @@ export interface PluginsConfig {
          *
          * This option is only supported on Android.
          *
-         * `css` = Injects CSS variables (`--safe-area-inset-*`) containing correct safe area inset values into the webview.
+         * `native` = (recommended) For older Chromium versions (< v140) this embeds the webview with padding and sets the `env(safe-area-inset-*)` variables to `0px`. For newer Chromium versions (>= v140) this makes sure the webview adheres to the `viewport-fit` meta tag. If set to `viewport-fit="cover"` this will make the webview edge-to-edge and the `env(safe-area-inset-*)` variables will contain the correct values. With those values you could set padding for example so make sure the webview is shown correctly.
+         *
+         * `css` = This is the same as `native`, but it also injects CSS variables (`--safe-area-inset-*`) containing correct safe area inset values into the webview.
+         *
+         * `disable` = (not recommended) Disable safe area insets handling completely.
+         * This shifts the responsibility from Capacitor to your own code to handle the insets.
+         * Be aware that this might result in a visually broken UI if your native app code and the content loaded into the webview do not correctly handle safe area insets.
          *
-         * `disable` = Disable CSS variables injection.
+         * @default "native"
+         */
+        insetsHandling?: 'native' | 'css' | 'disable';
+        /**
+         * Set an initial value for the to be detected `viewport-fit=` meta tag value.
+         * For most apps that support edge-to-edge this value will eventually be `cover`.
+         * Therefore you might want to set this value to `cover` to help prevent layout jumps and glitches.
+         * If you know the value to be `cover` initially, you can set it here.
+         * The value will always end up correctly, no matter what you set here,
+         * as long as `insetsHandling` is set to `native` or `css`.
+         * It only exists to help prevent layout jumps and glitches.
+         *
+         * This option is only supported on Android.
          *
-         * @default "css"
+         * @default undefined
          */
-        insetsHandling?: 'css' | 'disable';
+        initialViewportFitValueHint?: 'auto' | 'contain' | 'cover';
         /**
          * The style of the text and icons of the system bars.
          *

package/dist/ios/update.js

@@ -13,6 +13,7 @@ const log_1 = require("../log");
 const plugin_1 = require("../plugin");
 const copy_1 = require("../tasks/copy");
 const migrate_1 = require("../tasks/migrate");
+const capacitor_package_1 = require("../util/capacitor-package");
 const cordova_ios_1 = require("../util/cordova-ios");
 const fs_1 = require("../util/fs");
 const iosplugin_1 = require("../util/iosplugin");
@@ -34,9 +35,12 @@ async function updatePluginFiles(config, plugins, deployment) {
     var _a;
     await (0, cordova_ios_1.removePluginsNativeFiles)(config);
     const cordovaPlugins = plugins.filter((p) => (0, plugin_1.getPluginType)(p, platform) === 1 /* PluginType.Cordova */);
-    const enableCordova = cordovaPlugins.length > 0;
+    const enableCordova = cordovaPlugins.length > 0 || config.app.forceCordova;
     if (enableCordova) {
         log_1.logger.info('Found Cordova Plugins: Including iOS Cordova Support');
+        if (config.app.forceCordova) {
+            log_1.logger.info('Cordova support installation has been forced');
+        }
         await (0, cordova_ios_1.copyPluginsNativeFiles)(config, cordovaPlugins);
     }
     if (!(await (0, fs_extra_1.pathExists)(await config.ios.webDirAbs))) {
@@ -49,20 +53,30 @@ async function updatePluginFiles(config, plugins, deployment) {
             await (0, cordova_ios_1.generateCordovaPackageFiles)(cordovaPlugins, config);
         }
         const validSPMPackages = await (0, spm_1.checkPluginsForPackageSwift)(config, plugins);
+        const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
+        const majorCapVersion = (0, semver_1.major)(iosPlatformVersion);
+        const capacitorPackage = await (0, capacitor_package_1.resolveCapacitorPackage)(config, 'from');
         await Promise.all(validSPMPackages.map(async (plugin) => {
-            var _a;
-            const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
             const packageSwiftPath = (0, path_1.join)(plugin.rootPath, 'Package.swift');
             let content = await (0, fs_extra_1.readFile)(packageSwiftPath, { encoding: 'utf-8' });
-            const regex = new RegExp('url:\\s*"https://github.com/ionic-team/capacitor-swift-pm\\.git",\\s*from:\\s*"([^"]+)"');
-            const version = (_a = content.match(regex)) === null || _a === void 0 ? void 0 : _a[1];
-            const majorCapVersion = (0, semver_1.major)(iosPlatformVersion);
+            const version = (0, capacitor_package_1.findCapacitorDependencyVersion)(content);
+            if (version && (0, semver_1.major)(version) != majorCapVersion) {
+                log_1.logger.warn(`${plugin.id} is built for Capacitor ${(0, semver_1.major)(version)}, it might cause issues`);
+            }
+            if (capacitorPackage.sourceBased) {
+                // The plugin has to resolve to the same package identity as the app, or SPM ends up with
+                // two packages that both vend a Capacitor product.
+                const rewritten = (0, capacitor_package_1.rewriteCapacitorDependency)(content, capacitorPackage, plugin.rootPath);
+                if (rewritten !== content) {
+                    await (0, fs_extra_1.writeFile)(packageSwiftPath, rewritten);
+                }
+                return;
+            }
             if (version && (0, semver_1.major)(version) != majorCapVersion) {
                 const preCapVersion = (0, semver_1.prerelease)(iosPlatformVersion);
                 const forceVersion = preCapVersion ? iosPlatformVersion : `${majorCapVersion}.0.0`;
                 content = (0, migrate_1.setAllStringIn)(content, `url: "https://github.com/ionic-team/capacitor-swift-pm.git",`, `)`, ` from: "${forceVersion}"`);
                 await (0, fs_extra_1.writeFile)(packageSwiftPath, content);
-                log_1.logger.warn(`${plugin.id} is built for Capacitor ${(0, semver_1.major)(version)}, it might cause issues`);
             }
         }));
         await (0, spm_1.generatePackageFile)(config, validSPMPackages.concat(cordovaPlugins));

package/dist/tasks/migrate-edge-to-edge.js

@@ -0,0 +1,158 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.__testables = exports.migrateToEdgeToEdge = void 0;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const log_1 = require("../log");
+const fs_1 = require("../util/fs");
+const JAVA = {
+    imports: ['import android.os.Bundle;', 'import androidx.activity.EdgeToEdge;'],
+    enableCall: 'EdgeToEdge.enable(this);',
+    onCreate: `
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        EdgeToEdge.enable(this);
+    }
+`,
+};
+const KOTLIN = {
+    imports: ['import android.os.Bundle', 'import androidx.activity.enableEdgeToEdge'],
+    enableCall: 'enableEdgeToEdge()',
+    onCreate: `
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+    }
+`,
+};
+async function migrateToEdgeToEdge(config) {
+    var _a, _b;
+    if (((_b = (_a = config.app.extConfig.plugins) === null || _a === void 0 ? void 0 : _a.SystemBars) === null || _b === void 0 ? void 0 : _b.insetsHandling) === 'disable') {
+        log_1.logger.info(`Edge-to-edge migration: SystemBars insetsHandling is 'disable', skipping.`);
+        return;
+    }
+    const activities = await findBridgeActivities(config);
+    if (activities.length === 0) {
+        log_1.logger.warn(`Edge-to-edge migration: no Activity extending BridgeActivity found. ${manualInstructions(JAVA.enableCall)}`);
+        return;
+    }
+    if (activities.length > 1) {
+        log_1.logger.warn(`Edge-to-edge migration: found more than one Activity extending BridgeActivity (${activities.join(', ')}), ` +
+            `skipping. ${manualInstructions(JAVA.enableCall)}`);
+        return;
+    }
+    const path = activities[0];
+    const language = path.endsWith('.kt') ? KOTLIN : JAVA;
+    const source = (0, fs_extra_1.readFileSync)(path, 'utf-8');
+    if (hasEdgeToEdgeEnabled(source)) {
+        log_1.logger.info('Edge-to-edge migration: Activity already enables edge-to-edge, skipping.');
+        return;
+    }
+    const patched = patchActivitySource(source, language);
+    if (!patched) {
+        log_1.logger.warn(`Edge-to-edge migration: could not patch ${path}. ${manualInstructions(language.enableCall)}`);
+        return;
+    }
+    (0, fs_extra_1.writeFileSync)(path, patched, 'utf-8');
+}
+exports.migrateToEdgeToEdge = migrateToEdgeToEdge;
+function manualInstructions(enableCall) {
+    return (`Add ${enableCall} to the onCreate of the Activity hosting Capacitor. ` +
+        `Without it the 'native' insetsHandling default of the SystemBars plugin cannot apply safe area insets.`);
+}
+async function findBridgeActivities(config) {
+    const javaDir = (0, path_1.join)(config.android.srcMainDirAbs, 'java');
+    if (!(0, fs_extra_1.existsSync)(javaDir)) {
+        return [];
+    }
+    const sources = await (0, fs_1.readdirp)(javaDir, {
+        filter: (entry) => !entry.stats.isDirectory() && (entry.path.endsWith('.java') || entry.path.endsWith('.kt')),
+    });
+    return sources.filter((path) => (0, fs_extra_1.readFileSync)(path, 'utf-8').includes('BridgeActivity'));
+}
+function hasEdgeToEdgeEnabled(source) {
+    return source.includes('EdgeToEdge.enable(') || source.includes('enableEdgeToEdge(');
+}
+function patchActivitySource(source, language) {
+    var _a;
+    const patched = (_a = insertEnableCall(source, language)) !== null && _a !== void 0 ? _a : insertOnCreate(source, language);
+    if (!patched) {
+        return undefined;
+    }
+    return addImports(patched, language.imports);
+}
+function insertEnableCall(source, language) {
+    var _a, _b;
+    const lines = source.split('\n');
+    const superCall = lines.findIndex((line) => line.includes('super.onCreate('));
+    if (superCall === -1) {
+        return undefined;
+    }
+    const indentation = (_b = (_a = lines[superCall].match(/^\s*/)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : '';
+    lines.splice(superCall + 1, 0, `${indentation}${language.enableCall}`);
+    return lines.join('\n');
+}
+function insertOnCreate(source, language) {
+    const classDeclaration = source.search(/\bclass\s+\w+/);
+    if (classDeclaration === -1) {
+        return undefined;
+    }
+    const bodyStart = source.indexOf('{', classDeclaration);
+    if (bodyStart === -1) {
+        return undefined;
+    }
+    const bodyEnd = findMatchingBrace(source, bodyStart);
+    if (bodyEnd === -1) {
+        return undefined;
+    }
+    const body = source.slice(0, bodyEnd).replace(/\s*$/, '\n');
+    return body + language.onCreate + source.slice(bodyEnd);
+}
+function findMatchingBrace(source, openIndex) {
+    let depth = 0;
+    for (let i = openIndex; i < source.length; i++) {
+        if (source[i] === '{') {
+            depth++;
+        }
+        else if (source[i] === '}') {
+            depth--;
+            if (depth === 0) {
+                return i;
+            }
+        }
+    }
+    return -1;
+}
+function addImports(source, statements) {
+    const lines = source.split('\n');
+    for (const statement of statements) {
+        if (!lines.includes(statement)) {
+            lines.splice(importInsertIndex(lines, statement), 0, statement);
+        }
+    }
+    return lines.join('\n');
+}
+function importInsertIndex(lines, statement) {
+    const sortsAfter = lines.findIndex((line) => line.startsWith('import ') && line > statement);
+    if (sortsAfter !== -1) {
+        return sortsAfter;
+    }
+    let lastImport = -1;
+    lines.forEach((line, index) => {
+        if (line.startsWith('import ')) {
+            lastImport = index;
+        }
+    });
+    if (lastImport !== -1) {
+        return lastImport + 1;
+    }
+    return lines.findIndex((line) => line.startsWith('package ')) + 1;
+}
+exports.__testables = {
+    JAVA,
+    KOTLIN,
+    addImports,
+    hasEdgeToEdgeEnabled,
+    patchActivitySource,
+};