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
Custom Domains (#1564)
Ivan Starkov37c8608eaec9
diff --git a/apps/builder/app/builder/features/blocking-alerts/blocking-alerts.tsx b/apps/builder/app/builder/features/blocking-alerts/blocking-alerts.tsxindex 49cd250dc5..f8f348c72c 100644--- a/apps/builder/app/builder/features/blocking-alerts/blocking-alerts.tsx+++ b/apps/builder/app/builder/features/blocking-alerts/blocking-alerts.tsx@@ -6,7 +6,8 @@ import { isFeatureEnabled } from "@webstudio-is/feature-flags";const useTooSmallMessage = () => {const [message, setMessage] = useState<string>();const check = () => {- const minWidth = 900;+ // To have more space for Chrome DevTools, we allow a smaller window size in development+ const minWidth = process.env.NODE_ENV === "production" ? 900 : 700;const message =window.innerWidth >= minWidth? undefineddiff --git a/apps/builder/app/builder/features/topbar/add-domain.tsx b/apps/builder/app/builder/features/topbar/add-domain.tsxnew file mode 100644index 0000000000..8ac693e430--- /dev/null+++ b/apps/builder/app/builder/features/topbar/add-domain.tsx@@ -0,0 +1,149 @@+import {+ Button,+ Flex,+ InputField,+ Label,+ Separator,+ theme,+ Text,+} from "@webstudio-is/design-system";+import type { DomainRouter } from "@webstudio-is/domain/index.server";+import { validateDomain } from "@webstudio-is/domain";+import type { Project } from "@webstudio-is/project";+import { useId, useState } from "react";+import { createTrpcFetchProxy } from "~/shared/remix/trpc-remix-proxy";+import { builderDomainsPath } from "~/shared/router-utils";++const trpc = createTrpcFetchProxy<DomainRouter>(builderDomainsPath);++type DomainsAddProps = {+ projectId: Project["id"];+ onCreate: (domain: string) => void;+ refreshDomainResult: (+ input: { projectId: Project["id"] },+ onSuccess: () => void+ ) => void;+ domainLoadingState: "idle" | "submitting";+};++export const AddDomain = ({+ projectId,+ onCreate,+ refreshDomainResult,+ domainLoadingState,+}: DomainsAddProps) => {+ const id = useId();+ const {+ send: create,+ state,+ error: createSystemError,+ } = trpc.create.useMutation();+ const [isOpen, setIsOpen] = useState(false);+ const [domain, setDomain] = useState("");+ const [error, setError] = useState<string>();++ const handleCreate = () => {+ setError(undefined);++ const validationResult = validateDomain(domain);++ if (validationResult.success === false) {+ setError(validationResult.error);+ return;+ }++ create({ domain: validationResult.domain, projectId }, (data) => {+ if (data.success === false) {+ setError(data.error);+ return;+ }++ refreshDomainResult({ projectId }, () => {+ setDomain("");+ setIsOpen(false);+ onCreate(validationResult.domain);+ });+ });+ };++ return (+ <>+ <Flex+ css={{+ padding: theme.spacing[9],+ paddingTop: isOpen ? theme.spacing[5] : theme.spacing[9],+ paddingBottom: isOpen ? theme.spacing[9] : 0,+ }}+ gap={2}+ shrink={false}+ direction={"column"}+ onKeyDown={(event) => {+ if (event.key === "Escape") {+ setDomain("");+ setIsOpen(false);+ event.preventDefault();+ }+ }}+ >+ {isOpen && (+ <>+ <Label htmlFor={id} sectionTitle>+ New Domain+ </Label>+ <InputField+ id={id}+ autoFocus+ placeholder="your-domain.com"+ value={domain}+ disabled={state !== "idle" || domainLoadingState !== "idle"}+ onKeyDown={(event) => {+ if (event.key === "Enter") {+ handleCreate();+ }+ if (event.key === "Escape") {+ setDomain("");+ setIsOpen(false);+ event.preventDefault();+ }+ }}+ onChange={(event) => {+ setError(undefined);+ setDomain(event.target.value);+ }}+ color={error !== undefined ? "error" : undefined}+ />+ {error !== undefined && (+ <>+ <Text color="destructive">{error}</Text>+ </>+ )}+ {createSystemError !== undefined && (+ <>+ {/* Something happened with network, api etc */}+ <Text color="destructive">{createSystemError}</Text>+ <Text color="subtle">Please try again later</Text>+ </>+ )}+ </>+ )}++ <Button+ disabled={state !== "idle" || domainLoadingState !== "idle"}+ color={isOpen ? "primary" : "neutral"}+ css={{ width: "100%", flexShrink: 0 }}+ onClick={() => {+ if (isOpen === false) {+ setIsOpen(true);+ return;+ }++ handleCreate();+ }}+ >+ {isOpen ? "Add domain" : "Add a new domain"}+ </Button>+ </Flex>+ {isOpen && <Separator css={{ mb: theme.spacing[5] }} />}+ </>+ );+};diff --git a/apps/builder/app/builder/features/topbar/collapsible-domain-section.tsx b/apps/builder/app/builder/features/topbar/collapsible-domain-section.tsxnew file mode 100644index 0000000000..208831b415--- /dev/null+++ b/apps/builder/app/builder/features/topbar/collapsible-domain-section.tsx@@ -0,0 +1,72 @@+import {+ Box,+ Flex,+ Label,+ theme,+ SectionTitle,+} from "@webstudio-is/design-system";+import { useEffect, useRef, useState, type ReactNode } from "react";+import { CollapsibleSectionBase } from "~/builder/shared/collapsible-section";++export const CollapsibleDomainSection = ({+ initiallyOpen = false,+ children,+ title,+ suffix,+}: {+ initiallyOpen?: boolean;+ children: ReactNode;+ suffix: ReactNode;+ title: string;+}) => {+ const [open, setOpen] = useState(initiallyOpen);+ const titleRef = useRef<HTMLButtonElement>(null);++ useEffect(() => {+ if (open) {+ titleRef.current?.scrollIntoView({+ behavior: "smooth",+ });+ }+ }, [open]);++ return (+ <CollapsibleSectionBase+ label=""+ fullWidth+ isOpen={open}+ onOpenChange={setOpen}+ trigger={+ <SectionTitle+ ref={titleRef}+ suffix={+ <Box+ css={{ display: "contents" }}+ onClick={(event) => {+ if (event.defaultPrevented) {+ return;+ }+ setOpen(!open);+ }}+ >+ {suffix}+ </Box>+ }+ >+ <Label truncate>{title}</Label>+ </SectionTitle>+ }+ >+ <Flex+ css={{+ mx: theme.spacing[9],+ overflowWrap: "anywhere",+ }}+ gap={2}+ direction={"column"}+ >+ {children}+ </Flex>+ </CollapsibleSectionBase>+ );+};diff --git a/apps/builder/app/builder/features/topbar/domains.tsx b/apps/builder/app/builder/features/topbar/domains.tsxnew file mode 100644index 0000000000..025dff107e--- /dev/null+++ b/apps/builder/app/builder/features/topbar/domains.tsx@@ -0,0 +1,425 @@+import {+ Button,+ theme,+ Text,+ Tooltip,+ IconButton,+ Grid,+ InputField,+ styled,+ Flex,+ NestedInputButton,+} from "@webstudio-is/design-system";+import type { DomainRouter } from "@webstudio-is/domain/index.server";+import type { Project } from "@webstudio-is/project";+import { createTrpcFetchProxy } from "~/shared/remix/trpc-remix-proxy";+import { builderDomainsPath } from "~/shared/router-utils";+import {+ AlertIcon,+ CheckCircleIcon,+ ExternalLinkIcon,+ CopyIcon,+} from "@webstudio-is/icons";+import type { DomainStatus } from "@webstudio-is/prisma-client";+import { CollapsibleDomainSection } from "./collapsible-domain-section";+import env from "~/shared/env";++const trpc = createTrpcFetchProxy<DomainRouter>(builderDomainsPath);++type Domain = {+ projectId: Project["id"];+ domain: {+ domain: string;+ error: string | null;+ status: DomainStatus;+ };+ txtRecord: string;+ cname: string;+ verified: boolean;+};++const InputEllipsis = styled(InputField, {+ "&>input": {+ textOverflow: "ellipsis",+ },+});++const CopyToClipboard = (props: { text: string }) => {+ return (+ <Tooltip content={"Copy to clipboard"}>+ <NestedInputButton+ onClick={() => {+ navigator.clipboard.writeText(props.text);+ }}+ >+ <CopyIcon />+ </NestedInputButton>+ </Tooltip>+ );+};++const getCname = (domain: string) => {+ const domainArray = domain.split(".");+ const cnameArray = domainArray.slice(0, -2);+ if (cnameArray.length === 0) {+ return "@";+ }+ return cnameArray.join(".");+};++const getStatusText = (props: { projectDomain: Domain }) => {+ const status = props.projectDomain.verified+ ? (`VERIFIED_${props.projectDomain.domain.status}` as `VERIFIED_${DomainStatus}`)+ : `UNVERIFIED`;++ let isVerifiedActive = false;+ let text = "Something went wrong";++ switch (status) {+ case "UNVERIFIED":+ text = "Status: Not verified";+ break;++ case "VERIFIED_INITIALIZING":+ text = "Status: Initializing CNAME";+ break;+ case "VERIFIED_PENDING":+ text = "Status: Waiting for CNAME propagation";+ break;+ case "VERIFIED_ACTIVE":+ isVerifiedActive = true;+ text = "Status: Active";+ break;+ case "VERIFIED_ERROR":+ text = props.projectDomain.domain.error ?? text;+ break;++ default:+ ((value: never) => {+ /* exhaustive check */+ })(status);+ break;+ }++ return { isVerifiedActive, text };+};++const StatusIcon = (props: { projectDomain: Domain }) => {+ const { isVerifiedActive, text } = getStatusText(props);++ const Icon = isVerifiedActive ? CheckCircleIcon : AlertIcon;++ return (+ <Tooltip content={text}>+ <Flex+ align={"center"}+ justify={"center"}+ css={{+ cursor: "pointer",+ width: theme.spacing[12],+ height: theme.spacing[12],+ color: isVerifiedActive+ ? theme.colors.foregroundSuccessText+ : theme.colors.foregroundDestructive,+ }}+ >+ <Icon />+ </Flex>+ </Tooltip>+ );+};++const DomainItem = (props: {+ initiallyOpen: boolean;+ projectDomain: Domain;+ refreshDomainResult: (+ input: { projectId: Project["id"] },+ onSuccess?: () => void+ ) => void;+ domainLoadingState: "idle" | "submitting";+}) => {+ const {+ send: verify,+ state: verifyState,+ data: verifyData,+ error: verifySystemError,+ } = trpc.verify.useMutation();++ const {+ send: remove,+ state: removeState,+ data: removeData,+ error: removeSystemError,+ } = trpc.remove.useMutation();++ const {+ send: updateStatus,+ state: updateStatusState,+ data: updateStatusData,+ error: updateStatusError,+ } = trpc.updateStatus.useMutation();++ const isRemoveInProgress =+ removeState !== "idle" || props.domainLoadingState !== "idle";++ const isCheckStateInProgress =+ verifyState !== "idle" ||+ updateStatusState !== "idle" ||+ props.domainLoadingState !== "idle";++ const status = props.projectDomain.verified+ ? (`VERIFIED_${props.projectDomain.domain.status}` as `VERIFIED_${DomainStatus}`)+ : `UNVERIFIED`;++ const cnameEntryName = getCname(props.projectDomain.domain.domain);+ const cnameEntryValue = `${props.projectDomain.cname}.customers.${+ env.PUBLISHER_HOST ?? "wstd.work"+ }`;++ const txtEntryName =+ cnameEntryName === "@"+ ? "__webstudio_is"+ : `__webstudio_is.${cnameEntryName}`;++ const { isVerifiedActive, text } = getStatusText({+ projectDomain: props.projectDomain,+ });++ return (+ <CollapsibleDomainSection+ initiallyOpen={props.initiallyOpen}+ title={props.projectDomain.domain.domain}+ suffix={+ <Grid flow="column">+ <StatusIcon projectDomain={props.projectDomain} />++ <Tooltip content={`Proceed to ${props.projectDomain.domain.domain}`}>+ <IconButton+ tabIndex={-1}+ onClick={(event) => {+ const url = new URL(+ `https://${props.projectDomain.domain.domain}`+ );+ window.open(url.href, "_blank");+ event.preventDefault();+ }}+ >+ <ExternalLinkIcon />+ </IconButton>+ </Tooltip>+ </Grid>+ }+ >+ {status === "UNVERIFIED" && (+ <>+ {verifySystemError !== undefined && (+ <Text color="destructive">{verifySystemError}</Text>+ )}+ <Button+ disabled={isCheckStateInProgress}+ color="primary"+ css={{ width: "100%", flexShrink: 0, mt: theme.spacing[3] }}+ onClick={() => {+ verify(+ {+ domain: props.projectDomain.domain.domain,+ projectId: props.projectDomain.projectId,+ },+ (verifyResponse) => {+ if (verifyResponse.success) {+ props.refreshDomainResult({+ projectId: props.projectDomain.projectId,+ });+ }+ }+ );+ }}+ >+ Check status+ </Button>+ </>+ )}++ {status !== "UNVERIFIED" && (+ <>+ {updateStatusData?.success === false && (+ <Text color="destructive">{updateStatusData.error}</Text>+ )}+ {updateStatusError !== undefined && (+ <Text color="destructive">{updateStatusError}</Text>+ )}+ <Button+ disabled={isCheckStateInProgress}+ color="primary"+ css={{ width: "100%", flexShrink: 0, mt: theme.spacing[3] }}+ onClick={() => {+ updateStatus(+ {+ domain: props.projectDomain.domain.domain,+ projectId: props.projectDomain.projectId,+ },+ (data) => {+ if (data.success) {+ if (+ props.projectDomain.domain.status !==+ data.domain.status ||+ props.projectDomain.domain.error !== data.domain.error+ ) {+ props.refreshDomainResult({+ projectId: props.projectDomain.projectId,+ });+ }+ }+ }+ );+ }}+ >+ Check status+ </Button>+ </>+ )}++ {removeData?.success === false && (+ <Text color="destructive">{removeData.error}</Text>+ )}++ {removeSystemError !== undefined && (+ <Text color="destructive">{removeSystemError}</Text>+ )}++ <Button+ disabled={isRemoveInProgress}+ color="neutral"+ css={{ width: "100%", flexShrink: 0 }}+ onClick={() => {+ remove(+ {+ domain: props.projectDomain.domain.domain,+ projectId: props.projectDomain.projectId,+ },+ () => {+ props.refreshDomainResult({+ projectId: props.projectDomain.projectId,+ });+ }+ );+ }}+ >+ Remove domain+ </Button>++ <Grid gap={2} css={{ mt: theme.spacing[5] }}>+ <Grid gap={1}>+ {status === "UNVERIFIED" && (+ <>+ {verifyData?.success === false ? (+ <Text color="destructive">+ Status: Failed to verify+ <br />+ {verifyData.error}+ </Text>+ ) : (+ <>+ <Text color="destructive">Status: Not verified</Text>+ <Text color="subtle">+ Verification may take up to 24 hours but usually takes only+ a few minutes.+ </Text>+ </>+ )}+ </>+ )}++ {status !== "UNVERIFIED" && (+ <>+ <Text color={isVerifiedActive ? "success" : "destructive"}>+ {text}+ </Text>+ </>+ )}+ </Grid>++ <Text color="subtle">+ <strong>To verify your domain:</strong>+ <br />+ Visit the admin console of your domain registrar (the website you+ purchased your domain from) and create one <strong>CNAME</strong>{" "}+ record and one <strong>TXT</strong> record with the values shown+ below:+ </Text>++ <Grid+ gap={1}+ css={{+ gridTemplateColumns: `${theme.spacing[18]} ${theme.spacing[18]} 1fr`,+ }}+ >+ <Text color="subtle" variant={"titles"}>+ TYPE+ </Text>+ <Text color="subtle" variant={"titles"}>+ NAME+ </Text>+ <Text color="subtle" variant={"titles"}>+ VALUE+ </Text>++ <InputEllipsis readOnly value="CNAME" />+ <InputEllipsis+ readOnly+ value={cnameEntryName}+ suffix={<CopyToClipboard text={cnameEntryName} />}+ />+ <InputEllipsis+ readOnly+ value={cnameEntryValue}+ suffix={<CopyToClipboard text={cnameEntryValue} />}+ />++ <InputEllipsis readOnly value="TXT" />+ <InputEllipsis+ readOnly+ value={txtEntryName}+ suffix={<CopyToClipboard text={txtEntryName} />}+ />+ <InputEllipsis+ readOnly+ value={props.projectDomain.txtRecord}+ suffix={<CopyToClipboard text={props.projectDomain.txtRecord} />}+ />+ </Grid>+ </Grid>+ </CollapsibleDomainSection>+ );+};++type DomainsProps = {+ newDomains: Set<string>;+ domains: Domain[];+ refreshDomainResult: (+ input: { projectId: Project["id"] },+ onSuccess?: () => void+ ) => void;+ domainLoadingState: "idle" | "submitting";+};++export const Domains = ({+ newDomains,+ domains,+ refreshDomainResult,+ domainLoadingState,+}: DomainsProps) => {+ return (+ <>+ {domains.map((projectDomain) => (+ <DomainItem+ key={projectDomain.domain.domain}+ projectDomain={projectDomain}+ initiallyOpen={newDomains.has(projectDomain.domain.domain)}+ refreshDomainResult={refreshDomainResult}+ domainLoadingState={domainLoadingState}+ />+ ))}+ </>+ );+};diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsxindex 7fddfd9821..4a34098c35 100644--- a/apps/builder/app/builder/features/topbar/publish.tsx+++ b/apps/builder/app/builder/features/topbar/publish.tsx@@ -1,13 +1,6 @@-import { useEffect, useState } from "react";-import { useFetcher } from "@remix-run/react";-import { ExternalLinkIcon } from "@webstudio-is/icons";+import { useCallback, useEffect, useState } from "react";import {- Text,Button,- Flex,- Label,- Link,- DeprecatedTextField,useId,Tooltip,FloatingPanelPopover,@@ -15,69 +8,297 @@ import {FloatingPanelPopoverTrigger,FloatingPanelPopoverContent,FloatingPanelPopoverTitle,+ IconButton,+ Grid,+ Flex,+ Label,+ Text,+ InputField,+ Separator,+ ScrollArea,} from "@webstudio-is/design-system";import { useIsPublishDialogOpen } from "../../shared/nano-states";import type { Project } from "@webstudio-is/project";-import { getPublishedUrl, restPublishPath } from "~/shared/router-utils";+import { getPublishedUrl } from "~/shared/router-utils";import { theme } from "@webstudio-is/design-system";import { useAuthPermit } from "~/shared/nano-states";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";+import { Domains } from "./domains";+import { CollapsibleDomainSection } from "./collapsible-domain-section";+import {+ CheckCircleIcon,+ ExternalLinkIcon,+ AlertIcon,+} from "@webstudio-is/icons";+import { createTrpcFetchProxy } from "~/shared/remix/trpc-remix-proxy";+import { builderDomainsPath } from "~/shared/router-utils";+import type { DomainRouter } from "@webstudio-is/domain/index.server";+import { AddDomain } from "./add-domain";++const trpc = createTrpcFetchProxy<DomainRouter>(builderDomainsPath);+type PublishButtonProps = { project: Project };-const Content = ({ project }: PublishButtonProps) => {+const ChangeProjectDomain = (props: PublishButtonProps) => {const id = useId();- const fetcher = useFetcher();- const [url, setUrl] = useState<string>();- const domain = fetcher.data?.domain || project.domain;++ const {+ send: updateProjectDomain,+ state: updateProjectDomainState,+ error: updateProjectSystemError,+ } = trpc.updateProjectDomain.useMutation();++ const {+ load: loadProject,+ data: projectData,+ error: projectSystemError,+ } = trpc.project.useQuery();++ const [domain, setDomain] = useState(props.project.domain);+ const [error, setError] = useState<string>();++ let project = props.project;+ if (projectData?.success) {+ project = projectData.project;+ }++ const refreshProject = useCallback(+ () =>+ loadProject({ projectId: props.project.id }, (projectData) => {+ if (projectData?.success === false) {+ setError(projectData.error);+ }+ }),+ [loadProject, props.project.id]+ );useEffect(() => {- setUrl(getPublishedUrl(domain));- }, [domain]);+ refreshProject();+ }, [refreshProject]);++ const publishedUrl = new URL(getPublishedUrl(project.domain));++ const handleUpdateProjectDomain = () => {+ if (updateProjectDomainState !== "idle") {+ return;+ }+ if (domain === project.domain) {+ return;+ }++ updateProjectDomain({ domain, projectId: project.id }, (data) => {+ if (data?.success === false) {+ setError(data.error);+ return;+ }+ refreshProject();+ });+ };++ if (projectSystemError !== undefined) {+ return (+ <Flex+ css={{+ m: theme.spacing[9],+ overflowWrap: "anywhere",+ }}+ gap={2}+ direction={"column"}+ >+ <Text color="destructive">{projectSystemError}</Text>+ <Text color="subtle">Please try again later</Text>+ </Flex>+ );+ }++ if (projectData === undefined) {+ return <div />;+ }return (- <Flex- direction="column"- css={{- padding: theme.spacing[9],- }}- >- <fetcher.Form method="post" action={restPublishPath()}>- <Flex direction="column" gap="2">- {url !== undefined && (- <Link- href={url}- target="_blank"+ <CollapsibleDomainSection+ title={publishedUrl.host}+ suffix={+ <Grid flow="column">+ <Tooltip content={error !== undefined ? error : "Everything is ok"}>+ <Flex+ align={"center"}+ justify={"center"}css={{- display: "flex",- gap: theme.spacing[0],+ cursor: "pointer",+ width: theme.spacing[12],+ height: theme.spacing[12],+ color:+ error !== undefined+ ? theme.colors.foregroundDestructive+ : theme.colors.foregroundSuccessText,+ }}+ >+ {error !== undefined ? <AlertIcon /> : <CheckCircleIcon />}+ </Flex>+ </Tooltip>++ <Tooltip content={`Proceed to ${publishedUrl.href}`}>+ <IconButton+ tabIndex={-1}+ onClick={(event) => {+ window.open(publishedUrl.href, "_blank");+ event.preventDefault();}}>- <Text truncate>{new URL(getPublishedUrl(domain)).host}</Text><ExternalLinkIcon />- </Link>- )}- <Flex gap="2" align="center">- <input type="hidden" name="projectId" value={project.id} />- <Label htmlFor={id}>Domain:</Label>- <DeprecatedTextField id={id} name="domain" defaultValue={domain} />- </Flex>- {fetcher.data?.errors !== undefined && (- <Text color="destructive">{fetcher.data?.errors}</Text>+ </IconButton>+ </Tooltip>+ </Grid>+ }+ >+ <Grid gap={3}>+ <Grid gap={1}>+ <Label htmlFor={id}>Domain:</Label>+ <InputField+ id={id}+ placeholder="Domain"+ value={domain}+ disabled={updateProjectDomainState !== "idle"}+ onChange={(event) => {+ setError(undefined);+ setDomain(event.target.value);+ }}+ onBlur={handleUpdateProjectDomain}+ onKeyDown={(event) => {+ if (event.key === "Enter") {+ handleUpdateProjectDomain();+ }++ if (event.key === "Escape") {+ if (project.domain !== domain) {+ setDomain(project.domain);+ event.preventDefault();+ }+ }+ }}+ color={+ error !== undefined || updateProjectSystemError !== undefined+ ? "error"+ : undefined+ }+ />+ {error !== undefined && <Text color="destructive">{error}</Text>}+ {updateProjectSystemError !== undefined && (+ <Text color="destructive">{updateProjectSystemError}</Text>)}- <Flex css={{ paddingTop: theme.spacing["2"] }}>- <Button- state={fetcher.state !== "idle" ? "pending" : "auto"}- type="submit"- css={{ flexGrow: 1 }}- >- {fetcher.state !== "idle" ? "Publishing" : "Publish"}- </Button>- </Flex>- </Flex>- </fetcher.Form>+ </Grid>+ </Grid>+ </CollapsibleDomainSection>+ );+};++const Publish = ({ projectId }: { projectId: Project["id"] }) => {+ const {+ send: publish,+ state: publishState,+ data: publishData,+ error: publishSystemError,+ } = trpc.publish.useMutation();++ return (+ <Flex+ css={{+ paddingLeft: theme.spacing[9],+ paddingRight: theme.spacing[9],+ paddingBottom: theme.spacing[9],+ paddingTop: theme.spacing[5],+ }}+ gap={2}+ shrink={false}+ direction={"column"}+ >+ {publishSystemError !== undefined && (+ <Text color="destructive">{publishSystemError}</Text>+ )}++ {publishData?.success === false && (+ <Text color="destructive">{publishData.error}</Text>+ )}++ <Button+ color="positive"+ disabled={publishState !== "idle"}+ onClick={() => {+ publish({ projectId });+ }}+ >+ Publish+ </Button></Flex>);};+const Content = (props: PublishButtonProps) => {+ const [newDomains, setNewDomains] = useState(new Set<string>());+ const {+ data: domainsResult,+ load: refreshDomainResult,+ state: domainLoadingState,+ } = trpc.findMany.useQuery();++ useEffect(() => {+ refreshDomainResult({ projectId: props.project.id });+ }, [refreshDomainResult, props.project.id]);++ return (+ <>+ <ScrollArea>+ <ChangeProjectDomain project={props.project} />++ {isFeatureEnabled("domains") && (+ <>+ {domainsResult?.success === true && (+ <Domains+ newDomains={newDomains}+ domains={domainsResult.data}+ refreshDomainResult={refreshDomainResult}+ domainLoadingState={domainLoadingState}+ />+ )}+ {domainsResult?.success === false && (+ <Label+ css={{+ overflowWrap: "anywhere",+ color: theme.colors.foregroundDestructive,+ }}+ >+ <div>{domainsResult.error}</div>+ </Label>+ )}+ </>+ )}+ </ScrollArea>++ {isFeatureEnabled("domains") && (+ <>+ <Flex direction="column" justify="end" css={{ height: 0 }}>+ <Separator />+ </Flex>++ <AddDomain+ projectId={props.project.id}+ refreshDomainResult={refreshDomainResult}+ domainLoadingState={domainLoadingState}+ onCreate={(domain) => {+ setNewDomains((prev) => {+ return new Set([...prev, domain]);+ });+ }}+ />+ </>+ )}++ <Publish projectId={props.project.id} />+ </>+ );+};+export const PublishButton = ({ project }: PublishButtonProps) => {const [isOpen, setIsOpen] = useIsPublishDialogOpen();const [authPermit] = useAuthPermit();@@ -99,9 +320,15 @@ export const PublishButton = ({ project }: PublishButtonProps) => {</Tooltip></FloatingPanelAnchor>- <FloatingPanelPopoverContent css={{ zIndex: theme.zIndices[1] }}>- <Content project={project} />+ <FloatingPanelPopoverContent+ css={{+ zIndex: theme.zIndices[1],+ width: theme.spacing[33],+ maxWidth: theme.spacing[33],+ }}+ ><FloatingPanelPopoverTitle>Publish</FloatingPanelPopoverTitle>+ <Content project={project} /></FloatingPanelPopoverContent></FloatingPanelPopover>);diff --git a/apps/builder/app/routes/builder.domains.$method.ts b/apps/builder/app/routes/builder.domains.$method.tsnew file mode 100644index 0000000000..0d9f6313a2--- /dev/null+++ b/apps/builder/app/routes/builder.domains.$method.ts@@ -0,0 +1,24 @@+import type { ActionArgs } from "@remix-run/node";+import { domainRouter } from "@webstudio-is/domain/index.server";+import { findAuthenticatedUser } from "~/services/auth.server";+import { createContext } from "~/shared/context.server";+import { handleTrpcRemixAction } from "~/shared/remix/trpc-remix-request.server";++export const action = async ({ request, params }: ActionArgs) => {+ const authenticatedUser = await findAuthenticatedUser(request);++ if (authenticatedUser === null) {+ throw new Error("Not authenticated");+ }++ const context = await createContext(request);++ return await handleTrpcRemixAction({+ request,+ params,+ router: domainRouter,+ context,+ });+};++export const loader = action;diff --git a/apps/builder/app/routes/rest.publish.ts b/apps/builder/app/routes/rest.publish.tsdeleted file mode 100644index 111ca9e8f7..0000000000--- a/apps/builder/app/routes/rest.publish.ts+++ /dev/null@@ -1,49 +0,0 @@-import type { ActionArgs } from "@remix-run/node";-import { zfd } from "zod-form-data";-import env from "~/env/env.server";-import { createContext } from "~/shared/context.server";-import * as db from "~/shared/db";--const schema = zfd.formData({- domain: zfd.text(),- projectId: zfd.text(),-});--export const action = async ({ request }: ActionArgs) => {- const { domain, projectId } = schema.parse(await request.formData());-- try {- const context = await createContext(request);-- await db.misc.publish({ projectId, domain }, context);- if (env.PUBLISHER_ENDPOINT && env.PUBLISHER_TOKEN) {- const headers = new Headers();- headers.append("X-AUTH-WEBSTUDIO", env.PUBLISHER_TOKEN || "");- headers.append("Content-Type", "text/plain");- const url = new URL(request.url);- const response = await fetch(env.PUBLISHER_ENDPOINT, {- method: "PUT",- headers,- body: JSON.stringify({- builderApiOrigin: url.origin,- projectId,- projectName: domain,- // To support preview deployments- branchName: env.BRANCH_NAME,- }),- });- const text = await response.text();- if (!response.ok) {- throw new Error(text);- }- }- return { domain };- } catch (error) {- if (error instanceof Error) {- return {- errors: error.message,- };- }- }- return { errors: "Unexpected error" };-};diff --git a/apps/builder/app/shared/context.server.ts b/apps/builder/app/shared/context.server.tsindex 993f73a8de..59800437a5 100644--- a/apps/builder/app/shared/context.server.ts+++ b/apps/builder/app/shared/context.server.ts@@ -1,4 +1,5 @@import type { AppContext } from "@webstudio-is/trpc-interface/index.server";+import env from "~/env/env.server";import { authenticator } from "~/services/auth.server";import { trpcClient } from "~/services/trpc.server";@@ -22,6 +23,22 @@ const createAuthorizationContext = async (return context;};+const createDomainContext = (request: Request) => {+ const url = new URL(request.url);++ const context: AppContext["domain"] = {+ domainTrpc: trpcClient.domain,+ domainEnv: {+ BRANCH_NAME: env.BRANCH_NAME ?? "main",+ PUBLISHER_TOKEN: env.PUBLISHER_TOKEN ?? "",+ PUBLISHER_ENDPOINT: env.PUBLISHER_ENDPOINT,+ BUILDER_ORIGIN: url.origin,+ },+ };++ return context;+};+/*** argument buildEnv==="prod" only if we are loading project with production build*/@@ -30,8 +47,10 @@ export const createContext = async (buildEnv: AppContext["authorization"]["buildEnv"] = "dev"): Promise<AppContext> => {const authorization = await createAuthorizationContext(request, buildEnv);+ const domain = await createDomainContext(request);return {authorization,+ domain,};};diff --git a/apps/builder/app/shared/db/index.ts b/apps/builder/app/shared/db/index.tsindex b7d9801512..9e9bf15b68 100644--- a/apps/builder/app/shared/db/index.ts+++ b/apps/builder/app/shared/db/index.ts@@ -1,4 +1,3 @@-export * as misc from "./misc.server";export * as user from "./user.server";// @todo make the export consistent with the restexport * from "./canvas.server";diff --git a/apps/builder/app/shared/db/misc.server.ts b/apps/builder/app/shared/db/misc.server.tsdeleted file mode 100644index f03733dd51..0000000000--- a/apps/builder/app/shared/db/misc.server.ts+++ /dev/null@@ -1,53 +0,0 @@-import { db } from "@webstudio-is/project/index.server";-import { prisma } from "@webstudio-is/prisma-client";-import type { AppContext } from "@webstudio-is/trpc-interface/index.server";-import {- createBuild,- loadBuildByProjectId,-} from "@webstudio-is/project-build/index.server";--/**- * Conceptually publishing is cloning all data that affects user site- * and referencing it under a new tree id.- */-export const publish = async (- {- projectId,- domain,- }: {- projectId: string | null;- domain: string | null;- },- context: AppContext-) => {- if (projectId === null) {- throw new Error("Project ID required");- }- if (domain === null) {- throw new Error("Domain required");- }-- const project = await db.project.loadById(projectId, context);- if (project === null) {- throw new Error(`Project "${projectId}" not found`);- }-- const devBuild = await loadBuildByProjectId(projectId, "dev");-- await prisma.$transaction(async (client) => {- await createBuild(- { projectId: project.id, env: "prod", sourceBuild: devBuild },- context,- client- );- });-- const updatedProject = await db.project.updateDomain(- {- id: projectId,- domain,- },- context- );- return updatedProject;-};diff --git a/apps/builder/app/shared/remix/trpc-remix-proxy.ts b/apps/builder/app/shared/remix/trpc-remix-proxy.tsindex c8a161189c..adf721cda2 100644--- a/apps/builder/app/shared/remix/trpc-remix-proxy.ts+++ b/apps/builder/app/shared/remix/trpc-remix-proxy.ts@@ -7,7 +7,7 @@ import type {} from "@trpc/server";// eslint-disable-next-line import/no-internal-modulesimport { createRecursiveProxy } from "@trpc/server/shared";-import { useCallback } from "react";+import { useCallback, useMemo, useState } from "react";export const createTrpcRemixProxy = <Router extends AnyRouter>(getPath: (method: string) => string@@ -60,3 +60,101 @@ export const createTrpcRemixProxy = <Router extends AnyRouter>(state,};}) as never;++export const createTrpcFetchProxy = <Router extends AnyRouter>(+ getPath: (method: string) => string+): {+ [Procedure in keyof Router["_def"]["record"]]: Router["_def"]["record"][Procedure] extends AnyMutationProcedure+ ? {+ useMutation: () => {+ send: (+ input: inferRouterInputs<Router>[Procedure],+ onSuccess?: (data: inferRouterOutputs<Router>[Procedure]) => void+ ) => void;+ data?: inferRouterOutputs<Router>[Procedure];+ state: "idle" | "submitting";+ error?: string | undefined;+ };+ }+ : {+ useQuery: () => {+ load: (+ input: inferRouterInputs<Router>[Procedure],+ onSuccess?: (data: inferRouterOutputs<Router>[Procedure]) => void+ ) => void;+ data?: inferRouterOutputs<Router>[Procedure];+ state: "idle" | "submitting";+ error?: string | undefined;+ };+ };+} =>+ createRecursiveProxy((options) => {+ const path = [...options.path];+ const hook = path.pop();+ const [data, setData] = useState(undefined);+ const [state, setState] = useState<"idle" | "submitting">("idle");+ const [error, setError] = useState<string | undefined>(undefined);++ if (hook !== "useMutation" && hook !== "useQuery") {+ throw new Error(`Invalid hook ${hook}`);+ }++ const method = path.join(".");++ const submit = useMemo(() => {+ let requestId = 0;++ return async (input: never, onSuccess?: (data: unknown) => void) => {+ try {+ setState("submitting");+ requestId += 1;+ const currentRequestId = requestId;++ if (process.env.NODE_ENV !== "production") {+ await new Promise((resolve) => setTimeout(resolve, 1000));+ }++ const response = await fetch(getPath(method), {+ method: "POST",+ headers: {+ "Content-Type": "application/json",+ },+ body: JSON.stringify(input),+ });++ // Newer request has been made, ignore this one+ // In the future to support optimistic updates we can call onComplete with the requestId order+ if (currentRequestId !== requestId) {+ return;+ }++ if (response.ok) {+ const data = await response.json();+ setData(data);+ setError(undefined);+ onSuccess?.(data);+ return;+ }++ // Error handling+ const message = await response.text();+ setError(message.slice(0, 200));+ } catch (error) {+ if (error instanceof Error) {+ setError(error.message);+ return;+ }+ setError("Unknown error");+ } finally {+ setState("idle");+ }+ };+ }, [method]);++ return {+ [hook === "useMutation" ? "send" : "load"]: submit,+ data: data,+ state,+ error,+ };+ }) as never;diff --git a/apps/builder/app/shared/remix/trpc-remix-request.server.ts b/apps/builder/app/shared/remix/trpc-remix-request.server.tsindex aba384e0bd..0e7a0864e3 100644--- a/apps/builder/app/shared/remix/trpc-remix-request.server.ts+++ b/apps/builder/app/shared/remix/trpc-remix-request.server.ts@@ -28,12 +28,16 @@ export const handleTrpcRemixAction = async <Router extends AnyRouter>({}input = JSON.parse(inputRaw) as never;} else {- const formData = await request.formData();- const inputRaw = formData.get("input");- if (typeof inputRaw !== "string") {- throw new Error(`Bad method name ${inputRaw}`);+ if (request.headers.get("Content-Type") !== "application/json") {+ const formData = await request.formData();+ const inputRaw = formData.get("input");+ if (typeof inputRaw !== "string") {+ throw new Error(`Bad method name ${inputRaw}`);+ }+ input = JSON.parse(inputRaw) as never;+ } else {+ input = (await request.json()) as never;}- input = JSON.parse(inputRaw) as never;}const caller = router.createCaller(context);diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tsindex 8296b9e6d3..8c1f23e0eb 100644--- a/apps/builder/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -50,6 +50,9 @@ export const dashboardPath = () => {return "/dashboard";};+export const builderDomainsPath = (method: string) =>+ `/builder/domains/${method}`;+export const dashboardProjectPath = (method: string) =>`/dashboard/projects/${method}`;@@ -108,8 +111,6 @@ export const restPatchPath = (props: { authToken?: string }) => {}`;};-export const restPublishPath = () => "/rest/publish";-export const getBuildUrl = ({buildOrigin,project,diff --git a/apps/builder/package.json b/apps/builder/package.jsonindex 0a11c6f3b4..1c5ce63502 100644--- a/apps/builder/package.json+++ b/apps/builder/package.json@@ -45,6 +45,7 @@"@webstudio-is/css-vars": "workspace:^","@webstudio-is/dashboard": "workspace:^","@webstudio-is/design-system": "workspace:^",+ "@webstudio-is/domain": "workspace:^","@webstudio-is/feature-flags": "workspace:^","@webstudio-is/fonts": "workspace:^","@webstudio-is/icons": "workspace:^",@@ -88,8 +89,7 @@"use-debounce": "^9.0.4","uuid": "^9.0.0","warn-once": "^0.1.1",- "zod": "^3.19.1",- "zod-form-data": "^1.2.1"+ "zod": "^3.21.4"},"devDependencies": {"@babel/core": "^7.21.0",diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.jsonindex c7eb7f0583..6b7c030e00 100644--- a/packages/asset-uploader/package.json+++ b/packages/asset-uploader/package.json@@ -34,7 +34,7 @@"@webstudio-is/tsconfig": "workspace:^","jest": "^29.3.1","typescript": "5.0.3",- "zod": "^3.19.1"+ "zod": "^3.21.4"},"exports": {".": {diff --git a/packages/authorization-token/package.json b/packages/authorization-token/package.jsonindex d2c2b6d592..a574b6c496 100644--- a/packages/authorization-token/package.json+++ b/packages/authorization-token/package.json@@ -17,7 +17,7 @@"dependencies": {"@webstudio-is/prisma-client": "workspace:^","@webstudio-is/trpc-interface": "workspace:^",- "zod": "^3.19.1"+ "zod": "^3.21.4"},"devDependencies": {"@jest/globals": "^29.3.1",diff --git a/packages/css-data/package.json b/packages/css-data/package.jsonindex 62eae7ef54..9a2160d6c7 100644--- a/packages/css-data/package.json+++ b/packages/css-data/package.json@@ -27,7 +27,7 @@"tsx": "^3.12.6","type-fest": "^3.7.1","typescript": "5.0.3",- "zod": "^3.19.1"+ "zod": "^3.21.4"},"peerDependencies": {"zod": "^3.19.1"diff --git a/packages/dashboard/package.json b/packages/dashboard/package.jsonindex 83937e004c..26545a9426 100644--- a/packages/dashboard/package.json+++ b/packages/dashboard/package.json@@ -17,7 +17,7 @@"@webstudio-is/prisma-client": "workspace:^","@webstudio-is/project": "workspace:^","@webstudio-is/trpc-interface": "workspace:^",- "zod": "^3.19.1"+ "zod": "^3.21.4"},"devDependencies": {"@jest/globals": "^29.3.1",diff --git a/packages/design-system/src/components/scroll-area.tsx b/packages/design-system/src/components/scroll-area.tsxindex f37f04abdf..021e212c52 100644--- a/packages/design-system/src/components/scroll-area.tsx+++ b/packages/design-system/src/components/scroll-area.tsx@@ -5,6 +5,7 @@ import { Root, Viewport, Scrollbar, Thumb } from "@radix-ui/react-scroll-area";const ScrollAreaRoot = styled(Root, {boxSizing: "border-box",overflow: "hidden",+ display: "grid",});const ScrollAreaThumb = styled(Thumb, {diff --git a/packages/design-system/src/components/section-title.tsx b/packages/design-system/src/components/section-title.tsxindex 50bcdcd06f..10f60322bc 100644--- a/packages/design-system/src/components/section-title.tsx+++ b/packages/design-system/src/components/section-title.tsx@@ -40,12 +40,7 @@ const titleButtonLayoutStyle = css({height: "100%",boxSizing: "border-box",paddingLeft: theme.spacing[9],- paddingRight: theme.spacing[7],- variants: {- // We assume that suffix is a <Button prefix={<Icon />} />- // (hard to support arbitrary width suffixes here, hopefully we'll never need to)- hasSuffix: { true: { paddingRight: theme.spacing[16] } },- },+ paddingRight: theme.spacing[6],});const labelContainerStyle = css({@@ -73,6 +68,10 @@ const suffixSlotStyle = css({top: theme.spacing[4],});+const invisibleSuffixStyle = css({+ visibility: "hidden",+});+const dotsSlotStyle = css({display: "flex",});@@ -129,9 +128,7 @@ export const SectionTitle = forwardRef(onKeyDown={handleKeyDown}><button- className={titleButtonStyle({- hasSuffix: suffix !== undefined,- })}+ className={titleButtonStyle()}data-state={state}ref={ref}{...props}@@ -142,11 +139,7 @@ export const SectionTitle = forwardRef(Therefore, we render the label in a layer above the SectionTitle button*/}<div className={labelContainerStyle()}>- <div- className={titleButtonLayoutStyle({- hasSuffix: suffix !== undefined,- })}- >+ <div className={titleButtonLayoutStyle()}>{children}{finalDots.length > 0 && (@@ -156,6 +149,11 @@ export const SectionTitle = forwardRef())}</div>)}++ {suffix && (+ /* In case of text overflow we need to place here the same suffix*/+ <div className={invisibleSuffixStyle()}>{suffix}</div>+ )}</div></div>diff --git a/packages/design-system/src/components/text.ts b/packages/design-system/src/components/text.tsindex 877b351376..b0ed70f4a3 100644--- a/packages/design-system/src/components/text.ts+++ b/packages/design-system/src/components/text.ts@@ -29,7 +29,13 @@ export const textStyle = css({contrast: { color: theme.colors.foregroundContrastMain },subtle: { color: theme.colors.foregroundSubtle },disabled: { color: theme.colors.foregroundDisabled },- destructive: { color: theme.colors.foregroundDestructive },+ success: { color: theme.colors.foregroundSuccessText },+ destructive: {+ color: theme.colors.foregroundDestructive,+ // destructive in most cases used to show 3rd party errors+ // we don't want it to break layout+ overflowWrap: "anywhere",+ },},align: {left: { textAlign: "left" },diff --git a/packages/domain/LICENSE b/packages/domain/LICENSEnew file mode 100644index 0000000000..1f6edad9a7--- /dev/null+++ b/packages/domain/LICENSE@@ -0,0 +1,21 @@+MIT License++Copyright (c) 2022 Webstudio++Permission is hereby granted, free of charge, to any person obtaining a copy+of this software and associated documentation files (the "Software"), to deal+in the Software without restriction, including without limitation the rights+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+copies of the Software, and to permit persons to whom the Software is+furnished to do so, subject to the following conditions:++The above copyright notice and this permission notice shall be included in all+copies or substantial portions of the Software.++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE+SOFTWARE.diff --git a/packages/domain/README.md b/packages/domain/README.mdnew file mode 100644index 0000000000..1b2038b7b0--- /dev/null+++ b/packages/domain/README.md@@ -0,0 +1,3 @@+# Webstudio Project++Project related functionalities. This was temporarily placed here to reuse between other packages, but we need to split this into separate packages and probably remove this package entirely or keep it only for "project" specific functionality.diff --git a/packages/domain/jest.config.js b/packages/domain/jest.config.jsnew file mode 100644index 0000000000..e7fc137533--- /dev/null+++ b/packages/domain/jest.config.js@@ -0,0 +1 @@+export { default } from "@webstudio-is/jest-config";diff --git a/packages/domain/package.json b/packages/domain/package.jsonnew file mode 100644index 0000000000..1834690178--- /dev/null+++ b/packages/domain/package.json@@ -0,0 +1,52 @@+{+ "name": "@webstudio-is/domain",+ "version": "0.68.0",+ "description": "Webstudio Domain",+ "author": "Webstudio <[email protected]>",+ "homepage": "https://webstudio.is",+ "type": "module",+ "scripts": {+ "typecheck": "tsc --noEmit --emitDeclarationOnly false",+ "test": "NODE_OPTIONS=--experimental-vm-modules jest",+ "checks": "pnpm typecheck && pnpm lint",+ "dev": "build-package --watch",+ "build": "build-package",+ "dts": "tsc --declarationDir lib/types",+ "lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"+ },+ "dependencies": {+ "@webstudio-is/prisma-client": "workspace:^",+ "@webstudio-is/project": "workspace:^",+ "@webstudio-is/project-build": "workspace:^",+ "@webstudio-is/trpc-interface": "workspace:^",+ "zod": "^3.21.4"+ },+ "devDependencies": {+ "@jest/globals": "^29.3.1",+ "@webstudio-is/jest-config": "workspace:^",+ "@webstudio-is/scripts": "workspace:^",+ "@webstudio-is/tsconfig": "workspace:^",+ "jest": "^29.3.1",+ "typescript": "5.0.3"+ },+ "exports": {+ ".": {+ "source": "./src/index.ts",+ "import": "./lib/index.js",+ "require": "./lib/cjs/index.js"+ },+ "./index.server": {+ "source": "./src/index.server.ts",+ "import": "./lib/index.server.js"+ }+ },+ "types": "lib/types/index.d.ts",+ "files": [+ "lib/*",+ "src/*",+ "!*.test.*"+ ],+ "license": "MIT",+ "private": false,+ "sideEffects": false+}diff --git a/packages/domain/src/db/cname-from-user-id.ts b/packages/domain/src/db/cname-from-user-id.tsnew file mode 100644index 0000000000..327272a0d6--- /dev/null+++ b/packages/domain/src/db/cname-from-user-id.ts@@ -0,0 +1,62 @@+import { webcrypto as crypto } from "node:crypto";++export const cnameFromUserId = async (userId: string) => {+ const vowels = ["a", "e", "i", "o", "u"];+ const consonants = [+ "b",+ "c",+ "d",+ "f",+ "g",+ "h",+ "j",+ "k",+ "l",+ "m",+ "n",+ "p",+ "q",+ "r",+ "s",+ "t",+ "v",+ "w",+ "x",+ "y",+ "z",+ ];++ const secretBuffer = await crypto.subtle.digest(+ "SHA-256",+ new TextEncoder().encode(userId)+ );++ let result = "";++ const array = new Uint8Array(secretBuffer);+ const wordsLength = [+ Math.max(4, array[0] % 7),+ Math.max(4, array[0] % 7),+ Math.max(4, array[0] % 7),+ ];++ let wordIndex = 0;+ let wordLength = wordsLength[wordIndex];++ for (let i = 0; i < array.length; i++) {+ result +=+ i % 2 === 0+ ? consonants[array[i] % consonants.length]+ : vowels[array[i] % vowels.length];+ if (i >= wordLength) {+ wordIndex++;+ if (wordIndex >= wordsLength.length) {+ break;+ }+ result += "-";+ wordLength += wordsLength[wordIndex];+ }+ }++ return result;+};diff --git a/packages/domain/src/db/domain.ts b/packages/domain/src/db/domain.tsnew file mode 100644index 0000000000..3597974131--- /dev/null+++ b/packages/domain/src/db/domain.ts@@ -0,0 +1,316 @@+import { v4 as uuid } from "uuid";+import { prisma, type Project, type Domain } from "@webstudio-is/prisma-client";+import {+ authorizeProject,+ type AppContext,+ AuthorizationError,+} from "@webstudio-is/trpc-interface/index.server";+import { validateDomain } from "./validate";+import { cnameFromUserId } from "./cname-from-user-id";++const getProjectDomains = async (projectId: Project["id"]) =>+ await prisma.projectWithDomain.findMany({+ where: {+ projectId,+ },+ include: {+ domain: true,+ },+ orderBy: [+ {+ createdAt: "asc",+ },+ ],+ });++export const findMany = async (+ props: { projectId: Project["id"] },+ context: AppContext+): Promise<+ | { success: false; error: string }+ | { success: true; data: Awaited<ReturnType<typeof getProjectDomains>> }+> => {+ // Only builder of the project can list domains+ const canList = await authorizeProject.hasProjectPermit(+ { projectId: props.projectId, permit: "build" },+ context+ );++ if (canList === false) {+ throw new Error("You don't have access to list this project domains");+ }++ const projectDomains = await getProjectDomains(props.projectId);++ return {+ success: true,+ data: projectDomains,+ };+};++type Result = { success: false; error: string } | { success: true };++/**+ * Creates 2 entries in the database:+ * at the "domain" table and at the "projectDomain" table+ */+export const create = async (+ props: {+ projectId: Project["id"];+ domain: string;+ maxDomainsAllowedPerUser: number;+ },+ context: AppContext+): Promise<Result> => {+ // Only owner of the project can create domains+ const canCreateDomain = await authorizeProject.hasProjectPermit(+ { projectId: props.projectId, permit: "own" },+ context+ );++ if (canCreateDomain === false) {+ throw new AuthorizationError(+ "You don't have access to create this project domains"+ );+ }++ const { userId } = context.authorization;++ if (userId === undefined) {+ throw new AuthorizationError("User must be logged in to create domain");+ }++ // Query amount of domains+ const projectDomainsCount = await prisma.projectWithDomain.count({+ where: {+ userId: context.authorization.userId,+ },+ });++ if (projectDomainsCount >= props.maxDomainsAllowedPerUser) {+ return {+ success: false,+ error: "You have reached the maximum amount of domains allowed",+ };+ }++ const validationResult = validateDomain(props.domain);++ if (validationResult.success === false) {+ return validationResult;+ }++ const { domain } = validationResult;++ // Create domain in domain table+ const dbDomain = await prisma.domain.upsert({+ update: {+ domain,+ },+ create: {+ domain,+ status: "INITIALIZING",+ },+ where: {+ domain,+ },+ });++ const txtRecord = uuid();++ // Create project domain relation+ await prisma.projectDomain.create({+ data: {+ domainId: dbDomain.id,+ projectId: props.projectId,+ txtRecord,+ cname: await cnameFromUserId(userId),+ },+ });++ return { success: true };+};++/**+ * Verify TXT record of the domain, update domain status, start 3rd party domain initialization process+ */+export const verify = async (+ props: {+ projectId: Project["id"];+ domain: string;+ },+ context: AppContext+): Promise<Result> => {+ // Only owner of the project can register domains+ const canRegisterDomain = await authorizeProject.hasProjectPermit(+ { projectId: props.projectId, permit: "own" },+ context+ );++ if (canRegisterDomain === false) {+ throw new Error("You don't have access to create this project domains");+ }++ const validationResult = validateDomain(props.domain);++ if (validationResult.success === false) {+ return validationResult;+ }++ const { domain } = validationResult;++ const projectDomain = await prisma.projectWithDomain.findFirstOrThrow({+ where: {+ projectId: props.projectId,+ domain: {+ domain,+ },+ },+ include: {+ domain: true,+ },+ });++ // @todo: TXT verification and domain initialization should be implemented in the future as queue service+ const createDomainResult = await context.domain.domainTrpc.create.mutate({+ domain,+ txtRecord: projectDomain.txtRecord,+ });++ if (createDomainResult.success === false) {+ return createDomainResult;+ }++ await prisma.domain.update({+ where: {+ domain,+ },+ data: {+ status: "PENDING",+ txtRecord: projectDomain.txtRecord,+ },+ });++ return { success: true };+};++/**+ * Removes projectDomain entry+ */+export const remove = async (+ props: {+ projectId: Project["id"];+ domain: string;+ },+ context: AppContext+): Promise<Result> => {+ // Only owner of the project can register domains+ const canDeleteDomain = await authorizeProject.hasProjectPermit(+ { projectId: props.projectId, permit: "own" },+ context+ );++ if (canDeleteDomain === false) {+ throw new Error("You don't have access to delete this project domains");+ }++ const validationResult = validateDomain(props.domain);++ if (validationResult.success === false) {+ return validationResult;+ }++ const { domain } = validationResult;++ await prisma.projectDomain.deleteMany({+ where: {+ projectId: props.projectId,+ domain: {+ domain,+ },+ },+ });++ return { success: true };+};++type Status = "active" | "pending" | "error";+type StatusEnum = Uppercase<Status>;++type RefreshResult =+ | { success: false; error: string }+ | { success: true; domain: Domain };++const statusToStatusEnum = (status: Status): StatusEnum =>+ status.toUpperCase() as StatusEnum;++/**+ * Reads the status of the domain from the 3rd party provider+ * and updates the database accordingly+ *+ * @todo: In the future should be a read only status reader+ */+export const updateStatus = async (+ props: {+ projectId: Project["id"];+ domain: string;+ },+ context: AppContext+): Promise<RefreshResult> => {+ // Only owner of the project can register domains+ const canRefreshDomain = await authorizeProject.hasProjectPermit(+ { projectId: props.projectId, permit: "own" },+ context+ );++ if (canRefreshDomain === false) {+ throw new Error("You don't have access to refresh this project domains");+ }++ const validationResult = validateDomain(props.domain);++ if (validationResult.success === false) {+ return validationResult;+ }++ const { domain } = validationResult;++ // @todo: must be implemented as workflow/queue service part of 3rd party domain initialization process+ const statusResult = await context.domain.domainTrpc.getStatus.query({+ domain,+ });++ if (statusResult.success === false) {+ return statusResult;+ }++ const { data } = statusResult;++ if (data.status === "error") {+ // update domain status+ const updatedDomain = await prisma.domain.update({+ where: {+ domain,+ },+ data: {+ status: statusToStatusEnum(data.status),+ error: data.error,+ },+ });++ return { success: true, domain: updatedDomain };+ }++ // update domain status+ const updatedDomain = await prisma.domain.update({+ where: {+ domain,+ },+ data: {+ status: statusToStatusEnum(data.status),+ error: null,+ },+ });++ return { success: true, domain: updatedDomain };+};diff --git a/packages/domain/src/db/index.ts b/packages/domain/src/db/index.tsnew file mode 100644index 0000000000..40dfe1ac71--- /dev/null+++ b/packages/domain/src/db/index.ts@@ -0,0 +1 @@+export * as db from "./domain";diff --git a/packages/domain/src/db/validate.ts b/packages/domain/src/db/validate.tsnew file mode 100644index 0000000000..01fa8c54ea--- /dev/null+++ b/packages/domain/src/db/validate.ts@@ -0,0 +1,31 @@+export const validateDomain = (+ domain: string+): { success: false; error: string } | { success: true; domain: string } => {+ try {+ const domainUrl = new URL(`https://${domain}`);+ const domainHost = domainUrl.host;++ if (domainHost.split(".").length < 2) {+ return {+ success: false,+ error: `The domain "${domainHost}" must have at least two levels.`,+ };+ }++ if (domainHost.split(".").length > 4) {+ return {+ success: false,+ error: `The domain "${domainHost}" must have at most four levels.`,+ };+ }+ return {+ success: true,+ domain: domainHost,+ };+ } catch {+ return {+ success: false,+ error: `Invalid domain ${domain}`,+ };+ }+};diff --git a/packages/domain/src/index.server.ts b/packages/domain/src/index.server.tsnew file mode 100644index 0000000000..7caf469ef2--- /dev/null+++ b/packages/domain/src/index.server.ts@@ -0,0 +1 @@+export * from "./trpc";diff --git a/packages/domain/src/index.ts b/packages/domain/src/index.tsnew file mode 100644index 0000000000..896668510f--- /dev/null+++ b/packages/domain/src/index.ts@@ -0,0 +1,2 @@+export type { DomainRouter } from "./trpc";+export { validateDomain } from "./db/validate";diff --git a/packages/domain/src/trpc/domain.ts b/packages/domain/src/trpc/domain.tsnew file mode 100644index 0000000000..de17479e54--- /dev/null+++ b/packages/domain/src/trpc/domain.ts@@ -0,0 +1,224 @@+import { z } from "zod";+import { initTRPC } from "@trpc/server";+import type { AppContext } from "@webstudio-is/trpc-interface/index.server";+import { db as projectDb } from "@webstudio-is/project/index.server";+import { db } from "../db";+import { createProductionBuild } from "@webstudio-is/project-build/index.server";++const { router, procedure } = initTRPC.context<AppContext>().create();++export const domainRouter = router({+ project: procedure+ .input(z.object({ projectId: z.string() }))+ .query(async ({ input, ctx }) => {+ try {+ const project = await projectDb.project.loadById(input.projectId, ctx);+ return {+ success: true,+ project,+ } as const;+ } catch (error) {+ return {+ success: false,+ error: error instanceof Error ? error.message : "Unknown error",+ } as const;+ }+ }),+ publish: procedure+ .input(z.object({ projectId: z.string() }))+ .mutation(async ({ input, ctx }) => {+ try {+ await createProductionBuild(+ {+ projectId: input.projectId,+ },+ ctx+ );++ const project = await projectDb.project.loadById(input.projectId, ctx);++ const { domainEnv } = ctx.domain;++ const headers = new Headers();++ headers.append("X-AUTH-WEBSTUDIO", domainEnv.PUBLISHER_TOKEN || "");+ headers.append("Content-Type", "text/plain");++ const url = new URL(domainEnv.BUILDER_ORIGIN);+ if (domainEnv.PUBLISHER_ENDPOINT === undefined) {+ return {+ success: false,+ error: "PUBLISHER_ENDPOINT is not defined",+ };+ }++ const response = await fetch(domainEnv.PUBLISHER_ENDPOINT, {+ method: "PUT",+ headers,+ body: JSON.stringify({+ builderApiOrigin: url.origin,+ projectId: input.projectId,+ // @todo: useless and must be provided by the rest/project endpoint+ projectName: project.domain,+ // To support preview deployments+ // @todo: useless and must be provided by the rest/project endpoint+ branchName: domainEnv.BRANCH_NAME,+ }),+ });++ const text = await response.text();+ if (response.ok === false) {+ throw new Error(text);+ }++ return { success: true } as const;+ } catch (error) {+ return {+ success: false,+ error: error instanceof Error ? error.message : "Unknown error",+ } as const;+ }+ }),+ /**+ * Update *.wstd.* domain+ */+ updateProjectDomain: procedure+ .input(+ z.object({+ projectId: z.string(),+ domain: z.string(),+ })+ )+ .mutation(async ({ input, ctx }) => {+ try {+ await projectDb.project.updateDomain(+ {+ id: input.projectId,+ domain: input.domain,+ },+ ctx+ );+ return { success: true } as const;+ } catch (error) {+ return {+ success: false,+ error: error instanceof Error ? error.message : "Unknown error",+ } as const;+ }+ }),++ /**+ * Creates 2 entries in the database:+ * at the "domain" table and at the "projectDomain" table+ */+ create: procedure+ .input(+ z.object({+ projectId: z.string(),+ domain: z.string(),+ })+ )+ .mutation(async ({ input, ctx }) => {+ try {+ return await db.create(+ {+ projectId: input.projectId,+ domain: input.domain,+ maxDomainsAllowedPerUser: 5,+ },+ ctx+ );+ } catch (error) {+ return {+ success: false,+ error: error instanceof Error ? error.message : "Unknown error",+ } as const;+ }+ }),++ verify: procedure+ .input(+ z.object({+ projectId: z.string(),+ domain: z.string(),+ })+ )+ .mutation(async ({ input, ctx }) => {+ try {+ return await db.verify(+ {+ projectId: input.projectId,+ domain: input.domain,+ },+ ctx+ );+ } catch (error) {+ return {+ success: false,+ error: error instanceof Error ? error.message : "Unknown error",+ } as const;+ }+ }),+ remove: procedure+ .input(+ z.object({+ projectId: z.string(),+ domain: z.string(),+ })+ )+ .mutation(async ({ input, ctx }) => {+ try {+ return await db.remove(+ {+ projectId: input.projectId,+ domain: input.domain,+ },+ ctx+ );+ } catch (error) {+ return {+ success: false,+ error: error instanceof Error ? error.message : "Unknown error",+ } as const;+ }+ }),+ findMany: procedure+ .input(+ z.object({+ projectId: z.string(),+ })+ )+ .query(async ({ input, ctx }) => {+ try {+ return await db.findMany({ projectId: input.projectId }, ctx);+ } catch (error) {+ return {+ success: false,+ error: error instanceof Error ? error.message : "Unknown error",+ } as const;+ }+ }),++ updateStatus: procedure+ .input(+ z.object({+ projectId: z.string(),+ domain: z.string(),+ })+ )+ .mutation(async ({ input, ctx }) => {+ try {+ return await db.updateStatus(+ { projectId: input.projectId, domain: input.domain },+ ctx+ );+ } catch (error) {+ return {+ success: false,+ error: error instanceof Error ? error.message : "Unknown error",+ } as const;+ }+ }),+});++export type DomainRouter = typeof domainRouter;diff --git a/packages/domain/src/trpc/index.ts b/packages/domain/src/trpc/index.tsnew file mode 100644index 0000000000..7886141dc9--- /dev/null+++ b/packages/domain/src/trpc/index.ts@@ -0,0 +1 @@+export * from "./domain";diff --git a/packages/domain/tsconfig.json b/packages/domain/tsconfig.jsonnew file mode 100644index 0000000000..292c6d9f01--- /dev/null+++ b/packages/domain/tsconfig.json@@ -0,0 +1,8 @@+{+ "extends": "@webstudio-is/tsconfig/base.json",+ "include": ["src", "../../@types/**/*.d.ts"],+ "compilerOptions": {+ "module": "ES2020",+ "target": "ES2020"+ }+}diff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.tsindex ea5c5e0ad9..c5a30e96e4 100644--- a/packages/feature-flags/src/flags.ts+++ b/packages/feature-flags/src/flags.ts@@ -2,3 +2,4 @@ export const example = false;export const dark = false;export const unsupportedBrowsers = false;export const displayContents = false;+export const domains = false;diff --git a/packages/fonts/package.json b/packages/fonts/package.jsonindex 5684565ca5..a4faf3fa35 100644--- a/packages/fonts/package.json+++ b/packages/fonts/package.json@@ -26,7 +26,7 @@"@webstudio-is/tsconfig": "workspace:^","jest": "^29.3.1","typescript": "5.0.3",- "zod": "^3.19.1"+ "zod": "^3.21.4"},"peerDependencies": {"zod": "^3.19.1"diff --git a/packages/generate-arg-types/package.json b/packages/generate-arg-types/package.jsonindex d93e9d3ab7..d4ad195201 100644--- a/packages/generate-arg-types/package.json+++ b/packages/generate-arg-types/package.json@@ -18,7 +18,7 @@"fast-glob": "^3.2.12","fs-extra": "^10.1.0","react-docgen-typescript": "^2.2.2",- "zod": "^3.19.1"+ "zod": "^3.21.4"},"devDependencies": {"@webstudio-is/scripts": "workspace:^",diff --git a/packages/icons/icons/check-circle.svg b/packages/icons/icons/check-circle.svgnew file mode 100644index 0000000000..80a6f60850--- /dev/null+++ b/packages/icons/icons/check-circle.svg@@ -0,0 +1,4 @@+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <path fill-rule="evenodd" clip-rule="evenodd" d="M8.00002 1.98311C4.6771 1.98311 1.98335 4.67686 1.98335 7.99977C1.98335 11.3227 4.6771 14.0164 8.00002 14.0164C11.3229 14.0164 14.0167 11.3227 14.0167 7.99977C14.0167 4.67686 11.3229 1.98311 8.00002 1.98311ZM0.68335 7.99977C0.68335 3.95889 3.95913 0.683105 8.00002 0.683105C12.0409 0.683105 15.3167 3.95889 15.3167 7.99977C15.3167 12.0407 12.0409 15.3164 8.00002 15.3164C3.95913 15.3164 0.68335 12.0407 0.68335 7.99977Z"/>+ <path fill-rule="evenodd" clip-rule="evenodd" d="M11.5657 5.35718C11.8781 5.6696 11.8781 6.17613 11.5657 6.48855L7.41185 10.6424C7.26183 10.7924 7.05834 10.8767 6.84617 10.8767C6.634 10.8767 6.43051 10.7924 6.28048 10.6424L4.43433 8.79625C4.12191 8.48383 4.12191 7.9773 4.43433 7.66488C4.74675 7.35246 5.25328 7.35246 5.5657 7.66488L6.84617 8.94535L10.4343 5.35718C10.7467 5.04476 11.2533 5.04476 11.5657 5.35718Z" />+</svg>diff --git a/packages/icons/icons/copy.svg b/packages/icons/icons/copy.svgnew file mode 100644index 0000000000..27e69d4dde--- /dev/null+++ b/packages/icons/icons/copy.svg@@ -0,0 +1,3 @@+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.49534 1.3501H12.1046C12.4196 1.35009 12.6942 1.35007 12.9211 1.36861C13.1614 1.38824 13.4046 1.43187 13.6399 1.55174C13.988 1.7291 14.271 2.01212 14.4483 2.36022C14.5682 2.59547 14.6118 2.83871 14.6315 3.07901C14.65 3.30583 14.65 3.58049 14.65 3.89546V8.50473C14.65 8.81971 14.65 9.09437 14.6315 9.32119C14.6118 9.56149 14.5682 9.80473 14.4483 10.04C14.271 10.3881 13.988 10.6711 13.6399 10.8485C13.4046 10.9683 13.1614 11.012 12.9211 11.0316C12.6942 11.0501 12.4196 11.0501 12.1046 11.0501H11.05V12.1047C11.05 12.4197 11.05 12.6944 11.0315 12.9212C11.0118 13.1615 10.9682 13.4047 10.8483 13.64C10.671 13.9881 10.388 14.2711 10.0399 14.4485C9.80461 14.5683 9.56137 14.612 9.32107 14.6316C9.09425 14.6501 8.81959 14.6501 8.50461 14.6501H3.89534C3.58037 14.6501 3.30571 14.6501 3.07889 14.6316C2.83859 14.612 2.59535 14.5683 2.36009 14.4485C2.012 14.2711 1.72898 13.9881 1.55161 13.64C1.43175 13.4047 1.38812 13.1615 1.36848 12.9212C1.34995 12.6944 1.34996 12.4197 1.34998 12.1047V7.49546C1.34996 7.18049 1.34995 6.90583 1.36848 6.67901C1.38812 6.43871 1.43175 6.19547 1.55161 5.96022C1.72898 5.61212 2.01199 5.3291 2.36009 5.15174C2.59535 5.03187 2.83859 4.98824 3.07889 4.96861C3.3057 4.95008 3.58036 4.95009 3.89533 4.9501L4.94998 4.9501L4.94998 3.89545C4.94996 3.58048 4.94995 3.30583 4.96848 3.07901C4.98812 2.83871 5.03175 2.59547 5.15162 2.36022C5.32898 2.01212 5.61199 1.7291 5.96009 1.55174C6.19535 1.43187 6.43859 1.38824 6.67889 1.36861C6.9057 1.35007 7.18036 1.35009 7.49534 1.3501ZM3.91998 6.2501C3.57322 6.2501 3.35224 6.2506 3.18475 6.26429C3.02484 6.27735 2.97172 6.29912 2.95028 6.31005C2.84679 6.36278 2.76265 6.44692 2.70992 6.5504C2.699 6.57185 2.67723 6.62497 2.66417 6.78487C2.65048 6.95237 2.64998 7.17334 2.64998 7.5201V12.0801C2.64998 12.4269 2.65048 12.6478 2.66417 12.8153C2.67723 12.9752 2.699 13.0284 2.70992 13.0498C2.76265 13.1533 2.84679 13.2374 2.95028 13.2902C2.97172 13.3011 3.02484 13.3228 3.18475 13.3359C3.35224 13.3496 3.57322 13.3501 3.91998 13.3501H8.47998C8.82673 13.3501 9.04771 13.3496 9.2152 13.3359C9.37511 13.3228 9.42823 13.3011 9.44967 13.2902C9.55316 13.2374 9.6373 13.1533 9.69003 13.0498C9.70096 13.0284 9.72272 12.9752 9.73579 12.8153C9.74947 12.6478 9.74998 12.4269 9.74998 12.0801V7.5201C9.74998 7.17334 9.74947 6.95237 9.73579 6.78487C9.72272 6.62497 9.70096 6.57185 9.69003 6.5504C9.6373 6.44692 9.55316 6.36278 9.44967 6.31005C9.42823 6.29912 9.37511 6.27735 9.2152 6.26429C9.04771 6.2506 8.82673 6.2501 8.47998 6.2501H3.91998ZM11.05 9.7501V7.49546C11.05 7.18049 11.05 6.90583 11.0315 6.67901C11.0118 6.43871 10.9682 6.19547 10.8483 5.96022C10.671 5.61212 10.388 5.3291 10.0399 5.15174C9.80461 5.03187 9.56137 4.98824 9.32107 4.96861C9.09425 4.95008 8.81959 4.95009 8.50462 4.9501L6.24998 4.9501V3.9201C6.24998 3.57334 6.25048 3.35237 6.26417 3.18487C6.27723 3.02497 6.299 2.97185 6.30992 2.9504C6.36265 2.84692 6.44679 2.76278 6.55028 2.71005C6.57172 2.69912 6.62484 2.67735 6.78475 2.66429C6.95224 2.6506 7.17322 2.6501 7.51998 2.6501H12.08C12.4267 2.6501 12.6477 2.6506 12.8152 2.66429C12.9751 2.67735 13.0282 2.69912 13.0497 2.71005C13.1532 2.76278 13.2373 2.84691 13.29 2.9504C13.301 2.97185 13.3227 3.02497 13.3358 3.18487C13.3495 3.35237 13.35 3.57334 13.35 3.9201V8.4801C13.35 8.82686 13.3495 9.04783 13.3358 9.21533C13.3227 9.37523 13.301 9.42835 13.29 9.44979C13.2373 9.55328 13.1532 9.63742 13.0497 9.69015C13.0282 9.70108 12.9751 9.72284 12.8152 9.73591C12.6477 9.74959 12.4267 9.7501 12.08 9.7501H11.05Z"/>+</svg>diff --git a/packages/icons/icons/refresh.svg b/packages/icons/icons/refresh.svgnew file mode 100644index 0000000000..73f13fbebf--- /dev/null+++ b/packages/icons/icons/refresh.svg@@ -0,0 +1,3 @@+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.8116 4.73693C10.2718 2.934 7.61888 2.42709 5.49157 3.65529C4.04778 4.48886 3.17469 5.93121 3.01053 7.47343C2.97253 7.8304 2.65235 8.08898 2.29538 8.05098C1.93842 8.01298 1.67984 7.6928 1.71783 7.33583C1.92408 5.39819 3.02271 3.57958 4.84157 2.52946C7.59674 0.93876 11.0521 1.65955 12.9622 4.09012L13.0432 3.78774C13.1362 3.44098 13.4926 3.2352 13.8393 3.32812C14.1861 3.42103 14.3919 3.77745 14.2989 4.1242L13.8109 5.94557C13.7663 6.11208 13.6574 6.25406 13.5081 6.34025C13.3588 6.42645 13.1813 6.4498 13.0148 6.40519L11.1935 5.91715C10.8467 5.82424 10.6409 5.46782 10.7338 5.12107C10.8268 4.77432 11.1832 4.56854 11.5299 4.66145L11.8116 4.73693ZM13.7042 7.94898C14.0612 7.98697 14.3198 8.30716 14.2818 8.66412C14.0755 10.6018 12.9769 12.4204 11.158 13.4705C8.40299 15.0611 4.94779 14.3405 3.03766 11.9102L2.95672 12.2122C2.86381 12.559 2.50739 12.7648 2.16064 12.6719C1.81389 12.5789 1.60811 12.2225 1.70102 11.8758L2.18905 10.0544C2.28197 9.70765 2.63839 9.50187 2.98514 9.59478L4.80651 10.0828C5.15326 10.1757 5.35904 10.5321 5.26612 10.8789C5.17321 11.2257 4.81679 11.4314 4.47004 11.3385L4.18787 11.2629C5.72766 13.0659 8.38067 13.5729 10.508 12.3447C11.9518 11.5111 12.8249 10.0687 12.9891 8.52653C13.0271 8.16956 13.3472 7.91098 13.7042 7.94898Z"/>+</svg>diff --git a/packages/icons/src/__generated__/check-circle.tsx b/packages/icons/src/__generated__/check-circle.tsxnew file mode 100644index 0000000000..fbaeee751b--- /dev/null+++ b/packages/icons/src/__generated__/check-circle.tsx@@ -0,0 +1,15 @@+// Generated from icons/check-circle.svg++import { forwardRef } from "react";+import type { IconProps } from "../types";++// prettier-ignore+export const CheckCircleIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fillRule="evenodd" d="M8 1.983a6.017 6.017 0 1 0 0 12.033A6.017 6.017 0 0 0 8 1.983ZM.683 8a7.317 7.317 0 1 1 14.634 0A7.317 7.317 0 0 1 .683 8Z" clipRule="evenodd" /><path fillRule="evenodd" d="M11.566 5.357a.8.8 0 0 1 0 1.132l-4.154 4.153a.8.8 0 0 1-1.132 0L4.434 8.796a.8.8 0 1 1 1.132-1.131l1.28 1.28 3.588-3.588a.8.8 0 0 1 1.132 0Z" clipRule="evenodd" /></svg>+ );+ }+);++CheckCircleIcon.displayName = "CheckCircleIcon";diff --git a/packages/icons/src/__generated__/copy.tsx b/packages/icons/src/__generated__/copy.tsxnew file mode 100644index 0000000000..12a62892c6--- /dev/null+++ b/packages/icons/src/__generated__/copy.tsx@@ -0,0 +1,15 @@+// Generated from icons/copy.svg++import { forwardRef } from "react";+import type { IconProps } from "../types";++// prettier-ignore+export const CopyIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fillRule="evenodd" d="M7.495 1.35h4.61c.315 0 .59 0 .816.019.24.02.484.063.719.183.348.177.631.46.808.808.12.235.164.479.184.719.018.227.018.501.018.816v4.61c0 .315 0 .59-.018.816-.02.24-.064.484-.184.719a1.85 1.85 0 0 1-.808.809c-.235.12-.479.163-.719.183-.227.018-.501.018-.816.018H11.05v1.055c0 .315 0 .59-.019.816-.02.24-.063.484-.183.719a1.85 1.85 0 0 1-.808.808c-.235.12-.479.164-.719.184-.227.018-.501.018-.816.018h-4.61c-.315 0-.59 0-.816-.018a1.883 1.883 0 0 1-.719-.184 1.85 1.85 0 0 1-.808-.808 1.882 1.882 0 0 1-.184-.719 10.757 10.757 0 0 1-.018-.816v-4.61c0-.315 0-.59.018-.816.02-.24.064-.484.184-.719a1.85 1.85 0 0 1 .808-.808c.235-.12.479-.164.719-.183.227-.019.501-.019.816-.019H4.95V3.895c0-.315 0-.59.018-.816.02-.24.064-.484.184-.719a1.85 1.85 0 0 1 .808-.808c.235-.12.479-.164.719-.183.227-.019.501-.019.816-.019ZM3.92 6.25c-.347 0-.568 0-.735.014a.643.643 0 0 0-.235.046.55.55 0 0 0-.24.24.643.643 0 0 0-.046.235c-.014.167-.014.388-.014.735v4.56c0 .347 0 .568.014.735.013.16.035.213.046.235a.55.55 0 0 0 .24.24c.022.011.075.033.235.046.167.014.388.014.735.014h4.56c.347 0 .568 0 .735-.014a.645.645 0 0 0 .235-.046.55.55 0 0 0 .24-.24.643.643 0 0 0 .046-.235c.013-.167.014-.388.014-.735V7.52c0-.347 0-.568-.014-.735a.643.643 0 0 0-.046-.235.55.55 0 0 0-.24-.24.643.643 0 0 0-.235-.046 10.166 10.166 0 0 0-.735-.014H3.92Zm7.13 3.5V7.495c0-.315 0-.59-.019-.816a1.883 1.883 0 0 0-.183-.719 1.85 1.85 0 0 0-.808-.808 1.882 1.882 0 0 0-.719-.183c-.227-.019-.501-.019-.816-.019H6.25V3.92c0-.347 0-.568.014-.735a.643.643 0 0 1 .046-.235.55.55 0 0 1 .24-.24.643.643 0 0 1 .235-.046c.167-.013.388-.014.735-.014h4.56c.347 0 .568 0 .735.014.16.013.213.035.235.046a.55.55 0 0 1 .24.24c.011.022.033.075.046.235.014.167.014.388.014.735v4.56c0 .347 0 .568-.014.735-.013.16-.035.213-.046.235a.55.55 0 0 1-.24.24.644.644 0 0 1-.235.046c-.167.014-.388.014-.735.014h-1.03Z" clipRule="evenodd" /></svg>+ );+ }+);++CopyIcon.displayName = "CopyIcon";diff --git a/packages/icons/src/__generated__/index.ts b/packages/icons/src/__generated__/index.tsindex 9eb84f1d68..38809414a5 100644--- a/packages/icons/src/__generated__/index.ts+++ b/packages/icons/src/__generated__/index.ts@@ -38,6 +38,7 @@ export * from "./bp-star-off";export * from "./bp-star-on";export * from "./bug";export * from "./button-element";+export * from "./check-circle";export * from "./checkbox-checked-filled";export * from "./checkbox-checked";export * from "./checkbox-empty";@@ -52,6 +53,7 @@ export * from "./chevron-filled-right";export * from "./chevron-filled-up";export * from "./code-text";export * from "./commit";+export * from "./copy";export * from "./dash-border";export * from "./dash";export * from "./dashed-border";@@ -101,6 +103,7 @@ export * from "./play";export * from "./plus";export * from "./radio-checked";export * from "./radio-unchecked";+export * from "./refresh";export * from "./repeat-column";export * from "./repeat-grid";export * from "./repeat-row";diff --git a/packages/icons/src/__generated__/refresh.tsx b/packages/icons/src/__generated__/refresh.tsxnew file mode 100644index 0000000000..8db984882e--- /dev/null+++ b/packages/icons/src/__generated__/refresh.tsx@@ -0,0 +1,15 @@+// Generated from icons/refresh.svg++import { forwardRef } from "react";+import type { IconProps } from "../types";++// prettier-ignore+export const RefreshIcon = forwardRef<SVGSVGElement, IconProps>(+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {+ return (+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fillRule="evenodd" d="M11.812 4.737A5.018 5.018 0 0 0 3.01 7.473a.65.65 0 1 1-1.293-.137A6.318 6.318 0 0 1 12.962 4.09l.081-.302a.65.65 0 0 1 1.256.336l-.488 1.822a.65.65 0 0 1-.796.46l-1.822-.489a.65.65 0 1 1 .337-1.256l.282.076Zm1.892 3.212a.65.65 0 0 1 .578.715A6.318 6.318 0 0 1 3.038 11.91l-.081.302a.65.65 0 1 1-1.256-.336l.488-1.822a.65.65 0 0 1 .796-.46l1.822.489a.65.65 0 1 1-.337 1.255l-.282-.075a5.018 5.018 0 0 0 8.801-2.736.65.65 0 0 1 .715-.578Z" clipRule="evenodd" /></svg>+ );+ }+);++RefreshIcon.displayName = "RefreshIcon";diff --git a/packages/icons/src/copy.tsx b/packages/icons/src/copy.tsxdeleted file mode 100644index 1a2b3e09b5..0000000000--- a/packages/icons/src/copy.tsx+++ /dev/null@@ -1,28 +0,0 @@-import * as React from "react";-import type { IconProps } from "./types";--export const CopyIcon = React.forwardRef<SVGSVGElement, IconProps>(- ({ color = "currentColor", ...props }, forwardedRef) => {- return (- <svg- width="16"- height="16"- viewBox="0 0 16 16"- fill="none"- xmlns="http://www.w3.org/2000/svg"- {...props}- ref={forwardedRef}- >- <path- d="M5.6 5.6V3.92C5.6 3.24794 5.6 2.91191 5.73079 2.65521C5.84584 2.42942 6.02942 2.24584 6.25521 2.13079C6.51191 2 6.84794 2 7.52 2H12.08C12.7521 2 13.0881 2 13.3448 2.13079C13.5706 2.24584 13.7542 2.42942 13.8692 2.65521C14 2.91191 14 3.24794 14 3.92V8.48C14 9.15206 14 9.4881 13.8692 9.74479C13.7542 9.97058 13.5706 10.1542 13.3448 10.2692C13.0881 10.4 12.7521 10.4 12.08 10.4H10.4M3.92 14H8.48C9.15206 14 9.48809 14 9.74479 13.8692C9.97058 13.7542 10.1542 13.5706 10.2692 13.3448C10.4 13.0881 10.4 12.7521 10.4 12.08V7.52C10.4 6.84794 10.4 6.51191 10.2692 6.25521C10.1542 6.02942 9.97058 5.84584 9.74479 5.73079C9.48809 5.6 9.15206 5.6 8.48 5.6H3.92C3.24794 5.6 2.91191 5.6 2.65521 5.73079C2.42942 5.84584 2.24584 6.02942 2.13079 6.25521C2 6.51191 2 6.84794 2 7.52V12.08C2 12.7521 2 13.0881 2.13079 13.3448C2.24584 13.5706 2.42942 13.7542 2.65521 13.8692C2.91191 14 3.24794 14 3.92 14Z"- stroke={color}- strokeWidth="1.3"- strokeLinecap="round"- strokeLinejoin="round"- />- </svg>- );- }-);--CopyIcon.displayName = "CopyIcon";diff --git a/packages/icons/src/index.ts b/packages/icons/src/index.tsindex 0a1ceaa5fe..a683c3d0c4 100644--- a/packages/icons/src/index.ts+++ b/packages/icons/src/index.ts@@ -15,7 +15,6 @@ export * from "./trash";export * from "./size";export * from "./upload";export * from "./gear";-export * from "./copy";export * from "./new-page";export * from "./new-folder";export * from "./chevron-double-up";diff --git a/packages/prisma-client/package.json b/packages/prisma-client/package.jsonindex 7a43748fab..b266338e7b 100644--- a/packages/prisma-client/package.json+++ b/packages/prisma-client/package.json@@ -26,7 +26,7 @@"prisma": "^4.14.0","tsx": "^3.12.6","typescript": "5.0.3",- "zod": "^3.19.1"+ "zod": "^3.21.4"},"exports": {"source": "./src/index.ts",diff --git a/packages/prisma-client/prisma/migrations/20230517150043_domain/migration.sql b/packages/prisma-client/prisma/migrations/20230517150043_domain/migration.sqlnew file mode 100644index 0000000000..c0b52c3ecc--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20230517150043_domain/migration.sql@@ -0,0 +1,59 @@+-- CreateEnum+CREATE TYPE "DomainStatus" AS ENUM ('INITIALIZING', 'ACTIVE', 'ERROR', 'PENDING');++-- CreateTable+CREATE TABLE "Domain" (+ "id" TEXT NOT NULL,+ "domain" TEXT NOT NULL,+ "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,+ "txtRecord" TEXT,+ "status" "DomainStatus" NOT NULL DEFAULT 'INITIALIZING',+ "error" TEXT,++ CONSTRAINT "Domain_pkey" PRIMARY KEY ("id")+);++-- CreateTable+CREATE TABLE "ProjectDomain" (+ "projectId" TEXT NOT NULL,+ "domainId" TEXT NOT NULL,+ "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,+ "txtRecord" TEXT NOT NULL,+ "cname" TEXT NOT NULL,++ CONSTRAINT "ProjectDomain_pkey" PRIMARY KEY ("projectId","domainId")+);++-- CreateIndex+CREATE UNIQUE INDEX "Domain_domain_key" ON "Domain"("domain");++-- CreateIndex+CREATE UNIQUE INDEX "ProjectDomain_txtRecord_key" ON "ProjectDomain"("txtRecord");++-- CreateIndex+CREATE INDEX "ProjectDomain_domainId_idx" ON "ProjectDomain"("domainId");++-- AddForeignKey+ALTER TABLE "ProjectDomain" ADD CONSTRAINT "ProjectDomain_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE RESTRICT ON UPDATE CASCADE;++-- AddForeignKey+ALTER TABLE "ProjectDomain" ADD CONSTRAINT "ProjectDomain_domainId_fkey" FOREIGN KEY ("domainId") REFERENCES "Domain"("id") ON DELETE RESTRICT ON UPDATE CASCADE;+++-- CreateView+CREATE VIEW "ProjectWithDomain" AS+SELECT+ pd."projectId",+ pd."domainId",+ pd."txtRecord",+ pd."cname",+ pd."createdAt",+ -- any DNS txt record change would cause verified to be changed immediately+ coalesce(pd."txtRecord" = d."txtRecord", false) AS verified,+ -- domains count per user+ p."userId"+FROM+ "ProjectDomain" pd+ LEFT JOIN "Domain" d ON pd."domainId" = d.id+ LEFT JOIN "Project" p ON pd."projectId" = p.id;+diff --git a/packages/prisma-client/prisma/schema.prisma b/packages/prisma-client/prisma/schema.prismaindex 1f882a563b..d42fe3cfd4 100644--- a/packages/prisma-client/prisma/schema.prisma+++ b/packages/prisma-client/prisma/schema.prisma@@ -76,15 +76,16 @@ model User {}model Project {- id String @id @default(uuid())- createdAt DateTime @default(now())- title String- domain String @unique- user User? @relation(fields: [userId], references: [id])- userId String?- build Build[]- isDeleted Boolean @default(false)- files File[]+ id String @id @default(uuid())+ createdAt DateTime @default(now())+ title String+ domain String @unique+ user User? @relation(fields: [userId], references: [id])+ userId String?+ build Build[]+ isDeleted Boolean @default(false)+ files File[]+ ProjectDomain ProjectDomain[]@@unique([id, isDeleted])@@unique([domain, isDeleted])@@ -128,6 +129,64 @@ model AuthorizationToken {@@id([token, projectId])}+enum DomainStatus {+ INITIALIZING+ ACTIVE+ ERROR+ PENDING+}++// Domains + last known status and last known txtRecord+// In the future we can update this table using queue, n8n or temporal workflows.+// As of now updates are done during UI interactions+model Domain {+ id String @id @default(uuid())+ domain String @unique+ createdAt DateTime @default(now())+ ProjectDomain ProjectDomain[]+ // Last known txtRecord of the domain (to check domain ownership)+ txtRecord String?+ // create, init, pending, active, error+ status DomainStatus @default(INITIALIZING)+ // In case of status="error", this will contain the error message+ error String?+ projectWithDomain ProjectWithDomain[]+}++model ProjectDomain {+ projectId String+ project Project @relation(fields: [projectId], references: [id])+ domainId String+ domain Domain @relation(fields: [domainId], references: [id])+ createdAt DateTime @default(now())+ // Generated txt record to check domain ownership+ txtRecord String @unique @default(uuid())++ // CNAME record to point to the domain+ cname String++ @@id([projectId, domainId])+ @@index([domainId])+}++view ProjectWithDomain {+ projectId String+ domainId String+ domain Domain @relation(fields: [domainId], references: [id])+ txtRecord String++ createdAt DateTime++ // CNAME record to point to the domain+ cname String++ verified Boolean+ // To count statistics per user+ userId String?++ @@id([projectId, domainId])+}+// Dashboardview DashboardProject {id String @id @default(uuid())diff --git a/packages/prisma-client/src/prisma.ts b/packages/prisma-client/src/prisma.tsindex 37cc22c787..252ee7ff61 100644--- a/packages/prisma-client/src/prisma.ts+++ b/packages/prisma-client/src/prisma.ts@@ -14,29 +14,35 @@ declare global {| undefined;}+const logPrisma = process.env.NODE_ENV === "production";+// this fixes the issue with `warn(prisma-client) There are already 10 instances of Prisma Client actively running.`// explanation here// https://www.prisma.io/docs/guides/database/troubleshooting-orm/help-articles/nextjs-prisma-client-dev-practicesexport const prisma =global.prisma ||- new PrismaClient({- log: [- { emit: "event", level: "query" },+ new PrismaClient(+ logPrisma+ ? {+ log: [+ { emit: "event", level: "query" },- {- emit: "stdout",- level: "error",- },- {- emit: "stdout",- level: "info",- },- {- emit: "stdout",- level: "warn",- },- ],- });+ {+ emit: "stdout",+ level: "error",+ },+ {+ emit: "stdout",+ level: "info",+ },+ {+ emit: "stdout",+ level: "warn",+ },+ ],+ }+ : {}+ );prisma.$on("query", (e) => {// Try to minify the query as vercel/new relic log size is limiteddiff --git a/packages/prisma-client/src/types.ts b/packages/prisma-client/src/types.tsindex 6a96699288..33a38c5255 100644--- a/packages/prisma-client/src/types.ts+++ b/packages/prisma-client/src/types.ts@@ -8,4 +8,6 @@ export type {DashboardProject,AuthorizationRelation,AuthorizationToken,+ DomainStatus,+ Domain,} from "./__generated__";diff --git a/packages/project-build/package.json b/packages/project-build/package.jsonindex 3aaa5f5a3b..f77e832a83 100644--- a/packages/project-build/package.json+++ b/packages/project-build/package.json@@ -38,7 +38,7 @@"@webstudio-is/prisma-client": "workspace:^","@webstudio-is/trpc-interface": "workspace:^","nanoid": "^3.2.0",- "zod": "^3.19.1"+ "zod": "^3.21.4"},"devDependencies": {"@jest/globals": "^29.3.1",@@ -46,6 +46,7 @@"@webstudio-is/scripts": "workspace:^","@webstudio-is/tsconfig": "workspace:^","jest": "^29.3.1",- "typescript": "5.0.3"+ "typescript": "5.0.3",+ "type-fest": "^3.7.1"}}diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.tsindex 91509158d4..69a3b67899 100644--- a/packages/project-build/src/db/build.ts+++ b/packages/project-build/src/db/build.ts@@ -6,7 +6,11 @@ import {prisma,Prisma,} from "@webstudio-is/prisma-client";-import type { AppContext } from "@webstudio-is/trpc-interface/index.server";+import {+ AuthorizationError,+ authorizeProject,+ type AppContext,+} from "@webstudio-is/trpc-interface/index.server";import type { Build } from "../types";import { Pages } from "../schema/pages";import {@@ -215,3 +219,31 @@ export async function createBuild(},});}++export const createProductionBuild = async (+ props: {+ projectId: Build["projectId"];+ },+ context: AppContext+) => {+ const canBuild = await authorizeProject.hasProjectPermit(+ { projectId: props.projectId, permit: "build" },+ context+ );++ if (canBuild === false) {+ throw new AuthorizationError("You don't have access to build this project");+ }++ // @todo: This is highly unoptimal and on a big project would take few seconds of CPU time.+ // we need just duplicate row from dev build and change isDev to false and isProd to true+ const devBuild = await loadBuildByProjectId(props.projectId, "dev");++ await prisma.$transaction(async (client) => {+ await createBuild(+ { projectId: props.projectId, env: "prod", sourceBuild: devBuild },+ context,+ client+ );+ });+};diff --git a/packages/project-build/src/schema/styles.ts b/packages/project-build/src/schema/styles.tsindex 89c97b8b39..644690408c 100644--- a/packages/project-build/src/schema/styles.ts+++ b/packages/project-build/src/schema/styles.ts@@ -1,16 +1,22 @@import { z } from "zod";import { type StyleProperty, StyleValue } from "@webstudio-is/css-data";+import type { Simplify } from "type-fest";-export const StyleDecl = z.object({+const StyleDeclRaw = z.object({styleSourceId: z.string(),breakpointId: z.string(),state: z.optional(z.string()),// @todo can't figure out how to make property to be enum- property: z.string() as z.ZodType<StyleProperty>,+ property: z.string(),value: StyleValue,});-export type StyleDecl = z.infer<typeof StyleDecl>;+export type StyleDecl = Simplify<+ Omit<z.infer<typeof StyleDeclRaw>, "property"> & {+ property: StyleProperty;+ }+>;+export const StyleDecl = StyleDeclRaw as z.ZodType<StyleDecl>;export type StyleDeclKey = string;@@ -26,6 +32,6 @@ export const StylesList = z.array(StyleDecl);export type StylesList = z.infer<typeof StylesList>;-export const Styles = z.map(z.string() as z.ZodType<StyleDeclKey>, StyleDecl);+export const Styles = z.map(z.string(), StyleDecl);-export type Styles = z.infer<typeof Styles>;+export type Styles = Map<string, StyleDecl>;diff --git a/packages/project/package.json b/packages/project/package.jsonindex 1ed5e3a4ed..5dc8a956aa 100644--- a/packages/project/package.json+++ b/packages/project/package.json@@ -22,7 +22,7 @@"nanoid": "^3.2.0","slugify": "^1.6.5","uuid": "^9.0.0",- "zod": "^3.19.1"+ "zod": "^3.21.4"},"devDependencies": {"@types/uuid": "^8.3.4",diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.jsonindex bef256a313..7a946569e3 100644--- a/packages/react-sdk/package.json+++ b/packages/react-sdk/package.json@@ -32,7 +32,8 @@"react": "^18.2.0","react-dom": "^18.2.0","typescript": "5.0.3",- "zod": "^3.19.1"+ "type-fest": "^3.7.1",+ "zod": "^3.21.4"},"peerDependencies": {"@remix-run/react": "^1.15.0",diff --git a/packages/react-sdk/src/embed-template.ts b/packages/react-sdk/src/embed-template.tsindex 963dbbe0f4..85eaebd3d6 100644--- a/packages/react-sdk/src/embed-template.ts+++ b/packages/react-sdk/src/embed-template.ts@@ -10,6 +10,7 @@ import {Breakpoint,} from "@webstudio-is/project-build";import { StyleValue, type StyleProperty } from "@webstudio-is/css-data";+import type { Simplify } from "type-fest";const EmbedTemplateText = z.object({type: z.literal("text"),@@ -43,13 +44,20 @@ const EmbedTemplateProp = z.union([type EmbedTemplateProp = z.infer<typeof EmbedTemplateProp>;-export const EmbedTemplateStyleDecl = z.object({+const EmbedTemplateStyleDeclRaw = z.object({state: z.optional(z.string()),- property: z.string() as z.ZodType<StyleProperty>,+ property: z.string(),value: StyleValue,});-export type EmbedTemplateStyleDecl = z.infer<typeof EmbedTemplateStyleDecl>;+export type EmbedTemplateStyleDecl = Simplify<+ Omit<z.infer<typeof EmbedTemplateStyleDeclRaw>, "property"> & {+ property: StyleProperty;+ }+>;++export const EmbedTemplateStyleDecl =+ EmbedTemplateStyleDeclRaw as z.ZodType<EmbedTemplateStyleDecl>;export type EmbedTemplateInstance = {type: "instance";diff --git a/packages/trpc-interface/package.json b/packages/trpc-interface/package.jsonindex 3851bb49db..bbd572676e 100644--- a/packages/trpc-interface/package.json+++ b/packages/trpc-interface/package.json@@ -21,7 +21,7 @@"node-fetch": "2","ts-custom-error": "^3.3.1","uuid": "^9.0.0",- "zod": "^3.19.1"+ "zod": "^3.21.4"},"devDependencies": {"@types/node": "^18.11.18",diff --git a/packages/trpc-interface/src/context/context.server.ts b/packages/trpc-interface/src/context/context.server.tsindex fcc0d9b3c7..345c7f5337 100644--- a/packages/trpc-interface/src/context/context.server.ts+++ b/packages/trpc-interface/src/context/context.server.ts@@ -23,6 +23,17 @@ type AuthorizationContext = {authorizeTrpc: TrpcInterfaceClient["authorize"];};+type DomainContext = {+ domainTrpc: TrpcInterfaceClient["domain"];+ domainEnv: {+ PUBLISHER_TOKEN: string;+ PUBLISHER_ENDPOINT?: string;+ BUILDER_ORIGIN: string;+ // @todo remove and get from the /rest/project endpoint+ BRANCH_NAME?: string;+ };+};+/*** AppContext is a global context that is passed to all trpc/api queries/mutations* "authorization" is made inside the namespace because eventually there will be@@ -30,4 +41,5 @@ type AuthorizationContext = {*/export type AppContext = {authorization: AuthorizationContext;+ domain: DomainContext;};diff --git a/packages/trpc-interface/src/shared/domain.ts b/packages/trpc-interface/src/shared/domain.tsnew file mode 100644index 0000000000..4fd027fcf7--- /dev/null+++ b/packages/trpc-interface/src/shared/domain.ts@@ -0,0 +1,117 @@+/**+ * Localhost implementation of the dashboard trpc interface+ * It's playground, and just emulates real 3rd party apis+ */+import { z } from "zod";+import { router, procedure } from "./trpc";++const CreateInput = z.object({ domain: z.string(), txtRecord: z.string() });+const Input = z.object({ domain: z.string() });++const createOutput = <T extends z.ZodType>(data: T) =>+ z.discriminatedUnion("success", [+ z.object({ success: z.literal(true), data }),+ z.object({ success: z.literal(false), error: z.string() }),+ ]);++declare global {+ // eslint-disable-next-line no-var+ var dnsTxtEntries: Map<string, string>;+ // eslint-disable-next-line no-var+ var domainStates: Map<string, "active" | "pending" | "error">;+}++// Remix purges require module cache on every request in development,+// this is the way to persist data between requests in development+globalThis.dnsTxtEntries =+ globalThis.dnsTxtEntries ?? new Map<string, string>();+globalThis.domainStates =+ globalThis.domainStates ?? new Map<string, "active" | "pending">();++export const domainRouter = router({+ /**+ * Verify TXT record and add custom domain entry to DNS+ */+ create: procedure+ .input(CreateInput)+ .output(createOutput(z.optional(z.undefined())))+ .mutation(async ({ input, ctx }) => {+ const record = dnsTxtEntries.get(input.domain);+ if (record !== input.txtRecord) {+ // Return an error once then update the record+ dnsTxtEntries.set(input.domain, input.txtRecord);++ return {+ success: false,+ error: `TXT record does not match, expected "${+ input.txtRecord+ }" but got "${record ?? "undefined"}"`,+ };+ }++ domainStates.set(input.domain, "pending");++ return { success: true };+ }),++ refresh: procedure+ .input(Input)+ .output(createOutput(z.optional(z.undefined())))+ .mutation(async ({ input, ctx }) => {+ return { success: true };+ }),+ /**+ * Get status of verified domain+ */+ getStatus: procedure+ .input(Input)+ .output(+ createOutput(+ z.discriminatedUnion("status", [+ z.object({ status: z.enum(["active", "pending"]) }),+ z.object({ status: z.enum(["error"]), error: z.string() }),+ ])+ )+ )+ .query(async ({ input, ctx }) => {+ const domainState = domainStates.get(input.domain);++ if (domainState === undefined) {+ domainStates.set(input.domain, "pending");++ return {+ success: false,+ error: `Domain ${input.domain} is not active`,+ };+ }++ if (domainState === "active") {+ setTimeout(() => {+ domainStates.set(input.domain, "error");+ });+ }++ if (domainState === "pending" || domainState === "error") {+ setTimeout(() => {+ domainStates.set(input.domain, "active");+ }, 5000);+ }++ if (domainState === "error") {+ return {+ success: true,+ data: {+ status: "error",+ error: "Domain cname verification failed",+ },+ };+ }++ return {+ success: true,+ data: {+ status: domainState,+ },+ };+ }),+});diff --git a/packages/trpc-interface/src/shared/shared-router.ts b/packages/trpc-interface/src/shared/shared-router.tsindex bf0980dc83..8ec8a5d886 100644--- a/packages/trpc-interface/src/shared/shared-router.ts+++ b/packages/trpc-interface/src/shared/shared-router.ts@@ -1,9 +1,11 @@import type { createTRPCProxyClient } from "@trpc/client";import { router } from "./trpc";import { authorizationRouter } from "./authorization-router";+import { domainRouter } from "./domain";export const sharedRouter = router({authorize: authorizationRouter,+ domain: domainRouter,});export type SharedRouter = typeof sharedRouter;diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 09d1db5ce4..2b5ab2f321 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -131,6 +131,9 @@ importers:'@webstudio-is/design-system':specifier: workspace:^version: link:../../packages/design-system+ '@webstudio-is/domain':+ specifier: workspace:^+ version: link:../../packages/domain'@webstudio-is/feature-flags':specifier: workspace:^version: link:../../packages/feature-flags@@ -261,11 +264,8 @@ importers:specifier: ^0.1.1version: 0.1.1zod:- specifier: ^3.19.1- version: 3.19.1- zod-form-data:- specifier: ^1.2.1- version: 1.2.1([email protected])+ specifier: ^3.21.4+ version: 3.21.4devDependencies:'@babel/core':specifier: ^7.21.0@@ -395,8 +395,8 @@ importers:specifier: 5.0.3version: 5.0.3zod:- specifier: ^3.19.1- version: 3.19.1+ specifier: ^3.21.4+ version: 3.21.4packages/authorization-token:dependencies:@@ -407,8 +407,8 @@ importers:specifier: workspace:^version: link:../trpc-interfacezod:- specifier: ^3.19.1- version: 3.19.1+ specifier: ^3.21.4+ version: 3.21.4devDependencies:'@jest/globals':specifier: ^29.3.1@@ -478,8 +478,8 @@ importers:specifier: 5.0.3version: 5.0.3zod:- specifier: ^3.19.1- version: 3.19.1+ specifier: ^3.21.4+ version: 3.21.4packages/css-engine:dependencies:@@ -557,8 +557,8 @@ importers:specifier: workspace:^version: link:../trpc-interfacezod:- specifier: ^3.19.1- version: 3.19.1+ specifier: ^3.21.4+ version: 3.21.4devDependencies:'@jest/globals':specifier: ^29.3.1@@ -757,6 +757,43 @@ importers:specifier: 5.0.3version: 5.0.3+ packages/domain:+ dependencies:+ '@webstudio-is/prisma-client':+ specifier: workspace:^+ version: link:../prisma-client+ '@webstudio-is/project':+ specifier: workspace:^+ version: link:../project+ '@webstudio-is/project-build':+ specifier: workspace:^+ version: link:../project-build+ '@webstudio-is/trpc-interface':+ specifier: workspace:^+ version: link:../trpc-interface+ zod:+ specifier: ^3.21.4+ version: 3.21.4+ devDependencies:+ '@jest/globals':+ specifier: ^29.3.1+ version: 29.3.1+ '@webstudio-is/jest-config':+ specifier: workspace:^+ version: link:../jest-config+ '@webstudio-is/scripts':+ specifier: workspace:^+ version: link:../scripts+ '@webstudio-is/tsconfig':+ specifier: workspace:^+ version: link:../tsconfig+ jest:+ specifier: ^29.3.1+ version: 29.3.1(@types/[email protected])+ typescript:+ specifier: 5.0.3+ version: 5.0.3+packages/eslint-config-custom:dependencies:'@typescript-eslint/eslint-plugin':@@ -827,8 +864,8 @@ importers:specifier: 5.0.3version: 5.0.3zod:- specifier: ^3.19.1- version: 3.19.1+ specifier: ^3.21.4+ version: 3.21.4packages/form-handlers:dependencies:@@ -889,8 +926,8 @@ importers:specifier: ^2.2.2version: 2.2.2([email protected])zod:- specifier: ^3.19.1- version: 3.19.1+ specifier: ^3.21.4+ version: 3.21.4devDependencies:'@webstudio-is/scripts':specifier: workspace:^@@ -1086,8 +1123,8 @@ importers:specifier: 5.0.3version: 5.0.3zod:- specifier: ^3.19.1- version: 3.19.1+ specifier: ^3.21.4+ version: 3.21.4packages/project:dependencies:@@ -1116,8 +1153,8 @@ importers:specifier: ^9.0.0version: 9.0.0zod:- specifier: ^3.19.1- version: 3.19.1+ specifier: ^3.21.4+ version: 3.21.4devDependencies:'@types/uuid':specifier: ^8.3.4@@ -1147,8 +1184,8 @@ importers:specifier: ^3.2.0version: 3.3.4zod:- specifier: ^3.19.1- version: 3.19.1+ specifier: ^3.21.4+ version: 3.21.4devDependencies:'@jest/globals':specifier: ^29.3.1@@ -1165,6 +1202,9 @@ importers:jest:specifier: ^29.3.1version: 29.3.1(@types/[email protected])+ type-fest:+ specifier: ^3.7.1+ version: 3.7.1typescript:specifier: 5.0.3version: 5.0.3@@ -1265,12 +1305,15 @@ importers:react-dom:specifier: 18.2.0version: 18.2.0([email protected])+ type-fest:+ specifier: ^3.7.1+ version: 3.7.1typescript:specifier: 5.0.3version: 5.0.3zod:- specifier: ^3.19.1- version: 3.19.1+ specifier: ^3.21.4+ version: 3.21.4packages/scripts:dependencies:@@ -1391,8 +1434,8 @@ importers:specifier: ^9.0.0version: 9.0.0zod:- specifier: ^3.19.1- version: 3.19.1+ specifier: ^3.21.4+ version: 3.21.4devDependencies:'@types/node':specifier: ^18.11.18@@ -20132,16 +20175,8 @@ packages:stack-trace: 0.0.10dev: true- resolution: {integrity: sha512-L4zocmlzikYB9A2uVVj3OUKX/t3spOZTzQLOhoCXECn9w+eN3bw0D/KYGX4J72iLdCIwDP6YJyYwVXkx3WTu7A==}- peerDependencies:- zod: ^3.11.x- dependencies:- zod: 3.19.1- dev: false-- resolution: {integrity: sha512-LYjZsEDhCdYET9ikFu6dVPGp2YH9DegXjdJToSzD9rO6fy4qiRYFoyEYwps88OseJlPyl2NOe2iJuhEhL7IpEA==}+ resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==}resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}