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.

refactor: split jsx testing utils into template package (#4604)

Bogdan Chadkin7f7a8fd9de7a
diff --git a/apps/builder/app/builder/shared/commands.test.tsx b/apps/builder/app/builder/shared/commands.test.tsx
index 9fd6d7f276..d87b0668e2 100644
--- a/apps/builder/app/builder/shared/commands.test.tsx
+++ b/apps/builder/app/builder/shared/commands.test.tsx
@@ -1,6 +1,7 @@
import { describe, expect, test } from "vitest";
import * as baseMetas from "@webstudio-is/sdk-components-react/metas";
import { createDefaultPages } from "@webstudio-is/project-build";
+import { renderJsx, $ } from "@webstudio-is/template";
import {
$instances,
$pages,
@@ -9,7 +10,6 @@ import {
import { registerContainers } from "~/shared/sync";
import { $awareness, selectInstance } from "~/shared/awareness";
import { deleteSelectedInstance, unwrap, wrapIn } from "./commands";
-import { renderJsx, $ } from "@webstudio-is/sdk/testing";
registerContainers();
diff --git a/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx b/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx
index 9454f8f4ad..e486ff84ac 100644
--- a/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx
+++ b/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx
@@ -15,7 +15,7 @@ import {
} from "~/shared/nano-states";
import { TextEditor } from "./text-editor";
import { emitCommand, subscribeCommands } from "~/canvas/shared/commands";
-import { $, renderJsx } from "@webstudio-is/sdk/testing";
+import { $, renderJsx } from "@webstudio-is/template";
import { $awareness } from "~/shared/awareness";
export default {
diff --git a/apps/builder/app/shared/copy-paste/asset-upload.test.tsx b/apps/builder/app/shared/copy-paste/asset-upload.test.tsx
index 3ea7cabff6..0daa6ce0e2 100644
--- a/apps/builder/app/shared/copy-paste/asset-upload.test.tsx
+++ b/apps/builder/app/shared/copy-paste/asset-upload.test.tsx
@@ -1,5 +1,5 @@
import { expect, test } from "vitest";
-import { $, renderJsx, AssetValue } from "@webstudio-is/sdk/testing";
+import { $, renderJsx, AssetValue } from "@webstudio-is/template";
import { denormalizeSrcProps } from "./asset-upload";
import type { StyleDecl, WebstudioFragment } from "@webstudio-is/sdk";
diff --git a/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsx b/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsx
index f9cb25bf27..f1a902dddd 100644
--- a/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsx
+++ b/apps/builder/app/shared/copy-paste/plugin-webflow/plugin-webflow.test.tsx
@@ -10,7 +10,7 @@ import {
type WebstudioFragment,
type Instance,
} from "@webstudio-is/sdk";
-import { $, renderJsx } from "@webstudio-is/sdk/testing";
+import { $, renderJsx } from "@webstudio-is/template";
import * as defaultMetas from "@webstudio-is/sdk-components-react-remix/metas";
import { __testing__ } from "./plugin-webflow";
import {
diff --git a/apps/builder/app/shared/instance-utils.test.tsx b/apps/builder/app/shared/instance-utils.test.tsx
index b210d6007e..84f6455579 100644
--- a/apps/builder/app/shared/instance-utils.test.tsx
+++ b/apps/builder/app/shared/instance-utils.test.tsx
@@ -7,7 +7,7 @@ import {
} from "@webstudio-is/react-sdk";
import type { Project } from "@webstudio-is/project";
import { createDefaultPages } from "@webstudio-is/project-build";
-import { $, ws, renderJsx, ExpressionValue } from "@webstudio-is/sdk/testing";
+import { $, ws, renderJsx, ExpressionValue } from "@webstudio-is/template";
import { parseCss } from "@webstudio-is/css-data";
import { coreMetas } from "@webstudio-is/react-sdk";
import * as defaultMetas from "@webstudio-is/sdk-components-react/metas";
diff --git a/apps/builder/app/shared/matcher.test.tsx b/apps/builder/app/shared/matcher.test.tsx
index e4423f7c5a..910061729d 100644
--- a/apps/builder/app/shared/matcher.test.tsx
+++ b/apps/builder/app/shared/matcher.test.tsx
@@ -1,6 +1,6 @@
import { describe, expect, test, vi } from "vitest";
import type { JSX } from "react";
-import { renderJsx, $, ExpressionValue } from "@webstudio-is/sdk/testing";
+import { renderJsx, $, ExpressionValue } from "@webstudio-is/template";
import { coreMetas } from "@webstudio-is/react-sdk";
import * as baseMetas from "@webstudio-is/sdk-components-react/metas";
import type { WsComponentMeta } from "@webstudio-is/react-sdk";
diff --git a/apps/builder/app/shared/style-object-model.test.tsx b/apps/builder/app/shared/style-object-model.test.tsx
index 2c3ccc7ec1..ab947602eb 100644
--- a/apps/builder/app/shared/style-object-model.test.tsx
+++ b/apps/builder/app/shared/style-object-model.test.tsx
@@ -9,7 +9,7 @@ import {
type StyleDecl,
getStyleDeclKey,
} from "@webstudio-is/sdk";
-import { $, renderJsx } from "@webstudio-is/sdk/testing";
+import { $, renderJsx } from "@webstudio-is/template";
import { parseCss } from "@webstudio-is/css-data";
import type { StyleValue } from "@webstudio-is/css-engine";
import {
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 251de924e1..c5c245acfb 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -74,6 +74,7 @@
"@webstudio-is/sdk-components-react": "workspace:*",
"@webstudio-is/sdk-components-react-radix": "workspace:*",
"@webstudio-is/sdk-components-react-remix": "workspace:*",
+ "@webstudio-is/template": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
"arrgv": "^1.0.2",
"bcp-47": "^2.1.0",
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index a0819dd068..0e13c046b6 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -33,6 +33,7 @@
"@webstudio-is/icons": "workspace:^",
"@webstudio-is/image": "workspace:*",
"@webstudio-is/sdk": "workspace:*",
+ "@webstudio-is/template": "workspace:*",
"change-case": "^5.4.4",
"html-tags": "^4.0.0",
"nanoid": "^5.0.8"
diff --git a/packages/react-sdk/src/component-generator.test.tsx b/packages/react-sdk/src/component-generator.test.tsx
index 2500f14068..2822a724bc 100644
--- a/packages/react-sdk/src/component-generator.test.tsx
+++ b/packages/react-sdk/src/component-generator.test.tsx
@@ -13,7 +13,7 @@ import {
createProxy,
renderJsx,
ws,
-} from "@webstudio-is/sdk/testing";
+} from "@webstudio-is/template";
import {
generateJsxChildren,
generateWebstudioComponent,
diff --git a/packages/react-sdk/src/css/css.test.tsx b/packages/react-sdk/src/css/css.test.tsx
index 2a00696c4b..5202f815d1 100644
--- a/packages/react-sdk/src/css/css.test.tsx
+++ b/packages/react-sdk/src/css/css.test.tsx
@@ -1,8 +1,8 @@
import { expect, test } from "vitest";
import type { Breakpoint } from "@webstudio-is/sdk";
+import { $, renderJsx } from "@webstudio-is/template";
import { generateCss, type CssConfig } from "./css";
import { descendantComponent, rootComponent } from "../core-components";
-import { $, renderJsx } from "@webstudio-is/sdk/testing";
const toMap = <T extends { id: string }>(list: T[]) =>
new Map(list.map((item) => [item.id, item] as const));
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index f0a374c0ad..3407d904f5 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -21,9 +21,6 @@
"webstudio": "./src/__generated__/normalize.css.ts",
"types": "./lib/types/__generated__/normalize.css.d.ts",
"import": "./lib/__generated__/normalize.css.js"
- },
- "./testing": {
- "webstudio": "./src/testing.ts"
}
},
"files": [
@@ -49,6 +46,7 @@
},
"devDependencies": {
"@webstudio-is/css-data": "workspace:*",
+ "@webstudio-is/template": "workspace:*",
"@webstudio-is/tsconfig": "workspace:*",
"html-tags": "^4.0.0",
"strip-indent": "^4.0.0",
diff --git a/packages/sdk/src/instances-utils.test.tsx b/packages/sdk/src/instances-utils.test.tsx
index b7c4bb2f97..a540a81034 100644
--- a/packages/sdk/src/instances-utils.test.tsx
+++ b/packages/sdk/src/instances-utils.test.tsx
@@ -1,5 +1,5 @@
import { expect, test } from "vitest";
-import { $, renderJsx } from "./jsx";
+import { $, renderJsx } from "@webstudio-is/template";
import {
findTreeInstanceIds,
findTreeInstanceIdsExcludingSlotDescendants,
diff --git a/packages/sdk/src/resources-generator.test.tsx b/packages/sdk/src/resources-generator.test.tsx
index e4063e2d6c..4ba97b1ff4 100644
--- a/packages/sdk/src/resources-generator.test.tsx
+++ b/packages/sdk/src/resources-generator.test.tsx
@@ -1,5 +1,5 @@
import { expect, test } from "vitest";
-import { renderJsx, $ } from "./jsx";
+import { renderJsx, $ } from "@webstudio-is/template";
import type { Page } from "./schema/pages";
import { createScope } from "./scope";
import {
diff --git a/packages/template/package.json b/packages/template/package.json
new file mode 100644
index 0000000000..060bbadf7b
--- /dev/null
+++ b/packages/template/package.json
@@ -0,0 +1,26 @@
+{
+ "name": "@webstudio-is/template",
+ "version": "0.0.0-webstudio-version",
+ "description": "Webstudio templates based on React",
+ "author": "Webstudio <[email protected]>",
+ "homepage": "https://webstudio.is",
+ "license": "AGPL-3.0-or-later",
+ "private": true,
+ "type": "module",
+ "exports": {
+ "webstudio": "./src/index.ts"
+ },
+ "sideEffects": false,
+ "scripts": {
+ "typecheck": "tsc",
+ "test": "vitest run"
+ },
+ "dependencies": {
+ "@webstudio-is/sdk": "workspace:*",
+ "react": "18.3.0-canary-14898b6a9-20240318"
+ },
+ "devDependencies": {
+ "@webstudio-is/tsconfig": "workspace:*",
+ "vitest": "^2.1.8"
+ }
+}
diff --git a/packages/sdk/src/testing.ts b/packages/template/src/index.ts
similarity index 100%
rename from packages/sdk/src/testing.ts
rename to packages/template/src/index.ts
diff --git a/packages/sdk/src/jsx.test.tsx b/packages/template/src/jsx.test.tsx
similarity index 100%
rename from packages/sdk/src/jsx.test.tsx
rename to packages/template/src/jsx.test.tsx
diff --git a/packages/sdk/src/jsx.ts b/packages/template/src/jsx.ts
similarity index 97%
rename from packages/sdk/src/jsx.ts
rename to packages/template/src/jsx.ts
index faf1b2b23b..67cbca9d77 100644
--- a/packages/sdk/src/jsx.ts
+++ b/packages/template/src/jsx.ts
@@ -1,6 +1,5 @@
import type { JSX, ReactNode } from "react";
-import type { Instances } from "./schema/instances";
-import type { Props } from "./schema/props";
+import type { Instances, Props } from "@webstudio-is/sdk";
export class ExpressionValue {
value;
diff --git a/packages/template/tsconfig.json b/packages/template/tsconfig.json
new file mode 100644
index 0000000000..d2e5040f8f
--- /dev/null
+++ b/packages/template/tsconfig.json
@@ -0,0 +1,3 @@
+{
+ "extends": "@webstudio-is/tsconfig/base.json"
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cec4214612..c1d5b8a169 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -289,6 +289,9 @@ importers:
'@webstudio-is/sdk-components-react-remix':
specifier: workspace:*
version: link:../../packages/sdk-components-react-remix
+ '@webstudio-is/template':
+ specifier: workspace:*
+ version: link:../../packages/template
'@webstudio-is/trpc-interface':
specifier: workspace:*
version: link:../../packages/trpc-interface
@@ -1715,6 +1718,9 @@ importers:
'@webstudio-is/sdk':
specifier: workspace:*
version: link:../sdk
+ '@webstudio-is/template':
+ specifier: workspace:*
+ version: link:../template
change-case:
specifier: ^5.4.4
version: 5.4.4
@@ -1780,6 +1786,9 @@ importers:
'@webstudio-is/css-data':
specifier: workspace:*
version: link:../css-data
+ '@webstudio-is/template':
+ specifier: workspace:*
+ version: link:../template
'@webstudio-is/tsconfig':
specifier: workspace:*
version: link:../tsconfig
@@ -1998,6 +2007,22 @@ importers:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318([email protected])
+ packages/template:
+ dependencies:
+ '@webstudio-is/sdk':
+ specifier: workspace:*
+ version: link:../sdk
+ react:
+ specifier: 18.3.0-canary-14898b6a9-20240318
+ version: 18.3.0-canary-14898b6a9-20240318
+ devDependencies:
+ '@webstudio-is/tsconfig':
+ specifier: workspace:*
+ version: link:../tsconfig
+ vitest:
+ specifier: ^2.1.8
+ version: 2.1.8(@types/[email protected])([email protected])
+
packages/trpc-interface:
dependencies:
'@trpc/client':