Merge branch 'main' into refactor-to-new-react-style

jestjs · Jan 6, 2022 · f6aa020 · f6aa020
2 parents 707f8b1 + 11d79ec
commit f6aa020
Show file tree

Hide file tree

Showing 25 changed files with 51 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,13 @@
 
 ### Chore & Maintenance
 
+- `[*]` Update graceful-fs to ^4.2.9 ([#11749](https://github.com/facebook/jest/pull/11749))
 - `[docs, examples]` Update React examples to match with the new React guidelines for code examples ([#12217](https://github.com/facebook/jest/pull/12217))
 
 ### Performance
 
+- `[jest-resolve]` perf: skip error creation on not found stat calls ([#11749](https://github.com/facebook/jest/pull/11749))
+
 ## 27.4.7
 
 ### Fixes

diff --git a/e2e/global-teardown-esm/__tests__/test.js b/e2e/global-teardown-esm/__tests__/test.js
@@ -8,7 +8,6 @@
 import os from 'os';
 import path from 'path';
 import fs from 'graceful-fs';
-import greeting from '../';
 
 const DIR = path.join(os.tmpdir(), 'jest-global-teardown-esm');
 

diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "find-process": "^1.4.1",
     "glob": "^7.1.1",
     "globby": "^11.0.0",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "isbinaryfile": "^4.0.0",
     "istanbul-lib-coverage": "^3.0.0",
     "istanbul-lib-report": "^3.0.0",

diff --git a/packages/babel-jest/package.json b/packages/babel-jest/package.json
@@ -24,7 +24,7 @@
     "babel-plugin-istanbul": "^6.1.1",
     "babel-preset-jest": "^27.4.0",
     "chalk": "^4.0.0",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "slash": "^3.0.0"
   },
   "devDependencies": {

diff --git a/packages/jest-circus/package.json b/packages/jest-circus/package.json
@@ -46,7 +46,7 @@
     "@types/graceful-fs": "^4.1.3",
     "@types/stack-utils": "^2.0.0",
     "execa": "^5.0.0",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "jest-snapshot-serializer-raw": "^1.1.0"
   },
   "engines": {

diff --git a/packages/jest-cli/package.json b/packages/jest-cli/package.json
@@ -18,7 +18,7 @@
     "@jest/types": "^27.4.2",
     "chalk": "^4.0.0",
     "exit": "^0.1.2",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "import-local": "^3.0.2",
     "jest-config": "^27.4.7",
     "jest-util": "^27.4.2",

diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json
@@ -33,7 +33,7 @@
     "ci-info": "^3.2.0",
     "deepmerge": "^4.2.2",
     "glob": "^7.1.1",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "jest-circus": "^27.4.6",
     "jest-environment-jsdom": "^27.4.6",
     "jest-environment-node": "^27.4.6",

diff --git a/packages/jest-config/src/resolveConfigPath.ts b/packages/jest-config/src/resolveConfigPath.ts
@@ -42,7 +42,7 @@ export default (
   // e.g.
   // With a directory structure like this:
   //   my_project/
-  //     packcage.json
+  //     package.json
   //
   // Passing a `my_project/some_directory_that_doesnt_exist` as a project
   // name will resolve into a (possibly empty) `my_project/package.json` and

diff --git a/packages/jest-core/package.json b/packages/jest-core/package.json
@@ -22,7 +22,7 @@
     "chalk": "^4.0.0",
     "emittery": "^0.8.1",
     "exit": "^0.1.2",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "jest-changed-files": "^27.4.2",
     "jest-config": "^27.4.7",
     "jest-haste-map": "^27.4.6",

diff --git a/packages/jest-haste-map/package.json b/packages/jest-haste-map/package.json
@@ -22,7 +22,7 @@
     "@types/node": "*",
     "anymatch": "^3.0.3",
     "fb-watchman": "^2.0.0",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "jest-regex-util": "^27.4.0",
     "jest-serializer": "^27.4.0",
     "jest-util": "^27.4.2",

diff --git a/packages/jest-message-util/package.json b/packages/jest-message-util/package.json
@@ -24,7 +24,7 @@
     "@jest/types": "^27.4.2",
     "@types/stack-utils": "^2.0.0",
     "chalk": "^4.0.0",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "micromatch": "^4.0.4",
     "pretty-format": "^27.4.6",
     "slash": "^3.0.0",

diff --git a/packages/jest-reporters/package.json b/packages/jest-reporters/package.json
@@ -22,7 +22,7 @@
     "collect-v8-coverage": "^1.0.0",
     "exit": "^0.1.2",
     "glob": "^7.1.2",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "istanbul-lib-coverage": "^3.0.0",
     "istanbul-lib-instrument": "^5.1.0",
     "istanbul-lib-report": "^3.0.0",

diff --git a/packages/jest-resolve/package.json b/packages/jest-resolve/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@jest/types": "^27.4.2",
     "chalk": "^4.0.0",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "jest-haste-map": "^27.4.6",
     "jest-pnp-resolver": "^1.2.2",
     "jest-util": "^27.4.2",

diff --git a/packages/jest-resolve/src/fileWalkers.ts b/packages/jest-resolve/src/fileWalkers.ts
@@ -30,7 +30,8 @@ function statSyncCached(path: string): IPathType {
 
   let stat;
   try {
-    stat = fs.statSync(path);
+    // @ts-expect-error TS2554 - throwIfNoEntry is only available in recent version of node, but inclusion of the option is a backward compatible no-op.
+    stat = fs.statSync(path, {throwIfNoEntry: false});
   } catch (e: any) {
     if (!(e && (e.code === 'ENOENT' || e.code === 'ENOTDIR'))) {
       throw e;

diff --git a/packages/jest-runner/package.json b/packages/jest-runner/package.json
@@ -26,7 +26,7 @@
     "chalk": "^4.0.0",
     "emittery": "^0.8.1",
     "exit": "^0.1.2",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "jest-docblock": "^27.4.0",
     "jest-environment-jsdom": "^27.4.6",
     "jest-environment-node": "^27.4.6",

diff --git a/packages/jest-runtime/package.json b/packages/jest-runtime/package.json
@@ -29,7 +29,7 @@
     "collect-v8-coverage": "^1.0.0",
     "execa": "^5.0.0",
     "glob": "^7.1.3",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "jest-haste-map": "^27.4.6",
     "jest-message-util": "^27.4.6",
     "jest-mock": "^27.4.6",

diff --git a/packages/jest-serializer/package.json b/packages/jest-serializer/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@types/node": "*",
-    "graceful-fs": "^4.2.4"
+    "graceful-fs": "^4.2.9"
   },
   "engines": {
     "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"

diff --git a/packages/jest-snapshot/package.json b/packages/jest-snapshot/package.json
@@ -29,7 +29,7 @@
     "babel-preset-current-node-syntax": "^1.0.0",
     "chalk": "^4.0.0",
     "expect": "^27.4.6",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "jest-diff": "^27.4.6",
     "jest-get-type": "^27.4.0",
     "jest-haste-map": "^27.4.6",

diff --git a/packages/jest-source-map/package.json b/packages/jest-source-map/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "callsites": "^3.0.0",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "source-map": "^0.6.0"
   },
   "devDependencies": {

diff --git a/packages/jest-test-sequencer/package.json b/packages/jest-test-sequencer/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@jest/test-result": "^27.4.6",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "jest-haste-map": "^27.4.6",
     "jest-runtime": "^27.4.6"
   },

diff --git a/packages/jest-transform/package.json b/packages/jest-transform/package.json
@@ -23,7 +23,7 @@
     "chalk": "^4.0.0",
     "convert-source-map": "^1.4.0",
     "fast-json-stable-stringify": "^2.0.0",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "jest-haste-map": "^27.4.6",
     "jest-regex-util": "^27.4.0",
     "jest-util": "^27.4.2",

diff --git a/packages/jest-util/package.json b/packages/jest-util/package.json
@@ -21,7 +21,7 @@
     "@types/node": "*",
     "chalk": "^4.0.0",
     "ci-info": "^3.2.0",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.9",
     "picomatch": "^2.2.3"
   },
   "devDependencies": {

diff --git a/scripts/remove-prettier-dep.js b/scripts/remove-prettier-dep.js
diff --git a/website/static/css/jest.css b/website/static/css/jest.css
@@ -151,12 +151,16 @@
   padding: 12px 0;
 }
 
+.logos {
+  align-items: baseline;
+}
+
 .logos > a {
   margin-left: 0;
 }
 
 .logos > p.others {
-  padding-top: 1.5rem !important;
+  align-self: center;
 }
 
 @media only screen and (min-width: 736px) {