updates jest/ts-jest to latest (#9155)

vercel · Oct 25, 2024 · a9a0ef5 · a9a0ef5
1 parent ddf7316
commit a9a0ef5
Show file tree

Hide file tree

Showing 116 changed files with 2,117 additions and 1,940 deletions.
diff --git a/crates/turborepo-lib/src/turbo_json/loader.rs b/crates/turborepo-lib/src/turbo_json/loader.rs
@@ -356,9 +356,9 @@ mod test {
     use crate::{task_graph::TaskDefinition, turbo_json::CONFIG_FILE};
 
     #[test_case(r"{}", TurboJson::default() ; "empty")]
-    #[test_case(r#"{ "globalDependencies": ["tsconfig.json", "jest.config.js"] }"#,
+    #[test_case(r#"{ "globalDependencies": ["tsconfig.json", "jest.config.ts"] }"#,
         TurboJson {
-            global_deps: vec!["jest.config.js".to_string(), "tsconfig.json".to_string()],
+            global_deps: vec!["jest.config.ts".to_string(), "tsconfig.json".to_string()],
             ..TurboJson::default()
         }
     ; "global dependencies (sorted)")]

diff --git a/docs/repo-docs/reference/run.mdx b/docs/repo-docs/reference/run.mdx
@@ -283,7 +283,7 @@ Specify glob of global filesystem dependencies to be hashed. Useful for `.env` a
 
 ```bash title="Terminal"
 turbo run build --global-deps=".env"
-turbo run build --global-deps=".env.*" --global-deps=".eslintrc" --global-deps="jest.config.js"
+turbo run build --global-deps=".env.*" --global-deps=".eslintrc" --global-deps="jest.config.ts"
 ```
 
 <Callout type="info">

