@superblocksteam/sdk 2.0.6-next.113 → 2.0.6-next.12
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 -6
- package/dist/application-build.mjs.map +1 -1
- package/dist/cli-replacement/automatic-upgrades.d.ts +2 -5
- package/dist/cli-replacement/automatic-upgrades.d.ts.map +1 -1
- package/dist/cli-replacement/automatic-upgrades.js +49 -114
- package/dist/cli-replacement/automatic-upgrades.js.map +1 -1
- package/dist/cli-replacement/dev.d.mts +2 -1
- package/dist/cli-replacement/dev.d.mts.map +1 -1
- package/dist/cli-replacement/dev.mjs +32 -57
- package/dist/cli-replacement/dev.mjs.map +1 -1
- package/dist/client.d.ts +0 -34
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +1 -92
- package/dist/client.js.map +1 -1
- package/dist/dev-utils/dev-logger.d.mts +7 -17
- package/dist/dev-utils/dev-logger.d.mts.map +1 -1
- package/dist/dev-utils/dev-logger.mjs +9 -50
- 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 +15 -8
- package/dist/dev-utils/dev-server.mjs.map +1 -1
- package/dist/dev-utils/dev-tracer.d.ts +0 -2
- package/dist/dev-utils/dev-tracer.d.ts.map +1 -1
- package/dist/dev-utils/dev-tracer.js +35 -42
- package/dist/dev-utils/dev-tracer.js.map +1 -1
- package/dist/dev-utils/vite-plugin-sb-cdn.d.mts.map +1 -1
- package/dist/dev-utils/vite-plugin-sb-cdn.mjs +3 -13
- 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-inject-sb-ids-transform.mjs +1 -1
- package/dist/vite-plugin-inject-sb-ids-transform.mjs.map +1 -1
- package/package.json +3 -5
- package/src/application-build.mts +3 -6
- package/src/cli-replacement/automatic-upgrades.ts +59 -158
- package/src/cli-replacement/dev.mts +43 -77
- package/src/client.ts +0 -115
- package/src/dev-utils/dev-logger.mts +20 -94
- package/src/dev-utils/dev-server.mts +15 -10
- package/src/dev-utils/dev-tracer.ts +37 -48
- package/src/dev-utils/vite-plugin-sb-cdn.mts +3 -14
- package/src/index.ts +0 -4
- package/src/vite-plugin-inject-sb-ids-transform.mts +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/dev-utils/vite-plugin-build-manifest-stub.d.mts +0 -10
- package/dist/dev-utils/vite-plugin-build-manifest-stub.d.mts.map +0 -1
- package/dist/dev-utils/vite-plugin-build-manifest-stub.mjs +0 -27
- package/dist/dev-utils/vite-plugin-build-manifest-stub.mjs.map +0 -1
- package/dist/vite-plugin-generate-build-manifest.d.mts +0 -21
- package/dist/vite-plugin-generate-build-manifest.d.mts.map +0 -1
- package/dist/vite-plugin-generate-build-manifest.mjs +0 -130
- package/dist/vite-plugin-generate-build-manifest.mjs.map +0 -1
- package/src/dev-utils/vite-plugin-build-manifest-stub.mts +0 -30
- package/src/vite-plugin-generate-build-manifest.mts +0 -192
- package/test/clients.test.mts +0 -120
|
@@ -9,7 +9,6 @@ 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";
|
|
13
12
|
import { injectSuperblocksIdsPlugin } from "./vite-plugin-inject-sb-ids-transform.mjs";
|
|
14
13
|
export async function buildApplication({ root, dest, mode, libraryUrl, assetsCdnUrl, ddClientToken, ddApplicationId, ddEnv, ddVersion, }) {
|
|
15
14
|
const cwd = process.cwd();
|
|
@@ -39,7 +38,7 @@ export async function buildApplication({ root, dest, mode, libraryUrl, assetsCdn
|
|
|
39
38
|
async function buildWithVite({ root, dest, mode, libraryUrl, assetsCdnUrl, ddClientToken, ddApplicationId, ddEnv, ddVersion, }) {
|
|
40
39
|
const viteLogger = createLogger();
|
|
41
40
|
const logger = getLogger();
|
|
42
|
-
viteLogger.info =
|
|
41
|
+
viteLogger.info = logger.info;
|
|
43
42
|
viteLogger.warn = (msg) => {
|
|
44
43
|
logger.warn(yellow(msg));
|
|
45
44
|
};
|
|
@@ -88,7 +87,7 @@ async function buildWithVite({ root, dest, mode, libraryUrl, assetsCdnUrl, ddCli
|
|
|
88
87
|
logLevel: "info",
|
|
89
88
|
plugins: [
|
|
90
89
|
tsconfigPaths(),
|
|
91
|
-
injectIndexVitePlugin({ assetsCdnUrl }),
|
|
90
|
+
injectIndexVitePlugin({ assetsCdnUrl, logger }),
|
|
92
91
|
customComponentsPlugin(),
|
|
93
92
|
injectSuperblocksIdsPlugin(root),
|
|
94
93
|
superblocksCdnPlugin({
|
|
@@ -96,15 +95,12 @@ async function buildWithVite({ root, dest, mode, libraryUrl, assetsCdnUrl, ddCli
|
|
|
96
95
|
"@superblocksteam/library": `${libraryUrl}/index.js`,
|
|
97
96
|
"react/jsx-runtime": "https://esm.sh/react@18.2.0/jsx-runtime.mjs",
|
|
98
97
|
"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",
|
|
101
98
|
},
|
|
102
99
|
cssImports: {
|
|
103
100
|
"@superblocksteam/library/index.css": `${libraryUrl}/index.css`,
|
|
104
101
|
},
|
|
105
102
|
}),
|
|
106
103
|
react(),
|
|
107
|
-
generateBuildManifestPlugin(root),
|
|
108
104
|
ddRumPlugin({
|
|
109
105
|
clientToken: ddClientToken ?? "",
|
|
110
106
|
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,
|
|
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;AAGvF,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,MAAM,CAAC,IAAI,CAAC;IAC9B,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,MAAM,EAAE,CAAW;YACzD,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;iBACpD;gBACD,UAAU,EAAE;oBACV,oCAAoC,EAAE,GAAG,UAAU,YAAY;iBAChE;aACF,CAAC;YACF,KAAK,EAAE;YAEP,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,12 +6,9 @@ interface PackageVersionInfo {
|
|
|
6
6
|
version: string;
|
|
7
7
|
alias?: string;
|
|
8
8
|
}
|
|
9
|
-
export declare function getCurrentCliVersion(): Promise<
|
|
9
|
+
export declare function getCurrentCliVersion(): Promise<string | 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<
|
|
13
|
-
cliUpdated: boolean;
|
|
14
|
-
libraryUpdated: boolean;
|
|
15
|
-
}>;
|
|
12
|
+
export declare function checkVersionsAndUpgrade(lockService: LockService, config?: ApplicationConfig): Promise<void>;
|
|
16
13
|
export {};
|
|
17
14
|
//# 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,CAAC,MAAM,GAAG,SAAS,CAAC,CAwBxE;AAED,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,YAAY,GACf,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAoBzC;AAqHD,wBAAsB,iCAAiC,IAAI,OAAO,CAChE,kBAAkB,GAAG,SAAS,CAC/B,CAeA;AAED,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,WAAW,EACxB,MAAM,CAAC,EAAE,iBAAiB,iBA0K3B"}
|
|
@@ -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 {
|
|
9
|
+
import { 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
|
+
console.log(`Could not get latest CLI version: ${error.responseMeta.message}`);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
catch (error) {
|
|
@@ -47,14 +47,7 @@ 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
|
-
|
|
51
|
-
if (aliasMatch && aliasMatch[1] !== "cli") {
|
|
52
|
-
return {
|
|
53
|
-
version: version,
|
|
54
|
-
alias: `@superblocksteam/${aliasMatch[1]}`,
|
|
55
|
-
};
|
|
56
|
-
}
|
|
57
|
-
return { version };
|
|
50
|
+
return version;
|
|
58
51
|
}
|
|
59
52
|
catch (error) {
|
|
60
53
|
if (isNativeError(error)) {
|
|
@@ -71,12 +64,13 @@ export async function getCurrentLibraryVersion(pm) {
|
|
|
71
64
|
case "pnpm":
|
|
72
65
|
return await getPnpmLibraryVersion();
|
|
73
66
|
default:
|
|
74
|
-
|
|
67
|
+
console.error(`${pm.agent} is currently not supported for automatic upgrades.`);
|
|
75
68
|
return undefined;
|
|
76
69
|
}
|
|
77
70
|
}
|
|
78
71
|
catch (error) {
|
|
79
|
-
|
|
72
|
+
console.error("Could not resolve current library version. Skipping automatic upgrade.");
|
|
73
|
+
console.error(error);
|
|
80
74
|
return undefined;
|
|
81
75
|
}
|
|
82
76
|
}
|
|
@@ -149,8 +143,8 @@ async function upgradeCliWithOclif(targetVersion) {
|
|
|
149
143
|
const superblocksPath = stdout.trim();
|
|
150
144
|
if (!superblocksPath)
|
|
151
145
|
return false;
|
|
152
|
-
const { stdout: updateOutput
|
|
153
|
-
return !
|
|
146
|
+
const { stdout: updateOutput } = await exec(`${superblocksPath} update --version=${targetVersion}`);
|
|
147
|
+
return !updateOutput.includes("not updatable");
|
|
154
148
|
}
|
|
155
149
|
catch (error) {
|
|
156
150
|
if (isNativeError(error)) {
|
|
@@ -159,50 +153,17 @@ async function upgradeCliWithOclif(targetVersion) {
|
|
|
159
153
|
return false;
|
|
160
154
|
}
|
|
161
155
|
}
|
|
162
|
-
async function upgradePackageWithPackageManager(pm, packageName, targetVersion,
|
|
156
|
+
async function upgradePackageWithPackageManager(pm, packageName, targetVersion, alias) {
|
|
163
157
|
const packageSpec = alias
|
|
164
158
|
? `@superblocksteam/${packageName}@npm:${alias}@${targetVersion}`
|
|
165
159
|
: `@superblocksteam/${packageName}@${targetVersion}`;
|
|
166
|
-
|
|
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);
|
|
160
|
+
const installCommand = resolveCommand(pm.agent, "install", [packageSpec]);
|
|
175
161
|
if (!installCommand) {
|
|
176
|
-
|
|
162
|
+
console.error("Could not determine how to upgrade Superblocks packages.");
|
|
177
163
|
return;
|
|
178
164
|
}
|
|
179
165
|
const { command, args } = installCommand;
|
|
180
|
-
|
|
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;
|
|
166
|
+
await exec(`${command} ${args.join(" ")}`);
|
|
206
167
|
}
|
|
207
168
|
export async function getCurrentLibraryVersionWithoutPM() {
|
|
208
169
|
// Detect package manager
|
|
@@ -223,7 +184,6 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
223
184
|
const cliUpdated = false;
|
|
224
185
|
const libraryUpdated = false;
|
|
225
186
|
let hasFailedToUpgrade = false;
|
|
226
|
-
logger.info("Checking versions");
|
|
227
187
|
await traceFunction({
|
|
228
188
|
name: "checkVersionsAndUpgrade",
|
|
229
189
|
tracer,
|
|
@@ -247,7 +207,7 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
247
207
|
if (!pm || !config?.id)
|
|
248
208
|
return;
|
|
249
209
|
// Get current versions
|
|
250
|
-
const
|
|
210
|
+
const currentCliVersion = await traceFunction({
|
|
251
211
|
name: "getCurrentCliVersion",
|
|
252
212
|
tracer,
|
|
253
213
|
fn: async () => {
|
|
@@ -262,10 +222,10 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
262
222
|
},
|
|
263
223
|
});
|
|
264
224
|
// Skip if we're in local development
|
|
265
|
-
if (!
|
|
266
|
-
!valid(
|
|
267
|
-
|
|
268
|
-
|
|
225
|
+
if (!currentCliVersion ||
|
|
226
|
+
!valid(currentCliVersion) ||
|
|
227
|
+
currentCliVersion.startsWith("file:") ||
|
|
228
|
+
currentCliVersion.startsWith("link:") ||
|
|
269
229
|
!currentLibraryInfo ||
|
|
270
230
|
!valid(currentLibraryInfo.version) ||
|
|
271
231
|
currentLibraryInfo.version.startsWith("file:") ||
|
|
@@ -288,14 +248,14 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
288
248
|
// If version is latest, then semver can throw an error
|
|
289
249
|
// Check if CLI needs upgrade
|
|
290
250
|
cliNeedsUpgrade =
|
|
291
|
-
targetVersions.cli && gt(targetVersions.cli,
|
|
251
|
+
targetVersions.cli && gt(targetVersions.cli, currentCliVersion);
|
|
292
252
|
// Check if library needs upgrade
|
|
293
253
|
libraryNeedsUpgrade =
|
|
294
254
|
targetVersions.library &&
|
|
295
255
|
gt(targetVersions.library, currentLibraryInfo.version);
|
|
296
256
|
}
|
|
297
257
|
catch (error) {
|
|
298
|
-
|
|
258
|
+
console.warn("Error checking versions to upgrade, releasing lock and exiting", error);
|
|
299
259
|
await traceFunction({
|
|
300
260
|
name: "shutdownLockService",
|
|
301
261
|
tracer,
|
|
@@ -313,60 +273,37 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
313
273
|
}
|
|
314
274
|
let cliUpdated = false;
|
|
315
275
|
let libraryUpdated = false;
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
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",
|
|
276
|
+
// Upgrade CLI if needed
|
|
277
|
+
if (cliNeedsUpgrade) {
|
|
278
|
+
const oclifUpgradeSucceeded = await traceFunction({
|
|
279
|
+
name: "upgradeCliWithOclif",
|
|
280
|
+
tracer,
|
|
281
|
+
fn: async () => {
|
|
282
|
+
return await upgradeCliWithOclif(targetVersions.cli);
|
|
283
|
+
},
|
|
284
|
+
});
|
|
285
|
+
if (!oclifUpgradeSucceeded) {
|
|
286
|
+
// Fall back to package manager upgrade
|
|
287
|
+
await traceFunction({
|
|
288
|
+
name: "upgradePackageWithPackageManager",
|
|
353
289
|
tracer,
|
|
354
290
|
fn: async () => {
|
|
355
|
-
|
|
356
|
-
await upgradePackageWithPackageManager(pm, "library", targetVersions.library, {
|
|
357
|
-
alias: currentLibraryInfo.alias,
|
|
358
|
-
global: false,
|
|
359
|
-
});
|
|
360
|
-
libraryUpdated = true;
|
|
291
|
+
await upgradePackageWithPackageManager(pm, "cli", targetVersions.cli);
|
|
361
292
|
},
|
|
362
293
|
});
|
|
363
|
-
|
|
294
|
+
cliUpdated = true;
|
|
364
295
|
}
|
|
365
|
-
await Promise.all(upgradePromises);
|
|
366
296
|
}
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
297
|
+
// Upgrade library if needed
|
|
298
|
+
if (libraryNeedsUpgrade) {
|
|
299
|
+
await traceFunction({
|
|
300
|
+
name: "upgradePackageWithPackageManager",
|
|
301
|
+
tracer,
|
|
302
|
+
fn: async () => {
|
|
303
|
+
await upgradePackageWithPackageManager(pm, "library", targetVersions.library, currentLibraryInfo.alias);
|
|
304
|
+
},
|
|
305
|
+
});
|
|
306
|
+
libraryUpdated = true;
|
|
370
307
|
}
|
|
371
308
|
// Log what was updated
|
|
372
309
|
if (cliUpdated && libraryUpdated) {
|
|
@@ -378,18 +315,16 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
378
315
|
else if (libraryUpdated) {
|
|
379
316
|
logger.info("@superblocksteam/library has been updated.");
|
|
380
317
|
}
|
|
381
|
-
else {
|
|
382
|
-
logger.info("No upgrades needed");
|
|
383
|
-
}
|
|
384
318
|
},
|
|
385
319
|
});
|
|
386
320
|
// Restart CLI if anything was updated
|
|
387
321
|
if (hasFailedToUpgrade) {
|
|
388
322
|
process.exit(1);
|
|
389
323
|
}
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
324
|
+
else if (cliUpdated || libraryUpdated) {
|
|
325
|
+
logger.info("Restarting the CLI…");
|
|
326
|
+
await lockService.releaseLock();
|
|
327
|
+
process.exit(AUTO_UPGRADE_EXIT_CODE);
|
|
328
|
+
}
|
|
394
329
|
}
|
|
395
330
|
//# 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,13 +2,14 @@ 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;
|
|
5
6
|
devServerPort?: number;
|
|
6
7
|
uploadFirst?: boolean;
|
|
7
8
|
downloadFirst?: boolean;
|
|
8
9
|
skipSync?: boolean;
|
|
9
10
|
applicationConfig?: ApplicationConfig;
|
|
10
11
|
superblocksPath?: string;
|
|
11
|
-
logger?: (
|
|
12
|
+
logger?: (message: string) => void;
|
|
12
13
|
skipAutoUpgrade?: boolean;
|
|
13
14
|
signal?: AbortSignal;
|
|
14
15
|
}): 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,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,
|
|
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,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,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,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAGnC,eAAe,CAAC,EAAE,OAAO,CAAC;IAG1B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,iBA2LA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
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";
|
|
3
4
|
import path from "node:path";
|
|
4
5
|
import { promisify } from "node:util";
|
|
5
6
|
import { maskUnixSignals } from "@superblocksteam/util";
|
|
@@ -12,12 +13,11 @@ import { diffJson } from "diff";
|
|
|
12
13
|
import fs from "fs-extra";
|
|
13
14
|
import { resolveCommand } from "package-manager-detector";
|
|
14
15
|
import { detect } from "package-manager-detector/detect";
|
|
15
|
-
import {
|
|
16
|
+
import { getLogger } from "../dev-utils/dev-logger.mjs";
|
|
16
17
|
import { createDevServer } from "../dev-utils/dev-server.mjs";
|
|
17
|
-
import tracer
|
|
18
|
+
import tracer from "../dev-utils/dev-tracer.js";
|
|
18
19
|
import { SuperblocksSdk } from "../sdk.js";
|
|
19
20
|
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,16 +66,17 @@ async function installPackages(cwd, logger) {
|
|
|
66
66
|
}
|
|
67
67
|
export async function dev(options) {
|
|
68
68
|
const logger = getLogger(options.logger);
|
|
69
|
-
const { cwd, devServerPort, downloadFirst, uploadFirst, skipSync, applicationConfig, skipAutoUpgrade, } = options;
|
|
70
|
-
|
|
69
|
+
const { cwd, pidfilePath, devServerPort, downloadFirst, uploadFirst, skipSync, applicationConfig, skipAutoUpgrade, } = options;
|
|
70
|
+
const cliVersion = await getCurrentCliVersion();
|
|
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}`);
|
|
71
73
|
// Add check for node_modules
|
|
72
74
|
if (!fs.existsSync(path.join(cwd, "node_modules"))) {
|
|
73
75
|
throw new Error('node_modules folder is missing. Please run "npm install" first.');
|
|
74
76
|
}
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
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}`);
|
|
77
|
+
if (pidfilePath) {
|
|
78
|
+
await fsp.writeFile(pidfilePath, `${process.pid}\n`);
|
|
79
|
+
}
|
|
79
80
|
const port = devServerPort ?? 5173;
|
|
80
81
|
const fsOperationQueue = new OperationQueue();
|
|
81
82
|
let syncService;
|
|
@@ -109,9 +110,15 @@ export async function dev(options) {
|
|
|
109
110
|
if (lockService) {
|
|
110
111
|
try {
|
|
111
112
|
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
|
+
}
|
|
112
119
|
}
|
|
113
120
|
catch (error) {
|
|
114
|
-
logger.error("Failed to acquire lock on application",
|
|
121
|
+
logger.error("Failed to acquire lock on application", error);
|
|
115
122
|
passErrorToVSCode(error.context?.message, logger);
|
|
116
123
|
throw new Error(`Failed to acquire lock on application: ${error}`);
|
|
117
124
|
}
|
|
@@ -130,77 +137,49 @@ export async function dev(options) {
|
|
|
130
137
|
appRootDirPath: options.cwd,
|
|
131
138
|
applicationId: applicationConfig.id,
|
|
132
139
|
organizationId: currentUser.organizations[0].id,
|
|
140
|
+
anthropicApiKey: process.env.ANTHROPIC_API_KEY || "",
|
|
133
141
|
fsOperationQueue,
|
|
134
142
|
draftInterface: syncService,
|
|
135
143
|
tracer,
|
|
136
144
|
});
|
|
137
145
|
const isSynced = localContents.hash === serverHash;
|
|
138
146
|
if (isSynced) {
|
|
139
|
-
logger.info(
|
|
140
|
-
|
|
141
|
-
else {
|
|
142
|
-
logger.info(`Local files are out of sync with the server on branch '${applicationConfig.branchName}'`);
|
|
147
|
+
logger.info("Local files are in sync with the server");
|
|
148
|
+
return;
|
|
143
149
|
}
|
|
150
|
+
logger.info("Local files are out of sync with the server");
|
|
144
151
|
if (!(downloadFirst || uploadFirst)) {
|
|
145
152
|
throw new Error("You must choose --download-first or --upload-first to use the dev command");
|
|
146
153
|
}
|
|
147
154
|
if (downloadFirst && uploadFirst) {
|
|
148
155
|
throw new Error("Choose either --download-first or --upload-first");
|
|
149
156
|
}
|
|
150
|
-
let hasPackageChanged = false;
|
|
151
157
|
if (downloadFirst) {
|
|
152
|
-
logger.info(
|
|
158
|
+
logger.info("Starting directory sync from server before starting the local server");
|
|
159
|
+
// Read package.json before download
|
|
153
160
|
const packageJsonBefore = await readPkgJson(cwd);
|
|
154
161
|
await syncService.downloadDirectory();
|
|
162
|
+
// Read package.json after download and compare
|
|
155
163
|
const packageJsonAfter = await readPkgJson(cwd);
|
|
164
|
+
// Check if package.json changed
|
|
156
165
|
if (packageJsonBefore && packageJsonAfter) {
|
|
157
166
|
const diff = diffJson(packageJsonBefore, packageJsonAfter);
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
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;
|
|
167
|
+
const hasChanges = diff.some((part) => part.added || part.removed);
|
|
168
|
+
if (hasChanges) {
|
|
169
|
+
logger.info("package.json has changed, installing packages…");
|
|
170
|
+
await installPackages(cwd, logger);
|
|
173
171
|
}
|
|
174
|
-
hasCliUpdated = result?.cliUpdated ?? false;
|
|
175
172
|
}
|
|
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);
|
|
183
173
|
}
|
|
184
|
-
if (
|
|
185
|
-
logger.info(
|
|
174
|
+
else if (uploadFirst) {
|
|
175
|
+
logger.info("Uploading local files to server before starting");
|
|
186
176
|
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);
|
|
192
177
|
}
|
|
193
178
|
});
|
|
194
179
|
}
|
|
195
180
|
catch (error) {
|
|
196
181
|
logger.error(error.message);
|
|
197
|
-
|
|
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
|
-
}
|
|
182
|
+
process.exit(1);
|
|
204
183
|
}
|
|
205
184
|
}
|
|
206
185
|
else {
|
|
@@ -219,10 +198,6 @@ export async function dev(options) {
|
|
|
219
198
|
options.signal?.addEventListener("abort", () => {
|
|
220
199
|
logger.info("Server closed");
|
|
221
200
|
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
|
-
});
|
|
226
201
|
});
|
|
227
202
|
logger.debug(green(`Local server started at port ${port}`));
|
|
228
203
|
logger.debug(green(`Visit your application at:`));
|