chore: replace @types/jest with a new private @jest/test-globals …

…package (#13344)
jestjs · Oct 1, 2022 · eafabf9 · eafabf9
1 parent c6b812d
commit eafabf9
Show file tree

Hide file tree

Showing 76 changed files with 508 additions and 94 deletions.
diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
@@ -1,22 +1,7 @@
 {
+  "extends": "../tsconfig.test.json",
   "compilerOptions": {
-    "noEmit": true,
-
-    "target": "es2017",
-    "module": "commonjs",
-    "lib": ["dom", "es2017"],
-    "strict": true,
-
-    /* Additional Checks */
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-
-    /* Module Resolution Options */
-    "moduleResolution": "node",
-    "isolatedModules": true,
-    "importsNotUsedAsValues": "error",
-    "resolveJsonModule": true
-  }
+    "rootDir": "./"
+  },
+  "include": ["./**/*"]
 }
diff --git a/examples/angular/package.json b/examples/angular/package.json
@@ -23,6 +23,7 @@
     "@babel/plugin-proposal-decorators": "*",
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-typescript": "^7.0.0",
+    "@jest/globals": "workspace:^",
     "babel-jest": "workspace:^",
     "babel-plugin-transform-typescript-metadata": "*",
     "jest": "workspace:^",

diff --git a/examples/typescript/__tests__/CheckboxWithLabel-test.tsx b/examples/typescript/__tests__/CheckboxWithLabel-test.tsx
@@ -2,7 +2,8 @@
 
 import * as React from 'react';
 import * as TestUtils from 'react-dom/test-utils';