diff --git a/examples/kitchen-sink/apps/api/package.json b/examples/kitchen-sink/apps/api/package.json
@@ -22,13 +22,13 @@
     "morgan": "^1.10.0"
   },
   "devDependencies": {
+    "@jest/globals": "^29.7.0",
     "@repo/eslint-config": "workspace:*",
     "@repo/jest-presets": "workspace:*",
     "@repo/typescript-config": "workspace:*",
     "@types/body-parser": "^1.19.5",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
-    "@types/jest": "^29.5.12",
     "@types/morgan": "^1.9.9",
     "@types/node": "^20.11.24",
     "@types/supertest": "^6.0.2",

diff --git a/examples/kitchen-sink/apps/api/src/__tests__/server.test.ts b/examples/kitchen-sink/apps/api/src/__tests__/server.test.ts
@@ -1,4 +1,5 @@
 import supertest from "supertest";
+import { describe, it, expect } from "@jest/globals";
 import { createServer } from "../server";
 
 describe("Server", () => {

diff --git a/...kages/jest-presets/browser/jest-preset.js → ...kages/jest-presets/browser/jest-preset.ts b/...kages/jest-presets/browser/jest-preset.js → ...kages/jest-presets/browser/jest-preset.ts
@@ -1,4 +1,6 @@
-module.exports = {
+import type { Config } from "jest";
+
+const config = {
   roots: ["<rootDir>"],
   testEnvironment: "jsdom",
   transform: {
@@ -11,4 +13,6 @@ module.exports = {
     "<rootDir>/dist",
   ],
   preset: "ts-jest",
-};
+} as const satisfies Config;
+
+export default config;
diff --git a/...packages/jest-presets/node/jest-preset.js → ...packages/jest-presets/node/jest-preset.ts b/...packages/jest-presets/node/jest-preset.js → ...packages/jest-presets/node/jest-preset.ts
@@ -1,4 +1,6 @@
-module.exports = {
+import type { Config } from "jest";
+
+const config = {
   roots: ["<rootDir>"],
   transform: {
     "^.+\\.tsx?$": "ts-jest",
@@ -10,4 +12,6 @@ module.exports = {
     "<rootDir>/dist",
   ],
   preset: "ts-jest",
-};
+} as const satisfies Config;
+
+export default config;
diff --git a/examples/kitchen-sink/packages/jest-presets/package.json b/examples/kitchen-sink/packages/jest-presets/package.json
@@ -4,13 +4,14 @@
   "private": true,
   "license": "MIT",
   "files": [
-    "browser/jest-preset.js",
-    "node/jest-preset.js"
+    "browser/jest-preset.ts",
+    "node/jest-preset.ts"
   ],
   "dependencies": {
-    "ts-jest": "^29.1.2"
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.5"
   },
   "devDependencies": {
     "jest-environment-jsdom": "^29.7.0"
   }
-}
+}
diff --git a/examples/kitchen-sink/packages/logger/package.json b/examples/kitchen-sink/packages/logger/package.json
@@ -18,10 +18,10 @@
     "preset": "@repo/jest-presets/node"
   },
   "devDependencies": {
+    "@jest/globals": "^29.7.0",
     "@repo/eslint-config": "workspace:*",
     "@repo/jest-presets": "workspace:*",
     "@repo/typescript-config": "workspace:*",
-    "@types/jest": "^29.5.12",
     "@types/node": "^20.11.24",
     "jest": "^29.7.0",
     "tsup": "^8.0.2",

diff --git a/examples/kitchen-sink/packages/logger/src/__tests__/log.test.ts b/examples/kitchen-sink/packages/logger/src/__tests__/log.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect, jest } from "@jest/globals";
 import { log } from "..";
 
 jest.spyOn(global.console, "log");

diff --git a/examples/kitchen-sink/packages/ui/package.json b/examples/kitchen-sink/packages/ui/package.json
@@ -31,10 +31,10 @@
     "preset": "@repo/jest-presets/browser"
   },
   "devDependencies": {
+    "@jest/globals": "^29.7.0",
     "@repo/eslint-config": "workspace:*",
     "@repo/jest-presets": "workspace:*",
     "@repo/typescript-config": "workspace:*",
-    "@types/jest": "^29.5.12",
     "@types/node": "^20.11.24",
     "@types/react": "^18.2.62",
     "@types/react-dom": "^18.2.19",

diff --git a/examples/kitchen-sink/packages/ui/src/counter-button/index.test.tsx b/examples/kitchen-sink/packages/ui/src/counter-button/index.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from "@jest/globals";
 import { createRoot } from "react-dom/client";
 import { CounterButton } from ".";
 

diff --git a/examples/kitchen-sink/packages/ui/src/link/index.test.tsx b/examples/kitchen-sink/packages/ui/src/link/index.test.tsx
@@ -1,3 +1,4 @@
+import { describe, it } from "@jest/globals";
 import { createRoot } from "react-dom/client";
 import { Link } from ".";
 

diff --git a/examples/kitchen-sink/pnpm-lock.yaml b/examples/kitchen-sink/pnpm-lock.yaml
diff --git a/examples/with-docker/apps/api/package.json b/examples/with-docker/apps/api/package.json
@@ -21,13 +21,13 @@
     "morgan": "^1.10.0"
   },
   "devDependencies": {
+    "@jest/globals": "^29.7.0",
     "@repo/eslint-config": "*",
     "@repo/jest-presets": "*",
     "@repo/typescript-config": "*",
     "@types/body-parser": "^1.19.5",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
-    "@types/jest": "^29.5.12",
     "@types/morgan": "^1.9.9",
     "@types/node": "^20.11.24",
     "@types/supertest": "^6.0.2",

diff --git a/examples/with-docker/apps/api/src/__tests__/server.test.ts b/examples/with-docker/apps/api/src/__tests__/server.test.ts
@@ -1,4 +1,5 @@
 import supertest from "supertest";
+import { describe, it, expect } from "@jest/globals";
 import { createServer } from "../server";
 
 describe("server", () => {

diff --git a/...packages/jest-presets/node/jest-preset.js → ...packages/jest-presets/node/jest-preset.ts b/...packages/jest-presets/node/jest-preset.js → ...packages/jest-presets/node/jest-preset.ts
@@ -1,4 +1,6 @@
-module.exports = {
+import type { Config } from "jest";
+
+const config = {
   roots: ["<rootDir>"],
   transform: {
     "^.+\\.tsx?$": "ts-jest",
@@ -10,4 +12,6 @@ module.exports = {
     "<rootDir>/dist",
   ],
   preset: "ts-jest",
-};
+} as const satisfies Config;
+
+export default config;
diff --git a/examples/with-docker/packages/jest-presets/package.json b/examples/with-docker/packages/jest-presets/package.json
@@ -4,9 +4,10 @@
   "private": true,
   "license": "MIT",
   "files": [
-    "node/jest-preset.js"
+    "node/jest-preset.ts"
   ],
   "dependencies": {
-    "ts-jest": "^29.1.1"
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.5"
   }
-}
+}
diff --git a/examples/with-docker/packages/logger/package.json b/examples/with-docker/packages/logger/package.json
@@ -18,10 +18,10 @@
     "preset": "@repo/jest-presets/node"
   },
   "devDependencies": {
+    "@jest/globals": "^29.7.0",
     "@repo/eslint-config": "*",
     "@repo/jest-presets": "*",
     "@repo/typescript-config": "*",
-    "@types/jest": "^29.5.12",
     "@types/node": "^20.11.24",
     "eslint": "^8.57.0",
     "jest": "^29.7.0",

diff --git a/examples/with-docker/packages/logger/src/__tests__/log.test.ts b/examples/with-docker/packages/logger/src/__tests__/log.test.ts
@@ -1,3 +1,4 @@
+import { describe, it, expect, jest } from "@jest/globals";
 import { log } from "..";
 
 jest.spyOn(global.console, "log");