Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
feat: Rename Site to Project because we are not just building a site builder (#2718)
Oleg Isonen5930064678a3
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex fe029aed88..2b7382e619 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -48,7 +48,7 @@ import { useSyncPageUrl } from "~/shared/pages";import { useMount } from "~/shared/hook-utils/use-mount";import { subscribeCommands } from "~/builder/shared/commands";import { AiCommandBar } from "./features/ai/ai-command-bar";-import { SiteSettings } from "./features/seo/site-settings";+import { ProjectSettings } from "./features/seo/project-settings";import type { UserPlanFeatures } from "~/shared/db/user-plan-features.server";registerContainers();@@ -307,7 +307,7 @@ export const Builder = ({return (<TooltipProvider><ChromeWrapper isPreviewMode={isPreviewMode}>- <SiteSettings />+ <ProjectSettings /><TopbargridArea="header"project={project}diff --git a/apps/builder/app/builder/features/seo/project-settings.stories.tsx b/apps/builder/app/builder/features/seo/project-settings.stories.tsxnew file mode 100644index 0000000000..5971b937e0--- /dev/null+++ b/apps/builder/app/builder/features/seo/project-settings.stories.tsx@@ -0,0 +1,12 @@+import { $isProjectSettingsOpen } from "~/shared/nano-states/seo";+import { ProjectSettings } from "./project-settings";++export default {+ component: ProjectSettings,+};++$isProjectSettingsOpen.set(true);++export const ProjectSettingsExample = () => {+ return <ProjectSettings />;+};diff --git a/apps/builder/app/builder/features/seo/site-settings.tsx b/apps/builder/app/builder/features/seo/project-settings.tsxsimilarity index 87%rename from apps/builder/app/builder/features/seo/site-settings.tsxrename to apps/builder/app/builder/features/seo/project-settings.tsxindex 3225de035d..2670e0f673 100644--- a/apps/builder/app/builder/features/seo/site-settings.tsx+++ b/apps/builder/app/builder/features/seo/project-settings.tsx@@ -14,7 +14,7 @@ import {css,} from "@webstudio-is/design-system";import { useEffect, useState } from "react";-import { $isSiteSettigsOpen } from "~/shared/nano-states/seo";+import { $isProjectSettingsOpen } from "~/shared/nano-states/seo";import { ImageControl } from "./image-control";import { assetsStore, pagesStore } from "~/shared/nano-states";import env from "~/shared/env";@@ -40,7 +40,7 @@ const imgStyle = css({borderColor: theme.colors.borderMain,});-const SiteSettingsContent = (props: Props) => {+const ProjectSettingsContent = (props: Props) => {const ids = useIds(["siteName", "favicon", "code"]);const handleChange =<T extends keyof Value>(name: T) =>@@ -75,12 +75,12 @@ const SiteSettingsContent = (props: Props) => {px: theme.spacing[5],}}>- <Label htmlFor={ids.siteName}>Site Name</Label>+ <Label htmlFor={ids.siteName}>Project Name</Label><InputFieldid={ids.siteName}value={props.value.siteName ?? ""}onChange={(event) => handleChange("siteName")(event.target.value)}- placeholder="Current Site Name"+ placeholder="Current Project Name"name="Name"autoFocus/>@@ -125,7 +125,7 @@ const SiteSettingsContent = (props: Props) => {</Label><Text color="subtle">Custom code and scripts will be added at the end of the <head>- tag to every page across the published site.+ tag to every page across the published project.</Text><TextAreaid={ids.code}@@ -141,7 +141,7 @@ const SiteSettingsContent = (props: Props) => {);};-const SiteSettingsView = () => {+const ProjectSettingsView = () => {const [value, setValue] = useState(pagesStore.get()?.meta ?? {siteName: "",@@ -150,7 +150,7 @@ const SiteSettingsView = () => {});- const isOpen = useStore($isSiteSettigsOpen);+ const isOpen = useStore($isProjectSettingsOpen);const handleSave = useEffectEvent(() => {serverSyncStore.createTransaction([pagesStore], (pages) => {@@ -167,7 +167,7 @@ const SiteSettingsView = () => {open={isOpen}onOpenChange={(isOpen) => {handleSave();- $isSiteSettigsOpen.set(isOpen);+ $isProjectSettingsOpen.set(isOpen);}}><DialogContent@@ -181,21 +181,21 @@ const SiteSettingsView = () => {zIndex: theme.zIndices[1],}}>- <SiteSettingsContent value={value} onChange={setValue} />+ <ProjectSettingsContent value={value} onChange={setValue} />{/* Title is at the end intentionally,* to make the close button last in the tab order*/}- <DialogTitle>Site Settings</DialogTitle>+ <DialogTitle>Project Settings</DialogTitle></DialogContent></Dialog>);};-export const SiteSettings = () => {+export const ProjectSettings = () => {const [settingDialogLazyOpen, setSettingDialogLazyOpen] = useState(false);useEffect(() => {- return $isSiteSettigsOpen.subscribe((isOpen) => {+ return $isProjectSettingsOpen.subscribe((isOpen) => {if (isOpen) {setSettingDialogLazyOpen(true);}@@ -206,5 +206,5 @@ export const SiteSettings = () => {return null;}- return <SiteSettingsView />;+ return <ProjectSettingsView />;};diff --git a/apps/builder/app/builder/features/seo/site-settings.stories.tsx b/apps/builder/app/builder/features/seo/site-settings.stories.tsxdeleted file mode 100644index ed1f04f0f4..0000000000--- a/apps/builder/app/builder/features/seo/site-settings.stories.tsx+++ /dev/null@@ -1,12 +0,0 @@-import { $isSiteSettigsOpen } from "~/shared/nano-states/seo";-import { SiteSettings } from "./site-settings";--export default {- component: SiteSettings,-};--$isSiteSettigsOpen.set(true);--export const SiteSettingsExample = () => {- return <SiteSettings />;-};diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsxindex d8c1cd493f..ecf4468f63 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsx@@ -1,7 +1,7 @@import { pagesStore } from "~/shared/nano-states/pages";import { PageSettings } from "./settings";-import { $isSiteSettigsOpen } from "~/shared/nano-states/seo";+import { $isProjectSettingsOpen } from "~/shared/nano-states/seo";import { Grid, theme } from "@webstudio-is/design-system";import { assetsStore, projectStore } from "~/shared/nano-states";@@ -9,7 +9,7 @@ export default {component: PageSettings,};-$isSiteSettigsOpen.set(true);+$isProjectSettingsOpen.set(true);assetsStore.set(new Map([@@ -35,7 +35,7 @@ assetsStore.set(pagesStore.set({meta: {- siteName: "Site name",+ siteName: "Project name",faviconAssetId: "imageId",code: "code",},diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsxindex 2664b4b8b1..cac8a049e2 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx@@ -500,7 +500,7 @@ const FormFields = ({color={errors.title && "error"}id={fieldIds.title}name="title"- placeholder="My awesome site - About"+ placeholder="My awesome project - About"disabled={disabled}value={values.title}onChange={(event) => {@@ -558,8 +558,8 @@ const FormFields = ({<Text color="subtle">This image appears when you share a link to this page on socialmedia sites. If no image is set here, the Social Image set in the- Site Settings will be used. The optimal dimensions for the image are- 1200x630 px or larger with a 1.91:1 aspect ratio.+ Project Settings will be used. The optimal dimensions for the image+ are 1200x630 px or larger with a 1.91:1 aspect ratio.</Text><Grid gap={1} flow={"column"}><ImageControldiff --git a/apps/builder/app/builder/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/topbar/menu/menu.tsxindex b3b63f257f..0f9eecd2b5 100644--- a/apps/builder/app/builder/features/topbar/menu/menu.tsx+++ b/apps/builder/app/builder/features/topbar/menu/menu.tsx@@ -30,7 +30,7 @@ import { dashboardPath } from "~/shared/router-utils";import { $authPermit } from "~/shared/nano-states";import { emitCommand } from "~/builder/shared/commands";import { MenuButton } from "./menu-button";-import { $isSiteSettigsOpen } from "~/shared/nano-states/seo";+import { $isProjectSettingsOpen } from "~/shared/nano-states/seo";const ThemeMenuItem = () => {if (isFeatureEnabled("dark") === false) {@@ -205,10 +205,10 @@ export const Menu = () => {<Tooltip side="right" content={undefined}><DropdownMenuItemonSelect={() => {- $isSiteSettigsOpen.set(true);+ $isProjectSettingsOpen.set(true);}}>- Site Settings+ Project Settings</DropdownMenuItem></Tooltip></DropdownMenuContent>diff --git a/apps/builder/app/routes/$.tsx b/apps/builder/app/routes/$.tsxindex 6f9ce37eed..dfc05a6148 100644--- a/apps/builder/app/routes/$.tsx+++ b/apps/builder/app/routes/$.tsx@@ -59,7 +59,7 @@ const Outlet = () => {};/**- * @todo add support for published site on localhost+ * @todo add support for published project on localhost* consider switching current route to something like /canvas*/diff --git a/apps/builder/app/shared/nano-states/seo.ts b/apps/builder/app/shared/nano-states/seo.tsindex 6935a921a4..80bfc41511 100644--- a/apps/builder/app/shared/nano-states/seo.ts+++ b/apps/builder/app/shared/nano-states/seo.ts@@ -1,3 +1,3 @@import { atom } from "nanostores";-export const $isSiteSettigsOpen = atom<boolean>(false);+export const $isProjectSettingsOpen = atom<boolean>(false);diff --git a/apps/builder/app/shared/share-project/share-project.tsx b/apps/builder/app/shared/share-project/share-project.tsxindex 9612454a24..82c506d499 100644--- a/apps/builder/app/shared/share-project/share-project.tsx+++ b/apps/builder/app/shared/share-project/share-project.tsx@@ -138,7 +138,7 @@ const Menu = ({checked={relation === "viewers"}onCheckedChange={handleCheckedChange("viewers")}title="View"- info="Recipients can only view the site"+ info="Recipients can only view the project"/>{/*Hide temporarily until we have a way to allow edit content but not edit tree, etc.@@ -147,14 +147,14 @@ const Menu = ({onCheckedChange={handleCheckedChange("editors")}checked={relation === "editors"}title="Edit Content"- info="Recipients can view the site and edit content like text and images, but they will not be able to change the styles or structure of your site."+ info="Recipients can view the project and edit content like text and images, but they will not be able to change the styles or structure of your project."/>*/}<PermissiononCheckedChange={handleCheckedChange("builders")}checked={relation === "builders"}title="Build"- info="Recipients can make any changes but can not publish the site."+ info="Recipients can make any changes but can not publish the project."/>{hasProPlan && (@@ -162,7 +162,7 @@ const Menu = ({onCheckedChange={handleCheckedChange("administrators")}checked={relation === "administrators"}title="Admin"- info="Recipients can make any changes and can also publish the site."+ info="Recipients can make any changes and can also publish the project."/>)}</Item>diff --git a/apps/builder/docs/test-cases.md b/apps/builder/docs/test-cases.mdindex 7a39ee29f3..9a4b5ba837 100644--- a/apps/builder/docs/test-cases.md+++ b/apps/builder/docs/test-cases.md@@ -79,8 +79,8 @@- Try to access the dashboard when not logged in to make sure you will be redirected to the login page- Open the login page when logged in to make sure you are redirected to the dashboard- - Ensure you can view a built site in an incognito tab- - Ensure you can view a forked site in an incognito tab+ - Ensure you can view a built project in an incognito tab+ - Ensure you can view a forked project in an incognito tab- Click on dev login, add the first four characters in AUTH_SECRET value in the `.env` value and make sure user is authenticated and redirected to the dashboard- Click on dev login and write a wrong value to make sure you get an error message and stay in the login page.- Click on login with GitHub and make sure that you are redirected to the dashboarddiff --git a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx b/fixtures/webstudio-custom-template/app/__generated__/_index.tsxindex 78a527d95e..d3e8caf852 100644--- a/fixtures/webstudio-custom-template/app/__generated__/_index.tsx+++ b/fixtures/webstudio-custom-template/app/__generated__/_index.tsx@@ -3,7 +3,7 @@import { Fragment, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import type { Asset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import { Heading as Heading } from "@webstudio-is/sdk-components-react";@@ -22,7 +22,7 @@ export const imageAssets: ImageAsset[] = [},];export const pageData: PageData = {- site: {+ project: {siteName: "Fixture Site",faviconAssetId: "cd1e9fad-8df1-45c6-800f-05fda2d2469f",code: '<script>console.log(\'HELLO\')</script>\n<meta property="saas:test" content="test">',diff --git a/fixtures/webstudio-custom-template/app/routes/_index.tsx b/fixtures/webstudio-custom-template/app/routes/_index.tsxindex e4cf2f02a5..4d50e3a025 100644--- a/fixtures/webstudio-custom-template/app/routes/_index.tsx+++ b/fixtures/webstudio-custom-template/app/routes/_index.tsx@@ -8,7 +8,7 @@ import {json,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";-import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";+import type { Page as PageType, ProjectMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import {@@ -27,7 +27,7 @@ import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = {- site?: SiteMeta;+ project?: ProjectMeta;page: PageType;};@@ -68,7 +68,7 @@ export const headers = () => {};export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {- const { page, site } = pageData;+ const { page, project } = pageData;const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];@@ -92,16 +92,16 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {const origin = `https://${data?.host}`;- if (site?.siteName) {+ if (project?.siteName) {metas.push({property: "og:site_name",- content: site.siteName,+ content: project.siteName,});metas.push({"script:ld+json": {"@context": "https://schema.org","@type": "WebSite",- name: site.siteName,+ name: project.siteName,url: origin,},});@@ -160,11 +160,11 @@ export const links: LinksFunction = () => {href: css,});- const { site } = pageData;+ const { project } = pageData;- if (site?.faviconAssetId) {+ if (project?.faviconAssetId) {const imageAsset = imageAssets.find(- (asset) => asset.id === site.faviconAssetId+ (asset) => asset.id === project.faviconAssetId);if (imageAsset) {diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsxindex 36222cc414..d6cc49bdc2 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/__generated__/_index.tsx@@ -3,7 +3,7 @@import { Fragment, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import type { Asset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import {Heading as Heading,diff --git a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsxindex e4cf2f02a5..4d50e3a025 100644--- a/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-edge-functions/app/routes/_index.tsx@@ -8,7 +8,7 @@ import {json,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";-import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";+import type { Page as PageType, ProjectMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import {@@ -27,7 +27,7 @@ import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = {- site?: SiteMeta;+ project?: ProjectMeta;page: PageType;};@@ -68,7 +68,7 @@ export const headers = () => {};export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {- const { page, site } = pageData;+ const { page, project } = pageData;const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];@@ -92,16 +92,16 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {const origin = `https://${data?.host}`;- if (site?.siteName) {+ if (project?.siteName) {metas.push({property: "og:site_name",- content: site.siteName,+ content: project.siteName,});metas.push({"script:ld+json": {"@context": "https://schema.org","@type": "WebSite",- name: site.siteName,+ name: project.siteName,url: origin,},});@@ -160,11 +160,11 @@ export const links: LinksFunction = () => {href: css,});- const { site } = pageData;+ const { project } = pageData;- if (site?.faviconAssetId) {+ if (project?.faviconAssetId) {const imageAsset = imageAssets.find(- (asset) => asset.id === site.faviconAssetId+ (asset) => asset.id === project.faviconAssetId);if (imageAsset) {diff --git a/fixtures/webstudio-remix-netlify-functions/_app_redirects b/fixtures/webstudio-remix-netlify-functions/_app_redirectsindex cf910997da..0ee9d3e42f 100644--- a/fixtures/webstudio-remix-netlify-functions/_app_redirects+++ b/fixtures/webstudio-remix-netlify-functions/_app_redirects@@ -1,7 +1,9 @@-# This template uses this file instead of the typicial Netlify _redirects file.+# This template uses this file instead of the typicial Netlify \_redirects file.+# For more information about redirects and rewrites, see https://docs.netlify.com/routing/redirects/.-# Do not remove the line below. This is required to serve the site when deployed.-/* /.netlify/functions/server 200+# Do not remove the line below. This is required to serve the project when deployed.++/\* /.netlify/functions/server 200# Add other redirects and rewrites here and/or in your netlify.tomldiff --git a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsxindex 36222cc414..d6cc49bdc2 100644--- a/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/__generated__/_index.tsx@@ -3,7 +3,7 @@import { Fragment, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import type { Asset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import {Heading as Heading,diff --git a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsxindex e4cf2f02a5..4d50e3a025 100644--- a/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-netlify-functions/app/routes/_index.tsx@@ -8,7 +8,7 @@ import {json,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";-import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";+import type { Page as PageType, ProjectMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import {@@ -27,7 +27,7 @@ import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = {- site?: SiteMeta;+ project?: ProjectMeta;page: PageType;};@@ -68,7 +68,7 @@ export const headers = () => {};export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {- const { page, site } = pageData;+ const { page, project } = pageData;const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];@@ -92,16 +92,16 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {const origin = `https://${data?.host}`;- if (site?.siteName) {+ if (project?.siteName) {metas.push({property: "og:site_name",- content: site.siteName,+ content: project.siteName,});metas.push({"script:ld+json": {"@context": "https://schema.org","@type": "WebSite",- name: site.siteName,+ name: project.siteName,url: origin,},});@@ -160,11 +160,11 @@ export const links: LinksFunction = () => {href: css,});- const { site } = pageData;+ const { project } = pageData;- if (site?.faviconAssetId) {+ if (project?.faviconAssetId) {const imageAsset = imageAssets.find(- (asset) => asset.id === site.faviconAssetId+ (asset) => asset.id === project.faviconAssetId);if (imageAsset) {diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsxindex 325aac06f0..f22efd4e9c 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[_route_with_symbols_]._index.tsx@@ -3,7 +3,7 @@import { Fragment, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import type { Asset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import { Image as Image } from "@webstudio-is/sdk-components-react";@@ -44,7 +44,7 @@ export const imageAssets: ImageAsset[] = [},];export const pageData: PageData = {- site: {+ project: {siteName: "KittyGuardedZone",faviconAssetId: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",code: "<script>console.log('KittyGuardedZone')</script>\n",diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsxindex b98205708a..7e1bbbb16f 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[form]._index.tsx@@ -3,7 +3,7 @@import { Fragment, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import type { Asset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";import {Body as Body,Form as Form,@@ -53,7 +53,7 @@ export const imageAssets: ImageAsset[] = [},];export const pageData: PageData = {- site: {+ project: {siteName: "KittyGuardedZone",faviconAssetId: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",code: "<script>console.log('KittyGuardedZone')</script>\n",diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsxindex 4955f2d4c7..2bd0f61145 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[heading-with-id]._index.tsx@@ -3,7 +3,7 @@import { Fragment, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import type { Asset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import { Heading as Heading } from "@webstudio-is/sdk-components-react";@@ -44,7 +44,7 @@ export const imageAssets: ImageAsset[] = [},];export const pageData: PageData = {- site: {+ project: {siteName: "KittyGuardedZone",faviconAssetId: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",code: "<script>console.log('KittyGuardedZone')</script>\n",diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsxindex 6bf21da0c7..ce057eb939 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[radix]._index.tsx@@ -3,7 +3,7 @@import { Fragment, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import type { Asset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import {Accordion as Accordion,@@ -55,7 +55,7 @@ export const imageAssets: ImageAsset[] = [},];export const pageData: PageData = {- site: {+ project: {siteName: "KittyGuardedZone",faviconAssetId: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",code: "<script>console.log('KittyGuardedZone')</script>\n",diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsxindex f4d46d1ed2..ec6304e1e6 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/[resources]._index.tsx@@ -3,7 +3,7 @@import { Fragment, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import type { Asset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";import { Body as Body } from "@webstudio-is/sdk-components-react-remix";import {Box as Box,@@ -47,7 +47,7 @@ export const imageAssets: ImageAsset[] = [},];export const pageData: PageData = {- site: {+ project: {siteName: "KittyGuardedZone",faviconAssetId: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",code: "<script>console.log('KittyGuardedZone')</script>\n",diff --git a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsxindex 7699348189..0a36430bd4 100644--- a/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/__generated__/_index.tsx@@ -3,7 +3,7 @@import { Fragment, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import type { Asset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";import {Body as Body,Link as Link,@@ -53,7 +53,7 @@ export const imageAssets: ImageAsset[] = [},];export const pageData: PageData = {- site: {+ project: {siteName: "KittyGuardedZone",faviconAssetId: "88d5e2ff-b8f2-4899-aaf8-dde4ade6da10",code: "<script>console.log('KittyGuardedZone')</script>\n",diff --git a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsxindex 653bb1f430..93e7e16d9e 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[_route_with_symbols_]._index.tsx@@ -8,7 +8,7 @@ import {json,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";-import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";+import type { Page as PageType, ProjectMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import {@@ -27,7 +27,7 @@ import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = {- site?: SiteMeta;+ project?: ProjectMeta;page: PageType;};@@ -68,7 +68,7 @@ export const headers = () => {};export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {- const { page, site } = pageData;+ const { page, project } = pageData;const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];@@ -92,16 +92,16 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {const origin = `https://${data?.host}`;- if (site?.siteName) {+ if (project?.siteName) {metas.push({property: "og:site_name",- content: site.siteName,+ content: project.siteName,});metas.push({"script:ld+json": {"@context": "https://schema.org","@type": "WebSite",- name: site.siteName,+ name: project.siteName,url: origin,},});@@ -160,11 +160,11 @@ export const links: LinksFunction = () => {href: css,});- const { site } = pageData;+ const { project } = pageData;- if (site?.faviconAssetId) {+ if (project?.faviconAssetId) {const imageAsset = imageAssets.find(- (asset) => asset.id === site.faviconAssetId+ (asset) => asset.id === project.faviconAssetId);if (imageAsset) {diff --git a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsxindex 2781c2b061..57a5ad5537 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[form]._index.tsx@@ -8,7 +8,7 @@ import {json,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";-import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";+import type { Page as PageType, ProjectMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import {@@ -27,7 +27,7 @@ import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = {- site?: SiteMeta;+ project?: ProjectMeta;page: PageType;};@@ -68,7 +68,7 @@ export const headers = () => {};export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {- const { page, site } = pageData;+ const { page, project } = pageData;const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];@@ -92,16 +92,16 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {const origin = `https://${data?.host}`;- if (site?.siteName) {+ if (project?.siteName) {metas.push({property: "og:site_name",- content: site.siteName,+ content: project.siteName,});metas.push({"script:ld+json": {"@context": "https://schema.org","@type": "WebSite",- name: site.siteName,+ name: project.siteName,url: origin,},});@@ -160,11 +160,11 @@ export const links: LinksFunction = () => {href: css,});- const { site } = pageData;+ const { project } = pageData;- if (site?.faviconAssetId) {+ if (project?.faviconAssetId) {const imageAsset = imageAssets.find(- (asset) => asset.id === site.faviconAssetId+ (asset) => asset.id === project.faviconAssetId);if (imageAsset) {diff --git a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsxindex 7e6a0a2ff5..a4a6ea1e32 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[heading-with-id]._index.tsx@@ -8,7 +8,7 @@ import {json,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";-import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";+import type { Page as PageType, ProjectMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import {@@ -27,7 +27,7 @@ import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = {- site?: SiteMeta;+ project?: ProjectMeta;page: PageType;};@@ -68,7 +68,7 @@ export const headers = () => {};export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {- const { page, site } = pageData;+ const { page, project } = pageData;const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];@@ -92,16 +92,16 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {const origin = `https://${data?.host}`;- if (site?.siteName) {+ if (project?.siteName) {metas.push({property: "og:site_name",- content: site.siteName,+ content: project.siteName,});metas.push({"script:ld+json": {"@context": "https://schema.org","@type": "WebSite",- name: site.siteName,+ name: project.siteName,url: origin,},});@@ -160,11 +160,11 @@ export const links: LinksFunction = () => {href: css,});- const { site } = pageData;+ const { project } = pageData;- if (site?.faviconAssetId) {+ if (project?.faviconAssetId) {const imageAsset = imageAssets.find(- (asset) => asset.id === site.faviconAssetId+ (asset) => asset.id === project.faviconAssetId);if (imageAsset) {diff --git a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsxindex f783ee34ba..4231c9e408 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[radix]._index.tsx@@ -8,7 +8,7 @@ import {json,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";-import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";+import type { Page as PageType, ProjectMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import {@@ -27,7 +27,7 @@ import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = {- site?: SiteMeta;+ project?: ProjectMeta;page: PageType;};@@ -68,7 +68,7 @@ export const headers = () => {};export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {- const { page, site } = pageData;+ const { page, project } = pageData;const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];@@ -92,16 +92,16 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {const origin = `https://${data?.host}`;- if (site?.siteName) {+ if (project?.siteName) {metas.push({property: "og:site_name",- content: site.siteName,+ content: project.siteName,});metas.push({"script:ld+json": {"@context": "https://schema.org","@type": "WebSite",- name: site.siteName,+ name: project.siteName,url: origin,},});@@ -160,11 +160,11 @@ export const links: LinksFunction = () => {href: css,});- const { site } = pageData;+ const { project } = pageData;- if (site?.faviconAssetId) {+ if (project?.faviconAssetId) {const imageAsset = imageAssets.find(- (asset) => asset.id === site.faviconAssetId+ (asset) => asset.id === project.faviconAssetId);if (imageAsset) {diff --git a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsxindex 6af28ce456..3b5c3a26c7 100644--- a/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/[resources]._index.tsx@@ -8,7 +8,7 @@ import {json,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";-import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";+import type { Page as PageType, ProjectMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import {@@ -27,7 +27,7 @@ import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = {- site?: SiteMeta;+ project?: ProjectMeta;page: PageType;};@@ -68,7 +68,7 @@ export const headers = () => {};export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {- const { page, site } = pageData;+ const { page, project } = pageData;const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];@@ -92,16 +92,16 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {const origin = `https://${data?.host}`;- if (site?.siteName) {+ if (project?.siteName) {metas.push({property: "og:site_name",- content: site.siteName,+ content: project.siteName,});metas.push({"script:ld+json": {"@context": "https://schema.org","@type": "WebSite",- name: site.siteName,+ name: project.siteName,url: origin,},});@@ -160,11 +160,11 @@ export const links: LinksFunction = () => {href: css,});- const { site } = pageData;+ const { project } = pageData;- if (site?.faviconAssetId) {+ if (project?.faviconAssetId) {const imageAsset = imageAssets.find(- (asset) => asset.id === site.faviconAssetId+ (asset) => asset.id === project.faviconAssetId);if (imageAsset) {diff --git a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx b/fixtures/webstudio-remix-vercel/app/routes/_index.tsxindex e4cf2f02a5..4d50e3a025 100644--- a/fixtures/webstudio-remix-vercel/app/routes/_index.tsx+++ b/fixtures/webstudio-remix-vercel/app/routes/_index.tsx@@ -8,7 +8,7 @@ import {json,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";-import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";+import type { Page as PageType, ProjectMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import {@@ -27,7 +27,7 @@ import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = {- site?: SiteMeta;+ project?: ProjectMeta;page: PageType;};@@ -68,7 +68,7 @@ export const headers = () => {};export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {- const { page, site } = pageData;+ const { page, project } = pageData;const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];@@ -92,16 +92,16 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {const origin = `https://${data?.host}`;- if (site?.siteName) {+ if (project?.siteName) {metas.push({property: "og:site_name",- content: site.siteName,+ content: project.siteName,});metas.push({"script:ld+json": {"@context": "https://schema.org","@type": "WebSite",- name: site.siteName,+ name: project.siteName,url: origin,},});@@ -160,11 +160,11 @@ export const links: LinksFunction = () => {href: css,});- const { site } = pageData;+ const { project } = pageData;- if (site?.faviconAssetId) {+ if (project?.faviconAssetId) {const imageAsset = imageAssets.find(- (asset) => asset.id === site.faviconAssetId+ (asset) => asset.id === project.faviconAssetId);if (imageAsset) {diff --git a/packages/asset-uploader/src/db/clone.ts b/packages/asset-uploader/src/db/clone.tsindex 5a98a9c273..a1deda9ae6 100644--- a/packages/asset-uploader/src/db/clone.ts+++ b/packages/asset-uploader/src/db/clone.ts@@ -16,7 +16,7 @@ export const cloneAssets = async (/*** Don't use unless absolutely have to (e.g. because of transactions)- * and unless it's obvious on the call site that permission is checked+ * and unless it's obvious on the call project that permission is checked*/dontCheckEditPermission?: boolean;},diff --git a/packages/cli/README.md b/packages/cli/README.mdindex a96afcbc9a..c6f0ff7858 100644--- a/packages/cli/README.md+++ b/packages/cli/README.md@@ -108,7 +108,7 @@ If you want to build a production version of the app, you can run `npm run build### Vercel-Once you've built the project locally, you can use the [Vercel CLI](https://vercel.com/docs/cli) to deploy your site directly to [Vercel](https://vercel.com):+Once you've built the project locally, you can use the [Vercel CLI](https://vercel.com/docs/cli) to deploy your project directly to [Vercel](https://vercel.com):```bashvercel deploy@@ -118,7 +118,7 @@ Follow the instructions [here](https://vercel.com/docs/cli) to install the `verc### Netlify-If you want to deploy to netlify, you can use [Netlify CLI](https://docs.netlify.com/cli/get-started/) to deploy your site directly to [Netlify](https://netlify.com/):+If you want to deploy to netlify, you can use [Netlify CLI](https://docs.netlify.com/cli/get-started/) to deploy your project directly to [Netlify](https://netlify.com/):```bashnetlify deploydiff --git a/packages/cli/__generated__/index.tsx b/packages/cli/__generated__/index.tsxindex be7db72c18..f6dda812c8 100644--- a/packages/cli/__generated__/index.tsx+++ b/packages/cli/__generated__/index.tsx@@ -8,7 +8,7 @@ export const fontAssets: Asset[] = [];export const imageAssets: ImageAsset[] = [];export const pageData: PageData = {- site: {+ project: {siteName: "",faviconAssetId: "",code: "",diff --git a/packages/cli/src/commands/init-flow.ts b/packages/cli/src/commands/init-flow.tsindex f4dd14f55a..a16f0830f3 100644--- a/packages/cli/src/commands/init-flow.ts+++ b/packages/cli/src/commands/init-flow.ts@@ -119,7 +119,7 @@ export const initFlow = async (["Now you can:",folderName && `Go to your project: ${pc.dim(`cd ${folderName}`)}`,- `Run ${pc.dim("npm run dev")} to preview your site on a local server.`,+ `Run ${pc.dim("npm run dev")} to preview your project on a local server.`,projectTemplate && getDeploymentInstructions(projectTemplate),].filter(Boolean)@@ -138,8 +138,10 @@ const getDeploymentInstructions = (return [`To deploy to Netlify, run the following commands: `,`Run ${pc.dim("npx netlify-cli login")} to login to Netlify.`,- `Run ${pc.dim("npx netlify-cli sites:create")} to create a new site.`,- `Run ${pc.dim("npx netlify-cli build")} to build the site`,+ `Run ${pc.dim(+ "npx netlify-cli sites:create"+ )} to create a new project.`,+ `Run ${pc.dim("npx netlify-cli build")} to build the project`,`Run ${pc.dim("npx netlify-cli deploy")} to deploy on Netlify.`,].join("\n");}diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.tsindex c9e1d4ee21..6271000b96 100644--- a/packages/cli/src/prebuild.ts+++ b/packages/cli/src/prebuild.ts@@ -251,7 +251,7 @@ export const prebuild = async (options: {const domain = siteData.build.deployment?.projectDomain;if (domain === undefined) {- throw new Error(`Project domain is missing from the site data`);+ throw new Error(`Project domain is missing from the project data`);}const radixComponentNamespacedMetas = Object.entries(@@ -469,7 +469,7 @@ export const prebuild = async (options: {const pageData = siteDataByPage[pathname];// serialize data only used in runtimeconst renderedPageData: PageData = {- site: siteData.build.pages.meta,+ project: siteData.build.pages.meta,page: pageData.page,};@@ -499,7 +499,7 @@ export const prebuild = async (options: {/* This is a auto generated file for building the project */ \nimport { Fragment, useState } from "react";import type { PageData } from "~/routes/_index";-import type { Asset, ImageAsset, SiteMeta } from "@webstudio-is/sdk";+import type { Asset, ImageAsset, ProjectMeta } from "@webstudio-is/sdk";${componentImports}export const fontAssets: Asset[] = ${JSON.stringify(fontAssets)}export const imageAssets: ImageAsset[] = ${JSON.stringify(imageAssets)}diff --git a/packages/cli/templates/netlify-functions/_app_redirects b/packages/cli/templates/netlify-functions/_app_redirectsindex cf910997da..0ee9d3e42f 100644--- a/packages/cli/templates/netlify-functions/_app_redirects+++ b/packages/cli/templates/netlify-functions/_app_redirects@@ -1,7 +1,9 @@-# This template uses this file instead of the typicial Netlify _redirects file.+# This template uses this file instead of the typicial Netlify \_redirects file.+# For more information about redirects and rewrites, see https://docs.netlify.com/routing/redirects/.-# Do not remove the line below. This is required to serve the site when deployed.-/* /.netlify/functions/server 200+# Do not remove the line below. This is required to serve the project when deployed.++/\* /.netlify/functions/server 200# Add other redirects and rewrites here and/or in your netlify.tomldiff --git a/packages/cli/templates/route-template.tsx b/packages/cli/templates/route-template.tsxindex 2eebbfcbd2..edbe15f1ef 100644--- a/packages/cli/templates/route-template.tsx+++ b/packages/cli/templates/route-template.tsx@@ -8,7 +8,7 @@ import {json,} from "@remix-run/server-runtime";import { useLoaderData } from "@remix-run/react";-import type { Page as PageType, SiteMeta } from "@webstudio-is/sdk";+import type { Page as PageType, ProjectMeta } from "@webstudio-is/sdk";import { ReactSdkContext } from "@webstudio-is/react-sdk";import { n8nHandler, getFormId } from "@webstudio-is/form-handlers";import {@@ -27,7 +27,7 @@ import css from "../__generated__/index.css";import { assetBaseUrl, imageBaseUrl, imageLoader } from "~/constants.mjs";export type PageData = {- site?: SiteMeta;+ project?: ProjectMeta;page: PageType;};@@ -68,7 +68,7 @@ export const headers = () => {};export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {- const { page, site } = pageData;+ const { page, project } = pageData;const metas: ReturnType<V2_ServerRuntimeMetaFunction> = [];@@ -92,16 +92,16 @@ export const meta: V2_ServerRuntimeMetaFunction<typeof loader> = ({ data }) => {const origin = `https://${data?.host}`;- if (site?.siteName) {+ if (project?.siteName) {metas.push({property: "og:site_name",- content: site.siteName,+ content: project.siteName,});metas.push({"script:ld+json": {"@context": "https://schema.org","@type": "WebSite",- name: site.siteName,+ name: project.siteName,url: origin,},});@@ -160,11 +160,11 @@ export const links: LinksFunction = () => {href: css,});- const { site } = pageData;+ const { project } = pageData;- if (site?.faviconAssetId) {+ if (project?.faviconAssetId) {const imageAsset = imageAssets.find(- (asset) => asset.id === site.faviconAssetId+ (asset) => asset.id === project.faviconAssetId);if (imageAsset) {diff --git a/packages/image/src/image-dev.stories.tsx b/packages/image/src/image-dev.stories.tsxindex 37c1208407..fd980cbaca 100644--- a/packages/image/src/image-dev.stories.tsx+++ b/packages/image/src/image-dev.stories.tsx@@ -21,7 +21,7 @@ type ImageProps = React.ComponentProps<typeof ImagePrimitive>;**/const USE_CLOUDFLARE_IMAGE_TRANSFORM = false;-// For cloudflare image transform testing, logo should be the most consistent image on the site+// For cloudflare image transform testing, logo should be the most consistent image on the projectconst REMOTE_SELF_DOMAIN_IMAGE = "https://webstudio.is/logo.webp";const imageSrc = USE_CLOUDFLARE_IMAGE_TRANSFORMdiff --git a/packages/react-sdk/README.md b/packages/react-sdk/README.mdindex 601fd6cabe..d7b7835e62 100644--- a/packages/react-sdk/README.md+++ b/packages/react-sdk/README.md@@ -1,4 +1,4 @@# Webstudio SDK-Webstudio SDK is a TypeScript API that lets you use your Webstudio site or some components in your custom codebase or just render a complete Remix Document.+Webstudio SDK is a TypeScript API that lets you use your Webstudio project or some components in your custom codebase or just render a complete Remix Document.It is currently under development, but feel free to play with the the current [landing site](https://github.com/webstudio-is/webstudio-landing)diff --git a/packages/react-sdk/src/app/root.tsx b/packages/react-sdk/src/app/root.tsxindex a6893de252..848bdaf25e 100644--- a/packages/react-sdk/src/app/root.tsx+++ b/packages/react-sdk/src/app/root.tsx@@ -1,7 +1,7 @@import { Links, Meta, Outlet as DefaultOutlet } from "@remix-run/react";/**- * We are using Outlet prop from index layout when user renders site from a subdomain.+ * We are using Outlet prop from index layout when user renders project from a subdomain.*/export const Root = ({Outlet = DefaultOutlet,diff --git a/packages/sdk-components-react-remix/README.md b/packages/sdk-components-react-remix/README.mdindex 458fad7235..03f1b6ad2c 100644--- a/packages/sdk-components-react-remix/README.md+++ b/packages/sdk-components-react-remix/README.md@@ -1,3 +1,3 @@# Webstudio SDK Components-Webstudio SDK is a TypeScript API that lets you use your Webstudio site or some components in your custom codebase or just render a complete Remix Document.+Webstudio SDK is a TypeScript API that lets you use your Webstudio project or some components in your custom codebase or just render a complete Remix Document.diff --git a/packages/sdk-components-react/README.md b/packages/sdk-components-react/README.mdindex 458fad7235..03f1b6ad2c 100644--- a/packages/sdk-components-react/README.md+++ b/packages/sdk-components-react/README.md@@ -1,3 +1,3 @@# Webstudio SDK Components-Webstudio SDK is a TypeScript API that lets you use your Webstudio site or some components in your custom codebase or just render a complete Remix Document.+Webstudio SDK is a TypeScript API that lets you use your Webstudio project or some components in your custom codebase or just render a complete Remix Document.diff --git a/packages/sdk-components-react/src/__generated__/vimeo.props.ts b/packages/sdk-components-react/src/__generated__/vimeo.props.tsindex 98770b6f22..b59c778947 100644--- a/packages/sdk-components-react/src/__generated__/vimeo.props.ts+++ b/packages/sdk-components-react/src/__generated__/vimeo.props.ts@@ -653,7 +653,7 @@ export const props: Record<string, PropMeta> = {},showPreview: {description:- "Whether the preview image should be loaded from Vimeo API. Ideally don't use it, because it will show up with some delay and will make your site feel slower.",+ "Whether the preview image should be loaded from Vimeo API. Ideally don't use it, because it will show up with some delay and will make your project feel slower.",required: false,control: "boolean",type: "boolean",diff --git a/packages/sdk-components-react/src/vimeo.tsx b/packages/sdk-components-react/src/vimeo.tsxindex 5988e57ba9..8deecae3fc 100644--- a/packages/sdk-components-react/src/vimeo.tsx+++ b/packages/sdk-components-react/src/vimeo.tsx@@ -281,7 +281,7 @@ export type VimeoOptions = Omit<| "title"| "portrait"> & {- /** Whether the preview image should be loaded from Vimeo API. Ideally don't use it, because it will show up with some delay and will make your site feel slower. */+ /** Whether the preview image should be loaded from Vimeo API. Ideally don't use it, because it will show up with some delay and will make your project feel slower. */showPreview?: boolean;/** Whether to prevent the player from tracking session data, including cookies. Keep in mind that setting this argument to true also blocks video stats. */doNotTrack?: VimeoPlayerOptions["dnt"];diff --git a/packages/sdk/package.json b/packages/sdk/package.jsonindex 73e5d0f44c..4873c2dd95 100644--- a/packages/sdk/package.json+++ b/packages/sdk/package.json@@ -1,7 +1,7 @@{"name": "@webstudio-is/sdk","version": "0.123.0",- "description": "Webstudio site data schema",+ "description": "Webstudio project data schema","author": "Webstudio <[email protected]>","homepage": "https://webstudio.is","license": "AGPL-3.0-or-later",diff --git a/packages/sdk/src/schema/pages.ts b/packages/sdk/src/schema/pages.tsindex 2e3dca2759..75410e8232 100644--- a/packages/sdk/src/schema/pages.ts+++ b/packages/sdk/src/schema/pages.ts@@ -72,17 +72,17 @@ const Page = z.object({path: PagePath,});-const SiteMeta = z.object({+const ProjectMeta = z.object({siteName: z.string().optional(),faviconAssetId: z.string().optional(),code: z.string().optional(),});-export type SiteMeta = z.infer<typeof SiteMeta>;+export type ProjectMeta = z.infer<typeof ProjectMeta>;export type Page = z.infer<typeof Page>;export const Pages = z.object({- meta: SiteMeta.optional(),+ meta: ProjectMeta.optional(),homePage: HomePage,pages: z.array(Page)diff --git a/packages/trpc-interface/src/authorize/project.server.ts b/packages/trpc-interface/src/authorize/project.server.tsindex f09c6dc750..d34bc2c9f2 100644--- a/packages/trpc-interface/src/authorize/project.server.ts+++ b/packages/trpc-interface/src/authorize/project.server.ts@@ -46,7 +46,7 @@ export const hasProjectPermit = async (const checks = [];const namespace = "Project";- // Allow load production build env i.e. "published" site+ // Allow load production build env i.e. "published" projectif (props.permit === "view" && context.authorization.isServiceCall) {return true;}