-const CheckboxWithLabel = require('../CheckboxWithLabel').default;
+import {expect, it} from '@jest/globals';
+import CheckboxWithLabel from '../CheckboxWithLabel';
 
 it('CheckboxWithLabel changes the text after click', () => {
   const checkboxLabelRef: React.RefObject<HTMLLabelElement> = React.createRef();

diff --git a/examples/typescript/__tests__/calc.test.ts b/examples/typescript/__tests__/calc.test.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
-import {jest} from '@jest/globals';
+import {describe, expect, it, jest} from '@jest/globals';
 import Memory from '../Memory';
 import makeCalc from '../calc';
 import sub from '../sub';

diff --git a/examples/typescript/__tests__/sub-test.ts b/examples/typescript/__tests__/sub-test.ts
@@ -1,5 +1,6 @@
 // Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
+import {expect, it} from '@jest/globals';
 import sub from '../sub';
 
 it('subtracts 5 - 1 to equal 4 in TypeScript', () => {

diff --git a/examples/typescript/__tests__/sum-test.ts b/examples/typescript/__tests__/sum-test.ts
@@ -1,5 +1,7 @@
 // Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
+import {expect, it} from '@jest/globals';
+
 it('adds 1 + 2 to equal 3 in TScript', () => {
   // Generally, `import` should be used for TypeScript
   // as using `require` will not return any type information.

diff --git a/examples/typescript/__tests__/sum.test.js b/examples/typescript/__tests__/sum.test.js
@@ -1,5 +1,7 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
 
+import {expect, it} from '@jest/globals';
+
 it('adds 1 + 2 to equal 3 in Typescript', () => {
   const sum = require('../sum.ts').default;
   expect(sum(1, 2)).toBe(3);

diff --git a/examples/typescript/package.json b/examples/typescript/package.json
@@ -12,7 +12,7 @@
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-react": "^7.12.1",
     "@babel/preset-typescript": "^7.0.0",
-    "@types/jest": "^27.4.0",
+    "@jest/globals": "workspace:^",
     "babel-jest": "workspace:^",
     "jest": "workspace:^"
   },

diff --git a/package.json b/package.json
@@ -20,7 +20,6 @@
     "@types/babel__generator": "^7.0.0",
     "@types/babel__template": "^7.0.2",
     "@types/dedent": "^0.7.0",
-    "@types/jest": "^27.4.0",
     "@types/node": "~14.14.45",
     "@types/which": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "^5.14.0",

diff --git a/packages/babel-jest/src/__tests__/tsconfig.json b/packages/babel-jest/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/babel-plugin-jest-hoist/src/__tests__/tsconfig.json b/packages/babel-plugin-jest-hoist/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/diff-sequences/src/__tests__/tsconfig.json b/packages/diff-sequences/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/expect-utils/src/__tests__/isError.test.ts b/packages/expect-utils/src/__tests__/isError.test.ts
@@ -7,6 +7,8 @@
  * @jest-environment jsdom
  */
 
+/// <reference lib="dom" />
+
 /* eslint-env browser */
 
 import {isError} from '../utils';

diff --git a/packages/expect-utils/src/__tests__/tsconfig.json b/packages/expect-utils/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/expect/src/__tests__/toEqual-dom.test.ts b/packages/expect/src/__tests__/toEqual-dom.test.ts
@@ -6,6 +6,9 @@
  *
  * @jest-environment jsdom
  */
+
+/// <reference lib="dom" />
+
 /* eslint-env browser*/
 
 describe('toEqual', () => {

diff --git a/packages/expect/src/__tests__/tsconfig.json b/packages/expect/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-circus/src/__tests__/tsconfig.json b/packages/jest-circus/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git 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-cli/src/__tests__/tsconfig.json b/packages/jest-cli/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-cli/src/init/__tests__/tsconfig.json b/packages/jest-cli/src/init/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-config/src/__tests__/tsconfig.json b/packages/jest-config/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-console/src/__tests__/tsconfig.json b/packages/jest-console/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-core/src/__tests__/tsconfig.json b/packages/jest-core/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-core/src/lib/__tests__/tsconfig.json b/packages/jest-core/src/lib/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-core/src/plugins/__tests__/tsconfig.json b/packages/jest-core/src/plugins/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-create-cache-key-function/src/__tests__/tsconfig.json b/packages/jest-create-cache-key-function/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-diff/src/__tests__/tsconfig.json b/packages/jest-diff/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-docblock/src/__tests__/tsconfig.json b/packages/jest-docblock/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-each/src/__tests__/tsconfig.json b/packages/jest-each/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-environment-jsdom/src/__tests__/tsconfig.json b/packages/jest-environment-jsdom/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-environment-node/src/__tests__/tsconfig.json b/packages/jest-environment-node/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git 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-fake-timers/src/__tests__/legacyFakeTimers.test.ts b/packages/jest-fake-timers/src/__tests__/legacyFakeTimers.test.ts
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+/// <reference lib="dom" />
+
 import * as util from 'util';
 import {runInNewContext} from 'vm';
 import {ModuleMocker} from 'jest-mock';

diff --git a/packages/jest-fake-timers/src/__tests__/tsconfig.json b/packages/jest-fake-timers/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-get-type/src/__tests__/tsconfig.json b/packages/jest-get-type/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-globals/src/__tests__/tsconfig.json b/packages/jest-globals/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git 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-haste-map/src/__tests__/tsconfig.json b/packages/jest-haste-map/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-haste-map/src/crawlers/__tests__/tsconfig.json b/packages/jest-haste-map/src/crawlers/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-haste-map/src/lib/__tests__/tsconfig.json b/packages/jest-haste-map/src/lib/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-jasmine2/src/__tests__/tsconfig.json b/packages/jest-jasmine2/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git 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-leak-detector/src/__tests__/tsconfig.json b/packages/jest-leak-detector/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}
diff --git a/packages/jest-matcher-utils/src/__tests__/deepCyclicCopyReplaceableDom.test.ts b/packages/jest-matcher-utils/src/__tests__/deepCyclicCopyReplaceableDom.test.ts
@@ -6,7 +6,11 @@
  *
  * @jest-environment jsdom
  */
+
+/// <reference lib="dom" />
+
 /* eslint-env browser*/
+
 import deepCyclicCopyReplaceable from '../deepCyclicCopyReplaceable';
 
 test('should copy dom element', () => {

diff --git a/packages/jest-matcher-utils/src/__tests__/tsconfig.json b/packages/jest-matcher-utils/src/__tests__/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../../tsconfig.test.json",
+  "compilerOptions": {
+    "rootDir": "../"
+  },
+  "include": ["../**/*"]
+}