diff --git a/package-lock.json b/package-lock.json index 75b792e..b4b05b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,8 +15,8 @@ "@sealcode/add-to-head": "^1.0.0", "@sealcode/crud-ui": "^0.0.17", "@sealcode/file-manager": "^1.0.2", - "@sealcode/jdd": "^0.6.6", - "@sealcode/jdd-editor": "^0.1.18", + "@sealcode/jdd": "^0.7.1", + "@sealcode/jdd-editor": "^0.1.19", "@sealcode/sealgen": "^0.17.24", "@sealcode/simplemde": "^1.12.1", "@sealcode/ts-predicates": "^0.6.2", @@ -939,9 +939,9 @@ } }, "node_modules/@sealcode/jdd": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/@sealcode/jdd/-/jdd-0.6.6.tgz", - "integrity": "sha512-UVZErDYUzTeKMDmDJcRhJR6GqVT67K/sIEbaJqDTD2CeV0aUMqUqEpVOJlZmvGZxFuQI6QIXvcQuqmsZhj/Zng==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@sealcode/jdd/-/jdd-0.7.1.tgz", + "integrity": "sha512-9B3dtzOmrELuuIvtKErL75UaX91ZTvJbD8tUyik6iygc/p0k1RIHdTAM+Fl5Xt2D1i3mUshaLsf0wXJpYDe/yw==", "dependencies": { "@sealcode/file-manager": "^1.0.2", "@sealcode/ts-predicates": "^0.5.3", @@ -962,12 +962,12 @@ } }, "node_modules/@sealcode/jdd-editor": { - "version": "0.1.18", - "resolved": "https://registry.npmjs.org/@sealcode/jdd-editor/-/jdd-editor-0.1.18.tgz", - "integrity": "sha512-iQfaa5FrKJ0OfWZe4FHYIOI1bex1DdCNfkeRY3PFApI2rMroD7iTxYxmNq+RSpJwuCFEJP6Wa5TsvyEQnzC11w==", + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/@sealcode/jdd-editor/-/jdd-editor-0.1.19.tgz", + "integrity": "sha512-dSXN2YMJR7s3fiBlypajZBECpeSHSlJwxy4PU0n0RrBzzwF8Y2hbiu+dhaQVoAfhJyVnOOBE22UlAZ137iKlfQ==", "dependencies": { "@koa/router": "^13.1.0", - "@sealcode/jdd": "^0.6.5", + "@sealcode/jdd": "^0.7.1", "@sealcode/sealcodemirror": "^5.70.0-beta5", "@sealcode/sealgen": "^0.17.4", "@types/object-path": "^0.11.4", diff --git a/package.json b/package.json index 3f75532..b22bde3 100644 --- a/package.json +++ b/package.json @@ -80,8 +80,8 @@ "@sealcode/add-to-head": "^1.0.0", "@sealcode/crud-ui": "^0.0.17", "@sealcode/file-manager": "^1.0.2", - "@sealcode/jdd": "^0.6.6", - "@sealcode/jdd-editor": "^0.1.18", + "@sealcode/jdd": "^0.7.1", + "@sealcode/jdd-editor": "^0.1.19", "@sealcode/sealgen": "^0.17.24", "@sealcode/simplemde": "^1.12.1", "@sealcode/ts-predicates": "^0.6.2", diff --git a/src/back/jdd-context.ts b/src/back/jdd-context.ts index 505fd4a..70ba892 100644 --- a/src/back/jdd-context.ts +++ b/src/back/jdd-context.ts @@ -4,11 +4,12 @@ import type { FilePointer } from "@sealcode/file-manager"; import { makeSimpleJDDContext } from "@sealcode/jdd"; import { TheFileManager } from "./file-manager.js"; import { imageRouter } from "./image-router.js"; +import { registry } from "./jdd-components/registry.js"; export function makeJDDContext(ctx: Context): JDDContext { return { language: "pl", - ...makeSimpleJDDContext(TheFileManager), + ...makeSimpleJDDContext(TheFileManager, registry), render_image: async (image: string | FilePointer | null, args) => { if (!image) { return ""; diff --git a/src/back/routes/middlewares/customUrlView.tsx b/src/back/routes/middlewares/customUrlView.tsx index ebb06d3..76cba56 100644 --- a/src/back/routes/middlewares/customUrlView.tsx +++ b/src/back/routes/middlewares/customUrlView.tsx @@ -40,11 +40,8 @@ export const customUrlView = : null; if (page && pageContent) { - const jdd = await JDD.fromStorage( - registry, - makeJDDContext(ctx), - pageContent - ); + const jdd_context = makeJDDContext(ctx); + const jdd = await JDD.fromStorage(registry, jdd_context, pageContent); const title = page.get("title"); const heading = page.get("heading"); const hideNavigation = page.get("hideNavigation") || false; @@ -54,7 +51,7 @@ export const customUrlView = ctx, title: title || ctx.$app.manifest.name, description: page.get("description") || "", - css_clumps: jdd.getAllCSSClumps(), + css_clumps: jdd.getAllCSSClumps(jdd_context), hideNavigation, htmlOptions: { showFooter: !hideNavigation,