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
refactor: bundle webstudio packages in cli (#4706)
Bogdan Chadkin71f56ea7d619
diff --git a/apps/builder/app/builder/features/settings-panel/shared.tsx b/apps/builder/app/builder/features/settings-panel/shared.tsxindex aba81e072e..85e7ef31a3 100644--- a/apps/builder/app/builder/features/settings-panel/shared.tsx+++ b/apps/builder/app/builder/features/settings-panel/shared.tsx@@ -400,5 +400,8 @@ export const humanizeAttribute = (string: string) => {if (string === "className") {return "Class";}+ if (string === "htmlFor") {+ return "For";+ }return humanizeString(string);};diff --git a/packages/cli/package.json b/packages/cli/package.jsonindex ecc28633a5..8e518cbf02 100644--- a/packages/cli/package.json+++ b/packages/cli/package.json@@ -23,7 +23,7 @@],"scripts": {"typecheck": "tsc",- "build": "rm -rf lib && esbuild src/cli.ts --outdir=lib --bundle --format=esm --packages=external",+ "build": "rm -rf lib && vite build","test": "vitest run"},"license": "AGPL-3.0-or-later",@@ -32,21 +32,20 @@},"dependencies": {"@clack/prompts": "^0.7.0",- "@webstudio-is/http-client": "workspace:*",- "@webstudio-is/image": "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:*",+ "@emotion/hash": "^0.9.2",+ "acorn": "^8.14.0",+ "acorn-walk": "^8.3.4","change-case": "^5.4.4","deepmerge": "^4.3.1","env-paths": "^3.0.0",+ "nanoid": "^5.0.8","p-limit": "^4.0.0","parse5": "7.1.2","picocolors": "^1.1.0",- "strip-indent": "^4.0.0",+ "react": "18.3.0-canary-14898b6a9-20240318",+ "reserved-identifiers": "^1.0.0","tinyexec": "^0.3.1",+ "warn-once": "^0.1.1","yargs": "^17.7.2","zod": "^3.22.4"},@@ -63,9 +62,15 @@"@types/react-dom": "^18.2.25","@types/yargs": "^17.0.33","@vitejs/plugin-react": "^4.3.4",+ "@webstudio-is/http-client": "workspace:*",+ "@webstudio-is/image": "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/tsconfig": "workspace:*","prettier": "3.4.2",- "react": "18.3.0-canary-14898b6a9-20240318","react-dom": "18.3.0-canary-14898b6a9-20240318","ts-expect": "^1.3.0","vike": "^0.4.210",diff --git a/packages/cli/vite.config.ts b/packages/cli/vite.config.tsnew file mode 100644index 0000000000..880b548e76--- /dev/null+++ b/packages/cli/vite.config.ts@@ -0,0 +1,50 @@+import { defineConfig } from "vite";+import pkg from "./package.json";++const isExternal = (id: string, importer: string | undefined) => {+ if (id.startsWith("@webstudio-is/")) {+ return false;+ }+ if (id.startsWith("node:")) {+ return true;+ }+ if (id.startsWith("@")) {+ const packageName = id.split("/").slice(0, 2).join("/");+ if (packageName in pkg.dependencies === false) {+ throw Error(+ `${packageName} imported from ${importer} is not found in direct dependencies`+ );+ }+ return true;+ }+ if (id.includes(".") === false) {+ const [packageName] = id.split("/");+ if (packageName in pkg.dependencies === false) {+ throw Error(+ `${packageName} imported from ${importer} is not found in direct dependencies`+ );+ }+ return true;+ }+ return false;+};++export default defineConfig({+ // resolve only webstudio condition in tests+ resolve: {+ conditions: ["webstudio"],+ },+ build: {+ minify: false,+ lib: {+ entry: ["src/cli.ts"],+ formats: ["es"],+ },+ rollupOptions: {+ external: isExternal,+ output: {+ dir: "lib",+ },+ },+ },+});diff --git a/packages/image/src/image.tsx b/packages/image/src/image.tsxindex 6d320422c5..c735bf11a5 100644--- a/packages/image/src/image.tsx+++ b/packages/image/src/image.tsx@@ -9,6 +9,7 @@ const defaultTag = "img";type ImageProps = ComponentProps<typeof defaultTag> & {quality?: number;+ /** Optimize the image for enhanced performance. */optimize?: boolean;loader: ImageLoader;};diff --git a/packages/sdk-components-react-radix/package.json b/packages/sdk-components-react-radix/package.jsonindex 663385987c..ef3d7c730b 100644--- a/packages/sdk-components-react-radix/package.json+++ b/packages/sdk-components-react-radix/package.json@@ -41,7 +41,7 @@},"scripts": {"build": "vite build --config ../../vite.sdk-components.config.ts",- "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.ws.ts !./src/*.test.{ts,tsx}' -e asChild -e modal -e defaultOpen -e defaultChecked && prettier --write \"**/*.props.ts\"",+ "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.ws.ts !./src/*.template.tsx !./src/*.test.{ts,tsx}' -e asChild -e modal -e defaultOpen -e defaultChecked && prettier --write \"**/*.props.ts\"","build:stories": "webstudio-sdk generate-stories && prettier --write \"src/__generated__/*.stories.tsx\"","dts": "tsc --project tsconfig.dts.json","typecheck": "tsc"diff --git a/packages/sdk-components-react-radix/src/__generated__/select.props.ts b/packages/sdk-components-react-radix/src/__generated__/select.props.tsindex 45b8e28b21..57a12b9e0b 100644--- a/packages/sdk-components-react-radix/src/__generated__/select.props.ts+++ b/packages/sdk-components-react-radix/src/__generated__/select.props.ts@@ -23,6 +23,12 @@ export const propsSelect: Record<string, PropMeta> = {type: "boolean",description: "Indicates whether the user can interact with the element.",},+ form: {+ required: false,+ control: "text",+ type: "string",+ description: "Indicates the form that is the owner of the element.",+ },name: {required: false,control: "text",diff --git a/packages/sdk-components-react-radix/src/__generated__/tabs.props.ts b/packages/sdk-components-react-radix/src/__generated__/tabs.props.tsindex 0c97772f1b..31356b8c51 100644--- a/packages/sdk-components-react-radix/src/__generated__/tabs.props.ts+++ b/packages/sdk-components-react-radix/src/__generated__/tabs.props.ts@@ -579,10 +579,11 @@ export const propsTabs: Record<string, PropMeta> = {options: ["on", "off"],},value: {- description: "The value for the selected tab, if controlled",required: false,control: "text",type: "string",+ description:+ "Defines a default value which will be displayed in the element on pageload.",},vocab: { required: false, control: "text", type: "string" },};diff --git a/packages/sdk-components-react-radix/src/label.ws.ts b/packages/sdk-components-react-radix/src/label.ws.tsindex db6d92b723..63d1d2bee3 100644--- a/packages/sdk-components-react-radix/src/label.ws.ts+++ b/packages/sdk-components-react-radix/src/label.ws.ts@@ -20,12 +20,6 @@ export const meta: WsComponentMeta = {};export const propsMeta: WsComponentPropsMeta = {- props: {- ...props,- htmlFor: {- ...props.htmlFor,- label: "For",- },- },+ props,initialProps: ["id", "className", "htmlFor"],};diff --git a/packages/sdk-components-react-radix/src/navigation-menu.template.tsx b/packages/sdk-components-react-radix/src/navigation-menu.template.tsxindex 005862303b..3da0d767d2 100644--- a/packages/sdk-components-react-radix/src/navigation-menu.template.tsx+++ b/packages/sdk-components-react-radix/src/navigation-menu.template.tsx@@ -76,7 +76,7 @@ const components = [];const createMenuContentItem = (props: (typeof components)[number]) => (- <radix.NavigationMenuLink>+ <radix.NavigationMenuLink key={props.title}><$.Linkhref={`https://ui.shadcn.com${props.href}`}// block select-none space-y-1 rounded-md p-3 leading-nonediff --git a/packages/sdk-components-react/package.json b/packages/sdk-components-react/package.jsonindex 55e41e95c1..103dc7a940 100644--- a/packages/sdk-components-react/package.json+++ b/packages/sdk-components-react/package.json@@ -41,7 +41,7 @@},"scripts": {"build": "vite build --config ../../vite.sdk-components.config.ts",- "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.test.{ts,tsx} !./src/*.ws.ts' && prettier --write \"**/*.props.ts\"",+ "build:args": "NODE_OPTIONS=--conditions=webstudio generate-arg-types './src/*.tsx !./src/*.stories.tsx !./src/*.test.{ts,tsx} !./src/*.ws.ts !./src/*.ws.ts !./src/*.template.tsx' && prettier --write \"**/*.props.ts\"","dts": "tsc --project tsconfig.dts.json","test": "vitest run","typecheck": "tsc"diff --git a/packages/sdk-components-react/src/__generated__/image.props.ts b/packages/sdk-components-react/src/__generated__/image.props.tsindex f43f110545..be57b921d6 100644--- a/packages/sdk-components-react/src/__generated__/image.props.ts+++ b/packages/sdk-components-react/src/__generated__/image.props.ts@@ -529,6 +529,7 @@ export const props: Record<string, PropMeta> = {},nonce: { required: false, control: "text", type: "string" },optimize: {+ description: "Optimize the image for enhanced performance.",required: false,control: "boolean",type: "boolean",diff --git a/packages/sdk-components-react/src/__generated__/vimeo-preview-image.props.ts b/packages/sdk-components-react/src/__generated__/vimeo-preview-image.props.tsindex ef5233e023..3dde01e6a6 100644--- a/packages/sdk-components-react/src/__generated__/vimeo-preview-image.props.ts+++ b/packages/sdk-components-react/src/__generated__/vimeo-preview-image.props.ts@@ -527,7 +527,12 @@ export const props: Record<string, PropMeta> = {"Determines whether the image will load as soon as possible (Eager), or when it scrolls into view (Lazy). Lazy loading is a great option for pages with many images because it can significantly reduce the time it takes for the page to load initially.",},nonce: { required: false, control: "text", type: "string" },- optimize: { required: false, control: "boolean", type: "boolean" },+ optimize: {+ description: "Optimize the image for enhanced performance.",+ required: false,+ control: "boolean",+ type: "boolean",+ },prefix: { required: false, control: "text", type: "string" },property: { required: false, control: "text", type: "string" },quality: { required: false, control: "number", type: "number" },diff --git a/packages/sdk-components-react/src/__generated__/vimeo.props.ts b/packages/sdk-components-react/src/__generated__/vimeo.props.tsindex ccd37bb5e3..54743cc4b1 100644--- a/packages/sdk-components-react/src/__generated__/vimeo.props.ts+++ b/packages/sdk-components-react/src/__generated__/vimeo.props.ts@@ -427,7 +427,6 @@ export const props: Record<string, PropMeta> = {required: false,control: "boolean",type: "boolean",- defaultValue: false,},className: { required: false, control: "text", type: "string" },color: {diff --git a/packages/sdk-components-react/src/image.ws.ts b/packages/sdk-components-react/src/image.ws.tsindex b4accbcd56..4a465d86fc 100644--- a/packages/sdk-components-react/src/image.ws.ts+++ b/packages/sdk-components-react/src/image.ws.ts@@ -45,24 +45,16 @@ export const meta: WsComponentMeta = {order: 0,};-// Automatically generated props don't have the right control.-export const propsOverrides = {- src: {- type: "string",- control: "file",- label: "Source",- required: false,- },-} as const;--const optimize = props.optimize;-optimize.description = "Optimize the image for enhanced performance.";-export const propsMeta: WsComponentPropsMeta = {props: {...props,- ...propsOverrides,- optimize,+ // Automatically generated props don't have the right control.+ src: {+ type: "string",+ control: "file",+ label: "Source",+ required: false,+ },},initialProps: ["id",diff --git a/packages/sdk-components-react/src/label.ws.ts b/packages/sdk-components-react/src/label.ws.tsindex 942ca44347..65d916a65f 100644--- a/packages/sdk-components-react/src/label.ws.ts+++ b/packages/sdk-components-react/src/label.ws.ts@@ -29,12 +29,6 @@ export const meta: WsComponentMeta = {};export const propsMeta: WsComponentPropsMeta = {- props: {- ...props,- htmlFor: {- ...props.htmlFor,- label: "For",- },- },+ props,initialProps: ["id", "className", "htmlFor"],};diff --git a/packages/sdk-components-react/src/vimeo-play-button.ws.ts b/packages/sdk-components-react/src/vimeo-play-button.ws.tsindex 36a278fe7e..665dd97f5e 100644--- a/packages/sdk-components-react/src/vimeo-play-button.ws.ts+++ b/packages/sdk-components-react/src/vimeo-play-button.ws.ts@@ -7,7 +7,7 @@ import {import { props } from "./__generated__/vimeo-play-button.props";import { ButtonElementIcon } from "@webstudio-is/icons/svg";import { button } from "@webstudio-is/sdk/normalize.css";-import { defaultTag } from "./vimeo-play-button";+import type { defaultTag } from "./vimeo-play-button";const presetStyle = {button,diff --git a/packages/sdk-components-react/src/vimeo-preview-image.ws.ts b/packages/sdk-components-react/src/vimeo-preview-image.ws.tsindex 966a828315..df1e9eeab6 100644--- a/packages/sdk-components-react/src/vimeo-preview-image.ws.ts+++ b/packages/sdk-components-react/src/vimeo-preview-image.ws.ts@@ -2,11 +2,7 @@ import {type WsComponentMeta,type WsComponentPropsMeta,} from "@webstudio-is/react-sdk";-import {- propsOverrides as imagePropsOverrides,- propsMeta as imagePropsMeta,- meta as imageMeta,-} from "./image.ws";+import { propsMeta as imagePropsMeta, meta as imageMeta } from "./image.ws";import { props } from "./__generated__/vimeo-preview-image.props";export const meta: WsComponentMeta = {@@ -20,6 +16,15 @@ export const meta: WsComponentMeta = {};export const propsMeta: WsComponentPropsMeta = {- props: { ...props, ...imagePropsOverrides },+ props: {+ ...props,+ // Automatically generated props don't have the right control.+ src: {+ type: "string",+ control: "file",+ label: "Source",+ required: false,+ },+ },initialProps: imagePropsMeta.initialProps,};diff --git a/packages/sdk-components-react/src/vimeo.ws.ts b/packages/sdk-components-react/src/vimeo.ws.tsindex 85c8c2ed4f..8902c89820 100644--- a/packages/sdk-components-react/src/vimeo.ws.ts+++ b/packages/sdk-components-react/src/vimeo.ws.ts@@ -8,7 +8,7 @@ import {} from "@webstudio-is/react-sdk";import { div } from "@webstudio-is/sdk/normalize.css";import { props } from "./__generated__/vimeo.props";-import { Vimeo } from "./vimeo";+import type { Vimeo } from "./vimeo";const presetStyle = {div,diff --git a/packages/sdk/package.json b/packages/sdk/package.jsonindex ce8b8c909d..fc044e6ab6 100644--- a/packages/sdk/package.json+++ b/packages/sdk/package.json@@ -49,7 +49,6 @@"@webstudio-is/template": "workspace:*","@webstudio-is/tsconfig": "workspace:*","html-tags": "^4.0.0",- "strip-indent": "^4.0.0","vitest": "^2.1.8"}}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 0799d87bb7..a8f2857460 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1008,27 +1008,15 @@ importers:'@clack/prompts':specifier: ^0.7.0version: 0.7.0- '@webstudio-is/http-client':- specifier: workspace:*- version: link:../http-client- '@webstudio-is/image':- specifier: workspace:*- version: link:../image- '@webstudio-is/react-sdk':- specifier: workspace:*- version: link:../react-sdk- '@webstudio-is/sdk':- specifier: workspace:*- version: link:../sdk- '@webstudio-is/sdk-components-react':- specifier: workspace:*- version: link:../sdk-components-react- '@webstudio-is/sdk-components-react-radix':- specifier: workspace:*- version: link:../sdk-components-react-radix- '@webstudio-is/sdk-components-react-remix':- specifier: workspace:*- version: link:../sdk-components-react-remix+ '@emotion/hash':+ specifier: ^0.9.2+ version: 0.9.2+ acorn:+ specifier: ^8.14.0+ version: 8.14.0+ acorn-walk:+ specifier: ^8.3.4+ version: 8.3.4change-case:specifier: ^5.4.4version: 5.4.4@@ -1038,6 +1026,9 @@ importers:env-paths:specifier: ^3.0.0version: 3.0.0+ nanoid:+ specifier: ^5.0.8+ version: 5.0.8p-limit:specifier: ^4.0.0version: 4.0.0@@ -1047,12 +1038,18 @@ importers:picocolors:specifier: ^1.1.0version: 1.1.0- strip-indent:- specifier: ^4.0.0- version: 4.0.0+ react:+ specifier: 18.3.0-canary-14898b6a9-20240318+ version: 18.3.0-canary-14898b6a9-20240318+ reserved-identifiers:+ specifier: ^1.0.0+ version: 1.0.0tinyexec:specifier: ^0.3.1version: 0.3.1+ warn-once:+ specifier: ^0.1.1+ version: 0.1.1yargs:specifier: ^17.7.2version: 17.7.2@@ -1096,15 +1093,33 @@ importers:'@vitejs/plugin-react':specifier: ^4.3.4version: 4.3.4([email protected](@types/[email protected]))+ '@webstudio-is/http-client':+ specifier: workspace:*+ version: link:../http-client+ '@webstudio-is/image':+ specifier: workspace:*+ version: link:../image+ '@webstudio-is/react-sdk':+ specifier: workspace:*+ version: link:../react-sdk+ '@webstudio-is/sdk':+ specifier: workspace:*+ version: link:../sdk+ '@webstudio-is/sdk-components-react':+ specifier: workspace:*+ version: link:../sdk-components-react+ '@webstudio-is/sdk-components-react-radix':+ specifier: workspace:*+ version: link:../sdk-components-react-radix+ '@webstudio-is/sdk-components-react-remix':+ specifier: workspace:*+ version: link:../sdk-components-react-remix'@webstudio-is/tsconfig':specifier: workspace:*version: link:../tsconfigprettier:specifier: 3.4.2version: 3.4.2- react:- specifier: 18.3.0-canary-14898b6a9-20240318- version: 18.3.0-canary-14898b6a9-20240318react-dom:specifier: 18.3.0-canary-14898b6a9-20240318version: 18.3.0-canary-14898b6a9-20240318([email protected])@@ -1759,9 +1774,6 @@ importers:html-tags:specifier: ^4.0.0version: 4.0.0- strip-indent:- specifier: ^4.0.0- version: 4.0.0vitest:specifier: ^2.1.8version: 2.1.8(@types/[email protected])([email protected])