From 63cb9ecd07d2a6f5c04d11250060bd7afb2dffdb Mon Sep 17 00:00:00 2001 From: mrazauskas <72159681+mrazauskas@users.noreply.github.com> Date: Fri, 4 Feb 2022 12:21:46 +0200 Subject: [PATCH 1/5] chore: bump jest-runner-tsd --- package.json | 3 +- packages/expect/__typechecks__/tsconfig.json | 6 + .../jest-types/__typechecks__/config.test.ts | 2 +- .../jest-types/__typechecks__/expect.test.ts | 18 +- .../jest-types/__typechecks__/globals.test.ts | 2 +- .../jest-types/__typechecks__/jest.test.ts | 2 +- .../jest-types/__typechecks__/tsconfig.json | 6 + packages/jest-types/package.json | 2 +- yarn.lock | 278 ++++-------------- 9 files changed, 86 insertions(+), 233 deletions(-) create mode 100644 packages/expect/__typechecks__/tsconfig.json create mode 100644 packages/jest-types/__typechecks__/tsconfig.json diff --git a/package.json b/package.json index fa288cf2d1b1..5872a6f9b664 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "@jest/globals": "workspace:*", "@jest/test-utils": "workspace:*", "@tsconfig/node10": "^1.0.8", + "@tsd/typescript": "^4.5.5", "@types/babel__core": "^7.0.0", "@types/babel__generator": "^7.0.0", "@types/babel__template": "^7.0.0", @@ -55,7 +56,7 @@ "jest-changed-files": "workspace:*", "jest-junit": "^13.0.0", "jest-mock": "workspace:*", - "jest-runner-tsd": "^1.1.0", + "jest-runner-tsd": "^2.0.0", "jest-silent-reporter": "^0.5.0", "jest-snapshot": "workspace:*", "jest-snapshot-serializer-raw": "^1.1.0", diff --git a/packages/expect/__typechecks__/tsconfig.json b/packages/expect/__typechecks__/tsconfig.json new file mode 100644 index 000000000000..c1fad13ef425 --- /dev/null +++ b/packages/expect/__typechecks__/tsconfig.json @@ -0,0 +1,6 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "skipLibCheck": true + } +} diff --git a/packages/jest-types/__typechecks__/config.test.ts b/packages/jest-types/__typechecks__/config.test.ts index 0bb54dbdd81c..dd69249ea7b6 100644 --- a/packages/jest-types/__typechecks__/config.test.ts +++ b/packages/jest-types/__typechecks__/config.test.ts @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import {expectAssignable} from 'mlh-tsd'; +import {expectAssignable} from 'tsd-lite'; import type {Config} from '@jest/types'; expectAssignable({ diff --git a/packages/jest-types/__typechecks__/expect.test.ts b/packages/jest-types/__typechecks__/expect.test.ts index 80d87e86d186..3f6eae703433 100644 --- a/packages/jest-types/__typechecks__/expect.test.ts +++ b/packages/jest-types/__typechecks__/expect.test.ts @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import {expectError, expectType} from 'mlh-tsd'; +import {expectError, expectType} from 'tsd-lite'; import {expect} from '@jest/globals'; // asymmetric matchers @@ -182,26 +182,26 @@ expectError(expect(jest.fn()).toHaveBeenCalledTimes()); expectType(expect(jest.fn()).toBeCalledWith('value')); expectType(expect(jest.fn()).toBeCalledWith('value', 123)); -// expectError(expect(jest.fn()).toBeCalledWith()); +expectError(expect(jest.fn()).toBeCalledWith()); expectType(expect(jest.fn()).toHaveBeenCalledWith(123)); expectType(expect(jest.fn()).toHaveBeenCalledWith(123, 'value')); -// expectError(expect(jest.fn()).toHaveBeenCalledWith()); +expectError(expect(jest.fn()).toHaveBeenCalledWith()); expectType(expect(jest.fn()).lastCalledWith('value')); expectType(expect(jest.fn()).lastCalledWith('value', 123)); -// expectError(expect(jest.fn()).lastCalledWith()); +expectError(expect(jest.fn()).lastCalledWith()); expectType(expect(jest.fn()).toHaveBeenLastCalledWith(123)); expectType(expect(jest.fn()).toHaveBeenLastCalledWith(123, 'value')); -// expectError(expect(jest.fn()).toHaveBeenLastCalledWith()); +expectError(expect(jest.fn()).toHaveBeenLastCalledWith()); expectType(expect(jest.fn()).nthCalledWith(1, 'value')); expectType(expect(jest.fn()).nthCalledWith(1, 'value', 123)); -// expectError(expect(jest.fn()).nthCalledWith()); -// expectError(expect(jest.fn()).nthCalledWith(2)); +expectError(expect(jest.fn()).nthCalledWith()); +expectError(expect(jest.fn()).nthCalledWith(2)); expectType(expect(jest.fn()).toHaveBeenNthCalledWith(1, 'value')); expectType(expect(jest.fn()).toHaveBeenNthCalledWith(1, 'value', 123)); -// expectError(expect(jest.fn()).toHaveBeenNthCalledWith()); -// expectError(expect(jest.fn()).toHaveBeenNthCalledWith(2)); +expectError(expect(jest.fn()).toHaveBeenNthCalledWith()); +expectError(expect(jest.fn()).toHaveBeenNthCalledWith(2)); expectType(expect(jest.fn()).toReturn()); expectError(expect(jest.fn()).toReturn('value')); diff --git a/packages/jest-types/__typechecks__/globals.test.ts b/packages/jest-types/__typechecks__/globals.test.ts index f1d843419a88..fb530a548145 100644 --- a/packages/jest-types/__typechecks__/globals.test.ts +++ b/packages/jest-types/__typechecks__/globals.test.ts @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import {expectError, expectType} from 'mlh-tsd'; +import {expectError, expectType} from 'tsd-lite'; import { afterAll, afterEach, diff --git a/packages/jest-types/__typechecks__/jest.test.ts b/packages/jest-types/__typechecks__/jest.test.ts index a1d60669698f..3f5478f524ad 100644 --- a/packages/jest-types/__typechecks__/jest.test.ts +++ b/packages/jest-types/__typechecks__/jest.test.ts @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import {expectError, expectType} from 'mlh-tsd'; +import {expectError, expectType} from 'tsd-lite'; import {jest} from '@jest/globals'; import type {Mock} from 'jest-mock'; diff --git a/packages/jest-types/__typechecks__/tsconfig.json b/packages/jest-types/__typechecks__/tsconfig.json new file mode 100644 index 000000000000..c1fad13ef425 --- /dev/null +++ b/packages/jest-types/__typechecks__/tsconfig.json @@ -0,0 +1,6 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "skipLibCheck": true + } +} diff --git a/packages/jest-types/package.json b/packages/jest-types/package.json index 69877cdad605..45d0f8abb6cf 100644 --- a/packages/jest-types/package.json +++ b/packages/jest-types/package.json @@ -27,7 +27,7 @@ "chalk": "^4.0.0" }, "devDependencies": { - "mlh-tsd": "^0.14.1" + "tsd-lite": "^0.5.0" }, "publishConfig": { "access": "public" diff --git a/yarn.lock b/yarn.lock index 154844e08e49..b04648b18e61 100644 --- a/yarn.lock +++ b/yarn.lock @@ -271,7 +271,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.8.3": +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.15.8, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.8.3": version: 7.16.7 resolution: "@babel/code-frame@npm:7.16.7" dependencies: @@ -2592,6 +2592,7 @@ __metadata: "@jest/globals": "workspace:*" "@jest/test-utils": "workspace:*" "@tsconfig/node10": ^1.0.8 + "@tsd/typescript": ^4.5.5 "@types/babel__core": ^7.0.0 "@types/babel__generator": ^7.0.0 "@types/babel__template": ^7.0.0 @@ -2633,7 +2634,7 @@ __metadata: jest-changed-files: "workspace:*" jest-junit: ^13.0.0 jest-mock: "workspace:*" - jest-runner-tsd: ^1.1.0 + jest-runner-tsd: ^2.0.0 jest-silent-reporter: ^0.5.0 jest-snapshot: "workspace:*" jest-snapshot-serializer-raw: ^1.1.0 @@ -2801,7 +2802,7 @@ __metadata: "@types/node": "*" "@types/yargs": ^16.0.0 chalk: ^4.0.0 - mlh-tsd: ^0.14.1 + tsd-lite: ^0.5.0 languageName: unknown linkType: soft @@ -4439,6 +4440,16 @@ __metadata: languageName: node linkType: hard +"@tsd/typescript@npm:^4.5.5": + version: 4.5.5 + resolution: "@tsd/typescript@npm:4.5.5" + bin: + tsc: typescript/bin/tsc + tsserver: typescript/bin/tsserver + checksum: 8520820b99dbd4121a81d88a3a76ecc3519711c41baac5fb865b06cc90eac23f3b42a1f7c0beefdb042107ccf50db0b92115f7a2fc65852cacd59ebb9c2dd83f + languageName: node + linkType: hard + "@types/aria-query@npm:^4.2.0": version: 4.2.2 resolution: "@types/aria-query@npm:4.2.2" @@ -4587,7 +4598,7 @@ __metadata: languageName: node linkType: hard -"@types/eslint@npm:*, @types/eslint@npm:^7.2.13": +"@types/eslint@npm:*": version: 7.29.0 resolution: "@types/eslint@npm:7.29.0" dependencies: @@ -6707,22 +6718,6 @@ __metadata: languageName: node linkType: hard -"boxen@npm:^4.2.0": - version: 4.2.0 - resolution: "boxen@npm:4.2.0" - dependencies: - ansi-align: ^3.0.0 - camelcase: ^5.3.1 - chalk: ^3.0.0 - cli-boxes: ^2.2.0 - string-width: ^4.1.0 - term-size: ^2.1.0 - type-fest: ^0.8.1 - widest-line: ^3.1.0 - checksum: 667b291d227a86134aaacd6f2f997828607a8e2ead0da7b2568372728382765634df46e211f73d3b11a43784db7ec53da627a57213adbd42ce10ad39609ee4e3 - languageName: node - linkType: hard - "boxen@npm:^5.0.0, boxen@npm:^5.0.1": version: 5.1.2 resolution: "boxen@npm:5.1.2" @@ -7313,7 +7308,7 @@ __metadata: languageName: node linkType: hard -"cli-boxes@npm:^2.2.0, cli-boxes@npm:^2.2.1": +"cli-boxes@npm:^2.2.1": version: 2.2.1 resolution: "cli-boxes@npm:2.2.1" checksum: 1d39df5628a44779727cc32496fff73933f22723c0ef572c043a3fa5d9b4b88024416ff92db582076b275bdf7d7f460fc7e5fa7eb8e88d3226f08233963083a7 @@ -7990,16 +7985,27 @@ __metadata: languageName: node linkType: hard -"create-jest-runner@npm:^0.6.0": - version: 0.6.0 - resolution: "create-jest-runner@npm:0.6.0" +"create-jest-runner@npm:^0.9.0": + version: 0.9.0 + resolution: "create-jest-runner@npm:0.9.0" dependencies: - chalk: ^3.0.0 - jest-worker: ^25.1.0 - throat: ^5.0.0 + chalk: ^4.1.0 + jest-worker: ^27.0.6 + throat: ^6.0.1 + peerDependencies: + "@jest/test-result": ^27.0.0 + "@jest/types": ^27.0.0 + jest-runner: ^27.0.0 + peerDependenciesMeta: + "@jest/test-result": + optional: true + "@jest/types": + optional: true + jest-runner: + optional: true bin: create-jest-runner: generator/index.js - checksum: 18cce006b1ec46435e4a3c50c91670bc1a5b22c4e2506b3625d8016976da93506bc0f12c968ad5c620b6c2203e93aebeef4d7e6e664f03bf249cf30cd43d2e86 + checksum: 6dfacc8ac461e2f3065e29f4f95b201a070f9d05e0f3c18e69ab96d962d05a708a60417be2d19c0640d018cb900ebca549dea065599d459c97870c51932ef335 languageName: node linkType: hard @@ -9297,22 +9303,6 @@ __metadata: languageName: node linkType: hard -"eslint-formatter-pretty@npm:^4.0.0": - version: 4.1.0 - resolution: "eslint-formatter-pretty@npm:4.1.0" - dependencies: - "@types/eslint": ^7.2.13 - ansi-escapes: ^4.2.1 - chalk: ^4.1.0 - eslint-rule-docs: ^1.1.5 - log-symbols: ^4.0.0 - plur: ^4.0.0 - string-width: ^4.2.0 - supports-hyperlinks: ^2.0.0 - checksum: fe764e381dff9a3b925b9a02d95b815fbd7599629223b0647ff52967ad228a053632dcece488678d2a63b2e3e1c82b1f3efd9f774e95c30021e5a890d27460fc - languageName: node - linkType: hard - "eslint-import-resolver-node@npm:^0.3.6": version: 0.3.6 resolution: "eslint-import-resolver-node@npm:0.3.6" @@ -9433,13 +9423,6 @@ __metadata: languageName: node linkType: hard -"eslint-rule-docs@npm:^1.1.5": - version: 1.1.231 - resolution: "eslint-rule-docs@npm:1.1.231" - checksum: 21095d34306fe923c43ffaaf492c6442b4c8829c4cfe8e0da7f5200e1020cec0c836b99ac4d319f58d65d191fdd2e13f14375095eb7f60566bfa153e503b43bf - languageName: node - linkType: hard - "eslint-scope@npm:5.1.1, eslint-scope@npm:^5.1.1": version: 5.1.1 resolution: "eslint-scope@npm:5.1.1" @@ -10870,15 +10853,6 @@ __metadata: languageName: node linkType: hard -"global-dirs@npm:^2.0.1": - version: 2.1.0 - resolution: "global-dirs@npm:2.1.0" - dependencies: - ini: 1.3.7 - checksum: 32e478655226c5b64f9077c88924ba3079723fb7aabd847574bc21367369ea75d722e13aa77570e22880a51e58338bf4abfbb58f3b03de88c4784a7f94d9a25a - languageName: node - linkType: hard - "global-dirs@npm:^3.0.0": version: 3.0.0 resolution: "global-dirs@npm:3.0.0" @@ -11778,13 +11752,6 @@ __metadata: languageName: node linkType: hard -"ini@npm:1.3.7": - version: 1.3.7 - resolution: "ini@npm:1.3.7" - checksum: cf00289cb43d8de635d907c202f7dd8650d8228c322b501c089c4f52ea78dc21ebc38b07c4f37b532f52eba110d11b71f32bc22173097ca0e9c8521575688d7c - languageName: node - linkType: hard - "ini@npm:2.0.0": version: 2.0.0 resolution: "ini@npm:2.0.0" @@ -11890,13 +11857,6 @@ __metadata: languageName: node linkType: hard -"irregular-plurals@npm:^3.2.0": - version: 3.3.0 - resolution: "irregular-plurals@npm:3.3.0" - checksum: ca26e42b7e71267f80497c174ea211a6d2327d07742ab493b5450adbbd6e96d5c0e2f7c89695134eca591216bf9a2b050a3b2a66c7491716772b17d473e3456d - languageName: node - linkType: hard - "is-accessor-descriptor@npm:^0.1.6": version: 0.1.6 resolution: "is-accessor-descriptor@npm:0.1.6" @@ -12159,16 +12119,6 @@ __metadata: languageName: node linkType: hard -"is-installed-globally@npm:^0.3.1": - version: 0.3.2 - resolution: "is-installed-globally@npm:0.3.2" - dependencies: - global-dirs: ^2.0.1 - is-path-inside: ^3.0.1 - checksum: 10fc4fb09fe86c0ed5fa21e821607c6e1ca258386787b1aaad3afbe59470d0c3b50b076cbc996173b9b4c0de7d6a8b741aabf9229ab09d6c37ff663e51631529 - languageName: node - linkType: hard - "is-installed-globally@npm:^0.4.0": version: 0.4.0 resolution: "is-installed-globally@npm:0.4.0" @@ -12200,13 +12150,6 @@ __metadata: languageName: node linkType: hard -"is-npm@npm:^4.0.0": - version: 4.0.0 - resolution: "is-npm@npm:4.0.0" - checksum: 94ab2edae37293ceba039729ba1de851448059979138f72d7184a89a484bf70fbefc462268fecf59865e54ce972c15164229acc73bd56c025a7afc7dd0702c40 - languageName: node - linkType: hard - "is-npm@npm:^5.0.0": version: 5.0.0 resolution: "is-npm@npm:5.0.0" @@ -12260,7 +12203,7 @@ __metadata: languageName: node linkType: hard -"is-path-inside@npm:^3.0.1, is-path-inside@npm:^3.0.2": +"is-path-inside@npm:^3.0.2": version: 3.0.3 resolution: "is-path-inside@npm:3.0.3" checksum: b19a2937441131e68b9eb9931ec8933bc87743a8f5364f6f7e1b8fc6c1403386ecf305835fb781e3986332fada456d71ff95af77ccda5806b35aac58234f9080 @@ -12406,13 +12349,6 @@ __metadata: languageName: node linkType: hard -"is-unicode-supported@npm:^0.1.0": - version: 0.1.0 - resolution: "is-unicode-supported@npm:0.1.0" - checksum: 00ca6f5581b81d55c567d259175cb1af08c60ae95f6aad69adadfdfbe098c60ef5617ad440770d821f1710773987c0b13ed6dd375cd9ab1bd7b7dd8f9a42625c - languageName: node - linkType: hard - "is-weakref@npm:^1.0.1": version: 1.0.2 resolution: "is-weakref@npm:1.0.2" @@ -12734,15 +12670,6 @@ __metadata: languageName: unknown linkType: soft -"jest-docblock@npm:^26.0.0": - version: 26.0.0 - resolution: "jest-docblock@npm:26.0.0" - dependencies: - detect-newline: ^3.0.0 - checksum: 54b8ea1c8445a4b15e9ee5035f1bd60b0d492b87258995133a1b5df43a07803c93b54e8adaa45eae05778bd61ad57745491c625e7aa65198a9aa4f0c79030b56 - languageName: node - linkType: hard - "jest-each@^27.4.6, jest-each@workspace:packages/jest-each": version: 0.0.0-use.local resolution: "jest-each@workspace:packages/jest-each" @@ -13038,14 +12965,17 @@ __metadata: languageName: unknown linkType: soft -"jest-runner-tsd@npm:^1.1.0": - version: 1.1.0 - resolution: "jest-runner-tsd@npm:1.1.0" +"jest-runner-tsd@npm:^2.0.0": + version: 2.0.0 + resolution: "jest-runner-tsd@npm:2.0.0" dependencies: - create-jest-runner: ^0.6.0 - jest-docblock: ^26.0.0 - mlh-tsd: ^0.14.1 - checksum: 93a1dada88c6bceeabb8e60495bb295321ee7b57ba9f02137e6ace10d34baa5eb0e096da06acc9a1d1d6f6ab42fe95cb9486c8160dab257c0db5508ce8e03271 + "@babel/code-frame": ^7.15.8 + chalk: ^4.1.2 + create-jest-runner: ^0.9.0 + tsd-lite: ^0.5.0 + peerDependencies: + "@tsd/typescript": ^3.8.3 || ^4.0.7 + checksum: 33fee590e6e0a2dd6a444d37259b7b835f95df38a1502939d11a0180317734f42fe298b403ef55220b9e27d9df1b0322a1ce7189c4344ede5858cce6387e0294 languageName: node linkType: hard @@ -13303,7 +13233,7 @@ __metadata: languageName: unknown linkType: soft -"jest-worker@^27.0.2, jest-worker@^27.4.1, jest-worker@^27.4.6, jest-worker@workspace:packages/jest-worker": +"jest-worker@^27.0.2, jest-worker@^27.0.6, jest-worker@^27.4.1, jest-worker@^27.4.6, jest-worker@workspace:packages/jest-worker": version: 0.0.0-use.local resolution: "jest-worker@workspace:packages/jest-worker" dependencies: @@ -13318,16 +13248,6 @@ __metadata: languageName: unknown linkType: soft -"jest-worker@npm:^25.1.0": - version: 25.5.0 - resolution: "jest-worker@npm:25.5.0" - dependencies: - merge-stream: ^2.0.0 - supports-color: ^7.0.0 - checksum: 20ae005c58f9db5be0f9bced0df6aeca340c64e7e0c7c27264b5f5964c94013e98ccd678df935d629889136ce45594d230e547624ccce73de581a05d4a8e6315 - languageName: node - linkType: hard - "jest-worker@npm:^26.0.0, jest-worker@npm:^26.2.1, jest-worker@npm:^26.6.2": version: 26.6.2 resolution: "jest-worker@npm:26.6.2" @@ -13744,7 +13664,7 @@ __metadata: languageName: node linkType: hard -"latest-version@npm:^5.0.0, latest-version@npm:^5.1.0": +"latest-version@npm:^5.1.0": version: 5.1.0 resolution: "latest-version@npm:5.1.0" dependencies: @@ -14171,16 +14091,6 @@ __metadata: languageName: node linkType: hard -"log-symbols@npm:^4.0.0": - version: 4.1.0 - resolution: "log-symbols@npm:4.1.0" - dependencies: - chalk: ^4.1.0 - is-unicode-supported: ^0.1.0 - checksum: 57be4aeb6a6ecb81d8267600836f81928da1d846ad13384a9a22d179e27590fdb680946edbd15642a31735183adaa3dc6aae2d20e619a19fa0d54e1aee945915 - languageName: node - linkType: hard - "logkitty@npm:^0.7.1": version: 0.7.1 resolution: "logkitty@npm:0.7.1" @@ -14483,25 +14393,6 @@ __metadata: languageName: node linkType: hard -"meow@npm:^7.0.1": - version: 7.1.1 - resolution: "meow@npm:7.1.1" - dependencies: - "@types/minimist": ^1.2.0 - camelcase-keys: ^6.2.2 - decamelize-keys: ^1.1.0 - hard-rejection: ^2.1.0 - minimist-options: 4.1.0 - normalize-package-data: ^2.5.0 - read-pkg-up: ^7.0.1 - redent: ^3.0.0 - trim-newlines: ^3.0.0 - type-fest: ^0.13.1 - yargs-parser: ^18.1.3 - checksum: de6d2f15332a18da5e13bb3f935f9718cf7ae697d121009adee7a3410bfc63f6b7896476bb0e1ef101faacea4d4a4dc95108e3c9eab0e336b990a115646b72e8 - languageName: node - linkType: hard - "meow@npm:^8.0.0": version: 8.1.2 resolution: "meow@npm:8.1.2" @@ -15226,22 +15117,6 @@ __metadata: languageName: node linkType: hard -"mlh-tsd@npm:^0.14.1": - version: 0.14.1 - resolution: "mlh-tsd@npm:0.14.1" - dependencies: - eslint-formatter-pretty: ^4.0.0 - globby: ^11.0.1 - meow: ^7.0.1 - path-exists: ^4.0.0 - read-pkg-up: ^7.0.0 - update-notifier: ^4.1.0 - bin: - mlh-tsd: dist/cli.js - checksum: c9538dbe479bb770346e74789ec3681b07b8f7311a1bc8f4d1f2e527270ef66c41c490fa0f90f1594672a00c6f229d9d5a0b753af596da708d20a7b8defc130c - languageName: node - linkType: hard - "mock-fs@npm:^4.4.1": version: 4.14.0 resolution: "mock-fs@npm:4.14.0" @@ -16771,15 +16646,6 @@ __metadata: languageName: node linkType: hard -"plur@npm:^4.0.0": - version: 4.0.0 - resolution: "plur@npm:4.0.0" - dependencies: - irregular-plurals: ^3.2.0 - checksum: 22e3ba41be31e5843decf0b68ce555b7750da3b8ba56e34fbe3abc775fa9428ecf263ef401a5d0962cface0290caf0132ddd87617f02fc41789bbb0fa2a010c1 - languageName: node - linkType: hard - "portfinder@npm:^1.0.28": version: 1.0.28 resolution: "portfinder@npm:1.0.28" @@ -17550,7 +17416,7 @@ __metadata: languageName: node linkType: hard -"pupa@npm:^2.0.1, pupa@npm:^2.1.1": +"pupa@npm:^2.1.1": version: 2.1.1 resolution: "pupa@npm:2.1.1" dependencies: @@ -18224,7 +18090,7 @@ react-native@0.64.0: languageName: node linkType: hard -"read-pkg-up@npm:^7.0.0, read-pkg-up@npm:^7.0.1": +"read-pkg-up@npm:^7.0.1": version: 7.0.1 resolution: "read-pkg-up@npm:7.0.1" dependencies: @@ -20453,13 +20319,6 @@ react-native@0.64.0: languageName: node linkType: hard -"term-size@npm:^2.1.0": - version: 2.2.1 - resolution: "term-size@npm:2.2.1" - checksum: a013f688f6fc1b6410be3b2f7a04c3a9169e97186949b0bc33cc7c1943b0c88d9a943f81e518d9227cb817803e7a18c702f2971eafd6d8659ce4a1df94094246 - languageName: node - linkType: hard - "terminal-link@npm:^2.0.0": version: 2.1.1 resolution: "terminal-link@npm:2.1.1" @@ -20803,6 +20662,15 @@ react-native@0.64.0: languageName: node linkType: hard +"tsd-lite@npm:^0.5.0": + version: 0.5.0 + resolution: "tsd-lite@npm:0.5.0" + peerDependencies: + "@tsd/typescript": ^3.8.3 || ^4.0.7 + checksum: 6590ca24f2ac07e961ec3786a94269c26bfa93b09c3d397f5f3c3b09fedee515dbe96aa09de4c24ce3a42a3bbe47543f0a30aa06770b34b4a6eb8b61e92dce21 + languageName: node + linkType: hard + "tslib@npm:^1.8.1, tslib@npm:^1.9.0": version: 1.14.1 resolution: "tslib@npm:1.14.1" @@ -20869,13 +20737,6 @@ react-native@0.64.0: languageName: node linkType: hard -"type-fest@npm:^0.13.1": - version: 0.13.1 - resolution: "type-fest@npm:0.13.1" - checksum: 11acce4f34c75a838914bdc4a0133d2dd0864e313897471974880df82624159521bae691a6100ff99f93be2d0f8871ecdab18573d2c67e61905cf2f5cbfa52a6 - languageName: node - linkType: hard - "type-fest@npm:^0.16.0": version: 0.16.0 resolution: "type-fest@npm:0.16.0" @@ -21366,27 +21227,6 @@ react-native@0.64.0: languageName: node linkType: hard -"update-notifier@npm:^4.1.0": - version: 4.1.3 - resolution: "update-notifier@npm:4.1.3" - dependencies: - boxen: ^4.2.0 - chalk: ^3.0.0 - configstore: ^5.0.1 - has-yarn: ^2.1.0 - import-lazy: ^2.1.0 - is-ci: ^2.0.0 - is-installed-globally: ^0.3.1 - is-npm: ^4.0.0 - is-yarn-global: ^0.3.0 - latest-version: ^5.0.0 - pupa: ^2.0.1 - semver-diff: ^3.1.1 - xdg-basedir: ^4.0.0 - checksum: 90362dcdf349651f92cffc6b9c1dfe6cb1035c1af3e4952316800d7aa05e98ba7bd291edd315aa215ce3f9b4b246f1fc2489a25c85c6fee8bdd0163731b3e1fa - languageName: node - linkType: hard - "update-notifier@npm:^5.1.0": version: 5.1.0 resolution: "update-notifier@npm:5.1.0" @@ -22590,7 +22430,7 @@ react-native@0.64.0: languageName: node linkType: hard -"yargs-parser@npm:^18.1.2, yargs-parser@npm:^18.1.3": +"yargs-parser@npm:^18.1.2": version: 18.1.3 resolution: "yargs-parser@npm:18.1.3" dependencies: From f575aad9a29cdba0476017ff01826e5079e315e1 Mon Sep 17 00:00:00 2001 From: mrazauskas <72159681+mrazauskas@users.noreply.github.com> Date: Fri, 4 Feb 2022 15:13:32 +0200 Subject: [PATCH 2/5] fix compiler config --- packages/expect/__typechecks__/tsconfig.json | 9 ++++++--- packages/jest-types/__typechecks__/tsconfig.json | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/expect/__typechecks__/tsconfig.json b/packages/expect/__typechecks__/tsconfig.json index c1fad13ef425..e77a8348635f 100644 --- a/packages/expect/__typechecks__/tsconfig.json +++ b/packages/expect/__typechecks__/tsconfig.json @@ -1,6 +1,9 @@ { - "extends": "../../../tsconfig.json", + "extends": "@tsconfig/node10/tsconfig.json", "compilerOptions": { - "skipLibCheck": true - } + "isolatedModules": true, + "skipLibCheck": true, + "strict": true + }, + "include": ["**/*"] } diff --git a/packages/jest-types/__typechecks__/tsconfig.json b/packages/jest-types/__typechecks__/tsconfig.json index c1fad13ef425..e77a8348635f 100644 --- a/packages/jest-types/__typechecks__/tsconfig.json +++ b/packages/jest-types/__typechecks__/tsconfig.json @@ -1,6 +1,9 @@ { - "extends": "../../../tsconfig.json", + "extends": "@tsconfig/node10/tsconfig.json", "compilerOptions": { - "skipLibCheck": true - } + "isolatedModules": true, + "skipLibCheck": true, + "strict": true + }, + "include": ["**/*"] } From 0f2c010c621fef77a150e246eb1023f04c22036e Mon Sep 17 00:00:00 2001 From: mrazauskas <72159681+mrazauskas@users.noreply.github.com> Date: Fri, 4 Feb 2022 15:13:55 +0200 Subject: [PATCH 3/5] fix @tsd/typescript version --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5872a6f9b664..2ddc4d464569 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@jest/globals": "workspace:*", "@jest/test-utils": "workspace:*", "@tsconfig/node10": "^1.0.8", - "@tsd/typescript": "^4.5.5", + "@tsd/typescript": "~4.1.5", "@types/babel__core": "^7.0.0", "@types/babel__generator": "^7.0.0", "@types/babel__template": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index b04648b18e61..79d71fb2a791 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2592,7 +2592,7 @@ __metadata: "@jest/globals": "workspace:*" "@jest/test-utils": "workspace:*" "@tsconfig/node10": ^1.0.8 - "@tsd/typescript": ^4.5.5 + "@tsd/typescript": ~4.1.5 "@types/babel__core": ^7.0.0 "@types/babel__generator": ^7.0.0 "@types/babel__template": ^7.0.0 @@ -4440,13 +4440,13 @@ __metadata: languageName: node linkType: hard -"@tsd/typescript@npm:^4.5.5": - version: 4.5.5 - resolution: "@tsd/typescript@npm:4.5.5" +"@tsd/typescript@npm:~4.1.5": + version: 4.1.5 + resolution: "@tsd/typescript@npm:4.1.5" bin: tsc: typescript/bin/tsc tsserver: typescript/bin/tsserver - checksum: 8520820b99dbd4121a81d88a3a76ecc3519711c41baac5fb865b06cc90eac23f3b42a1f7c0beefdb042107ccf50db0b92115f7a2fc65852cacd59ebb9c2dd83f + checksum: 6f1f27ca5a67f30600c0da7c62ccf915374049a785660913cdbec45ab99dc2f0e1cfa1606cbc043b313cdff20424c0404a94685143e99ed58105efd0cab94df4 languageName: node linkType: hard From 48ac312254b482fa7c1bd6aa30b40c1c6fa08f8d Mon Sep 17 00:00:00 2001 From: mrazauskas <72159681+mrazauskas@users.noreply.github.com> Date: Fri, 4 Feb 2022 16:48:14 +0200 Subject: [PATCH 4/5] improve setup --- jest.config.types.js => jest.config.tsd.js | 0 package.json | 2 +- packages/expect/__typechecks__/tsconfig.json | 8 +------- packages/jest-types/__typechecks__/tsconfig.json | 8 +------- tsconfig.tsd.json | 11 +++++++++++ 5 files changed, 14 insertions(+), 15 deletions(-) rename jest.config.types.js => jest.config.tsd.js (100%) create mode 100644 tsconfig.tsd.json diff --git a/jest.config.types.js b/jest.config.tsd.js similarity index 100% rename from jest.config.types.js rename to jest.config.tsd.js diff --git a/package.json b/package.json index 2ddc4d464569..5e728b63aab3 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "lint:prettier": "prettier '**/*.{md,yml,yaml}' 'website/**/*.{css,js}' --write --ignore-path .gitignore", "lint:prettier:ci": "prettier '**/*.{md,yml,yaml}' 'website/**/*.{css,js}' --check --ignore-path .gitignore", "remove-examples": "node ./scripts/remove-examples.js", - "test-types": "yarn jest --config jest.config.types.js", + "test-types": "yarn jest --config jest.config.tsd.js", "test-ci": "yarn jest-coverage --color -i --config jest.config.ci.js && yarn test-leak && node ./scripts/mapCoverage.js && codecov", "test-ci-partial": "yarn test-ci-partial:parallel -i", "test-ci-partial:parallel": "yarn jest --color --config jest.config.ci.js", diff --git a/packages/expect/__typechecks__/tsconfig.json b/packages/expect/__typechecks__/tsconfig.json index e77a8348635f..c8ede5971ab0 100644 --- a/packages/expect/__typechecks__/tsconfig.json +++ b/packages/expect/__typechecks__/tsconfig.json @@ -1,9 +1,3 @@ { - "extends": "@tsconfig/node10/tsconfig.json", - "compilerOptions": { - "isolatedModules": true, - "skipLibCheck": true, - "strict": true - }, - "include": ["**/*"] + "extends": "../../../tsconfig.tsd.json" } diff --git a/packages/jest-types/__typechecks__/tsconfig.json b/packages/jest-types/__typechecks__/tsconfig.json index e77a8348635f..c8ede5971ab0 100644 --- a/packages/jest-types/__typechecks__/tsconfig.json +++ b/packages/jest-types/__typechecks__/tsconfig.json @@ -1,9 +1,3 @@ { - "extends": "@tsconfig/node10/tsconfig.json", - "compilerOptions": { - "isolatedModules": true, - "skipLibCheck": true, - "strict": true - }, - "include": ["**/*"] + "extends": "../../../tsconfig.tsd.json" } diff --git a/tsconfig.tsd.json b/tsconfig.tsd.json new file mode 100644 index 000000000000..eb673fdc5f4c --- /dev/null +++ b/tsconfig.tsd.json @@ -0,0 +1,11 @@ +{ + "extends": "@tsconfig/node10/tsconfig.json", + "compilerOptions": { + "esModuleInterop": false, + "isolatedModules": true, + "moduleResolution": "node", + "skipLibCheck": true, + "strict": true + }, + "include": ["**/*"] +} From 8304b4641bff2c6e4cf84fd5ea645b6171674ada Mon Sep 17 00:00:00 2001 From: mrazauskas <72159681+mrazauskas@users.noreply.github.com> Date: Fri, 4 Feb 2022 20:30:06 +0200 Subject: [PATCH 5/5] alternative setup --- .eslintrc.js | 4 ++-- jest.config.js | 2 +- jest.config.tsd.js | 2 +- packages/babel-jest/tsconfig.json | 2 ++ packages/babel-plugin-jest-hoist/tsconfig.json | 4 +++- packages/diff-sequences/tsconfig.json | 4 +++- packages/expect/.npmignore | 2 +- packages/expect/__typechecks__/tsconfig.json | 3 --- .../{__typechecks__ => __typetests__}/expect.test.ts | 0 packages/expect/__typetests__/tsconfig.json | 9 +++++++++ packages/expect/tsconfig.json | 2 ++ packages/jest-changed-files/tsconfig.json | 1 + packages/jest-circus/tsconfig.json | 2 ++ packages/jest-cli/tsconfig.json | 2 ++ packages/jest-config/tsconfig.json | 2 ++ packages/jest-console/tsconfig.json | 2 ++ packages/jest-core/tsconfig.json | 2 ++ packages/jest-create-cache-key-function/tsconfig.json | 2 ++ packages/jest-diff/tsconfig.json | 2 ++ packages/jest-docblock/tsconfig.json | 4 +++- packages/jest-each/tsconfig.json | 2 ++ packages/jest-environment-jsdom/tsconfig.json | 2 ++ packages/jest-environment-node/tsconfig.json | 2 ++ packages/jest-environment/tsconfig.json | 1 + packages/jest-fake-timers/tsconfig.json | 2 ++ packages/jest-get-type/tsconfig.json | 4 +++- packages/jest-globals/tsconfig.json | 2 ++ packages/jest-haste-map/tsconfig.json | 2 ++ packages/jest-jasmine2/tsconfig.json | 2 ++ packages/jest-leak-detector/tsconfig.json | 2 ++ packages/jest-matcher-utils/tsconfig.json | 2 ++ packages/jest-message-util/tsconfig.json | 2 ++ packages/jest-mock/tsconfig.json | 2 ++ packages/jest-phabricator/tsconfig.json | 1 + packages/jest-regex-util/tsconfig.json | 4 +++- packages/jest-repl/tsconfig.json | 2 ++ packages/jest-reporters/tsconfig.json | 2 ++ packages/jest-resolve-dependencies/tsconfig.json | 2 ++ packages/jest-resolve/tsconfig.json | 2 ++ packages/jest-runner/tsconfig.json | 2 ++ packages/jest-runtime/tsconfig.json | 2 ++ packages/jest-serializer/tsconfig.json | 4 +++- packages/jest-snapshot/tsconfig.json | 2 ++ packages/jest-source-map/tsconfig.json | 4 +++- packages/jest-test-result/tsconfig.json | 2 ++ packages/jest-test-sequencer/tsconfig.json | 2 ++ packages/jest-transform/tsconfig.json | 2 ++ packages/jest-types/.npmignore | 2 +- packages/jest-types/__typechecks__/tsconfig.json | 3 --- .../{__typechecks__ => __typetests__}/config.test.ts | 0 .../{__typechecks__ => __typetests__}/expect.test.ts | 0 .../{__typechecks__ => __typetests__}/globals.test.ts | 0 .../{__typechecks__ => __typetests__}/jest.test.ts | 0 packages/jest-types/__typetests__/tsconfig.json | 9 +++++++++ packages/jest-types/tsconfig.json | 3 ++- packages/jest-util/tsconfig.json | 2 ++ packages/jest-validate/tsconfig.json | 2 ++ packages/jest-watcher/tsconfig.json | 2 ++ packages/jest-worker/tsconfig.json | 2 ++ packages/jest/tsconfig.json | 1 + packages/pretty-format/tsconfig.json | 2 ++ packages/test-utils/tsconfig.json | 1 + tsconfig.json | 9 +-------- tsconfig.tsd.json | 11 ----------- 64 files changed, 123 insertions(+), 39 deletions(-) delete mode 100644 packages/expect/__typechecks__/tsconfig.json rename packages/expect/{__typechecks__ => __typetests__}/expect.test.ts (100%) create mode 100644 packages/expect/__typetests__/tsconfig.json delete mode 100644 packages/jest-types/__typechecks__/tsconfig.json rename packages/jest-types/{__typechecks__ => __typetests__}/config.test.ts (100%) rename packages/jest-types/{__typechecks__ => __typetests__}/expect.test.ts (100%) rename packages/jest-types/{__typechecks__ => __typetests__}/globals.test.ts (100%) rename packages/jest-types/{__typechecks__ => __typetests__}/jest.test.ts (100%) create mode 100644 packages/jest-types/__typetests__/tsconfig.json delete mode 100644 tsconfig.tsd.json diff --git a/.eslintrc.js b/.eslintrc.js index 1098157eafd9..bb36714e2a68 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -234,7 +234,7 @@ module.exports = { }, }, { - files: ['**/__typechecks__/**', '*.md'], + files: ['**/__typetests__/**', '*.md'], rules: { 'jest/no-focused-tests': 'off', 'jest/no-identical-title': 'off', @@ -303,7 +303,7 @@ module.exports = { devDependencies: [ '**/__mocks__/**', '**/__tests__/**', - '**/__typechecks__/**', + '**/__typetests__/**', '**/?(*.)(spec|test).js?(x)', 'scripts/**', 'babel.config.js', diff --git a/jest.config.js b/jest.config.js index e8e4ff73eb23..18d69b645a78 100644 --- a/jest.config.js +++ b/jest.config.js @@ -36,7 +36,7 @@ module.exports = { ], testPathIgnorePatterns: [ '/__arbitraries__/', - '/__typechecks__/', + '/__typetests__/', '/node_modules/', '/examples/', '/e2e/.*/__tests__', diff --git a/jest.config.tsd.js b/jest.config.tsd.js index 77a65008fffb..2ac85943e857 100644 --- a/jest.config.tsd.js +++ b/jest.config.tsd.js @@ -17,5 +17,5 @@ module.exports = { modulePathIgnorePatterns, roots: ['/packages'], runner: 'jest-runner-tsd', - testMatch: ['**/__typechecks__/**/*.ts'], + testMatch: ['**/__typetests__/**/*.ts'], }; diff --git a/packages/babel-jest/tsconfig.json b/packages/babel-jest/tsconfig.json index 0984ce01a994..1ffeba9a4488 100644 --- a/packages/babel-jest/tsconfig.json +++ b/packages/babel-jest/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], // TODO: include `babel-preset-jest` if it's ever in TS even though we don't care about its types "references": [ {"path": "../jest-transform"}, diff --git a/packages/babel-plugin-jest-hoist/tsconfig.json b/packages/babel-plugin-jest-hoist/tsconfig.json index 7bb06bce6d20..bb13eb783ccc 100644 --- a/packages/babel-plugin-jest-hoist/tsconfig.json +++ b/packages/babel-plugin-jest-hoist/tsconfig.json @@ -3,5 +3,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "build" - } + }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"] } diff --git a/packages/diff-sequences/tsconfig.json b/packages/diff-sequences/tsconfig.json index 7bb06bce6d20..bb13eb783ccc 100644 --- a/packages/diff-sequences/tsconfig.json +++ b/packages/diff-sequences/tsconfig.json @@ -3,5 +3,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "build" - } + }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"] } diff --git a/packages/expect/.npmignore b/packages/expect/.npmignore index 0f8a566fe139..83740ab0bc5a 100644 --- a/packages/expect/.npmignore +++ b/packages/expect/.npmignore @@ -1,6 +1,6 @@ **/__mocks__/** **/__tests__/** -__typechecks__ +__typetests__ src tsconfig.json tsconfig.tsbuildinfo diff --git a/packages/expect/__typechecks__/tsconfig.json b/packages/expect/__typechecks__/tsconfig.json deleted file mode 100644 index c8ede5971ab0..000000000000 --- a/packages/expect/__typechecks__/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../../tsconfig.tsd.json" -} diff --git a/packages/expect/__typechecks__/expect.test.ts b/packages/expect/__typetests__/expect.test.ts similarity index 100% rename from packages/expect/__typechecks__/expect.test.ts rename to packages/expect/__typetests__/expect.test.ts diff --git a/packages/expect/__typetests__/tsconfig.json b/packages/expect/__typetests__/tsconfig.json new file mode 100644 index 000000000000..b7577781b384 --- /dev/null +++ b/packages/expect/__typetests__/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "noUnusedLocals": false, + "noUnusedParameters": false, + "skipLibCheck": true + }, + "include": ["./**/*"] +} diff --git a/packages/expect/tsconfig.json b/packages/expect/tsconfig.json index 2130f5ba8f87..8fd74f140885 100644 --- a/packages/expect/tsconfig.json +++ b/packages/expect/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-get-type"}, {"path": "../jest-matcher-utils"}, diff --git a/packages/jest-changed-files/tsconfig.json b/packages/jest-changed-files/tsconfig.json index 3046cb6b9b6a..4003592c4d85 100644 --- a/packages/jest-changed-files/tsconfig.json +++ b/packages/jest-changed-files/tsconfig.json @@ -4,5 +4,6 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], "references": [{"path": "../jest-types"}] } diff --git a/packages/jest-circus/tsconfig.json b/packages/jest-circus/tsconfig.json index 659dded4b8f4..4e6535abac08 100644 --- a/packages/jest-circus/tsconfig.json +++ b/packages/jest-circus/tsconfig.json @@ -4,6 +4,8 @@ "outDir": "build", "rootDir": "src" }, + "include": ["./src/**/*"], + "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"], "references": [ {"path": "../expect"}, {"path": "../jest-each"}, diff --git a/packages/jest-cli/tsconfig.json b/packages/jest-cli/tsconfig.json index 81e31d14d7f0..32f96c0f8a77 100644 --- a/packages/jest-cli/tsconfig.json +++ b/packages/jest-cli/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-config"}, {"path": "../jest-core"}, diff --git a/packages/jest-config/tsconfig.json b/packages/jest-config/tsconfig.json index 4ffd33734047..8d8261ca2028 100644 --- a/packages/jest-config/tsconfig.json +++ b/packages/jest-config/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"], // TODO: This is missing `babel-jest`, `jest-jasmine2`, `jest-circus` and // jest-test-sequencer, but that is just `require.resolve`d, so no real use // for their types diff --git a/packages/jest-console/tsconfig.json b/packages/jest-console/tsconfig.json index 87cb2c2da489..308e84ff26ee 100644 --- a/packages/jest-console/tsconfig.json +++ b/packages/jest-console/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-message-util"}, {"path": "../jest-types"}, diff --git a/packages/jest-core/tsconfig.json b/packages/jest-core/tsconfig.json index 6010315e6eeb..f70d53b63195 100644 --- a/packages/jest-core/tsconfig.json +++ b/packages/jest-core/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-changed-files"}, {"path": "../jest-config"}, diff --git a/packages/jest-create-cache-key-function/tsconfig.json b/packages/jest-create-cache-key-function/tsconfig.json index 23c08b0da24e..cf4cceccce14 100644 --- a/packages/jest-create-cache-key-function/tsconfig.json +++ b/packages/jest-create-cache-key-function/tsconfig.json @@ -4,5 +4,7 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [{"path": "../jest-types"}, {"path": "../jest-util"}] } diff --git a/packages/jest-diff/tsconfig.json b/packages/jest-diff/tsconfig.json index 0e6330874c83..e816b873f5ba 100644 --- a/packages/jest-diff/tsconfig.json +++ b/packages/jest-diff/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../diff-sequences"}, {"path": "../jest-get-type"}, diff --git a/packages/jest-docblock/tsconfig.json b/packages/jest-docblock/tsconfig.json index 7bb06bce6d20..bb13eb783ccc 100644 --- a/packages/jest-docblock/tsconfig.json +++ b/packages/jest-docblock/tsconfig.json @@ -3,5 +3,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "build" - } + }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"] } diff --git a/packages/jest-each/tsconfig.json b/packages/jest-each/tsconfig.json index b88a75787fde..127194c63278 100644 --- a/packages/jest-each/tsconfig.json +++ b/packages/jest-each/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-get-type"}, {"path": "../jest-types"}, diff --git a/packages/jest-environment-jsdom/tsconfig.json b/packages/jest-environment-jsdom/tsconfig.json index f1597e6a07c9..240880c13e8f 100644 --- a/packages/jest-environment-jsdom/tsconfig.json +++ b/packages/jest-environment-jsdom/tsconfig.json @@ -4,6 +4,8 @@ "outDir": "build", "rootDir": "src" }, + "include": ["./src/**/*"], + "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"], "references": [ {"path": "../jest-environment"}, {"path": "../jest-fake-timers"}, diff --git a/packages/jest-environment-node/tsconfig.json b/packages/jest-environment-node/tsconfig.json index f1597e6a07c9..12bd3f484bcd 100644 --- a/packages/jest-environment-node/tsconfig.json +++ b/packages/jest-environment-node/tsconfig.json @@ -4,6 +4,8 @@ "outDir": "build", "rootDir": "src" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-environment"}, {"path": "../jest-fake-timers"}, diff --git a/packages/jest-environment/tsconfig.json b/packages/jest-environment/tsconfig.json index 7e0bf445fb1a..3b0f77d1c9c5 100644 --- a/packages/jest-environment/tsconfig.json +++ b/packages/jest-environment/tsconfig.json @@ -6,6 +6,7 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], "references": [ {"path": "../jest-fake-timers"}, {"path": "../jest-mock"}, diff --git a/packages/jest-fake-timers/tsconfig.json b/packages/jest-fake-timers/tsconfig.json index 9db8e6cc0ed9..0bdcddc53258 100644 --- a/packages/jest-fake-timers/tsconfig.json +++ b/packages/jest-fake-timers/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-message-util"}, {"path": "../jest-mock"}, diff --git a/packages/jest-get-type/tsconfig.json b/packages/jest-get-type/tsconfig.json index 7bb06bce6d20..bb13eb783ccc 100644 --- a/packages/jest-get-type/tsconfig.json +++ b/packages/jest-get-type/tsconfig.json @@ -3,5 +3,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "build" - } + }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"] } diff --git a/packages/jest-globals/tsconfig.json b/packages/jest-globals/tsconfig.json index f6060ca2e675..ef7d4e629e02 100644 --- a/packages/jest-globals/tsconfig.json +++ b/packages/jest-globals/tsconfig.json @@ -6,6 +6,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../expect"}, {"path": "../jest-environment"}, diff --git a/packages/jest-haste-map/tsconfig.json b/packages/jest-haste-map/tsconfig.json index 1174b5fae123..6788585ebdeb 100644 --- a/packages/jest-haste-map/tsconfig.json +++ b/packages/jest-haste-map/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-regex-util"}, {"path": "../jest-serializer"}, diff --git a/packages/jest-jasmine2/tsconfig.json b/packages/jest-jasmine2/tsconfig.json index a52d122e4792..81029dc1642f 100644 --- a/packages/jest-jasmine2/tsconfig.json +++ b/packages/jest-jasmine2/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../expect"}, {"path": "../jest-each"}, diff --git a/packages/jest-leak-detector/tsconfig.json b/packages/jest-leak-detector/tsconfig.json index af22aef220ca..4deb4b1ffbe1 100644 --- a/packages/jest-leak-detector/tsconfig.json +++ b/packages/jest-leak-detector/tsconfig.json @@ -4,5 +4,7 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [{"path": "../jest-get-type"}, {"path": "../pretty-format"}] } diff --git a/packages/jest-matcher-utils/tsconfig.json b/packages/jest-matcher-utils/tsconfig.json index febd499d97ae..b2323e702d75 100644 --- a/packages/jest-matcher-utils/tsconfig.json +++ b/packages/jest-matcher-utils/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-diff"}, {"path": "../jest-get-type"}, diff --git a/packages/jest-message-util/tsconfig.json b/packages/jest-message-util/tsconfig.json index 8be65ecb2b1e..81cde7d11ab7 100644 --- a/packages/jest-message-util/tsconfig.json +++ b/packages/jest-message-util/tsconfig.json @@ -4,5 +4,7 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [{"path": "../jest-types"}, {"path": "../pretty-format"}] } diff --git a/packages/jest-mock/tsconfig.json b/packages/jest-mock/tsconfig.json index 3046cb6b9b6a..b69d4caaeea9 100644 --- a/packages/jest-mock/tsconfig.json +++ b/packages/jest-mock/tsconfig.json @@ -4,5 +4,7 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [{"path": "../jest-types"}] } diff --git a/packages/jest-phabricator/tsconfig.json b/packages/jest-phabricator/tsconfig.json index ed501699fc79..1d67e0f2c281 100644 --- a/packages/jest-phabricator/tsconfig.json +++ b/packages/jest-phabricator/tsconfig.json @@ -4,6 +4,7 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], "references": [ { "path": "../jest-test-result" diff --git a/packages/jest-regex-util/tsconfig.json b/packages/jest-regex-util/tsconfig.json index 7bb06bce6d20..bb13eb783ccc 100644 --- a/packages/jest-regex-util/tsconfig.json +++ b/packages/jest-regex-util/tsconfig.json @@ -3,5 +3,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "build" - } + }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"] } diff --git a/packages/jest-repl/tsconfig.json b/packages/jest-repl/tsconfig.json index c6558a59e3a7..bdd24b2b9309 100644 --- a/packages/jest-repl/tsconfig.json +++ b/packages/jest-repl/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-config"}, {"path": "../jest-console"}, diff --git a/packages/jest-reporters/tsconfig.json b/packages/jest-reporters/tsconfig.json index 90e8ebceb1d5..d5c6ecc17d98 100644 --- a/packages/jest-reporters/tsconfig.json +++ b/packages/jest-reporters/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-console"}, {"path": "../jest-haste-map"}, diff --git a/packages/jest-resolve-dependencies/tsconfig.json b/packages/jest-resolve-dependencies/tsconfig.json index 433e2ed3f351..a1307345772a 100644 --- a/packages/jest-resolve-dependencies/tsconfig.json +++ b/packages/jest-resolve-dependencies/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-haste-map"}, {"path": "../jest-regex-util"}, diff --git a/packages/jest-resolve/tsconfig.json b/packages/jest-resolve/tsconfig.json index 7ffe2b2a1c93..c62988ec0d17 100644 --- a/packages/jest-resolve/tsconfig.json +++ b/packages/jest-resolve/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"], "references": [ {"path": "../jest-haste-map"}, {"path": "../jest-types"}, diff --git a/packages/jest-runner/tsconfig.json b/packages/jest-runner/tsconfig.json index 95c28936e714..8646589e6cf8 100644 --- a/packages/jest-runner/tsconfig.json +++ b/packages/jest-runner/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-console"}, {"path": "../jest-docblock"}, diff --git a/packages/jest-runtime/tsconfig.json b/packages/jest-runtime/tsconfig.json index 9db7077cf582..d746bf7b9bec 100644 --- a/packages/jest-runtime/tsconfig.json +++ b/packages/jest-runtime/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"], "references": [ {"path": "../jest-environment"}, {"path": "../jest-environment-node"}, diff --git a/packages/jest-serializer/tsconfig.json b/packages/jest-serializer/tsconfig.json index 7bb06bce6d20..bb13eb783ccc 100644 --- a/packages/jest-serializer/tsconfig.json +++ b/packages/jest-serializer/tsconfig.json @@ -3,5 +3,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "build" - } + }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"] } diff --git a/packages/jest-snapshot/tsconfig.json b/packages/jest-snapshot/tsconfig.json index d0d43f32c1c1..de9818a9b1dd 100644 --- a/packages/jest-snapshot/tsconfig.json +++ b/packages/jest-snapshot/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__mocks__/**/*", "./**/__tests__/**/*"], "references": [ {"path": "../expect"}, {"path": "../jest-diff"}, diff --git a/packages/jest-source-map/tsconfig.json b/packages/jest-source-map/tsconfig.json index 7bb06bce6d20..bb13eb783ccc 100644 --- a/packages/jest-source-map/tsconfig.json +++ b/packages/jest-source-map/tsconfig.json @@ -3,5 +3,7 @@ "compilerOptions": { "rootDir": "src", "outDir": "build" - } + }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"] } diff --git a/packages/jest-test-result/tsconfig.json b/packages/jest-test-result/tsconfig.json index 574a74911579..22378fc11b19 100644 --- a/packages/jest-test-result/tsconfig.json +++ b/packages/jest-test-result/tsconfig.json @@ -4,5 +4,7 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [{"path": "../jest-console"}, {"path": "../jest-types"}] } diff --git a/packages/jest-test-sequencer/tsconfig.json b/packages/jest-test-sequencer/tsconfig.json index 8f8417fc4e78..afb827643b6e 100644 --- a/packages/jest-test-sequencer/tsconfig.json +++ b/packages/jest-test-sequencer/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-haste-map"}, {"path": "../jest-runtime"}, diff --git a/packages/jest-transform/tsconfig.json b/packages/jest-transform/tsconfig.json index 102b4e3641b9..b663b58b48db 100644 --- a/packages/jest-transform/tsconfig.json +++ b/packages/jest-transform/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-haste-map"}, {"path": "../jest-regex-util"}, diff --git a/packages/jest-types/.npmignore b/packages/jest-types/.npmignore index 0f8a566fe139..83740ab0bc5a 100644 --- a/packages/jest-types/.npmignore +++ b/packages/jest-types/.npmignore @@ -1,6 +1,6 @@ **/__mocks__/** **/__tests__/** -__typechecks__ +__typetests__ src tsconfig.json tsconfig.tsbuildinfo diff --git a/packages/jest-types/__typechecks__/tsconfig.json b/packages/jest-types/__typechecks__/tsconfig.json deleted file mode 100644 index c8ede5971ab0..000000000000 --- a/packages/jest-types/__typechecks__/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../../tsconfig.tsd.json" -} diff --git a/packages/jest-types/__typechecks__/config.test.ts b/packages/jest-types/__typetests__/config.test.ts similarity index 100% rename from packages/jest-types/__typechecks__/config.test.ts rename to packages/jest-types/__typetests__/config.test.ts diff --git a/packages/jest-types/__typechecks__/expect.test.ts b/packages/jest-types/__typetests__/expect.test.ts similarity index 100% rename from packages/jest-types/__typechecks__/expect.test.ts rename to packages/jest-types/__typetests__/expect.test.ts diff --git a/packages/jest-types/__typechecks__/globals.test.ts b/packages/jest-types/__typetests__/globals.test.ts similarity index 100% rename from packages/jest-types/__typechecks__/globals.test.ts rename to packages/jest-types/__typetests__/globals.test.ts diff --git a/packages/jest-types/__typechecks__/jest.test.ts b/packages/jest-types/__typetests__/jest.test.ts similarity index 100% rename from packages/jest-types/__typechecks__/jest.test.ts rename to packages/jest-types/__typetests__/jest.test.ts diff --git a/packages/jest-types/__typetests__/tsconfig.json b/packages/jest-types/__typetests__/tsconfig.json new file mode 100644 index 000000000000..b7577781b384 --- /dev/null +++ b/packages/jest-types/__typetests__/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "noUnusedLocals": false, + "noUnusedParameters": false, + "skipLibCheck": true + }, + "include": ["./**/*"] +} diff --git a/packages/jest-types/tsconfig.json b/packages/jest-types/tsconfig.json index 7bb06bce6d20..12688a2879d6 100644 --- a/packages/jest-types/tsconfig.json +++ b/packages/jest-types/tsconfig.json @@ -3,5 +3,6 @@ "compilerOptions": { "rootDir": "src", "outDir": "build" - } + }, + "include": ["./src/**/*"] } diff --git a/packages/jest-util/tsconfig.json b/packages/jest-util/tsconfig.json index 3046cb6b9b6a..b69d4caaeea9 100644 --- a/packages/jest-util/tsconfig.json +++ b/packages/jest-util/tsconfig.json @@ -4,5 +4,7 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [{"path": "../jest-types"}] } diff --git a/packages/jest-validate/tsconfig.json b/packages/jest-validate/tsconfig.json index 7c636682050f..56eef35eeaa3 100644 --- a/packages/jest-validate/tsconfig.json +++ b/packages/jest-validate/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-get-type"}, {"path": "../jest-types"}, diff --git a/packages/jest-watcher/tsconfig.json b/packages/jest-watcher/tsconfig.json index eb392c86ab90..13b8810ffd17 100644 --- a/packages/jest-watcher/tsconfig.json +++ b/packages/jest-watcher/tsconfig.json @@ -4,6 +4,8 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [ {"path": "../jest-test-result"}, {"path": "../jest-types"}, diff --git a/packages/jest-worker/tsconfig.json b/packages/jest-worker/tsconfig.json index fd735f5969a8..1eb1744765cb 100644 --- a/packages/jest-worker/tsconfig.json +++ b/packages/jest-worker/tsconfig.json @@ -4,5 +4,7 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__performance_tests__/**/*", "./**/__tests__/**/*"], "references": [{"path": "../jest-leak-detector"}] } diff --git a/packages/jest/tsconfig.json b/packages/jest/tsconfig.json index dd19623b6a88..21169670d305 100644 --- a/packages/jest/tsconfig.json +++ b/packages/jest/tsconfig.json @@ -4,5 +4,6 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], "references": [{"path": "../jest-cli"}, {"path": "../jest-core"}] } diff --git a/packages/pretty-format/tsconfig.json b/packages/pretty-format/tsconfig.json index a6d891ed53bf..e894ea391e2d 100644 --- a/packages/pretty-format/tsconfig.json +++ b/packages/pretty-format/tsconfig.json @@ -4,5 +4,7 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], + "exclude": ["./**/__tests__/**/*"], "references": [{"path": "../jest-util"}] } diff --git a/packages/test-utils/tsconfig.json b/packages/test-utils/tsconfig.json index 8be65ecb2b1e..110097eb7fef 100644 --- a/packages/test-utils/tsconfig.json +++ b/packages/test-utils/tsconfig.json @@ -4,5 +4,6 @@ "rootDir": "src", "outDir": "build" }, + "include": ["./src/**/*"], "references": [{"path": "../jest-types"}, {"path": "../pretty-format"}] } diff --git a/tsconfig.json b/tsconfig.json index 1064bd907307..0285f916ae72 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -23,12 +23,5 @@ "esModuleInterop": false, "skipLibCheck": false, "resolveJsonModule": true - }, - "exclude": [ - ".yarn/releases/*", - "**/__mocks__/**/*", - "**/__tests__/**/*", - "**/__typechecks__/**/*", - "**/build/**/*" - ] + } } diff --git a/tsconfig.tsd.json b/tsconfig.tsd.json deleted file mode 100644 index eb673fdc5f4c..000000000000 --- a/tsconfig.tsd.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "@tsconfig/node10/tsconfig.json", - "compilerOptions": { - "esModuleInterop": false, - "isolatedModules": true, - "moduleResolution": "node", - "skipLibCheck": true, - "strict": true - }, - "include": ["**/*"] -}