diff --git a/__tests__/setup/chai.ts b/__tests__/setup/chai.ts index b24141b5..2f005a84 100644 --- a/__tests__/setup/chai.ts +++ b/__tests__/setup/chai.ts @@ -4,6 +4,7 @@ * @see https://chaijs.com */ +import { JestExtend as extend } from '@vitest/expect' import chaiEach from 'chai-each' import chaiQuantifiers from 'chai-quantifiers' import chaiString from 'chai-string' @@ -16,6 +17,7 @@ import { chai } from 'vitest' * @see https://github.com/funny-bytes/chai-quantifiers * @see https://github.com/onechiporenko/chai-string */ +extend(chai, chai.util) chai.use(chaiEach) chai.use(chaiQuantifiers) chai.use(chaiString) diff --git a/package.json b/package.json index fed4f400..2b3117b8 100644 --- a/package.json +++ b/package.json @@ -121,6 +121,7 @@ "@typescript-eslint/parser": "6.2.1", "@vates/toggle-scripts": "1.0.0", "@vitest/coverage-v8": "0.34.1", + "@vitest/expect": "0.34.1", "add-stream": "1.0.0", "chai": "5.0.0-alpha.1", "chai-each": "0.0.1", @@ -171,7 +172,7 @@ "version-bump-prompt": "6.1.0", "vite": "4.4.8", "vite-tsconfig-paths": "4.2.0", - "vitest": "0.33.0", + "vitest": "0.34.1", "vitest-github-actions-reporter": "0.10.0", "yaml-eslint-parser": "1.2.2" }, @@ -185,7 +186,8 @@ }, "resolutions": { "@ardatan/sync-fetch": "larsgw/sync-fetch#head=worker_threads", - "vitest@npm:0.33.0": "patch:vitest@npm%3A0.33.0#patches/vitest+0.33.0.dev.patch" + "chai": "5.0.0-alpha.1", + "vitest@npm:0.34.1": "patch:vitest@npm%3A0.34.1#patches/vitest+0.34.1.dev.patch" }, "engines": { "node": ">=16.20.0", diff --git a/patches/vitest+0.33.0.dev.patch b/patches/vitest+0.34.1.dev.patch similarity index 86% rename from patches/vitest+0.33.0.dev.patch rename to patches/vitest+0.34.1.dev.patch index f258001f..197f7802 100644 --- a/patches/vitest+0.33.0.dev.patch +++ b/patches/vitest+0.34.1.dev.patch @@ -1,5 +1,5 @@ diff --git a/dist/index.d.ts b/dist/index.d.ts -index v0.33.0..v0.33.0 +index v0.34.1..v0.34.1 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -115,6 +115,6 @@ @@ -11,10 +11,10 @@ index v0.33.0..v0.33.0 toBeConstructibleWith: Options['positive'] extends true ? (...args: ConstructorParams) => true : never; - toHaveProperty: (key: K, ...MISMATCH: MismatchArgs, Options['positive']>) => K extends keyof Actual ? ExpectTypeOf : true; + toHaveProperty: (key?: K, ...MISMATCH: MismatchArgs, Options['positive']>) => K extends keyof Actual ? ExpectTypeOf : true; -diff --git a/dist/vendor-cli-api.bf4b62a8.js b/dist/vendor-cli-api.bf4b62a8.js -index v0.33.0..v0.33.0 ---- a/dist/vendor-cli-api.bf4b62a8.js -+++ b/dist/vendor-cli-api.bf4b62a8.js +diff --git a/dist/vendor-node.caa511fc.js b/dist/vendor-node.caa511fc.js +index v0.34.1..v0.34.1 +--- a/dist/vendor-node.caa511fc.js ++++ b/dist/vendor-node.caa511fc.js @@ -11958,3 +11958,2 @@ - const suite = lastSuite; - while (lastSuite !== file && lastSuite.end < index) diff --git a/yarn.lock b/yarn.lock index 99082b9d..4dcbd8a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1432,6 +1432,7 @@ __metadata: "@typescript-eslint/parser": "npm:6.2.1" "@vates/toggle-scripts": "npm:1.0.0" "@vitest/coverage-v8": "npm:0.34.1" + "@vitest/expect": "npm:0.34.1" add-stream: "npm:1.0.0" chai: "npm:5.0.0-alpha.1" chai-each: "npm:0.0.1" @@ -1483,7 +1484,7 @@ __metadata: version-bump-prompt: "npm:6.1.0" vite: "npm:4.4.8" vite-tsconfig-paths: "npm:4.2.0" - vitest: "npm:0.33.0" + vitest: "npm:0.34.1" vitest-github-actions-reporter: "npm:0.10.0" yaml-eslint-parser: "npm:1.2.2" peerDependencies: @@ -2730,56 +2731,56 @@ __metadata: languageName: node linkType: hard -"@vitest/expect@npm:0.33.0": - version: 0.33.0 - resolution: "@vitest/expect@npm:0.33.0" +"@vitest/expect@npm:0.34.1": + version: 0.34.1 + resolution: "@vitest/expect@npm:0.34.1" dependencies: - "@vitest/spy": "npm:0.33.0" - "@vitest/utils": "npm:0.33.0" + "@vitest/spy": "npm:0.34.1" + "@vitest/utils": "npm:0.34.1" chai: "npm:^4.3.7" - checksum: d205fc2d4c05fba1c90575f3cef8f98f43a8e64873ab31a6d78a89101a4a70735aa5c5cbaa40e99615e82b194c6ebd26e90b8fbf350c4dee510bf413e9c06adf + checksum: 9b05aa671c37f5f27bcd6e703a0d5385f7170251f310207a3c1019aed5cba14e1cea3741ad3125f4fcfa2be0bda01626643cb49596e00bf8932a0eb36af298a9 languageName: node linkType: hard -"@vitest/runner@npm:0.33.0": - version: 0.33.0 - resolution: "@vitest/runner@npm:0.33.0" +"@vitest/runner@npm:0.34.1": + version: 0.34.1 + resolution: "@vitest/runner@npm:0.34.1" dependencies: - "@vitest/utils": "npm:0.33.0" + "@vitest/utils": "npm:0.34.1" p-limit: "npm:^4.0.0" pathe: "npm:^1.1.1" - checksum: b5e38a298eb0f52dfc1d145e0078cb29738a0e6ed49d281b009ac68e696bd41cd0225b467a1606efcdfca16c9a903065935e1dda34e495b8f6eddcb5821936ba + checksum: a5f3e37c8edfe3ee6e65df203dd5c11a820b5a3936217fd92920f5b85f6c4cad5e2c453142e49bf152b80761b2f6ab68b8eadb1477cee5617c08d31a8f0bf197 languageName: node linkType: hard -"@vitest/snapshot@npm:0.33.0": - version: 0.33.0 - resolution: "@vitest/snapshot@npm:0.33.0" +"@vitest/snapshot@npm:0.34.1": + version: 0.34.1 + resolution: "@vitest/snapshot@npm:0.34.1" dependencies: magic-string: "npm:^0.30.1" pathe: "npm:^1.1.1" pretty-format: "npm:^29.5.0" - checksum: cce2654ca443df2c819abb7b7ca9ef7ea1ca9da635b9bd6bab18c35ab7d55f5843e7e9c1e5b7459be7aecde292f524ed9c2ed56b8ef9916064625908361e1dc7 + checksum: 2a9ee71729949fcd86cfaaf07d0f4a5a2bfa1bef6e154d0451aa0973f9cf73070e5f3d1367c5424492d9b9cb3cb2917d76274be9b873c3e1a29fda77e334b4a0 languageName: node linkType: hard -"@vitest/spy@npm:0.33.0": - version: 0.33.0 - resolution: "@vitest/spy@npm:0.33.0" +"@vitest/spy@npm:0.34.1": + version: 0.34.1 + resolution: "@vitest/spy@npm:0.34.1" dependencies: tinyspy: "npm:^2.1.1" - checksum: 2b724430ab9158be82a02fe2ad572f16ed60479b4e52f59be64db37b08704927580589df5c5737854c0ae8e29e65ad4deab1a52d3aaa22068b9f747eeda46eae + checksum: 2d615da51c0ab0ac229bf028241746dc2c6c9582d02b049f818f28888415ee5e12ee7ecd4840304ef31587843ef188725506ef1d266b01a47b293dcf2096cc90 languageName: node linkType: hard -"@vitest/utils@npm:0.33.0": - version: 0.33.0 - resolution: "@vitest/utils@npm:0.33.0" +"@vitest/utils@npm:0.34.1": + version: 0.34.1 + resolution: "@vitest/utils@npm:0.34.1" dependencies: diff-sequences: "npm:^29.4.3" loupe: "npm:^2.3.6" pretty-format: "npm:^29.5.0" - checksum: 07ba1585ddbde10eb2de6830e3e7ebe3c8f48157474de57195eb926ef0cfa333608ab0a5d935d20cf709998af519b65b4394251195eee21e74e4ef7776e902d7 + checksum: b714f3ead4c63cf15110230bde5c64114bdcb006bcd3236fd417cda5e97352eb5c2c88183f3d43069684c6d71323f6833c82b7b451eaddb30616380eb033457b languageName: node linkType: hard @@ -3469,21 +3470,6 @@ __metadata: languageName: node linkType: hard -"chai@npm:^4.3.7": - version: 4.3.7 - resolution: "chai@npm:4.3.7" - dependencies: - assertion-error: "npm:^1.1.0" - check-error: "npm:^1.0.2" - deep-eql: "npm:^4.1.2" - get-func-name: "npm:^2.0.0" - loupe: "npm:^2.3.1" - pathval: "npm:^1.1.1" - type-detect: "npm:^4.0.5" - checksum: 07600143d9c0530811acf71e3fe3d613b13c627d19890e220a01064d9187c49ccd6be76e572a90e061f010f940ca380e9364b383e8a8a3f83313890986f49414 - languageName: node - linkType: hard - "chalk-template@npm:^1.0.0": version: 1.0.0 resolution: "chalk-template@npm:1.0.0" @@ -3549,13 +3535,6 @@ __metadata: languageName: node linkType: hard -"check-error@npm:^1.0.2": - version: 1.0.2 - resolution: "check-error@npm:1.0.2" - checksum: 5ef1bce78b7105bd5b3f2e7d80a2c2d405a52c3f53d8c48da34d4b8d05f2a63cda26a66e058c4bcc4111be79246ba9ba93074bc4d8e2a65fe3566f8a3f2f7851 - languageName: node - linkType: hard - "check-error@npm:^2.0.0": version: 2.0.0 resolution: "check-error@npm:2.0.0" @@ -8110,13 +8089,6 @@ __metadata: languageName: node linkType: hard -"pathval@npm:^1.1.1": - version: 1.1.1 - resolution: "pathval@npm:1.1.1" - checksum: 13fed3f7d8efa938ed9a5e3e5c6d35c6081e4d05b2fd97274702966477ff28af7599e44418bfeebf032acd407379a77b4db180cc78294e5b8dcd971567a0efe8 - languageName: node - linkType: hard - "pathval@npm:^2.0.0": version: 2.0.0 resolution: "pathval@npm:2.0.0" @@ -9378,10 +9350,10 @@ __metadata: languageName: node linkType: hard -"tinypool@npm:^0.6.0": - version: 0.6.0 - resolution: "tinypool@npm:0.6.0" - checksum: e62e6f08c744bc3a774eb788e6303e194e2f1499ce5bd6cac5adc4bad7c6ba750c0aa18c426d1f654e918987609a1217b7a96401d26bfa9891153c59bc6f657d +"tinypool@npm:^0.7.0": + version: 0.7.0 + resolution: "tinypool@npm:0.7.0" + checksum: 6570c0d0752ac6313a085afca3947fcc1b86347ae16789f7b8572b070f66bb1b68d0e7e3403422d6e14a5e1aedbdc63497985ea6963243eaddcb4ba8600efa47 languageName: node linkType: hard @@ -9923,9 +9895,9 @@ __metadata: languageName: node linkType: hard -"vite-node@npm:0.33.0": - version: 0.33.0 - resolution: "vite-node@npm:0.33.0" +"vite-node@npm:0.34.1": + version: 0.34.1 + resolution: "vite-node@npm:0.34.1" dependencies: cac: "npm:^6.7.14" debug: "npm:^4.3.4" @@ -9935,7 +9907,7 @@ __metadata: vite: "npm:^3.0.0 || ^4.0.0" bin: vite-node: vite-node.mjs - checksum: 8bf6b8e274c19eef1b55389b173f19941fcfe711ced32c2c46ec26c65834be81655321ab44d9510d5a4a30b75b49fa7d9dc1724c99d7af1122101b6e31112cf2 + checksum: 1ff1e8cbd2924935c5f4772a0ea5371ff28f1a28c2b7846c80b4e73efe76ff50ea6525051390df7f0b6942f8b06f2f07438a87028283c73d47fd1274baa93ab0 languageName: node linkType: hard @@ -10006,18 +9978,18 @@ __metadata: languageName: node linkType: hard -"vitest@npm:0.33.0": - version: 0.33.0 - resolution: "vitest@npm:0.33.0" +"vitest@npm:0.34.1": + version: 0.34.1 + resolution: "vitest@npm:0.34.1" dependencies: "@types/chai": "npm:^4.3.5" "@types/chai-subset": "npm:^1.3.3" "@types/node": "npm:*" - "@vitest/expect": "npm:0.33.0" - "@vitest/runner": "npm:0.33.0" - "@vitest/snapshot": "npm:0.33.0" - "@vitest/spy": "npm:0.33.0" - "@vitest/utils": "npm:0.33.0" + "@vitest/expect": "npm:0.34.1" + "@vitest/runner": "npm:0.34.1" + "@vitest/snapshot": "npm:0.34.1" + "@vitest/spy": "npm:0.34.1" + "@vitest/utils": "npm:0.34.1" acorn: "npm:^8.9.0" acorn-walk: "npm:^8.2.0" cac: "npm:^6.7.14" @@ -10030,9 +10002,9 @@ __metadata: std-env: "npm:^3.3.3" strip-literal: "npm:^1.0.1" tinybench: "npm:^2.5.0" - tinypool: "npm:^0.6.0" + tinypool: "npm:^0.7.0" vite: "npm:^3.0.0 || ^4.0.0" - vite-node: "npm:0.33.0" + vite-node: "npm:0.34.1" why-is-node-running: "npm:^2.2.2" peerDependencies: "@edge-runtime/vm": "*" @@ -10062,22 +10034,22 @@ __metadata: optional: true bin: vitest: vitest.mjs - checksum: defb178d84cdad861e704d8681c4925e49fae4a2f71d710db1e754010f8b23b88284ce51f8cb0c7abfd93b8201d638e1b65647def85054211ac2cc3e2f5fab52 + checksum: df42543d08a0b5c0f6ad34ded65e3c29f87aba58b85ebd230247df3b2205a0cc0b07b72be6ba1ab53467a49013f75453ce997232dfef532b3cbbba768cebbb91 languageName: node linkType: hard -"vitest@patch:vitest@npm%3A0.33.0#patches/vitest+0.33.0.dev.patch::locator=%40flex-development%2Ftutils%40workspace%3A.": - version: 0.33.0 - resolution: "vitest@patch:vitest@npm%3A0.33.0#patches/vitest+0.33.0.dev.patch::version=0.33.0&hash=578689&locator=%40flex-development%2Ftutils%40workspace%3A." +"vitest@patch:vitest@npm%3A0.34.1#patches/vitest+0.34.1.dev.patch::locator=%40flex-development%2Ftutils%40workspace%3A.": + version: 0.34.1 + resolution: "vitest@patch:vitest@npm%3A0.34.1#patches/vitest+0.34.1.dev.patch::version=0.34.1&hash=2c63bb&locator=%40flex-development%2Ftutils%40workspace%3A." dependencies: "@types/chai": "npm:^4.3.5" "@types/chai-subset": "npm:^1.3.3" "@types/node": "npm:*" - "@vitest/expect": "npm:0.33.0" - "@vitest/runner": "npm:0.33.0" - "@vitest/snapshot": "npm:0.33.0" - "@vitest/spy": "npm:0.33.0" - "@vitest/utils": "npm:0.33.0" + "@vitest/expect": "npm:0.34.1" + "@vitest/runner": "npm:0.34.1" + "@vitest/snapshot": "npm:0.34.1" + "@vitest/spy": "npm:0.34.1" + "@vitest/utils": "npm:0.34.1" acorn: "npm:^8.9.0" acorn-walk: "npm:^8.2.0" cac: "npm:^6.7.14" @@ -10090,9 +10062,9 @@ __metadata: std-env: "npm:^3.3.3" strip-literal: "npm:^1.0.1" tinybench: "npm:^2.5.0" - tinypool: "npm:^0.6.0" + tinypool: "npm:^0.7.0" vite: "npm:^3.0.0 || ^4.0.0" - vite-node: "npm:0.33.0" + vite-node: "npm:0.34.1" why-is-node-running: "npm:^2.2.2" peerDependencies: "@edge-runtime/vm": "*" @@ -10122,7 +10094,7 @@ __metadata: optional: true bin: vitest: vitest.mjs - checksum: 7e964f411f5ba4b1ee493768cc9739f3df9aa3f7eb556bd7ac239ed0d75e7185ff334e7540e52c4ef4347a7b8af15713c4fd51eb168e46f31d601e59cd3a18be + checksum: faab7cd771444db08f009a518c2a3ad71692ce7046edb360ea1990d2e32628e2314e47a9b37cbaa5e25047980f35b3a21534c8909de389ca85de302c487e9931 languageName: node linkType: hard