Merge branch 'master' into pretty-format/jestjs#7895

mishra-prabhakar · Mar 7, 2019 · 6192fda · 6192fda
2 parents 09ffcce + 36484b5
commit 6192fda
Show file tree

Hide file tree

Showing 50 changed files with 358 additions and 334 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "3.13.1",
-  "version": "24.1.0",
+  "version": "24.3.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

diff --git a/packages/babel-jest/package.json b/packages/babel-jest/package.json
@@ -1,7 +1,7 @@
 {
   "name": "babel-jest",
   "description": "Jest plugin to use babel for transformation.",
-  "version": "24.1.0",
+  "version": "24.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -11,11 +11,11 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "dependencies": {
-    "@jest/transform": "^24.1.0",
-    "@jest/types": "^24.1.0",
+    "@jest/transform": "^24.3.0",
+    "@jest/types": "^24.3.0",
     "@types/babel__core": "^7.1.0",
     "babel-plugin-istanbul": "^5.1.0",
-    "babel-preset-jest": "^24.1.0",
+    "babel-preset-jest": "^24.3.0",
     "chalk": "^2.4.2",
     "slash": "^2.0.0"
   },
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b16789230fd45056a7f2fa199bae06c7a1780deb"
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }
diff --git a/packages/babel-plugin-jest-hoist/package.json b/packages/babel-plugin-jest-hoist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-jest-hoist",
-  "version": "24.1.0",
+  "version": "24.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -21,5 +21,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b16789230fd45056a7f2fa199bae06c7a1780deb"
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }
diff --git a/packages/babel-preset-jest/package.json b/packages/babel-preset-jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-jest",
-  "version": "24.1.0",
+  "version": "24.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -10,7 +10,7 @@
   "main": "index.js",
   "dependencies": {
     "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-    "babel-plugin-jest-hoist": "^24.1.0"
+    "babel-plugin-jest-hoist": "^24.3.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0"
@@ -21,5 +21,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b16789230fd45056a7f2fa199bae06c7a1780deb"
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }
diff --git a/packages/diff-sequences/package.json b/packages/diff-sequences/package.json
@@ -1,6 +1,6 @@
 {
   "name": "diff-sequences",
-  "version": "24.0.0",
+  "version": "24.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -30,5 +30,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "634e5a54f46b2a62d1dc81a170562e6f4e55ad60"
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }
diff --git a/packages/eslint-config-fb-strict/package.json b/packages/eslint-config-fb-strict/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-fb-strict",
-  "version": "24.0.0",
+  "version": "24.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -26,5 +26,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "634e5a54f46b2a62d1dc81a170562e6f4e55ad60"
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }
diff --git a/packages/expect/package.json b/packages/expect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expect",
-  "version": "24.1.0",
+  "version": "24.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -11,12 +11,12 @@
   "types": "build/index.d.ts",
   "browser": "build-es5/index.js",
   "dependencies": {
-    "@jest/types": "^24.1.0",
+    "@jest/types": "^24.3.0",
     "ansi-styles": "^3.2.0",
-    "jest-get-type": "^24.0.0",
-    "jest-matcher-utils": "^24.0.0",
-    "jest-message-util": "^24.0.0",
-    "jest-regex-util": "^24.0.0"
+    "jest-get-type": "^24.3.0",
+    "jest-matcher-utils": "^24.3.0",
+    "jest-message-util": "^24.3.0",
+    "jest-regex-util": "^24.3.0"
   },
   "devDependencies": {
     "@types/ansi-styles": "^3.2.1"
@@ -27,5 +27,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b16789230fd45056a7f2fa199bae06c7a1780deb"
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }
diff --git a/packages/jest-changed-files/package.json b/packages/jest-changed-files/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jest-changed-files",
-  "version": "24.0.0",
+  "version": "24.3.0",
   "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": "^24.1.0",
+    "@jest/types": "^24.3.0",
     "execa": "^1.0.0",
     "throat": "^4.0.0"
   },
@@ -23,5 +23,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "634e5a54f46b2a62d1dc81a170562e6f4e55ad60"
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }
diff --git a/packages/jest-changed-files/src/hg.ts b/packages/jest-changed-files/src/hg.ts
@@ -21,7 +21,7 @@ const adapter: SCMAdapter = {
 
     const args = ['status', '-amnu'];
     if (options && options.withAncestor) {
-      args.push('--rev', `min(!public() & ::.)^`);
+      args.push('--rev', `min((!public() & ::.)+.)^`);
     } else if (options && options.changedSince) {
       args.push('--rev', `ancestor(., ${options.changedSince})`);
     } else if (options && options.lastCommit === true) {

diff --git a/packages/jest-circus/package.json b/packages/jest-circus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jest-circus",
-  "version": "24.1.0",
+  "version": "24.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -11,36 +11,36 @@
   "types": "build/index.d.ts",
   "dependencies": {
     "@babel/traverse": "^7.1.0",
-    "@jest/environment": "^24.1.0",
-    "@jest/test-result": "^24.1.0",
-    "@jest/types": "^24.1.0",
+    "@jest/environment": "^24.3.0",
+    "@jest/test-result": "^24.3.0",
+    "@jest/types": "^24.3.0",
     "@types/node": "*",
     "chalk": "^2.0.1",
     "co": "^4.6.0",
-    "expect": "^24.1.0",
+    "expect": "^24.3.0",
     "is-generator-fn": "^2.0.0",
-    "jest-each": "^24.0.0",
-    "jest-matcher-utils": "^24.0.0",
-    "jest-message-util": "^24.0.0",
-    "jest-snapshot": "^24.1.0",
-    "jest-util": "^24.0.0",
-    "pretty-format": "^24.0.0",
+    "jest-each": "^24.3.0",
+    "jest-matcher-utils": "^24.3.0",
+    "jest-message-util": "^24.3.0",
+    "jest-snapshot": "^24.3.0",
+    "jest-util": "^24.3.0",
+    "pretty-format": "^24.3.0",
     "stack-utils": "^1.0.1",
     "throat": "^4.0.0"
   },
   "devDependencies": {
-    "@jest/test-utils": "0.0.0",
+    "@jest/test-utils": "^24.3.0",
     "@types/babel__traverse": "^7.0.4",
     "@types/co": "^4.6.0",
     "@types/stack-utils": "^1.0.1",
     "execa": "^1.0.0",
-    "jest-runtime": "^24.1.0"
+    "jest-runtime": "^24.3.0"
   },
   "engines": {
     "node": ">= 6"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b16789230fd45056a7f2fa199bae06c7a1780deb"
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }
diff --git a/packages/jest-cli/package.json b/packages/jest-cli/package.json
@@ -1,20 +1,20 @@
 {
   "name": "jest-cli",
   "description": "Delightful JavaScript Testing.",
-  "version": "24.1.0",
+  "version": "24.3.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "dependencies": {
-    "@jest/core": "^24.1.0",
-    "@jest/test-result": "^24.1.0",
-    "@jest/types": "^24.1.0",
+    "@jest/core": "^24.3.0",
+    "@jest/test-result": "^24.3.0",
+    "@jest/types": "^24.3.0",
     "chalk": "^2.0.1",
     "exit": "^0.1.2",
     "import-local": "^2.0.0",
     "is-ci": "^2.0.0",
-    "jest-config": "^24.1.0",
-    "jest-util": "^24.0.0",
-    "jest-validate": "^24.0.0",
+    "jest-config": "^24.3.0",
+    "jest-util": "^24.3.0",
+    "jest-validate": "^24.3.0",
     "prompts": "^2.0.1",
     "realpath-native": "^1.1.0",
     "yargs": "^12.0.2"
@@ -70,5 +70,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b16789230fd45056a7f2fa199bae06c7a1780deb"
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }
diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jest-config",
-  "version": "24.1.0",
+  "version": "24.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -11,20 +11,20 @@
   "types": "build/index.d.ts",
   "dependencies": {
     "@babel/core": "^7.1.0",
-    "@jest/types": "^24.1.0",
-    "babel-jest": "^24.1.0",
+    "@jest/types": "^24.3.0",
+    "babel-jest": "^24.3.0",
     "chalk": "^2.0.1",
     "glob": "^7.1.1",
-    "jest-environment-jsdom": "^24.0.0",
-    "jest-environment-node": "^24.0.0",
-    "jest-get-type": "^24.0.0",
-    "jest-jasmine2": "^24.1.0",
-    "jest-regex-util": "^24.0.0",
-    "jest-resolve": "^24.1.0",
-    "jest-util": "^24.0.0",
-    "jest-validate": "^24.0.0",
+    "jest-environment-jsdom": "^24.3.0",
+    "jest-environment-node": "^24.3.0",
+    "jest-get-type": "^24.3.0",
+    "jest-jasmine2": "^24.3.0",
+    "jest-regex-util": "^24.3.0",
+    "jest-resolve": "^24.3.0",
+    "jest-util": "^24.3.0",
+    "jest-validate": "^24.3.0",
     "micromatch": "^3.1.10",
-    "pretty-format": "^24.0.0",
+    "pretty-format": "^24.3.0",
     "realpath-native": "^1.1.0"
   },
   "devDependencies": {
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b16789230fd45056a7f2fa199bae06c7a1780deb"
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }
diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jest/console",
-  "version": "24.1.0",
+  "version": "24.3.0",
   "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/source-map": "^24.1.0",
+    "@jest/source-map": "^24.3.0",
     "@types/node": "*",
     "chalk": "^2.0.1",
     "slash": "^2.0.0"
@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "634e5a54f46b2a62d1dc81a170562e6f4e55ad60"
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }
diff --git a/packages/jest-core/package.json b/packages/jest-core/package.json
@@ -1,31 +1,31 @@
 {
   "name": "@jest/core",
   "description": "Delightful JavaScript Testing.",
-  "version": "24.1.0",
+  "version": "24.3.0",
   "main": "build/jest.js",
   "types": "build/jest.d.ts",
   "dependencies": {
-    "@jest/console": "^24.1.0",
-    "@jest/types": "^24.1.0",
-    "@jest/reporters": "^24.1.0",
-    "@jest/test-result": "^24.1.0",
-    "@jest/transform": "^24.1.0",
+    "@jest/console": "^24.3.0",
+    "@jest/reporters": "^24.3.0",
+    "@jest/test-result": "^24.3.0",
+    "@jest/transform": "^24.3.0",
+    "@jest/types": "^24.3.0",
     "ansi-escapes": "^3.0.0",
     "chalk": "^2.0.1",
     "exit": "^0.1.2",
     "graceful-fs": "^4.1.15",
-    "jest-changed-files": "^24.0.0",
-    "jest-config": "^24.1.0",
-    "jest-haste-map": "^24.0.0",
-    "jest-message-util": "^24.0.0",
-    "jest-regex-util": "^24.0.0",
-    "jest-resolve-dependencies": "^24.1.0",
-    "jest-runner": "^24.1.0",
-    "jest-runtime": "^24.1.0",
-    "jest-snapshot": "^24.1.0",
-    "jest-util": "^24.0.0",
-    "jest-validate": "^24.0.0",
-    "jest-watcher": "^24.0.0",
+    "jest-changed-files": "^24.3.0",
+    "jest-config": "^24.3.0",
+    "jest-haste-map": "^24.3.0",
+    "jest-message-util": "^24.3.0",
+    "jest-regex-util": "^24.3.0",
+    "jest-resolve-dependencies": "^24.3.0",
+    "jest-runner": "^24.3.0",
+    "jest-runtime": "^24.3.0",
+    "jest-snapshot": "^24.3.0",
+    "jest-util": "^24.3.0",
+    "jest-validate": "^24.3.0",
+    "jest-watcher": "^24.3.0",
     "micromatch": "^3.1.10",
     "p-each-series": "^1.0.0",
     "pirates": "^4.0.1",
@@ -83,5 +83,6 @@
   ],
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "gitHead": "3a7a4f3a3f5489ac8e07dcddf76bb949c482ec87"
 }