Skip to content

Commit 281253d

Browse files
authored
Merge pull request #25576 from storybookjs/kasper/vitest-1.0
Test: Upgrade test package to vitest 1.1.3
2 parents 3abd0ba + 6b8c2df commit 281253d

File tree

5 files changed

+56
-62
lines changed

5 files changed

+56
-62
lines changed

code/.yarn/patches/@vitest-expect-npm-0.34.5-8031508efe.patch code/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch

+14-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

code/lib/test/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@
5050
"@testing-library/dom": "^9.3.1",
5151
"@testing-library/jest-dom": "^6.1.3",
5252
"@testing-library/user-event": "14.3.0",
53-
"@types/chai": "^4",
54-
"@vitest/expect": "^0.34.2",
55-
"@vitest/spy": "^0.34.1",
53+
"@vitest/expect": "1.1.3",
54+
"@vitest/spy": "^1.1.3",
5655
"chai": "^4.3.7",
5756
"util": "^0.12.4"
5857
},

code/lib/test/src/spy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
spyOn,
33
isMockFunction,
44
fn,
5-
spies as mocks,
5+
mocks,
66
type MaybeMocked,
77
type MaybeMockedDeep,
88
type MaybePartiallyMocked,

code/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"@typescript-eslint/eslint-plugin": "^5.45.0",
8181
"@typescript-eslint/experimental-utils": "^5.45.0",
8282
"@typescript-eslint/parser": "^5.45.0",
83-
"@vitest/expect@^0.34.2": "patch:@vitest/expect@npm%3A0.34.5#./.yarn/patches/@vitest-expect-npm-0.34.5-8031508efe.patch",
83+
"@vitest/expect@1.1.3": "patch:@vitest/expect@npm%3A1.1.3#~/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch",
8484
"esbuild": "^0.18.0",
8585
"eslint": "^8.28.0",
8686
"eslint-plugin-prettier": "^5.1.2",

code/yarn.lock

+38-54
Original file line numberDiff line numberDiff line change
@@ -6673,9 +6673,8 @@ __metadata:
66736673
"@testing-library/dom": "npm:^9.3.1"
66746674
"@testing-library/jest-dom": "npm:^6.1.3"
66756675
"@testing-library/user-event": "npm:14.3.0"
6676-
"@types/chai": "npm:^4"
6677-
"@vitest/expect": "npm:^0.34.2"
6678-
"@vitest/spy": "npm:^0.34.1"
6676+
"@vitest/expect": "npm:1.1.3"
6677+
"@vitest/spy": "npm:^1.1.3"
66796678
chai: "npm:^4.3.7"
66806679
ts-dedent: "npm:^2.2.0"
66816680
type-fest: "npm:~2.19"
@@ -7191,13 +7190,6 @@ __metadata:
71917190
languageName: node
71927191
linkType: hard
71937192

7194-
"@types/chai@npm:^4":
7195-
version: 4.3.11
7196-
resolution: "@types/chai@npm:4.3.11"
7197-
checksum: 0c216ac4a19bfbf8318bb104d32e50704ee2ffc4b538b976c4326e6638fee121462402caa570662227a2a218810388aadb14bdbd3d3d474ec300b00695db448a
7198-
languageName: node
7199-
linkType: hard
7200-
72017193
"@types/color-convert@npm:^2.0.0":
72027194
version: 2.0.3
72037195
resolution: "@types/color-convert@npm:2.0.3"
@@ -8370,17 +8362,6 @@ __metadata:
83708362
languageName: node
83718363
linkType: hard
83728364

8373-
"@vitest/expect@npm:0.34.5":
8374-
version: 0.34.5
8375-
resolution: "@vitest/expect@npm:0.34.5"
8376-
dependencies:
8377-
"@vitest/spy": "npm:0.34.5"
8378-
"@vitest/utils": "npm:0.34.5"
8379-
chai: "npm:^4.3.7"
8380-
checksum: dc30a5e1f2732a1906df57f65381df1129dbf994496734c27e4a3f832852862501eaba1ec2987215ec12ee23a8f2ef1d8ff63c7cd5490046a7a26800da1adcb2
8381-
languageName: node
8382-
linkType: hard
8383-
83848365
"@vitest/expect@npm:1.0.4":
83858366
version: 1.0.4
83868367
resolution: "@vitest/expect@npm:1.0.4"
@@ -8392,14 +8373,25 @@ __metadata:
83928373
languageName: node
83938374
linkType: hard
83948375

