Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Resolve recent content and CSS issues (#6567)
Oleg Isonencdfef44a6aaf
diff --git a/apps/builder/app/services/github-issue-report.server.test.ts b/apps/builder/app/services/github-issue-report.server.test.tsindex 52a87f2389..5e8b09fbf3 100644--- a/apps/builder/app/services/github-issue-report.server.test.ts+++ b/apps/builder/app/services/github-issue-report.server.test.ts@@ -36,6 +36,8 @@ const report: IssueReportInput = {],tool: "preview.start",code: "PROJECT_BUNDLE_INVALID",+ errorType: "AssetRevisionConflictError",+ requestId: "abc123-LIS",httpStatus: 504,elapsedMs: 17_000,issues: [@@ -93,6 +95,8 @@ describe("GitHub issue reports", () => {expect(body).toContain("## Captured failure diagnostics");expect(body).toContain("- Tool: `preview.start`");expect(body).toContain("- Error code: `PROJECT_BUNDLE_INVALID`");+ expect(body).toContain("- Error type: AssetRevisionConflictError");+ expect(body).toContain("- Request ID: `abc123-LIS`");expect(body).toContain("- HTTP status: `504`");expect(body).toContain("- Duration: `17000ms`");expect(body).toContain("stale=styles");diff --git a/apps/builder/app/services/github-issue-report.server.ts b/apps/builder/app/services/github-issue-report.server.tsindex 223cbbd1dd..b625e3b10e 100644--- a/apps/builder/app/services/github-issue-report.server.ts+++ b/apps/builder/app/services/github-issue-report.server.ts@@ -66,6 +66,12 @@ const formatFailureDiagnostics = (runtime: IssueReportInput["runtime"]) => {"",`- Tool: \`${failure.tool}\``,`- Error code: \`${failure.code}\``,+ ...(failure.errorType === undefined+ ? []+ : [`- Error type: ${failure.errorType}`]),+ ...(failure.requestId === undefined+ ? []+ : [`- Request ID: \`${failure.requestId}\``]),...(failure.httpStatus === undefined? []: [`- HTTP status: \`${failure.httpStatus}\``]),diff --git a/packages/cli/src/project-session.test.ts b/packages/cli/src/project-session.test.tsindex 12179d3e09..b8b02cc0d5 100644--- a/packages/cli/src/project-session.test.ts+++ b/packages/cli/src/project-session.test.ts@@ -171,6 +171,28 @@ test("keeps only anonymous structured fields from the latest tool failure", () =).toEqual([]);});+test("retains safe error types and request IDs without leaking error messages", () => {+ class AssetRevisionConflictError extends Error {}+ const cause = Object.assign(+ new AssetRevisionConflictError("Private article name"),+ {+ requestId: "abc123-LIS",+ }+ );+ const failure = createIssueReportFailure(+ "update-content-block-frontmatter",+ new Error("Private project details", { cause })+ );++ expect(failure).toEqual({+ tool: "update-content-block-frontmatter",+ code: "MCP_TOOL_FAILED",+ errorType: "AssetRevisionConflictError",+ requestId: "abc123-LIS",+ });+ expect(JSON.stringify(failure)).not.toContain("Private");+});+test("captures only recognized IDs from nested failed tool input", () => {const failure = createIssueReportFailure("update-styles",diff --git a/packages/cli/src/project-session.ts b/packages/cli/src/project-session.tsindex 506d03ee81..542d5ba75f 100644--- a/packages/cli/src/project-session.ts+++ b/packages/cli/src/project-session.ts@@ -18,6 +18,8 @@ import {issueReportBrowserAttempt,issueReportBrowserSignal,issueReportEntityId,+ issueReportErrorType,+ issueReportRequestId,getPublicBuildIncludes,publicApiEntityIdFields,publicApiContractVersion,@@ -377,6 +379,13 @@ export const createIssueReportFailure = (): IssueReportRecentFailure => {const errorCode = getStableErrorCode(error);const records = getIssueReportErrorRecords(error);+ const errorType = records+ .map((record) =>+ issueReportErrorType.safeParse(+ record instanceof Error ? record.constructor.name : undefined+ )+ )+ .find((result) => result.success && result.data !== "TRPCClientError");const record = records.find((candidate) =>candidate.attempts !== undefined || candidate.processExit !== undefined@@ -412,6 +421,13 @@ export const createIssueReportFailure = (? "error": "other";const httpStatus = httpClient.getErrorStatus(error) ?? response?.status;+ const requestId = issueReportRequestId.safeParse(+ records.find((record) => record.requestId !== undefined)?.requestId ??+ (response?.headers instanceof Headers+ ? (response.headers.get("x-request-id") ??+ response.headers.get("cf-ray"))+ : undefined)+ );const isResponseTransformFailure = records.some((candidate) => {if (candidate.name !== "TRPCClientError" ||@@ -482,6 +498,8 @@ export const createIssueReportFailure = (code: isResponseTransformFailure? "API_RESPONSE_TRANSFORM_FAILED": (errorCode ?? "MCP_TOOL_FAILED"),+ ...(errorType?.success ? { errorType: errorType.data } : {}),+ ...(requestId.success ? { requestId: requestId.data } : {}),...(typeof httpStatus === "number" &&Number.isInteger(httpStatus) &&httpStatus >= 100 &&diff --git a/packages/css-data/src/parse-css.test.ts b/packages/css-data/src/parse-css.test.tsindex cd18127dd0..29dd3397db 100644--- a/packages/css-data/src/parse-css.test.ts+++ b/packages/css-data/src/parse-css.test.ts@@ -9,6 +9,23 @@ import {import { propertyVarTestFixtures } from "./__generated__/property-var-test-fixtures";describe("Parse CSS", () => {+ test("border color-mix with a variable matches explicit longhands", () => {+ const color = "color-mix(in srgb, var(--accent) 50%, transparent)";+ const shorthand = parseCss(+ `.test { border-top: 1px solid ${color}; }`,+ new Map()+ );+ const longhands = parseCss(+ `.test {+ border-top-width: 1px;+ border-top-style: solid;+ border-top-color: ${color};+ }`,+ new Map()+ );+ expect(shorthand.styles).toEqual(longhands.styles);+ });+test.each([["16px/1.5", "16px", "1.5", "var(--font-body)"],["16px / 24px", "16px", "24px", "var(--font-body)"],diff --git a/packages/css-data/src/shorthands.test.ts b/packages/css-data/src/shorthands.test.tsindex b3241fdf90..c6ce208515 100644--- a/packages/css-data/src/shorthands.test.ts+++ b/packages/css-data/src/shorthands.test.ts@@ -116,6 +116,42 @@ test("expand border edges", () => {]);});+test("expand border with color-mix containing a variable", () => {+ expect(+ expandShorthands([+ [+ "border-top",+ "1px solid color-mix(in srgb, var(--accent) 50%, transparent)",+ ],+ ])+ ).toEqual([+ ["border-top-width", "1px"],+ ["border-top-style", "solid"],+ ["border-top-color", "color-mix(in srgb,var(--accent) 50%,transparent)"],+ ]);+ expect(+ expandShorthands([+ [+ "border-top",+ "solid color-mix(in srgb, var(--accent) 50%, transparent)",+ ],+ ])+ ).toEqual([+ ["border-top-width", "medium"],+ ["border-top-style", "solid"],+ ["border-top-color", "color-mix(in srgb,var(--accent) 50%,transparent)"],+ ]);+ expect(+ expandShorthands([+ ["border-top", "color-mix(in srgb, var(--accent) 50%, transparent)"],+ ])+ ).toEqual([+ ["border-top-width", "medium"],+ ["border-top-style", "none"],+ ["border-top-color", "color-mix(in srgb,var(--accent) 50%,transparent)"],+ ]);+});+test("expand border types", () => {expect(expandShorthands([["border-width", "1px"]])).toEqual([["border-top-width", "1px"],diff --git a/packages/css-data/src/shorthands.ts b/packages/css-data/src/shorthands.tsindex 4b657e2e23..189384e91f 100644--- a/packages/css-data/src/shorthands.ts+++ b/packages/css-data/src/shorthands.ts@@ -244,13 +244,19 @@ const expandBorder = function* (property: string, value: CssNode) {.filter((index): index is number => index !== undefined);const unresolvedNodes =unresolved === undefined ? [] : getValueList(unresolved);- const unresolvedIndex =- missing.length === 1 &&+ let unresolvedIndex: number | undefined;+ if (unresolvedNodes.length === 1 &&- unresolvedNodes[0]?.type === "Function" &&- unresolvedNodes[0].name === "var"- ? missing[0]- : undefined;+ unresolvedNodes[0]?.type === "Function"+ ) {+ if (unresolvedNodes[0].name.toLowerCase() === "color-mix") {+ if (color === undefined) {+ unresolvedIndex = 2;+ }+ } else if (unresolvedNodes[0].name === "var" && missing.length === 1) {+ unresolvedIndex = missing[0];+ }+ }const values = [width, style, color];if (unresolvedIndex !== undefined) {values[unresolvedIndex] = unresolved;diff --git a/packages/http-client/src/index.test.ts b/packages/http-client/src/index.test.tsindex ab121deb13..f7e756d99c 100644--- a/packages/http-client/src/index.test.ts+++ b/packages/http-client/src/index.test.ts@@ -1976,7 +1976,10 @@ test("reports recovery guidance when an asset update commit cannot be confirmed"async (input: URL | RequestInfo, init?: RequestInit) => {const url = new URL(input.toString());if (init?.method === "PUT") {- return new Response("response failed", { status: 500 });+ return new Response("response failed", {+ status: 500,+ headers: { "cf-ray": "abc123-LIS" },+ });}if (url.pathname.endsWith("/content")) {return new Response('{"theme":"light"}');@@ -1997,6 +2000,7 @@ test("reports recovery guidance when an asset update commit cannot be confirmed"})).rejects.toMatchObject({code: "ASSET_UPDATE_COMMIT_UNCERTAIN",+ cause: expect.objectContaining({ requestId: "abc123-LIS" }),message: expect.stringContaining("Read the current asset and download its content"),diff --git a/packages/http-client/src/index.ts b/packages/http-client/src/index.tsindex 8f90682426..851f52ce5d 100644--- a/packages/http-client/src/index.ts+++ b/packages/http-client/src/index.ts@@ -879,7 +879,11 @@ const getAssetRestFailure = async (} catch {// Preserve the HTTP status when the server cannot return a JSON error.}- return Object.assign(new Error(message), { status: response.status });+ return Object.assign(new Error(message), {+ status: response.status,+ requestId:+ response.headers.get("x-request-id") ?? response.headers.get("cf-ray"),+ });};const requestAssetRestJson = async <Result>(diff --git a/packages/project-build/src/content-database.test.ts b/packages/project-build/src/content-database.test.tsindex 6af2664497..196c1262a0 100644--- a/packages/project-build/src/content-database.test.ts+++ b/packages/project-build/src/content-database.test.ts@@ -684,6 +684,13 @@ describe("Content Block MDX compilation", () => {).toThrow("Dynamic MDX source candidates through resolved document references");+ expect(+ resolvePublishedMdxAssetCandidates({+ build,+ artifact,+ allowUnresolved: true,+ }).has("block")+ ).toBe(false);});@@ -769,6 +776,74 @@ describe("Content Block MDX compilation", () => {).toEqual(["collection.json"]);});+ test("allows a valid Content Block query with no matching documents", () => {+ const build = createBuild({ sourceType: "expression" });+ build.props[0].value = `${encodeDataVariableId("posts-data")}.data.id`;+ build.dataSources.push({+ type: "resource",+ id: "posts-data",+ scopeInstanceId: "block",+ name: "posts",+ resourceId: "posts",+ });+ build.resources.push({+ id: "posts",+ name: "Posts",+ control: "system",+ method: "post",+ url: '"/$resources/assets"',+ headers: [],+ body: createStructuredAssetQueryResourceBody({+ where: { all: [] },+ sort: [],+ limit: "10",+ offset: "0",+ output: { mode: "all", includeMetadata: true },+ content: { mode: "none" },+ }),+ });++ const candidates = resolvePublishedMdxAssetCandidates({+ build,+ artifact: { documents: [] } as unknown as ContentArtifactV1,+ });+ expect(candidates.get("block")).toEqual([]);+ expect(+ createPublishedBuildContentCompilationPlan(build, candidates)?.queries+ ).not.toContainEqual(+ expect.objectContaining({+ id: expect.stringContaining("__content-block-mdx__"),+ })+ );+ expect(() => resolvePublishedMdxAssetCandidates({ build })).toThrow(+ 'Content Block "block" has no finite dynamic MDX Asset candidates'+ );++ // A matching document with no src field is not an empty query result.+ build.props[0].value = `${encodeDataVariableId("posts-data")}.data.properties.missing`;+ expect(() =>+ resolvePublishedMdxAssetCandidates({+ build,+ artifact: {+ documents: [+ {+ _id: "article.mdx",+ name: "article.mdx",+ path: "posts/article.mdx",+ key: "article",+ extension: "mdx",+ mimeType: "text/mdx",+ size: 1,+ properties: {},+ },+ ],+ } as unknown as ContentArtifactV1,+ })+ ).toThrow(+ 'Content Block "block" has no finite dynamic MDX Asset candidates'+ );+ });+test("bounds a mutable project variable to the project's MDX assets", () => {const build = createBuild({ sourceType: "expression" });build.props[0].value = encodeDataVariableId("article-source");diff --git a/packages/project-build/src/content-database.ts b/packages/project-build/src/content-database.tsindex b2df82d61f..7703dfa396 100644--- a/packages/project-build/src/content-database.ts+++ b/packages/project-build/src/content-database.ts@@ -592,10 +592,14 @@ export const resolvePublishedMdxAssetCandidates = ({const evaluateDataSource = (dataSourceId: string,path: readonly string[],- visiting = new Set<string>(),- mutableVariables = new Set<string>()+ evaluation: {+ visiting: Set<string>;+ mutableVariables: Set<string>;+ hasResolvedQuery: boolean;+ hasMatchingDocuments: boolean;+ }): unknown[] => {- if (visiting.has(dataSourceId)) {+ if (evaluation.visiting.has(dataSourceId)) {throw new Error("Dynamic MDX source data dependency is cyclic");}const dataSource = dataSources.get(dataSourceId);@@ -605,7 +609,7 @@ export const resolvePublishedMdxAssetCandidates = ({if (dataSource.type === "variable") {// Project variables can be changed by actions after publication. Their// initial value is therefore not a complete dependency set.- mutableVariables.add(dataSourceId);+ evaluation.mutableVariables.add(dataSourceId);return [];}if (dataSource.type === "resource") {@@ -625,6 +629,7 @@ export const resolvePublishedMdxAssetCandidates = ({if (query === undefined || basePlan === undefined) {return [];}+ evaluation.hasResolvedQuery = true;if (documentGraph !== undefined) {if (getDocumentGraphQueryRootIds({@@ -655,6 +660,9 @@ export const resolvePublishedMdxAssetCandidates = ({],},});+ if (candidateIds.size > 0) {+ evaluation.hasMatchingDocuments = true;+ }const fieldPath = path[0] === "data" ? path.slice(1) : path;return documents.filter(({ _id }) => candidateIds.has(_id))@@ -696,14 +704,13 @@ export const resolvePublishedMdxAssetCandidates = ({? undefined: decodeDataSourceVariable(dataPath[0]);if (dependencyId !== undefined && dataPath !== undefined) {- visiting.add(dataSourceId);+ evaluation.visiting.add(dataSourceId);iterables = evaluateDataSource(dependencyId,dataPath.slice(1),- visiting,- mutableVariables+ evaluation);- visiting.delete(dataSourceId);+ evaluation.visiting.delete(dataSourceId);}}const items = iterables.flatMap((iterable) => {@@ -745,17 +752,17 @@ export const resolvePublishedMdxAssetCandidates = ({const dataSourceId =path === undefined ? undefined : decodeDataSourceVariable(path[0]);let assetIds: string[] = [];- const mutableVariables = new Set<string>();+ const evaluation = {+ visiting: new Set<string>(),+ mutableVariables: new Set<string>(),+ hasResolvedQuery: false,+ hasMatchingDocuments: false,+ };try {assetIds =dataSourceId === undefined || path === undefined? []- : evaluateDataSource(- dataSourceId,- path.slice(1),- new Set(),- mutableVariables- ).filter(+ : evaluateDataSource(dataSourceId, path.slice(1), evaluation).filter((value): value is string =>typeof value === "string" && value.length > 0);@@ -763,11 +770,20 @@ export const resolvePublishedMdxAssetCandidates = ({if (allowUnresolved === false) {throw error;}+ evaluation.hasResolvedQuery = false;}- if (mutableVariables.size > 0 && allMdxAssetIds !== undefined) {+ if (evaluation.mutableVariables.size > 0 && allMdxAssetIds !== undefined) {assetIds.push(...allMdxAssetIds);}if (assetIds.length === 0) {+ if (+ evaluation.hasResolvedQuery &&+ evaluation.hasMatchingDocuments === false &&+ evaluation.mutableVariables.size === 0+ ) {+ candidatesByBlock.set(blockInstanceId, []);+ continue;+ }if (allowUnresolved) {continue;}diff --git a/packages/protocol/src/builder-api/__generated__/server-only-router-operation-metadata.ts b/packages/protocol/src/builder-api/__generated__/server-only-router-operation-metadata.tsindex 443372d6e6..709160c330 100644--- a/packages/protocol/src/builder-api/__generated__/server-only-router-operation-metadata.ts+++ b/packages/protocol/src/builder-api/__generated__/server-only-router-operation-metadata.ts@@ -267,6 +267,14 @@ export const serverOnlyRouterOperationMetadata = {minLength: 1,maxLength: 160,},+ errorType: {+ type: "string",+ pattern: "^[A-Za-z][A-Za-z0-9]{0,99}(Error|Exception)$",+ },+ requestId: {+ type: "string",+ pattern: "^[A-Za-z0-9_-]{1,100}$",+ },httpStatus: {type: "integer",minimum: 100,@@ -287,6 +295,7 @@ export const serverOnlyRouterOperationMetadata = {type: "string",enum: ["formId",+ "requestId","jobId","domainId","blockInstanceId",diff --git a/packages/protocol/src/issue-report.test.ts b/packages/protocol/src/issue-report.test.tsindex a496791e85..1cd79fd6a0 100644--- a/packages/protocol/src/issue-report.test.ts+++ b/packages/protocol/src/issue-report.test.ts@@ -140,6 +140,8 @@ describe("issue report contract", () => {test("accepts bounded response and browser diagnostics but no raw payloads", () => {const failure = {...report.runtime.recentFailure,+ errorType: "AssetRevisionConflictError",+ requestId: "abc123-LIS",response: { format: "json", envelope: "result", batchSize: 1 },browser: {exitSignal: "SIGABRT",@@ -161,6 +163,15 @@ describe("issue report contract", () => {},})).toThrow();+ expect(() =>+ issueReportInput.parse({+ ...report,+ runtime: {+ ...report.runtime,+ recentFailure: { ...failure, requestId: "https://private.example" },+ },+ })+ ).toThrow();expect(() =>issueReportInput.parse({...report,diff --git a/packages/protocol/src/issue-report.ts b/packages/protocol/src/issue-report.tsindex f87f61159a..a7173edd4b 100644--- a/packages/protocol/src/issue-report.ts+++ b/packages/protocol/src/issue-report.ts@@ -94,10 +94,18 @@ export const issueReportEntityId = z.object({ field: issueReportEntityIdField, id: issueReportId }).strict();+export const issueReportErrorType = z+ .string()+ .regex(/^[A-Za-z][A-Za-z0-9]{0,99}(Error|Exception)$/);++export const issueReportRequestId = z.string().regex(/^[A-Za-z0-9_-]{1,100}$/);+export const issueReportRecentFailureSchema = z.object({tool: z.string().trim().min(1).max(160),code: z.string().trim().min(1).max(160),+ errorType: issueReportErrorType.optional(),+ requestId: issueReportRequestId.optional(),httpStatus: z.number().int().min(100).max(599).optional(),elapsedMs: z.number().int().nonnegative().optional(),entityIds: z.array(issueReportEntityId).max(20).optional(),diff --git a/packages/react-sdk/src/component-generator.test.tsx b/packages/react-sdk/src/component-generator.test.tsxindex 63e0537088..62dace2af9 100644--- a/packages/react-sdk/src/component-generator.test.tsx+++ b/packages/react-sdk/src/component-generator.test.tsx@@ -2,7 +2,7 @@ import { API, type Snapshot } from "typescript/unstable/sync";import { afterAll, beforeAll, expect, test } from "vitest";import stripIndent from "strip-indent";import { transform } from "esbuild";-import { createElement } from "react";+import { createElement, Fragment as ReactFragment } from "react";import { renderToStaticMarkup } from "react-dom/server";import { renderText } from "./context";import { standardAttributesToReactProps } from "@webstudio-is/content-engine/jsx-attributes";@@ -92,6 +92,37 @@ test("string props coerce repeated query values without changing missing values"expect(isValidJSX(generated)).toBe(true);});+test("json-code props keep object expressions as objects", () => {+ const code = new Variable("code", { "@type": "Article" });+ const JsonLd = createTemplateComponentFixture("JsonLd");+ const generated = generateWebstudioComponent({+ classesMap: new Map(),+ scope: createScope(),+ name: "Page",+ rootInstanceId: "body",+ parameters: [],+ metas: new Map<string, WsComponentMeta>([+ [+ "JsonLd",+ {+ props: {+ code: { type: "string", control: "json-code", required: true },+ },+ },+ ],+ ]),+ ...renderData(+ <Body ws:id="body">+ <JsonLd ws:id="jsonld" code={expression`${code}`} />+ </Body>+ ),+ });++ expect(generated).toContain("code={code}");+ expect(generated).not.toContain("String(code)");+ expect(isValidJSX(generated)).toBe(true);+});+test("Form submission parameters are unavailable during page render", () => {const formData = new Parameter("formData");const browserInfo = new Parameter("browserInfo");@@ -1855,13 +1886,78 @@ test("renders pre-materialized dynamic Content Block candidates without loading"expect(isValidJSX(generated)).toBe(true);});+test("renders a Content Block source inside its Collection item scope", async () => {+ const collectionItem = new Parameter("collectionItem");+ const data = renderData(+ <Body ws:id="body">+ <ws.collection+ ws:id="collection"+ data={[{ id: "article" }]}+ item={collectionItem}+ >+ <ws.block ws:id="block" />+ </ws.collection>+ </Body>+ );+ const itemDataSource = Array.from(data.dataSources.values()).find(+ ({ name }) => name === "collectionItem"+ );+ expect(itemDataSource).toBeDefined();+ const generated = generateWebstudioComponent({+ classesMap: new Map(),+ scope: createScope(),+ name: "Page",+ rootInstanceId: "body",+ parameters: [],+ metas: new Map(),+ ...data,+ publishedContentBlocks: new Map([+ [+ "block",+ {+ sourceExpression: `${encodeDataVariableId(itemDataSource!.id)}.id`,+ candidates: [+ {+ assetId: "article",+ dependencyRevision: "revision",+ children: [{ type: "text", value: "Article body" }],+ frontmatter: {},+ },+ ],+ },+ ],+ ]),+ });++ expect(generated).toContain("Article body");+ expect(generated).toContain('contentSource === "article"');+ expect(isValidJSX(generated)).toBe(true);+ const { code } = await transform(generated, {+ loader: "tsx",+ jsxFactory: "createElement",+ jsxFragment: "Fragment",+ });+ const Page = new Function(+ "createElement",+ "Fragment",+ "Body",+ `${code}return Page;`+ )(createElement, ReactFragment, "main");+ expect(renderToStaticMarkup(createElement(Page))).toContain("Article body");+});+test("renders a Content Block shell with candidate frontmatter and body", () => {const document = new Parameter("document");+ const visible = new Variable("visible", true);const Block = ws.block;const BlockBody = ws.contentBlockBody;const data = renderData(<Body ws:id="page">- <Block ws:id="block" document={document}>+ <Block+ ws:id="block"+ document={document}+ data-ws-show={expression`${visible}`}+ ><Heading ws:id="title">{expression`${document}.frontmatter.title`}</Heading>diff --git a/packages/react-sdk/src/component-generator.ts b/packages/react-sdk/src/component-generator.tsindex 6ec76209e3..3989867ef6 100644--- a/packages/react-sdk/src/component-generator.ts+++ b/packages/react-sdk/src/component-generator.ts@@ -289,6 +289,7 @@ export const generateJsxElement = ({if (instance.component !== collectionComponent &&meta?.props?.[prop.name]?.type === "string" &&+ meta?.props?.[prop.name]?.control !== "json-code" &&(prop.type === "expression" || prop.type === "parameter")) {propValue = `${propValue} == null ? ${propValue} : String(${propValue})`;@@ -434,13 +435,17 @@ export const generateJsxElement = ({after = "}";}conditionalElement += `${before}(${conditionValue}) &&\n`;- // wrap collection with fragment when rendered inside condition+ // Transparent components can generate multiple JSX children.// {dataSourceVariable &&// <>// {[].map(...)}// </>// }- if (instance.component === collectionComponent) {+ if (+ instance.component === collectionComponent ||+ instance.component === blockComponent ||+ instance.component === blockBodyComponent+ ) {conditionalElement += "<>\n";conditionalElement += generatedElement;conditionalElement += "</>\n";diff --git a/packages/react-sdk/src/page-settings-meta.test.tsx b/packages/react-sdk/src/page-settings-meta.test.tsxnew file mode 100644index 0000000000..7bb5df8d69--- /dev/null+++ b/packages/react-sdk/src/page-settings-meta.test.tsx@@ -0,0 +1,37 @@+import { expect, test } from "vitest";+import { renderToStaticMarkup } from "react-dom/server";+import { PageSettingsMeta } from "./page-settings-meta";++test("custom Open Graph metadata replaces defaults without removing other custom values", () => {+ const html = renderToStaticMarkup(+ <PageSettingsMeta+ url="https://example.com/article"+ siteName="Example"+ imageLoader={({ src }) => src}+ assetBaseUrl="/assets/"+ pageMeta={{+ title: "Page title",+ description: "Page description",+ socialImageUrl: "https://example.com/default.png",+ custom: [+ { property: "og:type", content: "article" },+ { property: "og:url", content: "https://canonical.example/article" },+ { property: "og:image", content: "https://example.com/first.png" },+ { property: "og:image", content: "https://example.com/second.png" },+ ],+ }}+ />+ );++ expect(html).toContain('property="og:type" content="article"');+ expect(html).not.toContain('property="og:type" content="website"');+ expect(html).toContain(+ 'property="og:url" content="https://canonical.example/article"'+ );+ expect(html).not.toContain(+ 'property="og:url" content="https://example.com/article"'+ );+ expect(html).not.toContain("default.png");+ expect(html.match(/property="og:image"/g)).toHaveLength(2);+ expect(html).toContain('name="description" content="Page description"');+});diff --git a/packages/react-sdk/src/page-settings-meta.tsx b/packages/react-sdk/src/page-settings-meta.tsxindex 8a0fb7fe23..560dd64e49 100644--- a/packages/react-sdk/src/page-settings-meta.tsx+++ b/packages/react-sdk/src/page-settings-meta.tsx@@ -136,7 +136,14 @@ export const PageSettingsMeta = ({});}- metas.push(...pageMeta.custom);+ const customProperties = new Set(+ pageMeta.custom.map((meta) => meta.property)+ );+ const pageMetas = metas.filter(+ (meta) =>+ meta.property === undefined || !customProperties.has(meta.property)+ );+ pageMetas.push(...pageMeta.custom);const isTwitterCardSizeDefined = pageMeta.custom.some((meta) => meta.property === "twitter:card"@@ -146,8 +153,11 @@ export const PageSettingsMeta = ({pageMeta.socialImageUrl !== undefined) &&isTwitterCardSizeDefined === false) {- metas.push({ property: "twitter:card", content: "summary_large_image" });+ pageMetas.push({+ property: "twitter:card",+ content: "summary_large_image",+ });}- return metas.map((meta, index) => <Meta key={index} {...meta} />);+ return pageMetas.map((meta, index) => <Meta key={index} {...meta} />);};diff --git a/packages/sdk/src/resources-generator.test.tsx b/packages/sdk/src/resources-generator.test.tsxindex 9862c88909..32f03a2360 100644--- a/packages/sdk/src/resources-generator.test.tsx+++ b/packages/sdk/src/resources-generator.test.tsx@@ -462,6 +462,31 @@ test("generate resources loader", () => {`);});+test("does not evaluate a Content Block source without candidate resources", () => {+ const generated = generateResources({+ scope: createScope(),+ page: { rootInstanceId: "body" } as Page,+ dataSources: toMap([+ {+ id: "collectionItem",+ scopeInstanceId: "collection",+ type: "parameter",+ name: "collectionItem",+ },+ ]),+ resources: new Map(),+ props: new Map(),+ contentBlockResourceSelections: [+ {+ sourceExpression: `${encodeDataSourceVariable("collectionItem")}.id`,+ candidates: [{ assetId: "article", resourceIds: [] }],+ },+ ],+ });++ expect(generated).not.toContain("collectionItem");+});+test("selects only resources used by the resolved dynamic MDX candidate", () => {const generated = generateResources({scope: createScope(),diff --git a/packages/sdk/src/resources-generator.ts b/packages/sdk/src/resources-generator.tsindex 81fc3e1f86..d926c151b1 100644--- a/packages/sdk/src/resources-generator.ts+++ b/packages/sdk/src/resources-generator.ts@@ -115,8 +115,12 @@ export const generateResources = ({}) => {const usedDataSources: DataSources = new Map();const contentInputDataSourceIds = new Set<string>();+ const resourceSelections = contentBlockResourceSelections.filter(+ ({ candidates }) =>+ candidates.some(({ resourceIds }) => resourceIds.length > 0)+ );const selectedResourceIds = new Set(- contentBlockResourceSelections.flatMap(({ candidates }) =>+ resourceSelections.flatMap(({ candidates }) =>candidates.flatMap(({ resourceIds }) => resourceIds)));@@ -151,7 +155,7 @@ export const generateResources = ({props,dataSources,});- for (const { sourceExpression } of contentBlockResourceSelections) {+ for (const { sourceExpression } of resourceSelections) {for (const dataSourceId of getExpressionDataSourceIds([sourceExpression])) {if (unavailableDataSourceIds.has(dataSourceId)) {throw new Error(@@ -290,7 +294,7 @@ export const generateResources = ({generatedRequests += ` }\n`;}- const generatedContentSelections = contentBlockResourceSelections.map(+ const generatedContentSelections = resourceSelections.map(({ sourceExpression, candidates }) => {const selectionDataSources: DataSources = new Map();const source = generateExpression({@@ -299,19 +303,17 @@ export const generateResources = ({usedDataSources: selectionDataSources,scope,});- if (candidates.some(({ resourceIds }) => resourceIds.length > 0)) {- for (const dataSource of selectionDataSources.values()) {- if (- (dataSource.type === "parameter" &&- dataSource.id !== page.systemDataSourceId &&- dataSource.id !== SYSTEM_VARIABLE_ID) ||- (dataSource.type === "resource" &&- selectedResourceIds.has(dataSource.resourceId))- ) {- throw new Error(- "Dynamic Content Block Resources require a source available after base Resources load"- );- }+ for (const dataSource of selectionDataSources.values()) {+ if (+ (dataSource.type === "parameter" &&+ dataSource.id !== page.systemDataSourceId &&+ dataSource.id !== SYSTEM_VARIABLE_ID) ||+ (dataSource.type === "resource" &&+ selectedResourceIds.has(dataSource.resourceId))+ ) {+ throw new Error(+ "Dynamic Content Block Resources require a source available after base Resources load"+ );}}for (const dataSource of selectionDataSources.values()) {