Merge branch 'main' into fix/equality-of-iterable-with-symbols

SimenB · SimenB · commit a257941600e2 · 2023-11-15T08:51:16.000+01:00
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
@@ -4,18 +4,23 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+concurrency:
+  group: lock-threads
+
 permissions: {}
 jobs:
   lock:
     permissions:
       issues: write # to lock issues (dessant/lock-threads)
       pull-requests: write # to lock PRs (dessant/lock-threads)
+      discussions: write # to lock discussions (dessant/lock-threads)
 
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ github.token }}
+          process-only: 'issues, prs'
           issue-inactive-days: '30'
           exclude-any-issue-labels: 'Discussion'
           issue-comment: >
diff --git a/.yarn/releases/yarn-3.6.4.cjs b/.yarn/releases/yarn-3.6.4.cjs
diff --git a/.yarn/releases/yarn-3.7.0.cjs b/.yarn/releases/yarn-3.7.0.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -28,4 +28,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-3.6.4.cjs
+yarnPath: .yarn/releases/yarn-3.7.0.cjs
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ _Before_ submitting a pull request, please make sure the following is done…
 
     Note: Replace `<your_username>` with your GitHub username
 
-1.  Jest uses [Yarn](https://code.facebook.com/posts/1840075619545360) for running development scripts. If you haven't already done so, please [install yarn](https://yarnpkg.com/en/docs/install).
+1.  Jest uses [Yarn](https://yarnpkg.com/) for running development scripts. If you haven't already done so, please run [`corepack enable`](https://nodejs.org/api/corepack.html#workflows).
 
 1.  Make sure you have `python` installed. Python is required by [node-gyp](https://github.com/nodejs/node-gyp) that is used when running `yarn install`.
 
@@ -44,13 +44,13 @@ _Before_ submitting a pull request, please make sure the following is done…
     python --version
     ```
 
-1.  Make sure you have a compatible version of `node` installed (As of October 29th, 2021, `v16.x` is recommended).
+1.  Make sure you have a compatible version of `node` installed (As of November 15th, 2023, `v20.x` is recommended).
 
     ```sh
     node -v
     ```
 
-1.  Run `yarn install`. On Windows: To install [Yarn](https://yarnpkg.com/en/docs/install#windows-tab) on Windows you may need to download either node.js or Chocolatey<br />
+1.  Run `yarn install`.
 
     ```sh
     yarn install
@@ -62,12 +62,6 @@ _Before_ submitting a pull request, please make sure the following is done…
     yarn --version
     ```
 
-    On Windows `yarn install` may fail with `gyp ERR! build error`. One of the possible solutions:
-
-    ```sh
-     yarn global add windows-build-tools
-    ```
-
 1.  Run `yarn build` to transpile TypeScript to JavaScript and type check the code
 
     ```sh
@@ -90,8 +84,6 @@ _Before_ submitting a pull request, please make sure the following is done…
     $ yarn test
     ```
 
-1.  If you haven't already, complete the [CLA](https://code.facebook.com/cla/).
-
 #### Changelog entries
 
 All changes that add a feature to or fix a bug in any of Jest's packages require a changelog entry containing the names of the packages affected, a description of the change, and the number of and link to the pull request. Try to match the structure of the existing entries.
@@ -108,7 +100,7 @@ Code that is written needs to be tested to ensure that it achieves the desired b
 
 ##### Unit tests
 
-Some of the packages within jest have a `__tests__` directory. This is where unit tests reside in. If the scope of your work only requires a unit test, this is where you will write it in. Tests here usually don't require much of any setup.
+Some of the packages within Jest have a `__tests__` directory. This is where unit tests reside in. If the scope of your work only requires a unit test, this is where you will write it in. Tests here usually don't require much of any setup.
 
 ##### Integration tests
 
@@ -118,7 +110,7 @@ It is possible to run the integration test itself manually to inspect that the n
 
 ```bash
 $ cd e2e/clear-cache
-$ node ../../packages/jest-cli/bin/jest.js # It is possible to use node --inspect or ndb
+$ node ../../packages/jest-cli/bin/jest.js # It is possible to use `node --inspect`
 PASS  __tests__/clear_cache.test.js
 ✓ stub (3ms)
 
@@ -166,9 +158,7 @@ The Jest website also offers documentation for older versions of Jest, which you
 
 ### Contributor License Agreement (CLA)
 
-In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another Facebook open source project, you're good to go. If you are submitting a pull request for the first time, just let us know that you have completed the CLA and we can cross-check with your GitHub username.
-
-[Complete your CLA here.](https://code.facebook.com/cla)
+In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another OpenJS open source project, you're good to go. If you are submitting a pull request for the first time, a bot will verify and guide you on how to sign it.
 
 ## How to try a development build of Jest in another project
 
@@ -180,10 +170,10 @@ $ cd /path/to/your/Jest_clone
 # Do one of the following:
 
 # Check out a commit from another contributor, and then
-$ yarn run build
+$ yarn run watch
 
 # Or, save your changes to Jest, and then
-$ yarn test # which also builds Jest
+$ yarn test
 ```
 
 To run tests in another project with the development build of Jest:
diff --git a/package.json b/package.json
@@ -202,5 +202,5 @@
     "psl": "patch:psl@npm:^1.9.0#./.yarn/patches/psl-npm-1.9.0-a546edad1a.patch",
     "ts-node@^10.5.0": "patch:ts-node@npm:^10.5.0#./.yarn/patches/ts-node-npm-10.9.1-6c268be7f4.patch"
   },
-  "packageManager": "yarn@3.6.4"
+  "packageManager": "yarn@3.7.0+sha256.7bf0c78a106332886ea4e59641fd819b1af953edcd72c4d93a32b1c71000ee67"
 }
diff --git a/packages/jest-resolve/package.json b/packages/jest-resolve/package.json
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@tsd/typescript": "^5.0.4",
     "@types/graceful-fs": "^4.1.3",
-    "@types/pnpapi": "^0.0.4",
+    "@types/pnpapi": "^0.0.5",
     "@types/resolve": "^1.20.2",
     "tsd-lite": "^0.8.0"
   },
diff --git a/website/package.json b/website/package.json
@@ -38,7 +38,7 @@
     "@docusaurus/preset-classic": "^3.0.0",
     "@docusaurus/remark-plugin-npm2yarn": "^3.0.0",
     "clsx": "^2.0.0",
-    "docusaurus-remark-plugin-tab-blocks": "^2.0.0",
+    "docusaurus-remark-plugin-tab-blocks": "^3.0.0",
     "prism-react-renderer": "^2.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
diff --git a/yarn.lock b/yarn.lock
@@ -5291,10 +5291,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/pnpapi@npm:^0.0.4":
-  version: 0.0.4
-  resolution: "@types/pnpapi@npm:0.0.4"
-  checksum: 625a33121ac14819a6172efad5ffd694fb317172135c26f0d3fa51b00a29f82742e7a9531e51c92caa15be84cdb0d420f66a1b3c89dc8b274ac3abfc455da16c
+"@types/pnpapi@npm:^0.0.5":
+  version: 0.0.5
+  resolution: "@types/pnpapi@npm:0.0.5"
+  checksum: 46d8474b77358c8cc48b957c059de6ad0839d18d8e90252c500c6bc30702e44e2629cf330350f7b291f35d863190b5390b641992c0601853a5d8b129fa91bd4d
   languageName: node
   linkType: hard
 
@@ -8988,13 +8988,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"docusaurus-remark-plugin-tab-blocks@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "docusaurus-remark-plugin-tab-blocks@npm:2.0.0"
+"docusaurus-remark-plugin-tab-blocks@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "docusaurus-remark-plugin-tab-blocks@npm:3.0.0"
   dependencies:
     unist-util-is: ^6.0.0
     unist-util-visit: ^5.0.0
-  checksum: 99eb4074071aee01938013c34f569e3ac12bee499a4e69e6431912812236b46bcc98c6d3d68a1bcb3d00ab0aac3829b8cc13c84391ec2c3ee1e3a2a8d3f9d27b
+  checksum: d33b85b33743fb500166847ae2889a17c49c57f5fa1b1e344b07433b3743bbbef85cbe25c134e6488340397a809f8e3ffde25ce482d9584808879902bd102ec0
   languageName: node
   linkType: hard
 
@@ -13228,7 +13228,7 @@ __metadata:
   dependencies:
     "@tsd/typescript": ^5.0.4
     "@types/graceful-fs": ^4.1.3
-    "@types/pnpapi": ^0.0.4
+    "@types/pnpapi": ^0.0.5
     "@types/resolve": ^1.20.2
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
@@ -13532,7 +13532,7 @@ __metadata:
     "@docusaurus/tsconfig": ^3.0.0
     "@types/react": ^18.2.0
     clsx: ^2.0.0
-    docusaurus-remark-plugin-tab-blocks: ^2.0.0
+    docusaurus-remark-plugin-tab-blocks: ^3.0.0
     graphql: ^16.3.0
     graphql-request: ^6.0.0
     js-yaml: ^4.1.0

Original file line number	Diff line number	Diff line change
`@@ -202,5 +202,5 @@`
`202`	`202`	`"psl": "patch:psl@npm:^1.9.0#./.yarn/patches/psl-npm-1.9.0-a546edad1a.patch",`
`203`	`203`	`"ts-node@^10.5.0": "patch:ts-node@npm:^10.5.0#./.yarn/patches/ts-node-npm-10.9.1-6c268be7f4.patch"`
`204`	`204`	`},`
`205`		`- "packageManager": "yarn@3.6.4"`
	`205`	`+ "packageManager": "yarn@3.7.0+sha256.7bf0c78a106332886ea4e59641fd819b1af953edcd72c4d93a32b1c71000ee67"`
`206`	`206`	`}`