@superblocksteam/sdk 2.0.115 → 2.0.116-next.1
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/.turbo/turbo-build.log +1 -1
- package/dist/cli-replacement/automatic-upgrades.d.ts.map +1 -1
- package/dist/cli-replacement/automatic-upgrades.js +16 -0
- package/dist/cli-replacement/automatic-upgrades.js.map +1 -1
- package/dist/cli-replacement/automatic-upgrades.test.js +78 -0
- package/dist/cli-replacement/automatic-upgrades.test.js.map +1 -1
- package/dist/cli-replacement/dev-startup-git-before-dbfs-order.test.d.mts +2 -0
- package/dist/cli-replacement/dev-startup-git-before-dbfs-order.test.d.mts.map +1 -0
- package/dist/cli-replacement/dev-startup-git-before-dbfs-order.test.mjs +341 -0
- package/dist/cli-replacement/dev-startup-git-before-dbfs-order.test.mjs.map +1 -0
- package/dist/cli-replacement/dev.d.mts.map +1 -1
- package/dist/cli-replacement/dev.mjs +105 -127
- package/dist/cli-replacement/dev.mjs.map +1 -1
- package/dist/cli-replacement/normalize-workspace-protocol.d.ts +15 -0
- package/dist/cli-replacement/normalize-workspace-protocol.d.ts.map +1 -0
- package/dist/cli-replacement/normalize-workspace-protocol.js +44 -0
- package/dist/cli-replacement/normalize-workspace-protocol.js.map +1 -0
- package/dist/cli-replacement/normalize-workspace-protocol.test.d.ts +2 -0
- package/dist/cli-replacement/normalize-workspace-protocol.test.d.ts.map +1 -0
- package/dist/cli-replacement/normalize-workspace-protocol.test.js +105 -0
- package/dist/cli-replacement/normalize-workspace-protocol.test.js.map +1 -0
- package/dist/dev-utils/dev-server.d.mts.map +1 -1
- package/dist/dev-utils/dev-server.mjs +2 -0
- package/dist/dev-utils/dev-server.mjs.map +1 -1
- package/package.json +12 -12
- package/src/cli-replacement/automatic-upgrades.test.ts +128 -0
- package/src/cli-replacement/automatic-upgrades.ts +17 -0
- package/src/cli-replacement/dev-startup-git-before-dbfs-order.test.mts +407 -0
- package/src/cli-replacement/dev.mts +163 -170
- package/src/cli-replacement/normalize-workspace-protocol.test.ts +122 -0
- package/src/cli-replacement/normalize-workspace-protocol.ts +64 -0
- package/src/dev-utils/dev-server.mts +6 -0
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import { describe, it, expect } from "vitest";
|
|
2
|
+
import { normalizeWorkspaceProtocolForNpm } from "./normalize-workspace-protocol.js";
|
|
3
|
+
describe("normalizeWorkspaceProtocolForNpm", () => {
|
|
4
|
+
it("returns unchanged when no workspace: deps are present", () => {
|
|
5
|
+
const pkg = {
|
|
6
|
+
dependencies: { react: "^18.0.0", "@superblocksteam/library": "2.5.0" },
|
|
7
|
+
devDependencies: { vitest: "^1.0.0" },
|
|
8
|
+
};
|
|
9
|
+
const result = normalizeWorkspaceProtocolForNpm(pkg);
|
|
10
|
+
expect(result.changed).toBe(false);
|
|
11
|
+
expect(result.warnings).toHaveLength(0);
|
|
12
|
+
expect(result.packageJson).toEqual(pkg);
|
|
13
|
+
});
|
|
14
|
+
it("strips workspace: prefix from dependencies and reports a warning per dep", () => {
|
|
15
|
+
const pkg = {
|
|
16
|
+
dependencies: {
|
|
17
|
+
"@superblocksteam/library": "workspace:*",
|
|
18
|
+
"@superblocksteam/sdk-api": "workspace:*",
|
|
19
|
+
react: "^18.0.0",
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
const result = normalizeWorkspaceProtocolForNpm(pkg);
|
|
23
|
+
expect(result.changed).toBe(true);
|
|
24
|
+
expect(result.packageJson.dependencies).toEqual({
|
|
25
|
+
"@superblocksteam/library": "*",
|
|
26
|
+
"@superblocksteam/sdk-api": "*",
|
|
27
|
+
react: "^18.0.0",
|
|
28
|
+
});
|
|
29
|
+
expect(result.warnings).toHaveLength(2);
|
|
30
|
+
expect(result.warnings.join(" ")).toContain("@superblocksteam/library");
|
|
31
|
+
expect(result.warnings.join(" ")).toContain("@superblocksteam/sdk-api");
|
|
32
|
+
});
|
|
33
|
+
it("preserves the version range after the workspace: prefix", () => {
|
|
34
|
+
const pkg = {
|
|
35
|
+
dependencies: {
|
|
36
|
+
a: "workspace:^1.2.3",
|
|
37
|
+
b: "workspace:~2.0.0",
|
|
38
|
+
c: "workspace:1.0.0",
|
|
39
|
+
},
|
|
40
|
+
};
|
|
41
|
+
const result = normalizeWorkspaceProtocolForNpm(pkg);
|
|
42
|
+
expect(result.changed).toBe(true);
|
|
43
|
+
expect(result.packageJson.dependencies).toEqual({
|
|
44
|
+
a: "^1.2.3",
|
|
45
|
+
b: "~2.0.0",
|
|
46
|
+
c: "1.0.0",
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
it("normalizes across all dependency buckets (devDependencies, optionalDependencies, peerDependencies)", () => {
|
|
50
|
+
const pkg = {
|
|
51
|
+
dependencies: { a: "workspace:*" },
|
|
52
|
+
devDependencies: { b: "workspace:*" },
|
|
53
|
+
optionalDependencies: { c: "workspace:*" },
|
|
54
|
+
peerDependencies: { d: "workspace:*" },
|
|
55
|
+
};
|
|
56
|
+
const result = normalizeWorkspaceProtocolForNpm(pkg);
|
|
57
|
+
expect(result.changed).toBe(true);
|
|
58
|
+
expect(result.packageJson.dependencies?.a).toBe("*");
|
|
59
|
+
expect(result.packageJson.devDependencies?.b).toBe("*");
|
|
60
|
+
expect(result.packageJson.optionalDependencies?.c).toBe("*");
|
|
61
|
+
expect(result.packageJson.peerDependencies?.d).toBe("*");
|
|
62
|
+
});
|
|
63
|
+
it("does not touch values that merely contain the substring 'workspace' but don't use the protocol", () => {
|
|
64
|
+
const pkg = {
|
|
65
|
+
dependencies: {
|
|
66
|
+
"some-workspace-tool": "1.0.0",
|
|
67
|
+
a: "git+ssh://git@github.com/foo/workspace.git",
|
|
68
|
+
},
|
|
69
|
+
};
|
|
70
|
+
const result = normalizeWorkspaceProtocolForNpm(pkg);
|
|
71
|
+
expect(result.changed).toBe(false);
|
|
72
|
+
expect(result.packageJson).toEqual(pkg);
|
|
73
|
+
});
|
|
74
|
+
it("does not mutate the input object", () => {
|
|
75
|
+
const pkg = {
|
|
76
|
+
dependencies: { a: "workspace:*" },
|
|
77
|
+
};
|
|
78
|
+
const original = JSON.parse(JSON.stringify(pkg));
|
|
79
|
+
normalizeWorkspaceProtocolForNpm(pkg);
|
|
80
|
+
expect(pkg).toEqual(original);
|
|
81
|
+
});
|
|
82
|
+
it("handles a package.json with no dependency buckets", () => {
|
|
83
|
+
const pkg = { name: "test", version: "1.0.0" };
|
|
84
|
+
const result = normalizeWorkspaceProtocolForNpm(pkg);
|
|
85
|
+
expect(result.changed).toBe(false);
|
|
86
|
+
expect(result.warnings).toHaveLength(0);
|
|
87
|
+
expect(result.packageJson).toEqual(pkg);
|
|
88
|
+
});
|
|
89
|
+
it("bare workspace: (no version after colon) falls back to *", () => {
|
|
90
|
+
const pkg = { dependencies: { a: "workspace:" } };
|
|
91
|
+
const result = normalizeWorkspaceProtocolForNpm(pkg);
|
|
92
|
+
expect(result.changed).toBe(true);
|
|
93
|
+
expect(result.packageJson.dependencies?.a).toBe("*");
|
|
94
|
+
});
|
|
95
|
+
it("operator-only forms (workspace:^ and workspace:~) preserve the operator as-is", () => {
|
|
96
|
+
const pkg = {
|
|
97
|
+
dependencies: { a: "workspace:^", b: "workspace:~" },
|
|
98
|
+
};
|
|
99
|
+
const result = normalizeWorkspaceProtocolForNpm(pkg);
|
|
100
|
+
expect(result.changed).toBe(true);
|
|
101
|
+
expect(result.packageJson.dependencies?.a).toBe("^");
|
|
102
|
+
expect(result.packageJson.dependencies?.b).toBe("~");
|
|
103
|
+
});
|
|
104
|
+
});
|
|
105
|
+
//# sourceMappingURL=normalize-workspace-protocol.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalize-workspace-protocol.test.js","sourceRoot":"","sources":["../../src/cli-replacement/normalize-workspace-protocol.test.ts"],"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":"AAEA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAwBlC,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EAChB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oDAAoD,CAAC;AACrF,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;AAGvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAyFhD,wBAAsB,6BAA6B,CAAC,IAAI,EAAE,MAAM,oCAwF/D;AAED,eAAO,MAAM,iBAAiB,KAAK,CAAC;AA6CpC,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;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAC3D,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,MAAM,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAC1C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,iFAAiF;IACjF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;CAC9B;AAKD,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,IAAI,EACJ,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,eAAe,EACf,MAAM,EAAE,cAAc,EACtB,IAAI,EACJ,GAAG,EACH,kBAAkB,EAAE,eAAe,EACnC,cAAc,GACf,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"dev-server.d.mts","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAwBlC,OAAO,KAAK,EACV,SAAS,EACT,eAAe,EAChB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oDAAoD,CAAC;AACrF,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;AAGvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAyFhD,wBAAsB,6BAA6B,CAAC,IAAI,EAAE,MAAM,oCAwF/D;AAED,eAAO,MAAM,iBAAiB,KAAK,CAAC;AA6CpC,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;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAC3D,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,MAAM,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAC1C,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB,iFAAiF;IACjF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;CAC9B;AAKD,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,IAAI,EACJ,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,eAAe,EACf,MAAM,EAAE,cAAc,EACtB,IAAI,EACJ,GAAG,EACH,kBAAkB,EAAE,eAAe,EACnC,cAAc,GACf,EAAE,sBAAsB,iFAogBxB;AA+MD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgClE"}
|
|
@@ -370,6 +370,7 @@ export async function createDevServer({ root, mode, fsOperationQueue, syncServic
|
|
|
370
370
|
// Strictly enforce the application ID and version headers for non-local environments
|
|
371
371
|
if (req.headers["x-superblocks-application-id"] !== resourceConfig.id) {
|
|
372
372
|
logger.error(`Application ID header mismatch, expected ${resourceConfig.id}, received ${req.headers["x-superblocks-application-id"]}`);
|
|
373
|
+
logger.info(`[dev-server-runtime] _sb_connect application mismatch: expected ${resourceConfig.id}, got ${req.headers["x-superblocks-application-id"]}`);
|
|
373
374
|
res.status(401).send(JSON.stringify({
|
|
374
375
|
error: `Application ID header mismatch. Expected ${resourceConfig.id}, received ${req.headers["x-superblocks-application-id"]}`,
|
|
375
376
|
}));
|
|
@@ -380,6 +381,7 @@ export async function createDevServer({ root, mode, fsOperationQueue, syncServic
|
|
|
380
381
|
incomingBranch !== currentBranch &&
|
|
381
382
|
incomingBranch !== SUPERBLOCKS_LIVE_GIT_BRANCH) {
|
|
382
383
|
logger.error(`Dev server expects branch ${currentBranch}, but received ${incomingBranch}. Check your current branch with 'git branch' and try again.`);
|
|
384
|
+
logger.info(`[dev-server-runtime] _sb_connect branch mismatch: expected ${currentBranch}, got ${incomingBranch}`);
|
|
383
385
|
res.status(401).send(JSON.stringify({
|
|
384
386
|
error: `Dev server expects branch ${currentBranch}, but received ${incomingBranch}. Check your current branch with 'git branch' and try again.`,
|
|
385
387
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.mjs","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dev-server.mjs","sourceRoot":"","sources":["../../src/dev-utils/dev-server.mts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@superblocksteam/sdk",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.116-next.1",
|
|
4
4
|
"description": "Superblocks JS SDK",
|
|
5
5
|
"homepage": "https://www.superblocks.com",
|
|
6
6
|
"license": "Superblocks Community Software License",
|
|
@@ -17,14 +17,14 @@
|
|
|
17
17
|
"@babel/plugin-proposal-decorators": "^7.28.0",
|
|
18
18
|
"@babel/plugin-transform-typescript": "7.28.0",
|
|
19
19
|
"@opentelemetry/api": "^1.9.1",
|
|
20
|
-
"@opentelemetry/api-logs": "^0.
|
|
20
|
+
"@opentelemetry/api-logs": "^0.214.0",
|
|
21
21
|
"@opentelemetry/context-async-hooks": "^2.0.1",
|
|
22
|
-
"@opentelemetry/exporter-logs-otlp-http": "^0.
|
|
23
|
-
"@opentelemetry/exporter-trace-otlp-http": "^0.
|
|
24
|
-
"@opentelemetry/instrumentation-express": "^0.
|
|
25
|
-
"@opentelemetry/instrumentation-http": "^0.
|
|
22
|
+
"@opentelemetry/exporter-logs-otlp-http": "^0.214.0",
|
|
23
|
+
"@opentelemetry/exporter-trace-otlp-http": "^0.214.0",
|
|
24
|
+
"@opentelemetry/instrumentation-express": "^0.62.0",
|
|
25
|
+
"@opentelemetry/instrumentation-http": "^0.214.0",
|
|
26
26
|
"@opentelemetry/resources": "^1.28.0",
|
|
27
|
-
"@opentelemetry/sdk-node": "^0.
|
|
27
|
+
"@opentelemetry/sdk-node": "^0.214.0",
|
|
28
28
|
"@opentelemetry/semantic-conventions": "^1.28.0",
|
|
29
29
|
"@superblocksteam/bucketeer-sdk": "1.1.0",
|
|
30
30
|
"@vitejs/plugin-react": "4.3.4",
|
|
@@ -48,11 +48,11 @@
|
|
|
48
48
|
"vite-tsconfig-paths": "^6.0.4",
|
|
49
49
|
"winston": "^3.17.0",
|
|
50
50
|
"yaml": "^2.7.1",
|
|
51
|
-
"@superblocksteam/library-shared": "2.0.
|
|
52
|
-
"@superblocksteam/shared": "0.
|
|
53
|
-
"@superblocksteam/
|
|
54
|
-
"@superblocksteam/
|
|
55
|
-
"@superblocksteam/vite-plugin-file-sync": "2.0.
|
|
51
|
+
"@superblocksteam/library-shared": "2.0.116-next.1",
|
|
52
|
+
"@superblocksteam/shared": "0.9586.0",
|
|
53
|
+
"@superblocksteam/telemetry": "2.0.116-next.1",
|
|
54
|
+
"@superblocksteam/util": "2.0.116-next.1",
|
|
55
|
+
"@superblocksteam/vite-plugin-file-sync": "2.0.116-next.1"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"@eslint/js": "^9.39.2",
|
|
@@ -82,6 +82,7 @@ vi.mock("@superblocksteam/shared", async () => {
|
|
|
82
82
|
|
|
83
83
|
const TARGET_CLI_VERSION = "2.1.0"; // newer than the mocked current 2.0.0
|
|
84
84
|
const TARGET_LIBRARY_VERSION = "1.9.0";
|
|
85
|
+
const TARGET_SDK_API_VERSION = "0.5.0";
|
|
85
86
|
|
|
86
87
|
const mockLockService = {
|
|
87
88
|
shutdown: vi.fn(async () => undefined),
|
|
@@ -109,6 +110,7 @@ beforeEach(() => {
|
|
|
109
110
|
data: {
|
|
110
111
|
cli: TARGET_CLI_VERSION,
|
|
111
112
|
library: TARGET_LIBRARY_VERSION,
|
|
113
|
+
sdkApi: TARGET_SDK_API_VERSION,
|
|
112
114
|
},
|
|
113
115
|
}),
|
|
114
116
|
})) as unknown as typeof fetch;
|
|
@@ -248,4 +250,130 @@ describe("checkVersionsAndWritePackageJson", () => {
|
|
|
248
250
|
);
|
|
249
251
|
});
|
|
250
252
|
});
|
|
253
|
+
|
|
254
|
+
describe("@superblocksteam/sdk-api rewrite (APPS-3752)", () => {
|
|
255
|
+
it("rewrites sdk-api to the server-supplied version when the app declares it", async () => {
|
|
256
|
+
vi.mocked(fs.readFile).mockResolvedValue(
|
|
257
|
+
JSON.stringify({
|
|
258
|
+
name: "test-app",
|
|
259
|
+
dependencies: {
|
|
260
|
+
"@superblocksteam/library": "workspace:*",
|
|
261
|
+
"@superblocksteam/sdk-api": "workspace:*",
|
|
262
|
+
},
|
|
263
|
+
}),
|
|
264
|
+
);
|
|
265
|
+
|
|
266
|
+
await checkVersionsAndWritePackageJson(
|
|
267
|
+
mockLockService,
|
|
268
|
+
mockConfig,
|
|
269
|
+
false,
|
|
270
|
+
true,
|
|
271
|
+
);
|
|
272
|
+
|
|
273
|
+
const [, writtenContent] = vi.mocked(fs.writeFile).mock.calls[0];
|
|
274
|
+
const parsed = JSON.parse(writtenContent as string);
|
|
275
|
+
expect(parsed.dependencies["@superblocksteam/sdk-api"]).toBe(
|
|
276
|
+
TARGET_SDK_API_VERSION,
|
|
277
|
+
);
|
|
278
|
+
// Library rewrite still happens too — the two are independent.
|
|
279
|
+
expect(parsed.dependencies["@superblocksteam/library"]).toBe(
|
|
280
|
+
TARGET_LIBRARY_VERSION,
|
|
281
|
+
);
|
|
282
|
+
});
|
|
283
|
+
|
|
284
|
+
it("pins sdk-api to the ephemeral alias when target is a SNAPSHOT", async () => {
|
|
285
|
+
const snapshotVersion = "0.5.0-SNAPSHOT.def456";
|
|
286
|
+
global.fetch = vi.fn(async () => ({
|
|
287
|
+
ok: true,
|
|
288
|
+
json: async () => ({
|
|
289
|
+
data: {
|
|
290
|
+
cli: TARGET_CLI_VERSION,
|
|
291
|
+
library: TARGET_LIBRARY_VERSION,
|
|
292
|
+
sdkApi: snapshotVersion,
|
|
293
|
+
},
|
|
294
|
+
}),
|
|
295
|
+
})) as unknown as typeof fetch;
|
|
296
|
+
vi.mocked(fs.readFile).mockResolvedValue(
|
|
297
|
+
JSON.stringify({
|
|
298
|
+
name: "test-app",
|
|
299
|
+
dependencies: {
|
|
300
|
+
"@superblocksteam/library": "1.0.0",
|
|
301
|
+
"@superblocksteam/sdk-api": "workspace:*",
|
|
302
|
+
},
|
|
303
|
+
}),
|
|
304
|
+
);
|
|
305
|
+
|
|
306
|
+
await checkVersionsAndWritePackageJson(
|
|
307
|
+
mockLockService,
|
|
308
|
+
mockConfig,
|
|
309
|
+
false,
|
|
310
|
+
true,
|
|
311
|
+
);
|
|
312
|
+
|
|
313
|
+
const [, writtenContent] = vi.mocked(fs.writeFile).mock.calls[0];
|
|
314
|
+
const parsed = JSON.parse(writtenContent as string);
|
|
315
|
+
expect(parsed.dependencies["@superblocksteam/sdk-api"]).toBe(
|
|
316
|
+
`npm:@superblocksteam/sdk-api-ephemeral@${snapshotVersion}`,
|
|
317
|
+
);
|
|
318
|
+
});
|
|
319
|
+
|
|
320
|
+
it("does not add sdk-api to apps that did not already declare it (e.g. shadcn template)", async () => {
|
|
321
|
+
vi.mocked(fs.readFile).mockResolvedValue(
|
|
322
|
+
JSON.stringify({
|
|
323
|
+
name: "test-app",
|
|
324
|
+
dependencies: { "@superblocksteam/library": "workspace:*" },
|
|
325
|
+
}),
|
|
326
|
+
);
|
|
327
|
+
|
|
328
|
+
await checkVersionsAndWritePackageJson(
|
|
329
|
+
mockLockService,
|
|
330
|
+
mockConfig,
|
|
331
|
+
false,
|
|
332
|
+
true,
|
|
333
|
+
);
|
|
334
|
+
|
|
335
|
+
const [, writtenContent] = vi.mocked(fs.writeFile).mock.calls[0];
|
|
336
|
+
const parsed = JSON.parse(writtenContent as string);
|
|
337
|
+
expect(parsed.dependencies["@superblocksteam/sdk-api"]).toBeUndefined();
|
|
338
|
+
expect(parsed.dependencies["@superblocksteam/library"]).toBe(
|
|
339
|
+
TARGET_LIBRARY_VERSION,
|
|
340
|
+
);
|
|
341
|
+
});
|
|
342
|
+
|
|
343
|
+
it("leaves sdk-api alone when the server response omits sdkApi (older deployment)", async () => {
|
|
344
|
+
global.fetch = vi.fn(async () => ({
|
|
345
|
+
ok: true,
|
|
346
|
+
json: async () => ({
|
|
347
|
+
data: {
|
|
348
|
+
cli: TARGET_CLI_VERSION,
|
|
349
|
+
library: TARGET_LIBRARY_VERSION,
|
|
350
|
+
// No sdkApi field — backward-compat with servers prior to this PR.
|
|
351
|
+
},
|
|
352
|
+
}),
|
|
353
|
+
})) as unknown as typeof fetch;
|
|
354
|
+
vi.mocked(fs.readFile).mockResolvedValue(
|
|
355
|
+
JSON.stringify({
|
|
356
|
+
name: "test-app",
|
|
357
|
+
dependencies: {
|
|
358
|
+
"@superblocksteam/library": "1.0.0",
|
|
359
|
+
"@superblocksteam/sdk-api": "workspace:*",
|
|
360
|
+
},
|
|
361
|
+
}),
|
|
362
|
+
);
|
|
363
|
+
|
|
364
|
+
await checkVersionsAndWritePackageJson(
|
|
365
|
+
mockLockService,
|
|
366
|
+
mockConfig,
|
|
367
|
+
false,
|
|
368
|
+
true,
|
|
369
|
+
);
|
|
370
|
+
|
|
371
|
+
const [, writtenContent] = vi.mocked(fs.writeFile).mock.calls[0];
|
|
372
|
+
const parsed = JSON.parse(writtenContent as string);
|
|
373
|
+
// The literal stays; safety net (#19078) handles it at install time.
|
|
374
|
+
expect(parsed.dependencies["@superblocksteam/sdk-api"]).toBe(
|
|
375
|
+
"workspace:*",
|
|
376
|
+
);
|
|
377
|
+
});
|
|
378
|
+
});
|
|
251
379
|
});
|
|
@@ -323,6 +323,23 @@ export async function checkVersionsAndWritePackageJson(
|
|
|
323
323
|
packageJson.dependencies["@superblocksteam/library"] =
|
|
324
324
|
targetVersions.library;
|
|
325
325
|
}
|
|
326
|
+
// sdk-api gets the same rewrite as library — fullstack templates depend on both
|
|
327
|
+
// and shipping `workspace:*` for sdk-api crashes npm install in cloud SABS pods
|
|
328
|
+
// (APPS-3752). The server only sets sdkApi on newer deployments; if it's missing,
|
|
329
|
+
// leave the existing dependency entry alone and let the consumer-side stripper
|
|
330
|
+
// (#19078) catch any remaining `workspace:` literal at install time.
|
|
331
|
+
if (
|
|
332
|
+
typeof targetVersions.sdkApi === "string" &&
|
|
333
|
+
packageJson.dependencies["@superblocksteam/sdk-api"] !== undefined
|
|
334
|
+
) {
|
|
335
|
+
if (targetVersions.sdkApi.includes("-SNAPSHOT")) {
|
|
336
|
+
packageJson.dependencies["@superblocksteam/sdk-api"] =
|
|
337
|
+
`npm:@superblocksteam/sdk-api-ephemeral@${targetVersions.sdkApi}`;
|
|
338
|
+
} else {
|
|
339
|
+
packageJson.dependencies["@superblocksteam/sdk-api"] =
|
|
340
|
+
targetVersions.sdkApi;
|
|
341
|
+
}
|
|
342
|
+
}
|
|
326
343
|
|
|
327
344
|
await fs.writeFile(
|
|
328
345
|
path.join(process.cwd(), "package.json"),
|