@superblocksteam/cli 1.7.0 → 1.8.2

package/README.md

@@ -12,7 +12,7 @@ $ npm install -g @superblocksteam/cli
 $ superblocks COMMAND
 running command...
 $ superblocks (--version)
-@superblocksteam/cli/1.7.0 linux-x64 node-v18.20.2
+@superblocksteam/cli/1.8.2 linux-x64 node-v18.20.3
 $ 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.7.0",
+    "@superblocksteam/custom-components": "1.8.2",
     "react": "^18",
     "react-dom": "^18"
   },

package/dist/commands/migrate.js

@@ -122,7 +122,7 @@ class Migrate extends authenticated_command_1.AuthenticatedCommand {
     async migrateSinglePageApplicationToMultiPage(applicationResource, superblocksRootPath) {
         const fileStructure = await (0, version_control_1.getFileStructureType)(superblocksRootPath, applicationResource.location);
         if (fileStructure == version_control_1.FileStructureType.SINGLE_PAGE &&
-            (await this.getSdk().fetchCurrentUser()).flagBootstrap["server.multipage.enabled"]) {
+            (await this.getSdk().fetchCurrentUser()).flagBootstrap["ui.multi-page.enabled"]) {
             this.log(`Migrating single page application at ${applicationResource.location} to multi-page application...`);
             const singlePageApplication = await (0, version_control_1.readApplicationFromDisk)(superblocksRootPath, applicationResource.location);
             const multiPageApplication = {

package/dist/commands/pull.js

@@ -143,11 +143,11 @@ Would you like to also delete these resources from your filesystem?`,
                                 catch (error) {
                                     if ((0, version_control_1.isCI)() && error instanceof sdk_1.ValidateGitSetupError) {
                                         this.log(`WARN: Failed to validate git setup for ${resourceTitle}. Skipping pull.\n\n${error.message}.`);
+                                        ctx.resourceIdsToSkip.add(resourceId);
                                     }
                                     else {
                                         throw error;
                                     }
-                                    ctx.resourceIdsToSkip.add(resourceId);
                                 }
                             },
                         });
@@ -157,13 +157,25 @@ Would you like to also delete these resources from your filesystem?`,
                     });
                 },
             },
+            {
+                task: async (ctx, task) => {
+                    return task.newListr([
+                        {
+                            title: `Filtering out resources with git validation errors...`,
+                            enabled: () => ctx.resourceIdsToSkip.size > 0,
+                            task: () => {
+                                // Remove resources to skip from list of resources to pull
+                                ctx.resourceIdsToPull = ctx.resourceIdsToPull.filter((id) => !ctx.resourceIdsToSkip.has(id));
+                            },
+                        },
+                    ]);
+                },
+            },
             {
                 task: async (ctx, task) => {
                     var _a, _b;
                     task.title = `Pulling resources from branch ${ctx.localBranchName}...`;
                     const viewMode = await (0, version_control_1.getMode)(task, mode);
-                    // Remove resources to skip from list of resources to push
-                    ctx.resourceIdsToPull = ctx.resourceIdsToPull.filter((id) => !ctx.resourceIdsToSkip.has(id));
                     const subtasks = [];
                     for (const resourceId of ctx.resourceIdsToPull) {
                         const resource = (_a = ctx.existingSuperblocksRootConfig) === null || _a === void 0 ? void 0 : _a.resources[resourceId];
@@ -180,7 +192,7 @@ Would you like to also delete these resources from your filesystem?`,
                                             task.title += `: fetched`;
                                             const fileStructureType = await (0, version_control_1.getFileStructureType)(ctx.superblocksRootPath, resource.location);
                                             if (fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE) {
-                                                const multiPageEnabled = (await this.getSdk().fetchCurrentUser()).flagBootstrap["server.multipage.enabled"];
+                                                const multiPageEnabled = (await this.getSdk().fetchCurrentUser()).flagBootstrap["ui.multi-page.enabled"];
                                                 if (multiPageEnabled) {
                                                     this.error(`Application files at ${resource.location} are in single page format, but the multi-page feature is enabled for your account. Please run superblocks migrate to convert your application to multi-page format and commit the changes before pulling.`);
                                                 }

package/dist/commands/push.js

@@ -150,11 +150,11 @@ Would you like to also delete these resources from your filesystem?`,
                                 catch (error) {
                                     if ((0, version_control_1.isCI)() && error instanceof sdk_1.ValidateGitSetupError) {
                                         this.log(`WARN: Failed to validate git setup for ${resourceTitle}. Skipping push.\n\n${error.message}.`);
+                                        ctx.resourceIdsToSkip.add(resourceId);
                                     }
                                     else {
                                         throw error;
                                     }
-                                    ctx.resourceIdsToSkip.add(resourceId);
                                 }
                             },
                         });
