diff --git a/examples/angular/package.json b/examples/angular/package.json index b03963e3b066..05486fabbaab 100644 --- a/examples/angular/package.json +++ b/examples/angular/package.json @@ -23,7 +23,6 @@ "@babel/plugin-proposal-decorators": "*", "@babel/preset-env": "*", "@babel/preset-typescript": "*", - "@types/jest": "*", "babel-jest": "*", "babel-plugin-transform-typescript-metadata": "*", "jest": "*", diff --git a/examples/typescript/package.json b/examples/typescript/package.json index 8a2c828a89de..ee134ec88c61 100644 --- a/examples/typescript/package.json +++ b/examples/typescript/package.json @@ -12,7 +12,6 @@ "@babel/preset-env": "*", "@babel/preset-react": "*", "@babel/preset-typescript": "*", - "@types/jest": "*", "babel-jest": "*", "jest": "*" }, diff --git a/package.json b/package.json index 1bba91340e1d..1bc00b4d1048 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "@types/babel__generator": "^7.0.0", "@types/babel__template": "^7.0.0", "@types/dedent": "0.7.0", - "@types/jest": "^27.4.0", "@types/node": "~12.12.0", "@types/which": "^2.0.0", "@typescript-eslint/eslint-plugin": "^5.11.0", @@ -150,8 +149,6 @@ "resolutions": { "@jest/create-cache-key-function": "workspace:*", "@testing-library/dom/pretty-format": "26.6.1", - "@types/jest/jest-diff": "^26.0.0", - "@types/jest/pretty-format": "^26.0.0", "babel-jest": "workspace:*", "jest": "workspace:*", "jest-environment-node": "workspace:*", diff --git a/packages/jest-circus/tsconfig.json b/packages/jest-circus/tsconfig.json index 67941a37790e..5722ca1d21ac 100644 --- a/packages/jest-circus/tsconfig.json +++ b/packages/jest-circus/tsconfig.json @@ -2,9 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "outDir": "build", - "rootDir": "src", - // we don't want `@types/jest` to be referenced - "types": [] + "rootDir": "src" }, "include": ["./src/**/*"], "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"], diff --git a/packages/jest-core/src/__tests__/SearchSource.test.ts b/packages/jest-core/src/__tests__/SearchSource.test.ts index 3922665cbb8a..71eca96d82c5 100644 --- a/packages/jest-core/src/__tests__/SearchSource.test.ts +++ b/packages/jest-core/src/__tests__/SearchSource.test.ts @@ -7,6 +7,7 @@ */ import * as path from 'path'; +import {beforeEach, describe, expect, it, jest} from '@jest/globals'; import type {Test} from '@jest/test-result'; import type {Config} from '@jest/types'; import {normalize} from 'jest-config'; diff --git a/packages/jest-environment/tsconfig.json b/packages/jest-environment/tsconfig.json index 3b0f77d1c9c5..4ac228a90ddf 100644 --- a/packages/jest-environment/tsconfig.json +++ b/packages/jest-environment/tsconfig.json @@ -1,8 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - // we don't want `@types/jest` to be referenced - "types": ["node"], "rootDir": "src", "outDir": "build" }, diff --git a/packages/jest-globals/tsconfig.json b/packages/jest-globals/tsconfig.json index 16a7adbc92db..da44298e3423 100644 --- a/packages/jest-globals/tsconfig.json +++ b/packages/jest-globals/tsconfig.json @@ -1,8 +1,6 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - // we don't want `@types/jest` to be referenced - "types": [], "rootDir": "src", "outDir": "build" }, diff --git a/packages/jest-jasmine2/tsconfig.json b/packages/jest-jasmine2/tsconfig.json index 3d2268f04774..ecd8d01247bf 100644 --- a/packages/jest-jasmine2/tsconfig.json +++ b/packages/jest-jasmine2/tsconfig.json @@ -2,9 +2,7 @@ "extends": "../../tsconfig", "compilerOptions": { "rootDir": "src", - "outDir": "build", - // we don't want `@types/jest` to be referenced - "types": [] + "outDir": "build" }, "include": ["./src/**/*"], "exclude": ["./**/__tests__/**/*"], diff --git a/packages/jest-types/__typetests__/expect.test.ts b/packages/jest-types/__typetests__/expect.test.ts index ece8c523f242..2e0ef4e7db07 100644 --- a/packages/jest-types/__typetests__/expect.test.ts +++ b/packages/jest-types/__typetests__/expect.test.ts @@ -7,7 +7,7 @@ import {expectError, expectType} from 'tsd-lite'; import type {EqualsFunction, Tester} from '@jest/expect-utils'; -import {expect} from '@jest/globals'; +import {expect, jest} from '@jest/globals'; import type * as jestMatcherUtils from 'jest-matcher-utils'; // asymmetric matchers diff --git a/packages/test-utils/src/ConditionalTest.ts b/packages/test-utils/src/ConditionalTest.ts index 53e1f965e969..fb99aa44fd93 100644 --- a/packages/test-utils/src/ConditionalTest.ts +++ b/packages/test-utils/src/ConditionalTest.ts @@ -8,6 +8,10 @@ /* eslint-disable jest/no-focused-tests */ import semver = require('semver'); +import type {Global} from '@jest/types'; + +declare const describe: Global.TestFrameworkGlobals['describe']; +declare const test: Global.TestFrameworkGlobals['test']; export function isJestJasmineRun(): boolean { return process.env.JEST_JASMINE === '1'; diff --git a/yarn.lock b/yarn.lock index 8415310770e0..b9adfc739669 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2644,7 +2644,6 @@ __metadata: "@types/babel__generator": ^7.0.0 "@types/babel__template": ^7.0.0 "@types/dedent": 0.7.0 - "@types/jest": ^27.4.0 "@types/node": ~12.12.0 "@types/which": ^2.0.0 "@typescript-eslint/eslint-plugin": ^5.11.0 @@ -4994,16 +4993,6 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:*, @types/jest@npm:^27.4.0": - version: 27.4.0 - resolution: "@types/jest@npm:27.4.0" - dependencies: - jest-diff: ^27.0.0 - pretty-format: ^27.0.0 - checksum: d2350267f954f9a2e4a15e5f02fbf19a77abfb9fd9e57a954de1fb0e9a0d3d5f8d3646ac7d9c42aeb4b4d828d2e70624ec149c85bb50a48634a54eed8429e1f8 - languageName: node - linkType: hard - "@types/jsdom@npm:^16.2.4": version: 16.2.14 resolution: "@types/jsdom@npm:16.2.14" @@ -6050,7 +6039,6 @@ __metadata: "@babel/plugin-proposal-decorators": "*" "@babel/preset-env": "*" "@babel/preset-typescript": "*" - "@types/jest": "*" babel-jest: "*" babel-plugin-transform-typescript-metadata: "*" core-js: ^3.2.1 @@ -8934,13 +8922,6 @@ __metadata: languageName: unknown linkType: soft -"diff-sequences@npm:^26.6.2": - version: 26.6.2 - resolution: "diff-sequences@npm:26.6.2" - checksum: 79af871776ef149a7ff3345d6b1bf37fe6e81f68632aa5542787851f6f60fba19b0be22fdd1e06046f56ae7382763ccfe94a982c39ee72bd107aef435ecbc0cf - languageName: node - linkType: hard - "diff@npm:^4.0.1": version: 4.0.2 resolution: "diff@npm:4.0.2" @@ -10071,7 +10052,6 @@ __metadata: "@babel/preset-env": "*" "@babel/preset-react": "*" "@babel/preset-typescript": "*" - "@types/jest": "*" babel-jest: "*" jest: "*" react: "*" @@ -12981,18 +12961,6 @@ __metadata: languageName: unknown linkType: soft -"jest-diff@npm:^26.0.0": - version: 26.6.2 - resolution: "jest-diff@npm:26.6.2" - dependencies: - chalk: ^4.0.0 - diff-sequences: ^26.6.2 - jest-get-type: ^26.3.0 - pretty-format: ^26.6.2 - checksum: d00d297f31e1ac0252127089892432caa7a11c69bde29cf3bb6c7a839c8afdb95cf1fd401f9df16a4422745da2e6a5d94b428b30666a2540c38e1c5699915c2d - languageName: node - linkType: hard - "jest-docblock@^28.0.0-alpha.3, jest-docblock@workspace:packages/jest-docblock": version: 0.0.0-use.local resolution: "jest-docblock@workspace:packages/jest-docblock" @@ -17809,7 +17777,7 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^26.0.0, pretty-format@npm:^26.5.2, pretty-format@npm:^26.6.2": +"pretty-format@npm:^26.5.2, pretty-format@npm:^26.6.2": version: 26.6.2 resolution: "pretty-format@npm:26.6.2" dependencies: