Merge branch 'master' into first

Author: SimenB

CHANGELOG.md

@@ -4,12 +4,21 @@
 
 ### Fixes
 
+- `[jest-validate]` Show suggestion only when unrecognized cli param is longer than 1 character ([#10604](https://github.com/facebook/jest/pull/10604))
 - `[jest-validate]` Validate `testURL` as CLI option ([#10595](https://github.com/facebook/jest/pull/10595))
 
 ### Chore & Maintenance
 
 ### Performance
 
+## 26.5.2
+
+### Fixes
+
+- `[*]` Revert usage of Escalade and rollback Yargs to v15 as it breaks Node 13 ([#10599](https://github.com/facebook/jest/pull/10599))
+- `[jest-circus]` Setup globals before emitting `setup`, and include Jest globals in the `setup` payload ([#10598](https://github.com/facebook/jest/pull/10598))
+- `[jest-mock]` Fix typings for `mockResolvedValue`, `mockResolvedValueOnce`, `mockRejectedValue` and `mockRejectedValueOnce` ([#10600](https://github.com/facebook/jest/pull/10600))
+
 ## 26.5.1
 
 ### Fixes

TestUtils.ts

@@ -83,6 +83,7 @@ const DEFAULT_PROJECT_CONFIG: Config.ProjectConfig = {
   globalTeardown: undefined,
   globals: {},
   haste: {},
+  injectGlobals: true,
   moduleDirectories: [],
   moduleFileExtensions: ['js'],
   moduleLoader: '/test_module_loader_path',

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "26.5.1",
+  "version": "26.5.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

package.json

@@ -82,7 +82,7 @@
     "which": "^2.0.1"
   },
   "scripts": {
-    "build-clean": "rimraf './packages/*/build' './packages/*/build-es5' './packages/*/tsconfig.tsbuildinfo'",
+    "build-clean": "rimraf './packages/*/build' './packages/*/tsconfig.tsbuildinfo'",
     "build": "yarn build:js && yarn build:ts",
     "build:js": "node ./scripts/build.js",
     "build:ts": "node ./scripts/buildTs.js",

packages/babel-jest/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-jest",
   "description": "Jest plugin to use babel for transformation.",
-  "version": "26.5.0",
+  "version": "26.5.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -11,8 +11,8 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "dependencies": {
-    "@jest/transform": "^26.5.0",
-    "@jest/types": "^26.5.0",
+    "@jest/transform": "^26.5.2",
+    "@jest/types": "^26.5.2",
     "@types/babel__core": "^7.1.7",
     "babel-plugin-istanbul": "^6.0.0",
     "babel-preset-jest": "^26.5.0",

packages/expect/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expect",
-  "version": "26.5.0",
+  "version": "26.5.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -10,11 +10,11 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "dependencies": {
-    "@jest/types": "^26.5.0",
+    "@jest/types": "^26.5.2",
     "ansi-styles": "^4.0.0",
     "jest-get-type": "^26.3.0",
-    "jest-matcher-utils": "^26.5.0",
-    "jest-message-util": "^26.5.0",
+    "jest-matcher-utils": "^26.5.2",
+    "jest-message-util": "^26.5.2",
     "jest-regex-util": "^26.0.0"
   },
   "devDependencies": {

packages/expect/src/__tests__/fakeChalk.test.ts

@@ -1,6 +1,6 @@
 {
   "name": "jest-changed-files",
-  "version": "26.5.0",
+  "version": "26.5.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -10,7 +10,7 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "dependencies": {
-    "@jest/types": "^26.5.0",
+    "@jest/types": "^26.5.2",
     "execa": "^4.0.0",
     "throat": "^5.0.0"
   },

packages/expect/src/fakeChalk.ts

@@ -1,6 +1,6 @@
 {
   "name": "jest-circus",
-  "version": "26.5.1",
+  "version": "26.5.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -11,24 +11,24 @@
   "types": "build/index.d.ts",
   "dependencies": {
     "@babel/traverse": "^7.1.0",
-    "@jest/environment": "^26.5.0",
-    "@jest/test-result": "^26.5.0",
-    "@jest/types": "^26.5.0",
+    "@jest/environment": "^26.5.2",
+    "@jest/test-result": "^26.5.2",
+    "@jest/types": "^26.5.2",
     "@types/babel__traverse": "^7.0.4",
     "@types/node": "*",
     "chalk": "^4.0.0",
     "co": "^4.6.0",
     "dedent": "^0.7.0",
-    "expect": "^26.5.0",
+    "expect": "^26.5.2",
     "is-generator-fn": "^2.0.0",
-    "jest-each": "^26.5.0",
-    "jest-matcher-utils": "^26.5.0",
-    "jest-message-util": "^26.5.0",
-    "jest-runner": "^26.5.1",
-    "jest-runtime": "^26.5.0",
-    "jest-snapshot": "^26.5.0",
-    "jest-util": "^26.5.0",
-    "pretty-format": "^26.5.0",
+    "jest-each": "^26.5.2",
+    "jest-matcher-utils": "^26.5.2",
+    "jest-message-util": "^26.5.2",
+    "jest-runner": "^26.5.2",
+    "jest-runtime": "^26.5.2",
+    "jest-snapshot": "^26.5.2",
+    "jest-util": "^26.5.2",
+    "pretty-format": "^26.5.2",
     "stack-utils": "^2.0.2",
     "throat": "^5.0.0"
   },