@@ -164,6 +164,20 @@ Would you like to also delete these resources from your filesystem?`,
                     });
                 },
             },
+            {
+                task: async (ctx, task) => {
+                    return task.newListr([
+                        {
+                            title: `Filtering out resources with git validation errors...`,
+                            enabled: () => ctx.resourceIdsToSkip.size > 0,
+                            task: () => {
+                                // Remove resources to skip from list of resources to push
+                                ctx.resourceIdsToPush = ctx.resourceIdsToPush.filter((id) => !ctx.resourceIdsToSkip.has(id));
+                            },
+                        },
+                    ]);
+                },
+            },
             {
                 task: async (ctx, task) => {
                     var _a, _b;
@@ -192,8 +206,6 @@ Would you like to also delete these resources from your filesystem?`,
                 task: async (ctx, task) => {
                     var _a;
                     task.title = `Pushing resources to branch ${ctx.localBranchName}...`;
-                    // Remove resources to skip from list of resources to push
-                    ctx.resourceIdsToPush = ctx.resourceIdsToPush.filter((id) => !ctx.resourceIdsToSkip.has(id));
                     const subtasks = [];
                     const superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
                     for (const resourceId of ctx.resourceIdsToPush) {
@@ -206,19 +218,22 @@ Would you like to also delete these resources from your filesystem?`,
                                         var _a;
                                         const fileStructureType = await (0, version_control_1.getFileStructureType)(superblocksRootPath, resource.location);
                                         if (fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE &&
-                                            (await this.getSdk().fetchCurrentUser()).flagBootstrap["server.multipage.enabled"]) {
-                                            this.error(`Application files at ${resource.location} are in single page format, but the multi-page feature is enabled for your account. Please run \`superblocks migrate\` to convert your application to multi-page format and commit the changes before pushing.`);
+                                            (await this.getSdk().fetchCurrentUser()).flagBootstrap["ui.multi-page.enabled"]) {
+                                            this.error(`Application files at ${resource.location} are in single page format, but the multi-page feature is enabled for your account. To resolve this issue, you can make a commit to this branch from Superblocks to convert the file structure to multi-page format (See docs: https://docs.superblocks.com/applications/multi-page/converting-single-page-to-multi-page#handling-outstanding-branches-created-before-multi-page). Alternatively, you can run \`superblocks migrate\` to convert your file structure and commit the changes before pushing.`);
                                         }
+                                        const localGitRepoState = await (0, version_control_1.getLocalGitRepoState)(ctx.localBranchName);
                                         const applicationConfig = fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE
                                             ? {
                                                 ...(await (0, version_control_1.readApplicationFromDisk)(superblocksRootPath, resource.location)),
                                                 commitId: ctx.headCommitId,
                                                 commitMessage: ctx.headCommitMessage,
+                                                gitState: localGitRepoState,
                                             }
                                             : {
                                                 ...(await (0, version_control_1.readMultiPageApplicationFromDisk)(superblocksRootPath, resource.location)),
                                                 commitId: ctx.headCommitId,
                                                 commitMessage: ctx.headCommitMessage,
+                                                gitState: localGitRepoState,
                                             };
                                         task.title += `: read from disk`;
                                         try {
@@ -253,10 +268,12 @@ Would you like to also delete these resources from your filesystem?`,
                                     title: `Pushing workflow/scheduled job ${resource.location}...`,
                                     task: async (_ctx, task) => {
                                         var _a;
+                                        const localGitRepoState = await (0, version_control_1.getLocalGitRepoState)(ctx.localBranchName);
                                         const apiConfig = {
                                             ...(await (0, version_control_1.readApiFromDisk)(superblocksRootPath, resource.location)),
                                             commitId: ctx.headCommitId,
                                             commitMessage: ctx.headCommitMessage,
+                                            gitState: localGitRepoState,
                                         };
                                         task.title += `: read from disk`;
                                         try {
@@ -335,11 +352,12 @@ Would you like to also delete these resources from your filesystem?`,
             ? [choices[0].name]
             : await task.prompt([
                 {
-                    type: "MultiSelect",
+                    type: "AutoComplete",
                     name: "resourceIdsToPush",
                     message: `Select resources to push (${version_control_1.MULTI_SELECT_PROMPT_HELP})`,
                     choices: choices,
                     initial: initialSelections,
+                    multiple: true,
                     validate: version_control_1.atLeastOneSelection,
                     prefix: "▸",
                     indicator: "◉",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.0",
+  "version": "1.8.2",
   "commands": {
     "init": {
       "id": "init",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/cli",
-  "version": "1.7.0",
+  "version": "1.8.2",
   "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.7.0",
-    "@superblocksteam/react-shim": "1.7.0",
-    "@superblocksteam/sdk": "1.7.0",
-    "@superblocksteam/util": "1.7.0",
-    "@superblocksteam/vite-custom-component-reload-plugin": "1.7.0",
+    "@superblocksteam/css-plugin": "1.8.2",
+    "@superblocksteam/react-shim": "1.8.2",
+    "@superblocksteam/sdk": "1.8.2",
+    "@superblocksteam/util": "1.8.2",
+    "@superblocksteam/vite-custom-component-reload-plugin": "1.8.2",
     "@vitejs/plugin-react": "^4.1.0",
     "colorette": "^2.0.19",
     "enquirer": "^2.3.6",