@superblocksteam/cli 1.0.2 → 1.1.1

package/dist/commands/push.js

@@ -0,0 +1,240 @@
+"use strict";
+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 util_1 = require("@superblocksteam/util");
+const listr2_1 = require("listr2");
+const lodash_1 = require("lodash");
+const authenticated_command_1 = require("../common/authenticated-command");
+const version_control_1 = require("../common/version-control");
+class Push extends authenticated_command_1.AuthenticatedCommand {
+    async run() {
+        const { flags, args } = await this.parse(Push);
+        const tasks = this.createTasks(args.resource_path, flags.branch);
+        await tasks.run();
+    }
+    createTasks(resourceName, branch) {
+        const tasks = new listr2_1.Listr([
+            {
+                title: "Checking for existing Superblocks project...",
+                task: async (ctx) => {
+                    ctx.pushedResources = {};
+                    ctx.removedResourceIds = [];
+                    try {
+                        [
+                            ctx.existingSuperblocksRootConfig,
+                            ctx.superblocksRootConfigPath,
+                        ] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
+                        ctx.existingSuperblocksResourceConfig =
+                            await (0, util_1.getSuperblocksResourceConfigIfExists)();
+                    }
+                    catch {
+                        // no existing superblocks config
+                        this.error("No Superblocks project found in the current folder hierarchy. Run 'superblocks init' to initialize a new project.");
+                    }
+                },
+            },
+            {
+                title: "Checking for existing git repository...",
+                task: async (ctx) => {
+                    try {
+                        ctx.pushToBranchName =
+                            branch || (await (0, version_control_1.getCurrentGitBranchIfGit)()) || version_control_1.DEFAULT_BRANCH;
+                        [ctx.headCommitId, ctx.headCommitMessage] = await (0, version_control_1.getHeadCommit)(ctx.pushToBranchName);
+                    }
+                    catch (e) {
+                        this.error(`Failed to check for existing git repository: ${e.message}. Please make sure to clone or initialize a git repository.`);
+                    }
+                    const isDirtyRepo = await (0, version_control_1.isGitRepoDirty)();
+                    if (isDirtyRepo) {
+                        this.error(`Your git repository is dirty. Please commit or stash your changes before pushing to Superblocks.`);
+                    }
+                },
+            },
+            {
+                title: "Checking for deleted Superblocks resources...",
+                task: async (ctx, task) => {
+                    var _a, _b, _c;
+                    try {
+                        for (const [resourceId, resource] of Object.entries((_b = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {})) {
+                            switch (resource === null || resource === void 0 ? void 0 : resource.resourceType) {
+                                case "APPLICATION": {
+                                    try {
+                                        await this.getSdk().fetchApplication({
+                                            applicationId: resourceId,
+                                            //NOTE(alex): using default branch since we assume that the resource is deleted if it's deleted from the default branch
+                                            branch: version_control_1.DEFAULT_BRANCH,
+                                        });
+                                    }
+                                    catch (error) {
+                                        if (error instanceof util_1.NotFoundError) {
+                                            ctx.removedResourceIds.push(resourceId);
+                                        }
+                                        else {
+                                            throw error;
+                                        }
+                                    }
+                                    break;
+                                }
+                                case "BACKEND": {
+                                    try {
+                                        await this.getSdk().fetchApi(resourceId);
+                                    }
+                                    catch (error) {
+                                        if (error instanceof util_1.NotFoundError) {
+                                            ctx.removedResourceIds.push(resourceId);
+                                        }
+                                        else {
+                                            throw error;
+                                        }
+                                    }
+                                    break;
+                                }
+                                default: {
+                                    this.warn(`Unsupported resource type, resource: ${JSON.stringify(resource)}`);
+                                }
+                            }
+                        }
+                        if (ctx.removedResourceIds.length === 0) {
+                            return;
+                        }
+                        const listOfDeletedResources = ctx.removedResourceIds
+                            .map((id) => `- ${ctx.existingSuperblocksRootConfig.resources[id].location}`)
+                            .join("\n");
+                        const removeResourcesFromDisk = await task.prompt([
+                            {
+                                name: "removeResourcesFromDisk",
+                                type: "confirm",
+                                message: `Warning: The following resources could not be found in Superblocks.
+${listOfDeletedResources}
+
+Automatically removing resources from your local Superblocks project.
+
+Would you like to also delete these resources from your filesystem?`,
+                            },
+                        ]);
+                        if (removeResourcesFromDisk) {
+                            for (const resourceId of ctx.removedResourceIds) {
+                                const resource = (_c = ctx.existingSuperblocksRootConfig) === null || _c === void 0 ? void 0 : _c.resources[resourceId];
+                                await (0, version_control_1.removeResourceFromDisk)(resource.location);
+                            }
+                        }
+                    }
+                    catch (e) {
+                        this.warn(`Could not check for deleted Superblocks resources. Continuing...: ${e.message}`);
+                    }
+                },
+            },
+            {
+                task: async (ctx, task) => {
+                    var _a;
+                    task.title = `Pushing resources to branch ${ctx.pushToBranchName}...`;
+                    const resourceIdsToPush = await this.getResourceIdsToPush(ctx, task, resourceName);
+                    const subtasks = [];
+                    const superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
+                    for (const resourceId of resourceIdsToPush) {
+                        const resource = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId];
+                        switch (resource === null || resource === void 0 ? void 0 : resource.resourceType) {
+                            case "APPLICATION": {
+                                subtasks.push({
+                                    title: `Pushing application ${resource.location}...`,
+                                    task: async (_ctx, task) => {
+                                        const applicationConfig = {
+                                            ...(await (0, version_control_1.readApplicationFromDisk)(superblocksRootPath, resource.location)),
+                                            commitId: ctx.headCommitId,
+                                            commitMessage: ctx.headCommitMessage,
+                                        };
+                                        task.title += `: read from disk`;
+                                        await this.getSdk().pushApplication({
+                                            applicationId: resourceId,
+                                            applicationConfig,
+                                            branch: ctx.pushToBranchName,
+                                        });
+                                        task.title += `: pushed to Superblocks`;
+                                        ctx.pushedResources[resourceId] = resource;
+                                    },
+                                });
+                                break;
+                            }
+                            default: {
+                                this.error(`Unsupported resource type, resource: ${JSON.stringify(resource)}
+                      `);
+                            }
+                        }
+                    }
+                    return task.newListr(subtasks, {
+                        concurrent: true,
+                    });
+                },
+            },
+        ], {
+            concurrent: false,
+        });
+        return tasks;
+    }
+    async getResourceIdsToPush(ctx, task, resourcePath, supportedResourceTypes = ["APPLICATION"]) {
+        var _a, _b, _c;
+        const resources = Object.entries((_b = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {}).filter(([, resource]) => {
+            return supportedResourceTypes.includes(resource.resourceType);
+        });
+        // If there are no resources, or if the user has specified a resource name
+        // that doesn't exist, we should throw an error.
+        if ((0, lodash_1.isEmpty)(resources)) {
+            throw new Error("No resources found in the current project");
+        }
+        else if (!(0, lodash_1.isEmpty)(resourcePath)) {
+            const resource = resources.find(([, resource]) => resource.location === resourcePath);
+            if (resource) {
+                return [resource[0]];
+            }
+            throw new Error(`No resource found with the given location: ${resourcePath}`);
+        }
+        const choices = [];
+        const initialSelections = [];
+        let counter = 0;
+        for (const [resourceId, resource] of resources) {
+            choices.push({
+                name: resourceId,
+                message: resource.location,
+            });
+            if (((_c = ctx.existingSuperblocksResourceConfig) === null || _c === void 0 ? void 0 : _c.id) === resourceId) {
+                initialSelections.push(counter);
+            }
+            counter++;
+        }
+        const resourceIdsToPush = choices.length === 1
+            ? [choices[0].name]
+            : await task.prompt([
+                {
+                    type: "MultiSelect",
+                    name: "resourceIdsToPush",
+                    message: `Select resources to push (${version_control_1.MULTI_SELECT_PROMPT_HELP})`,
+                    choices: choices,
+                    initial: initialSelections,
+                    validate: version_control_1.atLeastOneSelection,
+                    prefix: "▸",
+                    indicator: "◉",
+                },
+            ]);
+        return resourceIdsToPush;
+    }
+}
+Push.description = "Import objects from local filesystem to Superblocks";
+Push.examples = [
+    "<%= config.bin %> <%= command.id %>",
+    "<%= config.bin %> <%= command.id %>  apps/my-app",
+    "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch",
+];
+Push.flags = {
+    branch: core_1.Flags.string({
+        char: "b",
+        description: "Superblocks branch to push to, the current git branch will be used by default",
+    }),
+};
+Push.args = {
+    resource_path: core_1.Args.string({
+        description: "Superblocks resource location to push (e.g. apps/my-app)",
+    }),
+};
+exports.default = Push;

package/dist/commands/rm.d.ts

@@ -3,7 +3,7 @@ export default class Remove extends AuthenticatedCommand {
     static description: string;
     static examples: string[];
     static args: {
-        resourceLocation: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
+        resource_path: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
     };
     run(): Promise<void>;
     private createTasks;

package/dist/commands/rm.js

@@ -40,7 +40,7 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
                 task: (ctx, task) => task.newListr([
                     {
                         title: "Fetching applications...",
-                        enabled: () => !args.resourceLocation,
+                        enabled: () => !args.resource_path,
                         task: async (ctx, task) => {
                             // applications choices
                             const applications = await this.getSdk().fetchApplications();
@@ -104,8 +104,8 @@ class Remove extends authenticated_command_1.AuthenticatedCommand {
     }
     async getResourcesToRemove(ctx, task, args) {
         var _a;
-        if (args.resourceLocation) {
-            const [resourceId] = getResourceIdFromLocation(ctx, args.resourceLocation);
+        if (args.resource_path) {
+            const [resourceId] = getResourceIdFromLocation(ctx, args.resource_path);
             return [resourceId];
         }
         else {
@@ -169,7 +169,7 @@ Remove.examples = [
     "<%= config.bin %> <%= command.id %> apps/my-spectacular-app",
 ];
 Remove.args = {
-    resourceLocation: core_1.Args.string({
+    resource_path: core_1.Args.string({
         description: "Superblocks resource location (i.e. apps/my-spectacular-app)",
     }),
 };

package/dist/common/authenticated-command.js

@@ -126,8 +126,10 @@ class AuthenticatedApplicationCommand extends AuthenticatedCommand {
         }
         core_1.ux.action.start("Checking application...");
         try {
+            const branch = (await (0, version_control_1.getCurrentGitBranchIfGit)()) || version_control_1.DEFAULT_BRANCH;
             const application = await this.getSdk().fetchApplication({
                 applicationId: this.applicationConfig.id,
+                branch: branch,
             });
             core_1.ux.action.stop();
             if ((_b = (_a = application === null || application === void 0 ? void 0 : application.application) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.cliVersion) {
@@ -191,7 +193,8 @@ ${(0, colorette_1.cyan)("superblocks migrate")}`);
         core_1.ux.action.stop();
         try {
             core_1.ux.action.start("Registering components...");
-            await this.getSdk().registerComponents(this.applicationConfig.id, configs, injectedHeaders);
+            const branch = await (0, version_control_1.getCurrentGitBranchIfGit)();
+            await this.getSdk().registerComponents(this.applicationConfig.id, configs, branch, injectedHeaders);
             core_1.ux.action.stop();
         }
         catch (e) {

package/dist/common/version-control.d.ts

@@ -1,15 +1,27 @@
-import { ViewMode } from "@superblocksteam/sdk";
+import { ApplicationWrapper, ViewMode } from "@superblocksteam/sdk";
 import { VersionedResourceConfig } from "@superblocksteam/util";
 export declare const LATEST_EDITS_MODE = "latest-edits";
 export declare const MOST_RECENT_COMMIT_MODE = "most-recent-commit";
 export declare const DEPLOYED_MODE = "deployed";
+export declare const DEFAULT_BRANCH = "main";
 export declare const modeFlagValuesMap: Record<string, string>;
 export declare function modeFlagToViewMode(modeFlag: ModeFlag): ViewMode;
 export type ModeFlag = (keyof typeof modeFlagValuesMap)[number];
 export declare const SELECT_PROMPT_HELP = "Use \u2191/\u2193 arrow keys, Enter to confirm";
 export declare const MULTI_SELECT_PROMPT_HELP = "Type to filter, Use \u2191/\u2193 arrow keys, Space to select, Enter to confirm";
 export declare const atLeastOneSelection: (value: string[]) => string | true;
+export declare function readApplicationFromDisk(rootPath: string, existingRelativeLocation: string): Promise<ApplicationWrapper>;
 export declare function writeResourceToDisk(resourceType: string, resourceId: string, resource: any, rootPath: string, existingRelativeLocation?: string): Promise<VersionedResourceConfig>;
 export declare function removeResourceFromDisk(resourceLocation: string): Promise<void>;
 export declare function getMode(task: any, mode: ModeFlag): Promise<ViewMode>;
 export declare function sortByKey(obj: unknown): unknown;
+/**
+ * Returns the current git branch, or undefined if not in a git repo
+ */
+export declare function getCurrentGitBranchIfGit(): Promise<string | null>;
+/**
+ * Returns the current git branch, or throws if not in a git repo
+ */
+export declare function getCurrentGitBranch(): Promise<string>;
+export declare function getHeadCommit(branch: string): Promise<[string, string]>;
+export declare function isGitRepoDirty(): Promise<boolean>;

package/dist/common/version-control.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByKey = exports.getMode = exports.removeResourceFromDisk = exports.writeResourceToDisk = exports.atLeastOneSelection = exports.MULTI_SELECT_PROMPT_HELP = exports.SELECT_PROMPT_HELP = exports.modeFlagToViewMode = exports.modeFlagValuesMap = exports.DEPLOYED_MODE = exports.MOST_RECENT_COMMIT_MODE = exports.LATEST_EDITS_MODE = void 0;
+exports.isGitRepoDirty = exports.getHeadCommit = exports.getCurrentGitBranch = exports.getCurrentGitBranchIfGit = exports.sortByKey = exports.getMode = exports.removeResourceFromDisk = exports.writeResourceToDisk = exports.readApplicationFromDisk = exports.atLeastOneSelection = exports.MULTI_SELECT_PROMPT_HELP = exports.SELECT_PROMPT_HELP = exports.modeFlagToViewMode = exports.modeFlagValuesMap = exports.DEFAULT_BRANCH = exports.DEPLOYED_MODE = exports.MOST_RECENT_COMMIT_MODE = exports.LATEST_EDITS_MODE = void 0;
 const tslib_1 = require("tslib");
 const https = tslib_1.__importStar(require("https"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
@@ -10,11 +10,13 @@ const colorette_1 = require("colorette");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const lodash_1 = require("lodash");
 const lodash_2 = tslib_1.__importDefault(require("lodash"));
+const simple_git_1 = require("simple-git");
 const slugify_1 = tslib_1.__importDefault(require("slugify"));
 const yaml_1 = require("yaml");
 exports.LATEST_EDITS_MODE = "latest-edits";
 exports.MOST_RECENT_COMMIT_MODE = "most-recent-commit";
 exports.DEPLOYED_MODE = "deployed";
+exports.DEFAULT_BRANCH = "main";
 exports.modeFlagValuesMap = {
     [exports.LATEST_EDITS_MODE]: "Latest edits",
     [exports.MOST_RECENT_COMMIT_MODE]: "Most recent commit",
@@ -87,8 +89,38 @@ async function downloadFile(rootDirectory, filepath, url) {
     }
     return Promise.resolve("");
 }
+async function readYamlFile(path) {
+    return (0, yaml_1.parse)(await fs.readFile(path, "utf8"));
+}
+// NOTE: If a change is made to how applications are read from disk, please update
+// logic to write applications to disk in the "writeResourceToDisk" function accordingly.
+async function readApplicationFromDisk(rootPath, existingRelativeLocation) {
+    const application = await readYamlFile(`${rootPath}/${existingRelativeLocation}/application.yaml`);
+    const page = await readYamlFile(`${rootPath}/${existingRelativeLocation}/page.yaml`);
+    const apisDirName = `${rootPath}/${existingRelativeLocation}/apis`;
+    const apis = [];
+    if (await fs.pathExists(apisDirName)) {
+        const apiFiles = await fs.readdir(apisDirName);
+        for (const apiFile of apiFiles) {
+            const apiContent = await readYamlFile(`${apisDirName}/${apiFile}`);
+            // This mimics the shape of the ApiV3Dto object
+            apis.push({
+                id: apiContent.metadata.id,
+                apiPb: apiContent,
+            });
+        }
+    }
+    return {
+        application,
+        apis,
+        page,
+    };
+}
+exports.readApplicationFromDisk = readApplicationFromDisk;
+// NOTE: If a change is made to how applications are written to disk, please update
+// logic to read applications from disk in the "readApplicationFromDisk" function accordingly.
 async function writeResourceToDisk(resourceType, resourceId, resource, rootPath, existingRelativeLocation) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f;
     switch (resourceType) {
         case "APPLICATION": {
             const parentDirName = "apps";
@@ -105,6 +137,7 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
             if (resource.page) {
                 const pageContent = (0, yaml_1.stringify)(resource.page, {
                     sortMapEntries: true,
+                    blockQuote: "literal",
                 });
                 await fs.outputFile(`${appDirName}/page.yaml`, pageContent);
             }
@@ -119,10 +152,11 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
             };
             if (resource.apis) {
                 for (const api of resource.apis) {
-                    const originalApiName = (_d = (_c = (_b = api.apiPb) === null || _b === void 0 ? void 0 : _b.metadata) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : api.actions.name;
+                    const originalApiName = api.apiPb.metadata.name;
                     const apiName = slugifyName(originalApiName);
                     const apiContent = (0, yaml_1.stringify)(api.apiPb, {
                         sortMapEntries: true,
+                        blockQuote: "literal",
                     });
                     const handleApi = async () => {
                         await fs.outputFile(`${apisDirName}/${apiName}.yaml`, apiContent);
@@ -136,7 +170,7 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
             await fs.writeFile(`${appDirName}/${util_1.RESOURCE_CONFIG_PATH}`, JSON.stringify(sortByKey(applicationConfig), null, 2));
             const createdFiles = await Promise.resolve(
             // Defensive check for when application settings are missing componentFiles
-            (_f = (_e = resource.componentFiles) === null || _e === void 0 ? void 0 : _e.map((file) => downloadFile(appDirName, file.filename, file.url))) !== null && _f !== void 0 ? _f : []);
+            (_c = (_b = resource.componentFiles) === null || _b === void 0 ? void 0 : _b.map((file) => downloadFile(appDirName, file.filename, file.url))) !== null && _c !== void 0 ? _c : []);
             // print out failed downloads synchronously here
             createdFiles
                 .filter((createdFiles) => createdFiles.length)
@@ -150,7 +184,7 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
         }
         case "BACKEND": {
             const parentDirName = "backends";
-            const apiName = slugifyName((_j = (_h = (_g = resource.apiPb) === null || _g === void 0 ? void 0 : _g.metadata) === null || _h === void 0 ? void 0 : _h.name) !== null && _j !== void 0 ? _j : resource.actions.name);
+            const apiName = slugifyName((_f = (_e = (_d = resource.apiPb) === null || _d === void 0 ? void 0 : _d.metadata) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : resource.actions.name);
             const newRelativeLocation = `${parentDirName}/${apiName}`;
             const relativeLocation = existingRelativeLocation !== null && existingRelativeLocation !== void 0 ? existingRelativeLocation : newRelativeLocation;
             const backendDirName = node_path_1.default.resolve(rootPath, relativeLocation);
@@ -159,6 +193,7 @@ async function writeResourceToDisk(resourceType, resourceId, resource, rootPath,
             }
             const backendContent = (0, yaml_1.stringify)(resource.apiPb, {
                 sortMapEntries: true,
+                blockQuote: "literal",
             });
             await fs.outputFile(`${backendDirName}/api.yaml`, backendContent);
             const backendConfig = {
@@ -217,3 +252,52 @@ function sortByKey(obj) {
     return obj;
 }
 exports.sortByKey = sortByKey;
+/**
+ * Returns the current git branch, or undefined if not in a git repo
+ */
+async function getCurrentGitBranchIfGit() {
+    const git = (0, simple_git_1.simpleGit)();
+    try {
+        const status = await git.status();
+        const currentBranch = status.current;
+        return currentBranch;
+    }
+    catch {
+        // ignore
+    }
+    return null;
+}
+exports.getCurrentGitBranchIfGit = getCurrentGitBranchIfGit;
+/**
+ * Returns the current git branch, or throws if not in a git repo
+ */
+async function getCurrentGitBranch() {
+    const currentBranch = await getCurrentGitBranchIfGit();
+    if (!currentBranch) {
+        throw new Error("No git repository found");
+    }
+    return currentBranch;
+}
+exports.getCurrentGitBranch = getCurrentGitBranch;
+async function getHeadCommit(branch) {
+    const git = (0, simple_git_1.simpleGit)();
+    let headCommitId;
+    let headCommitMessage;
+    const logResponse = await git.show(["--no-patch", "--format=%H%n%s", branch]);
+    const logLines = logResponse.split("\n");
+    if (logLines.length > 1) {
+        headCommitId = logLines[0];
+        headCommitMessage = logLines[1];
+    }
+    if (!headCommitId || !headCommitMessage) {
+        throw new Error(`Failed to get head commit for branch '${branch}'`);
+    }
+    return [headCommitId, headCommitMessage];
+}
+exports.getHeadCommit = getHeadCommit;
+async function isGitRepoDirty() {
+    const git = (0, simple_git_1.simpleGit)();
+    const status = await git.status();
+    return !status.isClean();
+}
+exports.isGitRepoDirty = isGitRepoDirty;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.2",
+  "version": "1.1.1",
   "commands": {
     "init": {
       "id": "init",
@@ -28,8 +28,8 @@
         }
       },
       "args": {
-        "resourceUrl": {
-          "name": "resourceUrl",
+        "resource_url": {
+          "name": "resource_url",
           "description": "Superblocks resource URL (i.e. https://app.superblocks.com/applications/<application_id>/pages/<page_id>)",
           "required": false
         }
@@ -79,8 +79,7 @@
       "examples": [
         "<%= config.bin %> <%= command.id %>",
         "<%= config.bin %> <%= command.id %>  apps/my-app",
-        "<%= config.bin %> <%= command.id %>  backends/my-workflow",
-        "<%= config.bin %> <%= command.id %>  backends/my-scheduled-job"
+        "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch"
       ],
       "flags": {
         "mode": {
@@ -95,16 +94,52 @@
             "deployed"
           ],
           "default": "latest-edits"
+        },
+        "branch": {
+          "name": "branch",
+          "type": "option",
+          "char": "b",
+          "description": "Superblocks branch to pull from, the current git branch will be used by default",
+          "multiple": false
         }
       },
       "args": {
-        "only": {
-          "name": "only",
-          "description": "Superblocks resource location to pull (i.e. apps/my-app or backends/my-workflow)",
+        "resource_path": {
+          "name": "resource_path",
+          "description": "Superblocks resource location to pull (i.e. apps/my-app)",
           "required": false
         }
       }
     },
+    "push": {
+      "id": "push",
+      "description": "Import objects from local filesystem to Superblocks",
+      "strict": true,
+      "pluginName": "@superblocksteam/cli",
+      "pluginAlias": "@superblocksteam/cli",
+      "pluginType": "core",
+      "aliases": [],
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %>  apps/my-app",
+        "<%= config.bin %> <%= command.id %>  apps/my-app -b feature-branch"
+      ],
+      "flags": {
+        "branch": {
+          "name": "branch",
+          "type": "option",
+          "char": "b",
+          "description": "Superblocks branch to push to, the current git branch will be used by default",
+          "multiple": false
+        }
+      },
+      "args": {
+        "resource_path": {
+          "name": "resource_path",
+          "description": "Superblocks resource location to push (e.g. apps/my-app)"
+        }
+      }
+    },
     "rm": {
       "id": "rm",
       "description": "Remove a Superblocks resource from the local Superblocks project and delete the resource folder directory locally (if it exists)",
@@ -119,8 +154,8 @@
       ],
       "flags": {},
       "args": {
-        "resourceLocation": {
-          "name": "resourceLocation",
+        "resource_path": {
+          "name": "resource_path",
           "description": "Superblocks resource location (i.e. apps/my-spectacular-app)"
         }
       }
@@ -166,9 +201,18 @@
       "pluginType": "core",
       "aliases": [],
       "examples": [
-        "<%= config.bin %> components upload"
+        "<%= config.bin %> components upload",
+        "<%= config.bin %> components upload -b feature-branch"
       ],
-      "flags": {},
+      "flags": {
+        "branch": {
+          "name": "branch",
+          "type": "option",
+          "char": "b",
+          "description": "Superblocks branch to push to, the current (local) git branch will be used by default",
+          "multiple": false
+        }
+      },
       "args": {}
     },
     "components:watch": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "Official Superblocks CLI",
   "bin": {
     "superblocks": "bin/run"
@@ -18,11 +18,11 @@
     "@oclif/core": "^2.11.7",
     "@oclif/plugin-help": "^5.2.16",
     "@oclif/plugin-plugins": "^3.1.10",
-    "@superblocksteam/css-plugin": "1.0.2",
-    "@superblocksteam/react-shim": "1.0.2",
-    "@superblocksteam/sdk": "1.0.2",
-    "@superblocksteam/util": "1.0.2",
-    "@superblocksteam/vite-custom-component-reload-plugin": "1.0.2",
+    "@superblocksteam/css-plugin": "1.1.1",
+    "@superblocksteam/react-shim": "1.1.1",
+    "@superblocksteam/sdk": "1.1.1",
+    "@superblocksteam/util": "1.1.1",
+    "@superblocksteam/vite-custom-component-reload-plugin": "1.1.1",
     "@vitejs/plugin-react": "^4.0.4",
     "colorette": "^2.0.19",
     "enquirer": "^2.3.6",
@@ -30,6 +30,7 @@
     "listr2": "6.6.0",
     "lodash": "^4.17.21",
     "semver": "^7.5.4",
+    "simple-git": "^3.20.0",
     "slugify": "^1.6.6",
     "vite": "^4.4.8",
     "vite-plugin-inspect": "^0.7.28",
@@ -41,7 +42,7 @@
     "@types/chai": "^4",
     "@types/fs-extra": "^11.0.1",
     "@types/mocha": "^9.0.0",
-    "@types/node": "^16.18.38",
+    "@types/node": "^16.18.39",
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.1",
     "chai": "^4",
@@ -59,7 +60,7 @@
     "typescript": "^5.1.6"
   },
   "scripts": {
-    "preinstall": "node -e 'if (process.versions.node.split(`.`)[0] < 16) { console.error(`Incompatible Node version: Please use Node.js v16 or higher`); process.exit(1);}'",
+    "preinstall": "node -e \"if (process.versions.node.split('.')[0] < 16) { console.error('Incompatible Node version: Please use Node.js v16 or higher'); process.exit(1);}\"",
     "build": "tsc --build",
     "clean": "npm run clean:build && rm -rf node_modules",
     "clean:build": "tsc --build --clean && rm -rf dist tsconfig.tsbuildinfo",