Switch to @jest/globals (#532)

.github/dependabot.yaml

@@ -9,6 +9,11 @@ updates:
       interval: 'daily'
     labels:
       - 'dependencies'
+    groups:
+      jest:
+        patterns:
+          - 'jest'
+          - '@jest/globals'
 
   - package-ecosystem: 'github-actions'
     directory: '/'

eslint.config.mjs

@@ -133,11 +133,12 @@ export default typescriptEslint.config(
       'jest/no-duplicate-hooks': 'error',
       'jest/no-test-return-statement': 'error',
       'jest/no-untyped-mock-factory': 'error',
-      'jest/prefer-called-with': 'warn',
+      'jest/prefer-called-with': 'error',
       'jest/prefer-comparison-matcher': 'warn',
       'jest/prefer-equality-matcher': 'warn',
       'jest/prefer-expect-resolves': 'warn',
       'jest/prefer-hooks-on-top': 'warn',
+      'jest/prefer-importing-jest-globals': 'error',
       'jest/prefer-mock-promise-shorthand': 'error',
       'jest/prefer-spy-on': 'warn',
       'jest/prefer-strict-equal': 'warn',

global.d.ts

@@ -1 +1,9 @@
-import 'jest-extended';
+import type CustomMatchers from 'jest-extended';
+
+declare module 'expect' {
+  // eslint-disable-next-line @typescript-eslint/no-empty-interface -- needed for declaration merging
+  interface AsymmetricMatchers extends CustomMatchers {}
+
+  // eslint-disable-next-line @typescript-eslint/no-empty-interface -- needed for declaration merging
+  interface Matchers<R> extends CustomMatchers<R> {}
+}

package.json

@@ -44,7 +44,7 @@
   "homepage": "https://github.com/FloEdelmann/vue-ts-types",
   "devDependencies": {
     "@eslint/js": "^9.0.0",
-    "@types/jest": "^29.5.12",
+    "@jest/globals": "^29.7.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jest": "^28.2.0",

tests/prop-types/any.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { anyProp } from '../../src/prop-types/any';
 
 describe('anyProp().optional', () => {

tests/prop-types/array.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { arrayProp } from '../../src/prop-types/array';
 
 describe('arrayProp().optional', () => {

tests/prop-types/boolean.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { booleanProp } from '../../src/prop-types/boolean';
 
 describe('booleanProp().optional', () => {

tests/prop-types/function.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { functionProp } from '../../src/prop-types/function';
 
 describe('functionProp().optional', () => {

tests/prop-types/instanceOf.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { instanceOfProp } from '../../src/prop-types/instanceOf';
 
 class User {}

tests/prop-types/integer.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { integerProp } from '../../src/prop-types/integer';
 
 describe('integerProp().optional', () => {

tests/prop-types/number.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { numberProp } from '../../src/prop-types/number';
 
 describe('numberProp().optional', () => {

tests/prop-types/object.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { objectProp } from '../../src/prop-types/object';
 
 describe('objectProp().optional', () => {

tests/prop-types/oneOf.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { oneOfProp } from '../../src/prop-types/oneOf';
 
 describe('oneOfProp().optional', () => {

tests/prop-types/oneOfObjectKeys.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { oneOfObjectKeysProp } from '../../src/prop-types/oneOfObjectKeys';
 
 const options = { a: 'a', b: 'b', c: 'c' };

tests/prop-types/oneOfTypes.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { oneOfTypesProp } from '../../src/prop-types/oneOfTypes';
 
 describe('oneOfTypesProp().optional', () => {

tests/prop-types/string.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { stringProp } from '../../src/prop-types/string';
 
 describe('stringProp().optional', () => {

tests/prop-types/symbol.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { symbolProp } from '../../src/prop-types/symbol';
 
 describe('symbolProp().optional', () => {

tests/prop-types/vueComponent.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { vueComponentProp } from '../../src/prop-types/vueComponent';
 
 describe('vueComponentProp().optional', () => {

tests/validators/index.spec.ts

@@ -1,12 +1,17 @@
+import { describe, expect, it, jest } from '@jest/globals';
 import { vuePropValidator } from '../../src/validators';
 
 describe('vuePropValidator', () => {
-  const validator1 = jest.fn();
-  const validator2 = jest.fn();
-  const validator3 = jest.fn().mockReturnValue('some error message');
-  const validator4 = jest.fn();
+  const validator1 = jest.fn<() => string | undefined>();
+  const validator2 = jest.fn<() => string | undefined>();
+  const validator3 = jest
+    .fn<() => string | undefined>()
+    .mockReturnValue('some error message');
+  const validator4 = jest.fn<() => string | undefined>();
 
-  const warnSpy = jest.spyOn(console, 'warn').mockImplementation();
+  const warnSpy = jest
+    .spyOn(console, 'warn')
+    .mockImplementation(() => undefined);
 
   it('returns undefined if no validator is passed', () => {
     expect(vuePropValidator()).toBeUndefined();

tests/validators/isInstanceOf.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { isInstanceOf } from '../../src/validators/isInstanceOf';
 
 describe('isInstanceOf', () => {

tests/validators/isInteger.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { isInteger } from '../../src/validators/isInteger';
 
 describe('isInteger', () => {

tests/validators/isNegative.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { isNegative } from '../../src/validators/isNegative';
 
 describe('isNegative', () => {

tests/validators/isNonNegative.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { isNonNegative } from '../../src/validators/isNonNegative';
 
 describe('isNonNegative', () => {

tests/validators/isNonPositive.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { isNonPositive } from '../../src/validators/isNonPositive';
 
 describe('isNonPositive', () => {

tests/validators/isOneOf.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { isOneOf } from '../../src/validators/isOneOf';
 
 describe('isOneOf', () => {

tests/validators/isPositive.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { isPositive } from '../../src/validators/isPositive';
 
 describe('isPositive', () => {

tests/validators/isSymbol.spec.ts

@@ -1,3 +1,4 @@
+import { describe, expect, it } from '@jest/globals';
 import { isSymbol } from '../../src/validators/isSymbol';
 
 describe('isSymbol', () => {