@superblocksteam/sdk 2.0.6-next.45 → 2.0.6-next.46
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/dist/application-build.mjs +2 -2
- package/dist/application-build.mjs.map +1 -1
- package/dist/cli-replacement/automatic-upgrades.d.ts +5 -2
- package/dist/cli-replacement/automatic-upgrades.d.ts.map +1 -1
- package/dist/cli-replacement/automatic-upgrades.js +69 -26
- package/dist/cli-replacement/automatic-upgrades.js.map +1 -1
- package/dist/cli-replacement/dev.d.mts +1 -2
- package/dist/cli-replacement/dev.d.mts.map +1 -1
- package/dist/cli-replacement/dev.mjs +53 -28
- package/dist/cli-replacement/dev.mjs.map +1 -1
- package/dist/dev-utils/dev-logger.d.mts +17 -7
- package/dist/dev-utils/dev-logger.d.mts.map +1 -1
- package/dist/dev-utils/dev-logger.mjs +50 -9
- package/dist/dev-utils/dev-logger.mjs.map +1 -1
- package/dist/dev-utils/dev-server.d.mts.map +1 -1
- package/dist/dev-utils/dev-server.mjs +3 -11
- package/dist/dev-utils/dev-server.mjs.map +1 -1
- package/dist/vite-plugin-generate-build-manifest.mjs +1 -1
- package/dist/vite-plugin-generate-build-manifest.mjs.map +1 -1
- package/dist/vite-plugin-inject-sb-ids-transform.mjs +1 -1
- package/dist/vite-plugin-inject-sb-ids-transform.mjs.map +1 -1
- package/package.json +5 -5
- package/src/application-build.mts +2 -2
- package/src/cli-replacement/automatic-upgrades.ts +101 -27
- package/src/cli-replacement/dev.mts +67 -41
- package/src/dev-utils/dev-logger.mts +94 -20
- package/src/dev-utils/dev-server.mts +3 -11
- package/src/vite-plugin-generate-build-manifest.mts +1 -1
- package/src/vite-plugin-inject-sb-ids-transform.mts +1 -1
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -1,25 +1,66 @@
|
|
|
1
1
|
import { createLogger, format, transports } from "winston";
|
|
2
|
+
const activeTransports = [];
|
|
3
|
+
if (process.env.SUPERBLOCKS_IS_CSB === "true") {
|
|
4
|
+
activeTransports.push(new transports.File({
|
|
5
|
+
format: format.json(),
|
|
6
|
+
filename: `/tmp/dev-server.log`,
|
|
7
|
+
level: "info",
|
|
8
|
+
}));
|
|
9
|
+
}
|
|
10
|
+
activeTransports.push(new transports.Console({
|
|
11
|
+
format: format.combine(format.colorize(), format.timestamp({
|
|
12
|
+
format: "HH:mm:ss.SSS",
|
|
13
|
+
}), format.printf((props) => {
|
|
14
|
+
const { message, timestamp, error, level } = props;
|
|
15
|
+
const base = process.env.SUPERBLOCKS_IS_CSB === "true"
|
|
16
|
+
? `${timestamp} ${message}`
|
|
17
|
+
: `${message}`;
|
|
18
|
+
if (level === "error") {
|
|
19
|
+
return `${base} ${error.message} ${error.stack}`;
|
|
20
|
+
}
|
|
21
|
+
return base;
|
|
22
|
+
})),
|
|
23
|
+
}));
|
|
2
24
|
const winstonLogger = createLogger({
|
|
3
|
-
level: "
|
|
25
|
+
level: "debug",
|
|
4
26
|
exitOnError: false,
|
|
5
27
|
format: format.json(),
|
|
6
|
-
transports:
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
],
|
|
28
|
+
transports: activeTransports,
|
|
29
|
+
});
|
|
30
|
+
const logger = Object.freeze({
|
|
31
|
+
debug: (...messages) => winstonLogger.debug(messages.length > 0 ? messages.join(" ") : messages[0]),
|
|
32
|
+
log: (...messages) => winstonLogger.info(messages.length > 0 ? messages.join(" ") : messages[0]),
|
|
33
|
+
info: (...messages) => winstonLogger.info(messages.length > 0 ? messages.join(" ") : messages[0]),
|
|
34
|
+
warn: (...messages) => winstonLogger.warn(messages.length > 0 ? messages.join(" ") : messages[0]),
|
|
35
|
+
error: (message, meta) => winstonLogger.error(message, meta),
|
|
13
36
|
});
|
|
14
37
|
export function getLogger(loggerOverride) {
|
|
15
38
|
if (!loggerOverride) {
|
|
16
|
-
return
|
|
39
|
+
return logger;
|
|
17
40
|
}
|
|
18
41
|
return {
|
|
19
42
|
debug: loggerOverride,
|
|
20
43
|
info: loggerOverride,
|
|
21
44
|
warn: loggerOverride,
|
|
45
|
+
log: loggerOverride,
|
|
22
46
|
error: loggerOverride,
|
|
23
47
|
};
|
|
24
48
|
}
|
|
49
|
+
export function getErrorMeta(error) {
|
|
50
|
+
if (error instanceof Error) {
|
|
51
|
+
return {
|
|
52
|
+
error: {
|
|
53
|
+
kind: error.name,
|
|
54
|
+
message: error.message,
|
|
55
|
+
stack: error.stack,
|
|
56
|
+
},
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
return {
|
|
60
|
+
error: {
|
|
61
|
+
kind: "Unknown Error",
|
|
62
|
+
message: JSON.stringify(error),
|
|
63
|
+
},
|
|
64
|
+
};
|
|
65
|
+
}
|
|
25
66
|
//# sourceMappingURL=dev-logger.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-logger.mjs","sourceRoot":"","sources":["../../src/dev-utils/dev-logger.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-logger.mjs","sourceRoot":"","sources":["../../src/dev-utils/dev-logger.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.d.mts","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wDAAwD,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AACvF,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAIlC,UAAU,sBAAsB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,cAAc,CAAC;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAKD,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,IAAI,EACJ,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,SAAS,EACT,MAAM,EAAE,cAAc,EACtB,IAAI,GACL,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"dev-server.d.mts","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wDAAwD,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AACvF,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAIlC,UAAU,sBAAsB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,cAAc,CAAC;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAKD,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,IAAI,EACJ,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,SAAS,EACT,MAAM,EAAE,cAAc,EACtB,IAAI,GACL,EAAE,sBAAsB,iFAqLxB"}
|
|
@@ -14,7 +14,7 @@ import { createLogger, createServer, loadEnv } from "vite";
|
|
|
14
14
|
import tsconfigPaths from "vite-tsconfig-paths";
|
|
15
15
|
import pkg from "../../package.json" with { type: "json" };
|
|
16
16
|
import { customComponentsPlugin, isCustomComponentsEnabled, } from "./custom-build.mjs";
|
|
17
|
-
import { getLogger } from "./dev-logger.mjs";
|
|
17
|
+
import { getErrorMeta, getLogger } from "./dev-logger.mjs";
|
|
18
18
|
import { buildManifestStubPlugin } from "./vite-plugin-build-manifest-stub.mjs";
|
|
19
19
|
import { ddRumPlugin } from "./vite-plugin-dd-rum.mjs";
|
|
20
20
|
import { superblocksCdnPlugin } from "./vite-plugin-sb-cdn.mjs";
|
|
@@ -130,13 +130,6 @@ export async function createDevServer({ root, mode, fsOperationQueue, syncServic
|
|
|
130
130
|
res.send(JSON.stringify(healthResponse));
|
|
131
131
|
}, viteReject);
|
|
132
132
|
});
|
|
133
|
-
// TODO(code-mode): remove this soon
|
|
134
|
-
app.get("/_sb_disconnect", async (_req, res) => {
|
|
135
|
-
console.log("GET /_sb_disconnect");
|
|
136
|
-
// TODO(code-mode): should this include any validation checks, such as getting a token?
|
|
137
|
-
await gracefulShutdown({ logger, serverInitiated: false });
|
|
138
|
-
res.send("ok");
|
|
139
|
-
});
|
|
140
133
|
app.post("/_sb_disconnect", async (req, res) => {
|
|
141
134
|
const { initiatedByEmail, switchingTo } = req.body;
|
|
142
135
|
// TODO(code-mode): should this include any validation checks, such as getting a token?
|
|
@@ -150,7 +143,7 @@ export async function createDevServer({ root, mode, fsOperationQueue, syncServic
|
|
|
150
143
|
res.send("ok");
|
|
151
144
|
}
|
|
152
145
|
catch (e) {
|
|
153
|
-
|
|
146
|
+
logger.error("Error disconnecting from dev server", getErrorMeta(e));
|
|
154
147
|
res.status(500).send("Error disconnecting from dev server");
|
|
155
148
|
}
|
|
156
149
|
});
|
|
@@ -185,7 +178,7 @@ export async function createDevServer({ root, mode, fsOperationQueue, syncServic
|
|
|
185
178
|
async function startVite({ app, httpServer, root, mode, port, fsOperationQueue, syncService, lockService, aiService, logger: loggerOverride, }) {
|
|
186
179
|
const viteLogger = createLogger();
|
|
187
180
|
const logger = getLogger(loggerOverride);
|
|
188
|
-
viteLogger.info = logger.info;
|
|
181
|
+
viteLogger.info = (msg) => logger.info(msg);
|
|
189
182
|
viteLogger.warn = (msg) => {
|
|
190
183
|
logger.warn(yellow(msg));
|
|
191
184
|
};
|
|
@@ -258,7 +251,6 @@ async function startVite({ app, httpServer, root, mode, port, fsOperationQueue,
|
|
|
258
251
|
aiService,
|
|
259
252
|
httpServer,
|
|
260
253
|
tracer,
|
|
261
|
-
logger,
|
|
262
254
|
}, { isCustomBuildEnabled }),
|
|
263
255
|
// Add a virtual "stub" module for the build manifest
|
|
264
256
|
buildManifestStubPlugin(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.mjs","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,wCAAwC;AACxC,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,oCAAoC,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,KAAK,MAAM,sBAAsB,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3D,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,GAAG,MAAM,oBAAoB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AAC3D,OAAO,EACL,sBAAsB,EACtB,yBAAyB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-server.mjs","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ export const apiFileBaseName = "api.yaml";
|
|
|
32
32
|
export function generateBuildManifestPlugin(root) {
|
|
33
33
|
const viteLogger = createLogger();
|
|
34
34
|
const logger = getLogger();
|
|
35
|
-
viteLogger.info = logger.info;
|
|
35
|
+
viteLogger.info = (msg) => logger.info(msg);
|
|
36
36
|
viteLogger.warn = (msg) => {
|
|
37
37
|
logger.warn(yellow(msg));
|
|
38
38
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-plugin-generate-build-manifest.mjs","sourceRoot":"","sources":["../src/vite-plugin-generate-build-manifest.mts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,4CAA4C,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,GACvB,MAAM,2DAA2D,CAAC;AACnE,OAAO,EACL,QAAQ,EACR,qBAAqB,GACtB,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,MAAM,WAAW,CAAC;AAC3B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AASvD,MAAM,CAAC,MAAM,iBAAiB,GAAG,UAAU,CAAC;AAC5C,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC;AAQ1C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,2BAA2B,CAAC,IAAY;IACtD,MAAM,UAAU,GAAG,YAAY,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,UAAU,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"vite-plugin-generate-build-manifest.mjs","sourceRoot":"","sources":["../src/vite-plugin-generate-build-manifest.mts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ const routesFileBaseName = "routes.json";
|
|
|
22
22
|
export async function injectSuperblocksIdsPlugin(root) {
|
|
23
23
|
const viteLogger = createLogger();
|
|
24
24
|
const logger = getLogger();
|
|
25
|
-
viteLogger.info = logger.info;
|
|
25
|
+
viteLogger.info = (msg) => logger.info(msg);
|
|
26
26
|
viteLogger.warn = (msg) => {
|
|
27
27
|
logger.warn(yellow(msg));
|
|
28
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-plugin-inject-sb-ids-transform.mjs","sourceRoot":"","sources":["../src/vite-plugin-inject-sb-ids-transform.mts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EACL,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAIvD,MAAM,kBAAkB,GAAG,aAAa,CAAC;AAEzC;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,IAAY;IAC3D,MAAM,UAAU,GAAG,YAAY,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,UAAU,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"vite-plugin-inject-sb-ids-transform.mjs","sourceRoot":"","sources":["../src/vite-plugin-inject-sb-ids-transform.mts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@superblocksteam/sdk",
|
|
3
|
-
"version": "2.0.6-next.
|
|
3
|
+
"version": "2.0.6-next.46",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Superblocks JS SDK",
|
|
6
6
|
"homepage": "https://www.superblocks.com",
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"@opentelemetry/semantic-conventions": "^1.28.0",
|
|
31
31
|
"@rollup/wasm-node": "^4.35.0",
|
|
32
32
|
"@superblocksteam/bucketeer-sdk": "0.5.0",
|
|
33
|
-
"@superblocksteam/library": "2.0.6-next.
|
|
34
|
-
"@superblocksteam/library-shared": "2.0.6-next.
|
|
33
|
+
"@superblocksteam/library": "2.0.6-next.46",
|
|
34
|
+
"@superblocksteam/library-shared": "2.0.6-next.46",
|
|
35
35
|
"@superblocksteam/shared": "0.9198.0",
|
|
36
|
-
"@superblocksteam/util": "2.0.6-next.
|
|
37
|
-
"@superblocksteam/vite-plugin-file-sync": "2.0.6-next.
|
|
36
|
+
"@superblocksteam/util": "2.0.6-next.46",
|
|
37
|
+
"@superblocksteam/vite-plugin-file-sync": "2.0.6-next.46",
|
|
38
38
|
"@vitejs/plugin-react": "^4.3.4",
|
|
39
39
|
"axios": "^1.4.0",
|
|
40
40
|
"chokidar": "^4.0.3",
|
|
@@ -81,7 +81,7 @@ async function buildWithVite({
|
|
|
81
81
|
}) {
|
|
82
82
|
const viteLogger = createLogger();
|
|
83
83
|
const logger = getLogger();
|
|
84
|
-
viteLogger.info = logger.info;
|
|
84
|
+
viteLogger.info = (msg: string) => logger.info(msg);
|
|
85
85
|
viteLogger.warn = (msg: string) => {
|
|
86
86
|
logger.warn(yellow(msg));
|
|
87
87
|
};
|
|
@@ -133,7 +133,7 @@ async function buildWithVite({
|
|
|
133
133
|
logLevel: "info",
|
|
134
134
|
plugins: [
|
|
135
135
|
tsconfigPaths(),
|
|
136
|
-
injectIndexVitePlugin({ assetsCdnUrl
|
|
136
|
+
injectIndexVitePlugin({ assetsCdnUrl }),
|
|
137
137
|
customComponentsPlugin(),
|
|
138
138
|
injectSuperblocksIdsPlugin(root),
|
|
139
139
|
superblocksCdnPlugin({
|
|
@@ -6,7 +6,7 @@ import { resolveCommand, type DetectResult } from "package-manager-detector";
|
|
|
6
6
|
import { detect } from "package-manager-detector/detect";
|
|
7
7
|
import gt from "semver/functions/gt.js";
|
|
8
8
|
import valid from "semver/functions/valid.js";
|
|
9
|
-
import { getLogger } from "../dev-utils/dev-logger.mjs";
|
|
9
|
+
import { getErrorMeta, getLogger } from "../dev-utils/dev-logger.mjs";
|
|
10
10
|
import tracer from "../dev-utils/dev-tracer.js";
|
|
11
11
|
import type { ResponseMeta } from "../socket/handlers.js";
|
|
12
12
|
import type { ApplicationConfig } from "../types/common.js";
|
|
@@ -57,7 +57,7 @@ async function getRemoteVersions(
|
|
|
57
57
|
return data.data;
|
|
58
58
|
} else {
|
|
59
59
|
const error = (await response.json()) as CheckVersionsErrorResponse;
|
|
60
|
-
|
|
60
|
+
logger.error(
|
|
61
61
|
`Could not get latest CLI version: ${error.responseMeta.message}`,
|
|
62
62
|
);
|
|
63
63
|
}
|
|
@@ -70,7 +70,9 @@ async function getRemoteVersions(
|
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
|
|
73
|
-
export async function getCurrentCliVersion(): Promise<
|
|
73
|
+
export async function getCurrentCliVersion(): Promise<
|
|
74
|
+
PackageVersionInfo | undefined
|
|
75
|
+
> {
|
|
74
76
|
try {
|
|
75
77
|
const command = process.platform === "win32" ? "where" : "which";
|
|
76
78
|
const { stdout } = await exec(`${command} superblocks`);
|
|
@@ -87,7 +89,16 @@ export async function getCurrentCliVersion(): Promise<string | undefined> {
|
|
|
87
89
|
/@superblocksteam\/cli(-ephemeral)?\//,
|
|
88
90
|
"",
|
|
89
91
|
);
|
|
90
|
-
|
|
92
|
+
|
|
93
|
+
const aliasMatch = json.cliVersion?.match(/@superblocksteam\/([^\/]+)/);
|
|
94
|
+
if (aliasMatch && aliasMatch[1] !== "cli") {
|
|
95
|
+
return {
|
|
96
|
+
version: version,
|
|
97
|
+
alias: `@superblocksteam/${aliasMatch[1]}`,
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
return { version };
|
|
91
102
|
} catch (error) {
|
|
92
103
|
if (isNativeError(error)) {
|
|
93
104
|
logger.error(`Error getting CLI version: ${error.message}`);
|
|
@@ -106,16 +117,16 @@ export async function getCurrentLibraryVersion(
|
|
|
106
117
|
case "pnpm":
|
|
107
118
|
return await getPnpmLibraryVersion();
|
|
108
119
|
default:
|
|
109
|
-
|
|
120
|
+
logger.error(
|
|
110
121
|
`${pm.agent} is currently not supported for automatic upgrades.`,
|
|
111
122
|
);
|
|
112
123
|
return undefined;
|
|
113
124
|
}
|
|
114
125
|
} catch (error) {
|
|
115
|
-
|
|
126
|
+
logger.error(
|
|
116
127
|
"Could not resolve current library version. Skipping automatic upgrade.",
|
|
128
|
+
getErrorMeta(error),
|
|
117
129
|
);
|
|
118
|
-
console.error(error);
|
|
119
130
|
return undefined;
|
|
120
131
|
}
|
|
121
132
|
}
|
|
@@ -218,21 +229,61 @@ async function upgradePackageWithPackageManager(
|
|
|
218
229
|
pm: DetectResult,
|
|
219
230
|
packageName: string,
|
|
220
231
|
targetVersion: string,
|
|
221
|
-
|
|
232
|
+
{
|
|
233
|
+
alias,
|
|
234
|
+
global,
|
|
235
|
+
}: {
|
|
236
|
+
alias?: string;
|
|
237
|
+
global?: boolean;
|
|
238
|
+
},
|
|
222
239
|
): Promise<void> {
|
|
223
240
|
const packageSpec = alias
|
|
224
241
|
? `@superblocksteam/${packageName}@npm:${alias}@${targetVersion}`
|
|
225
242
|
: `@superblocksteam/${packageName}@${targetVersion}`;
|
|
226
243
|
|
|
227
|
-
const installCommand = resolveCommand(
|
|
244
|
+
const installCommand = resolveCommand(
|
|
245
|
+
pm.agent,
|
|
246
|
+
global ? "global" : "install",
|
|
247
|
+
[packageSpec],
|
|
248
|
+
);
|
|
228
249
|
|
|
229
250
|
if (!installCommand) {
|
|
230
|
-
|
|
251
|
+
logger.error("Could not determine how to upgrade Superblocks packages.");
|
|
231
252
|
return;
|
|
232
253
|
}
|
|
233
254
|
|
|
234
255
|
const { command, args } = installCommand;
|
|
235
|
-
|
|
256
|
+
logger.info(
|
|
257
|
+
`Running ${command} ${args.join(" ")} to upgrade ${packageName}...`,
|
|
258
|
+
);
|
|
259
|
+
let resolver: (value: void | PromiseLike<void>) => void;
|
|
260
|
+
let rejecter: (reason?: any) => void;
|
|
261
|
+
const promise = new Promise<void>((resolve, reject) => {
|
|
262
|
+
resolver = resolve;
|
|
263
|
+
rejecter = reject;
|
|
264
|
+
});
|
|
265
|
+
const cp = child_process.exec(
|
|
266
|
+
`${command} ${args.join(" ")}`,
|
|
267
|
+
{
|
|
268
|
+
cwd: process.cwd(),
|
|
269
|
+
},
|
|
270
|
+
(error) => {
|
|
271
|
+
if (error) {
|
|
272
|
+
logger.error(`Failed to upgrade ${packageName} to ${targetVersion}`);
|
|
273
|
+
rejecter(error);
|
|
274
|
+
} else {
|
|
275
|
+
logger.info(`Successfully upgraded ${packageName} to ${targetVersion}`);
|
|
276
|
+
resolver();
|
|
277
|
+
}
|
|
278
|
+
},
|
|
279
|
+
);
|
|
280
|
+
cp.stdout?.on("data", (data) => {
|
|
281
|
+
logger.info(data);
|
|
282
|
+
});
|
|
283
|
+
cp.stderr?.on("data", (data) => {
|
|
284
|
+
logger.warn(data);
|
|
285
|
+
});
|
|
286
|
+
return promise;
|
|
236
287
|
}
|
|
237
288
|
|
|
238
289
|
export async function getCurrentLibraryVersionWithoutPM(): Promise<
|
|
@@ -257,11 +308,16 @@ export async function getCurrentLibraryVersionWithoutPM(): Promise<
|
|
|
257
308
|
export async function checkVersionsAndUpgrade(
|
|
258
309
|
lockService: LockService,
|
|
259
310
|
config?: ApplicationConfig,
|
|
260
|
-
) {
|
|
311
|
+
): Promise<{
|
|
312
|
+
cliUpdated: boolean;
|
|
313
|
+
libraryUpdated: boolean;
|
|
314
|
+
}> {
|
|
261
315
|
const cliUpdated = false;
|
|
262
316
|
const libraryUpdated = false;
|
|
263
317
|
let hasFailedToUpgrade = false;
|
|
264
318
|
|
|
319
|
+
logger.info("Checking versions");
|
|
320
|
+
|
|
265
321
|
await traceFunction({
|
|
266
322
|
name: "checkVersionsAndUpgrade",
|
|
267
323
|
tracer,
|
|
@@ -286,7 +342,7 @@ export async function checkVersionsAndUpgrade(
|
|
|
286
342
|
if (!pm || !config?.id) return;
|
|
287
343
|
|
|
288
344
|
// Get current versions
|
|
289
|
-
const
|
|
345
|
+
const currentCliInfo = await traceFunction({
|
|
290
346
|
name: "getCurrentCliVersion",
|
|
291
347
|
tracer,
|
|
292
348
|
fn: async () => {
|
|
@@ -303,10 +359,10 @@ export async function checkVersionsAndUpgrade(
|
|
|
303
359
|
|
|
304
360
|
// Skip if we're in local development
|
|
305
361
|
if (
|
|
306
|
-
!
|
|
307
|
-
!valid(
|
|
308
|
-
|
|
309
|
-
|
|
362
|
+
!currentCliInfo ||
|
|
363
|
+
!valid(currentCliInfo.version) ||
|
|
364
|
+
currentCliInfo.version.startsWith("file:") ||
|
|
365
|
+
currentCliInfo.version.startsWith("link:") ||
|
|
310
366
|
!currentLibraryInfo ||
|
|
311
367
|
!valid(currentLibraryInfo.version) ||
|
|
312
368
|
currentLibraryInfo.version.startsWith("file:") ||
|
|
@@ -331,16 +387,16 @@ export async function checkVersionsAndUpgrade(
|
|
|
331
387
|
// If version is latest, then semver can throw an error
|
|
332
388
|
// Check if CLI needs upgrade
|
|
333
389
|
cliNeedsUpgrade =
|
|
334
|
-
targetVersions.cli && gt(targetVersions.cli,
|
|
390
|
+
targetVersions.cli && gt(targetVersions.cli, currentCliInfo.version);
|
|
335
391
|
|
|
336
392
|
// Check if library needs upgrade
|
|
337
393
|
libraryNeedsUpgrade =
|
|
338
394
|
targetVersions.library &&
|
|
339
395
|
gt(targetVersions.library, currentLibraryInfo.version);
|
|
340
396
|
} catch (error) {
|
|
341
|
-
|
|
397
|
+
logger.error(
|
|
342
398
|
"Error checking versions to upgrade, releasing lock and exiting",
|
|
343
|
-
error,
|
|
399
|
+
getErrorMeta(error),
|
|
344
400
|
);
|
|
345
401
|
await traceFunction({
|
|
346
402
|
name: "shutdownLockService",
|
|
@@ -364,6 +420,10 @@ export async function checkVersionsAndUpgrade(
|
|
|
364
420
|
|
|
365
421
|
// Upgrade CLI if needed
|
|
366
422
|
if (cliNeedsUpgrade) {
|
|
423
|
+
logger.info(
|
|
424
|
+
`Beginning CLI upgrade from ${currentCliInfo.version} to ${targetVersions.cli}`,
|
|
425
|
+
);
|
|
426
|
+
|
|
367
427
|
const oclifUpgradeSucceeded = await traceFunction({
|
|
368
428
|
name: "upgradeCliWithOclif",
|
|
369
429
|
tracer,
|
|
@@ -372,15 +432,20 @@ export async function checkVersionsAndUpgrade(
|
|
|
372
432
|
},
|
|
373
433
|
});
|
|
374
434
|
if (!oclifUpgradeSucceeded) {
|
|
435
|
+
logger.info(`Falling back to package manager upgrade for CLI`);
|
|
375
436
|
// Fall back to package manager upgrade
|
|
376
437
|
await traceFunction({
|
|
377
|
-
name: "upgradePackageWithPackageManager",
|
|
438
|
+
name: "upgradePackageWithPackageManager - cli",
|
|
378
439
|
tracer,
|
|
379
440
|
fn: async () => {
|
|
380
441
|
await upgradePackageWithPackageManager(
|
|
381
442
|
pm,
|
|
382
443
|
"cli",
|
|
383
444
|
targetVersions.cli,
|
|
445
|
+
{
|
|
446
|
+
alias: currentCliInfo.alias,
|
|
447
|
+
global: true,
|
|
448
|
+
},
|
|
384
449
|
);
|
|
385
450
|
},
|
|
386
451
|
});
|
|
@@ -390,15 +455,21 @@ export async function checkVersionsAndUpgrade(
|
|
|
390
455
|
|
|
391
456
|
// Upgrade library if needed
|
|
392
457
|
if (libraryNeedsUpgrade) {
|
|
458
|
+
logger.info(
|
|
459
|
+
`Beginning library upgrade from ${currentLibraryInfo.version} to ${targetVersions.library}`,
|
|
460
|
+
);
|
|
393
461
|
await traceFunction({
|
|
394
|
-
name: "upgradePackageWithPackageManager",
|
|
462
|
+
name: "upgradePackageWithPackageManager - library",
|
|
395
463
|
tracer,
|
|
396
464
|
fn: async () => {
|
|
397
465
|
await upgradePackageWithPackageManager(
|
|
398
466
|
pm,
|
|
399
467
|
"library",
|
|
400
468
|
targetVersions.library,
|
|
401
|
-
|
|
469
|
+
{
|
|
470
|
+
alias: currentLibraryInfo.alias,
|
|
471
|
+
global: false,
|
|
472
|
+
},
|
|
402
473
|
);
|
|
403
474
|
},
|
|
404
475
|
});
|
|
@@ -414,6 +485,8 @@ export async function checkVersionsAndUpgrade(
|
|
|
414
485
|
logger.info("@superblocksteam/cli has been updated.");
|
|
415
486
|
} else if (libraryUpdated) {
|
|
416
487
|
logger.info("@superblocksteam/library has been updated.");
|
|
488
|
+
} else {
|
|
489
|
+
logger.info("No upgrades needed");
|
|
417
490
|
}
|
|
418
491
|
},
|
|
419
492
|
});
|
|
@@ -421,9 +494,10 @@ export async function checkVersionsAndUpgrade(
|
|
|
421
494
|
// Restart CLI if anything was updated
|
|
422
495
|
if (hasFailedToUpgrade) {
|
|
423
496
|
process.exit(1);
|
|
424
|
-
} else if (cliUpdated || libraryUpdated) {
|
|
425
|
-
logger.info("Restarting the CLI…");
|
|
426
|
-
await lockService.releaseLock();
|
|
427
|
-
process.exit(AUTO_UPGRADE_EXIT_CODE);
|
|
428
497
|
}
|
|
498
|
+
|
|
499
|
+
return {
|
|
500
|
+
cliUpdated,
|
|
501
|
+
libraryUpdated,
|
|
502
|
+
};
|
|
429
503
|
}
|