Merge branch 'master' into fix_dotfiles_missing_from_hastemap

CHANGELOG.md

@@ -10,7 +10,8 @@
 
 - `[expect]` Match symbols and bigints in `any()` ([#10223](https://github.com/facebook/jest/pull/10223))
 - `[jest-changed-files]` Use `git diff` instead of `git log` for `--changedSince` ([#10155](https://github.com/facebook/jest/pull/10155))
-- `[jest-console]` Add missing console.timeLog for compatability with Node ([#10209](https://github.com/facebook/jest/pull/10209))
+- `[jest-console]` Add missing `console.timeLog` for compatibility with Node ([#10209](https://github.com/facebook/jest/pull/10209))
+- `[jest-haste-map]` Check `find` binary supports the `-iname` parameter ([#10308](https://github.com/facebook/jest/pull/10308))
 - `[jest-snapshot]` Strip added indentation for inline error snapshots ([#10217](https://github.com/facebook/jest/pull/10217))
 
 ### Chore & Maintenance

CONTRIBUTING.md

@@ -232,7 +232,9 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
 
 ## Credits
 
-This project exists thanks to all the people who [contribute](CONTRIBUTING.md). <a href="graphs/contributors"><img src="https://opencollective.com/jest/contributors.svg?width=890&button=false" /></a>
+This project exists thanks to all the people who [contribute](CONTRIBUTING.md).
+
+<a href="graphs/contributors"><img src="https://opencollective.com/jest/contributors.svg?width=890&button=false" /></a>
 
 ### [Backers](https://opencollective.com/jest#backer)
 

README.md

@@ -236,7 +236,9 @@ To help you get your feet wet and get you familiar with our contribution process
 
 ## Credits
 
-This project exists thanks to all the people who [contribute](CONTRIBUTING.md). <a href="https://github.com/facebook/jest/graphs/contributors"><img src="https://opencollective.com/jest/contributors.svg?width=890&button=false" /></a>
+This project exists thanks to all the people who [contribute](CONTRIBUTING.md).
+
+<a href="https://github.com/facebook/jest/graphs/contributors"><img src="https://opencollective.com/jest/contributors.svg?width=890&button=false" /></a>
 
 ### [Backers](https://opencollective.com/jest#backer)
 

docs/CLI.md

@@ -138,15 +138,15 @@ Deletes the Jest cache directory and then exits without running tests. Will dele
 
 ### `--collectCoverageFrom=<glob>`
 
-A glob pattern relative to <rootDir> matching the files that coverage info needs to be collected from.
+A glob pattern relative to `rootDir` matching the files that coverage info needs to be collected from.
 
 ### `--colors`
 
 Forces test results output highlighting even if stdout is not a TTY.
 
 ### `--config=<path>`
 
-Alias: `-c`. The path to a Jest config file specifying how to find and execute tests. If no `rootDir` is set in the config, the directory containing the config file is assumed to be the rootDir for the project. This can also be a JSON-encoded value which Jest will use as configuration.
+Alias: `-c`. The path to a Jest config file specifying how to find and execute tests. If no `rootDir` is set in the config, the directory containing the config file is assumed to be the `rootDir` for the project. This can also be a JSON-encoded value which Jest will use as configuration.
 
 ### `--coverage[=<boolean>]`
 

docs/WatchPlugins.md

@@ -224,8 +224,8 @@ Any key not used by built-in functionality can be claimed, as you would expect.
 
 Should your plugin attempt to overwrite a reserved key, Jest will error out with a descriptive message, something like:
 
-> Watch plugin YourFaultyPlugin attempted to register key <q>, that is reserved internally for quitting watch mode. Please change the configuration key for this plugin.
+> Watch plugin YourFaultyPlugin attempted to register key `q`, that is reserved internally for quitting watch mode. Please change the configuration key for this plugin.
 
 Third-party plugins are also forbidden to overwrite a key reserved already by another third-party plugin present earlier in the configured plugins list (`watchPlugins` array setting). When this happens, you’ll also get an error message that tries to help you fix that:
 
-> Watch plugins YourFaultyPlugin and TheirFaultyPlugin both attempted to register key <x>. Please change the key configuration for one of the conflicting plugins to avoid overlap.
+> Watch plugins YourFaultyPlugin and TheirFaultyPlugin both attempted to register key `x`. Please change the key configuration for one of the conflicting plugins to avoid overlap.

e2e/async-regenerator/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/code-frame@npm:^7.8.3":
   version: 7.8.3

e2e/babel-plugin-jest-hoist/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/code-frame@npm:^7.8.3":
   version: 7.8.3

e2e/chai-assertion-library-errors/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "assertion-error@npm:^1.1.0":
   version: 1.1.0

e2e/console-winston/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "async@npm:^2.6.1":
   version: 2.6.3

e2e/coverage-handlebars/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "commander@npm:~2.20.3":
   version: 2.20.3

e2e/coverage-remapping/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "root-workspace-0b6124@workspace:.":
   version: 0.0.0-use.local
@@ -25,7 +25,7 @@ typescript@^3.7.4:
 
 "typescript@patch:typescript@^3.7.4#builtin<compat/typescript>":
   version: 3.8.3
-  resolution: "typescript@patch:typescript@npm%3A3.8.3#builtin<compat/typescript>::version=3.8.3&hash=64df9d"
+  resolution: "typescript@patch:typescript@npm%3A3.8.3#builtin<compat/typescript>::version=3.8.3&hash=5b02a2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver

e2e/coverage-report/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.8.3

e2e/coverage-transform-instrumented/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/code-frame@npm:^7.8.3":
   version: 7.8.3

e2e/expect-async-matcher/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.8.3

e2e/failures/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.8.3

e2e/global-setup/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/code-frame@npm:^7.8.3":
   version: 7.8.3

e2e/global-teardown/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/code-frame@npm:^7.8.3":
   version: 7.8.3

e2e/stack-trace-source-maps-with-coverage/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "root-workspace-0b6124@workspace:.":
   version: 0.0.0-use.local
@@ -25,7 +25,7 @@ typescript@^3.7.4:
 
 "typescript@patch:typescript@^3.7.4#builtin<compat/typescript>":
   version: 3.8.3
-  resolution: "typescript@patch:typescript@npm%3A3.8.3#builtin<compat/typescript>::version=3.8.3&hash=64df9d"
+  resolution: "typescript@patch:typescript@npm%3A3.8.3#builtin<compat/typescript>::version=3.8.3&hash=5b02a2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver

e2e/stack-trace-source-maps/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "root-workspace-0b6124@workspace:.":
   version: 0.0.0-use.local
@@ -25,7 +25,7 @@ typescript@^3.7.4:
 
 "typescript@patch:typescript@^3.7.4#builtin<compat/typescript>":
   version: 3.8.3
-  resolution: "typescript@patch:typescript@npm%3A3.8.3#builtin<compat/typescript>::version=3.8.3&hash=64df9d"
+  resolution: "typescript@patch:typescript@npm%3A3.8.3#builtin<compat/typescript>::version=3.8.3&hash=5b02a2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver

e2e/transform/babel-jest-manual/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.8.3

e2e/transform/babel-jest/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.8.3

e2e/transform/multiple-transformers/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/code-frame@npm:^7.8.3":
   version: 7.8.3

e2e/transform/transformer-config/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.8.3

e2e/typescript-coverage/yarn.lock

@@ -3,7 +3,7 @@
 
 __metadata:
   version: 4
-  cacheKey: 4
+  cacheKey: 6
 
 "root-workspace-0b6124@workspace:.":
   version: 0.0.0-use.local
@@ -25,7 +25,7 @@ typescript@^3.3.1:
 
 "typescript@patch:typescript@^3.3.1#builtin<compat/typescript>":
   version: 3.8.3
-  resolution: "typescript@patch:typescript@npm%3A3.8.3#builtin<compat/typescript>::version=3.8.3&hash=64df9d"
+  resolution: "typescript@patch:typescript@npm%3A3.8.3#builtin<compat/typescript>::version=3.8.3&hash=5b02a2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver

packages/jest-config/src/color.ts

@@ -6,9 +6,11 @@
  */
 
 import {createHash} from 'crypto';
-import chalk = require('chalk');
+import type {ForegroundColor} from 'chalk';
 
-const colors: Array<keyof typeof chalk> = [
+type Color = typeof ForegroundColor;
+
+const colors: Array<Color> = [
   'red',
   'green',
   'yellow',
@@ -18,7 +20,7 @@ const colors: Array<keyof typeof chalk> = [
   'white',
 ];
 
-export const getDisplayNameColor = (seed?: string): typeof colors[number] => {
+export const getDisplayNameColor = (seed?: string): Color => {
   if (seed === undefined) {
     return 'white';
   }

packages/jest-haste-map/package.json

@@ -22,16 +22,15 @@
     "jest-worker": "^26.1.0",
     "micromatch": "^4.0.2",
     "sane": "^4.0.3",
-    "walker": "^1.0.7",
-    "which": "^2.0.2"
+    "walker": "^1.0.7"
   },
   "devDependencies": {
     "@jest/test-utils": "^26.0.0",
     "@types/anymatch": "^1.3.1",
     "@types/fb-watchman": "^2.0.0",
     "@types/micromatch": "^4.0.0",
     "@types/sane": "^2.0.0",
-    "@types/which": "^1.3.2"
+    "slash": "^3.0.0"
   },
   "optionalDependencies": {
     "fsevents": "^2.1.2"