From 023e86608b397d0cfa717e94ff7b78f8bb8ff8a8 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Fri, 12 Jan 2024 10:56:42 +0100 Subject: [PATCH 1/5] Upgrade test package to vitest 1.1.3 --- ...@vitest-expect-npm-1.1.3-2062bf533f.patch} | 17 +++- code/lib/test/package.json | 4 +- code/lib/test/src/spy.ts | 2 +- code/package.json | 1 - code/yarn.lock | 84 +++++++++---------- 5 files changed, 55 insertions(+), 53 deletions(-) rename code/.yarn/patches/{@vitest-expect-npm-0.34.5-8031508efe.patch => @vitest-expect-npm-1.1.3-2062bf533f.patch} (67%) diff --git a/code/.yarn/patches/@vitest-expect-npm-0.34.5-8031508efe.patch b/code/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch similarity index 67% rename from code/.yarn/patches/@vitest-expect-npm-0.34.5-8031508efe.patch rename to code/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch index 175c8fbcc343..ea5e834a06df 100644 --- a/code/.yarn/patches/@vitest-expect-npm-0.34.5-8031508efe.patch +++ b/code/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch @@ -1,8 +1,8 @@ diff --git a/dist/index.js b/dist/index.js -index 5a61947ad50426d27390b4e82533179323ad3ba1..32bfc45909b645cb31cec2e204c8baa23f21fdd2 100644 +index 974d6b26f626024fc9904908100c9ecaa54f43e1..5be2d35267e7f0525c6588758dbebe72599f88a9 100644 --- a/dist/index.js +++ b/dist/index.js -@@ -6,23 +6,29 @@ import { processError } from '@vitest/utils/error'; +@@ -6,31 +6,37 @@ import { processError } from '@vitest/utils/error'; import { util } from 'chai'; const MATCHERS_OBJECT = Symbol.for("matchers-object"); @@ -11,15 +11,19 @@ index 5a61947ad50426d27390b4e82533179323ad3ba1..32bfc45909b645cb31cec2e204c8baa2 +// Otherwise, vitest will override global jest matchers, and crash. +const JEST_MATCHERS_OBJECT = Symbol.for("$$jest-matchers-object-storybook"); const GLOBAL_EXPECT = Symbol.for("expect-global"); + const ASYMMETRIC_MATCHERS_OBJECT = Symbol.for("asymmetric-matchers-object"); if (!Object.prototype.hasOwnProperty.call(globalThis, MATCHERS_OBJECT)) { const globalState = /* @__PURE__ */ new WeakMap(); - const matchers = /* @__PURE__ */ Object.create(null); + const assymetricMatchers = /* @__PURE__ */ Object.create(null); Object.defineProperty(globalThis, MATCHERS_OBJECT, { get: () => globalState }); ++ Object.defineProperty(globalThis, ASYMMETRIC_MATCHERS_OBJECT, { ++ get: () => assymetricMatchers ++ }); +} -+ +if (!Object.prototype.hasOwnProperty.call(globalThis, JEST_MATCHERS_OBJECT)) { + const matchers = /* @__PURE__ */ Object.create(null); Object.defineProperty(globalThis, JEST_MATCHERS_OBJECT, { @@ -30,8 +34,15 @@ index 5a61947ad50426d27390b4e82533179323ad3ba1..32bfc45909b645cb31cec2e204c8baa2 matchers }) }); +- Object.defineProperty(globalThis, ASYMMETRIC_MATCHERS_OBJECT, { +- get: () => assymetricMatchers +- }); } + function getState(expect) { return globalThis[MATCHERS_OBJECT].get(expect); } ++ + function setState(state, expect) { + const map = globalThis[MATCHERS_OBJECT]; + const current = map.get(expect) || {}; diff --git a/code/lib/test/package.json b/code/lib/test/package.json index 653e24630577..a5ab1e10baca 100644 --- a/code/lib/test/package.json +++ b/code/lib/test/package.json @@ -51,8 +51,8 @@ "@testing-library/jest-dom": "^6.1.3", "@testing-library/user-event": "14.3.0", "@types/chai": "^4", - "@vitest/expect": "^0.34.2", - "@vitest/spy": "^0.34.1", + "@vitest/expect": "patch:@vitest/expect@npm%3A1.1.3#~/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch", + "@vitest/spy": "^1.1.3", "chai": "^4.3.7", "util": "^0.12.4" }, diff --git a/code/lib/test/src/spy.ts b/code/lib/test/src/spy.ts index 8b0ce5f38e56..3208df77ae76 100644 --- a/code/lib/test/src/spy.ts +++ b/code/lib/test/src/spy.ts @@ -2,7 +2,7 @@ import { spyOn, isMockFunction, fn, - spies as mocks, + mocks, type MaybeMocked, type MaybeMockedDeep, type MaybePartiallyMocked, diff --git a/code/package.json b/code/package.json index d9e159d1e640..768e13c2a664 100644 --- a/code/package.json +++ b/code/package.json @@ -80,7 +80,6 @@ "@typescript-eslint/eslint-plugin": "^5.45.0", "@typescript-eslint/experimental-utils": "^5.45.0", "@typescript-eslint/parser": "^5.45.0", - "@vitest/expect@^0.34.2": "patch:@vitest/expect@npm%3A0.34.5#./.yarn/patches/@vitest-expect-npm-0.34.5-8031508efe.patch", "esbuild": "^0.18.0", "eslint": "^8.28.0", "eslint-plugin-prettier": "^5.1.2", diff --git a/code/yarn.lock b/code/yarn.lock index ee33ab461a33..3075bfb15611 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6674,8 +6674,8 @@ __metadata: "@testing-library/jest-dom": "npm:^6.1.3" "@testing-library/user-event": "npm:14.3.0" "@types/chai": "npm:^4" - "@vitest/expect": "npm:^0.34.2" - "@vitest/spy": "npm:^0.34.1" + "@vitest/expect": "patch:@vitest/expect@npm%3A1.1.3#~/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch" + "@vitest/spy": "npm:^1.1.3" chai: "npm:^4.3.7" ts-dedent: "npm:^2.2.0" type-fest: "npm:~2.19" @@ -8370,17 +8370,6 @@ __metadata: languageName: node linkType: hard -"@vitest/expect@npm:0.34.5": - version: 0.34.5 - resolution: "@vitest/expect@npm:0.34.5" - dependencies: - "@vitest/spy": "npm:0.34.5" - "@vitest/utils": "npm:0.34.5" - chai: "npm:^4.3.7" - checksum: dc30a5e1f2732a1906df57f65381df1129dbf994496734c27e4a3f832852862501eaba1ec2987215ec12ee23a8f2ef1d8ff63c7cd5490046a7a26800da1adcb2 - languageName: node - linkType: hard - "@vitest/expect@npm:1.0.4": version: 1.0.4 resolution: "@vitest/expect@npm:1.0.4" @@ -8392,14 +8381,25 @@ __metadata: languageName: node linkType: hard -"@vitest/expect@patch:@vitest/expect@npm%3A0.34.5#./.yarn/patches/@vitest-expect-npm-0.34.5-8031508efe.patch::locator=%40storybook%2Froot%40workspace%3A.": - version: 0.34.5 - resolution: "@vitest/expect@patch:@vitest/expect@npm%3A0.34.5#./.yarn/patches/@vitest-expect-npm-0.34.5-8031508efe.patch::version=0.34.5&hash=f89b80&locator=%40storybook%2Froot%40workspace%3A." +"@vitest/expect@npm:1.1.3": + version: 1.1.3 + resolution: "@vitest/expect@npm:1.1.3" dependencies: - "@vitest/spy": "npm:0.34.5" - "@vitest/utils": "npm:0.34.5" - chai: "npm:^4.3.7" - checksum: b08f0b1df6a37305f3f68feec15cfac048ca9e3924998698625394296faac4e539e23d7422eec59c0850a83b7342b574a2d2d174aaa33a7eb0004e4e366c515c + "@vitest/spy": "npm:1.1.3" + "@vitest/utils": "npm:1.1.3" + chai: "npm:^4.3.10" + checksum: fe5c9eade516a754efc26d4b6378a250f0c3b668fa15b3e6b6042190b64a65c4459b7fd67bfca72fb1fbf215feb838b68da4ab224a2a10137d8828ca6af70516 + languageName: node + linkType: hard + +"@vitest/expect@patch:@vitest/expect@npm%3A1.1.3#~/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch": + version: 1.1.3 + resolution: "@vitest/expect@patch:@vitest/expect@npm%3A1.1.3#~/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch::version=1.1.3&hash=5d51c9" + dependencies: + "@vitest/spy": "npm:1.1.3" + "@vitest/utils": "npm:1.1.3" + chai: "npm:^4.3.10" + checksum: 426287f864f58b05b1c4689bc87b4ef2ca7b3316a22e8e42d94ee9c125cbc0caf294618c9a1201a8ddf8ab68ce1ab194d1e34589f7d608906a3dc679074cfe22 languageName: node linkType: hard @@ -8425,15 +8425,6 @@ __metadata: languageName: node linkType: hard -"@vitest/spy@npm:0.34.5": - version: 0.34.5 - resolution: "@vitest/spy@npm:0.34.5" - dependencies: - tinyspy: "npm:^2.1.1" - checksum: bbee495ca6300f50dde6418d14db0d3281daf38df15abae95202ddef253d6dd8bedf9f4a79da5a2246d3758ab24aa737caccf752fabcd8ba902a4f14801c2a0c - languageName: node - linkType: hard - "@vitest/spy@npm:1.0.4": version: 1.0.4 resolution: "@vitest/spy@npm:1.0.4" @@ -8443,23 +8434,12 @@ __metadata: languageName: node linkType: hard -"@vitest/spy@npm:^0.34.1": - version: 0.34.7 - resolution: "@vitest/spy@npm:0.34.7" - dependencies: - tinyspy: "npm:^2.1.1" - checksum: 1150b270eb72a5e8e7da997bcba90ebe5ed2ac50de1ea1f81738e16a19ab4bc77ca4d17639988df65695d4b325fe3647a1e4204d01024bcf5ecac8ba7764a2cc - languageName: node - linkType: hard - -"@vitest/utils@npm:0.34.5": - version: 0.34.5 - resolution: "@vitest/utils@npm:0.34.5" +"@vitest/spy@npm:1.1.3, @vitest/spy@npm:^1.1.3": + version: 1.1.3 + resolution: "@vitest/spy@npm:1.1.3" dependencies: - diff-sequences: "npm:^29.4.3" - loupe: "npm:^2.3.6" - pretty-format: "npm:^29.5.0" - checksum: 99cc5974ada1dab2b02220005c0fc97147baba175601a0faa1b2b6687c7f579d21a401077377d6f759b3aa8a07dcc8851cdc3e07f9a550ec289286107487ac36 + tinyspy: "npm:^2.2.0" + checksum: d1692582afb7b665ec283723b15bbb7da95896cbfd7befaad9fdac6b64a8250fd918781263d43e8e10ee4874cdd18646224f6d993749c3751296dced8095a9ed languageName: node linkType: hard @@ -8474,6 +8454,18 @@ __metadata: languageName: node linkType: hard +"@vitest/utils@npm:1.1.3": + version: 1.1.3 + resolution: "@vitest/utils@npm:1.1.3" + dependencies: + diff-sequences: "npm:^29.6.3" + estree-walker: "npm:^3.0.3" + loupe: "npm:^2.3.7" + pretty-format: "npm:^29.7.0" + checksum: 86f48a7722927741449f40f33584dd9857629782f6661654225b5dd3c039d61cc60806c5dfe419bd793f2a231ba91fe708cbdec5d99b62a1f6f819b6f2121fc3 + languageName: node + linkType: hard + "@vitest/utils@npm:^0.34.6": version: 0.34.7 resolution: "@vitest/utils@npm:0.34.7" @@ -26996,7 +26988,7 @@ __metadata: languageName: node linkType: hard -"tinyspy@npm:^2.1.1, tinyspy@npm:^2.2.0": +"tinyspy@npm:^2.2.0": version: 2.2.0 resolution: "tinyspy@npm:2.2.0" checksum: 8c7b70748dd8590e85d52741db79243746c15bc03c92d75c23160a762142db577e7f53e360ba7300e321b12bca5c42dd2522a8dbeec6ba3830302573dd8516bc From 46e50dd58b0eccd7cd4c5f4c85cc9b8b24670acb Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Fri, 12 Jan 2024 12:06:30 +0100 Subject: [PATCH 2/5] Use resolutions instead --- code/lib/test/package.json | 2 +- code/package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/lib/test/package.json b/code/lib/test/package.json index a5ab1e10baca..25fa4abbb838 100644 --- a/code/lib/test/package.json +++ b/code/lib/test/package.json @@ -51,7 +51,7 @@ "@testing-library/jest-dom": "^6.1.3", "@testing-library/user-event": "14.3.0", "@types/chai": "^4", - "@vitest/expect": "patch:@vitest/expect@npm%3A1.1.3#~/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch", + "@vitest/expect": "1.1.3", "@vitest/spy": "^1.1.3", "chai": "^4.3.7", "util": "^0.12.4" diff --git a/code/package.json b/code/package.json index 768e13c2a664..abc10e348078 100644 --- a/code/package.json +++ b/code/package.json @@ -80,6 +80,7 @@ "@typescript-eslint/eslint-plugin": "^5.45.0", "@typescript-eslint/experimental-utils": "^5.45.0", "@typescript-eslint/parser": "^5.45.0", + "@vitest/expect@1.1.3": "patch:@vitest/expect@npm%3A1.1.3#~/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch", "esbuild": "^0.18.0", "eslint": "^8.28.0", "eslint-plugin-prettier": "^5.1.2", From 06d584203ac6ef0594900f6e94653ad109cf564a Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Fri, 12 Jan 2024 12:23:37 +0100 Subject: [PATCH 3/5] Update lock --- code/yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/yarn.lock b/code/yarn.lock index 3075bfb15611..8e6afad2ff6b 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6674,7 +6674,7 @@ __metadata: "@testing-library/jest-dom": "npm:^6.1.3" "@testing-library/user-event": "npm:14.3.0" "@types/chai": "npm:^4" - "@vitest/expect": "patch:@vitest/expect@npm%3A1.1.3#~/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch" + "@vitest/expect": "npm:1.1.3" "@vitest/spy": "npm:^1.1.3" chai: "npm:^4.3.7" ts-dedent: "npm:^2.2.0" From 0258ebc0d82bb1a3d68f9ee6aaa4625b6635d26e Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Fri, 12 Jan 2024 13:03:13 +0100 Subject: [PATCH 4/5] Remove chai types --- code/lib/test/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/code/lib/test/package.json b/code/lib/test/package.json index 25fa4abbb838..739d2c689422 100644 --- a/code/lib/test/package.json +++ b/code/lib/test/package.json @@ -50,7 +50,6 @@ "@testing-library/dom": "^9.3.1", "@testing-library/jest-dom": "^6.1.3", "@testing-library/user-event": "14.3.0", - "@types/chai": "^4", "@vitest/expect": "1.1.3", "@vitest/spy": "^1.1.3", "chai": "^4.3.7", From 6b8c2df7c5abe3b4327d02ea923c37b8c231fb3f Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Fri, 12 Jan 2024 13:09:13 +0100 Subject: [PATCH 5/5] yarn.lock --- code/yarn.lock | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/yarn.lock b/code/yarn.lock index 8e6afad2ff6b..a52c475da3e7 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6673,7 +6673,6 @@ __metadata: "@testing-library/dom": "npm:^9.3.1" "@testing-library/jest-dom": "npm:^6.1.3" "@testing-library/user-event": "npm:14.3.0" - "@types/chai": "npm:^4" "@vitest/expect": "npm:1.1.3" "@vitest/spy": "npm:^1.1.3" chai: "npm:^4.3.7" @@ -7191,13 +7190,6 @@ __metadata: languageName: node linkType: hard -"@types/chai@npm:^4": - version: 4.3.11 - resolution: "@types/chai@npm:4.3.11" - checksum: 0c216ac4a19bfbf8318bb104d32e50704ee2ffc4b538b976c4326e6638fee121462402caa570662227a2a218810388aadb14bdbd3d3d474ec300b00695db448a - languageName: node - linkType: hard - "@types/color-convert@npm:^2.0.0": version: 2.0.3 resolution: "@types/color-convert@npm:2.0.3"