Merge branch 'main' into downgrade-write-file-atomic

Author: SimenB

.eslintrc.cjs

@@ -235,6 +235,15 @@ module.exports = {
         'jest/prefer-to-have-length': 'off',
       },
     },
+    // snapshot in an example needs to keep escapes
+    {
+      files: [
+        '**/2017-02-21-jest-19-immersive-watch-mode-test-platform-improvements.md/**',
+      ],
+      rules: {
+        'no-useless-escape': 'off',
+      },
+    },
 
     // snapshots in examples plus inline snapshots need to keep backtick
     {

.github/workflows/nodejs.yml

@@ -82,6 +82,8 @@ jobs:
         run: yarn lint
       - name: run prettier
         run: yarn lint:prettier:ci
+      - name: check changelog
+        run: yarn check-changelog
       - name: check copyright headers
         run: yarn check-copyright-headers
 

CHANGELOG.md

@@ -1262,7 +1262,7 @@ These helper functions and properties can be found on `this` inside a custom tes
 
 #### `this.equals(a, b, customTesters?)`
 
-This is a deep-equality function that will return `true` if two objects have the same values (recursively). It optionally takes a list of custom equality testers to apply to the deep equality checks. If you use this function, pass through the custom testers your tester is given so further equality checks `equals` applies can also use custom testers the test author may have configured. See the example in the [Recursive custom equality testers][#recursivecustomequalitytesters] section for more details.
+This is a deep-equality function that will return `true` if two objects have the same values (recursively). It optionally takes a list of custom equality testers to apply to the deep equality checks. If you use this function, pass through the custom testers your tester is given so further equality checks `equals` applies can also use custom testers the test author may have configured. See the example in the [Recursive custom equality testers](#recursive-custom-equality-testers) section for more details.
 
 #### Matchers vs Testers
 

docs/ExpectAPI.md

@@ -202,7 +202,7 @@ For more complex webpack configurations, you may also want to investigate projec
 In addition to installing `babel-jest` as described earlier, you'll need to add `@babel/preset-env` like so:
 
 ```bash npm2yarn
-	npm install --save-dev @babel/preset-env
+npm install --save-dev @babel/preset-env
 ```
 
 Then, you'll want to configure Babel as follows:

docs/Webpack.md

@@ -3,5 +3,6 @@
   "compilerOptions": {
     "rootDir": "./"
   },
-  "include": ["./**/*"]
+  "include": ["./**/*"],
+  "references": [{"path": "../packages/test-utils"}]
 }

e2e/tsconfig.json

@@ -89,6 +89,7 @@
     "build:js": "node ./scripts/build.mjs",
     "build:ts": "node ./scripts/buildTs.mjs",
     "bundle:ts": "node ./scripts/bundleTs.mjs",
+    "check-changelog": "node ./scripts/checkChangelog.mjs",
     "check-copyright-headers": "node ./scripts/checkCopyrightHeaders.mjs",
     "clean-all": "yarn clean-e2e && yarn build-clean && rimraf './packages/*/node_modules' && rimraf './node_modules'",
     "clean-e2e": "node ./scripts/cleanE2e.mjs",

package.json

@@ -1,5 +1,5 @@
 {
   "extends": "../../../../tsconfig.test.json",
   "include": ["./**/*"],
-  "references": [{"path": "../../"}]
+  "references": [{"path": "../../"}, {"path": "../../../test-utils"}]
 }

packages/babel-jest/src/__tests__/tsconfig.json

@@ -7,5 +7,5 @@
   "include": ["./src/**/*"],
   "exclude": ["./**/__tests__/**/*"],
   // TODO: include `babel-preset-jest` if it's ever in TS even though we don't care about its types
-  "references": [{"path": "../jest-transform"}, {"path": "../test-utils"}]
+  "references": [{"path": "../jest-transform"}]
 }

packages/babel-jest/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "../../../../tsconfig.test.json",
   "include": ["./**/*"],
-  "references": [{"path": "../../"}]
+  "references": [{"path": "../../"}, {"path": "../../../test-utils"}]
 }