@capacitor-plus/cli 8.0.0-beta.0 → 8.0.4

package/README.md

@@ -1,45 +1,63 @@
-# Capacitor CLI
+# @capacitor-plus/cli
 
-The Capacitor command-line interface (CLI) is a tool for creating and managing Capacitor applications. While it can be installed globally, it's recommended to install it locally in your project and execute through `npm` scripts.
+The command-line interface for Capacitor+.
+
+## What is Capacitor+?
+
+**Capacitor+** is an automated fork of [Capacitor](https://github.com/ionic-team/capacitor) maintained by [Capgo](https://capgo.app). It provides the same functionality as `@capacitor/cli` with these benefits:
+
+- **Faster Updates**: Get upstream fixes as soon as they pass CI, not months later
+- **Community PRs Merged**: Valuable PRs stuck in the upstream queue are merged here
+- **Security Reviewed**: Every change is analyzed by Claude Code for vulnerabilities
+- **Drop-in Replacement**: Same commands, just a different package scope
 
 ## Installation
 
 ### Project Installation (Recommended)
 
-Install the CLI locally in your project:
-
 ```bash
-npm install @capacitor/cli --save-dev
+npm install @capacitor-plus/cli --save-dev
 ```
 
 ### Global Installation
 
-While not recommended for project use, you can install the CLI globally:
+```bash
+npm install -g @capacitor-plus/cli
+```
+
+## Usage
+
+The CLI can be used through the `capacitor` or `cap` command. When installed locally, use it through `npx`:
 
 ```bash
-npm install -g @capacitor/cli
+npx cap init          # Initialize a new Capacitor project
+npx cap add android   # Add Android platform
+npx cap add ios       # Add iOS platform
+npx cap sync          # Sync web code to native projects
+npx cap build         # Build native projects
+npx cap run           # Run on a device or emulator
 ```
 
-## Using Capacitor CLI
+For detailed information, consult the [Getting Started guide](https://capacitorjs.com/docs/getting-started).
 
-The CLI can be used through the `capacitor` or `cap` command. When installed locally, use it through your project's `npm` scripts or `npx`.
+## Why Use This Instead of @capacitor/cli?
 
-Common commands:
+The official Capacitor release cycle can leave bug fixes and improvements waiting for months. Capacitor+ automatically syncs with upstream daily, runs full CI, and publishes verified releases immediately.
 
-- `cap init`: Initialize a new Capacitor project
-- `cap add`: Add a native platform (ios, android)
-- `cap sync`: Sync your web code to your native projects
+**Have a PR stuck in the Capacitor repo?** Open an issue linking to it, and we'll merge it here so you can use your fix today.
 
-For detailed information, consult the [Getting Started guide](https://capacitorjs.com/docs/getting-started).
+## Compatibility
+
+This package maintains API compatibility with `@capacitor/cli`. All commands work identically to the official CLI.
 
 ## Local Development
 
-If you're contributing to the Capacitor CLI or testing local changes:
+If you're contributing to Capacitor+ CLI or testing local changes:
 
 1. Clone and setup:
 
    ```bash
-   git clone https://github.com/ionic-team/capacitor.git
+   git clone https://github.com/Cap-go/capacitor-plus.git
    cd cli
    npm install
    ```
@@ -61,24 +79,12 @@ If you're contributing to the Capacitor CLI or testing local changes:
    - Use `capacitor` or `cap` commands to test your changes
    - Run `npm test` to execute the test suite
 
-## Debugging
-
-### Using VS Code Launch Configurations
-
-The CLI includes VS Code launch configurations for debugging. To debug a CLI command:
-
-1. Open the project in VS Code
-2. Right now we don't have debugging working in the ts files, so select one of the .js files inside of /dist/\*\*.js
-3. Place a breakpoint
-4. Press F5 or go to Run > Start Debugging
-5. Select a launch config and run filling out the path you want to run the cli in, and the command that you want run.
-
-You can add more configurations by copying and modifying the existing ones in `.vscode/launch.json`.
-
-## Contributing
+## Links
 
-Contributions are welcome! Please read our [Contributing Guide](https://github.com/ionic-team/capacitor/blob/main/CONTRIBUTING.md) for details.
+- [Main Repository](https://github.com/Cap-go/capacitor-plus)
+- [Capacitor Documentation](https://capacitorjs.com/docs)
+- [Capgo](https://capgo.app)
 
-### License
+## License
 
-- [MIT](https://github.com/ionic-team/capacitor/blob/HEAD/LICENSE)
+MIT - See [LICENSE](../LICENSE)

package/dist/android/update.js

@@ -91,10 +91,14 @@ async function findAndroidPluginClassesInPlugin(plugin) {
     return entries.filter((entry) => !!entry);
 }
 async function installGradlePlugins(config, capacitorPlugins, cordovaPlugins) {
-    const capacitorAndroidPackagePath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor/android', 'package.json');
+    // Try @capacitor-plus/android first, then fall back to @capacitor/android
+    let capacitorAndroidPackagePath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor-plus/android', 'package.json');
     if (!capacitorAndroidPackagePath) {
-        (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?`);
+        capacitorAndroidPackagePath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor/android', 'package.json');
+    }
+    if (!capacitorAndroidPackagePath) {
+        (0, errors_1.fatal)(`Unable to find ${colors_1.default.strong('node_modules/@capacitor-plus/android')} or ${colors_1.default.strong('node_modules/@capacitor/android')}.\n` +
+            `Are you sure ${colors_1.default.strong('@capacitor-plus/android')} or ${colors_1.default.strong('@capacitor/android')} is installed?`);
     }
     const capacitorAndroidPath = (0, path_1.resolve)((0, path_1.dirname)(capacitorAndroidPackagePath), 'capacitor');
     const settingsPath = config.android.platformDirAbs;

package/dist/common.js

@@ -59,7 +59,7 @@ async function checkCapacitorPlatform(config, platform) {
     const pkg = await getCapacitorPackage(config, platform);
     if (!pkg) {
         return (`Could not find the ${colors_1.default.input(platform)} platform.\n` +
-            `You must install it in your project first, e.g. w/ ${colors_1.default.input(`npm install @capacitor/${platform}`)}`);
+            `You must install it in your project first, e.g. w/ ${colors_1.default.input(`npm install @capacitor-plus/${platform}`)} or ${colors_1.default.input(`npm install @capacitor/${platform}`)}`);
     }
     return null;
 }
@@ -186,7 +186,11 @@ async function runTask(title, fn) {
 }
 exports.runTask = runTask;
 async function getCapacitorPackage(config, name) {
-    const packagePath = (0, node_1.resolveNode)(config.app.rootDir, `@capacitor/${name}`, 'package.json');
+    // Try @capacitor-plus first, then fall back to @capacitor
+    let packagePath = (0, node_1.resolveNode)(config.app.rootDir, `@capacitor-plus/${name}`, 'package.json');
+    if (!packagePath) {
+        packagePath = (0, node_1.resolveNode)(config.app.rootDir, `@capacitor/${name}`, 'package.json');
+    }
     if (!packagePath) {
         return null;
     }
@@ -196,8 +200,8 @@ exports.getCapacitorPackage = getCapacitorPackage;
 async function requireCapacitorPackage(config, name) {
     const pkg = await getCapacitorPackage(config, name);
     if (!pkg) {
-        (0, errors_1.fatal)(`Unable to find node_modules/@capacitor/${name}.\n` +
-            `Are you sure ${colors_1.default.strong(`@capacitor/${name}`)} is installed?`);
+        (0, errors_1.fatal)(`Unable to find node_modules/@capacitor-plus/${name} or node_modules/@capacitor/${name}.\n` +
+            `Are you sure ${colors_1.default.strong(`@capacitor-plus/${name}`)} or ${colors_1.default.strong(`@capacitor/${name}`)} is installed?`);
     }
     return pkg;
 }
@@ -375,16 +379,22 @@ async function checkPlatformVersions(config, platform) {
     const coreVersion = await getCoreVersion(config);
     const platformVersion = await getCapacitorPackageVersion(config, platform);
     if (semver.diff(coreVersion, platformVersion) === 'minor' || semver.diff(coreVersion, platformVersion) === 'major') {
-        log_1.logger.warn(`${colors_1.default.strong('@capacitor/core')}${colors_1.default.weak(`@${coreVersion}`)} version doesn't match ${colors_1.default.strong(`@capacitor/${platform}`)}${colors_1.default.weak(`@${platformVersion}`)} version.\n` +
-            `Consider updating to a matching version, e.g. w/ ${colors_1.default.input(`npm install @capacitor/core@${platformVersion}`)}`);
+        log_1.logger.warn(`${colors_1.default.strong('core')}${colors_1.default.weak(`@${coreVersion}`)} version doesn't match ${colors_1.default.strong(`${platform}`)}${colors_1.default.weak(`@${platformVersion}`)} version.\n` +
+            `Consider updating to a matching version.`);
     }
 }
 exports.checkPlatformVersions = checkPlatformVersions;
 function resolvePlatform(config, platform) {
     if (platform[0] !== '@') {
-        const core = (0, node_1.resolveNode)(config.app.rootDir, `@capacitor/${platform}`, 'package.json');
-        if (core) {
-            return (0, path_1.dirname)(core);
+        // Try @capacitor-plus first
+        const capacitorPlus = (0, node_1.resolveNode)(config.app.rootDir, `@capacitor-plus/${platform}`, 'package.json');
+        if (capacitorPlus) {
+            return (0, path_1.dirname)(capacitorPlus);
+        }
+        // Fall back to official @capacitor
+        const capacitor = (0, node_1.resolveNode)(config.app.rootDir, `@capacitor/${platform}`, 'package.json');
+        if (capacitor) {
+            return (0, path_1.dirname)(capacitor);
         }
         const community = (0, node_1.resolveNode)(config.app.rootDir, `@capacitor-community/${platform}`, 'package.json');
         if (community) {
@@ -429,7 +439,9 @@ async function checkJDKMajorVersion() {
 }
 exports.checkJDKMajorVersion = checkJDKMajorVersion;
 function parseApkNameFromFlavor(flavor) {
-    const convertedName = flavor.replace(/([A-Z])/g, '$1').toLowerCase();
+    let convertedName = flavor.replace(/([A-Z])/g, '-$1').toLowerCase();
+    if (convertedName.startsWith('-'))
+        convertedName = convertedName.replace('-', '');
     return `app-${convertedName ? `${convertedName}-` : ''}debug.apk`;
 }
 exports.parseApkNameFromFlavor = parseApkNameFromFlavor;

package/dist/config.js

@@ -396,7 +396,7 @@ async function determineGemfileOrCocoapodPath(rootDir, platformDir, nativeProjec
 }
 function formatConfigTS(extConfig) {
     // TODO: <reference> tags
-    return `import type { CapacitorConfig } from '@capacitor/cli';
+    return `import type { CapacitorConfig } from '@capacitor-plus/cli';
 
 const config: CapacitorConfig = ${(0, js_1.formatJSObject)(extConfig)};
 

package/dist/cordova.js

@@ -125,10 +125,14 @@ async function copyPluginsJS(config, cordovaPlugins, platform) {
 }
 exports.copyPluginsJS = copyPluginsJS;
 async function copyCordovaJS(config, platform) {
-    const cordovaPath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor/core', 'cordova.js');
+    // Try @capacitor-plus/core first, then fall back to @capacitor/core
+    let cordovaPath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor-plus/core', 'cordova.js');
     if (!cordovaPath) {
-        (0, errors_1.fatal)(`Unable to find ${colors_1.default.strong('node_modules/@capacitor/core/cordova.js')}.\n` +
-            `Are you sure ${colors_1.default.strong('@capacitor/core')} is installed?`);
+        cordovaPath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor/core', 'cordova.js');
+    }
+    if (!cordovaPath) {
+        (0, errors_1.fatal)(`Unable to find ${colors_1.default.strong('node_modules/@capacitor-plus/core/cordova.js')} or ${colors_1.default.strong('node_modules/@capacitor/core/cordova.js')}.\n` +
+            `Are you sure ${colors_1.default.strong('@capacitor-plus/core')} or ${colors_1.default.strong('@capacitor/core')} is installed?`);
     }
     return (0, fs_extra_1.copy)(cordovaPath, (0, path_1.join)(await getWebDir(config, platform), 'cordova.js'));
 }

package/dist/declarations.d.ts

@@ -642,11 +642,17 @@ export interface PluginsConfig {
      */
     SystemBars?: {
         /**
-         * Disables the injection of device css insets into the web view.
+         * Specifies how to handle problematic insets on Android.
          *
-         * @default false
+         * This option is only supported on Android.
+         *
+         * `css` = Injects CSS variables (`--safe-area-inset-*`) containing correct safe area inset values into the webview.
+         *
+         * `disable` = Disable all inset handling.
+         *
+         * @default "css"
          */
-        disableInsets?: boolean;
+        insetsHandling?: 'css' | 'disable';
         /**
          * The style of the text and icons of the system bars.
          *

package/dist/ios/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMajoriOSVersion = exports.editProjectSettingsIOS = exports.resolvePlugin = exports.getIOSPlugins = exports.checkCocoaPods = exports.checkBundler = exports.checkIOSPackage = void 0;
+exports.getMajorMinoriOSVersion = exports.getMajoriOSVersion = exports.editProjectSettingsIOS = exports.resolvePlugin = exports.getIOSPlugins = exports.checkCocoaPods = exports.checkBundler = exports.checkIOSPackage = void 0;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const fs_extra_1 = require("fs-extra");
@@ -103,3 +103,29 @@ function getMajoriOSVersion(config) {
     return iosVersion;
 }
 exports.getMajoriOSVersion = getMajoriOSVersion;
+function getMajorMinoriOSVersion(config) {
+    const pbx = (0, fs_extra_1.readFileSync)((0, path_1.join)(config.ios.nativeXcodeProjDirAbs, 'project.pbxproj'), 'utf-8');
+    const searchString = 'IPHONEOS_DEPLOYMENT_TARGET = ';
+    const startIndex = pbx.indexOf(searchString);
+    if (startIndex === -1) {
+        return '';
+    }
+    const valueStart = startIndex + searchString.length;
+    // Extract until semicolon or newline (typical end of value in pbxproj)
+    const endIndex = pbx.indexOf(';', valueStart);
+    const newlineIndex = pbx.indexOf('\n', valueStart);
+    const actualEnd = endIndex !== -1 && newlineIndex !== -1
+        ? Math.min(endIndex, newlineIndex)
+        : endIndex !== -1
+            ? endIndex
+            : newlineIndex !== -1
+                ? newlineIndex
+                : pbx.length;
+    let iosVersion = pbx.substring(valueStart, actualEnd).trim();
+    // Remove trailing .0 if present
+    if (iosVersion.endsWith('.0')) {
+        iosVersion = iosVersion.slice(0, -2);
+    }
+    return iosVersion;
+}
+exports.getMajorMinoriOSVersion = getMajorMinoriOSVersion;

package/dist/ios/update.js

@@ -138,10 +138,14 @@ async function updatePodfile(config, plugins, deployment) {
     }
 }
 async function getRelativeCapacitoriOSPath(config) {
-    const capacitoriOSPath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor/ios', 'package.json');
+    // Try @capacitor-plus/ios first, then fall back to @capacitor/ios
+    let capacitoriOSPath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor-plus/ios', 'package.json');
     if (!capacitoriOSPath) {
-        (0, errors_1.fatal)(`Unable to find ${colors_1.default.strong('node_modules/@capacitor/ios')}.\n` +
-            `Are you sure ${colors_1.default.strong('@capacitor/ios')} is installed?`);
+        capacitoriOSPath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor/ios', 'package.json');
+    }
+    if (!capacitoriOSPath) {
+        (0, errors_1.fatal)(`Unable to find ${colors_1.default.strong('node_modules/@capacitor-plus/ios')} or ${colors_1.default.strong('node_modules/@capacitor/ios')}.\n` +
+            `Are you sure ${colors_1.default.strong('@capacitor-plus/ios')} or ${colors_1.default.strong('@capacitor/ios')} is installed?`);
     }
     return (0, fs_1.convertToUnixPath)((0, path_1.relative)(config.ios.nativeProjectDirAbs, await (0, fs_extra_1.realpath)((0, path_1.dirname)(capacitoriOSPath))));
 }

package/dist/tasks/create.js

@@ -5,6 +5,6 @@ const tslib_1 = require("tslib");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const errors_1 = require("../errors");
 async function createCommand() {
-    (0, errors_1.fatal)(`The create command has been removed.\n` + `Use ${colors_1.default.input('npm init @capacitor/app')}`);
+    (0, errors_1.fatal)(`The create command has been removed.\n` + `Use ${colors_1.default.input('npm init @capacitor-plus/app')}`);
 }
 exports.createCommand = createCommand;

package/dist/tasks/doctor.js

@@ -21,13 +21,21 @@ async function doctorCommand(config, selectedPlatformName) {
 }
 exports.doctorCommand = doctorCommand;
 async function doctorCore(config) {
-    const [cliVersion, coreVersion, androidVersion, iosVersion] = await Promise.all([
+    const [cliVersionPlus, coreVersionPlus, androidVersionPlus, iosVersionPlus, cliVersion, coreVersion, androidVersion, iosVersion,] = await Promise.all([
+        (0, subprocess_1.getCommandOutput)('npm', ['info', '@capacitor-plus/cli', 'version']),
+        (0, subprocess_1.getCommandOutput)('npm', ['info', '@capacitor-plus/core', 'version']),
+        (0, subprocess_1.getCommandOutput)('npm', ['info', '@capacitor-plus/android', 'version']),
+        (0, subprocess_1.getCommandOutput)('npm', ['info', '@capacitor-plus/ios', 'version']),
         (0, subprocess_1.getCommandOutput)('npm', ['info', '@capacitor/cli', 'version']),
         (0, subprocess_1.getCommandOutput)('npm', ['info', '@capacitor/core', 'version']),
         (0, subprocess_1.getCommandOutput)('npm', ['info', '@capacitor/android', 'version']),
         (0, subprocess_1.getCommandOutput)('npm', ['info', '@capacitor/ios', 'version']),
     ]);
     log_1.output.write(`${colors_1.default.strong('Latest Dependencies:')}\n\n` +
+        `  @capacitor-plus/cli: ${colors_1.default.weak(cliVersionPlus !== null && cliVersionPlus !== void 0 ? cliVersionPlus : 'unknown')}\n` +
+        `  @capacitor-plus/core: ${colors_1.default.weak(coreVersionPlus !== null && coreVersionPlus !== void 0 ? coreVersionPlus : 'unknown')}\n` +
+        `  @capacitor-plus/android: ${colors_1.default.weak(androidVersionPlus !== null && androidVersionPlus !== void 0 ? androidVersionPlus : 'unknown')}\n` +
+        `  @capacitor-plus/ios: ${colors_1.default.weak(iosVersionPlus !== null && iosVersionPlus !== void 0 ? iosVersionPlus : 'unknown')}\n\n` +
         `  @capacitor/cli: ${colors_1.default.weak(cliVersion !== null && cliVersion !== void 0 ? cliVersion : 'unknown')}\n` +
         `  @capacitor/core: ${colors_1.default.weak(coreVersion !== null && coreVersion !== void 0 ? coreVersion : 'unknown')}\n` +
         `  @capacitor/android: ${colors_1.default.weak(androidVersion !== null && androidVersion !== void 0 ? androidVersion : 'unknown')}\n` +
@@ -38,7 +46,16 @@ async function doctorCore(config) {
 }
 exports.doctorCore = doctorCore;
 async function printInstalledPackages(config) {
-    const packageNames = ['@capacitor/cli', '@capacitor/core', '@capacitor/android', '@capacitor/ios'];
+    const packageNames = [
+        '@capacitor-plus/cli',
+        '@capacitor-plus/core',
+        '@capacitor-plus/android',
+        '@capacitor-plus/ios',
+        '@capacitor/cli',
+        '@capacitor/core',
+        '@capacitor/android',
+        '@capacitor/ios',
+    ];
     await Promise.all(packageNames.map(async (packageName) => {
         const packagePath = (0, node_1.resolveNode)(config.app.rootDir, packageName, 'package.json');
         await printPackageVersion(packageName, packagePath);

package/dist/tasks/migrate.js

@@ -17,8 +17,42 @@ const subprocess_1 = require("../util/subprocess");
 const template_1 = require("../util/template");
 // eslint-disable-next-line prefer-const
 let allDependencies = {};
-const libs = ['@capacitor/core', '@capacitor/cli', '@capacitor/ios', '@capacitor/android'];
+const libs = [
+    '@capacitor-plus/core',
+    '@capacitor-plus/cli',
+    '@capacitor-plus/ios',
+    '@capacitor-plus/android',
+    '@capacitor/core',
+    '@capacitor/cli',
+    '@capacitor/ios',
+    '@capacitor/android',
+];
 const plugins = [
+    '@capacitor-plus/action-sheet',
+    '@capacitor-plus/app',
+    '@capacitor-plus/app-launcher',
+    '@capacitor-plus/browser',
+    '@capacitor-plus/camera',
+    '@capacitor-plus/clipboard',
+    '@capacitor-plus/device',
+    '@capacitor-plus/dialog',
+    '@capacitor-plus/filesystem',
+    '@capacitor-plus/geolocation',
+    '@capacitor-plus/google-maps',
+    '@capacitor-plus/haptics',
+    '@capacitor-plus/keyboard',
+    '@capacitor-plus/local-notifications',
+    '@capacitor-plus/motion',
+    '@capacitor-plus/network',
+    '@capacitor-plus/preferences',
+    '@capacitor-plus/push-notifications',
+    '@capacitor-plus/screen-orientation',
+    '@capacitor-plus/screen-reader',
+    '@capacitor-plus/share',
+    '@capacitor-plus/splash-screen',
+    '@capacitor-plus/status-bar',
+    '@capacitor-plus/text-zoom',
+    '@capacitor-plus/toast',
     '@capacitor/action-sheet',
     '@capacitor/app',
     '@capacitor/app-launcher',
@@ -29,6 +63,7 @@ const plugins = [
     '@capacitor/dialog',
     '@capacitor/filesystem',
     '@capacitor/geolocation',
+    '@capacitor/google-maps',
     '@capacitor/haptics',
     '@capacitor/keyboard',
     '@capacitor/local-notifications',
@@ -36,8 +71,8 @@ const plugins = [
     '@capacitor/network',
     '@capacitor/preferences',
     '@capacitor/push-notifications',
-    '@capacitor/screen-reader',
     '@capacitor/screen-orientation',
+    '@capacitor/screen-reader',
     '@capacitor/share',
     '@capacitor/splash-screen',
     '@capacitor/status-bar',
@@ -119,7 +154,8 @@ async function migrateCommand(config, noprompt, packagemanager) {
                 installFailed = true;
             }
             // Update iOS Projects
-            if (allDependencies['@capacitor/ios'] && (0, fs_extra_1.existsSync)(config.ios.platformDirAbs)) {
+            if ((allDependencies['@capacitor-plus/ios'] || allDependencies['@capacitor/ios']) &&
+                (0, fs_extra_1.existsSync)(config.ios.platformDirAbs)) {
                 const currentiOSVersion = (0, common_2.getMajoriOSVersion)(config);
                 if (parseInt(currentiOSVersion) < parseInt(iOSVersion)) {
                     // ios template changes
@@ -145,7 +181,8 @@ async function migrateCommand(config, noprompt, packagemanager) {
             else {
                 log_1.logger.warn('Skipped Running cap sync.');
             }
-            if (allDependencies['@capacitor/android'] && (0, fs_extra_1.existsSync)(config.android.platformDirAbs)) {
+            if ((allDependencies['@capacitor-plus/android'] || allDependencies['@capacitor/android']) &&
+                (0, fs_extra_1.existsSync)(config.android.platformDirAbs)) {
                 // AndroidManifest.xml add "density"
                 await (0, common_1.runTask)(`Migrating AndroidManifest.xml by adding density to Activity configChanges.`, () => {
                     return updateAndroidManifest((0, path_1.join)(config.android.srcMainDirAbs, 'AndroidManifest.xml'));
@@ -289,6 +326,7 @@ async function installLatestLibs(dependencyManager, runInstall, config) {
         encoding: 'utf-8',
     });
     if (runInstall) {
+        rimraf_1.rimraf.sync((0, path_1.join)(config.app.rootDir, 'node_modules/@capacitor-plus/!(cli)'));
         rimraf_1.rimraf.sync((0, path_1.join)(config.app.rootDir, 'node_modules/@capacitor/!(cli)'));
         await (0, subprocess_1.runCommand)(dependencyManager, ['install']);
         if (dependencyManager == 'yarn') {
@@ -299,11 +337,21 @@ async function installLatestLibs(dependencyManager, runInstall, config) {
         }
     }
     else {
-        log_1.logger.info(`Please run an install command with your package manager of choice. (ex: yarn install)`);
+        log_1.logger.info(`Please run an install command with your package manager of choice. (ex: yarn add)`);
     }
 }
 async function writeBreakingChanges() {
     const breaking = [
+        '@capacitor-plus/action-sheet',
+        '@capacitor-plus/barcode-scanner',
+        '@capacitor-plus/browser',
+        '@capacitor-plus/camera',
+        '@capacitor-plus/geolocation',
+        '@capacitor-plus/google-maps',
+        '@capacitor-plus/push-notifications',
+        '@capacitor-plus/screen-orientation',
+        '@capacitor-plus/splash-screen',
+        '@capacitor-plus/status-bar',
         '@capacitor/action-sheet',
         '@capacitor/barcode-scanner',
         '@capacitor/browser',

package/dist/tasks/new-plugin.js

@@ -5,6 +5,6 @@ const tslib_1 = require("tslib");
 const colors_1 = tslib_1.__importDefault(require("../colors"));
 const errors_1 = require("../errors");
 async function newPluginCommand() {
-    (0, errors_1.fatal)(`The plugin:generate command has been removed.\n` + `Use ${colors_1.default.input('npm init @capacitor/plugin')}`);
+    (0, errors_1.fatal)(`The plugin:generate command has been removed.\n` + `Use ${colors_1.default.input('npm init @capacitor-plus/plugin')}`);
 }
 exports.newPluginCommand = newPluginCommand;

package/dist/telemetry.js

@@ -35,11 +35,11 @@ function telemetryAction(config, action) {
             ...config.app.package.devDependencies,
             ...config.app.package.dependencies,
         });
-        // Only collect packages in the capacitor org:
-        // https://www.npmjs.com/org/capacitor
-        const capacitorPackages = packages.filter(([k]) => k.startsWith('@capacitor/'));
+        // Only collect packages in the capacitor-plus org:
+        // https://www.npmjs.com/org/capacitor-plus
+        const capacitorPackages = packages.filter(([k]) => k.startsWith('@capacitor-plus/'));
         const versions = capacitorPackages.map(([k, v]) => [
-            `${k.replace(/^@capacitor\//, '').replace(/-/g, '_')}_version`,
+            `${k.replace(/^@capacitor-plus\//, '').replace(/-/g, '_')}_version`,
             v,
         ]);
         const data = {

package/dist/util/spm.js

@@ -81,14 +81,14 @@ exports.removeCocoapodsFiles = removeCocoapodsFiles;
 async function generatePackageText(config, plugins) {
     var _a, _b, _c;
     const iosPlatformVersion = await (0, common_1.getCapacitorPackageVersion)(config, config.ios.name);
-    const iosVersion = (0, common_2.getMajoriOSVersion)(config);
+    const iosVersion = (0, common_2.getMajorMinoriOSVersion)(config);
     let packageSwiftText = `// swift-tools-version: 5.9
 import PackageDescription
 
 // DO NOT MODIFY THIS FILE - managed by Capacitor CLI commands
 let package = Package(
     name: "CapApp-SPM",
-    platforms: [.iOS(.v${iosVersion})],
+    platforms: [.iOS(${iosVersion.includes('.') ? `"${iosVersion}"` : `.v${iosVersion}`})],
     products: [
         .library(
             name: "CapApp-SPM",

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@capacitor-plus/cli",
-  "version": "8.0.0-beta.0",
+  "version": "8.0.4",
   "description": "Capacitor+: Enhanced Capacitor with automated upstream sync - Cross-platform apps with JavaScript and the web",
-  "homepage": "https://github.com/Cap-go/capacitor-plus",
+  "homepage": "https://capgo.app/docs/plugins/capacitor-plus/",
   "author": "Capgo Team <support@capgo.app> (https://capgo.app)",
   "license": "MIT",
   "repository": {