@superblocksteam/cli 1.8.0 → 1.8.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md
CHANGED
|
@@ -12,7 +12,7 @@ $ npm install -g @superblocksteam/cli
|
|
|
12
12
|
$ superblocks COMMAND
|
|
13
13
|
running command...
|
|
14
14
|
$ superblocks (--version)
|
|
15
|
-
@superblocksteam/cli/1.8.
|
|
15
|
+
@superblocksteam/cli/1.8.2 linux-x64 node-v18.20.3
|
|
16
16
|
$ superblocks --help [COMMAND]
|
|
17
17
|
USAGE
|
|
18
18
|
$ superblocks COMMAND
|
package/dist/commands/migrate.js
CHANGED
|
@@ -122,7 +122,7 @@ class Migrate extends authenticated_command_1.AuthenticatedCommand {
|
|
|
122
122
|
async migrateSinglePageApplicationToMultiPage(applicationResource, superblocksRootPath) {
|
|
123
123
|
const fileStructure = await (0, version_control_1.getFileStructureType)(superblocksRootPath, applicationResource.location);
|
|
124
124
|
if (fileStructure == version_control_1.FileStructureType.SINGLE_PAGE &&
|
|
125
|
-
(await this.getSdk().fetchCurrentUser()).flagBootstrap["
|
|
125
|
+
(await this.getSdk().fetchCurrentUser()).flagBootstrap["ui.multi-page.enabled"]) {
|
|
126
126
|
this.log(`Migrating single page application at ${applicationResource.location} to multi-page application...`);
|
|
127
127
|
const singlePageApplication = await (0, version_control_1.readApplicationFromDisk)(superblocksRootPath, applicationResource.location);
|
|
128
128
|
const multiPageApplication = {
|
package/dist/commands/pull.js
CHANGED
|
@@ -143,11 +143,11 @@ Would you like to also delete these resources from your filesystem?`,
|
|
|
143
143
|
catch (error) {
|
|
144
144
|
if ((0, version_control_1.isCI)() && error instanceof sdk_1.ValidateGitSetupError) {
|
|
145
145
|
this.log(`WARN: Failed to validate git setup for ${resourceTitle}. Skipping pull.\n\n${error.message}.`);
|
|
146
|
+
ctx.resourceIdsToSkip.add(resourceId);
|
|
146
147
|
}
|
|
147
148
|
else {
|
|
148
149
|
throw error;
|
|
149
150
|
}
|
|
150
|
-
ctx.resourceIdsToSkip.add(resourceId);
|
|
151
151
|
}
|
|
152
152
|
},
|
|
153
153
|
});
|
|
@@ -157,13 +157,25 @@ Would you like to also delete these resources from your filesystem?`,
|
|
|
157
157
|
});
|
|
158
158
|
},
|
|
159
159
|
},
|
|
160
|
+
{
|
|
161
|
+
task: async (ctx, task) => {
|
|
162
|
+
return task.newListr([
|
|
163
|
+
{
|
|
164
|
+
title: `Filtering out resources with git validation errors...`,
|
|
165
|
+
enabled: () => ctx.resourceIdsToSkip.size > 0,
|
|
166
|
+
task: () => {
|
|
167
|
+
// Remove resources to skip from list of resources to pull
|
|
168
|
+
ctx.resourceIdsToPull = ctx.resourceIdsToPull.filter((id) => !ctx.resourceIdsToSkip.has(id));
|
|
169
|
+
},
|
|
170
|
+
},
|
|
171
|
+
]);
|
|
172
|
+
},
|
|
173
|
+
},
|
|
160
174
|
{
|
|
161
175
|
task: async (ctx, task) => {
|
|
162
176
|
var _a, _b;
|
|
163
177
|
task.title = `Pulling resources from branch ${ctx.localBranchName}...`;
|
|
164
178
|
const viewMode = await (0, version_control_1.getMode)(task, mode);
|
|
165
|
-
// Remove resources to skip from list of resources to push
|
|
166
|
-
ctx.resourceIdsToPull = ctx.resourceIdsToPull.filter((id) => !ctx.resourceIdsToSkip.has(id));
|
|
167
179
|
const subtasks = [];
|
|
168
180
|
for (const resourceId of ctx.resourceIdsToPull) {
|
|
169
181
|
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?`,
|
|
|
180
192
|
task.title += `: fetched`;
|
|
181
193
|
const fileStructureType = await (0, version_control_1.getFileStructureType)(ctx.superblocksRootPath, resource.location);
|
|
182
194
|
if (fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE) {
|
|
183
|
-
const multiPageEnabled = (await this.getSdk().fetchCurrentUser()).flagBootstrap["
|
|
195
|
+
const multiPageEnabled = (await this.getSdk().fetchCurrentUser()).flagBootstrap["ui.multi-page.enabled"];
|
|
184
196
|
if (multiPageEnabled) {
|
|
185
197
|
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.`);
|
|
186
198
|
}
|
package/dist/commands/push.js
CHANGED
|
@@ -150,11 +150,11 @@ Would you like to also delete these resources from your filesystem?`,
|
|
|
150
150
|
catch (error) {
|
|
151
151
|
if ((0, version_control_1.isCI)() && error instanceof sdk_1.ValidateGitSetupError) {
|
|
152
152
|
this.log(`WARN: Failed to validate git setup for ${resourceTitle}. Skipping push.\n\n${error.message}.`);
|
|
153
|
+
ctx.resourceIdsToSkip.add(resourceId);
|
|
153
154
|
}
|
|
154
155
|
else {
|
|
155
156
|
throw error;
|
|
156
157
|
}
|
|
157
|
-
ctx.resourceIdsToSkip.add(resourceId);
|
|
158
158
|
}
|
|
159
159
|
},
|
|
160
160
|
});
|
|
@@ -164,6 +164,20 @@ Would you like to also delete these resources from your filesystem?`,
|
|
|
164
164
|
});
|
|
165
165
|
},
|
|
166
166
|
},
|
|
167
|
+
{
|
|
168
|
+
task: async (ctx, task) => {
|
|
169
|
+
return task.newListr([
|
|
170
|
+
{
|
|
171
|
+
title: `Filtering out resources with git validation errors...`,
|
|
172
|
+
enabled: () => ctx.resourceIdsToSkip.size > 0,
|
|
173
|
+
task: () => {
|
|
174
|
+
// Remove resources to skip from list of resources to push
|
|
175
|
+
ctx.resourceIdsToPush = ctx.resourceIdsToPush.filter((id) => !ctx.resourceIdsToSkip.has(id));
|
|
176
|
+
},
|
|
177
|
+
},
|
|
178
|
+
]);
|
|
179
|
+
},
|
|
180
|
+
},
|
|
167
181
|
{
|
|
168
182
|
task: async (ctx, task) => {
|
|
169
183
|
var _a, _b;
|
|
@@ -192,8 +206,6 @@ Would you like to also delete these resources from your filesystem?`,
|
|
|
192
206
|
task: async (ctx, task) => {
|
|
193
207
|
var _a;
|
|
194
208
|
task.title = `Pushing resources to branch ${ctx.localBranchName}...`;
|
|
195
|
-
// Remove resources to skip from list of resources to push
|
|
196
|
-
ctx.resourceIdsToPush = ctx.resourceIdsToPush.filter((id) => !ctx.resourceIdsToSkip.has(id));
|
|
197
209
|
const subtasks = [];
|
|
198
210
|
const superblocksRootPath = node_path_1.default.resolve(node_path_1.default.dirname(ctx.superblocksRootConfigPath), "..");
|
|
199
211
|
for (const resourceId of ctx.resourceIdsToPush) {
|
|
@@ -206,8 +218,8 @@ Would you like to also delete these resources from your filesystem?`,
|
|
|
206
218
|
var _a;
|
|
207
219
|
const fileStructureType = await (0, version_control_1.getFileStructureType)(superblocksRootPath, resource.location);
|
|
208
220
|
if (fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE &&
|
|
209
|
-
(await this.getSdk().fetchCurrentUser()).flagBootstrap["
|
|
210
|
-
this.error(`Application files at ${resource.location} are in single page format, but the multi-page feature is enabled for your account.
|
|
221
|
+
(await this.getSdk().fetchCurrentUser()).flagBootstrap["ui.multi-page.enabled"]) {
|
|
222
|
+
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.`);
|
|
211
223
|
}
|
|
212
224
|
const localGitRepoState = await (0, version_control_1.getLocalGitRepoState)(ctx.localBranchName);
|
|
213
225
|
const applicationConfig = fileStructureType === version_control_1.FileStructureType.SINGLE_PAGE
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@superblocksteam/cli",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.2",
|
|
4
4
|
"description": "Official Superblocks CLI",
|
|
5
5
|
"bin": {
|
|
6
6
|
"superblocks": "bin/run"
|
|
@@ -18,11 +18,11 @@
|
|
|
18
18
|
"@oclif/core": "^2.11.7",
|
|
19
19
|
"@oclif/plugin-help": "^5.2.16",
|
|
20
20
|
"@oclif/plugin-plugins": "^3.1.10",
|
|
21
|
-
"@superblocksteam/css-plugin": "1.8.
|
|
22
|
-
"@superblocksteam/react-shim": "1.8.
|
|
23
|
-
"@superblocksteam/sdk": "1.8.
|
|
24
|
-
"@superblocksteam/util": "1.8.
|
|
25
|
-
"@superblocksteam/vite-custom-component-reload-plugin": "1.8.
|
|
21
|
+
"@superblocksteam/css-plugin": "1.8.2",
|
|
22
|
+
"@superblocksteam/react-shim": "1.8.2",
|
|
23
|
+
"@superblocksteam/sdk": "1.8.2",
|
|
24
|
+
"@superblocksteam/util": "1.8.2",
|
|
25
|
+
"@superblocksteam/vite-custom-component-reload-plugin": "1.8.2",
|
|
26
26
|
"@vitejs/plugin-react": "^4.1.0",
|
|
27
27
|
"colorette": "^2.0.19",
|
|
28
28
|
"enquirer": "^2.3.6",
|