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.

Use explicit imports from @jest/globals (#645)

Bogdan Chadkin752768abbc86
diff --git a/apps/designer/app/canvas/custom-components/link.test.ts b/apps/designer/app/canvas/custom-components/link.test.ts
index 6a65e3fae9..d5ec70d256 100644
--- a/apps/designer/app/canvas/custom-components/link.test.ts
+++ b/apps/designer/app/canvas/custom-components/link.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { preserveBuildParams } from "./link";
describe("preserveBuildParams", () => {
diff --git a/apps/designer/app/canvas/shared/instance.test.ts b/apps/designer/app/canvas/shared/instance.test.ts
index de679ae3a6..de9e7df62b 100644
--- a/apps/designer/app/canvas/shared/instance.test.ts
+++ b/apps/designer/app/canvas/shared/instance.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { type Instance } from "@webstudio-is/react-sdk";
import { findInsertLocation } from "./instance";
diff --git a/apps/designer/app/designer/features/props-panel/use-props-logic.test.ts b/apps/designer/app/designer/features/props-panel/use-props-logic.test.ts
index cf46a91875..884d27a11d 100644
--- a/apps/designer/app/designer/features/props-panel/use-props-logic.test.ts
+++ b/apps/designer/app/designer/features/props-panel/use-props-logic.test.ts
@@ -1,4 +1,4 @@
-import { jest } from "@jest/globals";
+import { jest, describe, test, expect } from "@jest/globals";
import { renderHook, act } from "@testing-library/react-hooks";
import {
ComponentName,
diff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/evaluate-math.test.ts b/apps/designer/app/designer/features/style-panel/shared/css-value-input/evaluate-math.test.ts
index 6652044c12..01556ce267 100644
--- a/apps/designer/app/designer/features/style-panel/shared/css-value-input/evaluate-math.test.ts
+++ b/apps/designer/app/designer/features/style-panel/shared/css-value-input/evaluate-math.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { evaluateMath } from "./evaluate-math";
describe("Evaluate math", () => {
diff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.ts b/apps/designer/app/designer/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.ts
index 68aa005f2a..129fdd97a5 100644
--- a/apps/designer/app/designer/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.ts
+++ b/apps/designer/app/designer/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { parseIntermediateOrInvalidValue } from "./parse-intermediate-or-invalid-value";
const properties = ["width", "lineHeight", "backgroundPositionX"] as const;
diff --git a/apps/designer/app/designer/features/style-panel/shared/parse-css-value.test.ts b/apps/designer/app/designer/features/style-panel/shared/parse-css-value.test.ts
index ff4fc43119..70ab77091d 100644
--- a/apps/designer/app/designer/features/style-panel/shared/parse-css-value.test.ts
+++ b/apps/designer/app/designer/features/style-panel/shared/parse-css-value.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { parseCssValue } from "./parse-css-value";
describe("Parse CSS value", () => {
diff --git a/apps/designer/app/designer/shared/assets/update-state-assets.test.ts b/apps/designer/app/designer/shared/assets/update-state-assets.test.ts
index bb59ce909e..c8fdeaff9d 100644
--- a/apps/designer/app/designer/shared/assets/update-state-assets.test.ts
+++ b/apps/designer/app/designer/shared/assets/update-state-assets.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import type { Asset } from "@webstudio-is/asset-uploader";
import {
UploadedClientAsset,
diff --git a/apps/designer/app/designer/shared/design-tokens-manager/utils.test.ts b/apps/designer/app/designer/shared/design-tokens-manager/utils.test.ts
index 00b81e82fe..d80b2ed527 100644
--- a/apps/designer/app/designer/shared/design-tokens-manager/utils.test.ts
+++ b/apps/designer/app/designer/shared/design-tokens-manager/utils.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import type { DesignToken } from "@webstudio-is/design-tokens";
import produce from "immer";
import {
diff --git a/apps/designer/app/shared/css-utils/delete-css-rules-by-breakpoint.test.ts b/apps/designer/app/shared/css-utils/delete-css-rules-by-breakpoint.test.ts
index ca5e949419..860777aa85 100644
--- a/apps/designer/app/shared/css-utils/delete-css-rules-by-breakpoint.test.ts
+++ b/apps/designer/app/shared/css-utils/delete-css-rules-by-breakpoint.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { type Instance } from "@webstudio-is/react-sdk";
import { deleteCssRulesByBreakpoint } from "./delete-css-rules-by-breakpoint";
diff --git a/apps/designer/app/shared/props-utils/delete-prop.test.ts b/apps/designer/app/shared/props-utils/delete-prop.test.ts
index 4f71b23eaf..e987f3d482 100644
--- a/apps/designer/app/shared/props-utils/delete-prop.test.ts
+++ b/apps/designer/app/shared/props-utils/delete-prop.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { type AllUserProps } from "@webstudio-is/react-sdk";
import { deletePropMutable } from "./delete-prop";
diff --git a/apps/designer/app/shared/props-utils/update-props.test.ts b/apps/designer/app/shared/props-utils/update-props.test.ts
index c51471f55a..e1aa20f119 100644
--- a/apps/designer/app/shared/props-utils/update-props.test.ts
+++ b/apps/designer/app/shared/props-utils/update-props.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { Asset } from "@webstudio-is/asset-uploader";
import {
type AllUserProps,
diff --git a/apps/designer/app/shared/router-utils/build-params.test.ts b/apps/designer/app/shared/router-utils/build-params.test.ts
index 663a2a9238..59cfcb7c4e 100644
--- a/apps/designer/app/shared/router-utils/build-params.test.ts
+++ b/apps/designer/app/shared/router-utils/build-params.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { getBuildParams, getBuildOrigin } from "./build-params";
const makeRequest = (url: string) => ({
diff --git a/apps/designer/package.json b/apps/designer/package.json
index 1ca1c41311..f82bd447fc 100644
--- a/apps/designer/package.json
+++ b/apps/designer/package.json
@@ -74,6 +74,7 @@
},
"devDependencies": {
"@babel/core": "^7.20.2",
+ "@jest/globals": "^29.3.1",
"@remix-run/dev": "^1.6.4",
"@storybook/addon-actions": "^6.5.9",
"@storybook/addon-essentials": "^6.5.9",
@@ -90,7 +91,6 @@
"@types/css-tree": "^2.0.0",
"@types/hoist-non-react-statics": "^3.3.1",
"@types/hyphenate-style-name": "^1.0.0",
- "@types/jest": "^29.2.3",
"@types/lodash.capitalize": "^4.2.6",
"@types/lodash.debounce": "^4.0.6",
"@types/lodash.memoize": "^4.1.6",
@@ -108,8 +108,8 @@
"babel-loader": "^8.2.5",
"css-tree": "^2.3.0",
"dotenv": "^16.0.0",
- "esbuild-jest": "^0.5.0",
"esbuild-node-externals": "^1.4.1",
+ "jest": "^29.3.1",
"prettier": "^2.6.2",
"react-test-renderer": "^17.0.2",
"relative-deps": "^1.0.7",
diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json
index 064b7b9b08..e1496ae45a 100644
--- a/packages/asset-uploader/package.json
+++ b/packages/asset-uploader/package.json
@@ -17,18 +17,20 @@
"dependencies": {
"@aws-sdk/client-s3": "^3.131.0",
"@aws-sdk/lib-storage": "^3.131.0",
- "@webstudio-is/prisma-client": "*",
"@webstudio-is/fonts": "*",
+ "@webstudio-is/prisma-client": "*",
"app-root-path": "^3.0.0",
"sharp": "^0.30.7"
},
"devDependencies": {
+ "@jest/globals": "^29.3.1",
"@types/app-root-path": "^1.2.4",
"@types/node": "^18.7.16",
"@types/sharp": "^0.30.4",
"@webstudio-is/jest-config": "*",
"@webstudio-is/scripts": "*",
"@webstudio-is/tsconfig": "*",
+ "jest": "^29.3.1",
"typescript": "4.7.4",
"zod": "^3.19.1"
},
diff --git a/packages/asset-uploader/src/utils/get-asset-path.test.ts b/packages/asset-uploader/src/utils/get-asset-path.test.ts
index b8294191f1..fcdcf8e22c 100644
--- a/packages/asset-uploader/src/utils/get-asset-path.test.ts
+++ b/packages/asset-uploader/src/utils/get-asset-path.test.ts
@@ -1,4 +1,11 @@
-import { jest } from "@jest/globals";
+import {
+ jest,
+ describe,
+ beforeEach,
+ afterAll,
+ test,
+ expect,
+} from "@jest/globals";
import { Asset, Location } from "@webstudio-is/prisma-client";
const commonAsset: Asset = {
diff --git a/packages/asset-uploader/src/utils/sanitize-s3-key.test.ts b/packages/asset-uploader/src/utils/sanitize-s3-key.test.ts
index 50578290c5..7a46a27349 100644
--- a/packages/asset-uploader/src/utils/sanitize-s3-key.test.ts
+++ b/packages/asset-uploader/src/utils/sanitize-s3-key.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { sanitizeS3Key } from "./sanitize-s3-key";
describe("sanitizeS3Key", () => {
diff --git a/packages/css-engine/package.json b/packages/css-engine/package.json
index 80a65e9707..bb9e368802 100644
--- a/packages/css-engine/package.json
+++ b/packages/css-engine/package.json
@@ -17,12 +17,13 @@
"publish-to-npm": "bash ../../bin/publish-to-npm.sh"
},
"dependencies": {
+ "@webstudio-is/fonts": "*",
"hyphenate-style-name": "^1.0.4",
"react": "^17.0.2",
- "react-dom": "^17.0.2",
- "@webstudio-is/fonts": "*"
+ "react-dom": "^17.0.2"
},
"devDependencies": {
+ "@jest/globals": "^29.3.1",
"@storybook/addon-actions": "^6.5.6",
"@storybook/addon-essentials": "^6.5.6",
"@storybook/addon-interactions": "^6.5.12",
@@ -32,13 +33,14 @@
"@storybook/manager-webpack4": "^6.5.6",
"@storybook/react": "^6.5.6",
"@storybook/testing-library": "^0.0.13",
- "@webstudio-is/jest-config": "*",
+ "@types/react": "^17.0.24",
+ "@types/react-dom": "^17.0.9",
"@webstudio-is/css-data": "*",
+ "@webstudio-is/jest-config": "*",
"@webstudio-is/scripts": "*",
"@webstudio-is/tsconfig": "*",
- "typescript": "4.7.4",
- "@types/react": "^17.0.24",
- "@types/react-dom": "^17.0.9"
+ "jest": "^29.3.1",
+ "typescript": "4.7.4"
},
"exports": "./lib/index.js",
"types": "src/index.ts",
diff --git a/packages/css-engine/src/core/css-engine.test.ts b/packages/css-engine/src/core/css-engine.test.ts
index 127e6b33a8..7e8b5b5121 100644
--- a/packages/css-engine/src/core/css-engine.test.ts
+++ b/packages/css-engine/src/core/css-engine.test.ts
@@ -1,3 +1,4 @@
+import { describe, beforeEach, test, expect } from "@jest/globals";
import { CssEngine } from "./css-engine";
const style0 = {
diff --git a/packages/css-engine/src/core/to-value.test.ts b/packages/css-engine/src/core/to-value.test.ts
index 7051daf341..949eb038ed 100644
--- a/packages/css-engine/src/core/to-value.test.ts
+++ b/packages/css-engine/src/core/to-value.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { toValue } from "./to-value";
describe("Convert WS CSS Values to native CSS strings", () => {
diff --git a/packages/css-vars/package.json b/packages/css-vars/package.json
index 14ddf7303f..0ef120da6f 100644
--- a/packages/css-vars/package.json
+++ b/packages/css-vars/package.json
@@ -15,7 +15,6 @@
},
"dependencies": {},
"devDependencies": {
- "@webstudio-is/jest-config": "*",
"@webstudio-is/scripts": "*",
"@webstudio-is/tsconfig": "*",
"typescript": "4.7.4"
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 68ff3994fc..afe2bbfeec 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -17,6 +17,7 @@
"publish-to-npm": "bash ../../bin/publish-to-npm.sh"
},
"devDependencies": {
+ "@jest/globals": "^29.3.1",
"@storybook/addon-actions": "^6.5.6",
"@storybook/addon-essentials": "^6.5.6",
"@storybook/addon-interactions": "^6.5.12",
@@ -26,9 +27,10 @@
"@storybook/manager-webpack4": "^6.5.6",
"@storybook/react": "^6.5.6",
"@storybook/testing-library": "^0.0.13",
- "@webstudio-is/scripts": "*",
"@webstudio-is/jest-config": "*",
+ "@webstudio-is/scripts": "*",
"@webstudio-is/tsconfig": "*",
+ "jest": "^29.3.1",
"typescript": "4.7.4"
},
"peerDependencies": {
diff --git a/packages/design-system/src/components/primitives/dnd/geometry-utils.test.ts b/packages/design-system/src/components/primitives/dnd/geometry-utils.test.ts
index 5f3c6fd2c7..20dbacf89e 100644
--- a/packages/design-system/src/components/primitives/dnd/geometry-utils.test.ts
+++ b/packages/design-system/src/components/primitives/dnd/geometry-utils.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import {
getPlacementBetween,
getDistanceToRect,
diff --git a/packages/design-system/src/components/primitives/dnd/use-auto-scroll.test.ts b/packages/design-system/src/components/primitives/dnd/use-auto-scroll.test.ts
index 839f53ecec..290be19fe9 100644
--- a/packages/design-system/src/components/primitives/dnd/use-auto-scroll.test.ts
+++ b/packages/design-system/src/components/primitives/dnd/use-auto-scroll.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { getSpeed } from "./use-auto-scroll";
describe("getSpeed", () => {
diff --git a/packages/design-system/src/components/tree/horizontal-shift.test.ts b/packages/design-system/src/components/tree/horizontal-shift.test.ts
index 5d44b3ee37..0a52f216ae 100644
--- a/packages/design-system/src/components/tree/horizontal-shift.test.ts
+++ b/packages/design-system/src/components/tree/horizontal-shift.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { renderHook, act } from "@testing-library/react-hooks";
import { DropTarget, Placement } from "../primitives/dnd";
import { useHorizontalShift } from "./horizontal-shift";
diff --git a/packages/fonts/package.json b/packages/fonts/package.json
index 79885948dc..21c59745c0 100644
--- a/packages/fonts/package.json
+++ b/packages/fonts/package.json
@@ -18,11 +18,13 @@
"fontkit": "^2.0.2"
},
"devDependencies": {
+ "@jest/globals": "^29.3.1",
"@types/fontkit": "^2.0.0",
"@webstudio-is/design-system": "*",
"@webstudio-is/jest-config": "*",
"@webstudio-is/scripts": "*",
"@webstudio-is/tsconfig": "*",
+ "jest": "^29.3.1",
"typescript": "4.7.4",
"zod": "^3.19.1"
},
diff --git a/packages/fonts/src/font-data.test.ts b/packages/fonts/src/font-data.test.ts
index 07d56b075e..ff8839c959 100644
--- a/packages/fonts/src/font-data.test.ts
+++ b/packages/fonts/src/font-data.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { parseSubfamily, normalizeFamily } from "./font-data";
describe("font-data", () => {
diff --git a/packages/fonts/src/get-font-faces.test.ts b/packages/fonts/src/get-font-faces.test.ts
index 7820f10d04..6edc265ba2 100644
--- a/packages/fonts/src/get-font-faces.test.ts
+++ b/packages/fonts/src/get-font-faces.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { getFontFaces, type PartialFontAsset } from "./get-font-faces";
describe("getFontFaces()", () => {
diff --git a/packages/http-client/package.json b/packages/http-client/package.json
index 906aedb712..790e276a9b 100644
--- a/packages/http-client/package.json
+++ b/packages/http-client/package.json
@@ -14,11 +14,13 @@
"publish-to-npm": "bash ../../bin/publish-to-npm.sh"
},
"devDependencies": {
+ "@jest/globals": "^29.3.1",
"@types/isomorphic-fetch": "^0.0.36",
"@webstudio-is/jest-config": "*",
"@webstudio-is/prisma-client": "*",
"@webstudio-is/project": "*",
"@webstudio-is/tsconfig": "*",
+ "jest": "^29.3.1",
"tsup": "^6.1.3",
"typescript": "4.7.4"
},
diff --git a/packages/http-client/src/index.test.ts b/packages/http-client/src/index.test.ts
index 012e32beb9..9ed1af8c04 100644
--- a/packages/http-client/src/index.test.ts
+++ b/packages/http-client/src/index.test.ts
@@ -1,4 +1,6 @@
+import { describe, test, expect } from "@jest/globals";
import { loadProject } from "./index";
+
const existingProjectId = "675e8af3-48fa-4b18-9ebf-fd2b128865e2";
const notPublishedProjectId = "7ec397c6-b3d0-4967-9073-9d83623fcf8e";
const onlyHomeProjectId = "36d6c16f-04a0-45d4-ab1d-aa0ab61eb5b6";
diff --git a/packages/image/package.json b/packages/image/package.json
index 530a9ce1f9..f79888769c 100644
--- a/packages/image/package.json
+++ b/packages/image/package.json
@@ -20,6 +20,7 @@
},
"dependencies": {},
"devDependencies": {
+ "@jest/globals": "^29.3.1",
"@storybook/addon-actions": "^6.5.6",
"@storybook/addon-essentials": "^6.5.6",
"@storybook/addon-interactions": "^6.5.12",
@@ -33,6 +34,7 @@
"@webstudio-is/jest-config": "*",
"@webstudio-is/scripts": "*",
"@webstudio-is/tsconfig": "*",
+ "jest": "^29.3.1",
"typescript": "4.7.4"
},
"peerDependencies": {
diff --git a/packages/image/src/image-optimize.test.ts b/packages/image/src/image-optimize.test.ts
index 58c259d8f7..250a28c5bb 100644
--- a/packages/image/src/image-optimize.test.ts
+++ b/packages/image/src/image-optimize.test.ts
@@ -1,3 +1,4 @@
+import { describe, test, expect } from "@jest/globals";
import { getImageAttributes } from "./image-optimize";
import { cloudflareImageLoader } from "./image-loaders";
diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json
index 7cebdaf67d..06665929a1 100644
--- a/packages/jest-config/package.json
+++ b/packages/jest-config/package.json
@@ -6,7 +6,7 @@
"publish-to-npm": "bash ../../bin/publish-to-npm.sh"
},
"dependencies": {
- "@types/jest": "^29.2.3",
+ "@jest/types": "^29.3.1",
"esbuild-jest": "^0.5.0",
"jest": "^29.3.1"
},
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index 3be65ac3a4..40eee11f9d 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -21,6 +21,7 @@
"devDependencies": {
"@babel/core": "^7.20.2",
"@esbuild-kit/esm-loader": "^2.4.2",
+ "@jest/globals": "^29.3.1",
"@remix-run/react": "^1.2.3",
"@remix-run/server-runtime": "^1.2.3",
"@storybook/addon-actions": "^6.5.6",
@@ -39,6 +40,7 @@
"babel-loader": "^8.2.5",
"esbuild": "^0.14.25",
"esbuild-node-externals": "^1.4.1",
+ "jest": "^29.3.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"remix-utils": "^4.1.0",
diff --git a/packages/react-sdk/src/components/index.test.ts b/packages/react-sdk/src/components/index.test.ts
index 5815185a10..312ab1e717 100644
--- a/packages/react-sdk/src/components/index.test.ts
+++ b/packages/react-sdk/src/components/index.test.ts
@@ -1,3 +1,4 @@
+import { test, expect } from "@jest/globals";
import {
getComponentNames,
getComponentMeta,
diff --git a/yarn.lock b/yarn.lock
index e12f75c461..f1358683f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5354,14 +5354,6 @@
expect "^29.0.0"
pretty-format "^29.0.0"
-"@types/jest@^29.2.3":
- version "29.2.3"
- resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.2.3.tgz#f5fd88e43e5a9e4221ca361e23790d48fcf0a211"
- integrity sha512-6XwoEbmatfyoCjWRX7z0fKMmgYKe9+/HrviJ5k0X/tjJWHGAezZOfYaxqQKuzG/TvQyr+ktjm4jgbk0s4/oF2w==
- dependencies:
- expect "^29.0.0"
- pretty-format "^29.0.0"
-
"@types/js-cookie@^2.2.6":
version "2.2.7"
resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.7.tgz#226a9e31680835a6188e887f3988e60c04d3f6a3"