diff --git a/package.json b/package.json index 9830741da92b..bdce1c5a57bb 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ ] }, "patchedDependencies": { - "@types/chai@4.3.6": "patches/@types__chai@4.3.6.patch", + "@types/chai": "patches/@types__chai.patch", "@sinonjs/fake-timers@11.1.0": "patches/@sinonjs__fake-timers@11.1.0.patch", "cac@6.7.14": "patches/cac@6.7.14.patch", "@types/sinonjs__fake-timers@8.1.5": "patches/@types__sinonjs__fake-timers@8.1.5.patch", diff --git a/packages/expect/package.json b/packages/expect/package.json index 081c801fdb5a..97d0c4e9a64b 100644 --- a/packages/expect/package.json +++ b/packages/expect/package.json @@ -40,7 +40,7 @@ "tinyrainbow": "^1.2.0" }, "devDependencies": { - "@types/chai": "4.3.6", + "@types/chai": "5.0.1", "@vitest/runner": "workspace:*", "rollup-plugin-copy": "^3.5.0" } diff --git a/patches/@types__chai.patch b/patches/@types__chai.patch new file mode 100644 index 000000000000..942ea6266a00 --- /dev/null +++ b/patches/@types__chai.patch @@ -0,0 +1,51 @@ +diff --git a/index.d.ts b/index.d.ts +index 986e0d507d88bc033f0a0f0b4dcc40be0635df94..beab8eae28220a457950cdbf5c7f043424f4fa14 100644 +--- a/index.d.ts ++++ b/index.d.ts +@@ -1,7 +1,7 @@ +-import deepEqual = require("deep-eql"); ++// import deepEqual = require("deep-eql"); + +-declare global { +- namespace Chai { ++// declare global { ++ declare namespace Chai { + type Message = string | (() => string); + type ObjectProperty = string | symbol | number; + +@@ -73,7 +73,7 @@ declare global { + getPathInfo(obj: object, path: string): PathInfo; + getPathValue(obj: object, path: string): object | undefined; + +- eql: typeof deepEqual; ++ // eql: typeof deepEqual; + } + + type ChaiPlugin = (chai: ChaiStatic, utils: ChaiUtils) => void; +@@ -2104,8 +2104,9 @@ declare global { + stack: string; + } + } +-} ++// } + ++declare module "chai" { + export function use(fn: Chai.ChaiPlugin): Chai.ChaiStatic; + + export const util: Chai.ChaiUtils; +@@ -2115,9 +2116,10 @@ export function should(): Chai.Should; + export function Should(): Chai.Should; + export const assert: Chai.AssertStatic; + export const expect: Chai.ExpectStatic; +- +-declare global { +- interface Object { +- should: Chai.Assertion; +- } + } ++ ++// declare global { ++// interface Object { ++// should: Chai.Assertion; ++// } ++// } diff --git a/patches/@types__chai@4.3.6.patch b/patches/@types__chai@4.3.6.patch deleted file mode 100644 index 6d8f1a0bcdc3..000000000000 --- a/patches/@types__chai@4.3.6.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/index.d.ts b/index.d.ts -index 9f5cb99cdc30c0ceee9c4bb2d866030cfe7b889e..7e231313ed85b703d70ec44778a96e7f3ff4f98e 100755 ---- a/index.d.ts -+++ b/index.d.ts -@@ -1963,6 +1963,6 @@ declare module "chai" { - export = chai; - } - --interface Object { -- should: Chai.Assertion; --} -+// interface Object { -+// should: Chai.Assertion; -+// } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7f066c8088d..61193e0abf63 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,9 +17,9 @@ patchedDependencies: '@sinonjs/fake-timers@11.1.0': hash: trok5obk3l5tdlygozv34fknii path: patches/@sinonjs__fake-timers@11.1.0.patch - '@types/chai@4.3.6': - hash: s5kzatt2y2dzfxfynxzvzt5kbm - path: patches/@types__chai@4.3.6.patch + '@types/chai': + hash: 7aemscswk25eebfiaafqarff4e + path: patches/@types__chai.patch '@types/sinonjs__fake-timers@8.1.5': hash: yuuqouzdhxwdvk3q6qf2uf434a path: patches/@types__sinonjs__fake-timers@8.1.5.patch @@ -581,8 +581,8 @@ importers: version: 1.2.0 devDependencies: '@types/chai': - specifier: 4.3.6 - version: 4.3.6(patch_hash=s5kzatt2y2dzfxfynxzvzt5kbm) + specifier: 5.0.1 + version: 5.0.1(patch_hash=7aemscswk25eebfiaafqarff4e) '@vitest/runner': specifier: workspace:* version: link:../runner @@ -3642,8 +3642,8 @@ packages: '@types/braces@3.0.1': resolution: {integrity: sha512-+euflG6ygo4bn0JHtn4pYqcXwRtLvElQ7/nnjDu7iYG56H0+OhCd7d6Ug0IE3WcFpZozBKW2+80FUbv5QGk5AQ==} - '@types/chai@4.3.6': - resolution: {integrity: sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==} + '@types/chai@5.0.1': + resolution: {integrity: sha512-5T8ajsg3M/FOncpLYW7sdOcD6yf4+722sze/tc4KQV0P8Z2rAr3SAuHCIkYmYpt8VbcQlnz8SxlOlPQYefe4cA==} '@types/codemirror@5.60.15': resolution: {integrity: sha512-dTOvwEQ+ouKJ/rE9LT1Ue2hmP6H1mZv5+CCnNWu2qtiOe2LQa9lCprEY20HxiDmV/Bxh+dXjywmy5aKvoGjULA==} @@ -3663,6 +3663,9 @@ packages: '@types/debug@4.1.12': resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==} + '@types/deep-eql@4.0.2': + resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==} + '@types/estree@0.0.39': resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==} @@ -12102,7 +12105,9 @@ snapshots: '@types/braces@3.0.1': {} - '@types/chai@4.3.6(patch_hash=s5kzatt2y2dzfxfynxzvzt5kbm)': {} + '@types/chai@5.0.1(patch_hash=7aemscswk25eebfiaafqarff4e)': + dependencies: + '@types/deep-eql': 4.0.2 '@types/codemirror@5.60.15': dependencies: @@ -12120,6 +12125,8 @@ snapshots: dependencies: '@types/ms': 0.7.31 + '@types/deep-eql@4.0.2': {} + '@types/estree@0.0.39': {} '@types/estree@1.0.5': {}