diff --git a/package-lock.json b/package-lock.json index 3ebcd10..fb3cbf9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@koa/router": "^12.0.1", "@playwright/test": "^1.36.1", "@sealcode/file-manager": "^1.0.2", - "@sealcode/jdd": "^0.4.5", + "@sealcode/jdd": "^0.4.7", "@sealcode/sealgen": "^0.15.8", "@sealcode/ts-predicates": "^0.6.2", "@types/kill-port": "^2.0.0", @@ -823,9 +823,9 @@ } }, "node_modules/@sealcode/jdd": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/@sealcode/jdd/-/jdd-0.4.5.tgz", - "integrity": "sha512-N4DWR/+WEosJwkaul4BGB6CuGRkNHAfbNF5hGTCwYZRIFStYCThMGg2odXt6zt8eWbf9Cwt9pPKIQ+ZQHgpJFA==", + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/@sealcode/jdd/-/jdd-0.4.7.tgz", + "integrity": "sha512-tO0NlX4xdlKnU7F6egFEPaxqbiRl4tzXOls6dnqUO3dqwow+RSE3WkjkqE8zTACQEJASY7vOGTtR5owYzZdH9Q==", "dependencies": { "@sealcode/file-manager": "^1.0.2", "@sealcode/ts-predicates": "^0.5.3", diff --git a/package.json b/package.json index 3587ab9..5df459f 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@koa/router": "^12.0.1", "@playwright/test": "^1.36.1", "@sealcode/file-manager": "^1.0.2", - "@sealcode/jdd": "^0.4.5", + "@sealcode/jdd": "^0.4.7", "@sealcode/sealgen": "^0.15.8", "@sealcode/ts-predicates": "^0.6.2", "@types/kill-port": "^2.0.0", diff --git a/src/back/routes/all-components.page.tsx b/src/back/routes/all-components.page.tsx index cb93751..9e799c2 100644 --- a/src/back/routes/all-components.page.tsx +++ b/src/back/routes/all-components.page.tsx @@ -3,7 +3,7 @@ import { TempstreamJSX } from "tempstream"; import { Page } from "@sealcode/sealgen"; import html from "../html.js"; import { registry } from "../jdd-components/components.js"; -import { render } from "@sealcode/jdd"; +import { documentContainerFromParsed, render } from "@sealcode/jdd"; import { shuffle } from "../util.js"; import { makeJDDContext } from "../jdd-context.js"; @@ -31,7 +31,9 @@ export default new (class AllComponentsPage extends Page { return html( ctx, "AllComponents", -
{render(registry, document, jdd_context)}
+
+ {render(registry, documentContainerFromParsed(document), jdd_context)} +
); } })(); diff --git a/src/back/routes/components.sreact.tsx b/src/back/routes/components.sreact.tsx index d987bb1..8dfd53f 100644 --- a/src/back/routes/components.sreact.tsx +++ b/src/back/routes/components.sreact.tsx @@ -1,4 +1,4 @@ -import { render, renderEarlyAssets } from "@sealcode/jdd"; +import { documentContainerFromParsed, render, renderEarlyAssets } from "@sealcode/jdd"; import { StatefulPage } from "@sealcode/sealgen"; import { hasShape, predicates } from "@sealcode/ts-predicates"; import type { BaseContext } from "koa"; @@ -88,12 +88,12 @@ export default new (class ComponentsPage extends StatefulPage< (...args) => tempstream`${defaultHead(...args)}${renderEarlyAssets( registry, - [ + documentContainerFromParsed([ { component_name: state.component, args: state.component_args, }, - ], + ]), makeJDDContext(ctx) )}` ); @@ -211,12 +211,12 @@ export default new (class ComponentsPage extends StatefulPage< {render( registry, - [ + documentContainerFromParsed([ { component_name: state.component, args: state.component_args, }, - ], + ]), jdd_context )}