From c87cee4e438801a67d567327375650e8f3c1a337 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 15 Sep 2022 10:13:47 +0200 Subject: [PATCH] move canvasDocument to react-sdk --- apps/designer/app/routes/canvas/$projectId.tsx | 2 +- apps/designer/app/routes/index.tsx | 7 +++++-- apps/designer/app/routes/preview/$projectId.tsx | 2 +- packages/react-sdk/package.json | 2 +- .../documents => packages/react-sdk/src/canvas}/canvas.tsx | 2 +- packages/react-sdk/src/canvas/index.ts | 1 + packages/react-sdk/src/index.ts | 1 + 7 files changed, 11 insertions(+), 6 deletions(-) rename {apps/designer/app/shared/documents => packages/react-sdk/src/canvas}/canvas.tsx (92%) create mode 100644 packages/react-sdk/src/canvas/index.ts diff --git a/apps/designer/app/routes/canvas/$projectId.tsx b/apps/designer/app/routes/canvas/$projectId.tsx index ad73bcc2c5..b24a39df17 100644 --- a/apps/designer/app/routes/canvas/$projectId.tsx +++ b/apps/designer/app/routes/canvas/$projectId.tsx @@ -5,7 +5,7 @@ import { loadCanvasData, type ErrorData, type CanvasData } from "~/shared/db"; import env, { Env } from "~/env.server"; import { ErrorMessage } from "~/shared/error"; import { sentryException } from "~/shared/sentry"; -import { Canvas as CanvasDocument } from "~/shared/documents/canvas"; +import { Canvas as CanvasDocument } from "@webstudio-is/react-sdk"; type Data = (CanvasData | ErrorData) & { env: Env }; diff --git a/apps/designer/app/routes/index.tsx b/apps/designer/app/routes/index.tsx index 4f8026d7c5..88efd7ee32 100644 --- a/apps/designer/app/routes/index.tsx +++ b/apps/designer/app/routes/index.tsx @@ -1,9 +1,12 @@ import { type LoaderFunction, redirect } from "@remix-run/node"; import { useLoaderData } from "@remix-run/react"; -import { type Data, Root } from "@webstudio-is/react-sdk"; +import { + type Data, + Root, + Canvas as CanvasDocument, +} from "@webstudio-is/react-sdk"; import config from "~/config"; import { db } from "@webstudio-is/project"; -import { Canvas as CanvasDocument } from "~/shared/documents/canvas"; import env, { Env } from "~/env.server"; // @todo all this subdomain logic is very hacky diff --git a/apps/designer/app/routes/preview/$projectId.tsx b/apps/designer/app/routes/preview/$projectId.tsx index 8bbd7a7d45..76fa063d8f 100644 --- a/apps/designer/app/routes/preview/$projectId.tsx +++ b/apps/designer/app/routes/preview/$projectId.tsx @@ -2,7 +2,7 @@ import { useLoaderData } from "@remix-run/react"; import type { LoaderFunction, MetaFunction } from "@remix-run/node"; import { Root } from "@webstudio-is/react-sdk"; import { loadPreviewData, type PreviewData, type ErrorData } from "~/shared/db"; -import { Canvas as CanvasDocument } from "~/shared/documents/canvas"; +import { Canvas as CanvasDocument } from "@webstudio-is/react-sdk"; import env, { Env } from "~/env.server"; export const meta: MetaFunction = () => { diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index e7b7a3c0b7..397567ba0d 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@webstudio-is/react-sdk", - "version": "0.5.1", + "version": "0.6.1", "description": "Webstudio JavaScript / TypeScript API", "author": "Webstudio ", "homepage": "https://webstudio.is", diff --git a/apps/designer/app/shared/documents/canvas.tsx b/packages/react-sdk/src/canvas/canvas.tsx similarity index 92% rename from apps/designer/app/shared/documents/canvas.tsx rename to packages/react-sdk/src/canvas/canvas.tsx index 0231013bd3..31e4689fe1 100644 --- a/apps/designer/app/shared/documents/canvas.tsx +++ b/packages/react-sdk/src/canvas/canvas.tsx @@ -1,5 +1,5 @@ import { Links, Meta, Outlet as DefaultOutlet } from "@remix-run/react"; -import { CriticalCss } from "@webstudio-is/react-sdk"; +import { CriticalCss } from ".."; /** * We are using Outlet prop from index layout when user renders site from a subdomain. diff --git a/packages/react-sdk/src/canvas/index.ts b/packages/react-sdk/src/canvas/index.ts new file mode 100644 index 0000000000..df456a3704 --- /dev/null +++ b/packages/react-sdk/src/canvas/index.ts @@ -0,0 +1 @@ +export * from "./canvas"; diff --git a/packages/react-sdk/src/index.ts b/packages/react-sdk/src/index.ts index 0ca1559f9c..58ede255ac 100644 --- a/packages/react-sdk/src/index.ts +++ b/packages/react-sdk/src/index.ts @@ -6,3 +6,4 @@ export * as componentsMeta from "./components/meta"; export * from "./user-props"; export * from "./pubsub"; export * from "./db"; +export * from "./canvas";