From fdbc9438a9945811cc3628d61b8b12584a749c18 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 16 Apr 2020 12:36:15 +0200 Subject: [PATCH] chore: require minimum typescript@3.8 --- .github/workflows/nodejs.yml | 2 - CHANGELOG.md | 1 + package.json | 3 -- packages/babel-jest/package.json | 7 --- packages/babel-plugin-jest-hoist/package.json | 7 --- packages/diff-sequences/package.json | 7 --- packages/expect/package.json | 7 --- packages/jest-changed-files/package.json | 7 --- packages/jest-circus/package.json | 7 --- packages/jest-cli/package.json | 7 --- packages/jest-config/package.json | 7 --- packages/jest-console/package.json | 7 --- packages/jest-console/src/CustomConsole.ts | 3 +- packages/jest-core/package.json | 7 --- packages/jest-diff/package.json | 7 --- packages/jest-docblock/package.json | 7 --- packages/jest-each/package.json | 7 --- packages/jest-environment-jsdom/package.json | 7 --- packages/jest-environment-node/package.json | 7 --- packages/jest-environment/package.json | 7 --- packages/jest-fake-timers/package.json | 7 --- packages/jest-get-type/package.json | 7 --- packages/jest-globals/package.json | 7 --- packages/jest-haste-map/package.json | 7 --- packages/jest-jasmine2/package.json | 7 --- packages/jest-leak-detector/package.json | 7 --- packages/jest-matcher-utils/package.json | 7 --- packages/jest-message-util/package.json | 7 --- packages/jest-mock/package.json | 7 --- packages/jest-phabricator/package.json | 7 --- packages/jest-regex-util/package.json | 7 --- packages/jest-repl/package.json | 7 --- packages/jest-reporters/package.json | 7 --- .../jest-resolve-dependencies/package.json | 7 --- packages/jest-resolve/package.json | 7 --- packages/jest-runner/package.json | 7 --- packages/jest-runtime/package.json | 7 --- packages/jest-serializer/package.json | 7 --- packages/jest-snapshot/package.json | 7 --- packages/jest-source-map/package.json | 7 --- packages/jest-test-result/package.json | 7 --- packages/jest-test-sequencer/package.json | 7 --- packages/jest-transform/package.json | 7 --- packages/jest-transform/src/types.ts | 5 +- packages/jest-types/package.json | 7 --- packages/jest-types/src/Global.ts | 9 ++-- packages/jest-util/package.json | 7 --- packages/jest-validate/package.json | 7 --- packages/jest-watcher/package.json | 7 --- packages/jest-worker/package.json | 7 --- packages/jest/package.json | 7 --- packages/pretty-format/package.json | 7 --- packages/test-utils/package.json | 7 --- scripts/buildTs.js | 40 --------------- scripts/verifyOldTs.js | 51 ------------------- yarn.lock | 10 +--- 56 files changed, 8 insertions(+), 445 deletions(-) delete mode 100644 scripts/verifyOldTs.js diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index e7da849d85fe..cb8ddbc912cf 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -41,8 +41,6 @@ jobs: run: node scripts/build.js - name: run tsc run: yarn build:ts - - name: verify ts 3.4 compatibility - run: yarn verify-old-ts - name: run eslint run: yarn lint - name: run eslint on browser builds diff --git a/CHANGELOG.md b/CHANGELOG.md index e927e97d6a87..3c3fec54581c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ ### Chore & Maintenance - `[*]` Do not generate TypeScript declaration source maps ([#9822](https://github.com/facebook/jest/pull/9822)) +- `[*]` [**BREAKING**] TypeScript definitions requires a minimum of TypeScript v3.8 ([#9823](https://github.com/facebook/jest/pull/9823)) ### Performance diff --git a/package.json b/package.json index 337123a5d1f9..a9247c5534e7 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "codecov": "^3.0.0", "debug": "^4.0.1", "dedent": "^0.7.0", - "downlevel-dts": "^0.4.0", "eslint": "^6.2.2", "eslint-config-prettier": "^6.1.0", "eslint-plugin-babel": "^5.1.0", @@ -78,7 +77,6 @@ "string-length": "^3.1.0", "strip-ansi": "^6.0.0", "tempy": "~0.3.0", - "throat": "^5.0.0", "typescript": "^3.8.2", "webpack": "^4.28.4", "which": "^2.0.1" @@ -107,7 +105,6 @@ "test-pretty-format-perf": "node packages/pretty-format/perf/test.js", "test-leak": "yarn jest -i --detectLeaks jest-mock jest-diff jest-repl", "test": "yarn lint && yarn jest", - "verify-old-ts": "node ./scripts/verifyOldTs.js", "watch": "yarn build && node ./scripts/watch.js", "watch:ts": "yarn build:ts --watch" }, diff --git a/packages/babel-jest/package.json b/packages/babel-jest/package.json index bc29e23c19a5..26f1f9008d7d 100644 --- a/packages/babel-jest/package.json +++ b/packages/babel-jest/package.json @@ -10,13 +10,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/transform": "^25.3.0", "@jest/types": "^25.3.0", diff --git a/packages/babel-plugin-jest-hoist/package.json b/packages/babel-plugin-jest-hoist/package.json index e46bfbd5f680..a48351390427 100644 --- a/packages/babel-plugin-jest-hoist/package.json +++ b/packages/babel-plugin-jest-hoist/package.json @@ -12,13 +12,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@types/babel__traverse": "^7.0.6" }, diff --git a/packages/diff-sequences/package.json b/packages/diff-sequences/package.json index 7912d18f0d65..c1ca52cae128 100644 --- a/packages/diff-sequences/package.json +++ b/packages/diff-sequences/package.json @@ -20,13 +20,6 @@ }, "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "scripts": { "perf": "node --expose-gc perf/index.js" }, diff --git a/packages/expect/package.json b/packages/expect/package.json index 48f17a6dabf2..05f7e7851201 100644 --- a/packages/expect/package.json +++ b/packages/expect/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "browser": "build-es5/index.js", "dependencies": { "@jest/types": "^25.3.0", diff --git a/packages/jest-changed-files/package.json b/packages/jest-changed-files/package.json index 9abd11d0157c..e40a2b254869 100644 --- a/packages/jest-changed-files/package.json +++ b/packages/jest-changed-files/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/types": "^25.3.0", "execa": "^3.2.0", diff --git a/packages/jest-circus/package.json b/packages/jest-circus/package.json index 053fae413eca..9f697384a456 100644 --- a/packages/jest-circus/package.json +++ b/packages/jest-circus/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@babel/traverse": "^7.1.0", "@jest/environment": "^25.3.0", diff --git a/packages/jest-cli/package.json b/packages/jest-cli/package.json index a7e640f5d876..e99e782e165b 100644 --- a/packages/jest-cli/package.json +++ b/packages/jest-cli/package.json @@ -4,13 +4,6 @@ "version": "25.3.0", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/core": "^25.3.0", "@jest/test-result": "^25.3.0", diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json index f3f74d08f554..15d5dc5bee0d 100644 --- a/packages/jest-config/package.json +++ b/packages/jest-config/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@babel/core": "^7.1.0", "@jest/test-sequencer": "^25.3.0", diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json index 3b7e6f1ce578..9a45ee902035 100644 --- a/packages/jest-console/package.json +++ b/packages/jest-console/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/types": "^25.3.0", "chalk": "^3.0.0", diff --git a/packages/jest-console/src/CustomConsole.ts b/packages/jest-console/src/CustomConsole.ts index 1bd27f3ac923..59a7e8441d7a 100644 --- a/packages/jest-console/src/CustomConsole.ts +++ b/packages/jest-console/src/CustomConsole.ts @@ -51,8 +51,7 @@ export default class CustomConsole extends Console { ); } - // use `asserts` when https://github.com/sandersn/downlevel-dts/issues/32 is fixed - assert(value: unknown, message?: string | Error): void { + assert(value: unknown, message?: string | Error): asserts value { try { assert(value, message); } catch (error) { diff --git a/packages/jest-core/package.json b/packages/jest-core/package.json index ac2c69310ddb..0bc69177bb3b 100644 --- a/packages/jest-core/package.json +++ b/packages/jest-core/package.json @@ -4,13 +4,6 @@ "version": "25.3.0", "main": "build/jest.js", "types": "build/jest.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/console": "^25.3.0", "@jest/reporters": "^25.3.0", diff --git a/packages/jest-diff/package.json b/packages/jest-diff/package.json index 56d44250aa38..1c161390e18b 100644 --- a/packages/jest-diff/package.json +++ b/packages/jest-diff/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "chalk": "^3.0.0", "diff-sequences": "^25.2.6", diff --git a/packages/jest-docblock/package.json b/packages/jest-docblock/package.json index 8264e146ade3..411507e2fd51 100644 --- a/packages/jest-docblock/package.json +++ b/packages/jest-docblock/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "detect-newline": "^3.0.0" }, diff --git a/packages/jest-each/package.json b/packages/jest-each/package.json index 2b3b94de400c..044c56dad0e9 100644 --- a/packages/jest-each/package.json +++ b/packages/jest-each/package.json @@ -4,13 +4,6 @@ "description": "Parameterised tests for Jest", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "repository": { "type": "git", "url": "https://github.com/facebook/jest.git", diff --git a/packages/jest-environment-jsdom/package.json b/packages/jest-environment-jsdom/package.json index c355720a4eb9..3cfaac43e8cb 100644 --- a/packages/jest-environment-jsdom/package.json +++ b/packages/jest-environment-jsdom/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/environment": "^25.3.0", "@jest/fake-timers": "^25.3.0", diff --git a/packages/jest-environment-node/package.json b/packages/jest-environment-node/package.json index 96512c431199..1a1a5949822e 100644 --- a/packages/jest-environment-node/package.json +++ b/packages/jest-environment-node/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/environment": "^25.3.0", "@jest/fake-timers": "^25.3.0", diff --git a/packages/jest-environment/package.json b/packages/jest-environment/package.json index 27858e12e838..23e259349e76 100644 --- a/packages/jest-environment/package.json +++ b/packages/jest-environment/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/fake-timers": "^25.3.0", "@jest/types": "^25.3.0", diff --git a/packages/jest-fake-timers/package.json b/packages/jest-fake-timers/package.json index dca478ad1ac4..cacb2fad9f5a 100644 --- a/packages/jest-fake-timers/package.json +++ b/packages/jest-fake-timers/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/types": "^25.3.0", "jest-message-util": "^25.3.0", diff --git a/packages/jest-get-type/package.json b/packages/jest-get-type/package.json index ae0524cb5af4..d752bcdc2c57 100644 --- a/packages/jest-get-type/package.json +++ b/packages/jest-get-type/package.json @@ -13,13 +13,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "publishConfig": { "access": "public" }, diff --git a/packages/jest-globals/package.json b/packages/jest-globals/package.json index 80ac807c888e..c33fd44bf03a 100644 --- a/packages/jest-globals/package.json +++ b/packages/jest-globals/package.json @@ -12,13 +12,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/environment": "^25.3.0", "@jest/types": "^25.3.0", diff --git a/packages/jest-haste-map/package.json b/packages/jest-haste-map/package.json index 418e16f9aa00..c7a9d25b7086 100644 --- a/packages/jest-haste-map/package.json +++ b/packages/jest-haste-map/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/types": "^25.3.0", "anymatch": "^3.0.3", diff --git a/packages/jest-jasmine2/package.json b/packages/jest-jasmine2/package.json index 5f7c1bdcd015..9559b2a27fbe 100644 --- a/packages/jest-jasmine2/package.json +++ b/packages/jest-jasmine2/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@babel/traverse": "^7.1.0", "@jest/environment": "^25.3.0", diff --git a/packages/jest-leak-detector/package.json b/packages/jest-leak-detector/package.json index 6f8faab05595..567f3a91e73b 100644 --- a/packages/jest-leak-detector/package.json +++ b/packages/jest-leak-detector/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "jest-get-type": "^25.2.6", "pretty-format": "^25.3.0" diff --git a/packages/jest-matcher-utils/package.json b/packages/jest-matcher-utils/package.json index 54232319d6ce..4612128c71a8 100644 --- a/packages/jest-matcher-utils/package.json +++ b/packages/jest-matcher-utils/package.json @@ -13,13 +13,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "chalk": "^3.0.0", "jest-diff": "^25.3.0", diff --git a/packages/jest-message-util/package.json b/packages/jest-message-util/package.json index 51c2c28b8f43..ff9a3649499f 100644 --- a/packages/jest-message-util/package.json +++ b/packages/jest-message-util/package.json @@ -12,13 +12,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@babel/code-frame": "^7.0.0", "@jest/types": "^25.3.0", diff --git a/packages/jest-mock/package.json b/packages/jest-mock/package.json index 643937b7c382..bfda39339736 100644 --- a/packages/jest-mock/package.json +++ b/packages/jest-mock/package.json @@ -18,13 +18,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "browser": "build-es5/index.js", "publishConfig": { "access": "public" diff --git a/packages/jest-phabricator/package.json b/packages/jest-phabricator/package.json index 90965d00b5e8..4e7cce09f4ca 100644 --- a/packages/jest-phabricator/package.json +++ b/packages/jest-phabricator/package.json @@ -7,13 +7,6 @@ "directory": "packages/jest-phabricator" }, "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/test-result": "^25.3.0" }, diff --git a/packages/jest-regex-util/package.json b/packages/jest-regex-util/package.json index e7b7206e03eb..641872644187 100644 --- a/packages/jest-regex-util/package.json +++ b/packages/jest-regex-util/package.json @@ -15,13 +15,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "publishConfig": { "access": "public" }, diff --git a/packages/jest-repl/package.json b/packages/jest-repl/package.json index 25e7e7df5f2a..4a05a1ccda23 100644 --- a/packages/jest-repl/package.json +++ b/packages/jest-repl/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/transform": "^25.3.0", "@jest/types": "^25.3.0", diff --git a/packages/jest-reporters/package.json b/packages/jest-reporters/package.json index df56ebb1ba8f..7746e1d74e7d 100644 --- a/packages/jest-reporters/package.json +++ b/packages/jest-reporters/package.json @@ -4,13 +4,6 @@ "version": "25.3.0", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@bcoe/v8-coverage": "^0.2.3", "@jest/console": "^25.3.0", diff --git a/packages/jest-resolve-dependencies/package.json b/packages/jest-resolve-dependencies/package.json index d49c92582164..aabd7262d81b 100644 --- a/packages/jest-resolve-dependencies/package.json +++ b/packages/jest-resolve-dependencies/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/types": "^25.3.0", "jest-regex-util": "^25.2.6", diff --git a/packages/jest-resolve/package.json b/packages/jest-resolve/package.json index fe0e8e5de75e..c15684974f2b 100644 --- a/packages/jest-resolve/package.json +++ b/packages/jest-resolve/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/types": "^25.3.0", "browser-resolve": "^1.11.3", diff --git a/packages/jest-runner/package.json b/packages/jest-runner/package.json index a28d896d5686..c3577f6cd32b 100644 --- a/packages/jest-runner/package.json +++ b/packages/jest-runner/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/console": "^25.3.0", "@jest/environment": "^25.3.0", diff --git a/packages/jest-runtime/package.json b/packages/jest-runtime/package.json index 822778a4f389..92bf8a05576b 100644 --- a/packages/jest-runtime/package.json +++ b/packages/jest-runtime/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/console": "^25.3.0", "@jest/environment": "^25.3.0", diff --git a/packages/jest-serializer/package.json b/packages/jest-serializer/package.json index ae4bd8ec7703..7065c34809ae 100644 --- a/packages/jest-serializer/package.json +++ b/packages/jest-serializer/package.json @@ -15,13 +15,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "publishConfig": { "access": "public" }, diff --git a/packages/jest-snapshot/package.json b/packages/jest-snapshot/package.json index 7dade23ce516..8a54f2216c64 100644 --- a/packages/jest-snapshot/package.json +++ b/packages/jest-snapshot/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@babel/types": "^7.0.0", "@jest/types": "^25.3.0", diff --git a/packages/jest-source-map/package.json b/packages/jest-source-map/package.json index 35dd3a4b03c5..e68b12d492f2 100644 --- a/packages/jest-source-map/package.json +++ b/packages/jest-source-map/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "callsites": "^3.0.0", "graceful-fs": "^4.2.3", diff --git a/packages/jest-test-result/package.json b/packages/jest-test-result/package.json index 5d134ded7850..62105fb319e0 100644 --- a/packages/jest-test-result/package.json +++ b/packages/jest-test-result/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/console": "^25.3.0", "@jest/types": "^25.3.0", diff --git a/packages/jest-test-sequencer/package.json b/packages/jest-test-sequencer/package.json index eef6f9a201a5..af7291e5ba1f 100644 --- a/packages/jest-test-sequencer/package.json +++ b/packages/jest-test-sequencer/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/test-result": "^25.3.0", "jest-haste-map": "^25.3.0", diff --git a/packages/jest-transform/package.json b/packages/jest-transform/package.json index d64a6809ed03..79eb8d2c2cf1 100644 --- a/packages/jest-transform/package.json +++ b/packages/jest-transform/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@babel/core": "^7.1.0", "@jest/types": "^25.3.0", diff --git a/packages/jest-transform/src/types.ts b/packages/jest-transform/src/types.ts index 30075298bc26..fff54e7e58a4 100644 --- a/packages/jest-transform/src/types.ts +++ b/packages/jest-transform/src/types.ts @@ -26,11 +26,8 @@ export type Options = ShouldInstrumentOptions & supportsStaticESM: boolean; }>; -// extends directly after https://github.com/sandersn/downlevel-dts/issues/33 is fixed -type SourceMapWithVersion = Omit; - // This is fixed in source-map@0.7.x, but we can't upgrade yet since it's async -interface FixedRawSourceMap extends SourceMapWithVersion { +interface FixedRawSourceMap extends Omit { version: number; } diff --git a/packages/jest-types/package.json b/packages/jest-types/package.json index 496567c4a25b..a41533251bdf 100644 --- a/packages/jest-types/package.json +++ b/packages/jest-types/package.json @@ -12,13 +12,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", diff --git a/packages/jest-types/src/Global.ts b/packages/jest-types/src/Global.ts index f4c0c327ead4..df96271c126a 100644 --- a/packages/jest-types/src/Global.ts +++ b/packages/jest-types/src/Global.ts @@ -93,10 +93,9 @@ export interface GlobalAdditions extends TestFrameworkGlobals { spyOnProperty: () => void; } -// TODO: Maybe add `| Window` in the future? -// extends directly after https://github.com/sandersn/downlevel-dts/issues/33 is fixed -type NodeGlobalWithoutAdditions = Omit; - -export interface Global extends GlobalAdditions, NodeGlobalWithoutAdditions { +export interface Global + extends GlobalAdditions, + // TODO: Maybe add `| Window` in the future? + Omit { [extras: string]: any; } diff --git a/packages/jest-util/package.json b/packages/jest-util/package.json index ee065c80c263..9e6a7bda3b06 100644 --- a/packages/jest-util/package.json +++ b/packages/jest-util/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/types": "^25.3.0", "chalk": "^3.0.0", diff --git a/packages/jest-validate/package.json b/packages/jest-validate/package.json index 0eac7742571e..b3202030d562 100644 --- a/packages/jest-validate/package.json +++ b/packages/jest-validate/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/types": "^25.3.0", "camelcase": "^5.3.1", diff --git a/packages/jest-watcher/package.json b/packages/jest-watcher/package.json index d34b8fb22268..6096a626f525 100644 --- a/packages/jest-watcher/package.json +++ b/packages/jest-watcher/package.json @@ -4,13 +4,6 @@ "version": "25.3.0", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/test-result": "^25.3.0", "@jest/types": "^25.3.0", diff --git a/packages/jest-worker/package.json b/packages/jest-worker/package.json index d07eca4ed821..3b0952f30144 100644 --- a/packages/jest-worker/package.json +++ b/packages/jest-worker/package.json @@ -9,13 +9,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "merge-stream": "^2.0.0", "supports-color": "^7.0.0" diff --git a/packages/jest/package.json b/packages/jest/package.json index 4e263e72cc2a..a01c04f453da 100644 --- a/packages/jest/package.json +++ b/packages/jest/package.json @@ -4,13 +4,6 @@ "version": "25.3.0", "main": "build/jest.js", "types": "build/jest.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@jest/core": "^25.3.0", "import-local": "^3.0.2", diff --git a/packages/pretty-format/package.json b/packages/pretty-format/package.json index 1c7a3624b2b4..22d8eedc7e95 100644 --- a/packages/pretty-format/package.json +++ b/packages/pretty-format/package.json @@ -10,13 +10,6 @@ "description": "Stringify any JavaScript value.", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "browser": "build-es5/index.js", "author": "James Kyle ", "dependencies": { diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 5bf8cb86877e..f57ff0b7795d 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -5,13 +5,6 @@ "license": "MIT", "main": "build/index.js", "types": "build/index.d.ts", - "typesVersions": { - "<3.8": { - "build/*": [ - "build/ts3.4/*" - ] - } - }, "dependencies": { "@types/jest": "*", "@types/node": "*", diff --git a/scripts/buildTs.js b/scripts/buildTs.js index cf734188267e..903723f2bc7b 100644 --- a/scripts/buildTs.js +++ b/scripts/buildTs.js @@ -8,13 +8,9 @@ 'use strict'; const fs = require('fs'); -const os = require('os'); const path = require('path'); - const chalk = require('chalk'); const execa = require('execa'); -const rimraf = require('rimraf'); -const throat = require('throat'); const {getPackages} = require('./buildUtils'); const packages = getPackages(); @@ -30,10 +26,6 @@ packagesWithTs.forEach(pkgDir => { throw new Error(`Package ${pkg.name} is missing \`types\` field`); } - if (!pkg.typesVersions) { - throw new Error(`Package ${pkg.name} is missing \`typesVersions\` field`); - } - if (pkg.main.replace(/\.js$/, '.d.ts') !== pkg.types) { throw new Error( `\`main\` and \`types\` field of ${pkg.name} does not match` @@ -64,35 +56,3 @@ try { process.exitCode = 1; return; } - -const downlevelArgs = ['--silent', 'downlevel-dts', 'build', 'build/ts3.4']; - -console.log(chalk.inverse(' Downleveling TypeScript definition files ')); - -// we want to limit the number of processes we spawn -const cpus = Math.max(1, os.cpus().length - 1); - -Promise.all( - packagesWithTs.map( - throat(cpus, pkgDir => { - // otherwise we get nested `ts3.4` directories - rimraf.sync(path.resolve(pkgDir, 'build/ts3.4')); - - return execa('yarn', downlevelArgs, {cwd: pkgDir, stdio: 'inherit'}); - }) - ) -) - .then(() => { - console.log( - chalk.inverse.green( - ' Successfully downleveled TypeScript definition files ' - ) - ); - }) - .catch(e => { - console.error( - chalk.inverse.red(' Unable to downlevel TypeScript definition files ') - ); - console.error(e.stack); - process.exitCode = 1; - }); diff --git a/scripts/verifyOldTs.js b/scripts/verifyOldTs.js deleted file mode 100644 index 34fbbd670a6b..000000000000 --- a/scripts/verifyOldTs.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -'use strict'; - -const fs = require('fs'); -const path = require('path'); - -const chalk = require('chalk'); -const execa = require('execa'); -const rimraf = require('rimraf'); -const tempy = require('tempy'); - -const jestDirectory = path.resolve(__dirname, '../packages/jest'); - -const tsConfig = { - compilerOptions: { - esModuleInterop: false, - lib: ['es2018'], - module: 'commonjs', - moduleResolution: 'node', - noEmit: true, - strict: true, - target: 'es5', - }, -}; -const cwd = tempy.directory(); - -try { - execa.sync('yarn', ['init', '--yes'], {cwd, stdio: 'inherit'}); - execa.sync('yarn', ['add', 'typescript@~3.4'], {cwd, stdio: 'inherit'}); - fs.writeFileSync( - path.join(cwd, 'tsconfig.json'), - JSON.stringify(tsConfig, null, 2) - ); - fs.writeFileSync( - path.join(cwd, 'index.ts'), - `import jest = require('${jestDirectory}');` - ); - execa.sync('yarn', ['tsc', '--project', '.'], {cwd, stdio: 'inherit'}); - - console.log( - chalk.inverse.green(' Successfully compiled Jest with TypeScript 3.4 ') - ); -} finally { - rimraf.sync(cwd); -} diff --git a/yarn.lock b/yarn.lock index 7a6349aa8a03..9831defc34be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5672,14 +5672,6 @@ dot-prop@^5.2.0: dependencies: is-obj "^2.0.0" -downlevel-dts@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/downlevel-dts/-/downlevel-dts-0.4.0.tgz#43f9f649c8b137373d76b4ee396d5a0227c10ddb" - integrity sha512-nh5vM3n2pRhPwZqh0iWo5gpItPAYEGEWw9yd0YpI+lO60B7A3A6iJlxDbt7kKVNbqBXKsptL+jwE/Yg5Go66WQ== - dependencies: - shelljs "^0.8.3" - typescript "^3.8.0-dev.20200111" - download@^6.2.2: version "6.2.5" resolved "https://registry.yarnpkg.com/download/-/download-6.2.5.tgz#acd6a542e4cd0bb42ca70cfc98c9e43b07039714" @@ -14323,7 +14315,7 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@*, typescript@^3.8.0-dev.20200111, typescript@^3.8.2: +typescript@*, typescript@^3.8.2: version "3.8.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==