@hs-x/cli 0.4.4 → 0.4.6
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/cloudflare-account-preflight.d.ts +26 -0
- package/dist/cloudflare-account-preflight.d.ts.map +1 -0
- package/dist/cloudflare-account-preflight.js +64 -0
- package/dist/cloudflare-account-preflight.js.map +1 -0
- package/dist/cloudflare-kv.d.ts.map +1 -1
- package/dist/cloudflare-kv.js +31 -6
- package/dist/cloudflare-kv.js.map +1 -1
- package/dist/cloudflare-pointer.d.ts.map +1 -1
- package/dist/cloudflare-pointer.js +9 -3
- package/dist/cloudflare-pointer.js.map +1 -1
- package/dist/cloudflare-scoped-resource.d.ts +6 -0
- package/dist/cloudflare-scoped-resource.d.ts.map +1 -1
- package/dist/cloudflare-scoped-resource.js +13 -6
- package/dist/cloudflare-scoped-resource.js.map +1 -1
- package/dist/commands/completion.d.ts.map +1 -1
- package/dist/commands/completion.js +1 -0
- package/dist/commands/completion.js.map +1 -1
- package/dist/commands/deploy.d.ts.map +1 -1
- package/dist/commands/deploy.js +226 -23
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/dev.d.ts +1 -0
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/dev.js +11 -6
- package/dist/commands/dev.js.map +1 -1
- package/dist/commands/help-command.d.ts.map +1 -1
- package/dist/commands/help-command.js +6 -1
- package/dist/commands/help-command.js.map +1 -1
- package/dist/commands/project.d.ts +1 -0
- package/dist/commands/project.d.ts.map +1 -1
- package/dist/constants.d.ts +1 -1
- package/dist/constants.js +1 -1
- package/dist/control-plane-tenant-provisioning.d.ts +2 -0
- package/dist/control-plane-tenant-provisioning.d.ts.map +1 -1
- package/dist/control-plane-tenant-provisioning.js +15 -2
- package/dist/control-plane-tenant-provisioning.js.map +1 -1
- package/dist/dev/browser-log-bridge.d.ts +12 -0
- package/dist/dev/browser-log-bridge.d.ts.map +1 -1
- package/dist/dev/browser-log-bridge.js +86 -3
- package/dist/dev/browser-log-bridge.js.map +1 -1
- package/dist/dev/frontend-log-relay.d.ts +3 -1
- package/dist/dev/frontend-log-relay.d.ts.map +1 -1
- package/dist/dev/frontend-log-relay.js +48 -3
- package/dist/dev/frontend-log-relay.js.map +1 -1
- package/dist/dev/session-manager.d.ts +2 -0
- package/dist/dev/session-manager.d.ts.map +1 -1
- package/dist/dev/session-manager.js +21 -6
- package/dist/dev/session-manager.js.map +1 -1
- package/dist/dev/stream-renderer.d.ts.map +1 -1
- package/dist/dev/stream-renderer.js +5 -6
- package/dist/dev/stream-renderer.js.map +1 -1
- package/dist/errors-registry.d.ts.map +1 -1
- package/dist/errors-registry.js +36 -0
- package/dist/errors-registry.js.map +1 -1
- package/dist/hubspot-auth.d.ts.map +1 -1
- package/dist/hubspot-auth.js +86 -3
- package/dist/hubspot-auth.js.map +1 -1
- package/dist/services/cloudflare-kv.d.ts.map +1 -1
- package/dist/services/cloudflare-kv.js +22 -4
- package/dist/services/cloudflare-kv.js.map +1 -1
- package/dist/tenant-state.d.ts +18 -0
- package/dist/tenant-state.d.ts.map +1 -1
- package/dist/tenant-state.js +72 -29
- package/dist/tenant-state.js.map +1 -1
- package/package.json +8 -8
|
@@ -37,18 +37,33 @@ export const layer = Layer.effect(CloudflareKv, Effect.gen(function* () {
|
|
|
37
37
|
? Effect.succeed(id)
|
|
38
38
|
: Effect.fail(cliError('HSX_E_INTERNAL', 'Cloudflare KV namespace has not been initialized.')));
|
|
39
39
|
const namespacesPath = `/client/v4/accounts/${encodeURIComponent(input.accountId)}/storage/kv/namespaces`;
|
|
40
|
-
const
|
|
41
|
-
const
|
|
40
|
+
const findNamespace = (name) => Effect.gen(function* () {
|
|
41
|
+
const url = buildUrl(namespacesPath);
|
|
42
|
+
url.searchParams.set('per_page', '1000');
|
|
43
|
+
const listResponse = yield* execOk(`${url.pathname}${url.search}`);
|
|
42
44
|
const listBody = yield* readJson(listResponse);
|
|
43
45
|
const existing = listBody.result?.find((item) => item.title === name);
|
|
44
|
-
|
|
46
|
+
return existing?.id && existing.title
|
|
47
|
+
? { id: existing.id, title: existing.title }
|
|
48
|
+
: undefined;
|
|
49
|
+
});
|
|
50
|
+
const ensureNamespace = (name) => Effect.gen(function* () {
|
|
51
|
+
const existing = yield* findNamespace(name);
|
|
52
|
+
if (existing) {
|
|
45
53
|
yield* Ref.set(namespaceRef, existing.id);
|
|
46
|
-
return
|
|
54
|
+
return existing;
|
|
47
55
|
}
|
|
48
56
|
const createRequest = HttpClientRequest.make('POST')(buildUrl(namespacesPath)).pipe(HttpClientRequest.setHeaders(baseHeaders()), HttpClientRequest.bodyText(JSON.stringify({ title: name }), 'application/json'));
|
|
49
57
|
const createResponse = yield* http.execute(createRequest);
|
|
50
58
|
if (!createResponse.ok) {
|
|
51
59
|
const detail = yield* readTextSafe(createResponse);
|
|
60
|
+
if (isNamespaceAlreadyExists(createResponse.status, detail)) {
|
|
61
|
+
const adopted = yield* findNamespace(name);
|
|
62
|
+
if (adopted) {
|
|
63
|
+
yield* Ref.set(namespaceRef, adopted.id);
|
|
64
|
+
return adopted;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
52
67
|
return yield* Effect.fail(cliError('HSX_E_API_NETWORK', `Cloudflare KV request failed (${createResponse.status})${detail ? `: ${detail}` : ''}`));
|
|
53
68
|
}
|
|
54
69
|
const createBody = yield* readJson(createResponse);
|
|
@@ -152,4 +167,7 @@ function resolveFlag(argv, name) {
|
|
|
152
167
|
const idx = argv.indexOf(name);
|
|
153
168
|
return idx >= 0 ? argv[idx + 1] : undefined;
|
|
154
169
|
}
|
|
170
|
+
function isNamespaceAlreadyExists(status, detail) {
|
|
171
|
+
return status === 400 && /(?:\b10014\b|namespace[^\n]*already exists)/i.test(detail);
|
|
172
|
+
}
|
|
155
173
|
//# sourceMappingURL=cloudflare-kv.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudflare-kv.js","sourceRoot":"","sources":["../../src/services/cloudflare-kv.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cloudflare-kv.js","sourceRoot":"","sources":["../../src/services/cloudflare-kv.ts"],"names":[],"mappings":"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"}
|
package/dist/tenant-state.d.ts
CHANGED
|
@@ -18,6 +18,15 @@ export declare function ensureTenantStateStore(input: {
|
|
|
18
18
|
readonly argv: readonly string[];
|
|
19
19
|
readonly root: string;
|
|
20
20
|
}): Promise<TenantStateContext>;
|
|
21
|
+
export declare function selectTenantCloudflareCredentials(input: {
|
|
22
|
+
readonly apiToken: string | undefined;
|
|
23
|
+
readonly pointerAccountId: string | undefined;
|
|
24
|
+
readonly leasedToken: string | undefined;
|
|
25
|
+
readonly leasedAccountId: string | undefined;
|
|
26
|
+
}): {
|
|
27
|
+
readonly effectiveToken: string | undefined;
|
|
28
|
+
readonly effectiveAccountId: string | undefined;
|
|
29
|
+
};
|
|
21
30
|
/**
|
|
22
31
|
* Preflight the credentials `ensureTenantStateStore` needs, WITHOUT provisioning
|
|
23
32
|
* anything. Call this before a Cloudflare deploy so a missing API token / account
|
|
@@ -66,4 +75,13 @@ export declare function rewriteTenantOwnerPrefix(input: {
|
|
|
66
75
|
readonly fromKey: string;
|
|
67
76
|
readonly toKey: string;
|
|
68
77
|
}[]>;
|
|
78
|
+
/**
|
|
79
|
+
* Lease the account's Cloudflare credential from the control plane using the
|
|
80
|
+
* active session. Returns undefined (never throws) when there is no session,
|
|
81
|
+
* no binding, or no stored credential — callers fall through to the env error.
|
|
82
|
+
*/
|
|
83
|
+
export declare function leaseCloudflareViaSession(argv: readonly string[], root: string): Promise<{
|
|
84
|
+
apiToken: string;
|
|
85
|
+
cloudflareAccountId: string;
|
|
86
|
+
} | undefined>;
|
|
69
87
|
//# sourceMappingURL=tenant-state.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-state.d.ts","sourceRoot":"","sources":["../src/tenant-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAGnD,OAAO,EAAE,KAAK,UAAU,EAAoB,MAAM,kBAAkB,CAAC;AAErE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACvE,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CACjC;
|
|
1
|
+
{"version":3,"file":"tenant-state.d.ts","sourceRoot":"","sources":["../src/tenant-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAGnD,OAAO,EAAE,KAAK,UAAU,EAAoB,MAAM,kBAAkB,CAAC;AAErE,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACvE,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CACjC;AAKD;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,KAAK,EAAE;IAClD,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAyE9B;AAED,wBAAgB,iCAAiC,CAAC,KAAK,EAAE;IACvD,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9C,GAAG;IACF,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,QAAQ,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;CACjD,CAaA;AAED;;;;;;;;GAQG;AACH,wBAAsB,+BAA+B,CAAC,KAAK,EAAE;IAC3D,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,IAAI,CAAC,CAWhB;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,KAAK,EAAE;IAChD,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAwB1C;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,wBAAwB,CAAC,KAAK,EAAE;IACpD,QAAQ,CAAC,EAAE,EAAE,OAAO,oBAAoB,EAAE,kBAAkB,CAAC;IAC7D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,SAAS;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,CAoB3E;AAoBD;;;;GAIG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,mBAAmB,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CA4CxE"}
|
package/dist/tenant-state.js
CHANGED
|
@@ -2,6 +2,7 @@ import { createCloudflareKvClient, resolveCloudflareCredentials } from './cloudf
|
|
|
2
2
|
import { ensureCloudflarePointer, loadCloudflarePointer } from './cloudflare-pointer.js';
|
|
3
3
|
import { createStateStore } from './state-store.js';
|
|
4
4
|
const tenantStateStoreCache = new Map();
|
|
5
|
+
const tenantStateStoreInflight = new Map();
|
|
5
6
|
/**
|
|
6
7
|
* Ensure the tenant `hsx-state` KV namespace exists and return a state-store
|
|
7
8
|
* bound to this project's pointer. Provisions the namespace and writes
|
|
@@ -17,18 +18,22 @@ export async function ensureTenantStateStore(input) {
|
|
|
17
18
|
const { apiToken } = creds;
|
|
18
19
|
// Fall back to the account id recorded in .hs-x/cloudflare.json so repeat
|
|
19
20
|
// deploys don't need CLOUDFLARE_ACCOUNT_ID re-exported every time.
|
|
20
|
-
const
|
|
21
|
+
const pointerAccountId = creds.accountId ?? (await loadCloudflarePointer(input.root))?.cloudflareAccountId;
|
|
21
22
|
// Lease fallback: with a session, the CP holds the account's CF credential
|
|
22
23
|
// (stored by `connect cloudflare`) — lease it instead of demanding env vars.
|
|
23
24
|
let leasedToken;
|
|
24
25
|
let leasedAccountId;
|
|
25
|
-
if (!apiToken || !
|
|
26
|
+
if (!apiToken || !pointerAccountId) {
|
|
26
27
|
const lease = await leaseCloudflareViaSession(input.argv, input.root);
|
|
27
28
|
leasedToken = lease?.apiToken;
|
|
28
29
|
leasedAccountId = lease?.cloudflareAccountId;
|
|
29
30
|
}
|
|
30
|
-
const effectiveToken
|
|
31
|
-
|
|
31
|
+
const { effectiveToken, effectiveAccountId } = selectTenantCloudflareCredentials({
|
|
32
|
+
apiToken,
|
|
33
|
+
pointerAccountId,
|
|
34
|
+
leasedToken,
|
|
35
|
+
leasedAccountId,
|
|
36
|
+
});
|
|
32
37
|
if (!effectiveToken || !effectiveAccountId) {
|
|
33
38
|
throw new Error('Tenant state requires a Cloudflare API token and account id. Set CLOUDFLARE_API_TOKEN and CLOUDFLARE_ACCOUNT_ID, pass --cloudflare-api-token / --cloudflare-account-id, or log in (`hs-x login`) with Cloudflare connected so the CLI can lease it.');
|
|
34
39
|
}
|
|
@@ -42,32 +47,58 @@ export async function ensureTenantStateStore(input) {
|
|
|
42
47
|
const cached = tenantStateStoreCache.get(cacheKey);
|
|
43
48
|
if (cached)
|
|
44
49
|
return cached;
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
50
|
+
const inflight = tenantStateStoreInflight.get(cacheKey);
|
|
51
|
+
if (inflight)
|
|
52
|
+
return inflight;
|
|
53
|
+
const provisioning = (async () => {
|
|
54
|
+
const bootstrapKv = createCloudflareKvClient({
|
|
55
|
+
accountId: effectiveAccountId,
|
|
56
|
+
apiToken: effectiveToken,
|
|
57
|
+
...(baseUrl ? { baseUrl } : {}),
|
|
58
|
+
});
|
|
59
|
+
const namespace = await bootstrapKv.ensureNamespace('hsx-state');
|
|
60
|
+
const pointer = await ensureCloudflarePointer({
|
|
61
|
+
root: input.root,
|
|
62
|
+
cloudflareAccountId: effectiveAccountId,
|
|
63
|
+
stateKvNamespaceId: namespace.id,
|
|
64
|
+
stateKvNamespaceName: namespace.title,
|
|
65
|
+
});
|
|
66
|
+
const context = {
|
|
60
67
|
pointer,
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
68
|
+
stateStore: createStateStore({
|
|
69
|
+
pointer,
|
|
70
|
+
kv: createCloudflareKvClient({
|
|
71
|
+
accountId: pointer.cloudflareAccountId,
|
|
72
|
+
apiToken: effectiveToken,
|
|
73
|
+
namespaceId: pointer.stateKvNamespaceId,
|
|
74
|
+
...(baseUrl ? { baseUrl } : {}),
|
|
75
|
+
}),
|
|
66
76
|
}),
|
|
67
|
-
}
|
|
77
|
+
};
|
|
78
|
+
tenantStateStoreCache.set(cacheKey, context);
|
|
79
|
+
return context;
|
|
80
|
+
})();
|
|
81
|
+
tenantStateStoreInflight.set(cacheKey, provisioning);
|
|
82
|
+
try {
|
|
83
|
+
return await provisioning;
|
|
84
|
+
}
|
|
85
|
+
finally {
|
|
86
|
+
tenantStateStoreInflight.delete(cacheKey);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
export function selectTenantCloudflareCredentials(input) {
|
|
90
|
+
// A leased token and account id are an inseparable credential pair. Mixing a
|
|
91
|
+
// newly leased token with a stale local pointer can target the wrong tenant.
|
|
92
|
+
if (!input.apiToken && input.leasedToken && input.leasedAccountId) {
|
|
93
|
+
return {
|
|
94
|
+
effectiveToken: input.leasedToken,
|
|
95
|
+
effectiveAccountId: input.leasedAccountId,
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
return {
|
|
99
|
+
effectiveToken: input.apiToken ?? input.leasedToken,
|
|
100
|
+
effectiveAccountId: input.pointerAccountId ?? input.leasedAccountId,
|
|
68
101
|
};
|
|
69
|
-
tenantStateStoreCache.set(cacheKey, context);
|
|
70
|
-
return context;
|
|
71
102
|
}
|
|
72
103
|
/**
|
|
73
104
|
* Preflight the credentials `ensureTenantStateStore` needs, WITHOUT provisioning
|
|
@@ -177,7 +208,7 @@ function rewriteOwnerIdValue(value, from, to) {
|
|
|
177
208
|
* active session. Returns undefined (never throws) when there is no session,
|
|
178
209
|
* no binding, or no stored credential — callers fall through to the env error.
|
|
179
210
|
*/
|
|
180
|
-
async function leaseCloudflareViaSession(argv, root) {
|
|
211
|
+
export async function leaseCloudflareViaSession(argv, root) {
|
|
181
212
|
try {
|
|
182
213
|
const { loadStore, activeSession } = await import('./account-store.js');
|
|
183
214
|
const store = await loadStore();
|
|
@@ -189,7 +220,11 @@ async function leaseCloudflareViaSession(argv, root) {
|
|
|
189
220
|
const binding = await readFile(join(root, '.hs-x', 'project.json'), 'utf8')
|
|
190
221
|
.then((raw) => JSON.parse(raw))
|
|
191
222
|
.catch(() => undefined);
|
|
192
|
-
const accountId =
|
|
223
|
+
const accountId = resolveFlag(argv, '--account-id') ??
|
|
224
|
+
process.env.HSX_ACCOUNT_ID ??
|
|
225
|
+
binding?.accountId ??
|
|
226
|
+
session.accountId ??
|
|
227
|
+
store.defaultAccountId;
|
|
193
228
|
if (!accountId)
|
|
194
229
|
return undefined;
|
|
195
230
|
const { resolveControlPlaneUrl } = await import('./config.js');
|
|
@@ -212,4 +247,12 @@ async function leaseCloudflareViaSession(argv, root) {
|
|
|
212
247
|
return undefined;
|
|
213
248
|
}
|
|
214
249
|
}
|
|
250
|
+
function resolveFlag(argv, name) {
|
|
251
|
+
const eq = argv.find((arg) => arg.startsWith(`${name}=`));
|
|
252
|
+
if (eq)
|
|
253
|
+
return eq.slice(name.length + 1) || undefined;
|
|
254
|
+
const idx = argv.indexOf(name);
|
|
255
|
+
const value = idx >= 0 ? argv[idx + 1] : undefined;
|
|
256
|
+
return value && !value.startsWith('-') ? value : undefined;
|
|
257
|
+
}
|
|
215
258
|
//# sourceMappingURL=tenant-state.js.map
|
package/dist/tenant-state.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-state.js","sourceRoot":"","sources":["../src/tenant-state.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAC5F,OAAO,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AACzF,OAAO,EAAmB,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAOrE,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"tenant-state.js","sourceRoot":"","sources":["../src/tenant-state.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hs-x/cli",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.6",
|
|
4
4
|
"description": "HS-X CLI — init, validate, connect, dev, deploy, promote, rollback, doctor, sync. Installs the `hs-x` command.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -18,13 +18,13 @@
|
|
|
18
18
|
"@effect/cli": "0.75.1",
|
|
19
19
|
"@effect/platform": "0.96.1",
|
|
20
20
|
"@effect/platform-bun": "0.89.0",
|
|
21
|
-
"@hs-x/codegen": "0.4.
|
|
22
|
-
"@hs-x/hubspot": "0.4.
|
|
23
|
-
"@hs-x/hubspot-cli": "0.4.
|
|
24
|
-
"@hs-x/react-doctor": "0.4.
|
|
25
|
-
"@hs-x/runtime": "0.4.
|
|
26
|
-
"@hs-x/types": "0.4.
|
|
27
|
-
"@hs-x/validator": "0.4.
|
|
21
|
+
"@hs-x/codegen": "0.4.6",
|
|
22
|
+
"@hs-x/hubspot": "0.4.6",
|
|
23
|
+
"@hs-x/hubspot-cli": "0.4.6",
|
|
24
|
+
"@hs-x/react-doctor": "0.4.6",
|
|
25
|
+
"@hs-x/runtime": "0.4.6",
|
|
26
|
+
"@hs-x/types": "0.4.6",
|
|
27
|
+
"@hs-x/validator": "0.4.6",
|
|
28
28
|
"@hubspot/local-dev-lib": "5.10.3",
|
|
29
29
|
"@hubspot/project-parsing-lib": "0.22.1",
|
|
30
30
|
"@hubspot/ui-extensions-dev-server": "2.1.2",
|