@capacitor-plus/cli 8.0.2 → 8.0.4

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-plus/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-plus/android')}.\n` +
-            `Are you sure ${colors_1.default.strong('@capacitor-plus/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-plus/${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-plus/${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-plus/${name}.\n` +
-            `Are you sure ${colors_1.default.strong(`@capacitor-plus/${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-plus/core')}${colors_1.default.weak(`@${coreVersion}`)} version doesn't match ${colors_1.default.strong(`@capacitor-plus/${platform}`)}${colors_1.default.weak(`@${platformVersion}`)} version.\n` +
-            `Consider updating to a matching version, e.g. w/ ${colors_1.default.input(`npm install @capacitor-plus/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-plus/${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) {

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-plus/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-plus/core/cordova.js')}.\n` +
-            `Are you sure ${colors_1.default.strong('@capacitor-plus/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/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-plus/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-plus/ios')}.\n` +
-            `Are you sure ${colors_1.default.strong('@capacitor-plus/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/doctor.js

@@ -21,17 +21,25 @@ 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(cliVersion !== null && cliVersion !== void 0 ? cliVersion : 'unknown')}\n` +
-        `  @capacitor-plus/core: ${colors_1.default.weak(coreVersion !== null && coreVersion !== void 0 ? coreVersion : 'unknown')}\n` +
-        `  @capacitor-plus/android: ${colors_1.default.weak(androidVersion !== null && androidVersion !== void 0 ? androidVersion : 'unknown')}\n` +
-        `  @capacitor-plus/ios: ${colors_1.default.weak(iosVersion !== null && iosVersion !== void 0 ? iosVersion : 'unknown')}\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` +
+        `  @capacitor/ios: ${colors_1.default.weak(iosVersion !== null && iosVersion !== void 0 ? iosVersion : 'unknown')}\n\n` +
         `${colors_1.default.strong('Installed Dependencies:')}\n\n`);
     await printInstalledPackages(config);
     log_1.output.write('\n');
@@ -43,6 +51,10 @@ async function printInstalledPackages(config) {
         '@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');

package/dist/tasks/migrate.js

@@ -17,7 +17,16 @@ const subprocess_1 = require("../util/subprocess");
 const template_1 = require("../util/template");
 // eslint-disable-next-line prefer-const
 let allDependencies = {};
-const libs = ['@capacitor-plus/core', '@capacitor-plus/cli', '@capacitor-plus/ios', '@capacitor-plus/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',
@@ -44,6 +53,31 @@ const plugins = [
     '@capacitor-plus/status-bar',
     '@capacitor-plus/text-zoom',
     '@capacitor-plus/toast',
+    '@capacitor/action-sheet',
+    '@capacitor/app',
+    '@capacitor/app-launcher',
+    '@capacitor/browser',
+    '@capacitor/camera',
+    '@capacitor/clipboard',
+    '@capacitor/device',
+    '@capacitor/dialog',
+    '@capacitor/filesystem',
+    '@capacitor/geolocation',
+    '@capacitor/google-maps',
+    '@capacitor/haptics',
+    '@capacitor/keyboard',
+    '@capacitor/local-notifications',
+    '@capacitor/motion',
+    '@capacitor/network',
+    '@capacitor/preferences',
+    '@capacitor/push-notifications',
+    '@capacitor/screen-orientation',
+    '@capacitor/screen-reader',
+    '@capacitor/share',
+    '@capacitor/splash-screen',
+    '@capacitor/status-bar',
+    '@capacitor/text-zoom',
+    '@capacitor/toast',
 ];
 const coreVersion = '^8.0.0';
 const pluginVersion = '^8.0.0';
@@ -120,7 +154,8 @@ async function migrateCommand(config, noprompt, packagemanager) {
                 installFailed = true;
             }
             // Update iOS Projects
-            if (allDependencies['@capacitor-plus/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
@@ -146,7 +181,8 @@ async function migrateCommand(config, noprompt, packagemanager) {
             else {
                 log_1.logger.warn('Skipped Running cap sync.');
             }
-            if (allDependencies['@capacitor-plus/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'));
@@ -291,6 +327,7 @@ async function installLatestLibs(dependencyManager, runInstall, config) {
     });
     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') {
             await (0, subprocess_1.runCommand)(dependencyManager, ['upgrade']);
@@ -315,6 +352,16 @@ async function writeBreakingChanges() {
         '@capacitor-plus/screen-orientation',
         '@capacitor-plus/splash-screen',
         '@capacitor-plus/status-bar',
+        '@capacitor/action-sheet',
+        '@capacitor/barcode-scanner',
+        '@capacitor/browser',
+        '@capacitor/camera',
+        '@capacitor/geolocation',
+        '@capacitor/google-maps',
+        '@capacitor/push-notifications',
+        '@capacitor/screen-orientation',
+        '@capacitor/splash-screen',
+        '@capacitor/status-bar',
     ];
     const broken = [];
     for (const lib of breaking) {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@capacitor-plus/cli",
-  "version": "8.0.2",
+  "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": {