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.

Drop prisma from cli (#2241)

Bogdan Chadkinee0e0f7e7a8f
diff --git a/apps/builder/app/builder/features/settings-panel/controls/url.tsx b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
index 579b3139a0..8655cd05c1 100644
--- a/apps/builder/app/builder/features/settings-panel/controls/url.tsx
+++ b/apps/builder/app/builder/features/settings-panel/controls/url.tsx
@@ -19,7 +19,7 @@ import {
PhoneIcon,
} from "@webstudio-is/icons";
import type { Instance, Page } from "@webstudio-is/sdk";
-import { findTreeInstanceIds } from "@webstudio-is/project-build";
+import { findTreeInstanceIds } from "@webstudio-is/sdk";
import { instancesStore, pagesStore, propsStore } from "~/shared/nano-states";
import {
type ControlProps,
diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
index 4c9263c2b8..54f900eec3 100644
--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx
@@ -10,7 +10,7 @@ import { useStore } from "@nanostores/react";
import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
import store from "immerhin";
import type { Instance, Instances } from "@webstudio-is/sdk";
-import { findTreeInstanceIds } from "@webstudio-is/project-build";
+import { findTreeInstanceIds } from "@webstudio-is/sdk";
import {
type Components,
renderWebstudioComponentChildren,
diff --git a/apps/builder/app/routes/rest.build.$buildId.tsx b/apps/builder/app/routes/rest.build.$buildId.tsx
index 48f5c92c27..d61b6d5234 100644
--- a/apps/builder/app/routes/rest.build.$buildId.tsx
+++ b/apps/builder/app/routes/rest.build.$buildId.tsx
@@ -1,5 +1,5 @@
import { json, type LoaderArgs } from "@remix-run/node";
-import type { Data } from "@webstudio-is/react-sdk";
+import type { Data } from "@webstudio-is/http-client";
import { db as projectDb } from "@webstudio-is/project/index.server";
import { sentryException } from "~/shared/sentry";
import { loadProductionCanvasData } from "~/shared/db";
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.ts
index 37b81fe2ea..401773808f 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts
@@ -3,7 +3,7 @@ import { nanoid } from "nanoid";
import store from "immerhin";
import { z } from "zod";
import { toast } from "@webstudio-is/design-system";
-import { findTreeInstanceIds } from "@webstudio-is/project-build";
+import { findTreeInstanceIds } from "@webstudio-is/sdk";
import {
Asset,
Breakpoint,
diff --git a/apps/builder/app/shared/db/canvas.server.ts b/apps/builder/app/shared/db/canvas.server.ts
index 0af85715f4..1955f70b5a 100644
--- a/apps/builder/app/shared/db/canvas.server.ts
+++ b/apps/builder/app/shared/db/canvas.server.ts
@@ -1,4 +1,4 @@
-import type { Data } from "@webstudio-is/react-sdk";
+import type { Data } from "@webstudio-is/http-client";
import { loadBuildById } from "@webstudio-is/project-build/index.server";
import { loadAssetsByProject } from "@webstudio-is/asset-uploader/index.server";
import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.ts
index cd6ae717e2..287633b8a9 100644
--- a/apps/builder/app/shared/instance-utils.ts
+++ b/apps/builder/app/shared/instance-utils.ts
@@ -6,7 +6,7 @@ import {
type StyleSource,
getStyleDeclKey,
} from "@webstudio-is/sdk";
-import { findTreeInstanceIdsExcludingSlotDescendants } from "@webstudio-is/project-build";
+import { findTreeInstanceIdsExcludingSlotDescendants } from "@webstudio-is/sdk";
import {
type WsComponentMeta,
generateDataFromEmbedTemplate,
diff --git a/apps/builder/app/shared/tree-utils.ts b/apps/builder/app/shared/tree-utils.ts
index ddc1f81f68..40802e27de 100644
--- a/apps/builder/app/shared/tree-utils.ts
+++ b/apps/builder/app/shared/tree-utils.ts
@@ -18,7 +18,7 @@ import {
import {
findTreeInstanceIds,
findTreeInstanceIdsExcludingSlotDescendants,
-} from "@webstudio-is/project-build";
+} from "@webstudio-is/sdk";
import { equalMedia } from "@webstudio-is/css-engine";
import type { WsComponentMeta } from "@webstudio-is/react-sdk";
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 302d262729..3114188a20 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -49,16 +49,17 @@
"@webstudio-is/error-utils": "workspace:^",
"@webstudio-is/feature-flags": "workspace:^",
"@webstudio-is/fonts": "workspace:^",
+ "@webstudio-is/http-client": "workspace:^",
"@webstudio-is/icons": "workspace:^",
"@webstudio-is/image": "workspace:^",
"@webstudio-is/prisma-client": "workspace:^",
"@webstudio-is/project": "workspace:^",
"@webstudio-is/project-build": "workspace:^",
"@webstudio-is/react-sdk": "workspace:^",
+ "@webstudio-is/sdk": "workspace:^",
"@webstudio-is/sdk-components-react": "workspace:^",
"@webstudio-is/sdk-components-react-radix": "workspace:^",
"@webstudio-is/sdk-components-react-remix": "workspace:^",
- "@webstudio-is/sdk": "workspace:^",
"@webstudio-is/trpc-interface": "workspace:^",
"colord": "^2.9.3",
"date-fns": "^2.30.0",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f51c324bd3..8518817a0b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -18,12 +18,11 @@
"dependencies": {
"@webstudio-is/http-client": "workspace:^",
"@webstudio-is/image": "workspace:^",
- "@webstudio-is/project-build": "workspace:^",
"@webstudio-is/react-sdk": "workspace:^",
+ "@webstudio-is/sdk": "workspace:^",
"@webstudio-is/sdk-components-react": "workspace:^",
"@webstudio-is/sdk-components-react-radix": "workspace:^",
"@webstudio-is/sdk-components-react-remix": "workspace:^",
- "@webstudio-is/sdk": "workspace:^",
"env-paths": "^3.0.0",
"ora": "^7.0.1",
"p-limit": "^4.0.0",
@@ -31,6 +30,7 @@
},
"devDependencies": {
"@types/node": "^18.13.0",
+ "@webstudio-is/form-handlers": "workspace:^",
"@webstudio-is/scripts": "workspace:^",
"@webstudio-is/tsconfig": "workspace:^",
"tsx": "^3.12.6",
diff --git a/packages/cli/src/prebuild.ts b/packages/cli/src/prebuild.ts
index d620d1df81..009f6dab3c 100644
--- a/packages/cli/src/prebuild.ts
+++ b/packages/cli/src/prebuild.ts
@@ -7,12 +7,18 @@ import {
generateCssText,
generateUtilsExport,
type Params,
- type Data,
type WsComponentMeta,
} from "@webstudio-is/react-sdk";
-import type { Instance, Prop, Page, DataSource } from "@webstudio-is/sdk";
-import { findTreeInstanceIds, type Build } from "@webstudio-is/project-build";
+import type {
+ Instance,
+ Prop,
+ Page,
+ DataSource,
+ Deployment,
+} from "@webstudio-is/sdk";
+import { findTreeInstanceIds } from "@webstudio-is/sdk";
import type { Asset, FontAsset } from "@webstudio-is/sdk";
+import type { Data } from "@webstudio-is/http-client";
import * as baseComponentMetas from "@webstudio-is/sdk-components-react/metas";
import * as remixComponentMetas from "@webstudio-is/sdk-components-react-remix/metas";
import * as radixComponentMetas from "@webstudio-is/sdk-components-react-radix/metas";
@@ -42,7 +48,12 @@ type ComponentsByPage = {
type SiteDataByPage = {
[path: string]: {
page: Page;
- build: Pick<Build, "props" | "instances" | "dataSources" | "deployment">;
+ build: {
+ props: [Prop["id"], Prop][];
+ instances: [Instance["id"], Instance][];
+ dataSources: [DataSource["id"], DataSource][];
+ deployment?: Deployment | undefined;
+ };
assets: Array<Asset>;
params?: Params;
pages: Array<Page>;
diff --git a/packages/form-handlers/package.json b/packages/form-handlers/package.json
index 1135b3a154..4b1bfc8ee6 100644
--- a/packages/form-handlers/package.json
+++ b/packages/form-handlers/package.json
@@ -13,7 +13,7 @@
"dts": "tsc --project tsconfig.dts.json"
},
"dependencies": {
- "@webstudio-is/project-build": "workspace:^"
+ "@webstudio-is/sdk": "workspace:^"
},
"devDependencies": {
"@webstudio-is/scripts": "workspace:^",
diff --git a/packages/form-handlers/src/shared.ts b/packages/form-handlers/src/shared.ts
index 4df362e5a0..37dbb6d14d 100644
--- a/packages/form-handlers/src/shared.ts
+++ b/packages/form-handlers/src/shared.ts
@@ -1,4 +1,4 @@
-import type { Build } from "@webstudio-is/project-build";
+import type { Instance, Prop } from "@webstudio-is/sdk";
export const formHiddenFieldPrefix = "ws--form";
export const formIdFieldName = `${formHiddenFieldPrefix}-id`;
@@ -114,7 +114,7 @@ export const getErrors = (
/** Checks that `formData` corresponds to a form in the `instances` tree */
export const hasMatchingForm = (
formData: FormData,
- instances: Build["instances"]
+ instances: [Instance["id"], Instance][]
) => {
const formId = getFormId(formData);
@@ -133,8 +133,8 @@ export const hasMatchingForm = (
export const getFormProperties = (
formData: FormData,
- instances: Build["instances"],
- props: Build["props"]
+ instances: [Instance["id"], Instance][],
+ props: [Prop["id"], Prop][]
) => {
const formId = getFormId(formData);
diff --git a/packages/http-client/package.json b/packages/http-client/package.json
index 8aba25505e..aa1aae31d4 100644
--- a/packages/http-client/package.json
+++ b/packages/http-client/package.json
@@ -13,11 +13,13 @@
"typecheck": "tsc",
"checks": "pnpm typecheck"
},
+ "dependencies": {
+ "@webstudio-is/sdk": "workspace:^"
+ },
"devDependencies": {
"@jest/globals": "^29.6.2",
"@webstudio-is/jest-config": "workspace:^",
"@webstudio-is/prisma-client": "workspace:^",
- "@webstudio-is/react-sdk": "workspace:^",
"@webstudio-is/scripts": "workspace:^",
"@webstudio-is/tsconfig": "workspace:^",
"jest": "^29.6.2",
diff --git a/packages/http-client/src/index.ts b/packages/http-client/src/index.ts
index c7a13aaf37..f3308ed057 100644
--- a/packages/http-client/src/index.ts
+++ b/packages/http-client/src/index.ts
@@ -1,4 +1,38 @@
-import type { Data } from "@webstudio-is/react-sdk";
+import type {
+ Asset,
+ Breakpoint,
+ DataSource,
+ Deployment,
+ Instance,
+ Page,
+ Pages,
+ Prop,
+ StyleDecl,
+ StyleDeclKey,
+ StyleSource,
+ StyleSourceSelection,
+} from "@webstudio-is/sdk";
+
+export type Data = {
+ page: Page;
+ pages: Array<Page>;
+ build: {
+ id: string;
+ projectId: string;
+ version: number;
+ createdAt: string;
+ pages: Pages;
+ breakpoints: [Breakpoint["id"], Breakpoint][];
+ styles: [StyleDeclKey, StyleDecl][];
+ styleSources: [StyleSource["id"], StyleSource][];
+ styleSourceSelections: [Instance["id"], StyleSourceSelection][];
+ props: [Prop["id"], Prop][];
+ instances: [Instance["id"], Instance][];
+ dataSources: [DataSource["id"], DataSource][];
+ deployment?: Deployment | undefined;
+ };
+ assets: Array<Asset>;
+};
interface DefaultArgs {
host: string;
diff --git a/packages/project-build/src/index.ts b/packages/project-build/src/index.ts
index 1ea2fef16e..6cc51677ee 100644
--- a/packages/project-build/src/index.ts
+++ b/packages/project-build/src/index.ts
@@ -1,3 +1,2 @@
export * from "./types";
export * from "./shared/pages-utils";
-export * from "./shared/instances-utils";
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index 27ebcc3fa0..5ab084cad5 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -40,7 +40,6 @@
"@webstudio-is/css-data": "workspace:^",
"@webstudio-is/css-engine": "workspace:^",
"@webstudio-is/fonts": "workspace:^",
- "@webstudio-is/project-build": "workspace:^",
"@webstudio-is/sdk": "workspace:^",
"html-tags": "^3.3.1",
"jsep": "^1.3.8",
diff --git a/packages/react-sdk/src/css/css.ts b/packages/react-sdk/src/css/css.ts
index 6dfed30166..7a50540524 100644
--- a/packages/react-sdk/src/css/css.ts
+++ b/packages/react-sdk/src/css/css.ts
@@ -1,6 +1,13 @@
import { createCssEngine, type TransformValue } from "@webstudio-is/css-engine";
-import type { Asset, Assets } from "@webstudio-is/sdk";
-import type { Build } from "@webstudio-is/project-build";
+import type {
+ Asset,
+ Assets,
+ Breakpoint,
+ Instance,
+ StyleDecl,
+ StyleDeclKey,
+ StyleSourceSelection,
+} from "@webstudio-is/sdk";
import type { WsComponentMeta } from "../components/component-meta";
import { idAttribute } from "../tree";
import { addGlobalRules } from "./global-rules";
@@ -8,9 +15,9 @@ import { getPresetStyleRules, getStyleRules } from "./style-rules";
type Data = {
assets: Asset[];
- breakpoints?: Build["breakpoints"];
- styles?: Build["styles"];
- styleSourceSelections?: Build["styleSourceSelections"];
+ breakpoints: [Breakpoint["id"], Breakpoint][];
+ styles: [StyleDeclKey, StyleDecl][];
+ styleSourceSelections: [Instance["id"], StyleSourceSelection][];
componentMetas: Map<string, WsComponentMeta>;
};
diff --git a/packages/react-sdk/src/tree/root.ts b/packages/react-sdk/src/tree/root.ts
index 8379ca5673..9e79e0fc96 100644
--- a/packages/react-sdk/src/tree/root.ts
+++ b/packages/react-sdk/src/tree/root.ts
@@ -11,8 +11,13 @@ import {
type ReadableAtom,
type WritableAtom,
} from "nanostores";
-import type { Build } from "@webstudio-is/project-build";
-import type { Page, Asset } from "@webstudio-is/sdk";
+import type {
+ Page,
+ Asset,
+ DataSource,
+ Instance,
+ Prop,
+} from "@webstudio-is/sdk";
import { createElementsTree } from "./create-elements-tree";
import {
WebstudioComponent,
@@ -23,16 +28,16 @@ import type { Components } from "../components/components-utils";
import type { Params, DataSourceValues } from "../context";
import type { GeneratedUtils } from "../generator";
-export type Data = {
+export type RootPropsData = {
+ params?: Params;
page: Page;
pages: Array<Page>;
- build: Build;
assets: Array<Asset>;
- params?: Params;
-};
-
-export type RootPropsData = Omit<Data, "build"> & {
- build: Pick<Data["build"], "instances" | "props" | "dataSources">;
+ build: {
+ instances: [Instance["id"], Instance][];
+ dataSources: [DataSource["id"], DataSource][];
+ props: [Prop["id"], Prop][];
+ };
};
type RootProps = {
diff --git a/packages/sdk/jest.config.js b/packages/sdk/jest.config.js
new file mode 100644
index 0000000000..e7fc137533
--- /dev/null
+++ b/packages/sdk/jest.config.js
@@ -0,0 +1 @@
+export { default } from "@webstudio-is/jest-config";
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 902bb3edd8..59875b5ecf 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -20,7 +20,8 @@
"sideEffects": false,
"scripts": {
"typecheck": "tsc",
- "checks": "pnpm typecheck",
+ "test": "NODE_OPTIONS=--experimental-vm-modules jest",
+ "checks": "pnpm typecheck && pnpm test",
"dev": "build-package --watch",
"build": "build-package",
"dts": "tsc --project tsconfig.dts.json"
@@ -31,7 +32,10 @@
"zod": "^3.21.4"
},
"devDependencies": {
+ "@jest/globals": "^29.6.2",
+ "@webstudio-is/jest-config": "workspace:^",
"@webstudio-is/scripts": "workspace:^",
- "@webstudio-is/tsconfig": "workspace:^"
+ "@webstudio-is/tsconfig": "workspace:^",
+ "jest": "^29.6.2"
}
}
diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
index 3588118eff..0457309fec 100644
--- a/packages/sdk/src/index.ts
+++ b/packages/sdk/src/index.ts
@@ -8,3 +8,5 @@ export * from "./schema/style-sources";
export * from "./schema/style-source-selections";
export * from "./schema/styles";
export * from "./schema/deployment";
+
+export * from "./instances-utils";
diff --git a/packages/project-build/src/shared/instances-utils.test.ts b/packages/sdk/src/instances-utils.test.ts
similarity index 96%
rename from packages/project-build/src/shared/instances-utils.test.ts
rename to packages/sdk/src/instances-utils.test.ts
index b3af91d358..05967ada28 100644
--- a/packages/project-build/src/shared/instances-utils.test.ts
+++ b/packages/sdk/src/instances-utils.test.ts
@@ -1,5 +1,5 @@
import { expect, test } from "@jest/globals";
-import type { Instance, Instances } from "@webstudio-is/sdk";
+import type { Instance, Instances } from "./schema/instances";
import {
findTreeInstanceIds,
findTreeInstanceIdsExcludingSlotDescendants,
diff --git a/packages/project-build/src/shared/instances-utils.ts b/packages/sdk/src/instances-utils.ts
similarity index 94%
rename from packages/project-build/src/shared/instances-utils.ts
rename to packages/sdk/src/instances-utils.ts
index eb693dfcb5..f02b1aa2dd 100644
--- a/packages/project-build/src/shared/instances-utils.ts
+++ b/packages/sdk/src/instances-utils.ts
@@ -1,4 +1,4 @@
-import type { Instance, Instances } from "@webstudio-is/sdk";
+import type { Instance, Instances } from "./schema/instances";
const traverseInstances = (
instances: Instances,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e461dd1ec9..c473cdede8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -144,6 +144,9 @@ importers:
'@webstudio-is/fonts':
specifier: workspace:^
version: link:../../packages/fonts
+ '@webstudio-is/http-client':
+ specifier: workspace:^
+ version: link:../../packages/http-client
'@webstudio-is/icons':
specifier: workspace:^
version: link:../../packages/icons
@@ -447,9 +450,6 @@ importers:
'@webstudio-is/image':
specifier: workspace:^
version: link:../image
- '@webstudio-is/project-build':
- specifier: workspace:^
- version: link:../project-build
'@webstudio-is/react-sdk':
specifier: workspace:^
version: link:../react-sdk
@@ -481,6 +481,9 @@ importers:
'@types/node':
specifier: ^18.13.0
version: 18.13.0
+ '@webstudio-is/form-handlers':
+ specifier: workspace:^
+ version: link:../form-handlers
'@webstudio-is/scripts':
specifier: workspace:^
version: link:../scripts
@@ -913,9 +916,9 @@ importers:
packages/form-handlers:
dependencies:
- '@webstudio-is/project-build':
+ '@webstudio-is/sdk':
specifier: workspace:^
- version: link:../project-build
+ version: link:../sdk
devDependencies:
'@webstudio-is/scripts':
specifier: workspace:^
@@ -987,6 +990,10 @@ importers:
version: link:../tsconfig
packages/http-client:
+ dependencies:
+ '@webstudio-is/sdk':
+ specifier: workspace:^
+ version: link:../sdk
devDependencies:
'@jest/globals':
specifier: ^29.6.2
@@ -997,9 +1004,6 @@ importers:
'@webstudio-is/prisma-client':
specifier: workspace:^
version: link:../prisma-client
- '@webstudio-is/react-sdk':
- specifier: workspace:^
- version: link:../react-sdk
'@webstudio-is/scripts':
specifier: workspace:^
version: link:../scripts
@@ -1248,9 +1252,6 @@ importers:
'@webstudio-is/fonts':
specifier: workspace:^
version: link:../fonts
- '@webstudio-is/project-build':
- specifier: workspace:^
- version: link:../project-build
'@webstudio-is/sdk':
specifier: workspace:^
version: link:../sdk
@@ -1350,12 +1351,21 @@ importers:
specifier: ^3.21.4
version: 3.21.4
devDependencies:
+ '@jest/globals':
+ specifier: ^29.6.2
+ version: 29.6.2
+ '@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.6.2
+ version: 29.6.2(@types/[email protected])
packages/sdk-components-react:
dependencies: