diff --git a/app/db/package.json b/app/db/package.json index abad046c..5bdf12fb 100644 --- a/app/db/package.json +++ b/app/db/package.json @@ -1,7 +1,7 @@ { "name": "db", "dependencies": { - "@prisma/client": "^5.7.1", - "prisma": "^5.7.1" + "@prisma/client": "^5.8.1", + "prisma": "^5.8.1" } } diff --git a/app/db/prisma/schema.prisma b/app/db/prisma/schema.prisma index d3d246a3..16ac0c75 100644 --- a/app/db/prisma/schema.prisma +++ b/app/db/prisma/schema.prisma @@ -225,6 +225,7 @@ model site { is_deleted Boolean @default(false) responsive String @default("all") npm_cache String @default(" ") @db.VarChar + code_mode String @default("old") @db.VarChar(5) code code[] component_site component_site[] npm_site npm_site[] diff --git a/app/srv/ws/sync/actions/site_load.ts b/app/srv/ws/sync/actions/site_load.ts index c6e2adc6..0406b70e 100644 --- a/app/srv/ws/sync/actions/site_load.ts +++ b/app/srv/ws/sync/actions/site_load.ts @@ -1,11 +1,9 @@ import { validate } from "uuid"; import { ESite } from "../../../../web/src/nova/ed/logic/ed-global"; import { SAction } from "../actions"; +import { prepCode } from "../editor/code/prep-code"; import { activity } from "../entity/activity"; import { SyncConnection } from "../type"; -import { prepCode } from "../editor/code/prep-code"; -import { docs } from "../entity/docs"; -import { snapshot } from "../entity/snapshot"; export const site_load: SAction["site"]["load"] = async function ( this: SyncConnection, @@ -40,10 +38,10 @@ export const site_load: SAction["site"]["load"] = async function ( config: config as ESite["config"], domain: site.domain, js: site.js || "", - responsive: site.responsive, + responsive: site.responsive as ESite["responsive"], js_compiled: site.js_compiled || "", - layout: { id: layout?.id || "", snapshot: null }, - code: { snapshot: null }, + layout: { id: layout?.id || "", snapshot: null, meta: undefined }, + code: { snapshot: null, mode: site.code_mode as "old" | "vsc" }, }; } } diff --git a/app/web/src/nova/ed/logic/ed-global.ts b/app/web/src/nova/ed/logic/ed-global.ts index f26017d3..33637b93 100644 --- a/app/web/src/nova/ed/logic/ed-global.ts +++ b/app/web/src/nova/ed/logic/ed-global.ts @@ -25,6 +25,7 @@ export const EmptySite = { }, code: { snapshot: null as null | Uint8Array, + mode: "old" as "old" | "vsc", }, }; diff --git a/bun.lockb b/bun.lockb index 6f5fb16f..7ad4a3c3 100755 Binary files a/bun.lockb and b/bun.lockb differ