Skip to content

Commit 21325ff

Browse files
committed
Upgrade @object-ui to 4.0.8 and wrangler, add secret_ciphertext
1 parent dce6526 commit 21325ff

7 files changed

Lines changed: 377 additions & 368 deletions

File tree

apps/account/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"preview": "vite preview"
1818
},
1919
"dependencies": {
20-
"@object-ui/i18n": "^4.0.7",
20+
"@object-ui/i18n": "^4.0.8",
2121
"@objectstack/client": "workspace:*",
2222
"@objectstack/client-react": "workspace:*",
2323
"@objectstack/spec": "workspace:*",

apps/cloud/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@
5858
"tsup": "^8.5.1",
5959
"tsx": "^4.22.0",
6060
"typescript": "^6.0.3",
61-
"wrangler": "^4.91.0"
61+
"wrangler": "^4.92.0"
6262
}
6363
}

apps/cloud/wrangler.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ compatibility_flags = ["nodejs_compat"]
4545
# rebuild + re-push to ship a new version, then run `wrangler deploy`.
4646
[[containers]]
4747
class_name = "CloudContainer"
48-
image = "registry.cloudflare.com/2846eb40a60f4738e292b90dcd8cce10/objectstack-cloud:turso-token-v2"
48+
image = "registry.cloudflare.com/2846eb40a60f4738e292b90dcd8cce10/objectstack-cloud:turso-token-v3"
4949
max_instances = 3
5050
instance_type = "standard-1"
5151

apps/console/package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,33 @@
1515
"preview": "vite preview"
1616
},
1717
"dependencies": {
18-
"@object-ui/app-shell": "^4.0.7",
19-
"@object-ui/auth": "^4.0.7",
20-
"@object-ui/collaboration": "^4.0.7",
21-
"@object-ui/components": "^4.0.7",
22-
"@object-ui/core": "^4.0.7",
23-
"@object-ui/data-objectstack": "^4.0.7",
24-
"@object-ui/fields": "^4.0.7",
25-
"@object-ui/i18n": "^4.0.7",
26-
"@object-ui/layout": "^4.0.7",
27-
"@object-ui/mobile": "^4.0.7",
28-
"@object-ui/permissions": "^4.0.7",
29-
"@object-ui/plugin-calendar": "^4.0.7",
30-
"@object-ui/plugin-charts": "^4.0.7",
31-
"@object-ui/plugin-chatbot": "^4.0.7",
32-
"@object-ui/plugin-dashboard": "^4.0.7",
33-
"@object-ui/plugin-detail": "^4.0.7",
34-
"@object-ui/plugin-form": "^4.0.7",
35-
"@object-ui/plugin-gantt": "^4.0.7",
36-
"@object-ui/plugin-grid": "^4.0.7",
37-
"@object-ui/plugin-kanban": "^4.0.7",
38-
"@object-ui/plugin-list": "^4.0.7",
39-
"@object-ui/plugin-map": "^4.0.7",
40-
"@object-ui/plugin-report": "^4.0.7",
41-
"@object-ui/plugin-timeline": "^4.0.7",
42-
"@object-ui/plugin-view": "^4.0.7",
43-
"@object-ui/react": "^4.0.7",
44-
"@object-ui/types": "^4.0.7",
18+
"@object-ui/app-shell": "^4.0.8",
19+
"@object-ui/auth": "^4.0.8",
20+
"@object-ui/collaboration": "^4.0.8",
21+
"@object-ui/components": "^4.0.8",
22+
"@object-ui/core": "^4.0.8",
23+
"@object-ui/data-objectstack": "^4.0.8",
24+
"@object-ui/fields": "^4.0.8",
25+
"@object-ui/i18n": "^4.0.8",
26+
"@object-ui/layout": "^4.0.8",
27+
"@object-ui/mobile": "^4.0.8",
28+
"@object-ui/permissions": "^4.0.8",
29+
"@object-ui/plugin-calendar": "^4.0.8",
30+
"@object-ui/plugin-charts": "^4.0.8",
31+
"@object-ui/plugin-chatbot": "^4.0.8",
32+
"@object-ui/plugin-dashboard": "^4.0.8",
33+
"@object-ui/plugin-detail": "^4.0.8",
34+
"@object-ui/plugin-form": "^4.0.8",
35+
"@object-ui/plugin-gantt": "^4.0.8",
36+
"@object-ui/plugin-grid": "^4.0.8",
37+
"@object-ui/plugin-kanban": "^4.0.8",
38+
"@object-ui/plugin-list": "^4.0.8",
39+
"@object-ui/plugin-map": "^4.0.8",
40+
"@object-ui/plugin-report": "^4.0.8",
41+
"@object-ui/plugin-timeline": "^4.0.8",
42+
"@object-ui/plugin-view": "^4.0.8",
43+
"@object-ui/react": "^4.0.8",
44+
"@object-ui/types": "^4.0.8",
4545
"clsx": "^2.1.1",
4646
"lucide-react": "^1.16.0",
4747
"react": "^19.2.6",

apps/objectos/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@
6161
"tsup": "^8.5.1",
6262
"tsx": "^4.22.0",
6363
"typescript": "^6.0.3",
64-
"wrangler": "^4.91.0"
64+
"wrangler": "^4.92.0"
6565
}
6666
}

packages/services/service-cloud/src/cloud-artifact-helpers.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ export interface SysCredentialRow {
2929
database_driver?: string;
3030
database_url?: string;
3131
database_auth_token?: string;
32+
/** The encrypted (or, with NoopSecretEncryptor, plaintext) DB secret. */
33+
secret_ciphertext?: string;
3234
}
3335

3436
export interface SysProjectRevisionRow {
@@ -261,7 +263,9 @@ export function buildRuntimeBlock(project: SysProjectRow, cred: SysCredentialRow
261263
databaseDriver: driver,
262264
databaseUrl: url,
263265
};
264-
const token = cred?.database_auth_token ?? project.database_auth_token;
266+
const token = cred?.database_auth_token
267+
?? cred?.secret_ciphertext
268+
?? project.database_auth_token;
265269
if (token) out.databaseAuthToken = token;
266270
return out;
267271
}

0 commit comments

Comments
 (0)