@swell/cli 2.0.19 → 2.0.20

package/dist/commands/app/install.js

@@ -3,6 +3,7 @@ import { Flags } from '@oclif/core';
 import ora from 'ora';
 import * as semver from 'semver';
 import config from '../../lib/config.js';
+import { readRcFile } from '../../lib/app-config.js';
 import { selectEnvironmentId, selectLoggedInStoreId, } from '../../lib/stores.js';
 import style from '../../lib/style.js';
 import { RemoteAppCommand } from '../../remote-app-command.js';
@@ -123,10 +124,20 @@ Without a store specified, install the app in the Live environment of the curren
         }
     }
     async confirmRemoveDevelopmentApp(storeToInstall) {
-        const existingSourcedApps = await this.api.get({ adminPath: `/client/apps` }, {
-            query: { source_id: this.app.id },
-        });
-        if (existingSourcedApps.results[0]?.id) {
+        let sourceAppId;
+        try {
+            const sourceApp = await readRcFile(this.swellRcPath());
+            sourceAppId = sourceApp?.id;
+        }
+        catch (error) {
+            // noop
+        }
+        const existingSourcedApps = sourceAppId
+            ? await this.api.get({ adminPath: `/client/apps` }, {
+                query: { source_id: sourceAppId },
+            })
+            : null;
+        if (existingSourcedApps?.results[0]?.id) {
             const continueInstall = await confirm({
                 default: false,
                 message: `${style.storeId(storeToInstall)} has a development version of ${style.appConfigValue(this.app.name)}. Do you want to replace it with an installed instance?`,

package/dist/remote-app-command.js

@@ -194,9 +194,29 @@ export class RemoteAppCommand extends AppCommand {
         const appLabel = this.app.type === 'theme' ? 'theme' : 'app';
         let app = updateApp || {};
         if (!app.id) {
+            // May already have a dev instance
+            let existingDevApp;
+            try {
+                existingDevApp = await this.api.get({
+                    adminPath: `/apps/${this.swellConfig.store.id}`,
+                });
+                // Check if existing dev app is owned by the current store
+                const currentStore = localConfig.getDefaultStore();
+                if (existingDevApp?.client_id !== currentStore) {
+                    existingDevApp = null;
+                }
+            }
+            catch {
+                // noop
+            }
             spinner.start(`Creating ${appLabel}...`);
-            app = await this.handleRequestErrors(async () => this.api.post({ adminPath: '/apps' }, { body }), () => spinner.fail('Error creating app.'));
-            this.appCreated = true;
+            if (existingDevApp) {
+                app = await this.handleRequestErrors(async () => this.api.put({ adminPath: `/apps/${existingDevApp.id}` }, { body }), () => spinner.fail('Error updating app.'));
+            }
+            else {
+                app = await this.handleRequestErrors(async () => this.api.post({ adminPath: '/apps' }, { body }), () => spinner.fail('Error creating app.'));
+                this.appCreated = true;
+            }
         }
         else if (app.id) {
             spinner.start(`Updating ${appLabel}...`);
@@ -296,7 +316,7 @@ export class RemoteAppCommand extends AppCommand {
         return this.api.post({ adminPath: `/client/apps` }, {
             body: { app_id: this.app.id, version },
             onAsyncGetPath: (response) => ({
-                adminPath: `/client/app-async-status/${response.id}`,
+                adminPath: `/client/app-async-status/${response.app_id}`,
             }),
             spinner,
         });
@@ -584,7 +604,7 @@ export class RemoteAppCommand extends AppCommand {
         await this.api.put({ adminPath: `/client/apps/${this.app.id}` }, {
             body: { version },
             onAsyncGetPath: (response) => ({
-                adminPath: `/client/app-async-status/${response.id}`,
+                adminPath: `/client/app-async-status/${response.app_id}`,
             }),
             spinner,
         });

package/oclif.manifest.json

@@ -1891,5 +1891,5 @@
       ]
     }
   },
-  "version": "2.0.19"
+  "version": "2.0.20"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.0.19",
+  "version": "2.0.20",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [