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
feat: add plain text page support (#5783)
Oleg Isonend45d1b4274d9
diff --git a/apps/builder/app/builder/features/command-panel/groups/components-group.tsx b/apps/builder/app/builder/features/command-panel/groups/components-group.tsxindex 4a4a007f7c..1a1e16b554 100644--- a/apps/builder/app/builder/features/command-panel/groups/components-group.tsx+++ b/apps/builder/app/builder/features/command-panel/groups/components-group.tsx@@ -69,8 +69,13 @@ export const $componentOptions = computed(order?: number;firstInstance: { component: string };}) => {+ const documentType = selectedPage?.meta.documentType;+ // text pages serve plain text content and accept no insertions+ if (documentType === "text") {+ return;+ }// show only xml category and collection component in xml documents- if (selectedPage?.meta.documentType === "xml") {+ if (documentType === "xml") {if (category !== "xml" && name !== collectionComponent) {return;}diff --git a/apps/builder/app/builder/features/command-panel/groups/convert-group.tsx b/apps/builder/app/builder/features/command-panel/groups/convert-group.tsxindex 3e7480b0c6..3d5f74bc1e 100644--- a/apps/builder/app/builder/features/command-panel/groups/convert-group.tsx+++ b/apps/builder/app/builder/features/command-panel/groups/convert-group.tsx@@ -16,7 +16,7 @@ import { elementComponent, tags } from "@webstudio-is/sdk";import { $registeredComponentMetas } from "~/shared/nano-states";import { $instances } from "~/shared/sync/data-stores";import { $props } from "~/shared/sync/data-stores";-import { $selectedInstancePath } from "~/shared/nano-states";+import { $selectedInstancePath, $selectedPage } from "~/shared/nano-states";import {getInstanceLabel,InstanceIcon,@@ -28,6 +28,7 @@ import {closeCommandPanel,openCommandPanel,} from "../command-state";+import { allowsHtmlMutations } from "../shared/document-utils";import { useState } from "react";import { convertInstance } from "~/shared/instance-utils";@@ -46,8 +47,9 @@ const $convertOptions = computed($instances,$props,$registeredComponentMetas,+ $selectedPage,],- (isOpen, instancePath, instances, props, metas) => {+ (isOpen, instancePath, instances, props, metas, selectedPage) => {const convertOptions: ConvertOption[] = [];if (!isOpen) {return convertOptions;@@ -55,6 +57,9 @@ const $convertOptions = computed(if (instancePath === undefined || instancePath.length === 1) {return convertOptions;}+ if (!allowsHtmlMutations(selectedPage)) {+ return convertOptions;+ }const [selectedItem] = instancePath;// Test all registered componentsdiff --git a/apps/builder/app/builder/features/command-panel/groups/tags-group.tsx b/apps/builder/app/builder/features/command-panel/groups/tags-group.tsxindex f6aad5936c..b5350b4a75 100644--- a/apps/builder/app/builder/features/command-panel/groups/tags-group.tsx+++ b/apps/builder/app/builder/features/command-panel/groups/tags-group.tsx@@ -13,11 +13,12 @@ import { $registeredComponentMetas } from "~/shared/nano-states";import { $instances } from "~/shared/sync/data-stores";import { $props } from "~/shared/sync/data-stores";import { insertWebstudioFragmentAt } from "~/shared/instance-utils";-import { $selectedInstancePath } from "~/shared/nano-states";+import { $selectedInstancePath, $selectedPage } from "~/shared/nano-states";import { InstanceIcon } from "~/builder/shared/instance-label";import { isTreeSatisfyingContentModel } from "~/shared/content-model";import { closeCommandPanel, $isCommandPanelOpen } from "../command-state";import type { BaseOption } from "../shared/types";+import { allowsHtmlMutations } from "../shared/document-utils";export type TagOption = BaseOption & {type: "tag";@@ -31,8 +32,9 @@ export const $tagOptions = computed($instances,$props,$registeredComponentMetas,+ $selectedPage,],- (isOpen, instancePath, instances, props, metas) => {+ (isOpen, instancePath, instances, props, metas, selectedPage) => {const tagOptions: TagOption[] = [];if (!isOpen) {return tagOptions;@@ -40,6 +42,9 @@ export const $tagOptions = computed(if (instancePath === undefined) {return tagOptions;}+ if (!allowsHtmlMutations(selectedPage)) {+ return tagOptions;+ }const [{ instance, instanceSelector }] = instancePath;const childInstance: Instance = {type: "instance",diff --git a/apps/builder/app/builder/features/command-panel/groups/wrap-group.tsx b/apps/builder/app/builder/features/command-panel/groups/wrap-group.tsxindex ff3ff13951..d846492c7d 100644--- a/apps/builder/app/builder/features/command-panel/groups/wrap-group.tsx+++ b/apps/builder/app/builder/features/command-panel/groups/wrap-group.tsx@@ -22,7 +22,7 @@ import type {import { $registeredComponentMetas } from "~/shared/nano-states";import { $instances } from "~/shared/sync/data-stores";import { $props } from "~/shared/sync/data-stores";-import { $selectedInstancePath } from "~/shared/nano-states";+import { $selectedInstancePath, $selectedPage } from "~/shared/nano-states";import {getInstanceLabel,InstanceIcon,@@ -36,6 +36,7 @@ import {} from "../command-state";import { useState } from "react";import { wrapInstance } from "~/shared/instance-utils";+import { allowsHtmlMutations } from "../shared/document-utils";type WrapOption = {component: string;@@ -146,8 +147,9 @@ const $wrapOptions = computed($instances,$props,$registeredComponentMetas,+ $selectedPage,],- (isOpen, instancePath, instances, props, metas) => {+ (isOpen, instancePath, instances, props, metas, selectedPage) => {const wrapOptions: WrapOption[] = [];if (!isOpen) {return wrapOptions;@@ -155,6 +157,9 @@ const $wrapOptions = computed(if (instancePath === undefined || instancePath.length === 1) {return wrapOptions;}+ if (!allowsHtmlMutations(selectedPage)) {+ return wrapOptions;+ }const [selectedItem, parentItem] = instancePath;// Build list of allowed wrappers from registered metasdiff --git a/apps/builder/app/builder/features/command-panel/shared/document-utils.ts b/apps/builder/app/builder/features/command-panel/shared/document-utils.tsnew file mode 100644index 0000000000..a07625428e--- /dev/null+++ b/apps/builder/app/builder/features/command-panel/shared/document-utils.ts@@ -0,0 +1,10 @@+import type { Page } from "@webstudio-is/sdk";++// Only html documents accept arbitrary html element/component mutations+// (insertion, wrapping, conversion). xml documents allow only specific xml+// components (handled per-item where applicable) and text documents serve+// plain text content with no insertions.+export const allowsHtmlMutations = (page: Page | undefined) => {+ const documentType = page?.meta.documentType;+ return documentType === undefined || documentType === "html";+};diff --git a/apps/builder/app/builder/features/components/components.tsx b/apps/builder/app/builder/features/components/components.tsxindex 6696c5032a..3d949e545e 100644--- a/apps/builder/app/builder/features/components/components.tsx+++ b/apps/builder/app/builder/features/components/components.tsx@@ -7,6 +7,7 @@ import {type WsComponentMeta,componentCategories,collectionComponent,+ documentTypes,elementComponent,} from "@webstudio-is/sdk";import {@@ -110,7 +111,7 @@ const filterAndGroupComponents = ({metasByCategory,search,}: {- documentType?: "html" | "xml";+ documentType?: (typeof documentTypes)[number];metasByCategory: Map<string, Array<Meta>>;search: string;}): Groups => {diff --git a/apps/builder/app/builder/features/pages/page-settings/page-settings.test.ts b/apps/builder/app/builder/features/pages/page-settings/page-settings.test.tsindex e37dc800f1..a71dfb5905 100644--- a/apps/builder/app/builder/features/pages/page-settings/page-settings.test.ts+++ b/apps/builder/app/builder/features/pages/page-settings/page-settings.test.ts@@ -169,6 +169,43 @@ describe("validateValues", () => {validateValues(createPages(), undefined, createValues(), new Map()).auth).toBeUndefined();});++ test("validates only visible document type sections", () => {+ const invalidHtmlMetadata = {+ title: `""`,+ language: `"not a locale"`,+ };++ const textErrors = validateValues(+ createPages(),+ undefined,+ createValues({+ ...invalidHtmlMetadata,+ documentType: "text",+ content: "42",+ }),+ new Map()+ );++ expect(textErrors.title).toBeUndefined();+ expect(textErrors.language).toBeUndefined();+ expect(textErrors.content).toBeDefined();++ const xmlErrors = validateValues(+ createPages(),+ undefined,+ createValues({+ ...invalidHtmlMetadata,+ documentType: "xml",+ content: "42",+ }),+ new Map()+ );++ expect(xmlErrors.title).toBeUndefined();+ expect(xmlErrors.language).toBeUndefined();+ expect(xmlErrors.content).toBeUndefined();+ });});describe("auth form values", () => {@@ -218,4 +255,19 @@ describe("auth form values", () => {password: "secret",});});++ test("maps text content metadata into form values", () => {+ const page = createPage({+ id: "llms",+ meta: {+ documentType: "text",+ content: `"Webstudio text content"`,+ },+ });+ const pages = createPages({ pages: [homePage, page] });++ expect(toFormValues(page, pages, false).content).toBe(+ `"Webstudio text content"`+ );+ });});diff --git a/apps/builder/app/builder/features/pages/page-settings/page-settings.tsx b/apps/builder/app/builder/features/pages/page-settings/page-settings.tsxindex 47a5aa9f67..b6d1d669ba 100644--- a/apps/builder/app/builder/features/pages/page-settings/page-settings.tsx+++ b/apps/builder/app/builder/features/pages/page-settings/page-settings.tsx@@ -25,7 +25,6 @@ import {ScrollArea,Link,PanelBanner,- css,TitleSuffixSpacer,DialogClose,DialogTitle,@@ -61,6 +60,10 @@ import {SocialImageSection,validateSocialImageSection,} from "./section-social-image";+import {+ TextContentSection,+ validateTextContentSection,+} from "./section-text-content";import {type Errors,type FieldName,@@ -82,6 +85,7 @@ const fieldDefaultValues: Values = {status: undefined,redirect: `""`,documentType: "html" as (typeof documentTypes)[number],+ content: `""`,auth: {login: "",password: "",@@ -120,10 +124,17 @@ const validateValues = (const sectionErrors = [validateGeneralSection({ pages, pageId, values, variableValues }),validateAuthSection(values),- validateSearchSection(values, variableValues),- validateSocialImageSection(values, variableValues),- validateCustomMetadataSection(values, variableValues),];+ if (values.documentType === "html") {+ sectionErrors.push(+ validateSearchSection(values, variableValues),+ validateSocialImageSection(values, variableValues),+ validateCustomMetadataSection(values, variableValues)+ );+ }+ if (values.documentType === "text") {+ sectionErrors.push(validateTextContentSection(values, variableValues));+ }for (const sectionError of sectionErrors) {if (sectionError.auth) {errors.auth = { ...errors.auth, ...sectionError.auth };@@ -162,6 +173,7 @@ const toFormValues = (status: page.meta.status ?? fieldDefaultValues.status,redirect: page.meta.redirect ?? fieldDefaultValues.redirect,documentType: page.meta.documentType ?? fieldDefaultValues.documentType,+ content: page.meta.content ?? fieldDefaultValues.content,auth: {login: page.meta.auth?.login ?? fieldDefaultValues.auth.login,password: page.meta.auth?.password ?? fieldDefaultValues.auth.password,@@ -206,14 +218,6 @@ export const __testing__ = {validateValues,};-const fieldsetStyle = css({- all: "unset",- display: "block",- "&:disabled": {- opacity: 0.4,- },-});-const FormFields = ({autoSelect,errors,@@ -281,56 +285,55 @@ const FormFields = ({/></CollapsibleSection>- {/**- * ----------------------========<<<Search Results>>>>========----------------------- */}- <CollapsibleSection label="Search">- <fieldset- disabled={values.documentType === "xml"}- className={fieldsetStyle()}- >+ {values.documentType === "text" && (+ <CollapsibleSection label="Content">+ <TextContentSection+ values={values}+ errors={errors}+ onChange={onChange}+ />+ </CollapsibleSection>+ )}++ {values.documentType === "html" && (+ <CollapsibleSection label="Search"><SearchSectionvalues={values}errors={errors}onChange={onChange}/>- </fieldset>- </CollapsibleSection>+ </CollapsibleSection>+ )}- <CollapsibleSection label="Social Image">- <fieldset- disabled={values.documentType === "xml"}- className={fieldsetStyle()}- >+ {values.documentType === "html" && (+ <CollapsibleSection label="Social Image"><SocialImageSectionvalues={values}errors={errors}onChange={onChange}/>- </fieldset>- </CollapsibleSection>+ </CollapsibleSection>+ )}- <CollapsibleSection label="Custom Metadata">- <fieldset- disabled={values.documentType === "xml"}- className={fieldsetStyle()}- >+ {values.documentType === "html" && (+ <CollapsibleSection label="Custom Metadata"><CustomMetadataSectionvalues={values}errors={errors}onChange={onChange}/>- </fieldset>- </CollapsibleSection>-- {(project?.marketplaceApprovalStatus === "PENDING" ||- project?.marketplaceApprovalStatus === "APPROVED" ||- project?.marketplaceApprovalStatus === "REJECTED") && (- <CollapsibleSection label="Marketplace">- <MarketplaceSection values={values} onChange={onChange} /></CollapsibleSection>)}+ {values.documentType === "html" &&+ (project?.marketplaceApprovalStatus === "PENDING" ||+ project?.marketplaceApprovalStatus === "APPROVED" ||+ project?.marketplaceApprovalStatus === "REJECTED") && (+ <CollapsibleSection label="Marketplace">+ <MarketplaceSection values={values} onChange={onChange} />+ </CollapsibleSection>+ )}+<Box css={{ height: theme.spacing[10] }} /></ScrollArea></Grid>@@ -537,6 +540,10 @@ const updatePage = (pageId: Page["id"], values: Partial<Values>) => {page.meta.documentType = values.documentType;}+ if (values.content !== undefined) {+ page.meta.content = values.content;+ }+if (values.auth !== undefined) {page.meta.auth = getAuthFromValues({...toFormValues(page, pages, page.id === pages.homePageId),diff --git a/apps/builder/app/builder/features/pages/page-settings/section-general.tsx b/apps/builder/app/builder/features/pages/page-settings/section-general.tsxindex c78c677329..83237e9d18 100644--- a/apps/builder/app/builder/features/pages/page-settings/section-general.tsx+++ b/apps/builder/app/builder/features/pages/page-settings/section-general.tsx@@ -417,7 +417,7 @@ export const GeneralSection = ({Move this page to the “Root” folder to set it as your home page</Text></>- ) : values.documentType === "xml" ? (+ ) : values.documentType !== "html" ? (<><HomeIcon color={rawTheme.colors.foregroundSubtle} /><Text@@ -428,7 +428,8 @@ export const GeneralSection = ({}}color="subtle">- XML pages cannot be set as the home page+ {values.documentType.toUpperCase()} pages cannot be set as the+ home page</Text></>) : (@@ -482,7 +483,7 @@ export const GeneralSection = ({options={documentTypes}getValue={(docType: (typeof documentTypes)[number]) => docType}getLabel={(docType: (typeof documentTypes)[number]) =>- docType.toLocaleUpperCase()+ docType.toUpperCase()}value={values.documentType}disabled={values.isHomePage}diff --git a/apps/builder/app/builder/features/pages/page-settings/section-text-content.tsx b/apps/builder/app/builder/features/pages/page-settings/section-text-content.tsxnew file mode 100644index 0000000000..6242b50ff9--- /dev/null+++ b/apps/builder/app/builder/features/pages/page-settings/section-text-content.tsx@@ -0,0 +1,90 @@+import { useId } from "react";+import { useStore } from "@nanostores/react";+import { Grid, Label, Text, TextArea } from "@webstudio-is/design-system";+import { isLiteralExpression } from "@webstudio-is/sdk";+import { z } from "zod";+import {+ BindingControl,+ BindingPopover,+} from "~/builder/shared/binding-popover";+import { computeExpression } from "~/shared/data-variables";+import { $pageRootScope } from "../page-utils";+import type { Errors, OnChange, Values } from "./shared";++const TextContentValues = z.object({+ content: z.string().optional(),+});++export const validateTextContentSection = (+ values: Values,+ variableValues: Map<string, unknown>+): Errors => {+ if (values.documentType !== "text") {+ return {};+ }++ const parsedResult = TextContentValues.safeParse({+ content: computeExpression(values.content, variableValues),+ });++ if (parsedResult.success === false) {+ return parsedResult.error.formErrors.fieldErrors;+ }++ return {};+};++export const TextContentSection = ({+ values,+ errors,+ onChange,+}: {+ values: Values;+ errors: Errors;+ onChange: OnChange;+}) => {+ const { variableValues, scope, aliases } = useStore($pageRootScope);+ const contentId = useId();++ return (+ <Grid gap={2}>+ <Text color="subtle">The plain text content served for this page.</Text>+ <Grid gap={1}>+ <Label htmlFor={contentId}>Text</Label>+ <BindingControl>+ <BindingPopover+ scope={scope}+ aliases={aliases}+ variant={isLiteralExpression(values.content) ? "default" : "bound"}+ value={values.content}+ onChange={(value) => {+ onChange({ field: "content", value });+ }}+ onRemove={(evaluatedValue) => {+ onChange({+ field: "content",+ value: JSON.stringify(evaluatedValue ?? ""),+ });+ }}+ />+ <TextArea+ id={contentId}+ color={errors.content ? "error" : undefined}+ disabled={isLiteralExpression(values.content) === false}+ value={String(+ computeExpression(values.content, variableValues) ?? ""+ )}+ onChange={(value) => {+ onChange({+ field: "content",+ value: JSON.stringify(value),+ });+ }}+ autoGrow+ maxRows={20}+ />+ </BindingControl>+ </Grid>+ </Grid>+ );+};diff --git a/apps/builder/app/builder/features/pages/page-settings/shared.ts b/apps/builder/app/builder/features/pages/page-settings/shared.tsindex 9a80b8a0ad..ac7fc640ae 100644--- a/apps/builder/app/builder/features/pages/page-settings/shared.ts+++ b/apps/builder/app/builder/features/pages/page-settings/shared.ts@@ -22,6 +22,7 @@ export type Values = {status: string | undefined;redirect: string;documentType: NonNullable<Page["meta"]["documentType"]>;+ content: string;auth: {login: string;password: string;diff --git a/apps/builder/app/builder/features/pages/pages.tsx b/apps/builder/app/builder/features/pages/pages.tsxindex 9814d3bb60..bd1c7e634d 100644--- a/apps/builder/app/builder/features/pages/pages.tsx+++ b/apps/builder/app/builder/features/pages/pages.tsx@@ -564,12 +564,29 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {const editingItemId = useStore($editingPageId);const pages = useStore($pages);const isDesignMode = useStore($isDesignMode);- const containerRef = useRef<HTMLDivElement>(null);+ const [containerElement, setContainerElement] =+ useState<HTMLDivElement | null>(null);+ const [settingsPanelHeight, setSettingsPanelHeight] = useState<number>();const [pageIdToDelete, setPageIdToDelete] = useState<string | undefined>();const [folderIdToDelete, setFolderIdToDelete] = useState<string | undefined>();+ useEffect(() => {+ if (containerElement === null) {+ return;+ }+ const updateHeight = () => {+ setSettingsPanelHeight(containerElement.getBoundingClientRect().height);+ };+ updateHeight();+ const resizeObserver = new ResizeObserver(updateHeight);+ resizeObserver.observe(containerElement);+ return () => {+ resizeObserver.disconnect();+ };+ }, [containerElement]);+if (currentPage === undefined || pages === undefined) {return;}@@ -607,7 +624,16 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {};return (- <div ref={containerRef} data-floating-panel-container>+ <div+ ref={setContainerElement}+ data-floating-panel-container+ style={{+ position: "relative",+ display: "flex",+ flexDirection: "column",+ height: "100%",+ }}+ ><PanelTitlesuffix={<>@@ -686,6 +712,7 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {}placement="right-start"width={Number.parseFloat(rawTheme.spacing[35])}+ height={settingsPanelHeight}open={true}onOpenChange={(isOpen) => {if (!isOpen) {@@ -693,7 +720,17 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {}}}>- <span style={{ display: "none" }} />+ <span+ aria-hidden+ style={{+ position: "absolute",+ top: 0,+ right: 0,+ width: 0,+ height: 0,+ pointerEvents: "none",+ }}+ /></FloatingPanel>)}{pageIdToDelete && (diff --git a/apps/builder/app/builder/sidebar-left/sidebar-left.tsx b/apps/builder/app/builder/sidebar-left/sidebar-left.tsxindex 6b9052fce1..22807de7ec 100644--- a/apps/builder/app/builder/sidebar-left/sidebar-left.tsx+++ b/apps/builder/app/builder/sidebar-left/sidebar-left.tsx@@ -24,6 +24,7 @@ import {setActiveSidebarPanel,toggleActiveSidebarPanel,} from "~/builder/shared/nano-states";+import { $selectedPage } from "~/shared/nano-states";import {SidebarButton,SidebarTabs,@@ -70,8 +71,8 @@ type PanelConfig = {Icon: IconComponent;Panel: (props: { publish: Publish; onClose: () => void }) => ReactNode;visibility?: {- content?: boolean; // if set, controls visibility in edit mode, if not the panel is visible- // Probably other modes+ content?: boolean;+ text?: boolean;};};@@ -80,7 +81,8 @@ const isPanelVisible = ({isPreviewMode,isContentMode,- }: { isPreviewMode: boolean; isContentMode: boolean }+ isTextPage,+ }: { isPreviewMode: boolean; isContentMode: boolean; isTextPage: boolean }) => {if (isPreviewMode) {return false;@@ -88,19 +90,29 @@ const isPanelVisible = (const { visibility } = panel;- // If visibility is not defined, the panel is always visibleif (visibility === undefined) {return true;}+ if (isTextPage) {+ // Show all panels for text pages; panels with text: false are disabled, not hidden+ return true;+ }+if (isContentMode) {- // If visibility.edit is not defined, the panel is visiblereturn visibility.content ?? true;}return true;};+const isPanelDisabled = (+ panel: Pick<PanelConfig, "visibility">,+ { isTextPage }: { isTextPage: boolean }+) => {+ return isTextPage === true && panel.visibility?.text === false;+};+const panels: PanelConfig[] = [{name: "components",@@ -114,6 +126,7 @@ const panels: PanelConfig[] = [Panel: ComponentsPanel,visibility: {content: false,+ text: false,},},{@@ -176,6 +189,8 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {const { Panel } = panels.find((item) => item.name === activePanel) ?? none;const isPreviewMode = useStore($isPreviewMode);const isContentMode = useStore($isContentMode);+ const selectedPage = useStore($selectedPage);+ const isTextPage = selectedPage?.meta.documentType === "text";const tabsWrapperRef = useRef<HTMLDivElement>(null);const returnTabRef = useRef<SidebarPanelName | undefined>(undefined);@@ -221,7 +236,7 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {setActiveSidebarPanel("assets");});- const modes = { isContentMode, isPreviewMode };+ const modes = { isContentMode, isPreviewMode, isTextPage };return (<SidebarTabs@@ -244,12 +259,14 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {<SidebarTabsList>{panels.filter((panel) => isPanelVisible(panel, modes))- .map(({ name, Icon, label }) => {+ .map(({ name, Icon, label, visibility }) => {+ const disabled = isPanelDisabled({ visibility }, modes);return (<SidebarTabsTriggerkey={name}label={label}value={name}+ disabled={disabled}onClick={() => {toggleActiveSidebarPanel(name);}}diff --git a/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsx b/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsxindex 408138583a..90208a439f 100644--- a/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsx+++ b/apps/builder/app/builder/sidebar-left/sidebar-tabs.tsx@@ -45,6 +45,10 @@ const buttonStyle = css({color: theme.colors.foregroundIconMain,backgroundColor: theme.colors.backgroundPanel,border: "none",+ "&:disabled": {+ opacity: 0.4,+ cursor: "not-allowed",+ },"&:focus-visible": triggerFocusRing,"@hover": {"&:hover": {diff --git a/fixtures/react-router-cloudflare/app/__generated__/[another-page]._index.server.tsx b/fixtures/react-router-cloudflare/app/__generated__/[another-page]._index.server.tsxindex f2aa1f2262..7742cba561 100644--- a/fixtures/react-router-cloudflare/app/__generated__/[another-page]._index.server.tsx+++ b/fixtures/react-router-cloudflare/app/__generated__/[another-page]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/react-router-cloudflare/app/__generated__/_index.server.tsx b/fixtures/react-router-cloudflare/app/__generated__/_index.server.tsxindex f0687732d9..43532c4748 100644--- a/fixtures/react-router-cloudflare/app/__generated__/_index.server.tsx+++ b/fixtures/react-router-cloudflare/app/__generated__/_index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/react-router-docker/app/__generated__/[another-page]._index.server.tsx b/fixtures/react-router-docker/app/__generated__/[another-page]._index.server.tsxindex f2aa1f2262..7742cba561 100644--- a/fixtures/react-router-docker/app/__generated__/[another-page]._index.server.tsx+++ b/fixtures/react-router-docker/app/__generated__/[another-page]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/react-router-docker/app/__generated__/_index.server.tsx b/fixtures/react-router-docker/app/__generated__/_index.server.tsxindex f0687732d9..43532c4748 100644--- a/fixtures/react-router-docker/app/__generated__/_index.server.tsx+++ b/fixtures/react-router-docker/app/__generated__/_index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/react-router-netlify/app/__generated__/[another-page]._index.server.tsx b/fixtures/react-router-netlify/app/__generated__/[another-page]._index.server.tsxindex f2aa1f2262..7742cba561 100644--- a/fixtures/react-router-netlify/app/__generated__/[another-page]._index.server.tsx+++ b/fixtures/react-router-netlify/app/__generated__/[another-page]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/react-router-netlify/app/__generated__/_index.server.tsx b/fixtures/react-router-netlify/app/__generated__/_index.server.tsxindex f0687732d9..43532c4748 100644--- a/fixtures/react-router-netlify/app/__generated__/_index.server.tsx+++ b/fixtures/react-router-netlify/app/__generated__/_index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/react-router-vercel/app/__generated__/[another-page]._index.server.tsx b/fixtures/react-router-vercel/app/__generated__/[another-page]._index.server.tsxindex f2aa1f2262..7742cba561 100644--- a/fixtures/react-router-vercel/app/__generated__/[another-page]._index.server.tsx+++ b/fixtures/react-router-vercel/app/__generated__/[another-page]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/react-router-vercel/app/__generated__/_index.server.tsx b/fixtures/react-router-vercel/app/__generated__/_index.server.tsxindex f0687732d9..43532c4748 100644--- a/fixtures/react-router-vercel/app/__generated__/_index.server.tsx+++ b/fixtures/react-router-vercel/app/__generated__/_index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.server.tsx b/fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.server.tsxindex f2aa1f2262..7742cba561 100644--- a/fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.server.tsx+++ b/fixtures/ssg-cloudflare-pages/app/__generated__/[another-page]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/ssg-cloudflare-pages/app/__generated__/_index.server.tsx b/fixtures/ssg-cloudflare-pages/app/__generated__/_index.server.tsxindex f0687732d9..43532c4748 100644--- a/fixtures/ssg-cloudflare-pages/app/__generated__/_index.server.tsx+++ b/fixtures/ssg-cloudflare-pages/app/__generated__/_index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/ssg-netlify-by-project-id/app/__generated__/[redirect]._index.server.tsx b/fixtures/ssg-netlify-by-project-id/app/__generated__/[redirect]._index.server.tsxindex fcd33e9a76..3235fdf5fa 100644--- a/fixtures/ssg-netlify-by-project-id/app/__generated__/[redirect]._index.server.tsx+++ b/fixtures/ssg-netlify-by-project-id/app/__generated__/[redirect]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 302,redirect: "/",+ content: undefined,custom: [],};};diff --git a/fixtures/ssg-netlify-by-project-id/app/__generated__/_index.server.tsx b/fixtures/ssg-netlify-by-project-id/app/__generated__/_index.server.tsxindex f0687732d9..43532c4748 100644--- a/fixtures/ssg-netlify-by-project-id/app/__generated__/_index.server.tsx+++ b/fixtures/ssg-netlify-by-project-id/app/__generated__/_index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.server.tsx b/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.server.tsxindex f2aa1f2262..7742cba561 100644--- a/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.server.tsx+++ b/fixtures/webstudio-cloudflare-template/app/__generated__/[another-page]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-cloudflare-template/app/__generated__/_index.server.tsx b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.server.tsxindex f0687732d9..43532c4748 100644--- a/fixtures/webstudio-cloudflare-template/app/__generated__/_index.server.tsx+++ b/fixtures/webstudio-cloudflare-template/app/__generated__/_index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[_route_with_symbols_]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[_route_with_symbols_]._index.server.tsxindex 4a38fb6d64..ad45acbd8c 100644--- a/fixtures/webstudio-features/app/__generated__/[_route_with_symbols_]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[_route_with_symbols_]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[animations]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[animations]._index.server.tsxindex 1717eca1b8..05e54798db 100644--- a/fixtures/webstudio-features/app/__generated__/[animations]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[animations]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[assets1]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[assets1]._index.server.tsxindex 902fc6ffe2..691bd63ff3 100644--- a/fixtures/webstudio-features/app/__generated__/[assets1]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[assets1]._index.server.tsx@@ -32,6 +32,7 @@ export const getPageMeta = ({socialImageUrl: "",status: undefined,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[class-names]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[class-names]._index.server.tsxindex 1717eca1b8..05e54798db 100644--- a/fixtures/webstudio-features/app/__generated__/[class-names]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[class-names]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[content-block]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[content-block]._index.server.tsxindex 1717eca1b8..05e54798db 100644--- a/fixtures/webstudio-features/app/__generated__/[content-block]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[content-block]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[duration]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[duration]._index.server.tsxindex b911a74391..ae4185ddcc 100644--- a/fixtures/webstudio-features/app/__generated__/[duration]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[duration]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: undefined,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[expressions]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[expressions]._index.server.tsxindex 67cc24284c..6f1c7f0b95 100644--- a/fixtures/webstudio-features/app/__generated__/[expressions]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[expressions]._index.server.tsx@@ -34,6 +34,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[form]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[form]._index.server.tsxindex 252e4bae83..ec5f112308 100644--- a/fixtures/webstudio-features/app/__generated__/[form]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[form]._index.server.tsx@@ -32,6 +32,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[head-tag]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[head-tag]._index.server.tsxindex 1717eca1b8..05e54798db 100644--- a/fixtures/webstudio-features/app/__generated__/[head-tag]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[head-tag]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[heading-with-id]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[heading-with-id]._index.server.tsxindex fc7125c67e..1848504e3c 100644--- a/fixtures/webstudio-features/app/__generated__/[heading-with-id]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[heading-with-id]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[nested].[nested-page]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[nested].[nested-page]._index.server.tsxindex 4fc89d1a77..cf3eda55f3 100644--- a/fixtures/webstudio-features/app/__generated__/[nested].[nested-page]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[nested].[nested-page]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[radix]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[radix]._index.server.tsxindex 8bb993bcdf..467a91ce19 100644--- a/fixtures/webstudio-features/app/__generated__/[radix]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[radix]._index.server.tsx@@ -26,6 +26,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[resources]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[resources]._index.server.tsxindex 35b84844c2..7895fa75aa 100644--- a/fixtures/webstudio-features/app/__generated__/[resources]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[resources]._index.server.tsx@@ -32,6 +32,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[sitemap.xml]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[sitemap.xml]._index.server.tsxindex 1717eca1b8..05e54798db 100644--- a/fixtures/webstudio-features/app/__generated__/[sitemap.xml]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[sitemap.xml]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: 200,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/[text-duration]._index.server.tsx b/fixtures/webstudio-features/app/__generated__/[text-duration]._index.server.tsxindex b911a74391..ae4185ddcc 100644--- a/fixtures/webstudio-features/app/__generated__/[text-duration]._index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/[text-duration]._index.server.tsx@@ -25,6 +25,7 @@ export const getPageMeta = ({socialImageUrl: "",status: undefined,redirect: "",+ content: undefined,custom: [],};};diff --git a/fixtures/webstudio-features/app/__generated__/_index.server.tsx b/fixtures/webstudio-features/app/__generated__/_index.server.tsxindex 5aa3c99f01..6f3569767f 100644--- a/fixtures/webstudio-features/app/__generated__/_index.server.tsx+++ b/fixtures/webstudio-features/app/__generated__/_index.server.tsx@@ -27,6 +27,7 @@ export const getPageMeta = ({socialImageUrl: undefined,status: undefined,redirect: undefined,+ content: undefined,custom: [{property: "fb:app_id",diff --git a/packages/cli/src/framework-react-router.ts b/packages/cli/src/framework-react-router.tsindex bd325a44a0..f76dccbd1e 100644--- a/packages/cli/src/framework-react-router.ts+++ b/packages/cli/src/framework-react-router.ts@@ -18,6 +18,10 @@ export const createFramework = async (): Promise<Framework> => {join(routeTemplatesDir, "xml.tsx"),"utf8");+ const textTemplate = await readFile(+ join(routeTemplatesDir, "text.tsx"),+ "utf8"+ );const defaultSitemapTemplate = await readFile(join(routeTemplatesDir, "default-sitemap.tsx"),"utf8"@@ -75,6 +79,12 @@ export const createFramework = async (): Promise<Framework> => {template: xmlTemplate,},],+ text: ({ pagePath }: { pagePath: string }) => [+ {+ file: join("app", "routes", `${generateRemixRoute(pagePath)}.tsx`),+ template: textTemplate,+ },+ ],redirect: ({ pagePath }: { pagePath: string }) => [{file: join("app", "routes", `${generateRemixRoute(pagePath)}.ts`),diff --git a/packages/cli/src/framework-remix.ts b/packages/cli/src/framework-remix.tsindex 6d5ef3b1f2..c1c886d25e 100644--- a/packages/cli/src/framework-remix.ts+++ b/packages/cli/src/framework-remix.ts@@ -18,6 +18,10 @@ export const createFramework = async (): Promise<Framework> => {join(routeTemplatesDir, "xml.tsx"),"utf8");+ const textTemplate = await readFile(+ join(routeTemplatesDir, "text.tsx"),+ "utf8"+ );const defaultSitemapTemplate = await readFile(join(routeTemplatesDir, "default-sitemap.tsx"),"utf8"@@ -75,6 +79,12 @@ export const createFramework = async (): Promise<Framework> => {template: xmlTemplate,},],+ text: ({ pagePath }: { pagePath: string }) => [+ {+ file: join("app", "routes", `${generateRemixRoute(pagePath)}.tsx`),+ template: textTemplate,+ },+ ],redirect: ({ pagePath }: { pagePath: string }) => [{file: join("app", "routes", `${generateRemixRoute(pagePath)}.ts`),diff --git a/packages/cli/src/framework-vike-ssg.ts b/packages/cli/src/framework-vike-ssg.tsindex 0f2876a9cc..e21c1ff19f 100644--- a/packages/cli/src/framework-vike-ssg.ts+++ b/packages/cli/src/framework-vike-ssg.ts@@ -79,6 +79,7 @@ export const createFramework = async (): Promise<Framework> => {];},xml: () => [],+ text: () => [],redirect: () => [],defaultSitemap: () => [],};diff --git a/packages/cli/src/framework.ts b/packages/cli/src/framework.tsindex 8871d519d8..3eb92c74c0 100644--- a/packages/cli/src/framework.ts+++ b/packages/cli/src/framework.ts@@ -14,6 +14,7 @@ export type Framework = {tags: Record<string, string>;html: (params: { pagePath: string }) => FrameworkTemplateEntry[];xml: (params: { pagePath: string }) => FrameworkTemplateEntry[];+ text: (params: { pagePath: string }) => FrameworkTemplateEntry[];redirect: (params: { pagePath: string }) => FrameworkTemplateEntry[];defaultSitemap: () => FrameworkTemplateEntry[];};diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex aca1e43ec8..d44497aec6 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -726,8 +726,7 @@ export const prebuild = async (options: {const serverFile = join(generatedDir, `${generatedBasename}.server.tsx`);await createFileIfNotExists(serverFile, serverExports);- const getTemplates =- documentType === "html" ? framework.html : framework.xml;+ const getTemplates = framework[documentType];for (const { file, template } of getTemplates({ pagePath })) {const content = template.replaceAll("__CONSTANTS__", importFrom("./app/constants.mjs", file))diff --git a/packages/cli/templates/defaults/app/route-templates/text.tsx b/packages/cli/templates/defaults/app/route-templates/text.tsxnew file mode 100644index 0000000000..25da6ce73d--- /dev/null+++ b/packages/cli/templates/defaults/app/route-templates/text.tsx@@ -0,0 +1,107 @@+import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";+import { isLocalResource, loadResources } from "@webstudio-is/sdk/runtime";+import { authenticateRequest } from "@webstudio-is/wsauth";+import { projectDomain } from "__CLIENT__";+import { getPageMeta, getRemixParams, getResources } from "__SERVER__";+import { sitemap } from "__SITEMAP__";+import { assets } from "__ASSETS__";+import { authRoutes } from "__AUTH__";++const authenticateProductionRequest = (request: Request) => {+ const host =+ request.headers.get("x-forwarded-host") ||+ request.headers.get("host") ||+ "";++ const requestHost = host.split(":")[0];+ if (+ projectDomain !== undefined &&+ (requestHost === projectDomain ||+ requestHost.startsWith(`${projectDomain}.`))+ ) {+ return;+ }++ return authenticateRequest(request, authRoutes);+};++const customFetch: typeof fetch = (input, init) => {+ if (typeof input !== "string") {+ return fetch(input, init);+ }++ if (isLocalResource(input, "sitemap.xml")) {+ const response = new Response(JSON.stringify(sitemap));+ response.headers.set("content-type", "application/json; charset=utf-8");+ return Promise.resolve(response);+ }++ if (isLocalResource(input, "current-date")) {+ const now = new Date();+ const startOfDay = new Date(+ Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate())+ );+ const data = {+ iso: startOfDay.toISOString(),+ year: startOfDay.getUTCFullYear(),+ month: startOfDay.getUTCMonth() + 1,+ day: startOfDay.getUTCDate(),+ timestamp: startOfDay.getTime(),+ };+ const response = new Response(JSON.stringify(data));+ response.headers.set("content-type", "application/json; charset=utf-8");+ return Promise.resolve(response);+ }++ if (isLocalResource(input, "assets")) {+ const response = new Response(JSON.stringify(assets));+ response.headers.set("content-type", "application/json; charset=utf-8");+ return Promise.resolve(response);+ }++ return fetch(input, init);+};++export const loader = async (arg: LoaderFunctionArgs) => {+ const authRoute = authenticateProductionRequest(arg.request);++ const url = new URL(arg.request.url);+ const host =+ arg.request.headers.get("x-forwarded-host") ||+ arg.request.headers.get("host") ||+ "";+ url.host = host;+ url.protocol = "https";++ const params = getRemixParams(arg.params);++ const system = {+ params,+ search: Object.fromEntries(url.searchParams),+ origin: url.origin,+ pathname: url.pathname,+ };++ const resources = await loadResources(+ customFetch,+ getResources({ system }).data+ );+ const pageMeta = getPageMeta({ system, resources });++ if (pageMeta.redirect) {+ const status =+ pageMeta.status === 301 || pageMeta.status === 302+ ? pageMeta.status+ : 302;+ return redirect(pageMeta.redirect, status);+ }++ return new Response(pageMeta.content ?? "", {+ status: pageMeta.status,+ headers: {+ "Content-Type": "text/plain; charset=utf-8",+ "Cache-Control":+ authRoute === undefined ? "public, max-age=600" : "private, no-store",+ },+ });+};diff --git a/packages/cli/templates/react-router/app/route-templates/text.tsx b/packages/cli/templates/react-router/app/route-templates/text.tsxnew file mode 100644index 0000000000..3229cb1f40--- /dev/null+++ b/packages/cli/templates/react-router/app/route-templates/text.tsx@@ -0,0 +1,107 @@+import { type LoaderFunctionArgs, redirect } from "react-router";+import { isLocalResource, loadResources } from "@webstudio-is/sdk/runtime";+import { authenticateRequest } from "@webstudio-is/wsauth";+import { projectDomain } from "__CLIENT__";+import { getPageMeta, getRemixParams, getResources } from "__SERVER__";+import { sitemap } from "__SITEMAP__";+import { assets } from "__ASSETS__";+import { authRoutes } from "__AUTH__";++const authenticateProductionRequest = (request: Request) => {+ const host =+ request.headers.get("x-forwarded-host") ||+ request.headers.get("host") ||+ "";++ const requestHost = host.split(":")[0];+ if (+ projectDomain !== undefined &&+ (requestHost === projectDomain ||+ requestHost.startsWith(`${projectDomain}.`))+ ) {+ return;+ }++ return authenticateRequest(request, authRoutes);+};++const customFetch: typeof fetch = (input, init) => {+ if (typeof input !== "string") {+ return fetch(input, init);+ }++ if (isLocalResource(input, "sitemap.xml")) {+ const response = new Response(JSON.stringify(sitemap));+ response.headers.set("content-type", "application/json; charset=utf-8");+ return Promise.resolve(response);+ }++ if (isLocalResource(input, "current-date")) {+ const now = new Date();+ const startOfDay = new Date(+ Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate())+ );+ const data = {+ iso: startOfDay.toISOString(),+ year: startOfDay.getUTCFullYear(),+ month: startOfDay.getUTCMonth() + 1,+ day: startOfDay.getUTCDate(),+ timestamp: startOfDay.getTime(),+ };+ const response = new Response(JSON.stringify(data));+ response.headers.set("content-type", "application/json; charset=utf-8");+ return Promise.resolve(response);+ }++ if (isLocalResource(input, "assets")) {+ const response = new Response(JSON.stringify(assets));+ response.headers.set("content-type", "application/json; charset=utf-8");+ return Promise.resolve(response);+ }++ return fetch(input, init);+};++export const loader = async (arg: LoaderFunctionArgs) => {+ const authRoute = authenticateProductionRequest(arg.request);++ const url = new URL(arg.request.url);+ const host =+ arg.request.headers.get("x-forwarded-host") ||+ arg.request.headers.get("host") ||+ "";+ url.host = host;+ url.protocol = "https";++ const params = getRemixParams(arg.params);++ const system = {+ params,+ search: Object.fromEntries(url.searchParams),+ origin: url.origin,+ pathname: url.pathname,+ };++ const resources = await loadResources(+ customFetch,+ getResources({ system }).data+ );+ const pageMeta = getPageMeta({ system, resources });++ if (pageMeta.redirect) {+ const status =+ pageMeta.status === 301 || pageMeta.status === 302+ ? pageMeta.status+ : 302;+ return redirect(pageMeta.redirect, status);+ }++ return new Response(pageMeta.content ?? "", {+ status: pageMeta.status,+ headers: {+ "Content-Type": "text/plain; charset=utf-8",+ "Cache-Control":+ authRoute === undefined ? "public, max-age=600" : "private, no-store",+ },+ });+};diff --git a/packages/design-system/src/components/floating-panel.tsx b/packages/design-system/src/components/floating-panel.tsxindex f44e75d978..fdffdc08b8 100644--- a/packages/design-system/src/components/floating-panel.tsx+++ b/packages/design-system/src/components/floating-panel.tsx@@ -208,6 +208,11 @@ export const FloatingPanel = ({return;}+ if (height !== undefined) {+ maxHeightRef.current = undefined;+ contentElement.style.removeProperty("max-height");+ }+const updatePosition = () => {if (triggerRef.current === null ||@@ -231,7 +236,7 @@ export const FloatingPanel = ({// Calculate max height based on container boundsconst containerRect = containerRef.current.getBoundingClientRect();const availableHeight = containerRect.bottom - y - 10; // 10px padding- if (availableHeight > 0) {+ if (availableHeight > 0 && height === undefined) {maxHeightRef.current = availableHeight;contentElement.style.maxHeight = `${availableHeight}px`;}@@ -280,7 +285,7 @@ export const FloatingPanel = ({return () => {resizeObserver.disconnect();};- }, [contentElement, containerRef, placement, offsetProp, open]);+ }, [contentElement, containerRef, placement, offsetProp, open, height]);return (<Dialogdiff --git a/packages/sdk/src/page-meta-generator.test.ts b/packages/sdk/src/page-meta-generator.test.tsindex fa27a1b69c..89a6e46710 100644--- a/packages/sdk/src/page-meta-generator.test.ts+++ b/packages/sdk/src/page-meta-generator.test.ts@@ -22,28 +22,29 @@ test("generate minimal static page meta factory", () => {assets: new Map(),})).toMatchInlineSnapshot(`-"export const getPageMeta = ({- system,- resources,-}: {- system: System;- resources: Record<string, any>;-}): PageMeta => {- return {- title: "Page title",- description: undefined,- excludePageFromSearch: undefined,- language: undefined,- socialImageAssetName: undefined,- socialImageUrl: undefined,- status: undefined,- redirect: undefined,- custom: [- ],- };-};-"-`);+ "export const getPageMeta = ({+ system,+ resources,+ }: {+ system: System;+ resources: Record<string, any>;+ }): PageMeta => {+ return {+ title: "Page title",+ description: undefined,+ excludePageFromSearch: undefined,+ language: undefined,+ socialImageAssetName: undefined,+ socialImageUrl: undefined,+ status: undefined,+ redirect: undefined,+ content: undefined,+ custom: [+ ],+ };+ };+ "+ `);});test("generate complete static page meta factory", () => {@@ -88,36 +89,37 @@ test("generate complete static page meta factory", () => {]),})).toMatchInlineSnapshot(`-"export const getPageMeta = ({- system,- resources,-}: {- system: System;- resources: Record<string, any>;-}): PageMeta => {- return {- title: "Page title",- description: "Page description",- excludePageFromSearch: true,- language: "en-US",- socialImageAssetName: "social-image-name",- socialImageUrl: undefined,- status: 302,- redirect: "/new-path",- custom: [- {- property: "custom-property-1",- content: "custom content 1",- },- {- property: "custom-property-2",- content: "custom content 2",- },- ],- };-};-"-`);+ "export const getPageMeta = ({+ system,+ resources,+ }: {+ system: System;+ resources: Record<string, any>;+ }): PageMeta => {+ return {+ title: "Page title",+ description: "Page description",+ excludePageFromSearch: true,+ language: "en-US",+ socialImageAssetName: "social-image-name",+ socialImageUrl: undefined,+ status: 302,+ redirect: "/new-path",+ content: undefined,+ custom: [+ {+ property: "custom-property-1",+ content: "custom content 1",+ },+ {+ property: "custom-property-2",+ content: "custom content 2",+ },+ ],+ };+ };+ "+ `);});test("generate asset url instead of id", () => {@@ -138,28 +140,29 @@ test("generate asset url instead of id", () => {assets: new Map(),})).toMatchInlineSnapshot(`-"export const getPageMeta = ({- system,- resources,-}: {- system: System;- resources: Record<string, any>;-}): PageMeta => {- return {- title: "Page title",- description: undefined,- excludePageFromSearch: undefined,- language: undefined,- socialImageAssetName: undefined,- socialImageUrl: "https://my-image",- status: undefined,- redirect: undefined,- custom: [- ],- };-};-"-`);+ "export const getPageMeta = ({+ system,+ resources,+ }: {+ system: System;+ resources: Record<string, any>;+ }): PageMeta => {+ return {+ title: "Page title",+ description: undefined,+ excludePageFromSearch: undefined,+ language: undefined,+ socialImageAssetName: undefined,+ socialImageUrl: "https://my-image",+ status: undefined,+ redirect: undefined,+ content: undefined,+ custom: [+ ],+ };+ };+ "+ `);});test("generate custom meta ignoring empty property name", () => {@@ -183,32 +186,33 @@ test("generate custom meta ignoring empty property name", () => {assets: new Map(),})).toMatchInlineSnapshot(`-"export const getPageMeta = ({- system,- resources,-}: {- system: System;- resources: Record<string, any>;-}): PageMeta => {- return {- title: "Page title",- description: undefined,- excludePageFromSearch: undefined,- language: undefined,- socialImageAssetName: undefined,- socialImageUrl: undefined,- status: undefined,- redirect: undefined,- custom: [- {- property: "custom-property",- content: "custom content 1",- },- ],- };-};-"-`);+ "export const getPageMeta = ({+ system,+ resources,+ }: {+ system: System;+ resources: Record<string, any>;+ }): PageMeta => {+ return {+ title: "Page title",+ description: undefined,+ excludePageFromSearch: undefined,+ language: undefined,+ socialImageAssetName: undefined,+ socialImageUrl: undefined,+ status: undefined,+ redirect: undefined,+ content: undefined,+ custom: [+ {+ property: "custom-property",+ content: "custom content 1",+ },+ ],+ };+ };+ "+ `);});test("generate page meta factory with variables", () => {@@ -235,29 +239,30 @@ test("generate page meta factory with variables", () => {assets: new Map(),})).toMatchInlineSnapshot(`-"export const getPageMeta = ({- system,- resources,-}: {- system: System;- resources: Record<string, any>;-}): PageMeta => {- let VariableName = ""- return {- title: VariableName,- description: undefined,- excludePageFromSearch: undefined,- language: undefined,- socialImageAssetName: undefined,- socialImageUrl: undefined,- status: undefined,- redirect: undefined,- custom: [- ],- };-};-"-`);+ "export const getPageMeta = ({+ system,+ resources,+ }: {+ system: System;+ resources: Record<string, any>;+ }): PageMeta => {+ let VariableName = ""+ return {+ title: VariableName,+ description: undefined,+ excludePageFromSearch: undefined,+ language: undefined,+ socialImageAssetName: undefined,+ socialImageUrl: undefined,+ status: undefined,+ redirect: undefined,+ content: undefined,+ custom: [+ ],+ };+ };+ "+ `);});test("generate page meta factory with page system variable", () => {@@ -284,29 +289,30 @@ test("generate page meta factory with page system variable", () => {assets: new Map(),})).toMatchInlineSnapshot(`-"export const getPageMeta = ({- system,- resources,-}: {- system: System;- resources: Record<string, any>;-}): PageMeta => {- let system_1 = system- return {- title: system_1?.params?.slug,- description: undefined,- excludePageFromSearch: undefined,- language: undefined,- socialImageAssetName: undefined,- socialImageUrl: undefined,- status: undefined,- redirect: undefined,- custom: [- ],- };-};-"-`);+ "export const getPageMeta = ({+ system,+ resources,+ }: {+ system: System;+ resources: Record<string, any>;+ }): PageMeta => {+ let system_1 = system+ return {+ title: system_1?.params?.slug,+ description: undefined,+ excludePageFromSearch: undefined,+ language: undefined,+ socialImageAssetName: undefined,+ socialImageUrl: undefined,+ status: undefined,+ redirect: undefined,+ content: undefined,+ custom: [+ ],+ };+ };+ "+ `);});test("generate page meta factory with global system variable", () => {@@ -325,29 +331,30 @@ test("generate page meta factory with global system variable", () => {assets: new Map(),})).toMatchInlineSnapshot(`-"export const getPageMeta = ({- system,- resources,-}: {- system: System;- resources: Record<string, any>;-}): PageMeta => {- let system_1 = system- return {- title: system_1?.params?.slug,- description: undefined,- excludePageFromSearch: undefined,- language: undefined,- socialImageAssetName: undefined,- socialImageUrl: undefined,- status: undefined,- redirect: undefined,- custom: [- ],- };-};-"-`);+ "export const getPageMeta = ({+ system,+ resources,+ }: {+ system: System;+ resources: Record<string, any>;+ }): PageMeta => {+ let system_1 = system+ return {+ title: system_1?.params?.slug,+ description: undefined,+ excludePageFromSearch: undefined,+ language: undefined,+ socialImageAssetName: undefined,+ socialImageUrl: undefined,+ status: undefined,+ redirect: undefined,+ content: undefined,+ custom: [+ ],+ };+ };+ "+ `);});test("generate page meta factory with resources", () => {@@ -374,29 +381,30 @@ test("generate page meta factory with resources", () => {assets: new Map(),})).toMatchInlineSnapshot(`-"export const getPageMeta = ({- system,- resources,-}: {- system: System;- resources: Record<string, any>;-}): PageMeta => {- let CmsPage = resources.CmsPage- return {- title: CmsPage?.data?.title,- description: undefined,- excludePageFromSearch: undefined,- language: undefined,- socialImageAssetName: undefined,- socialImageUrl: undefined,- status: undefined,- redirect: undefined,- custom: [- ],- };-};-"-`);+ "export const getPageMeta = ({+ system,+ resources,+ }: {+ system: System;+ resources: Record<string, any>;+ }): PageMeta => {+ let CmsPage = resources.CmsPage+ return {+ title: CmsPage?.data?.title,+ description: undefined,+ excludePageFromSearch: undefined,+ language: undefined,+ socialImageAssetName: undefined,+ socialImageUrl: undefined,+ status: undefined,+ redirect: undefined,+ content: undefined,+ custom: [+ ],+ };+ };+ "+ `);});test("generate page meta factory without unused variables", () => {@@ -444,27 +452,28 @@ test("generate page meta factory without unused variables", () => {assets: new Map(),})).toMatchInlineSnapshot(`-"export const getPageMeta = ({- system,- resources,-}: {- system: System;- resources: Record<string, any>;-}): PageMeta => {- let UsedName = ""- return {- title: UsedName,- description: undefined,- excludePageFromSearch: undefined,- language: undefined,- socialImageAssetName: undefined,- socialImageUrl: undefined,- status: undefined,- redirect: undefined,- custom: [- ],- };-};-"-`);+ "export const getPageMeta = ({+ system,+ resources,+ }: {+ system: System;+ resources: Record<string, any>;+ }): PageMeta => {+ let UsedName = ""+ return {+ title: UsedName,+ description: undefined,+ excludePageFromSearch: undefined,+ language: undefined,+ socialImageAssetName: undefined,+ socialImageUrl: undefined,+ status: undefined,+ redirect: undefined,+ content: undefined,+ custom: [+ ],+ };+ };+ "+ `);});diff --git a/packages/sdk/src/page-meta-generator.ts b/packages/sdk/src/page-meta-generator.tsindex 8f3f81dc45..7229eb552d 100644--- a/packages/sdk/src/page-meta-generator.ts+++ b/packages/sdk/src/page-meta-generator.ts@@ -13,6 +13,7 @@ export type PageMeta = {socialImageUrl?: string;status?: number;redirect?: string;+ content?: string;custom: Array<{ property: string; content: string }>;};@@ -77,6 +78,12 @@ export const generatePageMeta = ({usedDataSources,scope: localScope,});+ const contentExpression = generateExpression({+ expression: page.meta.content ?? "undefined",+ dataSources,+ usedDataSources,+ scope: localScope,+ });let customExpression = "";customExpression += `[\n`;for (const customMeta of page.meta.custom ?? []) {@@ -141,6 +148,7 @@ export const generatePageMeta = ({generated += ` socialImageUrl: ${socialImageUrlExpression},\n`;generated += ` status: ${statusExpression},\n`;generated += ` redirect: ${redirectExpression},\n`;+ generated += ` content: ${contentExpression},\n`;generated += ` custom: ${customExpression},\n`;generated += ` };\n`;generated += `};\n`;diff --git a/packages/sdk/src/page-utils.test.ts b/packages/sdk/src/page-utils.test.tsindex 480a99c8ba..2d8215d82b 100644--- a/packages/sdk/src/page-utils.test.ts+++ b/packages/sdk/src/page-utils.test.ts@@ -4,6 +4,7 @@ import {findPageByIdOrPath,findParentFolderByChildId,getPagePath,+ getStaticSiteMapXml,} from "./page-utils";const pages = {@@ -137,3 +138,40 @@ describe("findParentFolderByChildId", () => {).toEqual("folderId-1-1");});});++describe("getStaticSiteMapXml", () => {+ test("includes html pages and excludes xml and text pages", () => {+ const pagesWithDocumentTypes: Pages = {+ ...pages,+ pages: new Map(pages.pages)+ .set("xml", {+ id: "xml",+ path: "/sitemap-extra.xml",+ name: "XML",+ title: "XML",+ rootInstanceId: "rootInstanceId",+ meta: { documentType: "xml" },+ })+ .set("text", {+ id: "text",+ path: "/llms.txt",+ name: "LLMs",+ title: "LLMs",+ rootInstanceId: "rootInstanceId",+ meta: { documentType: "text" },+ }),+ folders: new Map(pages.folders).set("root", {+ ...pages.folders.get("root")!,+ children: ["folderId-1", "xml", "text"],+ }),+ };++ expect(getStaticSiteMapXml(pagesWithDocumentTypes, "2026-04-30")).toEqual([+ { path: "", lastModified: "2026-04-30" },+ {+ path: "/folder-1/folder-1-1/folder-1-1-1/page-1",+ lastModified: "2026-04-30",+ },+ ]);+ });+});diff --git a/packages/sdk/src/schema/component-meta.ts b/packages/sdk/src/schema/component-meta.tsindex 7fd18e8584..0a1b679c8a 100644--- a/packages/sdk/src/schema/component-meta.ts+++ b/packages/sdk/src/schema/component-meta.ts@@ -31,6 +31,7 @@ export const componentCategories = ["localization","radix","xml",+ "text","other","hidden","internal",diff --git a/packages/sdk/src/schema/pages.test.ts b/packages/sdk/src/schema/pages.test.tsindex 6e56d3861f..3f62bd103f 100644--- a/packages/sdk/src/schema/pages.test.ts+++ b/packages/sdk/src/schema/pages.test.ts@@ -1,5 +1,6 @@import { describe, expect, test } from "vitest";import {+ documentTypes,OldPagePath,PageAuth,PagePath,@@ -108,6 +109,27 @@ test("validates non-home page path is not empty", () => {]);});+test("supports text document type", () => {+ expect(documentTypes).toContain("text");+ expect(+ Pages.safeParse({+ ...validPages,+ pages: new Map(validPages.pages).set("text", {+ id: "text",+ name: "LLMs",+ path: "/llms.txt",+ title: `"LLMs"`,+ meta: { documentType: "text", content: `"Text content"` },+ rootInstanceId: "textRoot",+ }),+ folders: new Map(validPages.folders).set("root", {+ ...validPages.folders.get("root")!,+ children: ["home", "text"],+ }),+ }).success+ ).toBe(true);+});+test("validates page id matches its record key", () => {expect(Pages.safeParse({diff --git a/packages/sdk/src/schema/pages.ts b/packages/sdk/src/schema/pages.tsindex 3fe777f6a5..997dee05f0 100644--- a/packages/sdk/src/schema/pages.ts+++ b/packages/sdk/src/schema/pages.ts@@ -44,7 +44,7 @@ export const PageTitle = z`Minimum ${MIN_TITLE_LENGTH} characters required`);-export const documentTypes = ["html", "xml"] as const;+export const documentTypes = ["html", "xml", "text"] as const;const BasicAuthFields = {login: z.string(),@@ -109,6 +109,7 @@ const commonPageFields = {status: z.string().optional(),redirect: z.string().optional(),documentType: z.optional(z.enum(documentTypes)),+ content: z.string().optional(),auth: PageAuth.optional(),custom: z.array(diff --git a/packages/template/src/template.ts b/packages/template/src/template.tsindex 5e3487ae13..1f3b4ca35d 100644--- a/packages/template/src/template.ts+++ b/packages/template/src/template.ts@@ -11,6 +11,7 @@ export const templateCategories = ["localization","radix","xml",+ "text","other","hidden","internal",