@superblocksteam/cli 1.1.2 → 1.2.1

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/1.1.2 linux-x64 node-v18.18.2
+@superblocksteam/cli/1.2.1 linux-x64 node-v18.18.2
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND

package/assets/custom-components/setup/package.json

@@ -7,7 +7,7 @@
     "lint:fix": "npx eslint . --fix"
   },
   "dependencies": {
-    "@superblocksteam/custom-components": "1.1.2",
+    "@superblocksteam/custom-components": "1.2.1",
     "react": "^18",
     "react-dom": "^18"
   },

package/dist/commands/push.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const core_1 = require("@oclif/core");
+const sdk_1 = require("@superblocksteam/sdk");
 const util_1 = require("@superblocksteam/util");
 const listr2_1 = require("listr2");
 const lodash_1 = require("lodash");
@@ -146,11 +147,24 @@ Would you like to also delete these resources from your filesystem?`,
                                             commitMessage: ctx.headCommitMessage,
                                         };
                                         task.title += `: read from disk`;
-                                        await this.getSdk().pushApplication({
-                                            applicationId: resourceId,
-                                            applicationConfig,
-                                            branch: ctx.pushToBranchName,
-                                        });
+                                        try {
+                                            await this.getSdk().pushApplication({
+                                                applicationId: resourceId,
+                                                applicationConfig,
+                                                branch: ctx.pushToBranchName,
+                                            });
+                                        }
+                                        catch (error) {
+                                            if (error instanceof sdk_1.BranchNotCheckedOutError) {
+                                                this.log(`WARN: Application ${applicationConfig.application.name} failed to push, please check branch out in the Superblocks UI first in order to check this branch out for this resource.`);
+                                            }
+                                            else if (error instanceof sdk_1.CommitAlreadyExistsError) {
+                                                this.log(`WARN: Application ${applicationConfig.application.name} failed to push as the commit already exists in Superblocks.`);
+                                            }
+                                            else {
+                                                throw error;
+                                            }
+                                        }
                                         task.title += `: pushed to Superblocks`;
                                         ctx.pushedResources[resourceId] = resource;
                                     },

package/dist/common/version-control.js

@@ -6,6 +6,7 @@ const https = tslib_1.__importStar(require("https"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const path_1 = require("path");
 const util_1 = require("@superblocksteam/util");
+const util_2 = require("@superblocksteam/util");
 const colorette_1 = require("colorette");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const lodash_1 = require("lodash");
@@ -144,7 +145,7 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
             const apiPromises = [];
             const apisDirName = `${appDirName}/apis`;
             await fs.ensureDir(apisDirName);
-            const applicationConfig = {
+            const newApplicationConfig = {
                 configType: "APPLICATION",
                 apis: {},
                 defaultPageId: (_a = resource.page) === null || _a === void 0 ? void 0 : _a.id,
@@ -162,12 +163,23 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
                         await fs.outputFile(`${apisDirName}/${apiName}.yaml`, apiContent);
                     };
                     apiPromises.push(handleApi());
-                    applicationConfig.apis[api.id] = originalApiName;
+                    newApplicationConfig.apis[api.id] = originalApiName;
                 }
                 await Promise.all(apiPromises);
             }
-            await fs.ensureDir(`${appDirName}/${util_1.SUPERBLOCKS_HOME_FOLDER_NAME}`);
-            await fs.writeFile(`${appDirName}/${util_1.RESOURCE_CONFIG_PATH}`, JSON.stringify(sortByKey(applicationConfig), null, 2));
+            const existingApplicationConfig = await (0, util_1.getSuperblocksApplicationConfigIfExists)(appDirName);
+            // iterate through existing apis and remove from disk any that are no longer present
+            if (existingApplicationConfig === null || existingApplicationConfig === void 0 ? void 0 : existingApplicationConfig.apis) {
+                for (const existingApiId of Object.keys(existingApplicationConfig.apis)) {
+                    const existingApiName = existingApplicationConfig.apis[existingApiId];
+                    const existingApiPath = `${apisDirName}/${slugifyName(existingApiName)}.yaml`;
+                    if (!(existingApiId in newApplicationConfig.apis)) {
+                        await fs.remove(existingApiPath);
+                    }
+                }
+            }
+            await fs.ensureDir(`${appDirName}/${util_2.SUPERBLOCKS_HOME_FOLDER_NAME}`);
+            await fs.writeFile(`${appDirName}/${util_2.RESOURCE_CONFIG_PATH}`, JSON.stringify(sortByKey(newApplicationConfig), null, 2));
             const createdFiles = await Promise.resolve(
             // Defensive check for when application settings are missing componentFiles
             (_c = (_b = resource.componentFiles) === null || _b === void 0 ? void 0 : _b.map((file) => downloadFile(appDirName, file.filename, file.url))) !== null && _c !== void 0 ? _c : []);
@@ -200,8 +212,8 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
                 id: resourceId,
                 configType: "BACKEND",
             };
-            await fs.ensureDir(`${backendDirName}/${util_1.SUPERBLOCKS_HOME_FOLDER_NAME}`);
-            await fs.writeFile(`${backendDirName}/${util_1.RESOURCE_CONFIG_PATH}`, JSON.stringify(sortByKey(backendConfig), null, 2));
+            await fs.ensureDir(`${backendDirName}/${util_2.SUPERBLOCKS_HOME_FOLDER_NAME}`);
+            await fs.writeFile(`${backendDirName}/${util_2.RESOURCE_CONFIG_PATH}`, JSON.stringify(sortByKey(backendConfig), null, 2));
             return {
                 location: relativeLocation,
                 resourceType: "BACKEND",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.2",
+  "version": "1.2.1",
   "commands": {
     "init": {
       "id": "init",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "1.1.2",
+  "version": "1.2.1",
   "description": "Official Superblocks CLI",
   "bin": {
     "superblocks": "bin/run"
@@ -18,12 +18,12 @@
     "@oclif/core": "^2.11.7",
     "@oclif/plugin-help": "^5.2.16",
     "@oclif/plugin-plugins": "^3.1.10",
-    "@superblocksteam/css-plugin": "1.1.2",
-    "@superblocksteam/react-shim": "1.1.2",
-    "@superblocksteam/sdk": "1.1.2",
-    "@superblocksteam/util": "1.1.2",
-    "@superblocksteam/vite-custom-component-reload-plugin": "1.1.2",
-    "@vitejs/plugin-react": "^4.0.4",
+    "@superblocksteam/css-plugin": "1.2.1",
+    "@superblocksteam/react-shim": "1.2.1",
+    "@superblocksteam/sdk": "1.2.1",
+    "@superblocksteam/util": "1.2.1",
+    "@superblocksteam/vite-custom-component-reload-plugin": "1.2.1",
+    "@vitejs/plugin-react": "^4.1.0",
     "colorette": "^2.0.19",
     "enquirer": "^2.3.6",
     "fs-extra": "^11.1.1",