Skip to content

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.

Cleanup project package (#1358)

Bogdan Chadkin58f3b3f3d50b
diff --git a/apps/builder/app/builder/features/style-panel/sections/space/input-popover.tsx b/apps/builder/app/builder/features/style-panel/sections/space/input-popover.tsx
index a5c2570151..16b5bee7db 100644
--- a/apps/builder/app/builder/features/style-panel/sections/space/input-popover.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/space/input-popover.tsx
@@ -7,14 +7,16 @@ import {
DeprecatedPopoverPortal,
styled,
} from "@webstudio-is/design-system";
-import type { StyleUpdate } from "@webstudio-is/project";
import type { StyleProperty, StyleValue } from "@webstudio-is/css-data";
import {
CssValueInput,
type IntermediateStyleValue,
} from "../../shared/css-value-input";
import type { StyleSource } from "../../shared/style-info";
-import type { StyleUpdateOptions } from "../../shared/use-style-data";
+import type {
+ StyleUpdate,
+ StyleUpdateOptions,
+} from "../../shared/use-style-data";
import { theme } from "@webstudio-is/design-system";
const slideUpAndFade = keyframes({
diff --git a/apps/builder/app/builder/features/style-panel/shared/use-style-data.ts b/apps/builder/app/builder/features/style-panel/shared/use-style-data.ts
index 3188992c07..0274268282 100644
--- a/apps/builder/app/builder/features/style-panel/shared/use-style-data.ts
+++ b/apps/builder/app/builder/features/style-panel/shared/use-style-data.ts
@@ -2,8 +2,11 @@ import { useCallback } from "react";
import { useStore } from "@nanostores/react";
import store from "immerhin";
import warnOnce from "warn-once";
-import { getStyleDeclKey, type Instance } from "@webstudio-is/project-build";
-import type { StyleUpdates } from "@webstudio-is/project";
+import {
+ type Breakpoint,
+ type Instance,
+ getStyleDeclKey,
+} from "@webstudio-is/project-build";
import type { StyleProperty, StyleValue } from "@webstudio-is/css-data";
import type { Publish } from "~/shared/pubsub";
import {
@@ -17,6 +20,23 @@ import { selectedBreakpointStore } from "~/shared/nano-states/breakpoints";
import { parseCssValue } from "./parse-css-value";
import { useStyleInfo } from "./style-info";
+export type StyleUpdate =
+ | {
+ operation: "delete";
+ property: StyleProperty;
+ }
+ | {
+ operation: "set";
+ property: StyleProperty;
+ value: StyleValue;
+ };
+
+export type StyleUpdates = {
+ id: Instance["id"];
+ updates: Array<StyleUpdate>;
+ breakpoint: Breakpoint;
+};
+
declare module "~/shared/pubsub" {
export interface PubsubMap {
updateStyle: StyleUpdates;
diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsx
index e72fd37cdf..bacbf2cc64 100644
--- a/apps/builder/app/canvas/canvas.tsx
+++ b/apps/builder/app/canvas/canvas.tsx
@@ -1,7 +1,7 @@
import { useMemo, Fragment, useEffect } from "react";
import { useStore } from "@nanostores/react";
import { computed } from "nanostores";
-import type { CanvasData } from "@webstudio-is/project";
+import type { Params } from "@webstudio-is/react-sdk";
import type { Instance, Page } from "@webstudio-is/project-build";
import {
createElementsTree,
@@ -107,7 +107,7 @@ const DesignMode = () => {
};
type CanvasProps = {
- params: CanvasData["params"];
+ params: Params;
getComponent: GetComponent;
};
diff --git a/apps/builder/app/routes/$.tsx b/apps/builder/app/routes/$.tsx
index e8006e7fa9..84a3fea2f7 100644
--- a/apps/builder/app/routes/$.tsx
+++ b/apps/builder/app/routes/$.tsx
@@ -1,13 +1,12 @@
import { redirect } from "@remix-run/node";
import type { LoaderArgs, ErrorBoundaryComponent } from "@remix-run/node";
import { useLoaderData } from "@remix-run/react";
-import { Root, getComponent } from "@webstudio-is/react-sdk";
+import { type Params, Root, getComponent } from "@webstudio-is/react-sdk";
import env from "~/env/env.public.server";
import { sentryException } from "~/shared/sentry";
import { Canvas } from "~/canvas";
import { ErrorMessage } from "~/shared/error";
import { getBuildParams, dashboardPath } from "~/shared/router-utils";
-import type { CanvasData } from "@webstudio-is/project";
export const loader = async ({ request }: LoaderArgs) => {
const buildParams = getBuildParams(request);
@@ -15,7 +14,7 @@ export const loader = async ({ request }: LoaderArgs) => {
throw redirect(dashboardPath());
}
- const params: CanvasData["params"] = {};
+ const params: Params = {};
if (env.RESIZE_ORIGIN != null) {
params.resizeOrigin = env.RESIZE_ORIGIN;
diff --git a/apps/builder/app/routes/rest/project.$projectId.tsx b/apps/builder/app/routes/rest/project.$projectId.tsx
index 272b1d0ae7..1f1de934db 100644
--- a/apps/builder/app/routes/rest/project.$projectId.tsx
+++ b/apps/builder/app/routes/rest/project.$projectId.tsx
@@ -1,13 +1,13 @@
import { json, type LoaderArgs } from "@remix-run/node";
+import type { Data } from "@webstudio-is/react-sdk";
import { sentryException } from "~/shared/sentry";
import { loadProductionCanvasData } from "~/shared/db";
-import type { CanvasData } from "@webstudio-is/project";
import { createContext } from "~/shared/context.server";
export const loader = async ({
params,
request,
-}: LoaderArgs): Promise<CanvasData> => {
+}: LoaderArgs): Promise<Data> => {
try {
const projectId = params.projectId ?? undefined;
diff --git a/apps/builder/app/shared/db/canvas.server.ts b/apps/builder/app/shared/db/canvas.server.ts
index 1fc79da1dc..35c84894fa 100644
--- a/apps/builder/app/shared/db/canvas.server.ts
+++ b/apps/builder/app/shared/db/canvas.server.ts
@@ -1,4 +1,5 @@
-import type { CanvasData, Project } from "@webstudio-is/project";
+import type { Project } from "@webstudio-is/project";
+import type { Data } from "@webstudio-is/react-sdk";
import { loadBuildByProjectId } from "@webstudio-is/project-build/server";
import { db as projectDb } from "@webstudio-is/project/server";
import { loadByProject } from "@webstudio-is/asset-uploader/server";
@@ -10,7 +11,7 @@ export const loadProductionCanvasData = async (
projectId: Project["id"];
},
context: AppContext
-): Promise<CanvasData> => {
+): Promise<Data> => {
const project = await projectDb.project.loadByParams(
{ projectId: props.projectId },
context
@@ -61,7 +62,7 @@ export const loadCanvasData = async (
pageIdOrPath: string;
},
context: AppContext
-): Promise<CanvasData> => {
+): Promise<Data> => {
const build =
props.env === "dev"
? await loadBuildByProjectId(props.project.id, "dev")
diff --git a/packages/http-client/package.json b/packages/http-client/package.json
index db7793ef11..41cb0d973d 100644
--- a/packages/http-client/package.json
+++ b/packages/http-client/package.json
@@ -18,7 +18,7 @@
"@types/isomorphic-fetch": "^0.0.36",
"@webstudio-is/jest-config": "workspace:^",
"@webstudio-is/prisma-client": "workspace:^",
- "@webstudio-is/project": "workspace:^",
+ "@webstudio-is/react-sdk": "workspace:^",
"@webstudio-is/scripts": "workspace:^",
"@webstudio-is/tsconfig": "workspace:^",
"jest": "^29.3.1",
diff --git a/packages/http-client/src/index.ts b/packages/http-client/src/index.ts
index 09a3dd6392..6d31008f03 100644
--- a/packages/http-client/src/index.ts
+++ b/packages/http-client/src/index.ts
@@ -1,5 +1,5 @@
import fetch from "isomorphic-fetch";
-import type { CanvasData } from "@webstudio-is/project";
+import type { Data } from "@webstudio-is/react-sdk";
export const loadProject = async ({
apiUrl,
@@ -7,7 +7,7 @@ export const loadProject = async ({
}: {
apiUrl: string;
projectId: string;
-}): Promise<Array<CanvasData>> => {
+}): Promise<Array<Data>> => {
if (apiUrl === undefined) {
throw new Error("Webstudio API URL is required.");
}
diff --git a/packages/project/package.json b/packages/project/package.json
index c536d0ffa0..938442f499 100644
--- a/packages/project/package.json
+++ b/packages/project/package.json
@@ -15,10 +15,8 @@
"dependencies": {
"@trpc/server": "^10.9.0",
"@webstudio-is/asset-uploader": "workspace:^",
- "@webstudio-is/css-data": "workspace:^",
"@webstudio-is/prisma-client": "workspace:^",
"@webstudio-is/project-build": "workspace:^",
- "@webstudio-is/react-sdk": "workspace:^",
"@webstudio-is/trpc-interface": "workspace:^",
"nanoid": "^3.2.0",
"slugify": "^1.6.5",
diff --git a/packages/project/src/index.ts b/packages/project/src/index.ts
index 1de297ed70..ec0e2d2011 100644
--- a/packages/project/src/index.ts
+++ b/packages/project/src/index.ts
@@ -1,3 +1,2 @@
export * from "./shared/schema";
-export * from "./shared/canvas-components";
export type { ProjectRouter } from "./trpc";
diff --git a/packages/project/src/shared/canvas-components/index.ts b/packages/project/src/shared/canvas-components/index.ts
deleted file mode 100644
index e9f7edf109..0000000000
--- a/packages/project/src/shared/canvas-components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./instance-data";
diff --git a/packages/project/src/shared/canvas-components/instance-data.ts b/packages/project/src/shared/canvas-components/instance-data.ts
deleted file mode 100644
index baf70193de..0000000000
--- a/packages/project/src/shared/canvas-components/instance-data.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { Instance, Breakpoint } from "@webstudio-is/project-build";
-import type { StyleProperty, StyleValue } from "@webstudio-is/css-data";
-
-export type StyleUpdate =
- | {
- operation: "delete";
- property: StyleProperty;
- }
- | {
- operation: "set";
- property: StyleProperty;
- value: StyleValue;
- };
-
-export type StyleUpdates = {
- id: Instance["id"];
- updates: Array<StyleUpdate>;
- breakpoint: Breakpoint;
-};
diff --git a/packages/project/src/shared/schema.ts b/packages/project/src/shared/schema.ts
index d9f70e350c..cf990ed279 100644
--- a/packages/project/src/shared/schema.ts
+++ b/packages/project/src/shared/schema.ts
@@ -1,5 +1,4 @@
import { z } from "zod";
-import type { Data } from "@webstudio-is/react-sdk";
const MIN_TITLE_LENGTH = 2;
@@ -22,5 +21,3 @@ export type Project = z.infer<typeof Project>;
export const Projects = z.array(Project);
export type Projects = z.infer<typeof Projects>;
-
-export type CanvasData = Data;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1da28147fa..a722b973d5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -879,9 +879,9 @@ importers:
'@webstudio-is/prisma-client':
specifier: workspace:^
version: link:../prisma-client
- '@webstudio-is/project':
+ '@webstudio-is/react-sdk':
specifier: workspace:^
- version: link:../project
+ version: link:../react-sdk
'@webstudio-is/scripts':
specifier: workspace:^
version: link:../scripts
@@ -1050,18 +1050,12 @@ importers:
'@webstudio-is/asset-uploader':
specifier: workspace:^
version: link:../asset-uploader
- '@webstudio-is/css-data':
- specifier: workspace:^
- version: link:../css-data
'@webstudio-is/prisma-client':
specifier: workspace:^
version: link:../prisma-client
'@webstudio-is/project-build':
specifier: workspace:^
version: link:../project-build
- '@webstudio-is/react-sdk':
- specifier: workspace:^
- version: link:../react-sdk
'@webstudio-is/trpc-interface':
specifier: workspace:^
version: link:../trpc-interface