@superblocksteam/sdk 2.0.6-next.6 → 2.0.6-next.60
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 +199 -93
- package/dist/cli-replacement/automatic-upgrades.js.map +1 -1
- package/dist/cli-replacement/dev.d.mts +1 -2
- package/dist/cli-replacement/dev.d.mts.map +1 -1
- package/dist/cli-replacement/dev.mjs +53 -29
- package/dist/cli-replacement/dev.mjs.map +1 -1
- package/dist/dev-utils/dev-logger.d.mts +17 -7
- package/dist/dev-utils/dev-logger.d.mts.map +1 -1
- package/dist/dev-utils/dev-logger.mjs +50 -9
- package/dist/dev-utils/dev-logger.mjs.map +1 -1
- package/dist/dev-utils/dev-server.d.mts.map +1 -1
- package/dist/dev-utils/dev-server.mjs +8 -12
- package/dist/dev-utils/dev-server.mjs.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/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 +253 -113
- package/src/cli-replacement/dev.mts +67 -42
- package/src/dev-utils/dev-logger.mts +94 -20
- package/src/dev-utils/dev-server.mts +10 -12
- 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/vite-plugin-generate-build-manifest.mts +193 -0
- package/src/vite-plugin-inject-sb-ids-transform.mts +1 -1
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -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
17
|
import tracer 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,15 @@ 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
|
-
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}`);
|
|
69
|
+
const { cwd, devServerPort, downloadFirst, uploadFirst, skipSync, applicationConfig, skipAutoUpgrade, } = options;
|
|
73
70
|
// Add check for node_modules
|
|
74
71
|
if (!fs.existsSync(path.join(cwd, "node_modules"))) {
|
|
75
72
|
throw new Error('node_modules folder is missing. Please run "npm install" first.');
|
|
76
73
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
74
|
+
logger.info("Starting dev server");
|
|
75
|
+
const cliVersion = await getCurrentCliVersion();
|
|
76
|
+
const libraryVersion = await getCurrentLibraryVersionWithoutPM();
|
|
77
|
+
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}`);
|
|
80
78
|
const port = devServerPort ?? 5173;
|
|
81
79
|
const fsOperationQueue = new OperationQueue();
|
|
82
80
|
let syncService;
|
|
@@ -110,15 +108,9 @@ export async function dev(options) {
|
|
|
110
108
|
if (lockService) {
|
|
111
109
|
try {
|
|
112
110
|
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
111
|
}
|
|
120
112
|
catch (error) {
|
|
121
|
-
logger.error("Failed to acquire lock on application", error);
|
|
113
|
+
logger.error("Failed to acquire lock on application", getErrorMeta(error));
|
|
122
114
|
passErrorToVSCode(error.context?.message, logger);
|
|
123
115
|
throw new Error(`Failed to acquire lock on application: ${error}`);
|
|
124
116
|
}
|
|
@@ -137,7 +129,6 @@ export async function dev(options) {
|
|
|
137
129
|
appRootDirPath: options.cwd,
|
|
138
130
|
applicationId: applicationConfig.id,
|
|
139
131
|
organizationId: currentUser.organizations[0].id,
|
|
140
|
-
anthropicApiKey: process.env.ANTHROPIC_API_KEY || "",
|
|
141
132
|
fsOperationQueue,
|
|
142
133
|
draftInterface: syncService,
|
|
143
134
|
tracer,
|
|
@@ -145,41 +136,70 @@ export async function dev(options) {
|
|
|
145
136
|
const isSynced = localContents.hash === serverHash;
|
|
146
137
|
if (isSynced) {
|
|
147
138
|
logger.info("Local files are in sync with the server");
|
|
148
|
-
return;
|
|
149
139
|
}
|
|
150
|
-
|
|
140
|
+
else {
|
|
141
|
+
logger.info("Local files are out of sync with the server");
|
|
142
|
+
}
|
|
151
143
|
if (!(downloadFirst || uploadFirst)) {
|
|
152
144
|
throw new Error("You must choose --download-first or --upload-first to use the dev command");
|
|
153
145
|
}
|
|
154
146
|
if (downloadFirst && uploadFirst) {
|
|
155
147
|
throw new Error("Choose either --download-first or --upload-first");
|
|
156
148
|
}
|
|
149
|
+
let hasPackageChanged = false;
|
|
157
150
|
if (downloadFirst) {
|
|
158
|
-
logger.info("Starting
|
|
159
|
-
// Read package.json before download
|
|
151
|
+
logger.info("Starting download");
|
|
160
152
|
const packageJsonBefore = await readPkgJson(cwd);
|
|
161
153
|
await syncService.downloadDirectory();
|
|
162
|
-
// Read package.json after download and compare
|
|
163
154
|
const packageJsonAfter = await readPkgJson(cwd);
|
|
164
|
-
// Check if package.json changed
|
|
165
155
|
if (packageJsonBefore && packageJsonAfter) {
|
|
166
156
|
const diff = diffJson(packageJsonBefore, packageJsonAfter);
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
157
|
+
hasPackageChanged = diff.some((part) => part.added || part.removed);
|
|
158
|
+
}
|
|
159
|
+
else if (packageJsonAfter) {
|
|
160
|
+
hasPackageChanged = true;
|
|
161
|
+
logger.info("package.json was created, installing packages…");
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
let hasCliUpdated = false;
|
|
165
|
+
if (!process.env.PACKAGE_SUFFIX ||
|
|
166
|
+
process.env.PACKAGE_SUFFIX === "" ||
|
|
167
|
+
!skipAutoUpgrade) {
|
|
168
|
+
if (lockService) {
|
|
169
|
+
const result = await checkVersionsAndUpgrade(lockService, applicationConfig);
|
|
170
|
+
if (result?.libraryUpdated) {
|
|
171
|
+
hasPackageChanged = true;
|
|
171
172
|
}
|
|
173
|
+
hasCliUpdated = result?.cliUpdated ?? false;
|
|
172
174
|
}
|
|
175
|
+
else {
|
|
176
|
+
logger.warn("Lock service is not available, skipping version check and upgrade");
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
if (hasPackageChanged) {
|
|
180
|
+
logger.info("Installing packages…");
|
|
181
|
+
await installPackages(cwd, logger);
|
|
173
182
|
}
|
|
174
|
-
|
|
183
|
+
if (hasPackageChanged || uploadFirst) {
|
|
175
184
|
logger.info("Uploading local files to server before starting");
|
|
176
185
|
await syncService.uploadDirectory();
|
|
186
|
+
await syncService.uploadDirectoryNowIfNeeded();
|
|
187
|
+
}
|
|
188
|
+
if (hasCliUpdated) {
|
|
189
|
+
logger.info("CLI was updated, restarting the dev server…");
|
|
190
|
+
process.exit(AUTO_UPGRADE_EXIT_CODE);
|
|
177
191
|
}
|
|
178
192
|
});
|
|
179
193
|
}
|
|
180
194
|
catch (error) {
|
|
181
195
|
logger.error(error.message);
|
|
182
|
-
|
|
196
|
+
try {
|
|
197
|
+
await lockService?.shutdownAndExit();
|
|
198
|
+
}
|
|
199
|
+
finally {
|
|
200
|
+
// this is redundant, but it's here to make sure the lock service is shutdown and the process exits
|
|
201
|
+
process.exit(1);
|
|
202
|
+
}
|
|
183
203
|
}
|
|
184
204
|
}
|
|
185
205
|
else {
|
|
@@ -198,6 +218,10 @@ export async function dev(options) {
|
|
|
198
218
|
options.signal?.addEventListener("abort", () => {
|
|
199
219
|
logger.info("Server closed");
|
|
200
220
|
httpServer.close();
|
|
221
|
+
lockService?.shutdownAndExit().catch(() => {
|
|
222
|
+
// this is redundant, but it's here to make sure the lock service is shutdown and the process exits
|
|
223
|
+
process.exit(1);
|
|
224
|
+
});
|
|
201
225
|
});
|
|
202
226
|
logger.debug(green(`Local server started at port ${port}`));
|
|
203
227
|
logger.debug(green(`Visit your application at:`));
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"dev.mjs","sourceRoot":"","sources":["../../src/cli-replacement/dev.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
};
|
|
7
|
-
|
|
1
|
+
interface ErrorMeta {
|
|
2
|
+
error: {
|
|
3
|
+
kind: string;
|
|
4
|
+
message: string;
|
|
5
|
+
stack?: string;
|
|
6
|
+
};
|
|
7
|
+
}
|
|
8
|
+
export interface DevLogger {
|
|
9
|
+
log: (...messages: string[]) => void;
|
|
10
|
+
debug: (...messages: string[]) => void;
|
|
11
|
+
info: (...messages: string[]) => void;
|
|
12
|
+
warn: (...messages: string[]) => void;
|
|
13
|
+
error: (message: string, meta?: ErrorMeta) => void;
|
|
14
|
+
}
|
|
15
|
+
export declare function getLogger(loggerOverride?: (...messages: string[]) => void): DevLogger;
|
|
16
|
+
export declare function getErrorMeta(error: unknown): ErrorMeta;
|
|
17
|
+
export {};
|
|
8
18
|
//# sourceMappingURL=dev-logger.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-logger.d.mts","sourceRoot":"","sources":["../../src/dev-utils/dev-logger.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dev-logger.d.mts","sourceRoot":"","sources":["../../src/dev-utils/dev-logger.mts"],"names":[],"mappings":"AA4CA,UAAU,SAAS;IACjB,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACrC,KAAK,EAAE,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACvC,IAAI,EAAE,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACtC,IAAI,EAAE,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACtC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;CACpD;AAsBD,wBAAgB,SAAS,CACvB,cAAc,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,GAC/C,SAAS,CAYX;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,CAgBtD"}
|
|
@@ -1,25 +1,66 @@
|
|
|
1
1
|
import { createLogger, format, transports } from "winston";
|
|
2
|
+
const activeTransports = [];
|
|
3
|
+
if (process.env.SUPERBLOCKS_IS_CSB === "true") {
|
|
4
|
+
activeTransports.push(new transports.File({
|
|
5
|
+
format: format.json(),
|
|
6
|
+
filename: `/tmp/dev-server.log`,
|
|
7
|
+
level: "info",
|
|
8
|
+
}));
|
|
9
|
+
}
|
|
10
|
+
activeTransports.push(new transports.Console({
|
|
11
|
+
format: format.combine(format.colorize(), format.timestamp({
|
|
12
|
+
format: "HH:mm:ss.SSS",
|
|
13
|
+
}), format.printf((props) => {
|
|
14
|
+
const { message, timestamp, error, level } = props;
|
|
15
|
+
const base = process.env.SUPERBLOCKS_IS_CSB === "true"
|
|
16
|
+
? `${timestamp} ${message}`
|
|
17
|
+
: `${message}`;
|
|
18
|
+
if (level === "error") {
|
|
19
|
+
return `${base} ${error.message} ${error.stack}`;
|
|
20
|
+
}
|
|
21
|
+
return base;
|
|
22
|
+
})),
|
|
23
|
+
}));
|
|
2
24
|
const winstonLogger = createLogger({
|
|
3
|
-
level: "
|
|
25
|
+
level: "debug",
|
|
4
26
|
exitOnError: false,
|
|
5
27
|
format: format.json(),
|
|
6
|
-
transports:
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
],
|
|
28
|
+
transports: activeTransports,
|
|
29
|
+
});
|
|
30
|
+
const logger = Object.freeze({
|
|
31
|
+
debug: (...messages) => winstonLogger.debug(messages.length > 0 ? messages.join(" ") : messages[0]),
|
|
32
|
+
log: (...messages) => winstonLogger.info(messages.length > 0 ? messages.join(" ") : messages[0]),
|
|
33
|
+
info: (...messages) => winstonLogger.info(messages.length > 0 ? messages.join(" ") : messages[0]),
|
|
34
|
+
warn: (...messages) => winstonLogger.warn(messages.length > 0 ? messages.join(" ") : messages[0]),
|
|
35
|
+
error: (message, meta) => winstonLogger.error(message, meta),
|
|
13
36
|
});
|
|
14
37
|
export function getLogger(loggerOverride) {
|
|
15
38
|
if (!loggerOverride) {
|
|
16
|
-
return
|
|
39
|
+
return logger;
|
|
17
40
|
}
|
|
18
41
|
return {
|
|
19
42
|
debug: loggerOverride,
|
|
20
43
|
info: loggerOverride,
|
|
21
44
|
warn: loggerOverride,
|
|
45
|
+
log: loggerOverride,
|
|
22
46
|
error: loggerOverride,
|
|
23
47
|
};
|
|
24
48
|
}
|
|
49
|
+
export function getErrorMeta(error) {
|
|
50
|
+
if (error instanceof Error) {
|
|
51
|
+
return {
|
|
52
|
+
error: {
|
|
53
|
+
kind: error.name,
|
|
54
|
+
message: error.message,
|
|
55
|
+
stack: error.stack,
|
|
56
|
+
},
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
return {
|
|
60
|
+
error: {
|
|
61
|
+
kind: "Unknown Error",
|
|
62
|
+
message: JSON.stringify(error),
|
|
63
|
+
},
|
|
64
|
+
};
|
|
65
|
+
}
|
|
25
66
|
//# sourceMappingURL=dev-logger.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-logger.mjs","sourceRoot":"","sources":["../../src/dev-utils/dev-logger.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-logger.mjs","sourceRoot":"","sources":["../../src/dev-utils/dev-logger.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.d.mts","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dev-server.d.mts","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mDAAmD,CAAC;AACnF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wDAAwD,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qDAAqD,CAAC;AACvF,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAIlC,UAAU,sBAAsB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,cAAc,CAAC;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAKD,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,IAAI,EACJ,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,SAAS,EACT,MAAM,EAAE,cAAc,EACtB,IAAI,GACL,EAAE,sBAAsB,iFAqLxB"}
|
|
@@ -14,7 +14,8 @@ import { createLogger, createServer, loadEnv } from "vite";
|
|
|
14
14
|
import tsconfigPaths from "vite-tsconfig-paths";
|
|
15
15
|
import pkg from "../../package.json" with { type: "json" };
|
|
16
16
|
import { customComponentsPlugin, isCustomComponentsEnabled, } from "./custom-build.mjs";
|
|
17
|
-
import { getLogger } from "./dev-logger.mjs";
|
|
17
|
+
import { getErrorMeta, getLogger } from "./dev-logger.mjs";
|
|
18
|
+
import { buildManifestStubPlugin } from "./vite-plugin-build-manifest-stub.mjs";
|
|
18
19
|
import { ddRumPlugin } from "./vite-plugin-dd-rum.mjs";
|
|
19
20
|
import { superblocksCdnPlugin } from "./vite-plugin-sb-cdn.mjs";
|
|
20
21
|
let httpServer;
|
|
@@ -129,13 +130,6 @@ export async function createDevServer({ root, mode, fsOperationQueue, syncServic
|
|
|
129
130
|
res.send(JSON.stringify(healthResponse));
|
|
130
131
|
}, viteReject);
|
|
131
132
|
});
|
|
132
|
-
// TODO(code-mode): remove this soon
|
|
133
|
-
app.get("/_sb_disconnect", async (_req, res) => {
|
|
134
|
-
console.log("GET /_sb_disconnect");
|
|
135
|
-
// TODO(code-mode): should this include any validation checks, such as getting a token?
|
|
136
|
-
await gracefulShutdown({ logger, serverInitiated: false });
|
|
137
|
-
res.send("ok");
|
|
138
|
-
});
|
|
139
133
|
app.post("/_sb_disconnect", async (req, res) => {
|
|
140
134
|
const { initiatedByEmail, switchingTo } = req.body;
|
|
141
135
|
// TODO(code-mode): should this include any validation checks, such as getting a token?
|
|
@@ -149,7 +143,7 @@ export async function createDevServer({ root, mode, fsOperationQueue, syncServic
|
|
|
149
143
|
res.send("ok");
|
|
150
144
|
}
|
|
151
145
|
catch (e) {
|
|
152
|
-
|
|
146
|
+
logger.error("Error disconnecting from dev server", getErrorMeta(e));
|
|
153
147
|
res.status(500).send("Error disconnecting from dev server");
|
|
154
148
|
}
|
|
155
149
|
});
|
|
@@ -184,7 +178,7 @@ export async function createDevServer({ root, mode, fsOperationQueue, syncServic
|
|
|
184
178
|
async function startVite({ app, httpServer, root, mode, port, fsOperationQueue, syncService, lockService, aiService, logger: loggerOverride, }) {
|
|
185
179
|
const viteLogger = createLogger();
|
|
186
180
|
const logger = getLogger(loggerOverride);
|
|
187
|
-
viteLogger.info = logger.info;
|
|
181
|
+
viteLogger.info = (msg) => logger.info(msg);
|
|
188
182
|
viteLogger.warn = (msg) => {
|
|
189
183
|
logger.warn(yellow(msg));
|
|
190
184
|
};
|
|
@@ -197,6 +191,7 @@ async function startVite({ app, httpServer, root, mode, port, fsOperationQueue,
|
|
|
197
191
|
viteLogger.clearScreen = () => { };
|
|
198
192
|
const isCustomBuildEnabled = await isCustomComponentsEnabled();
|
|
199
193
|
const customFolder = path.join(root, "custom");
|
|
194
|
+
const draftsFolder = path.join(root, ".superblocks");
|
|
200
195
|
const cdnUrl = process.env.SUPERBLOCKS_CDN_URL ?? "http://localhost:4040/cdn";
|
|
201
196
|
const env = loadEnv(mode, root, "");
|
|
202
197
|
const hmrPort = await getFreePort();
|
|
@@ -229,7 +224,7 @@ async function startVite({ app, httpServer, root, mode, port, fsOperationQueue,
|
|
|
229
224
|
server: {
|
|
230
225
|
middlewareMode: true,
|
|
231
226
|
watch: {
|
|
232
|
-
ignored: [`${customFolder}/**/*`],
|
|
227
|
+
ignored: [`${customFolder}/**/*`, `${draftsFolder}/**/*`],
|
|
233
228
|
},
|
|
234
229
|
hmr: hmrOptions,
|
|
235
230
|
cors: {
|
|
@@ -256,8 +251,9 @@ async function startVite({ app, httpServer, root, mode, port, fsOperationQueue,
|
|
|
256
251
|
aiService,
|
|
257
252
|
httpServer,
|
|
258
253
|
tracer,
|
|
259
|
-
logger,
|
|
260
254
|
}, { isCustomBuildEnabled }),
|
|
255
|
+
// Add a virtual "stub" module for the build manifest
|
|
256
|
+
buildManifestStubPlugin(),
|
|
261
257
|
// for now, only use the CDN locally
|
|
262
258
|
superblocksCdnPlugin({
|
|
263
259
|
imports: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.mjs","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,wCAAwC;AACxC,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,oCAAoC,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,KAAK,MAAM,sBAAsB,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3D,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,GAAG,MAAM,oBAAoB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AAC3D,OAAO,EACL,sBAAsB,EACtB,yBAAyB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-server.mjs","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { Plugin } from "vite";
|
|
2
|
+
/**
|
|
3
|
+
* This plugin is used to stub the build manifest module. It creates a virtual module
|
|
4
|
+
* for the build manifest module and returns an empty object.
|
|
5
|
+
*
|
|
6
|
+
* This is meant to be used to avoid errors when the build manifest module is not found.
|
|
7
|
+
* This plugin only runs in dev server mode.
|
|
8
|
+
*/
|
|
9
|
+
export declare const buildManifestStubPlugin: () => Plugin;
|
|
10
|
+
//# sourceMappingURL=vite-plugin-build-manifest-stub.d.mts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vite-plugin-build-manifest-stub.d.mts","sourceRoot":"","sources":["../../src/dev-utils/vite-plugin-build-manifest-stub.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAKnC;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,QAAO,MAiB1C,CAAC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
const BUILD_MANIFEST_MODULE_PATH = "./user-facing/build-manifest.js";
|
|
2
|
+
const VIRTUAL_MODULE_ID = "\0virtual:build-manifest.js";
|
|
3
|
+
/**
|
|
4
|
+
* This plugin is used to stub the build manifest module. It creates a virtual module
|
|
5
|
+
* for the build manifest module and returns an empty object.
|
|
6
|
+
*
|
|
7
|
+
* This is meant to be used to avoid errors when the build manifest module is not found.
|
|
8
|
+
* This plugin only runs in dev server mode.
|
|
9
|
+
*/
|
|
10
|
+
export const buildManifestStubPlugin = () => {
|
|
11
|
+
return {
|
|
12
|
+
name: "build-manifest-stub",
|
|
13
|
+
enforce: "pre",
|
|
14
|
+
apply: "serve",
|
|
15
|
+
resolveId(source) {
|
|
16
|
+
if (source === BUILD_MANIFEST_MODULE_PATH) {
|
|
17
|
+
return VIRTUAL_MODULE_ID;
|
|
18
|
+
}
|
|
19
|
+
},
|
|
20
|
+
load(id) {
|
|
21
|
+
if (id === VIRTUAL_MODULE_ID) {
|
|
22
|
+
return "export default {}";
|
|
23
|
+
}
|
|
24
|
+
},
|
|
25
|
+
};
|
|
26
|
+
};
|
|
27
|
+
//# sourceMappingURL=vite-plugin-build-manifest-stub.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vite-plugin-build-manifest-stub.mjs","sourceRoot":"","sources":["../../src/dev-utils/vite-plugin-build-manifest-stub.mts"],"names":[],"mappings":"AAEA,MAAM,0BAA0B,GAAG,iCAAiC,CAAC;AACrE,MAAM,iBAAiB,GAAG,6BAA6B,CAAC;AAExD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAW,EAAE;IAClD,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,OAAO;QAEd,SAAS,CAAC,MAAM;YACd,IAAI,MAAM,KAAK,0BAA0B,EAAE,CAAC;gBAC1C,OAAO,iBAAiB,CAAC;YAC3B,CAAC;QACH,CAAC;QACD,IAAI,CAAC,EAAE;YACL,IAAI,EAAE,KAAK,iBAAiB,EAAE,CAAC;gBAC7B,OAAO,mBAAmB,CAAC;YAC7B,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-plugin-sb-cdn.d.mts","sourceRoot":"","sources":["../../src/dev-utils/vite-plugin-sb-cdn.mts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,MAAM,EAIZ,MAAM,MAAM,CAAC;AAQd;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;
|
|
1
|
+
{"version":3,"file":"vite-plugin-sb-cdn.d.mts","sourceRoot":"","sources":["../../src/dev-utils/vite-plugin-sb-cdn.mts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,MAAM,EAIZ,MAAM,MAAM,CAAC;AAQd;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC;AAucD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,MAAM,EAAE,CAAC,CAghBnB"}
|
|
@@ -127,8 +127,8 @@ async function extractImportsFromCode(code) {
|
|
|
127
127
|
* @returns Object containing all dependencies, content, binary data, and visited modules
|
|
128
128
|
*/
|
|
129
129
|
async function analyzeModuleGraph(baseUrl, url, visited = new Set(), visitedModules = new Map()) {
|
|
130
|
-
// Avoid circular dependencies
|
|
131
|
-
if (visited.has(url)) {
|
|
130
|
+
// Avoid circular dependencies and skip the shared library's build manifest reference
|
|
131
|
+
if (visited.has(url) || url.endsWith("/user-facing/build-manifest.js")) {
|
|
132
132
|
return {
|
|
133
133
|
dependencies: new Set(),
|
|
134
134
|
content: "",
|
|
@@ -312,6 +312,12 @@ const wellKnownPackages = new Map([
|
|
|
312
312
|
["react-dom", "https://esm.sh/react-dom@18.2.0"],
|
|
313
313
|
["react/jsx-runtime", "https://esm.sh/react@18.2.0/jsx-runtime"],
|
|
314
314
|
["react/jsx-dev-runtime", "https://esm.sh/react@18.2.0/jsx-dev-runtime"],
|
|
315
|
+
["./user-facing/build-manifest.js", "/assets/build-manifest.js"],
|
|
316
|
+
["/assets/user-facing/build-manifest.js", "/assets/build-manifest.js"],
|
|
317
|
+
]);
|
|
318
|
+
const packagesToExcludeFromCdnRedirect = new Set([
|
|
319
|
+
"./user-facing/build-manifest.js",
|
|
320
|
+
"/assets/user-facing/build-manifest.js",
|
|
315
321
|
]);
|
|
316
322
|
const react18CdnUrl = "https://esm.sh/react@18.2.0";
|
|
317
323
|
const reactDom18CdnUrl = "https://esm.sh/react-dom@18.2.0";
|
|
@@ -541,8 +547,12 @@ export async function superblocksCdnPlugin(options) {
|
|
|
541
547
|
// Externalize modules specified in the import map
|
|
542
548
|
// The cdn: prefix ensures they're properly resolved to the CDN URL
|
|
543
549
|
if (imports.includes(id)) {
|
|
550
|
+
const shouldRedirectToCdn = !packagesToExcludeFromCdnRedirect.has(id);
|
|
544
551
|
debug(`Externalizing module for CDN resolution: ${id}`);
|
|
545
|
-
return {
|
|
552
|
+
return {
|
|
553
|
+
id: `${shouldRedirectToCdn ? "cdn:" : ""}${id}`,
|
|
554
|
+
external: true,
|
|
555
|
+
};
|
|
546
556
|
}
|
|
547
557
|
return null;
|
|
548
558
|
},
|