@superblocksteam/sdk 2.0.6-next.10 → 2.0.6-next.100
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 +6 -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 +114 -49
- 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 +57 -32
- package/dist/cli-replacement/dev.mjs.map +1 -1
- package/dist/client.d.ts +34 -0
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +92 -1
- package/dist/client.js.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 +8 -12
- package/dist/dev-utils/dev-server.mjs.map +1 -1
- package/dist/dev-utils/dev-tracer.d.ts +2 -0
- package/dist/dev-utils/dev-tracer.d.ts.map +1 -1
- package/dist/dev-utils/dev-tracer.js +42 -35
- package/dist/dev-utils/dev-tracer.js.map +1 -1
- package/dist/dev-utils/vite-plugin-build-manifest-stub.d.mts +10 -0
- package/dist/dev-utils/vite-plugin-build-manifest-stub.d.mts.map +1 -0
- package/dist/dev-utils/vite-plugin-build-manifest-stub.mjs +27 -0
- package/dist/dev-utils/vite-plugin-build-manifest-stub.mjs.map +1 -0
- package/dist/dev-utils/vite-plugin-sb-cdn.d.mts.map +1 -1
- package/dist/dev-utils/vite-plugin-sb-cdn.mjs +13 -3
- package/dist/dev-utils/vite-plugin-sb-cdn.mjs.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/vite-plugin-generate-build-manifest.d.mts +21 -0
- package/dist/vite-plugin-generate-build-manifest.d.mts.map +1 -0
- package/dist/vite-plugin-generate-build-manifest.mjs +131 -0
- package/dist/vite-plugin-generate-build-manifest.mjs.map +1 -0
- 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 +6 -4
- package/src/application-build.mts +6 -3
- package/src/cli-replacement/automatic-upgrades.ts +158 -59
- package/src/cli-replacement/dev.mts +77 -43
- package/src/client.ts +115 -0
- package/src/dev-utils/dev-logger.mts +94 -20
- package/src/dev-utils/dev-server.mts +10 -12
- package/src/dev-utils/dev-tracer.ts +48 -37
- package/src/dev-utils/vite-plugin-build-manifest-stub.mts +30 -0
- package/src/dev-utils/vite-plugin-sb-cdn.mts +14 -3
- package/src/index.ts +4 -0
- package/src/vite-plugin-generate-build-manifest.mts +193 -0
- package/src/vite-plugin-inject-sb-ids-transform.mts +1 -1
- package/test/clients.test.mts +120 -0
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -9,6 +9,7 @@ import { customComponentsPlugin } from "./dev-utils/custom-build.mjs";
|
|
|
9
9
|
import { getLogger } from "./dev-utils/dev-logger.mjs";
|
|
10
10
|
import { ddRumPlugin } from "./dev-utils/vite-plugin-dd-rum.mjs";
|
|
11
11
|
import { superblocksCdnPlugin } from "./dev-utils/vite-plugin-sb-cdn.mjs";
|
|
12
|
+
import { generateBuildManifestPlugin } from "./vite-plugin-generate-build-manifest.mjs";
|
|
12
13
|
import { injectSuperblocksIdsPlugin } from "./vite-plugin-inject-sb-ids-transform.mjs";
|
|
13
14
|
export async function buildApplication({ root, dest, mode, libraryUrl, assetsCdnUrl, ddClientToken, ddApplicationId, ddEnv, ddVersion, }) {
|
|
14
15
|
const cwd = process.cwd();
|
|
@@ -38,7 +39,7 @@ export async function buildApplication({ root, dest, mode, libraryUrl, assetsCdn
|
|
|
38
39
|
async function buildWithVite({ root, dest, mode, libraryUrl, assetsCdnUrl, ddClientToken, ddApplicationId, ddEnv, ddVersion, }) {
|
|
39
40
|
const viteLogger = createLogger();
|
|
40
41
|
const logger = getLogger();
|
|
41
|
-
viteLogger.info = logger.info;
|
|
42
|
+
viteLogger.info = (msg) => logger.info(msg);
|
|
42
43
|
viteLogger.warn = (msg) => {
|
|
43
44
|
logger.warn(yellow(msg));
|
|
44
45
|
};
|
|
@@ -87,7 +88,7 @@ async function buildWithVite({ root, dest, mode, libraryUrl, assetsCdnUrl, ddCli
|
|
|
87
88
|
logLevel: "info",
|
|
88
89
|
plugins: [
|
|
89
90
|
tsconfigPaths(),
|
|
90
|
-
injectIndexVitePlugin({ assetsCdnUrl
|
|
91
|
+
injectIndexVitePlugin({ assetsCdnUrl }),
|
|
91
92
|
customComponentsPlugin(),
|
|
92
93
|
injectSuperblocksIdsPlugin(root),
|
|
93
94
|
superblocksCdnPlugin({
|
|
@@ -95,12 +96,15 @@ async function buildWithVite({ root, dest, mode, libraryUrl, assetsCdnUrl, ddCli
|
|
|
95
96
|
"@superblocksteam/library": `${libraryUrl}/index.js`,
|
|
96
97
|
"react/jsx-runtime": "https://esm.sh/react@18.2.0/jsx-runtime.mjs",
|
|
97
98
|
"react/jsx-dev-runtime": "https://esm.sh/react@18.2.0/jsx-dev-runtime.mjs",
|
|
99
|
+
"./user-facing/build-manifest.js": "/assets/build-manifest.js",
|
|
100
|
+
"/assets/user-facing/build-manifest.js": "/assets/build-manifest.js",
|
|
98
101
|
},
|
|
99
102
|
cssImports: {
|
|
100
103
|
"@superblocksteam/library/index.css": `${libraryUrl}/index.css`,
|
|
101
104
|
},
|
|
102
105
|
}),
|
|
103
106
|
react(),
|
|
107
|
+
generateBuildManifestPlugin(root),
|
|
104
108
|
ddRumPlugin({
|
|
105
109
|
clientToken: ddClientToken ?? "",
|
|
106
110
|
applicationId: ddApplicationId ?? "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application-build.mjs","sourceRoot":"","sources":["../src/application-build.mts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,KAAK,MAAM,sBAAsB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"application-build.mjs","sourceRoot":"","sources":["../src/application-build.mts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,KAAK,MAAM,sBAAsB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAC;AACxF,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAEvF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACrC,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,YAAY,EACZ,aAAa,EACb,eAAe,EACf,KAAK,EACL,SAAS,GAWV;IACC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,IAAI,CAAC;QACH,sEAAsE;QACtE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,kBAAkB,CAAC,CAAC;QAC7D,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpB,MAAM,aAAa,CAAC;YAClB,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;YAC3B,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;YAC3B,IAAI;YACJ,UAAU;YACV,YAAY;YACZ,aAAa;YACb,eAAe;YACf,KAAK;YACL,SAAS;SACV,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,0DAA0D;QAC1D,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,EAC3B,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,YAAY,EACZ,aAAa,EACb,eAAe,EACf,KAAK,EACL,SAAS,GAWV;IACC,MAAM,UAAU,GAAG,YAAY,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,UAAU,CAAC,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpD,UAAU,CAAC,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE;QAChC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,CAAC,CAAC;IACF,UAAU,CAAC,QAAQ,GAAG,CAAC,GAAW,EAAE,EAAE;QACpC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,CAAC,CAAC;IACF,UAAU,CAAC,KAAK,GAAG,CAAC,GAAW,EAAE,EAAE;QACjC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,UAAU,CAAC,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IAElC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/C,MAAM,KAAK,CAAC;QACV,IAAI;QACJ,IAAI;QACJ,OAAO,EAAE,KAAK;QACd,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,cAAc,EAAE,0BAA0B;aAC3C;SACF;QACD,WAAW,EAAE,IAAI;QACjB,YAAY,EAAE;YACZ,OAAO,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC;YAC/B,OAAO,EAAE,EAAE;SACZ;QACD,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;YACZ,WAAW,EAAE,IAAI;YACjB,KAAK,EAAE,IAAI;YACX,eAAe,EAAE;gBACf,OAAO,EAAE,CAAC,UAAU,CAAC;gBACrB,uBAAuB,EAAE,IAAI;aAC9B;YACD,aAAa,EAAE;gBACb,QAAQ,EAAE;oBACR,GAAG,YAAY,OAAO;oBACtB,OAAO;oBACP,WAAW;oBACX,mBAAmB;oBACnB,uBAAuB;iBACxB;gBACD,uBAAuB,EAAE,iBAAiB;gBAC1C,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;aAC1B;SACF;QACD,QAAQ,EAAE,MAAM;QAChB,OAAO,EAAE;YACP,aAAa,EAAE;YACf,qBAAqB,CAAC,EAAE,YAAY,EAAE,CAAC;YACvC,sBAAsB,EAAE;YACxB,0BAA0B,CAAC,IAAI,CAAC;YAChC,oBAAoB,CAAC;gBACnB,OAAO,EAAE;oBACP,0BAA0B,EAAE,GAAG,UAAU,WAAW;oBACpD,mBAAmB,EAAE,6CAA6C;oBAClE,uBAAuB,EACrB,iDAAiD;oBACnD,iCAAiC,EAAE,2BAA2B;oBAC9D,uCAAuC,EAAE,2BAA2B;iBACrE;gBACD,UAAU,EAAE;oBACV,oCAAoC,EAAE,GAAG,UAAU,YAAY;iBAChE;aACF,CAAC;YACF,KAAK,EAAE;YACP,2BAA2B,CAAC,IAAI,CAAC;YAEjC,WAAW,CAAC;gBACV,WAAW,EAAE,aAAa,IAAI,EAAE;gBAChC,aAAa,EAAE,eAAe,IAAI,EAAE;gBACpC,GAAG,EAAE,KAAK,IAAI,MAAM;gBACpB,OAAO,EAAE,SAAS,IAAI,OAAO;aAC9B,CAAC;SACH;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -6,9 +6,12 @@ interface PackageVersionInfo {
|
|
|
6
6
|
version: string;
|
|
7
7
|
alias?: string;
|
|
8
8
|
}
|
|
9
|
-
export declare function getCurrentCliVersion(): Promise<
|
|
9
|
+
export declare function getCurrentCliVersion(): Promise<PackageVersionInfo | undefined>;
|
|
10
10
|
export declare function getCurrentLibraryVersion(pm: DetectResult): Promise<PackageVersionInfo | undefined>;
|
|
11
11
|
export declare function getCurrentLibraryVersionWithoutPM(): Promise<PackageVersionInfo | undefined>;
|
|
12
|
-
export declare function checkVersionsAndUpgrade(lockService: LockService, config?: ApplicationConfig): Promise<
|
|
12
|
+
export declare function checkVersionsAndUpgrade(lockService: LockService, config?: ApplicationConfig): Promise<{
|
|
13
|
+
cliUpdated: boolean;
|
|
14
|
+
libraryUpdated: boolean;
|
|
15
|
+
}>;
|
|
13
16
|
export {};
|
|
14
17
|
//# sourceMappingURL=automatic-upgrades.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automatic-upgrades.d.ts","sourceRoot":"","sources":["../../src/cli-replacement/automatic-upgrades.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAO7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AAEvF,eAAO,MAAM,sBAAsB,KAAK,CAAC;AASzC,UAAU,kBAAkB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AA8CD,wBAAsB,oBAAoB,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"automatic-upgrades.d.ts","sourceRoot":"","sources":["../../src/cli-replacement/automatic-upgrades.ts"],"names":[],"mappings":"AAIA,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAO7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AAEvF,eAAO,MAAM,sBAAsB,KAAK,CAAC;AASzC,UAAU,kBAAkB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AA8CD,wBAAsB,oBAAoB,IAAI,OAAO,CACnD,kBAAkB,GAAG,SAAS,CAC/B,CAiCA;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,YAAY,GACf,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAoBzC;AAsKD,wBAAsB,iCAAiC,IAAI,OAAO,CAChE,kBAAkB,GAAG,SAAS,CAC/B,CAeA;AAED,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,WAAW,EACxB,MAAM,CAAC,EAAE,iBAAiB,GACzB,OAAO,CAAC;IACT,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC,CA6MD"}
|
|
@@ -6,7 +6,7 @@ import { resolveCommand } 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
|
export const AUTO_UPGRADE_EXIT_CODE = 99;
|
|
12
12
|
const exec = promisify(child_process.exec);
|
|
@@ -24,7 +24,7 @@ async function getRemoteVersions(config) {
|
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
26
|
const error = (await response.json());
|
|
27
|
-
|
|
27
|
+
logger.error(`Could not get latest CLI version: ${error.responseMeta.message}`);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
catch (error) {
|
|
@@ -47,7 +47,14 @@ export async function getCurrentCliVersion() {
|
|
|
47
47
|
const json = JSON.parse(versionOutput);
|
|
48
48
|
// Extract version from string like "@superblocksteam/cli/2.0.0-next.1" or "@superblocksteam/cli-ephemeral/2.0.0-SNAPSHOT.1749077365"
|
|
49
49
|
const version = json.cliVersion?.replace(/@superblocksteam\/cli(-ephemeral)?\//, "");
|
|
50
|
-
|
|
50
|
+
const aliasMatch = json.cliVersion?.match(/@superblocksteam\/([^\/]+)/);
|
|
51
|
+
if (aliasMatch && aliasMatch[1] !== "cli") {
|
|
52
|
+
return {
|
|
53
|
+
version: version,
|
|
54
|
+
alias: `@superblocksteam/${aliasMatch[1]}`,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
return { version };
|
|
51
58
|
}
|
|
52
59
|
catch (error) {
|
|
53
60
|
if (isNativeError(error)) {
|
|
@@ -64,13 +71,12 @@ export async function getCurrentLibraryVersion(pm) {
|
|
|
64
71
|
case "pnpm":
|
|
65
72
|
return await getPnpmLibraryVersion();
|
|
66
73
|
default:
|
|
67
|
-
|
|
74
|
+
logger.error(`${pm.agent} is currently not supported for automatic upgrades.`);
|
|
68
75
|
return undefined;
|
|
69
76
|
}
|
|
70
77
|
}
|
|
71
78
|
catch (error) {
|
|
72
|
-
|
|
73
|
-
console.error(error);
|
|
79
|
+
logger.error("Could not resolve current library version. Skipping automatic upgrade.", getErrorMeta(error));
|
|
74
80
|
return undefined;
|
|
75
81
|
}
|
|
76
82
|
}
|
|
@@ -143,8 +149,8 @@ async function upgradeCliWithOclif(targetVersion) {
|
|
|
143
149
|
const superblocksPath = stdout.trim();
|
|
144
150
|
if (!superblocksPath)
|
|
145
151
|
return false;
|
|
146
|
-
const { stdout: updateOutput } = await exec(`${superblocksPath} update --version=${targetVersion}`);
|
|
147
|
-
return !updateOutput.includes("not updatable");
|
|
152
|
+
const { stdout: updateOutput, stderr: updateErrorOutput } = await exec(`${superblocksPath} update --version=${targetVersion}`);
|
|
153
|
+
return !(updateOutput + updateErrorOutput).includes("not updatable");
|
|
148
154
|
}
|
|
149
155
|
catch (error) {
|
|
150
156
|
if (isNativeError(error)) {
|
|
@@ -153,17 +159,50 @@ async function upgradeCliWithOclif(targetVersion) {
|
|
|
153
159
|
return false;
|
|
154
160
|
}
|
|
155
161
|
}
|
|
156
|
-
async function upgradePackageWithPackageManager(pm, packageName, targetVersion, alias) {
|
|
162
|
+
async function upgradePackageWithPackageManager(pm, packageName, targetVersion, { alias, global, }) {
|
|
157
163
|
const packageSpec = alias
|
|
158
164
|
? `@superblocksteam/${packageName}@npm:${alias}@${targetVersion}`
|
|
159
165
|
: `@superblocksteam/${packageName}@${targetVersion}`;
|
|
160
|
-
|
|
166
|
+
// --prefer-offline will skip some staleness checks that are slow
|
|
167
|
+
const installArgs = [packageSpec, "--fund=false"];
|
|
168
|
+
if (pm.agent === "npm") {
|
|
169
|
+
installArgs.push("--audit=false");
|
|
170
|
+
}
|
|
171
|
+
if (packageName === "cli") {
|
|
172
|
+
installArgs.push("--force");
|
|
173
|
+
}
|
|
174
|
+
const installCommand = resolveCommand(pm.agent, global ? "global" : "install", installArgs);
|
|
161
175
|
if (!installCommand) {
|
|
162
|
-
|
|
176
|
+
logger.error("Could not determine how to upgrade Superblocks packages.");
|
|
163
177
|
return;
|
|
164
178
|
}
|
|
165
179
|
const { command, args } = installCommand;
|
|
166
|
-
|
|
180
|
+
logger.info(`Running ${command} ${args.join(" ")} to upgrade ${packageName}...`);
|
|
181
|
+
let resolver;
|
|
182
|
+
let rejecter;
|
|
183
|
+
const promise = new Promise((resolve, reject) => {
|
|
184
|
+
resolver = resolve;
|
|
185
|
+
rejecter = reject;
|
|
186
|
+
});
|
|
187
|
+
const cp = child_process.exec(`${command} ${args.join(" ")}`, {
|
|
188
|
+
cwd: process.cwd(),
|
|
189
|
+
}, (error) => {
|
|
190
|
+
if (error) {
|
|
191
|
+
logger.error(`Failed to upgrade ${packageName} to ${targetVersion}`);
|
|
192
|
+
rejecter(error);
|
|
193
|
+
}
|
|
194
|
+
else {
|
|
195
|
+
logger.info(`Successfully upgraded ${packageName} to ${targetVersion}`);
|
|
196
|
+
resolver();
|
|
197
|
+
}
|
|
198
|
+
});
|
|
199
|
+
cp.stdout?.on("data", (data) => {
|
|
200
|
+
logger.info(data);
|
|
201
|
+
});
|
|
202
|
+
cp.stderr?.on("data", (data) => {
|
|
203
|
+
logger.warn(data);
|
|
204
|
+
});
|
|
205
|
+
return promise;
|
|
167
206
|
}
|
|
168
207
|
export async function getCurrentLibraryVersionWithoutPM() {
|
|
169
208
|
// Detect package manager
|
|
@@ -184,6 +223,7 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
184
223
|
const cliUpdated = false;
|
|
185
224
|
const libraryUpdated = false;
|
|
186
225
|
let hasFailedToUpgrade = false;
|
|
226
|
+
logger.info("Checking versions");
|
|
187
227
|
await traceFunction({
|
|
188
228
|
name: "checkVersionsAndUpgrade",
|
|
189
229
|
tracer,
|
|
@@ -207,7 +247,7 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
207
247
|
if (!pm || !config?.id)
|
|
208
248
|
return;
|
|
209
249
|
// Get current versions
|
|
210
|
-
const
|
|
250
|
+
const currentCliInfo = await traceFunction({
|
|
211
251
|
name: "getCurrentCliVersion",
|
|
212
252
|
tracer,
|
|
213
253
|
fn: async () => {
|
|
@@ -222,10 +262,10 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
222
262
|
},
|
|
223
263
|
});
|
|
224
264
|
// Skip if we're in local development
|
|
225
|
-
if (!
|
|
226
|
-
!valid(
|
|
227
|
-
|
|
228
|
-
|
|
265
|
+
if (!currentCliInfo ||
|
|
266
|
+
!valid(currentCliInfo.version) ||
|
|
267
|
+
currentCliInfo.version.startsWith("file:") ||
|
|
268
|
+
currentCliInfo.version.startsWith("link:") ||
|
|
229
269
|
!currentLibraryInfo ||
|
|
230
270
|
!valid(currentLibraryInfo.version) ||
|
|
231
271
|
currentLibraryInfo.version.startsWith("file:") ||
|
|
@@ -248,14 +288,14 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
248
288
|
// If version is latest, then semver can throw an error
|
|
249
289
|
// Check if CLI needs upgrade
|
|
250
290
|
cliNeedsUpgrade =
|
|
251
|
-
targetVersions.cli && gt(targetVersions.cli,
|
|
291
|
+
targetVersions.cli && gt(targetVersions.cli, currentCliInfo.version);
|
|
252
292
|
// Check if library needs upgrade
|
|
253
293
|
libraryNeedsUpgrade =
|
|
254
294
|
targetVersions.library &&
|
|
255
295
|
gt(targetVersions.library, currentLibraryInfo.version);
|
|
256
296
|
}
|
|
257
297
|
catch (error) {
|
|
258
|
-
|
|
298
|
+
logger.error("Error checking versions to upgrade, releasing lock and exiting", getErrorMeta(error));
|
|
259
299
|
await traceFunction({
|
|
260
300
|
name: "shutdownLockService",
|
|
261
301
|
tracer,
|
|
@@ -273,37 +313,60 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
273
313
|
}
|
|
274
314
|
let cliUpdated = false;
|
|
275
315
|
let libraryUpdated = false;
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
316
|
+
try {
|
|
317
|
+
const upgradePromises = [];
|
|
318
|
+
if (cliNeedsUpgrade) {
|
|
319
|
+
const cliUpgradePromise = traceFunction({
|
|
320
|
+
name: "upgradeCli",
|
|
321
|
+
tracer,
|
|
322
|
+
fn: async () => {
|
|
323
|
+
logger.info(`Beginning CLI upgrade from ${currentCliInfo.version} to ${targetVersions.cli}`);
|
|
324
|
+
const oclifUpgradeSucceeded = await traceFunction({
|
|
325
|
+
name: "upgradeCliWithOclif",
|
|
326
|
+
tracer,
|
|
327
|
+
fn: async () => {
|
|
328
|
+
return await upgradeCliWithOclif(targetVersions.cli);
|
|
329
|
+
},
|
|
330
|
+
});
|
|
331
|
+
if (!oclifUpgradeSucceeded) {
|
|
332
|
+
logger.info(`Falling back to package manager upgrade for CLI`);
|
|
333
|
+
// Fall back to package manager upgrade
|
|
334
|
+
await traceFunction({
|
|
335
|
+
name: "upgradePackageWithPackageManager - cli",
|
|
336
|
+
tracer,
|
|
337
|
+
fn: async () => {
|
|
338
|
+
await upgradePackageWithPackageManager(pm, "cli", targetVersions.cli, {
|
|
339
|
+
alias: currentCliInfo.alias,
|
|
340
|
+
global: true,
|
|
341
|
+
});
|
|
342
|
+
},
|
|
343
|
+
});
|
|
344
|
+
cliUpdated = true;
|
|
345
|
+
}
|
|
346
|
+
},
|
|
347
|
+
});
|
|
348
|
+
upgradePromises.push(cliUpgradePromise);
|
|
349
|
+
}
|
|
350
|
+
if (libraryNeedsUpgrade) {
|
|
351
|
+
const libraryUpgradePromise = traceFunction({
|
|
352
|
+
name: "upgradePackageWithPackageManager - library",
|
|
289
353
|
tracer,
|
|
290
354
|
fn: async () => {
|
|
291
|
-
|
|
355
|
+
logger.info(`Beginning library upgrade from ${currentLibraryInfo.version} to ${targetVersions.library}`);
|
|
356
|
+
await upgradePackageWithPackageManager(pm, "library", targetVersions.library, {
|
|
357
|
+
alias: currentLibraryInfo.alias,
|
|
358
|
+
global: false,
|
|
359
|
+
});
|
|
360
|
+
libraryUpdated = true;
|
|
292
361
|
},
|
|
293
362
|
});
|
|
294
|
-
|
|
363
|
+
upgradePromises.push(libraryUpgradePromise);
|
|
295
364
|
}
|
|
365
|
+
await Promise.all(upgradePromises);
|
|
296
366
|
}
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
name: "upgradePackageWithPackageManager",
|
|
301
|
-
tracer,
|
|
302
|
-
fn: async () => {
|
|
303
|
-
await upgradePackageWithPackageManager(pm, "library", targetVersions.library, currentLibraryInfo.alias);
|
|
304
|
-
},
|
|
305
|
-
});
|
|
306
|
-
libraryUpdated = true;
|
|
367
|
+
catch (error) {
|
|
368
|
+
logger.error("Error upgrading packages, releasing lock and exiting", getErrorMeta(error));
|
|
369
|
+
hasFailedToUpgrade = true;
|
|
307
370
|
}
|
|
308
371
|
// Log what was updated
|
|
309
372
|
if (cliUpdated && libraryUpdated) {
|
|
@@ -315,16 +378,18 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
315
378
|
else if (libraryUpdated) {
|
|
316
379
|
logger.info("@superblocksteam/library has been updated.");
|
|
317
380
|
}
|
|
381
|
+
else {
|
|
382
|
+
logger.info("No upgrades needed");
|
|
383
|
+
}
|
|
318
384
|
},
|
|
319
385
|
});
|
|
320
386
|
// Restart CLI if anything was updated
|
|
321
387
|
if (hasFailedToUpgrade) {
|
|
322
388
|
process.exit(1);
|
|
323
389
|
}
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
}
|
|
390
|
+
return {
|
|
391
|
+
cliUpdated,
|
|
392
|
+
libraryUpdated,
|
|
393
|
+
};
|
|
329
394
|
}
|
|
330
395
|
//# sourceMappingURL=automatic-upgrades.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automatic-upgrades.js","sourceRoot":"","sources":["../../src/cli-replacement/automatic-upgrades.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"automatic-upgrades.js","sourceRoot":"","sources":["../../src/cli-replacement/automatic-upgrades.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,14 +2,13 @@ import "../dev-utils/dev-tracer.js";
|
|
|
2
2
|
import type { ApplicationConfig } from "../types/common.js";
|
|
3
3
|
export declare function dev(options: {
|
|
4
4
|
cwd: string;
|
|
5
|
-
pidfilePath?: string;
|
|
6
5
|
devServerPort?: number;
|
|
7
6
|
uploadFirst?: boolean;
|
|
8
7
|
downloadFirst?: boolean;
|
|
9
8
|
skipSync?: boolean;
|
|
10
9
|
applicationConfig?: ApplicationConfig;
|
|
11
10
|
superblocksPath?: string;
|
|
12
|
-
logger?: (
|
|
11
|
+
logger?: (...messages: (string | Error)[]) => void;
|
|
13
12
|
skipAutoUpgrade?: boolean;
|
|
14
13
|
signal?: AbortSignal;
|
|
15
14
|
}): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.mts","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AA8BpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AA8D5D,wBAAsB,GAAG,CAAC,OAAO,EAAE;IAEjC,GAAG,EAAE,MAAM,CAAC;IACZ,
|
|
1
|
+
{"version":3,"file":"dev.d.mts","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AA8BpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AA8D5D,wBAAsB,GAAG,CAAC,OAAO,EAAE;IAEjC,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,CAAC,EAAE,MAAM,CAAC;IAGvB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IAGtC,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,MAAM,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,EAAE,KAAK,IAAI,CAAC;IAGnD,eAAe,CAAC,EAAE,OAAO,CAAC;IAG1B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,iBA8NA"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import "../dev-utils/dev-tracer.js";
|
|
2
2
|
import * as child_process from "node:child_process";
|
|
3
|
-
import * as fsp from "node:fs/promises";
|
|
4
3
|
import path from "node:path";
|
|
5
4
|
import { promisify } from "node:util";
|
|
6
5
|
import { maskUnixSignals } from "@superblocksteam/util";
|
|
@@ -13,11 +12,12 @@ import { diffJson } from "diff";
|
|
|
13
12
|
import fs from "fs-extra";
|
|
14
13
|
import { resolveCommand } from "package-manager-detector";
|
|
15
14
|
import { detect } from "package-manager-detector/detect";
|
|
16
|
-
import { getLogger } from "../dev-utils/dev-logger.mjs";
|
|
15
|
+
import { getErrorMeta, getLogger } from "../dev-utils/dev-logger.mjs";
|
|
17
16
|
import { createDevServer } from "../dev-utils/dev-server.mjs";
|
|
18
|
-
import tracer from "../dev-utils/dev-tracer.js";
|
|
17
|
+
import tracer, { initializeTracingSdk } from "../dev-utils/dev-tracer.js";
|
|
19
18
|
import { SuperblocksSdk } from "../sdk.js";
|
|
20
19
|
import { checkVersionsAndUpgrade, getCurrentCliVersion, getCurrentLibraryVersionWithoutPM, } from "./automatic-upgrades.js";
|
|
20
|
+
import { AUTO_UPGRADE_EXIT_CODE } from "./automatic-upgrades.js";
|
|
21
21
|
const exec = promisify(child_process.exec);
|
|
22
22
|
const passErrorToVSCode = (message, logger) => {
|
|
23
23
|
if (message) {
|
|
@@ -66,17 +66,16 @@ async function installPackages(cwd, logger) {
|
|
|
66
66
|
}
|
|
67
67
|
export async function dev(options) {
|
|
68
68
|
const logger = getLogger(options.logger);
|
|
69
|
-
const { cwd,
|
|
70
|
-
|
|
71
|
-
const libraryVersion = await getCurrentLibraryVersionWithoutPM();
|
|
72
|
-
logger.info(`Running command: ${options.superblocksPath} dev${options.uploadFirst ? " --upload-first" : ""}${options.downloadFirst ? " --download-first" : ""} with baseUrl: ${applicationConfig?.superblocksBaseUrl}, cliVersion: ${cliVersion}, libraryVersion: ${libraryVersion?.alias} ${libraryVersion?.version}`);
|
|
69
|
+
const { cwd, devServerPort, downloadFirst, uploadFirst, skipSync, applicationConfig, skipAutoUpgrade, } = options;
|
|
70
|
+
initializeTracingSdk(applicationConfig);
|
|
73
71
|
// Add check for node_modules
|
|
74
72
|
if (!fs.existsSync(path.join(cwd, "node_modules"))) {
|
|
75
73
|
throw new Error('node_modules folder is missing. Please run "npm install" first.');
|
|
76
74
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
75
|
+
logger.info("Starting dev server");
|
|
76
|
+
const cliVersion = await getCurrentCliVersion();
|
|
77
|
+
const libraryVersion = await getCurrentLibraryVersionWithoutPM();
|
|
78
|
+
logger.info(`Running command: ${options.superblocksPath} dev${options.uploadFirst ? " --upload-first" : ""}${options.downloadFirst ? " --download-first" : ""} with baseUrl: ${applicationConfig?.superblocksBaseUrl}, cliVersion: ${cliVersion?.alias} ${cliVersion?.version}, libraryVersion: ${libraryVersion?.alias} ${libraryVersion?.version}`);
|
|
80
79
|
const port = devServerPort ?? 5173;
|
|
81
80
|
const fsOperationQueue = new OperationQueue();
|
|
82
81
|
let syncService;
|
|
@@ -110,15 +109,9 @@ export async function dev(options) {
|
|
|
110
109
|
if (lockService) {
|
|
111
110
|
try {
|
|
112
111
|
await lockService.acquireLock();
|
|
113
|
-
// TODO(code-mode): package naming is preventing upgrade in ephemeral environments
|
|
114
|
-
if (!process.env.PACKAGE_SUFFIX ||
|
|
115
|
-
process.env.PACKAGE_SUFFIX === "" ||
|
|
116
|
-
!skipAutoUpgrade) {
|
|
117
|
-
await checkVersionsAndUpgrade(lockService, applicationConfig);
|
|
118
|
-
}
|
|
119
112
|
}
|
|
120
113
|
catch (error) {
|
|
121
|
-
logger.error("Failed to acquire lock on application", error);
|
|
114
|
+
logger.error("Failed to acquire lock on application", getErrorMeta(error));
|
|
122
115
|
passErrorToVSCode(error.context?.message, logger);
|
|
123
116
|
throw new Error(`Failed to acquire lock on application: ${error}`);
|
|
124
117
|
}
|
|
@@ -137,49 +130,77 @@ export async function dev(options) {
|
|
|
137
130
|
appRootDirPath: options.cwd,
|
|
138
131
|
applicationId: applicationConfig.id,
|
|
139
132
|
organizationId: currentUser.organizations[0].id,
|
|
140
|
-
anthropicApiKey: process.env.ANTHROPIC_API_KEY || "",
|
|
141
133
|
fsOperationQueue,
|
|
142
134
|
draftInterface: syncService,
|
|
143
135
|
tracer,
|
|
144
136
|
});
|
|
145
137
|
const isSynced = localContents.hash === serverHash;
|
|
146
138
|
if (isSynced) {
|
|
147
|
-
logger.info(
|
|
148
|
-
|
|
139
|
+
logger.info(`Local files are in sync with the server on branch '${applicationConfig.branchName}'`);
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
logger.info(`Local files are out of sync with the server on branch '${applicationConfig.branchName}'`);
|
|
149
143
|
}
|
|
150
|
-
logger.info("Local files are out of sync with the server");
|
|
151
144
|
if (!(downloadFirst || uploadFirst)) {
|
|
152
145
|
throw new Error("You must choose --download-first or --upload-first to use the dev command");
|
|
153
146
|
}
|
|
154
147
|
if (downloadFirst && uploadFirst) {
|
|
155
148
|
throw new Error("Choose either --download-first or --upload-first");
|
|
156
149
|
}
|
|
150
|
+
let hasPackageChanged = false;
|
|
157
151
|
if (downloadFirst) {
|
|
158
|
-
logger.info(
|
|
159
|
-
// Read package.json before download
|
|
152
|
+
logger.info(`Starting download of branch '${applicationConfig.branchName}'`);
|
|
160
153
|
const packageJsonBefore = await readPkgJson(cwd);
|
|
161
154
|
await syncService.downloadDirectory();
|
|
162
|
-
// Read package.json after download and compare
|
|
163
155
|
const packageJsonAfter = await readPkgJson(cwd);
|
|
164
|
-
// Check if package.json changed
|
|
165
156
|
if (packageJsonBefore && packageJsonAfter) {
|
|
166
157
|
const diff = diffJson(packageJsonBefore, packageJsonAfter);
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
158
|
+
hasPackageChanged = diff.some((part) => part.added || part.removed);
|
|
159
|
+
}
|
|
160
|
+
else if (packageJsonAfter) {
|
|
161
|
+
hasPackageChanged = true;
|
|
162
|
+
logger.info("package.json was created, installing packages…");
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
let hasCliUpdated = false;
|
|
166
|
+
if (!process.env.PACKAGE_SUFFIX ||
|
|
167
|
+
process.env.PACKAGE_SUFFIX === "" ||
|
|
168
|
+
!skipAutoUpgrade) {
|
|
169
|
+
if (lockService) {
|
|
170
|
+
const result = await checkVersionsAndUpgrade(lockService, applicationConfig);
|
|
171
|
+
if (result?.libraryUpdated) {
|
|
172
|
+
hasPackageChanged = true;
|
|
171
173
|
}
|
|
174
|
+
hasCliUpdated = result?.cliUpdated ?? false;
|
|
172
175
|
}
|
|
176
|
+
else {
|
|
177
|
+
logger.warn("Lock service is not available, skipping version check and upgrade");
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
if (hasPackageChanged) {
|
|
181
|
+
logger.info("Installing packages…");
|
|
182
|
+
await installPackages(cwd, logger);
|
|
173
183
|
}
|
|
174
|
-
|
|
175
|
-
logger.info(
|
|
184
|
+
if (hasPackageChanged || uploadFirst) {
|
|
185
|
+
logger.info(`Uploading local files to branch '${applicationConfig.branchName}' on server before starting`);
|
|
176
186
|
await syncService.uploadDirectory();
|
|
187
|
+
await syncService.uploadDirectoryNowIfNeeded();
|
|
188
|
+
}
|
|
189
|
+
if (hasCliUpdated) {
|
|
190
|
+
logger.info("CLI was updated, restarting the dev server…");
|
|
191
|
+
process.exit(AUTO_UPGRADE_EXIT_CODE);
|
|
177
192
|
}
|
|
178
193
|
});
|
|
179
194
|
}
|
|
180
195
|
catch (error) {
|
|
181
196
|
logger.error(error.message);
|
|
182
|
-
|
|
197
|
+
try {
|
|
198
|
+
await lockService?.shutdownAndExit();
|
|
199
|
+
}
|
|
200
|
+
finally {
|
|
201
|
+
// this is redundant, but it's here to make sure the lock service is shutdown and the process exits
|
|
202
|
+
process.exit(1);
|
|
203
|
+
}
|
|
183
204
|
}
|
|
184
205
|
}
|
|
185
206
|
else {
|
|
@@ -198,6 +219,10 @@ export async function dev(options) {
|
|
|
198
219
|
options.signal?.addEventListener("abort", () => {
|
|
199
220
|
logger.info("Server closed");
|
|
200
221
|
httpServer.close();
|
|
222
|
+
lockService?.shutdownAndExit().catch(() => {
|
|
223
|
+
// this is redundant, but it's here to make sure the lock service is shutdown and the process exits
|
|
224
|
+
process.exit(1);
|
|
225
|
+
});
|
|
201
226
|
});
|
|
202
227
|
logger.debug(green(`Local server started at port ${port}`));
|
|
203
228
|
logger.debug(green(`Visit your application at:`));
|