Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"@babel/plugin-proposal-decorators": "*",
"@babel/preset-env": "*",
"@babel/preset-typescript": "*",
"@types/jest": "*",
"babel-jest": "*",
"babel-plugin-transform-typescript-metadata": "*",
"jest": "*",
Expand Down
1 change: 0 additions & 1 deletion examples/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"@babel/preset-env": "*",
"@babel/preset-react": "*",
"@babel/preset-typescript": "*",
"@types/jest": "*",
"babel-jest": "*",
"jest": "*"
},
Expand Down
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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:*",
Expand Down
4 changes: 1 addition & 3 deletions packages/jest-circus/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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__/**/*"],
Expand Down
1 change: 1 addition & 0 deletions packages/jest-core/src/__tests__/SearchSource.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 0 additions & 2 deletions packages/jest-environment/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
// we don't want `@types/jest` to be referenced
"types": ["node"],
"rootDir": "src",
"outDir": "build"
},
Expand Down
2 changes: 0 additions & 2 deletions packages/jest-globals/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
// we don't want `@types/jest` to be referenced
"types": [],
"rootDir": "src",
"outDir": "build"
},
Expand Down
4 changes: 1 addition & 3 deletions packages/jest-jasmine2/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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__/**/*"],
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-types/__typetests__/expect.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions packages/test-utils/src/ConditionalTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
34 changes: 1 addition & 33 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -10071,7 +10052,6 @@ __metadata:
"@babel/preset-env": "*"
"@babel/preset-react": "*"
"@babel/preset-typescript": "*"
"@types/jest": "*"
babel-jest: "*"
jest: "*"
react: "*"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down