@superblocksteam/sdk 2.0.12 → 2.0.13-next.0
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/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 +46 -181
- package/dist/cli-replacement/automatic-upgrades.js.map +1 -1
- package/dist/cli-replacement/dev.d.mts.map +1 -1
- package/dist/cli-replacement/dev.mjs +36 -26
- package/dist/cli-replacement/dev.mjs.map +1 -1
- package/dist/dev-utils/dev-server.d.mts.map +1 -1
- package/dist/dev-utils/dev-server.mjs +8 -0
- package/dist/dev-utils/dev-server.mjs.map +1 -1
- package/package.json +5 -5
- package/src/cli-replacement/automatic-upgrades.ts +62 -236
- package/src/cli-replacement/dev.mts +40 -29
- package/src/dev-utils/dev-server.mts +14 -0
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { type DetectResult } from "package-manager-detector";
|
|
2
1
|
import type { ApplicationConfig } from "../types/common.js";
|
|
3
2
|
import type { LockService } from "@superblocksteam/vite-plugin-file-sync/lock-service";
|
|
4
3
|
export declare const AUTO_UPGRADE_EXIT_CODE = 99;
|
|
@@ -7,11 +6,9 @@ interface PackageVersionInfo {
|
|
|
7
6
|
alias?: string;
|
|
8
7
|
}
|
|
9
8
|
export declare function getCurrentCliVersion(): Promise<PackageVersionInfo | undefined>;
|
|
10
|
-
export declare function
|
|
11
|
-
export declare function getCurrentLibraryVersionWithoutPM(): Promise<PackageVersionInfo | undefined>;
|
|
12
|
-
export declare function checkVersionsAndUpgrade(lockService: LockService, config?: ApplicationConfig): Promise<{
|
|
9
|
+
export declare function checkVersionsAndWritePackageJson(lockService: LockService, config: ApplicationConfig): Promise<{
|
|
13
10
|
cliUpdated: boolean;
|
|
14
|
-
|
|
11
|
+
upgradePromises: Promise<void>[];
|
|
15
12
|
}>;
|
|
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":"
|
|
1
|
+
{"version":3,"file":"automatic-upgrades.d.ts","sourceRoot":"","sources":["../../src/cli-replacement/automatic-upgrades.ts"],"names":[],"mappings":"AAaA,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;AA6ED,wBAAsB,gCAAgC,CACpD,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC;IACT,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;CAClC,CAAC,CAwKD"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import * as child_process from "node:child_process";
|
|
2
|
+
import fs from "node:fs/promises";
|
|
3
|
+
import path from "node:path";
|
|
2
4
|
import { promisify } from "node:util";
|
|
3
5
|
import { isNativeError } from "node:util/types";
|
|
4
6
|
import { traceFunction } from "@superblocksteam/shared";
|
|
@@ -63,85 +65,6 @@ export async function getCurrentCliVersion() {
|
|
|
63
65
|
return undefined;
|
|
64
66
|
}
|
|
65
67
|
}
|
|
66
|
-
export async function getCurrentLibraryVersion(pm) {
|
|
67
|
-
try {
|
|
68
|
-
switch (pm.agent) {
|
|
69
|
-
case "npm":
|
|
70
|
-
return await getNpmLibraryVersion();
|
|
71
|
-
case "pnpm":
|
|
72
|
-
return await getPnpmLibraryVersion();
|
|
73
|
-
default:
|
|
74
|
-
logger.error(`${pm.agent} is currently not supported for automatic upgrades.`);
|
|
75
|
-
return undefined;
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
catch (error) {
|
|
79
|
-
logger.error("Could not resolve current library version. Skipping automatic upgrade.", getErrorMeta(error));
|
|
80
|
-
return undefined;
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
async function getNpmLibraryVersion() {
|
|
84
|
-
const { stdout } = await exec("npm list @superblocksteam/library --json", {
|
|
85
|
-
cwd: process.cwd(),
|
|
86
|
-
});
|
|
87
|
-
const parsed = JSON.parse(stdout);
|
|
88
|
-
const packageData = parsed.dependencies?.["@superblocksteam/library"] ??
|
|
89
|
-
parsed.devDependencies?.["@superblocksteam/library"];
|
|
90
|
-
if (!packageData?.version)
|
|
91
|
-
return undefined;
|
|
92
|
-
// Check if this is an alias by examining the resolved URL
|
|
93
|
-
const resolved = packageData.resolved;
|
|
94
|
-
if (resolved && resolved.includes("@superblocksteam/")) {
|
|
95
|
-
const aliasMatch = resolved.match(/@superblocksteam\/([^\/]+)/);
|
|
96
|
-
if (aliasMatch && aliasMatch[1] !== "library") {
|
|
97
|
-
return {
|
|
98
|
-
version: packageData.version,
|
|
99
|
-
alias: `@superblocksteam/${aliasMatch[1]}`,
|
|
100
|
-
};
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
return { version: packageData.version };
|
|
104
|
-
}
|
|
105
|
-
async function getPnpmLibraryVersion() {
|
|
106
|
-
// First try the original package name
|
|
107
|
-
let packageData;
|
|
108
|
-
try {
|
|
109
|
-
const result = await exec("pnpm list @superblocksteam/library --json", {
|
|
110
|
-
cwd: process.cwd(),
|
|
111
|
-
});
|
|
112
|
-
const parsed = JSON.parse(result.stdout);
|
|
113
|
-
packageData =
|
|
114
|
-
parsed[0]?.dependencies?.["@superblocksteam/library"] ??
|
|
115
|
-
parsed[0]?.devDependencies?.["@superblocksteam/library"];
|
|
116
|
-
}
|
|
117
|
-
catch {
|
|
118
|
-
// Package not found with original name, might be aliased
|
|
119
|
-
}
|
|
120
|
-
// If not found, try the ephemeral alias
|
|
121
|
-
if (!packageData?.version) {
|
|
122
|
-
try {
|
|
123
|
-
const aliasResult = await exec("pnpm list @superblocksteam/library-ephemeral --json", { cwd: process.cwd() });
|
|
124
|
-
const aliasParsed = JSON.parse(aliasResult.stdout);
|
|
125
|
-
packageData =
|
|
126
|
-
aliasParsed[0]?.dependencies?.["@superblocksteam/library"] ??
|
|
127
|
-
aliasParsed[0]?.devDependencies?.["@superblocksteam/library"];
|
|
128
|
-
}
|
|
129
|
-
catch {
|
|
130
|
-
return undefined;
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
if (!packageData?.version)
|
|
134
|
-
return undefined;
|
|
135
|
-
// Check if this is an alias by looking at the 'from' field
|
|
136
|
-
const from = packageData.from;
|
|
137
|
-
if (from && from !== "@superblocksteam/library") {
|
|
138
|
-
return {
|
|
139
|
-
version: packageData.version,
|
|
140
|
-
alias: from,
|
|
141
|
-
};
|
|
142
|
-
}
|
|
143
|
-
return { version: packageData.version };
|
|
144
|
-
}
|
|
145
68
|
async function upgradeCliWithOclif(targetVersion) {
|
|
146
69
|
try {
|
|
147
70
|
const command = process.platform === "win32" ? "where" : "which";
|
|
@@ -159,25 +82,23 @@ async function upgradeCliWithOclif(targetVersion) {
|
|
|
159
82
|
return false;
|
|
160
83
|
}
|
|
161
84
|
}
|
|
162
|
-
async function
|
|
163
|
-
const
|
|
164
|
-
? `@superblocksteam
|
|
165
|
-
: `@superblocksteam
|
|
166
|
-
|
|
167
|
-
const installArgs = [packageSpec, "--fund=false"];
|
|
85
|
+
async function upgradeCliWithPackageManager(pm, targetVersion, alias) {
|
|
86
|
+
const packageName = alias
|
|
87
|
+
? `@superblocksteam/cli@npm:${alias}@${targetVersion}`
|
|
88
|
+
: `@superblocksteam/cli@${targetVersion}`;
|
|
89
|
+
const installArgs = ["--fund=false", "--save-exact"];
|
|
168
90
|
if (pm.agent === "npm") {
|
|
169
91
|
installArgs.push("--audit=false");
|
|
170
92
|
}
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
const installCommand = resolveCommand(pm.agent, global ? "global" : "install", installArgs);
|
|
93
|
+
installArgs.push("--force");
|
|
94
|
+
installArgs.push(packageName);
|
|
95
|
+
const installCommand = resolveCommand(pm.agent, "global", installArgs);
|
|
175
96
|
if (!installCommand) {
|
|
176
97
|
logger.error("Could not determine how to upgrade Superblocks packages.");
|
|
177
98
|
return;
|
|
178
99
|
}
|
|
179
100
|
const { command, args } = installCommand;
|
|
180
|
-
logger.info(`Running ${command} ${args.join(" ")}
|
|
101
|
+
logger.info(`Running ${command} ${args.join(" ")}...`);
|
|
181
102
|
let resolver;
|
|
182
103
|
let rejecter;
|
|
183
104
|
const promise = new Promise((resolve, reject) => {
|
|
@@ -188,11 +109,11 @@ async function upgradePackageWithPackageManager(pm, packageName, targetVersion,
|
|
|
188
109
|
cwd: process.cwd(),
|
|
189
110
|
}, (error) => {
|
|
190
111
|
if (error) {
|
|
191
|
-
logger.error(`Failed to upgrade
|
|
112
|
+
logger.error(`Failed to upgrade packages to ${targetVersion}`);
|
|
192
113
|
rejecter(error);
|
|
193
114
|
}
|
|
194
115
|
else {
|
|
195
|
-
logger.info(`Successfully upgraded
|
|
116
|
+
logger.info(`Successfully upgraded packages to ${targetVersion}`);
|
|
196
117
|
resolver();
|
|
197
118
|
}
|
|
198
119
|
});
|
|
@@ -204,32 +125,15 @@ async function upgradePackageWithPackageManager(pm, packageName, targetVersion,
|
|
|
204
125
|
});
|
|
205
126
|
return promise;
|
|
206
127
|
}
|
|
207
|
-
export async function
|
|
208
|
-
// Detect package manager
|
|
209
|
-
const pm = await detect({
|
|
210
|
-
strategies: [
|
|
211
|
-
"packageManager-field",
|
|
212
|
-
"lockfile",
|
|
213
|
-
"install-metadata",
|
|
214
|
-
"devEngines-field",
|
|
215
|
-
],
|
|
216
|
-
cwd: process.cwd(),
|
|
217
|
-
});
|
|
218
|
-
if (!pm)
|
|
219
|
-
return;
|
|
220
|
-
return await getCurrentLibraryVersion(pm);
|
|
221
|
-
}
|
|
222
|
-
export async function checkVersionsAndUpgrade(lockService, config) {
|
|
128
|
+
export async function checkVersionsAndWritePackageJson(lockService, config) {
|
|
223
129
|
let cliUpdated = false;
|
|
224
|
-
let libraryUpdated = false;
|
|
225
130
|
let hasFailedToUpgrade = false;
|
|
226
|
-
|
|
131
|
+
const upgradePromises = [];
|
|
227
132
|
await traceFunction({
|
|
228
133
|
name: "checkVersionsAndUpgrade",
|
|
229
134
|
tracer,
|
|
230
135
|
fn: async () => {
|
|
231
|
-
|
|
232
|
-
const pm = await traceFunction({
|
|
136
|
+
const packageManager = await traceFunction({
|
|
233
137
|
name: "detectPackageManager",
|
|
234
138
|
tracer,
|
|
235
139
|
fn: async () => {
|
|
@@ -244,9 +148,11 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
244
148
|
});
|
|
245
149
|
},
|
|
246
150
|
});
|
|
247
|
-
if (!
|
|
151
|
+
if (!packageManager) {
|
|
152
|
+
console.log("No package manager found - must be npm or pnpm");
|
|
153
|
+
hasFailedToUpgrade = true;
|
|
248
154
|
return;
|
|
249
|
-
|
|
155
|
+
}
|
|
250
156
|
const currentCliInfo = await traceFunction({
|
|
251
157
|
name: "getCurrentCliVersion",
|
|
252
158
|
tracer,
|
|
@@ -254,24 +160,6 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
254
160
|
return await getCurrentCliVersion();
|
|
255
161
|
},
|
|
256
162
|
});
|
|
257
|
-
const currentLibraryInfo = await traceFunction({
|
|
258
|
-
name: "getCurrentLibraryVersion",
|
|
259
|
-
tracer,
|
|
260
|
-
fn: async () => {
|
|
261
|
-
return await getCurrentLibraryVersion(pm);
|
|
262
|
-
},
|
|
263
|
-
});
|
|
264
|
-
// Skip if we're in local development
|
|
265
|
-
if (!currentCliInfo ||
|
|
266
|
-
!valid(currentCliInfo.version) ||
|
|
267
|
-
currentCliInfo.version.startsWith("file:") ||
|
|
268
|
-
currentCliInfo.version.startsWith("link:") ||
|
|
269
|
-
!currentLibraryInfo ||
|
|
270
|
-
!valid(currentLibraryInfo.version) ||
|
|
271
|
-
currentLibraryInfo.version.startsWith("file:") ||
|
|
272
|
-
currentLibraryInfo.version.startsWith("link:")) {
|
|
273
|
-
return;
|
|
274
|
-
}
|
|
275
163
|
// Get target versions from server
|
|
276
164
|
const targetVersions = await traceFunction({
|
|
277
165
|
name: "getRemoteVersions",
|
|
@@ -282,17 +170,16 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
282
170
|
});
|
|
283
171
|
if (!targetVersions)
|
|
284
172
|
return;
|
|
285
|
-
let cliNeedsUpgrade;
|
|
286
|
-
let libraryNeedsUpgrade;
|
|
173
|
+
let cliNeedsUpgrade = false;
|
|
287
174
|
try {
|
|
288
175
|
// If version is latest, then semver can throw an error
|
|
289
176
|
// Check if CLI needs upgrade
|
|
290
|
-
cliNeedsUpgrade =
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
targetVersions.
|
|
295
|
-
|
|
177
|
+
cliNeedsUpgrade = Boolean(currentCliInfo &&
|
|
178
|
+
valid(currentCliInfo.version) &&
|
|
179
|
+
!(currentCliInfo.version.startsWith("file:") ||
|
|
180
|
+
currentCliInfo.version.startsWith("link:")) &&
|
|
181
|
+
targetVersions.cli &&
|
|
182
|
+
gt(targetVersions.cli, currentCliInfo.version));
|
|
296
183
|
}
|
|
297
184
|
catch (error) {
|
|
298
185
|
logger.error("Error checking versions to upgrade, releasing lock and exiting", getErrorMeta(error));
|
|
@@ -308,12 +195,8 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
308
195
|
hasFailedToUpgrade = true;
|
|
309
196
|
return;
|
|
310
197
|
}
|
|
311
|
-
if (!cliNeedsUpgrade && !libraryNeedsUpgrade) {
|
|
312
|
-
return; // Everything is up to date
|
|
313
|
-
}
|
|
314
198
|
try {
|
|
315
|
-
|
|
316
|
-
if (cliNeedsUpgrade) {
|
|
199
|
+
if (cliNeedsUpgrade && currentCliInfo) {
|
|
317
200
|
const cliUpgradePromise = traceFunction({
|
|
318
201
|
name: "upgradeCli",
|
|
319
202
|
tracer,
|
|
@@ -333,10 +216,7 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
333
216
|
name: "upgradePackageWithPackageManager - cli",
|
|
334
217
|
tracer,
|
|
335
218
|
fn: async () => {
|
|
336
|
-
await
|
|
337
|
-
alias: currentCliInfo.alias,
|
|
338
|
-
global: true,
|
|
339
|
-
});
|
|
219
|
+
await upgradeCliWithPackageManager(packageManager, targetVersions.cli, currentCliInfo.alias);
|
|
340
220
|
},
|
|
341
221
|
});
|
|
342
222
|
cliUpdated = true;
|
|
@@ -345,40 +225,28 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
345
225
|
});
|
|
346
226
|
upgradePromises.push(cliUpgradePromise);
|
|
347
227
|
}
|
|
348
|
-
if
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
228
|
+
// Skip if we're in local development
|
|
229
|
+
const packageJson = JSON.parse(await fs.readFile(path.join(process.cwd(), "package.json"), "utf8"));
|
|
230
|
+
packageJson.dependencies ??= {};
|
|
231
|
+
packageJson.devDependencies ??= {};
|
|
232
|
+
if (targetVersions.library.includes("-SNAPSHOT")) {
|
|
233
|
+
packageJson.dependencies["@superblocksteam/library"] =
|
|
234
|
+
"@superblocksteam/library@npm:@superblocksteam/library-ephemeral";
|
|
235
|
+
packageJson.devDependencies["@superblocksteam/linter"] =
|
|
236
|
+
"@superblocksteam/linter@npm:@superblocksteam/linter-ephemeral";
|
|
237
|
+
}
|
|
238
|
+
else {
|
|
239
|
+
packageJson.dependencies["@superblocksteam/library"] =
|
|
240
|
+
targetVersions.library;
|
|
241
|
+
packageJson.devDependencies["@superblocksteam/linter"] =
|
|
242
|
+
targetVersions.linter;
|
|
362
243
|
}
|
|
363
|
-
await
|
|
244
|
+
await fs.writeFile(path.join(process.cwd(), "package.json"), JSON.stringify(packageJson, null, 2));
|
|
364
245
|
}
|
|
365
246
|
catch (error) {
|
|
366
247
|
logger.error("Error upgrading packages, releasing lock and exiting", getErrorMeta(error));
|
|
367
248
|
hasFailedToUpgrade = true;
|
|
368
249
|
}
|
|
369
|
-
// Log what was updated
|
|
370
|
-
if (cliUpdated && libraryUpdated) {
|
|
371
|
-
logger.info("@superblocksteam/cli and @superblocksteam/library have been updated.");
|
|
372
|
-
}
|
|
373
|
-
else if (cliUpdated) {
|
|
374
|
-
logger.info("@superblocksteam/cli has been updated.");
|
|
375
|
-
}
|
|
376
|
-
else if (libraryUpdated) {
|
|
377
|
-
logger.info("@superblocksteam/library has been updated.");
|
|
378
|
-
}
|
|
379
|
-
else {
|
|
380
|
-
logger.info("No upgrades needed");
|
|
381
|
-
}
|
|
382
250
|
},
|
|
383
251
|
});
|
|
384
252
|
// Restart CLI if anything was updated
|
|
@@ -393,9 +261,6 @@ export async function checkVersionsAndUpgrade(lockService, config) {
|
|
|
393
261
|
}
|
|
394
262
|
process.exit(1);
|
|
395
263
|
}
|
|
396
|
-
return {
|
|
397
|
-
cliUpdated,
|
|
398
|
-
libraryUpdated,
|
|
399
|
-
};
|
|
264
|
+
return { cliUpdated, upgradePromises };
|
|
400
265
|
}
|
|
401
266
|
//# 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":"AAAA,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAqB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACxC,OAAO,KAAK,MAAM,2BAA2B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,MAAM,MAAM,4BAA4B,CAAC;AAKhD,MAAM,CAAC,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAEzC,MAAM,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;AAC3C,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;AAoB3B,KAAK,UAAU,iBAAiB,CAC9B,MAAyB;IAEzB,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,EAAE,EAAE,GAAG,MAAM,CAAC;IAEjD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,IAAI,GAAG,CACL,uBAAuB,EAAE,uBAAuB,EAChD,kBAAkB,CACnB,EACD;YACE,MAAM,EAAE,KAAK;YACb,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;SAC9C,CACF,CAAC;QAEF,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;YAChB,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAiC,CAAC;YACrE,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA+B,CAAC;YACpE,MAAM,CAAC,KAAK,CACV,qCAAqC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB;IAGxC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QACjE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,OAAO,cAAc,CAAC,CAAC;QACxD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAEtC,IAAI,CAAC,eAAe;YAAE,OAAO,SAAS,CAAC;QAEvC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAI,CAC1C,GAAG,eAAe,iBAAiB,CACpC,CAAC;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAA2B,CAAC;QACjE,qIAAqI;QACrI,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,CACtC,sCAAsC,EACtC,EAAE,CACH,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,4BAA4B,CAAC,CAAC;QACxE,IAAI,UAAU,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;YAC1C,OAAO;gBACL,OAAO,EAAE,OAAO;gBAChB,KAAK,EAAE,oBAAoB,UAAU,CAAC,CAAC,CAAC,EAAE;aAC3C,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,8BAA8B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,aAAqB;IACtD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QACjE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,OAAO,cAAc,CAAC,CAAC;QACxD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAEtC,IAAI,CAAC,eAAe;YAAE,OAAO,KAAK,CAAC;QAEnC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAI,CACpE,GAAG,eAAe,qBAAqB,aAAa,EAAE,CACvD,CAAC;QACF,OAAO,CAAC,CAAC,YAAY,GAAG,iBAAiB,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACvE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,CAAC,KAAK,CAAC,oCAAoC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,KAAK,UAAU,4BAA4B,CACzC,EAAgB,EAChB,aAAqB,EACrB,KAAc;IAEd,MAAM,WAAW,GAAG,KAAK;QACvB,CAAC,CAAC,4BAA4B,KAAK,IAAI,aAAa,EAAE;QACtD,CAAC,CAAC,wBAAwB,aAAa,EAAE,CAAC;IAE5C,MAAM,WAAW,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;IACrD,IAAI,EAAE,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;QACvB,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACpC,CAAC;IACD,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5B,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAE9B,MAAM,cAAc,GAAG,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAEvE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;QACzE,OAAO;IACT,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC;IACzC,MAAM,CAAC,IAAI,CAAC,WAAW,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,QAAmD,CAAC;IACxD,IAAI,QAAgC,CAAC;IACrC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpD,QAAQ,GAAG,OAAO,CAAC;QACnB,QAAQ,GAAG,MAAM,CAAC;IACpB,CAAC,CAAC,CAAC;IACH,MAAM,EAAE,GAAG,aAAa,CAAC,IAAI,CAC3B,GAAG,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAC9B;QACE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;KACnB,EACD,CAAC,KAAK,EAAE,EAAE;QACR,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,iCAAiC,aAAa,EAAE,CAAC,CAAC;YAC/D,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,qCAAqC,aAAa,EAAE,CAAC,CAAC;YAClE,QAAQ,EAAE,CAAC;QACb,CAAC;IACH,CAAC,CACF,CAAC;IACF,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QAC7B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QAC7B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,WAAwB,EACxB,MAAyB;IAKzB,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAE/B,MAAM,eAAe,GAAoB,EAAE,CAAC;IAE5C,MAAM,aAAa,CAAC;QAClB,IAAI,EAAE,yBAAyB;QAC/B,MAAM;QACN,EAAE,EAAE,KAAK,IAAI,EAAE;YACb,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC;gBACzC,IAAI,EAAE,sBAAsB;gBAC5B,MAAM;gBACN,EAAE,EAAE,KAAK,IAAI,EAAE;oBACb,OAAO,MAAM,MAAM,CAAC;wBAClB,UAAU,EAAE;4BACV,sBAAsB;4BACtB,UAAU;4BACV,kBAAkB;4BAClB,kBAAkB;yBACnB;wBACD,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;qBACnB,CAAC,CAAC;gBACL,CAAC;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;gBAC9D,kBAAkB,GAAG,IAAI,CAAC;gBAC1B,OAAO;YACT,CAAC;YAED,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC;gBACzC,IAAI,EAAE,sBAAsB;gBAC5B,MAAM;gBACN,EAAE,EAAE,KAAK,IAAI,EAAE;oBACb,OAAO,MAAM,oBAAoB,EAAE,CAAC;gBACtC,CAAC;aACF,CAAC,CAAC;YAEH,kCAAkC;YAClC,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC;gBACzC,IAAI,EAAE,mBAAmB;gBACzB,MAAM;gBACN,EAAE,EAAE,KAAK,IAAI,EAAE;oBACb,OAAO,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBACzC,CAAC;aACF,CAAC,CAAC;YACH,IAAI,CAAC,cAAc;gBAAE,OAAO;YAE5B,IAAI,eAAe,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC;gBACH,uDAAuD;gBACvD,6BAA6B;gBAC7B,eAAe,GAAG,OAAO,CACvB,cAAc;oBACZ,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC;oBAC7B,CAAC,CACC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;wBAC1C,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAC3C;oBACD,cAAc,CAAC,GAAG;oBAClB,EAAE,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,CACjD,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CACV,gEAAgE,EAChE,YAAY,CAAC,KAAK,CAAC,CACpB,CAAC;gBACF,MAAM,aAAa,CAAC;oBAClB,IAAI,EAAE,qBAAqB;oBAC3B,MAAM;oBACN,EAAE,EAAE,KAAK,IAAI,EAAE;wBACb,MAAM,WAAW,CAAC,QAAQ,CAAC;4BACzB,eAAe,EAAE,KAAK;yBACvB,CAAC,CAAC;oBACL,CAAC;iBACF,CAAC,CAAC;gBACH,kBAAkB,GAAG,IAAI,CAAC;gBAC1B,OAAO;YACT,CAAC;YAED,IAAI,CAAC;gBACH,IAAI,eAAe,IAAI,cAAc,EAAE,CAAC;oBACtC,MAAM,iBAAiB,GAAG,aAAa,CAAC;wBACtC,IAAI,EAAE,YAAY;wBAClB,MAAM;wBACN,EAAE,EAAE,KAAK,IAAI,EAAE;4BACb,MAAM,CAAC,IAAI,CACT,8BAA8B,cAAc,CAAC,OAAO,OAAO,cAAc,CAAC,GAAG,EAAE,CAChF,CAAC;4BACF,MAAM,qBAAqB,GAAG,MAAM,aAAa,CAAC;gCAChD,IAAI,EAAE,qBAAqB;gCAC3B,MAAM;gCACN,EAAE,EAAE,KAAK,IAAI,EAAE;oCACb,OAAO,MAAM,mBAAmB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;gCACvD,CAAC;6BACF,CAAC,CAAC;4BACH,IAAI,CAAC,qBAAqB,EAAE,CAAC;gCAC3B,MAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;gCAC/D,uCAAuC;gCACvC,MAAM,aAAa,CAAC;oCAClB,IAAI,EAAE,wCAAwC;oCAC9C,MAAM;oCACN,EAAE,EAAE,KAAK,IAAI,EAAE;wCACb,MAAM,4BAA4B,CAChC,cAAc,EACd,cAAc,CAAC,GAAG,EAClB,cAAc,CAAC,KAAK,CACrB,CAAC;oCACJ,CAAC;iCACF,CAAC,CAAC;gCACH,UAAU,GAAG,IAAI,CAAC;4BACpB,CAAC;wBACH,CAAC;qBACF,CAAC,CAAC;oBACH,eAAe,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAC1C,CAAC;gBAED,qCAAqC;gBACrC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CACpE,CAAC;gBAEF,WAAW,CAAC,YAAY,KAAK,EAAE,CAAC;gBAChC,WAAW,CAAC,eAAe,KAAK,EAAE,CAAC;gBACnC,IAAI,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBACjD,WAAW,CAAC,YAAY,CAAC,0BAA0B,CAAC;wBAClD,iEAAiE,CAAC;oBACpE,WAAW,CAAC,eAAe,CAAC,yBAAyB,CAAC;wBACpD,+DAA+D,CAAC;gBACpE,CAAC;qBAAM,CAAC;oBACN,WAAW,CAAC,YAAY,CAAC,0BAA0B,CAAC;wBAClD,cAAc,CAAC,OAAO,CAAC;oBACzB,WAAW,CAAC,eAAe,CAAC,yBAAyB,CAAC;wBACpD,cAAc,CAAC,MAAM,CAAC;gBAC1B,CAAC;gBAED,MAAM,EAAE,CAAC,SAAS,CAChB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,EACxC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CACrC,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CACV,sDAAsD,EACtD,YAAY,CAAC,KAAK,CAAC,CACpB,CAAC;gBACF,kBAAkB,GAAG,IAAI,CAAC;YAC5B,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,sCAAsC;IACtC,IAAI,kBAAkB,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,WAAW,CAAC,QAAQ,CAAC;gBACzB,eAAe,EAAE,KAAK;aACvB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CACV,qDAAqD,EACrD,YAAY,CAAC,KAAK,CAAC,CACpB,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC;AACzC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.mts","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"dev.d.mts","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AA6BpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAoE5D,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,iBA0RA"}
|
|
@@ -9,7 +9,6 @@ import { LockService, LockType, } from "@superblocksteam/vite-plugin-file-sync/l
|
|
|
9
9
|
import { OperationQueue } from "@superblocksteam/vite-plugin-file-sync/operation-queue";
|
|
10
10
|
import { SyncService } from "@superblocksteam/vite-plugin-file-sync/sync-service";
|
|
11
11
|
import { green } from "colorette";
|
|
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";
|
|
@@ -17,7 +16,7 @@ import { getErrorMeta, getLogger } from "../dev-utils/dev-logger.mjs";
|
|
|
17
16
|
import { createDevServer } from "../dev-utils/dev-server.mjs";
|
|
18
17
|
import tracer, { initializeTracingSdk } from "../dev-utils/dev-tracer.js";
|
|
19
18
|
import { SuperblocksSdk } from "../sdk.js";
|
|
20
|
-
import {
|
|
19
|
+
import { checkVersionsAndWritePackageJson, getCurrentCliVersion, } from "./automatic-upgrades.js";
|
|
21
20
|
import { AUTO_UPGRADE_EXIT_CODE } from "./automatic-upgrades.js";
|
|
22
21
|
const exec = promisify(child_process.exec);
|
|
23
22
|
const passErrorToVSCode = (message, logger) => {
|
|
@@ -50,15 +49,21 @@ async function installPackages(cwd, logger) {
|
|
|
50
49
|
logger.warn("Could not detect package manager, skipping package installation");
|
|
51
50
|
return;
|
|
52
51
|
}
|
|
53
|
-
const installCommand = resolveCommand(pm.agent, "install", [
|
|
52
|
+
const installCommand = resolveCommand(pm.agent, "install", [
|
|
53
|
+
"--fund=false",
|
|
54
|
+
"--audit=false",
|
|
55
|
+
]);
|
|
54
56
|
if (!installCommand) {
|
|
55
57
|
logger.warn(`Could not determine install command for ${pm.agent}, skipping package installation`);
|
|
56
58
|
return;
|
|
57
59
|
}
|
|
58
60
|
const { command, args } = installCommand;
|
|
59
61
|
logger.info(`Running ${command} ${args.join(" ")} to install dependencies…`);
|
|
60
|
-
await exec(`${command} ${args.join(" ")}`, {
|
|
62
|
+
const { stdout } = await exec(`${command} ${args.join(" ")}`, {
|
|
63
|
+
cwd,
|
|
64
|
+
});
|
|
61
65
|
logger.info("Package installation completed successfully");
|
|
66
|
+
logger.info(stdout);
|
|
62
67
|
}
|
|
63
68
|
catch (error) {
|
|
64
69
|
logger.error(`Error during package installation: ${error}`);
|
|
@@ -75,8 +80,7 @@ export async function dev(options) {
|
|
|
75
80
|
}
|
|
76
81
|
logger.info(`Starting dev server with auth file: ${process.env.SUPERBLOCKS_AUTH_FILE}`);
|
|
77
82
|
const cliVersion = await getCurrentCliVersion();
|
|
78
|
-
|
|
79
|
-
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}`);
|
|
83
|
+
logger.info(`Running command: ${options.superblocksPath} dev${options.uploadFirst ? " --upload-first" : ""}${options.downloadFirst ? " --download-first" : ""} with baseUrl: ${applicationConfig?.superblocksBaseUrl}, cliVersion: ${cliVersion?.version}${cliVersion?.alias ? ` (${cliVersion.alias})` : ""}`);
|
|
80
84
|
const port = devServerPort ?? 5173;
|
|
81
85
|
const fsOperationQueue = new OperationQueue();
|
|
82
86
|
let syncService;
|
|
@@ -162,34 +166,23 @@ export async function dev(options) {
|
|
|
162
166
|
throw new Error("Choose either --download-first or --upload-first");
|
|
163
167
|
}
|
|
164
168
|
let hasPackageChanged = false;
|
|
169
|
+
const packageJsonBefore = await readPkgJson(cwd);
|
|
165
170
|
if (downloadFirst) {
|
|
166
171
|
await tracer.startActiveSpan("downloadFirst", async (span) => {
|
|
167
172
|
logger.info(`Starting download of branch '${applicationConfig.branchName}'`);
|
|
168
|
-
const packageJsonBefore = await readPkgJson(cwd);
|
|
169
173
|
await syncService.downloadDirectory();
|
|
170
|
-
const packageJsonAfter = await readPkgJson(cwd);
|
|
171
|
-
if (packageJsonBefore && packageJsonAfter) {
|
|
172
|
-
const diff = diffJson(packageJsonBefore, packageJsonAfter);
|
|
173
|
-
hasPackageChanged = diff.some((part) => part.added || part.removed);
|
|
174
|
-
}
|
|
175
|
-
else if (packageJsonAfter) {
|
|
176
|
-
hasPackageChanged = true;
|
|
177
|
-
logger.info("package.json was created, installing packages…");
|
|
178
|
-
}
|
|
179
174
|
span.end();
|
|
180
175
|
});
|
|
181
176
|
}
|
|
182
177
|
let hasCliUpdated = false;
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
!
|
|
178
|
+
let upgradePromises = [];
|
|
179
|
+
if (!skipAutoUpgrade &&
|
|
180
|
+
(!process.env.PACKAGE_SUFFIX || process.env.PACKAGE_SUFFIX === "")) {
|
|
186
181
|
await tracer.startActiveSpan("versionCheckAndUpgrade", async (span) => {
|
|
187
182
|
if (lockService) {
|
|
188
|
-
const result = await
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
}
|
|
192
|
-
hasCliUpdated = result?.cliUpdated ?? false;
|
|
183
|
+
const result = await checkVersionsAndWritePackageJson(lockService, applicationConfig);
|
|
184
|
+
hasCliUpdated = result.cliUpdated;
|
|
185
|
+
upgradePromises = result.upgradePromises;
|
|
193
186
|
}
|
|
194
187
|
else {
|
|
195
188
|
logger.warn("Lock service is not available, skipping version check and upgrade");
|
|
@@ -197,13 +190,30 @@ export async function dev(options) {
|
|
|
197
190
|
span.end();
|
|
198
191
|
});
|
|
199
192
|
}
|
|
200
|
-
|
|
193
|
+
const packageJsonAfter = await readPkgJson(cwd);
|
|
194
|
+
if (packageJsonBefore && packageJsonAfter) {
|
|
195
|
+
hasPackageChanged =
|
|
196
|
+
JSON.stringify(packageJsonBefore, null, 2) !==
|
|
197
|
+
JSON.stringify(packageJsonAfter, null, 2);
|
|
198
|
+
}
|
|
199
|
+
else if (packageJsonAfter) {
|
|
200
|
+
hasPackageChanged = true;
|
|
201
|
+
logger.info("package.json was created, installing packages…");
|
|
202
|
+
}
|
|
203
|
+
if (hasPackageChanged || upgradePromises.length > 0) {
|
|
201
204
|
logger.info("Installing packages…");
|
|
202
205
|
await tracer.startActiveSpan("installPackages", async (span) => {
|
|
203
|
-
|
|
206
|
+
// Upgrade global CLI and local packages in parallel - improves performance
|
|
207
|
+
await Promise.all([
|
|
208
|
+
...upgradePromises,
|
|
209
|
+
installPackages(cwd, logger),
|
|
210
|
+
]);
|
|
204
211
|
span.end();
|
|
205
212
|
});
|
|
206
213
|
}
|
|
214
|
+
else {
|
|
215
|
+
logger.info("package.json has not changed, skipping package installation");
|
|
216
|
+
}
|
|
207
217
|
if (hasPackageChanged || uploadFirst) {
|
|
208
218
|
logger.info(`Uploading local files to branch '${applicationConfig.branchName}' on server before starting`);
|
|
209
219
|
await tracer.startActiveSpan("uploadFirstOrPackageChanged", async (span) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.mjs","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"AAAA,OAAO,4BAA4B,CAAC;AAEpC,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AAC9E,OAAO,EACL,WAAW,EACX,QAAQ,GACT,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,wDAAwD,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dev.mjs","sourceRoot":"","sources":["../../src/cli-replacement/dev.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,iFAmMxB"}
|
|
@@ -83,6 +83,7 @@ export async function createDevServer({ root, mode, fsOperationQueue, syncServic
|
|
|
83
83
|
app.use(express.json());
|
|
84
84
|
app.use((req, res, next) => {
|
|
85
85
|
res.setHeader("Cache-Control", "no-store, max-age=0");
|
|
86
|
+
res.setHeader("x-csb-no-sw-proxy", "1");
|
|
86
87
|
if (req.url === "/_sb_connect" ||
|
|
87
88
|
req.url === "/_sb_disconnect" ||
|
|
88
89
|
req.url === "/_sb_health" ||
|
|
@@ -172,6 +173,13 @@ export async function createDevServer({ root, mode, fsOperationQueue, syncServic
|
|
|
172
173
|
logger.info("SIGABRT received");
|
|
173
174
|
await gracefulShutdown({ logger, serverInitiated: false });
|
|
174
175
|
});
|
|
176
|
+
process.on("uncaughtException", (error) => {
|
|
177
|
+
logger.error("Uncaught exception", getErrorMeta(error));
|
|
178
|
+
gracefulShutdown({ logger, serverInitiated: false }).catch((shutdownError) => {
|
|
179
|
+
logger.error("Error during shutdown after uncaught exception:", shutdownError);
|
|
180
|
+
process.exit(1);
|
|
181
|
+
});
|
|
182
|
+
});
|
|
175
183
|
httpServer = await app.listen(port);
|
|
176
184
|
return httpServer;
|
|
177
185
|
}
|