@superblocksteam/cli 0.0.12 → 0.0.13

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/0.0.12 linux-x64 node-v18.16.1
+@superblocksteam/cli/0.0.13 linux-x64 node-v18.17.0
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND
@@ -157,7 +157,7 @@ ARGUMENTS
   ONLY  Superblocks resource location to pull (i.e. apps/my-app or backends/my-workflow)
 
 FLAGS
-  -m, --mode=<option>  Pull mode
+  -m, --mode=<option>  [default: latest-edits] Pull mode
                        <options: latest-edits|most-recent-commit|deployed>
 
 DESCRIPTION

package/assets/custom-components/package.json

@@ -6,15 +6,14 @@
     "lint": "npx eslint .",
     "lint:fix": "npx eslint . --fix"
   },
-  "dependencies": {},
-  "peerDependencies": {
-    "react": "^17",
-    "react-dom": "^17"
+  "dependencies": {
+    "react": "^18",
+    "react-dom": "^18"
   },
   "devDependencies": {
-    "@superblocksteam/cli": "0.0.12",
-    "@types/react": "^17",
-    "@types/react-dom": "^17",
+    "@superblocksteam/cli": "0.0.13",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "eslint": "^8.45.0",
     "eslint-config-prettier": "^8.8.0",

package/dist/commands/components/upload.js

@@ -4,12 +4,12 @@ const tslib_1 = require("tslib");
 const node_http_1 = tslib_1.__importDefault(require("node:http"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const core_1 = require("@oclif/core");
+const react_shim_1 = require("@superblocksteam/react-shim");
 const util_1 = require("@superblocksteam/util");
 const plugin_react_1 = tslib_1.__importDefault(require("@vitejs/plugin-react"));
 const fs = tslib_1.__importStar(require("fs-extra"));
 const serve_handler_1 = tslib_1.__importDefault(require("serve-handler"));
 const vite_1 = require("vite");
-const vite_plugin_externals_1 = require("vite-plugin-externals");
 const authenticated_command_1 = require("../../common/authenticated-command");
 class Upload extends authenticated_command_1.AuthenticatedApplicationCommand {
     async run() {
@@ -63,13 +63,7 @@ class Upload extends authenticated_command_1.AuthenticatedApplicationCommand {
                     write: true,
                 },
                 customLogger: viteLogger,
-                plugins: [
-                    (0, plugin_react_1.default)(),
-                    (0, vite_plugin_externals_1.viteExternalsPlugin)({
-                        react: "React",
-                        "react-dom": "ReactDOM",
-                    }),
-                ],
+                plugins: [(0, plugin_react_1.default)(), (0, react_shim_1.injectReactVersionsPlugin)()],
             });
         })();
         core_1.ux.action.stop();

package/dist/commands/components/watch.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.healthEndpointMiddleware = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
+const react_shim_1 = require("@superblocksteam/react-shim");
 const util_1 = require("@superblocksteam/util");
 const vite_custom_component_reload_plugin_1 = require("@superblocksteam/vite-custom-component-reload-plugin");
 const plugin_react_1 = tslib_1.__importDefault(require("@vitejs/plugin-react"));
 const colorette_1 = require("colorette");
 const vite_1 = require("vite");
-const vite_plugin_externals_1 = require("vite-plugin-externals");
 const authenticated_command_1 = require("../../common/authenticated-command");
 function healthEndpointMiddleware() {
     return {
@@ -80,11 +80,8 @@ class Watch extends authenticated_command_1.AuthenticatedApplicationCommand {
                 plugins: [
                     healthEndpointMiddleware(),
                     (0, plugin_react_1.default)(),
-                    (0, vite_plugin_externals_1.viteExternalsPlugin)({
-                        react: "React",
-                        "react-dom": "ReactDOM",
-                    }),
                     (0, vite_custom_component_reload_plugin_1.appendHotReloadEventPlugin)(),
+                    (0, react_shim_1.injectReactVersionsPlugin)(),
                 ],
             });
             await server.listen();

package/dist/commands/init.js

@@ -26,7 +26,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                 task: async (ctx) => {
                     ctx.fetchedResources = {};
                     ctx.writtenResources = {};
-                    ctx.now = Date.now();
+                    ctx.now = new Date().toISOString();
                     try {
                         ctx.existingSuperblocksConfig = (await (0, util_1.getSuperblocksMonorepoConfigJson)())[0];
                     }
@@ -73,7 +73,7 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                 title: "Writing resources to a disk...",
                 task: async (ctx, task) => {
                     const subtasks = [];
-                    const now = Date.now();
+                    const now = new Date().toISOString();
                     for (const resourceId of ctx.resourceIdsToInitialize) {
                         const resource = ctx.fetchedResources[resourceId];
                         switch (resource.resourceType) {
@@ -179,6 +179,9 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
                 }
                 counter++;
             }
+            if ((0, lodash_1.isEmpty)(choices)) {
+                this.error(`No resources found in your account. Please make sure you have access to at least one application, workflow or scheduled job.`);
+            }
             const resourceIdsToInitialize = await task.prompt([
                 {
                     type: "AutoComplete",
@@ -228,7 +231,13 @@ Initialize.examples = [
     "<%= config.bin %> <%= command.id %>",
     "<%= config.bin %> <%= command.id %> https://app.superblocks.com/applications/11111111-1111-1111-1111-111111111111/pages/22222222-2222-2222-2222-222222222222",
 ];
-Initialize.flags = version_control_1.commonFlags;
+Initialize.flags = {
+    mode: core_1.Flags.string({
+        char: "m",
+        description: "Pull mode",
+        options: Object.keys(version_control_1.modeFlagValuesMap),
+    }),
+};
 Initialize.args = {
     resourceUrl: core_1.Args.string({
         description: "Superblocks resource URL (i.e. https://app.superblocks.com/applications/<application_id>/pages/<page_id>)",

package/dist/commands/login.js

@@ -30,7 +30,7 @@ class Login extends core_1.Command {
                 if (superblocksBaseUrl === customChoice) {
                     superblocksBaseUrl = await core_1.ux.prompt("Enter the Superblocks base URL (then press Enter)", { type: "normal" });
                 }
-                const tokenPageUrl = new URL("personal-settings#profile", superblocksBaseUrl).href;
+                const tokenPageUrl = new URL("personal-settings#apiKey", superblocksBaseUrl).href;
                 token = await core_1.ux.prompt(`Enter your Superblocks access token (then press Enter) which can be found at ${tokenPageUrl}`, { type: "mask" });
             }
         }

package/dist/commands/pull.d.ts

@@ -3,7 +3,7 @@ export default class Pull extends AuthenticatedCommand {
     static description: string;
     static examples: string[];
     static flags: {
-        mode: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        mode: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     static args: {
         only: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;

package/dist/commands/pull.js

@@ -20,7 +20,7 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                 title: "Checking for existing Superblocks project...",
                 task: async (ctx) => {
                     ctx.writtenResources = {};
-                    ctx.now = Date.now();
+                    ctx.now = new Date().toISOString();
                     try {
                         [
                             ctx.existingSuperblocksRootConfig,
@@ -42,7 +42,7 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
                     const viewMode = await (0, version_control_1.getMode)(task, mode);
                     const resourceIdsToPull = await this.getResourceIdsToPull(ctx, task, only);
                     const subtasks = [];
-                    const now = Date.now();
+                    const now = new Date().toISOString();
                     const superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
                     for (const resourceId of resourceIdsToPull) {
                         const resource = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId];
@@ -135,18 +135,20 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
             }
             counter++;
         }
-        const resourceIdsToPull = await task.prompt([
-            {
-                type: "MultiSelect",
-                name: "resourceIdsToPull",
-                message: `Select resources to pull (${version_control_1.MULTI_SELECT_PROMPT_HELP})`,
-                choices: choices,
-                initial: initialSelections,
-                validate: version_control_1.atLeastOneSelection,
-                prefix: "▸",
-                indicator: "◉",
-            },
-        ]);
+        const resourceIdsToPull = choices.length === 1
+            ? [choices[0].name]
+            : await task.prompt([
+                {
+                    type: "MultiSelect",
+                    name: "resourceIdsToPull",
+                    message: `Select resources to pull (${version_control_1.MULTI_SELECT_PROMPT_HELP})`,
+                    choices: choices,
+                    initial: initialSelections,
+                    validate: version_control_1.atLeastOneSelection,
+                    prefix: "▸",
+                    indicator: "◉",
+                },
+            ]);
         return resourceIdsToPull;
     }
 }
@@ -157,7 +159,14 @@ Pull.examples = [
     "<%= config.bin %> <%= command.id %>  backends/my-workflow",
     "<%= config.bin %> <%= command.id %>  backends/my-scheduled-job",
 ];
-Pull.flags = version_control_1.commonFlags;
+Pull.flags = {
+    mode: core_1.Flags.string({
+        char: "m",
+        description: "Pull mode",
+        options: Object.keys(version_control_1.modeFlagValuesMap),
+        default: version_control_1.LATEST_EDITS_MODE,
+    }),
+};
 Pull.args = {
     only: core_1.Args.string({
         description: "Superblocks resource location to pull (i.e. apps/my-app or backends/my-workflow)",

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

@@ -12,12 +12,9 @@ export declare const DEPLOYED_MODE = "deployed";
 export declare const modeFlagValuesMap: Record<string, string>;
 export declare function modeFlagToViewMode(modeFlag: ModeFlag): ViewMode;
 export type ModeFlag = (keyof typeof modeFlagValuesMap)[number];
-export declare const commonFlags: {
-    mode: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-};
 export declare const SELECT_PROMPT_HELP = "Use \u2191/\u2193 arrow keys, Enter to confirm";
 export declare const MULTI_SELECT_PROMPT_HELP = "Use \u2191/\u2193 arrow keys, Space to select, Enter to confirm";
 export declare const atLeastOneSelection: (value: string[]) => string | true;
-export declare function writeResourceToDisk(resourceType: string, resourceId: string, resource: any, now: number, rootPath: string, existingRelativeLocation?: string): Promise<VersionedResourceConfig>;
+export declare function writeResourceToDisk(resourceType: string, resourceId: string, resource: any, now: string, rootPath: string, existingRelativeLocation?: string): Promise<VersionedResourceConfig>;
 export declare function getMode(task: any, mode: ModeFlag): Promise<ViewMode>;
 export declare function sortByKey(obj: unknown): unknown;

package/dist/common/version-control.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByKey = exports.getMode = exports.writeResourceToDisk = exports.atLeastOneSelection = exports.MULTI_SELECT_PROMPT_HELP = exports.SELECT_PROMPT_HELP = exports.commonFlags = exports.modeFlagToViewMode = exports.modeFlagValuesMap = exports.DEPLOYED_MODE = exports.MOST_RECENT_COMMIT_MODE = exports.LATEST_EDITS_MODE = void 0;
+exports.sortByKey = exports.getMode = 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;
 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 colorette_1 = require("colorette");
 const fs = tslib_1.__importStar(require("fs-extra"));
@@ -32,13 +31,6 @@ function modeFlagToViewMode(modeFlag) {
     }
 }
 exports.modeFlagToViewMode = modeFlagToViewMode;
-exports.commonFlags = {
-    mode: core_1.Flags.string({
-        char: "m",
-        description: "Pull mode",
-        options: Object.keys(exports.modeFlagValuesMap),
-    }),
-};
 exports.SELECT_PROMPT_HELP = "Use ↑/↓ arrow keys, Enter to confirm";
 exports.MULTI_SELECT_PROMPT_HELP = "Use ↑/↓ arrow keys, Space to select, Enter to confirm";
 const atLeastOneSelection = (value) => {
@@ -55,7 +47,7 @@ function slugifyName(originalName) {
     });
 }
 async function writeResourceToDisk(resourceType, resourceId, resource, now, rootPath, existingRelativeLocation) {
-    var _a;
+    var _a, _b, _c;
     switch (resourceType) {
         case "APPLICATION": {
             const parentDirName = "apps";
@@ -86,14 +78,17 @@ async function writeResourceToDisk(resourceType, resourceId, resource, now, root
             };
             if (resource.apis) {
                 for (const api of resource.apis) {
+                    const apiName = slugifyName((_b = api.apiPb.metadata.name) !== null && _b !== void 0 ? _b : api.actions.name);
+                    // server is still sending actions for a backwards compatibility
+                    delete api.actions;
                     const apiContent = (0, yaml_1.stringify)(api, {
                         sortMapEntries: true,
                     });
                     const handleApi = async () => {
-                        await fs.outputFile(`${apisDirName}/${slugifyName(api.actions.name)}.yaml`, apiContent);
+                        await fs.outputFile(`${apisDirName}/${apiName}.yaml`, apiContent);
                     };
                     apiPromises.push(handleApi());
-                    applicationConfig.apis[api.id] = api.actions.name;
+                    applicationConfig.apis[api.id] = apiName;
                 }
                 await Promise.all(apiPromises);
             }
@@ -107,7 +102,10 @@ async function writeResourceToDisk(resourceType, resourceId, resource, now, root
         }
         case "BACKEND": {
             const parentDirName = "backends";
-            const newRelativeLocation = `${parentDirName}/${slugifyName(resource.actions.name)}`;
+            const apiName = slugifyName((_c = resource.apiPb.metadata.name) !== null && _c !== void 0 ? _c : resource.actions.name);
+            // server is still sending actions for a backwards compatibility
+            delete resource.actions;
+            const newRelativeLocation = `${parentDirName}/${apiName}`;
             const relativeLocation = existingRelativeLocation !== null && existingRelativeLocation !== void 0 ? existingRelativeLocation : newRelativeLocation;
             const backendDirName = node_path_1.default.resolve(rootPath, relativeLocation);
             if (!(await fs.pathExists(backendDirName))) {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.12",
+  "version": "0.0.13",
   "commands": {
     "init": {
       "id": "init",
@@ -86,7 +86,8 @@
             "latest-edits",
             "most-recent-commit",
             "deployed"
-          ]
+          ],
+          "default": "latest-edits"
         }
       },
       "args": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "Official Superblocks CLI",
   "bin": {
     "superblocks": "bin/run"
@@ -19,6 +19,7 @@
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^2.4.4",
     "@superblocksteam/sdk": "*",
+    "@superblocksteam/react-shim": "*",
     "@superblocksteam/util": "*",
     "@superblocksteam/vite-custom-component-reload-plugin": "*",
     "@vitejs/plugin-react": "^4.0.0",
@@ -30,7 +31,6 @@
     "serve-handler": "^6.1.5",
     "slugify": "^1.6.6",
     "vite": "^4.3.9",
-    "vite-plugin-externals": "^0.6.2",
     "vite-plugin-inspect": "^0.7.28",
     "yaml": "2.3.1"
   },
@@ -56,7 +56,7 @@
     "shx": "^0.3.3",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
-    "typescript": "^5.1.3"
+    "typescript": "^5.1.6"
   },
   "scripts": {
     "build": "tsc --build",