Merge branch 'main' into move-off-alias-methods

Author: SimenB

CHANGELOG.md

@@ -44,6 +44,7 @@
 - `[*]` Depend on exact versions of monorepo dependencies instead of `^` range ([#14553](https://github.com/facebook/jest/pull/14553))
 - `[babel-jest, babel-preset-jest]` [**BREAKING**] Increase peer dependency of `@babel/core` to `^7.11` ([#14109](https://github.com/jestjs/jest/pull/14109))
 - `[jest-cli, jest-config, @jest/types]` [**BREAKING**] Remove deprecated `--init` argument ([#14490](https://github.com/jestjs/jest/pull/14490))
+- `[docs]` Fix typos in `CHANGELOG.md` and `packages/jest-validate/README.md` ([#14640](https://github.com/jestjs/jest/pull/14640))
 - `[docs]` Don't use alias matchers in docs ([#14631](https://github.com/facebook/jest/pull/14631))
 
 ## 29.7.0
@@ -634,7 +635,7 @@
 
 ### Fixes
 
-- `[*]` Use `sha256` instead of `md5` as hashing algortihm for compatibility with FIPS systems ([#12722](https://github.com/facebook/jest/pull/12722))
+- `[*]` Use `sha256` instead of `md5` as hashing algorithm for compatibility with FIPS systems ([#12722](https://github.com/facebook/jest/pull/12722))
 - `[babel-jest]` [**BREAKING**] Pass `rootDir` as `root` in Babel's options ([#12689](https://github.com/facebook/jest/pull/12689))
 - `[expect]` Move typings of `.not`, `.rejects` and `.resolves` modifiers outside of `Matchers` interface ([#12346](https://github.com/facebook/jest/pull/12346))
 - `[expect]` Throw useful error if `expect.extend` is called with invalid matchers ([#12488](https://github.com/facebook/jest/pull/12488))
@@ -1441,7 +1442,7 @@
 - `[*]` Upgrade to chalk@4 ([#9752](https://github.com/facebook/jest/pull/9752))
 - `[*]` Remove usage of `realpath-native` ([#9952](https://github.com/facebook/jest/pull/9952))
 - `[docs]` Fix example reference implementation to use Jest with Phabricator ([#8662](https://github.com/facebook/jest/pull/8662))
-- `[docs]` Added default compiler to tranform ([#8583](https://github.com/facebook/jest/pull/8583))
+- `[docs]` Added default compiler to transform ([#8583](https://github.com/facebook/jest/pull/8583))
 - `[docs]` Updated Testing Frameworks guide with React; make it generic ([#9106](https://github.com/facebook/jest/pull/9106))
 - `[expect, jest-mock, pretty-format]` [**BREAKING**] Remove `build-es5` from package ([#9945](https://github.com/facebook/jest/pull/9945))
 - `[@jest/fake-timers, @jest/environment]` [**BREAKING**] Rename `LolexFakeTimers` to `ModernFakeTimers` ([#9960](https://github.com/facebook/jest/pull/9960))
@@ -3481,7 +3482,7 @@ See <https://jestjs.io/blog/2016/12/15/2016-in-jest>
 - Added `--watchAll`, made `--watch` interactive and added the ability to update snapshots and select test patterns in watch mode.
 - Jest uses verbose mode when running a single test file.
 - Console messages are now buffered and printed along with the test results.
-- Fix `testEnvironment` resolution to prefer `jest-environment-{name}` instead of `{name}` only. This prevents a module colision when using `jsdom` as test environment.
+- Fix `testEnvironment` resolution to prefer `jest-environment-{name}` instead of `{name}` only. This prevents a module collision when using `jsdom` as test environment.
 - `moduleNameMapper` now uses a resolution algorithm.
 - Improved performance for small test runs.
 - Improved API documentation.
@@ -3620,7 +3621,7 @@ See <https://jestjs.io/blog/2016/12/15/2016-in-jest>
 - Clear the terminal window when using `--watch`.
 - By default, `--watch` will now only runs tests related to changed files. `--watch=all` can be used to run all tests on file system changes.
 - Debounce `--watch` re-runs to not trigger test runs during a branch switch in version control.
-- Added `jest.fn()` and `jest.fn(implementation)` as convenient shorcuts for `jest.genMockFunction()` and `jest.genMockFunction().mockImplementation()`.
+- Added `jest.fn()` and `jest.fn(implementation)` as convenient shortcuts for `jest.genMockFunction()` and `jest.genMockFunction().mockImplementation()`.
 - Added an `automock` option to turn off automocking globally.
 - Added a "no tests found" message if no tests can be found.
 - Jest sets `process.NODE_ENV` to `test` unless otherwise specified.

netlify.toml

@@ -7,13 +7,13 @@
   publish = "/website/build"
 
 [build.environment]
-  NODE_VERSION = "16"
+  NODE_VERSION = "20"
   NODE_OPTIONS = "--max_old_space_size=4096"
   # default cache
   YARN_ENABLE_GLOBAL_CACHE = "true"
   YARN_GLOBAL_FOLDER = "/opt/buildhome/.yarn_cache"
   YARN_CACHE_FOLDER = "/opt/buildhome/.yarn_cache"
-  YARN_VERSION = "3.3.1"
+  YARN_VERSION = "3.6.4"
 
 [context.production]
   # Do not build the site if there's no site-related changes

packages/jest-resolve/package.json

@@ -30,7 +30,7 @@
   "devDependencies": {
     "@tsd/typescript": "^5.0.4",
     "@types/graceful-fs": "^4.1.3",
-    "@types/pnpapi": "^0.0.3",
+    "@types/pnpapi": "^0.0.4",
     "@types/resolve": "^1.20.2",
     "tsd-lite": "^0.8.0"
   },

packages/jest-validate/README.md

@@ -203,7 +203,7 @@ import {validate} from 'jest-validate';
 validateCLIOptions(argv, {...allowedOptions, deprecatedOptions});
 ```
 
-If `argv` contains a deprecated option that is not specifid in `allowedOptions`, `validateCLIOptions` will throw an error with the message specified in the `deprecatedOptions` config:
+If `argv` contains a deprecated option that is not specified in `allowedOptions`, `validateCLIOptions` will throw an error with the message specified in the `deprecatedOptions` config:
 
 ```bash
 ● collectCoverageOnlyFrom:
@@ -213,4 +213,4 @@ If `argv` contains a deprecated option that is not specifid in `allowedOptions`,
   CLI Options Documentation: https://jestjs.io/docs/en/cli.html
 ```
 
-If the deprecation option is still listed in the `allowedOptions` config, then `validateCLIOptions` will print the warning wihout throwing an error.
+If the deprecation option is still listed in the `allowedOptions` config, then `validateCLIOptions` will print the warning without throwing an error.

website/docusaurus.config.js

@@ -223,6 +223,7 @@ const config = {
       },
       image: 'img/opengraph.png',
       prism: {
+        additionalLanguages: ['bash', 'diff', 'json'],
         theme: require('./src/prism/themeLight'),
         darkTheme: require('./src/prism/themeDark'),
       },

website/package.json

@@ -32,13 +32,14 @@
     ]
   },
   "dependencies": {
-    "@docusaurus/core": "^3.0.0-beta.0",
-    "@docusaurus/plugin-client-redirects": "3.0.0-beta.0",
-    "@docusaurus/plugin-pwa": "3.0.0-beta.0",
-    "@docusaurus/preset-classic": "3.0.0-beta.0",
-    "@docusaurus/remark-plugin-npm2yarn": "3.0.0-beta.0",
+    "@docusaurus/core": "3.0.0-rc.0",
+    "@docusaurus/plugin-client-redirects": "3.0.0-rc.0",
+    "@docusaurus/plugin-pwa": "3.0.0-rc.0",
+    "@docusaurus/preset-classic": "3.0.0-rc.0",
+    "@docusaurus/remark-plugin-npm2yarn": "3.0.0-rc.0",
     "clsx": "^2.0.0",
-    "docusaurus-remark-plugin-tab-blocks": "^2.0.0-beta",
+    "docusaurus-remark-plugin-tab-blocks": "^2.0.0-rc.0",
+    "prism-react-renderer": "^2.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-github-btn": "^1.3.0",
@@ -48,8 +49,8 @@
   "devDependencies": {
     "@babel/core": "^7.11.6",
     "@crowdin/cli": "^3.5.2",
-    "@docusaurus/module-type-aliases": "3.0.0-beta.0",
-    "@docusaurus/tsconfig": "3.0.0-beta.0",
+    "@docusaurus/module-type-aliases": "3.0.0-rc.0",
+    "@docusaurus/tsconfig": "3.0.0-rc.0",
     "@types/react": "^18.2.0",
     "graphql": "^16.3.0",
     "graphql-request": "^6.0.0",

website/src/prism/themeDark.js

@@ -5,7 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-const baseTheme = require('prism-react-renderer/themes/vsDark');
+const {themes} = require('prism-react-renderer');
+const baseTheme = themes.vsDark;
 
 const themeDark = [
   {

website/src/prism/themeLight.js

@@ -5,7 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-const baseTheme = require('prism-react-renderer/themes/github');
+const {themes} = require('prism-react-renderer');
+const baseTheme = themes.github;
 
 const themeLight = [
   {