From 806469b6693478d006c4282b2c4fa7e8572d7a2e Mon Sep 17 00:00:00 2001 From: Andrew Leedham Date: Thu, 2 Apr 2020 12:52:14 +0100 Subject: [PATCH 1/3] chore: upgrade chalk to v4 --- package.json | 2 +- packages/babel-jest/package.json | 2 +- packages/expect/package.json | 2 +- packages/jest-circus/package.json | 2 +- packages/jest-cli/package.json | 2 +- packages/jest-config/package.json | 2 +- packages/jest-console/package.json | 2 +- packages/jest-core/package.json | 2 +- packages/jest-diff/package.json | 2 +- packages/jest-each/package.json | 2 +- packages/jest-jasmine2/package.json | 2 +- packages/jest-matcher-utils/package.json | 2 +- packages/jest-message-util/package.json | 2 +- packages/jest-reporters/package.json | 2 +- packages/jest-resolve/package.json | 2 +- packages/jest-runner/package.json | 2 +- packages/jest-runtime/package.json | 2 +- packages/jest-snapshot/package.json | 2 +- packages/jest-transform/package.json | 2 +- packages/jest-types/package.json | 2 +- packages/jest-util/package.json | 2 +- packages/jest-validate/package.json | 2 +- packages/jest-watcher/package.json | 2 +- yarn.lock | 8 ++++++++ 24 files changed, 31 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 45bc0aba16b4..1dbafb07c2a6 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "babel-plugin-replace-ts-export-assignment": "^0.0.2", "babel-plugin-typescript-strip-namespaces": "^1.1.1", "camelcase": "^5.0.0", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "chokidar": "^3.3.0", "codecov": "^3.0.0", "debug": "^4.0.1", diff --git a/packages/babel-jest/package.json b/packages/babel-jest/package.json index 7b89bbf98e76..b9cd576199ae 100644 --- a/packages/babel-jest/package.json +++ b/packages/babel-jest/package.json @@ -23,7 +23,7 @@ "@types/babel__core": "^7.1.0", "babel-plugin-istanbul": "^6.0.0", "babel-preset-jest": "^25.2.6", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "slash": "^3.0.0" }, "devDependencies": { diff --git a/packages/expect/package.json b/packages/expect/package.json index e0f1ac085af6..d072f178126c 100644 --- a/packages/expect/package.json +++ b/packages/expect/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@jest/test-utils": "^25.2.6", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "fast-check": "^1.13.0", "immutable": "^4.0.0-rc.12" }, diff --git a/packages/jest-circus/package.json b/packages/jest-circus/package.json index 8ec844772dab..a1d3b4a43cc5 100644 --- a/packages/jest-circus/package.json +++ b/packages/jest-circus/package.json @@ -21,7 +21,7 @@ "@jest/environment": "^25.2.6", "@jest/test-result": "^25.2.6", "@jest/types": "^25.2.6", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "co": "^4.6.0", "expect": "^25.2.6", "is-generator-fn": "^2.0.0", diff --git a/packages/jest-cli/package.json b/packages/jest-cli/package.json index b2591efbe476..b1d3dcc9ad89 100644 --- a/packages/jest-cli/package.json +++ b/packages/jest-cli/package.json @@ -15,7 +15,7 @@ "@jest/core": "^25.2.6", "@jest/test-result": "^25.2.6", "@jest/types": "^25.2.6", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "exit": "^0.1.2", "import-local": "^3.0.2", "is-ci": "^2.0.0", diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json index 75a6c12b017b..82bf69d527a0 100644 --- a/packages/jest-config/package.json +++ b/packages/jest-config/package.json @@ -21,7 +21,7 @@ "@jest/test-sequencer": "^25.2.6", "@jest/types": "^25.2.6", "babel-jest": "^25.2.6", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "deepmerge": "^4.2.2", "glob": "^7.1.1", "jest-environment-jsdom": "^25.2.6", diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json index 7d026a6a6e1e..afa4f22278b3 100644 --- a/packages/jest-console/package.json +++ b/packages/jest-console/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@jest/source-map": "^25.2.6", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "jest-util": "^25.2.6", "slash": "^3.0.0" }, diff --git a/packages/jest-core/package.json b/packages/jest-core/package.json index 3fc4dda5dc08..82905140437e 100644 --- a/packages/jest-core/package.json +++ b/packages/jest-core/package.json @@ -18,7 +18,7 @@ "@jest/transform": "^25.2.6", "@jest/types": "^25.2.6", "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "exit": "^0.1.2", "graceful-fs": "^4.2.3", "jest-changed-files": "^25.2.6", diff --git a/packages/jest-diff/package.json b/packages/jest-diff/package.json index 23408fbe8f70..dcc10061687b 100644 --- a/packages/jest-diff/package.json +++ b/packages/jest-diff/package.json @@ -17,7 +17,7 @@ } }, "dependencies": { - "chalk": "^3.0.0", + "chalk": "^4.0.0", "diff-sequences": "^25.2.6", "jest-get-type": "^25.2.6", "pretty-format": "^25.2.6" diff --git a/packages/jest-each/package.json b/packages/jest-each/package.json index a6fe2861b045..262c3256c8a6 100644 --- a/packages/jest-each/package.json +++ b/packages/jest-each/package.json @@ -26,7 +26,7 @@ "license": "MIT", "dependencies": { "@jest/types": "^25.2.6", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "jest-get-type": "^25.2.6", "jest-util": "^25.2.6", "pretty-format": "^25.2.6" diff --git a/packages/jest-jasmine2/package.json b/packages/jest-jasmine2/package.json index 87ff49f1f9cd..5d4f5a4dc195 100644 --- a/packages/jest-jasmine2/package.json +++ b/packages/jest-jasmine2/package.json @@ -22,7 +22,7 @@ "@jest/source-map": "^25.2.6", "@jest/test-result": "^25.2.6", "@jest/types": "^25.2.6", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "co": "^4.6.0", "expect": "^25.2.6", "is-generator-fn": "^2.0.0", diff --git a/packages/jest-matcher-utils/package.json b/packages/jest-matcher-utils/package.json index f31736fc1b61..2b771d1b9311 100644 --- a/packages/jest-matcher-utils/package.json +++ b/packages/jest-matcher-utils/package.json @@ -21,7 +21,7 @@ } }, "dependencies": { - "chalk": "^3.0.0", + "chalk": "^4.0.0", "jest-diff": "^25.2.6", "jest-get-type": "^25.2.6", "pretty-format": "^25.2.6" diff --git a/packages/jest-message-util/package.json b/packages/jest-message-util/package.json index d82ad10bd3ee..f6e29b8c9623 100644 --- a/packages/jest-message-util/package.json +++ b/packages/jest-message-util/package.json @@ -23,7 +23,7 @@ "@babel/code-frame": "^7.0.0", "@jest/types": "^25.2.6", "@types/stack-utils": "^1.0.1", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "micromatch": "^4.0.2", "slash": "^3.0.0", "stack-utils": "^1.0.1" diff --git a/packages/jest-reporters/package.json b/packages/jest-reporters/package.json index 71e1091704cb..2e2cb1df407b 100644 --- a/packages/jest-reporters/package.json +++ b/packages/jest-reporters/package.json @@ -17,7 +17,7 @@ "@jest/test-result": "^25.2.6", "@jest/transform": "^25.2.6", "@jest/types": "^25.2.6", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", "glob": "^7.1.2", diff --git a/packages/jest-resolve/package.json b/packages/jest-resolve/package.json index d17824a7485a..aaf0567ec8cc 100644 --- a/packages/jest-resolve/package.json +++ b/packages/jest-resolve/package.json @@ -19,7 +19,7 @@ "dependencies": { "@jest/types": "^25.2.6", "browser-resolve": "^1.11.3", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "jest-pnp-resolver": "^1.2.1", "realpath-native": "^2.0.0", "resolve": "^1.15.1" diff --git a/packages/jest-runner/package.json b/packages/jest-runner/package.json index e6853212d1e5..f2d076f97db1 100644 --- a/packages/jest-runner/package.json +++ b/packages/jest-runner/package.json @@ -21,7 +21,7 @@ "@jest/environment": "^25.2.6", "@jest/test-result": "^25.2.6", "@jest/types": "^25.2.6", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "exit": "^0.1.2", "graceful-fs": "^4.2.3", "jest-config": "^25.2.6", diff --git a/packages/jest-runtime/package.json b/packages/jest-runtime/package.json index 05e2246f3cdb..841285a596cd 100644 --- a/packages/jest-runtime/package.json +++ b/packages/jest-runtime/package.json @@ -24,7 +24,7 @@ "@jest/transform": "^25.2.6", "@jest/types": "^25.2.6", "@types/yargs": "^15.0.0", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", "glob": "^7.1.3", diff --git a/packages/jest-snapshot/package.json b/packages/jest-snapshot/package.json index ab7b4dc12724..493f82bedba4 100644 --- a/packages/jest-snapshot/package.json +++ b/packages/jest-snapshot/package.json @@ -20,7 +20,7 @@ "@babel/types": "^7.0.0", "@jest/types": "^25.2.6", "@types/prettier": "^1.19.0", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "expect": "^25.2.6", "jest-diff": "^25.2.6", "jest-get-type": "^25.2.6", diff --git a/packages/jest-transform/package.json b/packages/jest-transform/package.json index 15ee518ec07d..0b427d6e9fc7 100644 --- a/packages/jest-transform/package.json +++ b/packages/jest-transform/package.json @@ -20,7 +20,7 @@ "@babel/core": "^7.1.0", "@jest/types": "^25.2.6", "babel-plugin-istanbul": "^6.0.0", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", "graceful-fs": "^4.2.3", diff --git a/packages/jest-types/package.json b/packages/jest-types/package.json index f09827d1938c..9f246860b6d9 100644 --- a/packages/jest-types/package.json +++ b/packages/jest-types/package.json @@ -23,7 +23,7 @@ "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^1.1.1", "@types/yargs": "^15.0.0", - "chalk": "^3.0.0" + "chalk": "^4.0.0" }, "devDependencies": { "@types/node": "*" diff --git a/packages/jest-util/package.json b/packages/jest-util/package.json index 4bfa45f3ae2e..ba84ad69a47f 100644 --- a/packages/jest-util/package.json +++ b/packages/jest-util/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@jest/types": "^25.2.6", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "is-ci": "^2.0.0", "make-dir": "^3.0.0" }, diff --git a/packages/jest-validate/package.json b/packages/jest-validate/package.json index 37e26bf1ea0c..fb9feff6346f 100644 --- a/packages/jest-validate/package.json +++ b/packages/jest-validate/package.json @@ -19,7 +19,7 @@ "dependencies": { "@jest/types": "^25.2.6", "camelcase": "^5.3.1", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "jest-get-type": "^25.2.6", "leven": "^3.1.0", "pretty-format": "^25.2.6" diff --git a/packages/jest-watcher/package.json b/packages/jest-watcher/package.json index 82b7646ee401..500c6cfaefc6 100644 --- a/packages/jest-watcher/package.json +++ b/packages/jest-watcher/package.json @@ -15,7 +15,7 @@ "@jest/test-result": "^25.2.6", "@jest/types": "^25.2.6", "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "jest-util": "^25.2.6", "string-length": "^3.1.0" }, diff --git a/yarn.lock b/yarn.lock index def4012e1270..c0db0b0dea78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4130,6 +4130,14 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72" + integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + character-entities-legacy@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" From d6e9dade7ff1eb7d79b48a2ee0a9d146a09ec342 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 2 May 2020 13:23:25 +0200 Subject: [PATCH 2/3] ts isolatedmodules --- tsconfig.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index b1d9bfdd5414..d5e967ef95d0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,8 +7,7 @@ "declaration": true, "composite": true, "emitDeclarationOnly": true, - // blocked by https://github.com/chalk/chalk/pull/390 - // "isolatedModules": true, + "isolatedModules": true, "importsNotUsedAsValues": "error", "strict": true, From 6c64442582f70a8f8f208bb8f303059c02734c4c Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 2 May 2020 13:28:40 +0200 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aef120e9361..cb3192fb1633 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - `[*]` [**BREAKING**] TypeScript definitions requires a minimum of TypeScript v3.8 ([#9823](https://github.com/facebook/jest/pull/9823)) - `[*]` [**BREAKING**] Drop support for Node 8 ([#9423](https://github.com/facebook/jest/pull/9423)) +- `[*]` Upgrade to chalk@4 ([#9752](https://github.com/facebook/jest/pull/9752)) - `[jest-runtime]` [**BREAKING**] Remove long-deprecated `require.requireActual` and `require.requireMock` methods ([#9854](https://github.com/facebook/jest/pull/9854)) - `[expect, jest-mock, pretty-format]` [**BREAKING**] Remove `build-es5` from package ([#9945](https://github.com/facebook/jest/pull/9945)) - `[jest-haste-map]` [**BREAKING**] removed `providesModuleNodeModules` ([#8535](https://github.com/facebook/jest/pull/8535))