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
Move css generation from project to sdk (#1354)
Bogdan Chadkin7e440df2355e
diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tsindex fd4bf7ac6e..dee904adb2 100644--- a/apps/builder/app/canvas/shared/styles.ts+++ b/apps/builder/app/canvas/shared/styles.ts@@ -1,21 +1,21 @@import { useEffect } from "react";import { useIsomorphicLayoutEffect } from "react-use";import { useStore } from "@nanostores/react";-import { addGlobalRules } from "@webstudio-is/project";-import {- assetsStore,- isPreviewModeStore,- selectedInstanceSelectorStore,- useBreakpoints,-} from "~/shared/nano-states";-import type { StyleDecl } from "@webstudio-is/project-build";import {collapsedAttribute,componentAttribute,getComponentMeta,getComponentNames,idAttribute,+ addGlobalRules,} from "@webstudio-is/react-sdk";+import {+ assetsStore,+ isPreviewModeStore,+ selectedInstanceSelectorStore,+ useBreakpoints,+} from "~/shared/nano-states";+import type { StyleDecl } from "@webstudio-is/project-build";import {validStaticValueTypes,type ValidStaticStyleValue,diff --git a/apps/builder/app/routes/s/css.ts b/apps/builder/app/routes/s/css.tsindex 79f20a2bbb..f20353066a 100644--- a/apps/builder/app/routes/s/css.ts+++ b/apps/builder/app/routes/s/css.ts@@ -1,5 +1,5 @@import { type ActionArgs, json } from "@remix-run/node";-import { generateCssText } from "@webstudio-is/project";+import { generateCssText } from "@webstudio-is/react-sdk";import { db } from "@webstudio-is/project/server";import env from "~/env/env.public.server";import { getBuildParams } from "~/shared/router-utils";diff --git a/packages/project/jest.config.js b/packages/project/jest.config.jsdeleted file mode 100644index e7fc137533..0000000000--- a/packages/project/jest.config.js+++ /dev/null@@ -1 +0,0 @@-export { default } from "@webstudio-is/jest-config";diff --git a/packages/project/package.json b/packages/project/package.jsonindex a7fa8572e6..c536d0ffa0 100644--- a/packages/project/package.json+++ b/packages/project/package.json@@ -7,8 +7,7 @@"type": "module","scripts": {"typecheck": "tsc --noEmit",- "test": "NODE_OPTIONS=--experimental-vm-modules jest",- "checks": "pnpm typecheck && pnpm lint && pnpm test",+ "checks": "pnpm typecheck && pnpm lint","dev": "build-package --watch","build": "build-package","lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"@@ -17,27 +16,19 @@"@trpc/server": "^10.9.0","@webstudio-is/asset-uploader": "workspace:^","@webstudio-is/css-data": "workspace:^",- "@webstudio-is/css-engine": "workspace:^",- "@webstudio-is/fonts": "workspace:^","@webstudio-is/prisma-client": "workspace:^","@webstudio-is/project-build": "workspace:^","@webstudio-is/react-sdk": "workspace:^","@webstudio-is/trpc-interface": "workspace:^",- "immer": "^9.0.12","nanoid": "^3.2.0",- "react": "^17.0.2","slugify": "^1.6.5","uuid": "^9.0.0",- "warn-once": "^0.1.1","zod": "^3.19.1"},"devDependencies": {- "@jest/globals": "^29.3.1","@types/uuid": "^8.3.4",- "@webstudio-is/jest-config": "workspace:^","@webstudio-is/scripts": "workspace:^","@webstudio-is/tsconfig": "workspace:^",- "jest": "^29.3.1","typescript": "5.0.3"},"exports": {@@ -51,8 +42,7 @@"types": "src/index.ts","files": ["lib/*",- "src/*",- "!*.test.*"+ "src/*"],"license": "MIT","private": false,diff --git a/packages/project/src/index.ts b/packages/project/src/index.tsindex fe71648d4b..1de297ed70 100644--- a/packages/project/src/index.ts+++ b/packages/project/src/index.ts@@ -1,4 +1,3 @@-export * from "./shared/styles";export * from "./shared/schema";export * from "./shared/canvas-components";export type { ProjectRouter } from "./trpc";diff --git a/packages/project/src/shared/styles/index.ts b/packages/project/src/shared/styles/index.tsdeleted file mode 100644index 24b800043a..0000000000--- a/packages/project/src/shared/styles/index.ts+++ /dev/null@@ -1,3 +0,0 @@-export * from "./global-rules";-export * from "./style-rules";-export * from "./css";diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.jsonindex 84ab73bae3..66da470072 100644--- a/packages/react-sdk/package.json+++ b/packages/react-sdk/package.json@@ -49,7 +49,9 @@"@nanostores/react": "^0.4.1","@webstudio-is/asset-uploader": "workspace:^","@webstudio-is/css-data": "workspace:^",+ "@webstudio-is/css-engine": "workspace:^","@webstudio-is/css-vars": "workspace:^",+ "@webstudio-is/fonts": "workspace:^","@webstudio-is/generate-arg-types": "workspace:^","@webstudio-is/icons": "workspace:^","@webstudio-is/image": "workspace:^",@@ -58,8 +60,7 @@"detect-font": "^0.1.5","html-tags": "^3.2.0","mitt": "^3.0.0",- "nanostores": "^0.7.1",- "warn-once": "^0.1.1"+ "nanostores": "^0.7.1"},"exports": {".": {diff --git a/packages/project/src/shared/styles/css.ts b/packages/react-sdk/src/css/css.tssimilarity index 90%rename from packages/project/src/shared/styles/css.tsrename to packages/react-sdk/src/css/css.tsindex ca43fc54a3..a611376c64 100644--- a/packages/project/src/shared/styles/css.ts+++ b/packages/react-sdk/src/css/css.ts@@ -1,12 +1,9 @@import { createCssEngine } from "@webstudio-is/css-engine";import type { Asset } from "@webstudio-is/asset-uploader";import type { Build } from "@webstudio-is/project-build";-import {- componentAttribute,- getComponentMeta,- getComponentNames,- idAttribute,-} from "@webstudio-is/react-sdk";+import { getComponentNames } from "../components/components-utils";+import { getComponentMeta } from "../components";+import { componentAttribute, idAttribute } from "../tree";import { addGlobalRules } from "./global-rules";import { getStyleRules } from "./style-rules";diff --git a/packages/project/src/shared/styles/global-rules.ts b/packages/react-sdk/src/css/global-rules.tssimilarity index 100%rename from packages/project/src/shared/styles/global-rules.tsrename to packages/react-sdk/src/css/global-rules.tsdiff --git a/packages/react-sdk/src/css/index.ts b/packages/react-sdk/src/css/index.tsindex 70258bd336..083270a433 100644--- a/packages/react-sdk/src/css/index.ts+++ b/packages/react-sdk/src/css/index.ts@@ -1 +1,4 @@export * from "./get-browser-style";+export * from "./global-rules";+export * from "./style-rules";+export * from "./css";diff --git a/packages/project/src/shared/styles/style-rules.test.ts b/packages/react-sdk/src/css/style-rules.test.tssimilarity index 100%rename from packages/project/src/shared/styles/style-rules.test.tsrename to packages/react-sdk/src/css/style-rules.test.tsdiff --git a/packages/project/src/shared/styles/style-rules.ts b/packages/react-sdk/src/css/style-rules.tssimilarity index 100%rename from packages/project/src/shared/styles/style-rules.tsrename to packages/react-sdk/src/css/style-rules.tsdiff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 5bea833d32..dfa7768705 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1056,12 +1056,6 @@ importers:'@webstudio-is/css-data':specifier: workspace:^version: link:../css-data- '@webstudio-is/css-engine':- specifier: workspace:^- version: link:../css-engine- '@webstudio-is/fonts':- specifier: workspace:^- version: link:../fonts'@webstudio-is/prisma-client':specifier: workspace:^version: link:../prisma-client@@ -1074,46 +1068,28 @@ importers:'@webstudio-is/trpc-interface':specifier: workspace:^version: link:../trpc-interface- immer:- specifier: ^9.0.12- version: 9.0.15nanoid:specifier: ^3.2.0version: 3.3.4- react:- specifier: ^17.0.2- version: 17.0.2slugify:specifier: ^1.6.5version: 1.6.5uuid:specifier: ^9.0.0version: 9.0.0- warn-once:- specifier: ^0.1.1- version: 0.1.1zod:specifier: ^3.19.1version: 3.19.1devDependencies:- '@jest/globals':- specifier: ^29.3.1- version: 29.3.1'@types/uuid':specifier: ^8.3.4version: 8.3.4- '@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.3version: 5.0.3@@ -1178,9 +1154,15 @@ importers:'@webstudio-is/css-data':specifier: workspace:^version: link:../css-data+ '@webstudio-is/css-engine':+ specifier: workspace:^+ version: link:../css-engine'@webstudio-is/css-vars':specifier: workspace:^version: link:../css-vars+ '@webstudio-is/fonts':+ specifier: workspace:^+ version: link:../fonts'@webstudio-is/generate-arg-types':specifier: workspace:^version: link:../generate-arg-types@@ -1208,9 +1190,6 @@ importers:nanostores:specifier: ^0.7.1version: 0.7.1- warn-once:- specifier: ^0.1.1- version: 0.1.1devDependencies:'@babel/core':specifier: ^7.21.0