@superblocksteam/cli 0.0.18 → 0.0.20

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/0.0.18 linux-x64 node-v18.17.0
+@superblocksteam/cli/0.0.20 linux-x64 node-v18.17.0
 $ superblocks --help [COMMAND]
 USAGE
   $ superblocks COMMAND
@@ -125,7 +125,7 @@ DESCRIPTION
   Display help for superblocks.
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.10/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.2.16/src/commands/help.ts)_
 
 ## `superblocks init [RESOURCEURL]`
 

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

@@ -7,11 +7,11 @@
     "lint:fix": "npx eslint . --fix"
   },
   "dependencies": {
+    "@superblocksteam/custom-components": "0.0.20",
     "react": "^18",
     "react-dom": "^18"
   },
   "devDependencies": {
-    "@superblocksteam/cli": "0.0.17",
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
@@ -20,6 +20,7 @@
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "^7.32.2",
     "prettier": "3.0.0",
+    "sass": "^1.64.2",
     "typescript": "^5.1.6"
   }
 }

package/dist/commands/components/upload.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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 css_plugin_1 = require("@superblocksteam/css-plugin");
@@ -9,7 +8,6 @@ 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 authenticated_command_1 = require("../../common/authenticated-command");
 class Upload extends authenticated_command_1.AuthenticatedApplicationCommand {
@@ -82,36 +80,7 @@ class Upload extends authenticated_command_1.AuthenticatedApplicationCommand {
             this.log(e.message);
             this.error("Failed to upload components", { exit: 1 });
         }
-        this.log("For testing purposes, the production assets will be served from this machine.");
-        const server = node_http_1.default.createServer((request, response) => {
-            // You pass two more arguments for config and middleware
-            // More details here: https://github.com/vercel/serve-handler#options
-            return (0, serve_handler_1.default)(request, response, {
-                public: "./",
-                headers: [
-                    {
-                        source: "**/*",
-                        headers: [
-                            {
-                                key: "Access-Control-Allow-Origin",
-                                value: "*",
-                            },
-                            {
-                                key: "Access-Control-Allow-Credentials",
-                                value: "true",
-                            },
-                            {
-                                key: "Access-Control-Allow-Private-Network",
-                                value: "true",
-                            },
-                        ],
-                    },
-                ],
-            });
-        });
-        server.listen(3030, () => {
-            console.log("Running asset server at http://localhost:3030");
-        });
+        this.log("You can now disable local dev mode and test your production assets");
     }
 }
 Upload.description = "Upload creates a production-ready bundle and saves the files for use outside of Local Development mode.";

package/dist/commands/init.js

@@ -139,23 +139,20 @@ class Initialize extends authenticated_command_1.AuthenticatedCommand {
             {
                 title: "Updating Superblocks project file...",
                 task: async (ctx) => {
-                    var _a, _b, _c, _d;
+                    var _a, _b;
                     const superblocksConfig = {
                         configType: "ROOT",
                         resources: {},
                         metadata: {
                             cliVersion: this.config.version,
-                            lastUpdated: ctx.now,
-                            created: (_b = (_a = ctx.existingSuperblocksConfig) === null || _a === void 0 ? void 0 : _a.metadata.created) !== null && _b !== void 0 ? _b : ctx.now,
                         },
                     };
-                    superblocksConfig.metadata.lastUpdated = ctx.now;
                     // new resources
                     for (const [resourceId, resource] of Object.entries(ctx.writtenResources)) {
                         superblocksConfig.resources[resourceId] = resource;
                     }
                     // existing resources
-                    for (const [resourceId, resource] of Object.entries((_d = (_c = ctx.existingSuperblocksConfig) === null || _c === void 0 ? void 0 : _c.resources) !== null && _d !== void 0 ? _d : {})) {
+                    for (const [resourceId, resource] of Object.entries((_b = (_a = ctx.existingSuperblocksConfig) === null || _a === void 0 ? void 0 : _a.resources) !== null && _b !== void 0 ? _b : {})) {
                         superblocksConfig.resources[resourceId] = resource;
                     }
                     if (!(await fs.exists(util_1.SUPERBLOCKS_HOME_FOLDER_NAME))) {

package/dist/commands/pull.js

@@ -87,20 +87,12 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
             {
                 title: "Updating Superblocks project file...",
                 task: async (ctx) => {
-                    var _a;
-                    const superblocksRootConfig = {
-                        configType: "ROOT",
-                        resources: ctx.existingSuperblocksRootConfig.resources,
-                        metadata: {
-                            ...(_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.metadata,
-                            lastUpdated: ctx.now,
-                        },
-                    };
+                    const [superblocksRootConfig, rootConfigPath] = await (0, util_1.getSuperblocksMonorepoConfigJson)(true);
                     for (const [resourceId, resource] of Object.entries(ctx.writtenResources)) {
                         superblocksRootConfig.resources[resourceId] = resource;
                     }
                     // update superblocks.json file
-                    await fs.writeFile(ctx.superblocksRootConfigPath, JSON.stringify((0, version_control_1.sortByKey)(superblocksRootConfig), null, 2));
+                    await fs.writeFile(rootConfigPath, JSON.stringify((0, version_control_1.sortByKey)(superblocksRootConfig), null, 2));
                 },
             },
         ], {
@@ -128,7 +120,7 @@ class Pull extends authenticated_command_1.AuthenticatedCommand {
         for (const [resourceId, resource] of Object.entries((_f = (_e = ctx.existingSuperblocksRootConfig) === null || _e === void 0 ? void 0 : _e.resources) !== null && _f !== void 0 ? _f : {})) {
             choices.push({
                 name: resourceId,
-                message: `${resource.location} (Last updated at ${new Date(resource.lastUpdated).toLocaleTimeString()})`,
+                message: resource.location,
             });
             if (((_g = ctx.existingSuperblocksResourceConfig) === null || _g === void 0 ? void 0 : _g.id) === resourceId) {
                 initialSelections.push(counter);

package/dist/common/authenticated-command.js

@@ -16,8 +16,10 @@ class AuthenticatedCommand extends core_1.Command {
             }
             const { token, superblocksBaseUrl } = result;
             this.sdk = new sdk_1.SuperblocksSdk(token, superblocksBaseUrl);
+            await (0, util_1.updatedMonorepoConfig)(this.config.version);
         }
-        catch {
+        catch (e) {
+            console.log(e.message);
             this.error("Please run 'superblocks login' first", { exit: 1 });
         }
     }

package/dist/common/defaults/create-component-defaults.d.ts

@@ -1,4 +1,4 @@
-import { StatefulProperty } from "../types";
+import { type StatefulProperty } from "@superblocksteam/util";
 export declare const getDefaultConfigTs: ({ id, name, displayName, statefulPropsRendered, eventHandlersRendered, }: {
     id: string;
     name: string;

package/dist/common/defaults/create-component-defaults.js

@@ -8,7 +8,7 @@ const indent = (str, spaces) => {
         .map((line) => `${spacesString}${line}`)
         .join("\n");
 };
-const getDefaultConfigTs = ({ id, name, displayName, statefulPropsRendered, eventHandlersRendered, }) => `import { type ComponentConfig } from "@superblocksteam/cli";
+const getDefaultConfigTs = ({ id, name, displayName, statefulPropsRendered, eventHandlersRendered, }) => `import { type ComponentConfig } from "@superblocksteam/custom-components";
 
 export default {
   // DO NOT CHANGE THE ID ONCE THE COMPONENT HAS BEEN REGISTERED!
@@ -22,15 +22,17 @@ export default {
 `;
 exports.getDefaultConfigTs = getDefaultConfigTs;
 const getDefaultComponentTsx = (statefulProps, eventHandlers) => `import React from "react";
-import { Props } from "./types";
+import { useSuperblocksContext } from "@superblocksteam/custom-components";
+import { type Props, type EventTriggers } from "./types";
+
+export default function Component({${statefulProps.length === 0
+    ? ""
+    : "\n" + statefulProps.map((v) => indent(v.path, 2) + ",\n").join("")}}: Props) {
+  const {
+    updateStatefulProperties,
+    events: {${"\n" + eventHandlers.map((v) => indent(v, 6) + ",\n").join("")}    },
+  } = useSuperblocksContext<Props, EventTriggers>();
 
-export default function Component({
-  updateStatefulProperties${statefulProps.length > 0
-    ? ",\n" + statefulProps.map((v) => indent(v.path, 2)).join(",\n")
-    : ""}${eventHandlers.length > 0
-    ? ",\n" + eventHandlers.map((v) => indent(v, 2)).join(",\n")
-    : ""}
-}: Props) {
   return (
     <div
       style={{

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

@@ -1,11 +1,5 @@
 import { ViewMode } from "@superblocksteam/sdk";
 import { VersionedResourceConfig } from "@superblocksteam/util";
-export type SuperblocksMetadata = {
-    cliVersion: string;
-    remote: string;
-    lastUpdated: number;
-    created: number;
-};
 export declare const LATEST_EDITS_MODE = "latest-edits";
 export declare const MOST_RECENT_COMMIT_MODE = "most-recent-commit";
 export declare const DEPLOYED_MODE = "deployed";

package/dist/common/version-control.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 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 colorette_1 = require("colorette");
 const fs = tslib_1.__importStar(require("fs-extra"));
@@ -46,6 +48,45 @@ function slugifyName(originalName) {
         lower: true,
     });
 }
+// resolves a true promise when download is complete. If there's an error, resolve false
+async function downloadFile(rootDirectory, filepath, url) {
+    const fullPath = `${rootDirectory}/${filepath}`;
+    // eslint-disable-next-line no-async-promise-executor
+    const result = await new Promise(async (resolve) => {
+        try {
+            // create directory path if it doesn't exist yet
+            if (!(await fs.pathExists(fullPath))) {
+                await fs.mkdir((0, path_1.dirname)(fullPath), { recursive: true });
+            }
+            const file = fs.createWriteStream(fullPath);
+            https.get(url, (resp) => {
+                resp.pipe(file);
+                file
+                    .on("finish", () => {
+                    file.end(() => resolve(true));
+                })
+                    .on("error", () => {
+                    fs.unlink(filepath);
+                    resolve(false);
+                });
+            });
+        }
+        catch (e) {
+            return resolve(false);
+        }
+    });
+    // failed to download correctly, attempt to clean up file
+    if (!result) {
+        try {
+            await fs.unlink(fullPath);
+        }
+        catch (e) {
+            console.log("Failed to delete file", fullPath);
+        }
+        return Promise.resolve(fullPath);
+    }
+    return Promise.resolve("");
+}
 async function writeResourceToDisk(resourceType, resourceId, resource, now, rootPath, existingRelativeLocation) {
     var _a, _b, _c, _d, _e, _f, _g;
     switch (resourceType) {
@@ -94,9 +135,15 @@ async function writeResourceToDisk(resourceType, resourceId, resource, now, root
             }
             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 createdFiles = await Promise.resolve(resource.componentFiles.map((file) => downloadFile(appDirName, file.filename, file.url)));
+            // print out failed downloads synchronously here
+            createdFiles
+                .filter((createdFiles) => createdFiles.length)
+                .forEach((createdFile) => {
+                console.log(`Unable to download ${createdFile}`);
+            });
             return {
                 location: relativeLocation,
-                lastUpdated: now,
                 resourceType: "APPLICATION",
             };
         }
@@ -123,7 +170,6 @@ async function writeResourceToDisk(resourceType, resourceId, resource, now, root
             await fs.writeFile(`${backendDirName}/${util_1.RESOURCE_CONFIG_PATH}`, JSON.stringify(sortByKey(backendConfig), null, 2));
             return {
                 location: relativeLocation,
-                lastUpdated: now,
                 resourceType: "BACKEND",
             };
         }

package/dist/index.d.ts

@@ -1,2 +1 @@
 export { run } from "@oclif/core";
-export * from "./exportedTypes";

package/dist/index.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const tslib_1 = require("tslib");
 var core_1 = require("@oclif/core");
 Object.defineProperty(exports, "run", { enumerable: true, get: function () { return core_1.run; } });
-tslib_1.__exportStar(require("./exportedTypes"), exports);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.18",
+  "version": "0.0.20",
   "commands": {
     "init": {
       "id": "init",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "Official Superblocks CLI",
   "bin": {
     "superblocks": "bin/run"
@@ -15,9 +15,9 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@oclif/core": "^2",
-    "@oclif/plugin-help": "^5",
-    "@oclif/plugin-plugins": "^2.4.4",
+    "@oclif/core": "^2.11.7",
+    "@oclif/plugin-help": "^5.2.16",
+    "@oclif/plugin-plugins": "^3.1.10",
     "@superblocksteam/css-plugin": "*",
     "@superblocksteam/react-shim": "*",
     "@superblocksteam/sdk": "*",
@@ -29,20 +29,18 @@
     "fs-extra": "^11.1.1",
     "listr2": "6.6.0",
     "lodash": "^4.17.21",
-    "serve-handler": "^6.1.5",
     "slugify": "^1.6.6",
     "vite": "^4.4.8",
     "vite-plugin-inspect": "^0.7.28",
     "yaml": "2.3.1"
   },
   "devDependencies": {
-    "@oclif/test": "^2.3.14",
+    "@oclif/test": "^2.4.4",
     "@types/babel__core": "^7.20.0",
     "@types/chai": "^4",
     "@types/fs-extra": "^11.0.1",
     "@types/mocha": "^9.0.0",
     "@types/node": "^16.18.38",
-    "@types/serve-handler": "^6.1.1",
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.1",
     "chai": "^4",
@@ -52,7 +50,7 @@
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-unicorn": "^47.0.0",
     "mocha": "^9",
-    "oclif": "^3",
+    "oclif": "^3.11.3",
     "prettier": "^2.8.8",
     "shx": "^0.3.3",
     "ts-node": "^10.9.1",

package/dist/common/types.d.ts

@@ -1,7 +0,0 @@
-import { type InputType } from "@superblocksteam/util";
-export interface StatefulProperty {
-    label: string;
-    path: string;
-    inputType: InputType;
-    placeholder?: string;
-}

package/dist/common/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/exportedTypes.d.ts

@@ -1,20 +0,0 @@
-/// <reference types="node" />
-import { type UUID } from "crypto";
-import { type StatefulProperty } from "./common/types";
-export interface ComponentConfig {
-    id: UUID;
-    name: string;
-    displayName: string;
-    componentPath: string;
-    statefulProperties: StatefulProperty[];
-    /**
-     * Example: [{
-     *  label: "On Click",
-     *  path: "onClick",
-     * }]
-     */
-    eventHandlers: Array<{
-        label: string;
-        path: string;
-    }>;
-}

package/dist/exportedTypes.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });