@capawesome/cli 3.7.0-dev.24727dc.1764842591 → 3.7.0-dev.445ea3a.1764843317

package/dist/commands/apps/liveupdates/setup.js

@@ -6,6 +6,7 @@ import { findCapacitorConfigPath, readCapacitorConfig } from '../../../utils/cap
 import { copyToClipboard } from '../../../utils/clipboard.js';
 import { fileExistsAtPath } from '../../../utils/file.js';
 import { checkOpensslInstalled, generateKeyPair, readPublicKey } from '../../../utils/openssl.js';
+import { findPackageJsonPath, getCapacitorMajorVersion, isPackageInstalled } from '../../../utils/package-json.js';
 import { installPackage } from '../../../utils/package-manager.js';
 import { prompt } from '../../../utils/prompt.js';
 import { defineCommand, defineOptions } from '@robingenz/zli';
@@ -39,7 +40,7 @@ export default defineCommand({
         // Try to get from config first
         if (!appId && config?.plugins?.LiveUpdate?.appId) {
             appId = config.plugins.LiveUpdate.appId;
-            consola.success(`Using existing app ID from Capacitor configuration: ${appId}`);
+            consola.info(`Found existing Capawesome Cloud app ID in Capacitor configuration: ${appId}`);
         }
         // Prompt if still not found
         if (!appId) {
@@ -85,33 +86,54 @@ export default defineCommand({
                 process.exit(1);
             }
         }
-        // Update config with app ID
-        await updateCapacitorConfig(capacitorConfigPath, {
-            plugins: {
-                LiveUpdate: {
-                    appId,
+        if (!config?.plugins?.LiveUpdate?.appId) {
+            // Update config with app ID
+            await updateCapacitorConfig(capacitorConfigPath, {
+                plugins: {
+                    LiveUpdate: {
+                        appId,
+                    },
                 },
-            },
-        });
-        consola.success(`Updated Capacitor configuration with app ID: ${appId}`);
+            });
+            consola.success(`Updated Capacitor configuration with Capawesome Cloud app ID: ${appId}`);
+        }
         // Step 4: Install SDK (Optional)
-        // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-        const shouldInstall = await prompt('Do you want to install the Live Update SDK?', {
-            type: 'confirm',
-            initial: true,
-        });
-        if (shouldInstall) {
+        const packageJsonPath = await findPackageJsonPath();
+        let sdkInstalled = false;
+        if (packageJsonPath) {
+            sdkInstalled = await isPackageInstalled(packageJsonPath, '@capawesome/capacitor-live-update');
+            if (sdkInstalled) {
+                consola.info('Live Update SDK is already installed.');
+            }
+        }
+        if (!sdkInstalled) {
             // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-            const packageManager = await prompt('Select your package manager:', {
-                type: 'select',
-                options: [
-                    { label: 'npm', value: 'npm' },
-                    { label: 'yarn', value: 'yarn' },
-                    { label: 'pnpm', value: 'pnpm' },
-                ],
+            const shouldInstall = await prompt('Do you want to install the Live Update SDK?', {
+                type: 'confirm',
+                initial: true,
             });
-            await installPackage('@capawesome/capacitor-live-update', packageManager);
-            consola.success('Live Update SDK installed successfully.');
+            if (shouldInstall) {
+                // Get Capacitor version to install matching plugin version
+                let packageName = '@capawesome/capacitor-live-update';
+                if (packageJsonPath) {
+                    const capacitorMajorVersion = await getCapacitorMajorVersion(packageJsonPath);
+                    if (capacitorMajorVersion) {
+                        packageName = `@capawesome/capacitor-live-update@^${capacitorMajorVersion}.0.0`;
+                        consola.info(`Installing plugin version ${capacitorMajorVersion} to match Capacitor ${capacitorMajorVersion}`);
+                    }
+                }
+                // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
+                const packageManager = await prompt('Select your package manager:', {
+                    type: 'select',
+                    options: [
+                        { label: 'npm', value: 'npm' },
+                        { label: 'yarn', value: 'yarn' },
+                        { label: 'pnpm', value: 'pnpm' },
+                    ],
+                });
+                await installPackage(packageName, packageManager);
+                consola.success('Live Update SDK installed successfully.');
+            }
         }
         // Step 5: Set Up Code Signing (Optional)
         // Reload config to get latest updates

package/dist/utils/package-json.js

@@ -56,3 +56,40 @@ export const getBuildScript = async (packageJsonPath) => {
     }
     return undefined;
 };
+/**
+ * Check if a package is installed.
+ * Checks both dependencies and devDependencies.
+ *
+ * @param packageJsonPath The path to the package.json file.
+ * @param packageName The name of the package to check.
+ * @returns True if the package is installed, false otherwise.
+ */
+export const isPackageInstalled = async (packageJsonPath, packageName) => {
+    const packageJson = await readPackageJson(packageJsonPath);
+    if (!packageJson) {
+        return false;
+    }
+    return !!(packageJson.dependencies?.[packageName] || packageJson.devDependencies?.[packageName]);
+};
+/**
+ * Get the Capacitor CLI version from package.json.
+ *
+ * @param packageJsonPath The path to the package.json file.
+ * @returns The Capacitor major version number, or undefined if not found.
+ */
+export const getCapacitorMajorVersion = async (packageJsonPath) => {
+    const packageJson = await readPackageJson(packageJsonPath);
+    if (!packageJson) {
+        return undefined;
+    }
+    const capacitorVersion = packageJson.dependencies?.['@capacitor/core'] || packageJson.devDependencies?.['@capacitor/core'];
+    if (!capacitorVersion) {
+        return undefined;
+    }
+    // Extract major version from version string (e.g., "^5.0.0" -> 5, "~6.1.0" -> 6)
+    const match = capacitorVersion.match(/(\d+)/);
+    if (match && match[1]) {
+        return parseInt(match[1], 10);
+    }
+    return undefined;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/cli",
-  "version": "3.7.0-dev.24727dc.1764842591",
+  "version": "3.7.0-dev.445ea3a.1764843317",
   "description": "The Capawesome Cloud Command Line Interface (CLI) to manage Live Updates and more.",
   "type": "module",
   "scripts": {