8395-
"@vitest/expect@patch:@vitest/expect@npm%3A0.34.5#./.yarn/patches/@vitest-expect-npm-0.34.5-8031508efe.patch::locator=%40storybook%2Froot%40workspace%3A.":
8396-
version: 0.34.5
8397-
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."
8376+
"@vitest/expect@npm:1.1.3":
8377+
version: 1.1.3
8378+
resolution: "@vitest/expect@npm:1.1.3"
83988379
dependencies:
8399-
"@vitest/spy": "npm:0.34.5"
8400-
"@vitest/utils": "npm:0.34.5"
8401-
chai: "npm:^4.3.7"
8402-
checksum: b08f0b1df6a37305f3f68feec15cfac048ca9e3924998698625394296faac4e539e23d7422eec59c0850a83b7342b574a2d2d174aaa33a7eb0004e4e366c515c
8380+
"@vitest/spy": "npm:1.1.3"
8381+
"@vitest/utils": "npm:1.1.3"
8382+
chai: "npm:^4.3.10"
8383+
checksum: fe5c9eade516a754efc26d4b6378a250f0c3b668fa15b3e6b6042190b64a65c4459b7fd67bfca72fb1fbf215feb838b68da4ab224a2a10137d8828ca6af70516
8384+
languageName: node
8385+
linkType: hard
8386+
8387+
"@vitest/expect@patch:@vitest/expect@npm%3A1.1.3#~/.yarn/patches/@vitest-expect-npm-1.1.3-2062bf533f.patch":
8388+
version: 1.1.3
8389+
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"
8390+
dependencies:
8391+
"@vitest/spy": "npm:1.1.3"
8392+
"@vitest/utils": "npm:1.1.3"
8393+
chai: "npm:^4.3.10"
8394+
checksum: 426287f864f58b05b1c4689bc87b4ef2ca7b3316a22e8e42d94ee9c125cbc0caf294618c9a1201a8ddf8ab68ce1ab194d1e34589f7d608906a3dc679074cfe22
84038395
languageName: node
84048396
linkType: hard
84058397

@@ -8425,15 +8417,6 @@ __metadata:
84258417
languageName: node
84268418
linkType: hard
84278419

8428-
"@vitest/spy@npm:0.34.5":
8429-
version: 0.34.5
8430-
resolution: "@vitest/spy@npm:0.34.5"
8431-
dependencies:
8432-
tinyspy: "npm:^2.1.1"
8433-
checksum: bbee495ca6300f50dde6418d14db0d3281daf38df15abae95202ddef253d6dd8bedf9f4a79da5a2246d3758ab24aa737caccf752fabcd8ba902a4f14801c2a0c
8434-
languageName: node
8435-
linkType: hard
8436-
84378420
"@vitest/spy@npm:1.0.4":
84388421
version: 1.0.4
84398422
resolution: "@vitest/spy@npm:1.0.4"
@@ -8443,23 +8426,12 @@ __metadata:
84438426
languageName: node
84448427
linkType: hard
84458428

8446-
"@vitest/spy@npm:^0.34.1":
8447-
version: 0.34.7
8448-
resolution: "@vitest/spy@npm:0.34.7"
8449-
dependencies:
8450-
tinyspy: "npm:^2.1.1"
8451-
checksum: 1150b270eb72a5e8e7da997bcba90ebe5ed2ac50de1ea1f81738e16a19ab4bc77ca4d17639988df65695d4b325fe3647a1e4204d01024bcf5ecac8ba7764a2cc
8452-
languageName: node
8453-
linkType: hard
8454-
8455-
"@vitest/utils@npm:0.34.5":
8456-
version: 0.34.5
8457-
resolution: "@vitest/utils@npm:0.34.5"
8429+
"@vitest/spy@npm:1.1.3, @vitest/spy@npm:^1.1.3":
8430+
version: 1.1.3
8431+
resolution: "@vitest/spy@npm:1.1.3"
84588432
dependencies:
8459-
diff-sequences: "npm:^29.4.3"
8460-
loupe: "npm:^2.3.6"
8461-
pretty-format: "npm:^29.5.0"
8462-
checksum: 99cc5974ada1dab2b02220005c0fc97147baba175601a0faa1b2b6687c7f579d21a401077377d6f759b3aa8a07dcc8851cdc3e07f9a550ec289286107487ac36
8433+
tinyspy: "npm:^2.2.0"
8434+
checksum: d1692582afb7b665ec283723b15bbb7da95896cbfd7befaad9fdac6b64a8250fd918781263d43e8e10ee4874cdd18646224f6d993749c3751296dced8095a9ed
84638435
languageName: node
84648436
linkType: hard
84658437

@@ -8474,6 +8446,18 @@ __metadata:
84748446
languageName: node
84758447
linkType: hard
84768448

8449+
"@vitest/utils@npm:1.1.3":
8450+
version: 1.1.3
8451+
resolution: "@vitest/utils@npm:1.1.3"
8452+
dependencies:
8453+
diff-sequences: "npm:^29.6.3"
8454+
estree-walker: "npm:^3.0.3"
8455+
loupe: "npm:^2.3.7"
8456+
pretty-format: "npm:^29.7.0"
8457+
checksum: 86f48a7722927741449f40f33584dd9857629782f6661654225b5dd3c039d61cc60806c5dfe419bd793f2a231ba91fe708cbdec5d99b62a1f6f819b6f2121fc3
8458+
languageName: node
8459+
linkType: hard
8460+
84778461
"@vitest/utils@npm:^0.34.6":
84788462
version: 0.34.7
84798463
resolution: "@vitest/utils@npm:0.34.7"
@@ -26996,7 +26980,7 @@ __metadata:
2699626980
languageName: node
2699726981
linkType: hard
2699826982

26999-
"tinyspy@npm:^2.1.1, tinyspy@npm:^2.2.0":
26983+
"tinyspy@npm:^2.2.0":
2700026984
version: 2.2.0
2700126985
resolution: "tinyspy@npm:2.2.0"
2700226986
checksum: 8c7b70748dd8590e85d52741db79243746c15bc03c92d75c23160a762142db577e7f53e360ba7300e321b12bca5c42dd2522a8dbeec6ba3830302573dd8516bc

0 commit comments

Comments
 (0)