Merge branch 'main' into jest-globals-per-file

cpojer · web-flow · commit 78a86c61477a · 2025-08-27T12:44:41.000+09:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 - `[jest-runtime]` Importing from `@jest/globals` in more than one file no longer breaks relative paths ([#15772](https://github.com/jestjs/jest/issues/15772))
 
+# Chore
+
+- `[expect]` Update docblock for `toContain()` to display info on substring check ([#15789](https://github.com/jestjs/jest/pull/15789))
+
 ## 30.0.5
 
 ### Features
diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md
@@ -133,7 +133,7 @@ Jest is not supported by Vite due to incompatibilities with the Vite [plugin sys
 
 There are examples for Jest integration with Vite in the [vite-jest](https://github.com/sodatea/vite-jest) library. However, this library is not compatible with versions of Vite later than 2.4.2.
 
-One alternative is [Vitest](https://vitest.dev/) which has an API compatible Jest.
+One alternative is [Vitest](https://vitest.dev/) which has an API that is compatible with Jest.
 
 ### Using Parcel
 
diff --git a/e2e/__tests__/tsIntegration.test.ts b/e2e/__tests__/tsIntegration.test.ts
@@ -7,13 +7,17 @@
 
 import * as path from 'path';
 import {cleanup, writeFiles} from '../Utils';
-import runJest, {getConfig} from '../runJest';
+import runJest, {getConfig, useNativeTypeScript} from '../runJest';
 
 const DIR = path.resolve(__dirname, '../ts-node-integration');
 
 beforeEach(() => cleanup(DIR));
 afterAll(() => cleanup(DIR));
 
+// Node.js's builtin TypeScript support doesn't do type checking, so skip tests
+// that validate type-checking behavior.
+const testIfTsLoader = useNativeTypeScript ? test.skip : test;
+
 describe('when `Config` type is imported from "@jest/types"', () => {
   test('with object config exported from TS file', () => {
     writeFiles(DIR, {
@@ -93,7 +97,7 @@ describe('when `Config` type is imported from "@jest/types"', () => {
     expect(globalConfig.verbose).toBe(true);
   });
 
-  test('throws if type errors are encountered', () => {
+  testIfTsLoader('throws if type errors are encountered', () => {
     writeFiles(DIR, {
       '__tests__/dummy.test.js': "test('dummy', () => expect(123).toBe(123));",
       'jest.config.ts': `
@@ -247,24 +251,27 @@ describe('when `Config` type is imported from "@jest/types"', () => {
     expect(globalConfig.verbose).toBe(true);
   });
 
-  test('throws if type errors are encountered when package.json#type=module', () => {
-    writeFiles(DIR, {
-      '__tests__/dummy.test.js': "test('dummy', () => expect(12).toBe(12));",
-      'jest.config.ts': `
+  testIfTsLoader(
+    'throws if type errors are encountered when package.json#type=module',
+    () => {
+      writeFiles(DIR, {
+        '__tests__/dummy.test.js': "test('dummy', () => expect(12).toBe(12));",
+        'jest.config.ts': `
           import type {Config} from '@jest/types';
           const config: Config.InitialOptions = {testTimeout: '10000'};
           export default config;
           `,
-      'package.json': '{"type": "module"}',
-    });
+        'package.json': '{"type": "module"}',
+      });
 
-    const {stderr, exitCode} = runJest(DIR);
+      const {stderr, exitCode} = runJest(DIR);
 
-    expect(stderr).toMatch(
-      "jest.config.ts(2,40): error TS2322: Type 'string' is not assignable to type 'number'.",
-    );
-    expect(exitCode).toBe(1);
-  });
+      expect(stderr).toMatch(
+        "jest.config.ts(2,40): error TS2322: Type 'string' is not assignable to type 'number'.",
+      );
+      expect(exitCode).toBe(1);
+    },
+  );
 
   test('throws if syntax errors are encountered when package.json#type=module', () => {
     writeFiles(DIR, {
@@ -403,7 +410,7 @@ describe('when `Config` type is imported from "jest"', () => {
     expect(globalConfig.verbose).toBe(true);
   });
 
-  test('throws if type errors are encountered', () => {
+  testIfTsLoader('throws if type errors are encountered', () => {
     writeFiles(DIR, {
       '__tests__/dummy.test.js': "test('dummy', () => expect(123).toBe(123));",
       'jest.config.ts': `
@@ -557,24 +564,27 @@ describe('when `Config` type is imported from "jest"', () => {
     expect(globalConfig.verbose).toBe(true);
   });
 
-  test('throws if type errors are encountered when package.json#type=module', () => {
-    writeFiles(DIR, {
-      '__tests__/dummy.test.js': "test('dummy', () => expect(12).toBe(12));",
-      'jest.config.ts': `
+  testIfTsLoader(
+    'throws if type errors are encountered when package.json#type=module',
+    () => {
+      writeFiles(DIR, {
+        '__tests__/dummy.test.js': "test('dummy', () => expect(12).toBe(12));",
+        'jest.config.ts': `
           import type {Config} from 'jest';
           const config: Config = {testTimeout: '10000'};
           export default config;
           `,
-      'package.json': '{"type": "module"}',
-    });
+        'package.json': '{"type": "module"}',
+      });
 
-    const {stderr, exitCode} = runJest(DIR);
+      const {stderr, exitCode} = runJest(DIR);
 
-    expect(stderr).toMatch(
-      "jest.config.ts(2,25): error TS2322: Type 'string' is not assignable to type 'number'.",
-    );
-    expect(exitCode).toBe(1);
-  });
+      expect(stderr).toMatch(
+        "jest.config.ts(2,25): error TS2322: Type 'string' is not assignable to type 'number'.",
+      );
+      expect(exitCode).toBe(1);
+    },
+  );
 
   test('throws if syntax errors are encountered when package.json#type=module', () => {
     writeFiles(DIR, {
diff --git a/e2e/__tests__/typescriptConfigFile.test.ts b/e2e/__tests__/typescriptConfigFile.test.ts
@@ -7,13 +7,11 @@
 
 import {tmpdir} from 'os';
 import * as path from 'path';
-import * as semver from 'semver';
 import {onNodeVersions} from '@jest/test-utils';
 import {cleanup, writeFiles} from '../Utils';
-import runJest, {getConfig} from '../runJest';
+import runJest, {getConfig, useNativeTypeScript} from '../runJest';
 
 const DIR = path.resolve(tmpdir(), 'typescript-config-file');
-const useNativeTypeScript = semver.satisfies(process.versions.node, '>=23.6.0');
 const importFileExtension = useNativeTypeScript ? '.ts' : '';
 
 beforeEach(() => cleanup(DIR));
diff --git a/e2e/custom-reporters/reporters/AssertionCountsReporter.js b/e2e/custom-reporters/reporters/AssertionCountsReporter.js
@@ -18,12 +18,11 @@ class AssertionCountsReporter {
     }
   }
   onTestCaseResult(test, testCaseResult) {
-    const difference = new Date(
-      Date.now() - testCaseResult.startedAt,
-    ).getDate();
+    const difference = Date.now() - testCaseResult.startedAt;
+    const sameDay = difference >= 0 && difference < 24 * 60 * 60 * 1000;
     console.log(
       `onTestCaseResult: ${testCaseResult.title}, ` +
-        `started: ${difference === 1 ? 'today' : 'invalid'}, ` +
+        `started: ${sameDay ? 'today' : 'invalid'}, ` +
         `status: ${testCaseResult.status}, ` +
         `numExpectations: ${testCaseResult.numPassingAsserts}`,
     );
diff --git a/e2e/runJest.ts b/e2e/runJest.ts
@@ -12,12 +12,18 @@ import {stripVTControlCharacters as stripAnsi} from 'util';
 import dedent from 'dedent';
 import execa from 'execa';
 import * as fs from 'graceful-fs';
+import * as semver from 'semver';
 import {TestPathPatterns} from '@jest/pattern';
 import type {FormattedTestResults} from '@jest/test-result';
 import {normalizeIcons} from '@jest/test-utils';
 import type {Config} from '@jest/types';
 import {ErrorWithStack} from 'jest-util';
 
+export const useNativeTypeScript = semver.satisfies(
+  process.versions.node,
+  '^22.18.0 || >=23.6.0',
+);
+
 const JEST_PATH = path.resolve(__dirname, '../packages/jest-cli/bin/jest.js');
 
 type RunJestOptions = {
diff --git a/examples/angular/package.json b/examples/angular/package.json
@@ -15,7 +15,7 @@
     "core-js": "^3.2.1",
     "rxjs": "^7.8.2",
     "tslib": "^2.0.0",
-    "typescript": "^5.0.4",
+    "typescript": "^5.8.3",
     "zone.js": "~0.11.8"
   },
   "devDependencies": {
diff --git a/examples/expect-extend/package.json b/examples/expect-extend/package.json
@@ -10,7 +10,7 @@
     "babel-jest": "workspace:*",
     "expect": "workspace:*",
     "jest": "workspace:*",
-    "typescript": "^5.0.4"
+    "typescript": "^5.8.3"
   },
   "scripts": {
     "test": "jest"
diff --git a/examples/typescript/package.json b/examples/typescript/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.8.3"
   },
   "devDependencies": {
     "@babel/core": "^7.27.4",
diff --git a/package.json b/package.json
@@ -79,8 +79,8 @@
     "tempy": "^1.0.1",
     "ts-node": "^10.5.0",
     "tstyche": "^4.0.0",
-    "typescript": "^5.0.4",
-    "typescript-eslint": "^8.33.1",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.38.0",
     "webpack": "^5.68.0",
     "webpack-node-externals": "^3.0.0",
     "which": "^4.0.0"
diff --git a/packages/expect/src/types.ts b/packages/expect/src/types.ts
@@ -209,6 +209,7 @@ export interface Matchers<R extends void | Promise<void>, T = unknown> {
   /**
    * Used when you want to check that an item is in a list.
    * For testing the items in the list, this uses `===`, a strict equality check.
+   * `.toContain` can also check whether a string is a substring of another string.
    */
   toContain(expected: unknown): R;
   /**
diff --git a/packages/jest-circus/src/utils.ts b/packages/jest-circus/src/utils.ts
@@ -439,7 +439,9 @@ const _getError = (
 };
 
 const getErrorStack = (error: Error): string =>
-  typeof error.stack === 'string' ? error.stack : error.message;
+  typeof error.stack === 'string' && error.stack !== ''
+    ? error.stack
+    : error.message;
 
 export const addErrorToEachTestUnderDescribe = (
   describeBlock: Circus.DescribeBlock,
diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json
@@ -68,7 +68,7 @@
     "esbuild-register": "^3.6.0",
     "semver": "^7.7.2",
     "ts-node": "^10.5.0",
-    "typescript": "^5.0.4"
+    "typescript": "^5.8.3"
   },
   "engines": {
     "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
diff --git a/packages/jest-get-type/src/index.ts b/packages/jest-get-type/src/index.ts
@@ -58,4 +58,7 @@ export function getType(value: unknown): ValueType {
   throw new Error(`value of unknown type: ${value}`);
 }
 
-export const isPrimitive = (value: unknown): boolean => Object(value) !== value;
+export const isPrimitive = (
+  value: unknown,
+): value is null | undefined | string | number | boolean | symbol | bigint =>
+  Object(value) !== value;
diff --git a/packages/jest-message-util/src/index.ts b/packages/jest-message-util/src/index.ts
@@ -463,18 +463,12 @@ export const formatResultsErrors = (
   options: StackTraceOptions,
   testPath?: string,
 ): string | null => {
-  const failedResults: FailedResults = testResults.reduce<FailedResults>(
-    (errors, result) => {
-      for (const [index, item] of result.failureMessages.entries()) {
-        errors.push({
-          content: item,
-          failureDetails: result.failureDetails[index],
-          result,
-        });
-      }
-      return errors;
-    },
-    [],
+  const failedResults: FailedResults = testResults.flatMap(result =>
+    result.failureMessages.map((item, index) => ({
+      content: item,
+      failureDetails: result.failureDetails[index],
+      result,
+    }))
   );
 
   if (failedResults.length === 0) {
diff --git a/website/blog/2022-04-25-jest-28.md b/website/blog/2022-04-25-jest-28.md
@@ -11,7 +11,7 @@ Additionally, as announced in the [Jest 27 blog post](/blog/2021/05/25/jest-27)
 
 ## Breaking changes
 
-The list of breaking changes is long (and can be seen fully in the [changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md#2800)), but for migration purposes, we've also written [a guide](/docs/28.x/upgrading-to-jest28) you can follow. Hopefully this makes the upgrade experience as frictionless as possible!
+The list of breaking changes is long (and can be seen fully in the [changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md#2800)), but for migration purposes, we've also written [a guide](https://jest-archive-august-2023.netlify.app/docs/28.x/upgrading-to-jest28/) you can follow. Hopefully this makes the upgrade experience as frictionless as possible!
 
 Main breaking changes likely to impact your migration are dropped support for Node 10 and 15 (but _not_ Node 12, which will be EOL in a few days) and some renamed configuration options.
 
diff --git a/website/blog/2022-08-25-jest-29.md b/website/blog/2022-08-25-jest-29.md
@@ -21,7 +21,7 @@ The only breaking changes that should be noticeable are:
 
 - `jest-environment-jsdom` has upgraded `jsdom` from v19 to v20
 
-There are certain changes to the types exposed by Jest, but probably (hopefully!) nothing that should impede the upgrade. Please see the [upgrade guide](/docs/upgrading-to-jest29) for more details.
+There are certain changes to the types exposed by Jest, but probably (hopefully!) nothing that should impede the upgrade. Please see the [upgrade guide](https://jest-archive-august-2023.netlify.app/docs/upgrading-to-jest29) for more details.
 
 That's it for breaking changes! Hopefully this means the upgrade path from Jest 28 is smooth. Please see the [changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md#2900) for other changes.
 
diff --git a/website/package.json b/website/package.json
@@ -55,6 +55,6 @@
     "graphql": "^16.11.0",
     "graphql-request": "^6.1.0",
     "js-yaml": "^4.1.0",
-    "typescript": "^5.0.4"
+    "typescript": "^5.8.3"
   }
 }
diff --git a/yarn.lock b/yarn.lock
