diff --git a/package.json b/package.json index 3739905da1b..6ab7b64d2e1 100644 --- a/package.json +++ b/package.json @@ -171,6 +171,7 @@ "typescript": "5.6.2", "vite": "^4.5.3", "vite-tsconfig-paths": "^4.3.2", + "vitest": "^1.3.1", "yargs": "^17.3.0" }, "optionalDependencies": { diff --git a/packages/@sanity/migrate/package.json b/packages/@sanity/migrate/package.json index dd45af09d3d..c6b5416f026 100644 --- a/packages/@sanity/migrate/package.json +++ b/packages/@sanity/migrate/package.json @@ -65,8 +65,7 @@ "@repo/package.config": "workspace:*", "@types/arrify": "^2.0.1", "@types/debug": "^4.1.12", - "rimraf": "^3.0.2", - "vitest": "^1.3.1" + "rimraf": "^3.0.2" }, "engines": { "node": ">=18" diff --git a/packages/@sanity/migrate/src/fetch-utils/__test__/assert2xx.test.ts b/packages/@sanity/migrate/src/fetch-utils/__test__/assert2xx.test.ts index 8397f2cd1ab..804a5998ddb 100644 --- a/packages/@sanity/migrate/src/fetch-utils/__test__/assert2xx.test.ts +++ b/packages/@sanity/migrate/src/fetch-utils/__test__/assert2xx.test.ts @@ -1,4 +1,4 @@ -import {expect, test} from '@jest/globals' +import {expect, test} from 'vitest' import {assert2xx} from '../fetchStream' @@ -25,10 +25,12 @@ test('server responds with 4xx and error response', () => { message: 'More details', }), } - expect(assert2xx(mockResponse as unknown as Response)).rejects.toThrowError({ - statusCode: 400, - message: 'Error message: More details', - }) + expect(assert2xx(mockResponse as unknown as Response)).rejects.toThrowError( + expect.objectContaining({ + statusCode: 400, + message: 'Error message: More details', + }), + ) }) test('server responds with 5xx and no json response', () => { @@ -37,10 +39,12 @@ test('server responds with 5xx and no json response', () => { statusText: 'Internal Server Error', json: () => Promise.reject(new Error('Failed to parse JSON')), } - expect(assert2xx(mockResponse as unknown as Response)).rejects.toThrowError({ - statusCode: 500, - message: 'HTTP Error 500: Internal Server Error', - }) + expect(assert2xx(mockResponse as unknown as Response)).rejects.toThrowError( + expect.objectContaining({ + statusCode: 500, + message: 'HTTP Error 500: Internal Server Error', + }), + ) }) test('server responds with 5xx and json response', () => { @@ -56,8 +60,10 @@ test('server responds with 5xx and json response', () => { status: 500, }), } - expect(assert2xx(mockResponse as unknown as Response)).rejects.toThrowError({ - statusCode: 500, - message: 'validationError: Document is not of valid type', - }) + expect(assert2xx(mockResponse as unknown as Response)).rejects.toThrowError( + expect.objectContaining({ + statusCode: 500, + message: 'validationError: Document is not of valid type', + }), + ) }) diff --git a/packages/@sanity/migrate/src/it-utils/__test__/decodeText.test.ts b/packages/@sanity/migrate/src/it-utils/__test__/decodeText.test.ts index 2e02bddd375..637ae8373fa 100644 --- a/packages/@sanity/migrate/src/it-utils/__test__/decodeText.test.ts +++ b/packages/@sanity/migrate/src/it-utils/__test__/decodeText.test.ts @@ -1,4 +1,4 @@ -import {expect, test} from '@jest/globals' +import {expect, test} from 'vitest' import {decodeText} from '../decodeText' import {toArray} from '../toArray' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4f3f4e30068..dbd613d47f8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -234,6 +234,9 @@ importers: vite-tsconfig-paths: specifier: ^4.3.2 version: 4.3.2(typescript@5.6.2)(vite@4.5.3(@types/node@18.19.44)(terser@5.32.0)) + vitest: + specifier: ^1.3.1 + version: 1.6.0(@types/node@18.19.44)(jsdom@23.2.0)(terser@5.32.0) yargs: specifier: ^17.3.0 version: 17.7.2 @@ -1084,9 +1087,6 @@ importers: rimraf: specifier: ^3.0.2 version: 3.0.2 - vitest: - specifier: ^1.3.1 - version: 1.6.0(@types/node@22.5.4)(jsdom@23.2.0)(terser@5.32.0) packages/@sanity/mutator: dependencies: @@ -24023,13 +24023,13 @@ snapshots: vary@1.1.2: {} - vite-node@1.6.0(@types/node@22.5.4)(terser@5.32.0): + vite-node@1.6.0(@types/node@18.19.44)(terser@5.32.0): dependencies: cac: 6.7.14 debug: 4.3.7(supports-color@9.4.0) pathe: 1.1.2 picocolors: 1.1.0 - vite: 5.4.5(@types/node@22.5.4)(terser@5.32.0) + vite: 5.4.5(@types/node@18.19.44)(terser@5.32.0) transitivePeerDependencies: - '@types/node' - less @@ -24092,7 +24092,7 @@ snapshots: fsevents: 2.3.3 terser: 5.32.0 - vitest@1.6.0(@types/node@22.5.4)(jsdom@23.2.0)(terser@5.32.0): + vitest@1.6.0(@types/node@18.19.44)(jsdom@23.2.0)(terser@5.32.0): dependencies: '@vitest/expect': 1.6.0 '@vitest/runner': 1.6.0 @@ -24111,11 +24111,11 @@ snapshots: strip-literal: 2.1.0 tinybench: 2.9.0 tinypool: 0.8.4 - vite: 5.4.5(@types/node@22.5.4)(terser@5.32.0) - vite-node: 1.6.0(@types/node@22.5.4)(terser@5.32.0) + vite: 5.4.5(@types/node@18.19.44)(terser@5.32.0) + vite-node: 1.6.0(@types/node@18.19.44)(terser@5.32.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.5.4 + '@types/node': 18.19.44 jsdom: 23.2.0 transitivePeerDependencies: - less