internal: Jest prep (#3509)

ntucker · renovate[bot] · web-flow · commit 5979fa4d450b · 2025-06-15T09:04:49.000-04:00
* pkg: Update validation packages to v30

* internal: jest 30 upgrades

* internal: Revert jest package updates

---------

Co-authored-by: renovate[bot] &lt;29139614+renovate[bot]@users.noreply.github.com&gt;
diff --git a/package.json b/package.json
@@ -89,8 +89,8 @@
     "eslint": "9.28.0",
     "globals": "^16.0.0",
     "ignore-styles": "^5.0.1",
-    "jest": "29.7.0",
-    "jest-environment-jsdom": "29.7.0",
+    "jest": "^29",
+    "jest-environment-jsdom": "^29",
     "mkdirp": "^3.0.0",
     "nock": "13.3.1",
     "node-fetch": "^3.3.0",
diff --git a/packages/core/src/manager/__tests__/pollingSubscription.ts b/packages/core/src/manager/__tests__/pollingSubscription.ts
@@ -1,5 +1,5 @@
 import { Endpoint } from '@data-client/endpoint';
-import { Article, PollingArticleResource } from '__tests__/new';
+import { Article } from '__tests__/new';
 
 import { createSubscription } from '../../controller/actions/createSubscription';
 import Controller from '../../controller/Controller';
@@ -284,13 +284,13 @@ describe('PollingSubscription', () => {
     });
 
     describe('cleanup()', () => {
-      let warnSpy: jest.SpyInstance;
+      let warnSpy: jest.Spied<typeof console.warn>;
       afterEach(() => {
         warnSpy.mockRestore();
       });
-      beforeEach(() =>
-        (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {}),
-      );
+      beforeEach(() => {
+        (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {});
+      });
 
       it('should stop all timers', () => {
         dispatch.mockClear();
diff --git a/packages/core/src/state/__tests__/reducer.ts b/packages/core/src/state/__tests__/reducer.ts
@@ -638,7 +638,7 @@ describe('reducer', () => {
     expect(newState).toBe(iniState);
   });
   describe('RESET', () => {
-    let warnspy: jest.SpyInstance;
+    let warnspy: jest.Spied<any>;
     beforeEach(() => {
       warnspy = jest.spyOn(global.console, 'warn').mockImplementation(() => {});
     });
diff --git a/packages/endpoint/src/__tests__/endpoint.ts b/packages/endpoint/src/__tests__/endpoint.ts
@@ -79,13 +79,13 @@ describe.each([true, false])(`Endpoint (CSP %s)`, mockCSP => {
   });
 
   describe('Function', () => {
-    let errorSpy: jest.SpyInstance;
+    let errorSpy: jest.Spied<typeof console.error>;
     afterEach(() => {
       errorSpy.mockRestore();
     });
-    beforeEach(
-      () => (errorSpy = jest.spyOn(console, 'error').mockImplementation()),
-    );
+    beforeEach(() => {
+      errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {}); // Suppress console.error
+    });
 
     it('should work when called as function', async () => {
       const UserDetail = new Endpoint(fetchUsers);
diff --git a/packages/endpoint/src/__tests__/validateRequired.test.ts b/packages/endpoint/src/__tests__/validateRequired.test.ts
@@ -1,12 +1,13 @@
 // eslint-env jest
+import { jest, describe, beforeAll, afterAll, it, expect } from '@jest/globals';
 import { Temporal } from '@js-temporal/polyfill';
 import { IDEntity } from '__tests__/new';
 
 import SimpleMemoCache from '../schemas/__tests__/denormalize';
 import Entity from '../schemas/Entity';
 import validateRequired from '../validateRequired';
 
-let dateSpy: jest.SpyInstance;
+let dateSpy: jest.Spied<any>;
 beforeAll(() => {
   dateSpy = jest
 
diff --git a/packages/endpoint/src/schemas/__tests__/All.test.ts b/packages/endpoint/src/schemas/__tests__/All.test.ts
@@ -1,4 +1,3 @@
-// eslint-env jest
 import { initialState, State, Controller } from '@data-client/core';
 import {
   normalize,
@@ -16,7 +15,7 @@ import { IDEntity } from '__tests__/new';
 import { schema } from '../..';
 import { fromJSState } from './denormalize';
 
-let dateSpy: jest.SpyInstance<number, []>;
+let dateSpy: jest.Spied<typeof Date.now>;
 beforeAll(() => {
   dateSpy = jest
 
diff --git a/packages/endpoint/src/schemas/__tests__/Collection.test.ts b/packages/endpoint/src/schemas/__tests__/Collection.test.ts
@@ -9,7 +9,7 @@ import { PolymorphicInterface } from '../..';
 import { schema } from '../..';
 import PolymorphicSchema from '../Polymorphic';
 
-let dateSpy: jest.SpyInstance;
+let dateSpy: jest.Spied<any>;
 beforeAll(() => {
   dateSpy = jest
     .spyOn(global.Date, 'now')
@@ -91,13 +91,13 @@ test('key works with custom schema', () => {
 });
 
 describe(`${schema.Collection.name} normalization`, () => {
-  let warnSpy: jest.SpyInstance;
+  let warnSpy: jest.Spied<typeof console.warn>;
   afterEach(() => {
     warnSpy.mockRestore();
   });
-  beforeEach(() =>
-    (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {}),
-  );
+  beforeEach(() => {
+    (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {});
+  });
 
   test('should throw a custom error if data loads with string unexpected value', () => {
     function normalizeBad() {
diff --git a/packages/endpoint/src/schemas/__tests__/Entity.test.ts b/packages/endpoint/src/schemas/__tests__/Entity.test.ts
@@ -1,4 +1,3 @@
-// eslint-env jest
 import { normalize, INVALID } from '@data-client/normalizr';
 import { denormalize as plainDenormalize } from '@data-client/normalizr';
 import { denormalize as immDenormalize } from '@data-client/normalizr/imm';
@@ -10,7 +9,7 @@ import { AbstractInstanceType } from '../../';
 import { schema } from '../../';
 import Entity from '../Entity';
 
-let dateSpy: jest.SpyInstance;
+let dateSpy: jest.Spied<any>;
 beforeAll(() => {
   dateSpy = jest
 
@@ -49,13 +48,13 @@ class WithOptional extends Entity {
 }
 
 describe(`${Entity.name} normalization`, () => {
-  let warnSpy: jest.SpyInstance;
+  let warnSpy: jest.Spied<typeof console.warn>;
   afterEach(() => {
     warnSpy.mockRestore();
   });
-  beforeEach(() =>
-    (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {}),
-  );
+  beforeEach(() => {
+    (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {});
+  });
 
   test('normalizes an entity', () => {
     class MyEntity extends Entity {}
diff --git a/packages/endpoint/src/schemas/__tests__/EntityMixin.test.ts b/packages/endpoint/src/schemas/__tests__/EntityMixin.test.ts
@@ -7,7 +7,7 @@ import { Temporal } from '@js-temporal/polyfill';
 import { SimpleMemoCache, fromJSEntities } from './denormalize';
 import { schema, EntityMixin } from '../..';
 
-let dateSpy: jest.SpyInstance;
+let dateSpy: jest.Spied<any>;
 beforeAll(() => {
   dateSpy = jest
 
@@ -299,13 +299,13 @@ describe(`${schema.Entity.name} construction`, () => {
 });
 
 describe(`${schema.Entity.name} normalization`, () => {
-  let warnSpy: jest.SpyInstance;
+  let warnSpy: jest.Spied<typeof console.warn>;
   afterEach(() => {
     warnSpy.mockRestore();
   });
-  beforeEach(() =>
-    (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {}),
-  );
+  beforeEach(() => {
+    warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
+  });
 
   test('normalizes an entity', () => {
     class MyEntity extends EntityMixin(IDData) {}
diff --git a/packages/endpoint/src/schemas/__tests__/Invalidate.test.ts b/packages/endpoint/src/schemas/__tests__/Invalidate.test.ts
@@ -13,7 +13,7 @@ import SimpleMemoCache, { fromJSEntities } from './denormalize';
 import { schema } from '../..';
 import Entity from '../Entity';
 
-let dateSpy: jest.SpyInstance;
+let dateSpy: jest.Spied<any>;
 beforeAll(() => {
   dateSpy = jest
     .spyOn(global.Date, 'now')
diff --git a/packages/endpoint/src/schemas/__tests__/Query.test.ts b/packages/endpoint/src/schemas/__tests__/Query.test.ts
@@ -10,10 +10,9 @@ import { schema, DenormalizeNullable } from '../..';
 
 const { initialState } = __INTERNAL__;
 
-let dateSpy: jest.SpyInstance<number, []>;
+let dateSpy: jest.Spied<typeof global.Date.now>;
 beforeAll(() => {
   dateSpy = jest
-
     .spyOn(global.Date, 'now')
     .mockImplementation(() => new Date('2019-05-14T11:01:58.135Z').valueOf());
 });
diff --git a/packages/endpoint/src/schemas/__tests__/Union.test.js b/packages/endpoint/src/schemas/__tests__/Union.test.js
@@ -23,9 +23,9 @@ let warnSpy;
 afterEach(() => {
   warnSpy.mockRestore();
 });
-beforeEach(() =>
-  (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {}),
-);
+beforeEach(() => {
+  (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {});
+});
 
 describe(`${schema.Union.name} normalization`, () => {
   test('throws if not given a schemaAttribute', () => {
diff --git a/packages/endpoint/src/schemas/__tests__/Values.test.js b/packages/endpoint/src/schemas/__tests__/Values.test.js
@@ -34,9 +34,9 @@ describe(`${schema.Values.name} normalization`, () => {
   afterEach(() => {
     warnSpy.mockRestore();
   });
-  beforeEach(() =>
-    (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {}),
-  );
+  beforeEach(() => {
+    (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {});
+  });
 
   test('normalizes without schemaAttribute', () => {
     class MyEntity extends IDEntity {
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -202,7 +202,7 @@
     "@types/qs": "^6",
     "@types/react": "19.1.8",
     "@types/react-dom": "*",
-    "jest-mock": "^29.7.0",
+    "jest-mock": "^29",
     "nock": "13.3.1",
     "qs": "^6.13.1",
     "react": "19.1.0",
diff --git a/packages/react/src/__tests__/endpoint-types.web.tsx b/packages/react/src/__tests__/endpoint-types.web.tsx
@@ -72,13 +72,13 @@ describe('endpoint types', () => {
       nock.cleanAll();
     });
 
-    let errorSpy: jest.SpyInstance;
+    let errorSpy: jest.Spied<typeof console.error>;
     afterEach(() => {
       errorSpy.mockRestore();
     });
-    beforeEach(
-      () => (errorSpy = jest.spyOn(console, 'error').mockImplementation()),
-    );
+    beforeEach(() => {
+      errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {}); // Suppress console.error
+    });
 
     it('should pass with exact params', async () => {
       const { result, waitForNextUpdate } = renderDataClient(() => {
diff --git a/packages/react/src/__tests__/integration-endpoint.web.tsx b/packages/react/src/__tests__/integration-endpoint.web.tsx
@@ -36,7 +36,7 @@ import {
   editorPayload,
 } from '../test-fixtures';
 
-let errorspy: jest.SpyInstance;
+let errorspy: jest.Spied<any>;
 beforeEach(() => {
   errorspy = jest.spyOn(global.console, 'error').mockImplementation(() => {});
   jest.spyOn(global.console, 'warn').mockImplementation(() => {});
@@ -198,7 +198,7 @@ describe.each([
   });
 
   describe('renderDataClient()', () => {
-    let warnspy: jest.SpyInstance;
+    let warnspy: jest.Spied<any>;
     beforeEach(() => {
       warnspy = jest.spyOn(global.console, 'warn').mockImplementation(() => {});
     });
@@ -575,7 +575,7 @@ describe.each([
 
     await expect(
       result.current(CoolerArticleResource.get, { id: 666 }),
-    ).rejects.toThrowError('Unexpected end of JSON input');
+    ).rejects.toThrow('Unexpected end of JSON input');
   });
 
   it.each([
diff --git a/packages/react/src/__tests__/integration-optimistic-endpoint.web.tsx b/packages/react/src/__tests__/integration-optimistic-endpoint.web.tsx
@@ -11,7 +11,6 @@ import {
   Article,
   VisSettingsResourceFromMixin,
 } from '__tests__/new';
-import { SpyInstance } from 'jest-mock';
 import nock from 'nock';
 import { useContext } from 'react';
 
@@ -739,7 +738,7 @@ describe.each([
     });
 
     describe('race conditions', () => {
-      let errorspy: SpyInstance<typeof global.console.error>;
+      let errorspy: jest.Spied<typeof global.console.error>;
       beforeEach(() => {
         errorspy = jest
           .spyOn(global.console, 'error')
diff --git a/packages/react/src/components/__tests__/backupboundary.node.tsx b/packages/react/src/components/__tests__/backupboundary.node.tsx
@@ -1,12 +1,11 @@
-// eslint-env jest
 import React, { version } from 'react';
 import { renderToString } from 'react-dom/server';
 
 import BackupLoading from '../BackupLoading';
 import UniversalSuspense from '../UniversalSuspense';
 
 describe('<BackupBoundary />', () => {
-  let warnspy: jest.SpyInstance;
+  let warnspy: jest.Spied<any>;
   beforeEach(() => {
     warnspy = jest.spyOn(global.console, 'warn').mockImplementation(() => {});
   });
diff --git a/packages/react/src/components/__tests__/getDefaultManagers.tsx b/packages/react/src/components/__tests__/getDefaultManagers.tsx
@@ -1,4 +1,3 @@
-// eslint-env jest
 import {
   NetworkManager,
   SubscriptionManager,
@@ -8,8 +7,8 @@ import {
 import { getDefaultManagers } from '../getDefaultManagers';
 
 describe('getDefaultManagers()', () => {
-  let warnspy: jest.SpyInstance;
-  let debugspy: jest.SpyInstance;
+  let warnspy: jest.Spied<any>;
+  let debugspy: jest.Spied<any>;
   beforeEach(() => {
     warnspy = jest.spyOn(global.console, 'warn').mockImplementation(() => {});
     debugspy = jest.spyOn(global.console, 'info').mockImplementation(() => {});
@@ -19,13 +18,13 @@ describe('getDefaultManagers()', () => {
     debugspy.mockRestore();
   });
 
-  let errorSpy: jest.SpyInstance;
+  let errorSpy: jest.Spied<typeof console.error>;
   afterEach(() => {
     errorSpy.mockRestore();
   });
-  beforeEach(
-    () => (errorSpy = jest.spyOn(console, 'error').mockImplementation()),
-  );
+  beforeEach(() => {
+    errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {}); // Suppress console.error
+  });
   it('should have SubscriptionManager in default managers', () => {
     const subManagers = getDefaultManagers().find(
       manager => manager instanceof SubscriptionManager,
diff --git a/packages/react/src/components/__tests__/provider.native.tsx b/packages/react/src/components/__tests__/provider.native.tsx
@@ -19,7 +19,7 @@ import DataProvider from '../DataProvider';
 const { SET_RESPONSE } = actionTypes;
 
 describe('<DataProvider />', () => {
-  let warnspy: jest.SpyInstance;
+  let warnspy: jest.Spied<any>;
   beforeEach(() => {
     warnspy = jest.spyOn(global.console, 'warn').mockImplementation(() => {});
   });
diff --git a/packages/react/src/components/__tests__/provider.node.tsx b/packages/react/src/components/__tests__/provider.node.tsx
@@ -5,7 +5,7 @@ import { renderToString } from 'react-dom/server';
 import DataProvider from '../DataProvider';
 
 describe('<DataProvider />', () => {
-  let warnspy: jest.SpyInstance;
+  let warnspy: jest.Spied<any>;
   beforeEach(() => {
     warnspy = jest.spyOn(global.console, 'warn').mockImplementation(() => {});
   });
diff --git a/packages/react/src/components/__tests__/provider.tsx b/packages/react/src/components/__tests__/provider.tsx
@@ -17,8 +17,8 @@ import DataProvider from '../DataProvider';
 import { getDefaultManagers } from '../getDefaultManagers';
 
 describe('<DataProvider />', () => {
-  let warnspy: jest.SpyInstance;
-  let debugspy: jest.SpyInstance;
+  let warnspy: jest.Spied<any>;
+  let debugspy: jest.Spied<any>;
   beforeEach(() => {
     warnspy = jest.spyOn(global.console, 'warn').mockImplementation(() => {});
     debugspy = jest.spyOn(global.console, 'info').mockImplementation(() => {});
diff --git a/packages/react/src/hooks/__tests__/useController/fetch.tsx b/packages/react/src/hooks/__tests__/useController/fetch.tsx
@@ -103,21 +103,21 @@ describe.each([
     renderDataClient = makeRenderDataClient(makeProvider);
   });
 
-  let errorspy: jest.SpyInstance;
+  let errorspy: jest.Spied<any>;
   beforeEach(() => {
     errorspy = jest.spyOn(global.console, 'error').mockImplementation(() => {});
     jest.spyOn(global.console, 'warn').mockImplementation(() => {});
   });
   afterEach(() => {
     errorspy.mockRestore();
   });
-  let warnSpy: jest.SpyInstance;
+  let warnSpy: jest.Spied<typeof console.warn>;
   afterEach(() => {
     warnSpy.mockRestore();
   });
-  beforeEach(() =>
-    (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {}),
-  );
+  beforeEach(() => {
+    (warnSpy = jest.spyOn(console, 'warn')).mockImplementation(() => {});
+  });
 
   it('should fetch', async () => {
     const { result } = renderDataClient(() => {
diff --git a/packages/react/src/hooks/__tests__/useDLE.native.tsx b/packages/react/src/hooks/__tests__/useDLE.native.tsx
diff --git a/packages/react/src/hooks/__tests__/useFetch.native.tsx b/packages/react/src/hooks/__tests__/useFetch.native.tsx
diff --git a/packages/react/src/hooks/__tests__/useFetch.web.tsx b/packages/react/src/hooks/__tests__/useFetch.web.tsx
diff --git a/packages/react/src/hooks/__tests__/useSuspense.native.tsx b/packages/react/src/hooks/__tests__/useSuspense.native.tsx
diff --git a/packages/react/src/hooks/__tests__/useSuspense.web.tsx b/packages/react/src/hooks/__tests__/useSuspense.web.tsx
diff --git a/packages/rest/src/__tests__/createResource.test.ts b/packages/rest/src/__tests__/createResource.test.ts
diff --git a/packages/test/package.json b/packages/test/package.json
diff --git a/packages/test/src/makeRenderDataClient/render18HookWrapped.tsx b/packages/test/src/makeRenderDataClient/render18HookWrapped.tsx
diff --git a/yarn.lock b/yarn.lock
