fix yarn 2 issue

storybookjs · Sep 4, 2023 · 7bbcad0 · 7bbcad0
1 parent 9e1136e
commit 7bbcad0
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 115 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -32,6 +32,8 @@ jobs:
       - name: Upgrade to storybook@next
         run: |
           npx storybook@next upgrade --prerelease --yes
+        env:
+          YARN_ENABLE_IMMUTABLE_INSTALLS: false
 
       - name: Run test runner
         uses: mathiasvr/command-output@v1
@@ -114,6 +116,8 @@ jobs:
       - name: Upgrade to storybook@next
         run: |
           npx storybook@next upgrade --prerelease --yes
+        env:
+          YARN_ENABLE_IMMUTABLE_INSTALLS: false
 
       - name: Run test runner and expect failure
         uses: mathiasvr/command-output@v1

diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "@storybook/addon-coverage": "^0.0.7",
     "@storybook/addon-essentials": "^7.3.0",
     "@storybook/addon-interactions": "^7.3.0",
-    "@storybook/jest": "^0.1.0",
+    "@storybook/jest": "^0.2.2",
     "@storybook/react": "^7.3.0",
     "@storybook/react-vite": "^7.3.0",
     "@storybook/testing-library": "^0.2.0",

diff --git a/yarn.lock b/yarn.lock
@@ -5,10 +5,10 @@ __metadata:
   version: 6
   cacheKey: 8
 
-"@adobe/css-tools@npm:^4.0.1":
-  version: 4.2.0
-  resolution: "@adobe/css-tools@npm:4.2.0"
-  checksum: dc5cc92ba3d562e7ffddb79d6d222c7e00b65f255fd2725b3d71490ff268844be322f917415d8c4ab39eca646343b632058db8bd5b1d646193fcc94d1d3e420b
+"@adobe/css-tools@npm:^4.3.0":
+  version: 4.3.1
+  resolution: "@adobe/css-tools@npm:4.3.1"
+  checksum: ad43456379ff391132aff687ece190cb23ea69395e23c9b96690eeabe2468da89a4aaf266e4f8b6eaab53db3d1064107ce0f63c3a974e864f4a04affc768da3f
   languageName: node
   linkType: hard
 
@@ -5011,20 +5011,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/channel-postmessage@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@storybook/channel-postmessage@npm:7.0.2"
-  dependencies:
-    "@storybook/channels": 7.0.2
-    "@storybook/client-logger": 7.0.2
-    "@storybook/core-events": 7.0.2
-    "@storybook/global": ^5.0.0
-    qs: ^6.10.0
-    telejson: ^7.0.3
-  checksum: ef175027b4b5794af263c6ec40f6caab02deb3c189598493f5612cd5745d9cada1427914dbf39aef01dbf3e71f4299d35cfcaaaad727c06da47850b56044032c
-  languageName: node
-  linkType: hard
-
 "@storybook/channel-postmessage@npm:7.0.22":
   version: 7.0.22
   resolution: "@storybook/channel-postmessage@npm:7.0.22"
@@ -5039,13 +5025,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/channels@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@storybook/channels@npm:7.0.2"
-  checksum: 34ff0481a7f8bf613a9b1c9ffc3db4e48e8c80fea29d66b68a9c3b74d52040d87a5ed002d0e3e287813f33ad607440d46078e5e96367bf98713c72efb587d4a3
-  languageName: node
-  linkType: hard
-
 "@storybook/channels@npm:7.0.22":
   version: 7.0.22
   resolution: "@storybook/channels@npm:7.0.22"
@@ -5118,15 +5097,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/client-logger@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@storybook/client-logger@npm:7.0.2"
-  dependencies:
-    "@storybook/global": ^5.0.0
-  checksum: 3deb50e8cde7777025753938e21318ee34c10237e29664cfb2dfd08f70d84b073961e1b546629e536ef53f26a91a9aed2c83223d7cfe1680787ecee7e39ce8a8
-  languageName: node
-  linkType: hard
-
 "@storybook/client-logger@npm:7.0.22":
   version: 7.0.22
   resolution: "@storybook/client-logger@npm:7.0.22"
@@ -5258,13 +5228,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/core-events@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@storybook/core-events@npm:7.0.2"
-  checksum: 5bca4db82f582b939ba1aaba26aee3e8f9aa0a2d36728934b4d26dbe858b6f455a46ddcf4e8e6c7b3f5fa5b517716c503626febca08e53712d516f2ca105bf11
-  languageName: node
-  linkType: hard
-
 "@storybook/core-events@npm:7.0.22":
   version: 7.0.22
   resolution: "@storybook/core-events@npm:7.0.22"
@@ -5451,28 +5414,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/instrumenter@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0":
-  version: 7.0.2
-  resolution: "@storybook/instrumenter@npm:7.0.2"
-  dependencies:
-    "@storybook/channels": 7.0.2
-    "@storybook/client-logger": 7.0.2
-    "@storybook/core-events": 7.0.2
-    "@storybook/global": ^5.0.0
-    "@storybook/preview-api": 7.0.2
-  checksum: 1f0fcd2fd6561030897558ee6fb363da23bbbc67f08d12204f885da9ffc90f180703b3fbd85f01758e0f7a066437ebd6af415d4eefcb9ddb1e8ad16fd37e3eae
-  languageName: node
-  linkType: hard
-
-"@storybook/jest@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "@storybook/jest@npm:0.1.0"
+"@storybook/jest@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "@storybook/jest@npm:0.2.2"
   dependencies:
     "@storybook/expect": storybook-jest
-    "@storybook/instrumenter": ^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0
-    "@testing-library/jest-dom": ^5.16.2
+    "@testing-library/jest-dom": ^6.1.2
+    "@types/jest": 28.1.3
     jest-mock: ^27.3.0
-  checksum: 74a4b9dc0ce921f72c2f4fbba053e4a4c84a6a16d07406492a26733f55438229197e547364d0848ac3df38ab5ce9e20829029196d376a267033d8e75904ab611
+  checksum: bff58ef0b5bed1f8a0a753c7d8861667f6ca8852671e06fa294af254511f6796057475c5788aecd5f9790366c8c46b504040121afb2e0ea714fa5ffa79bea220
   languageName: node
   linkType: hard
 
@@ -5542,29 +5492,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/preview-api@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@storybook/preview-api@npm:7.0.2"
-  dependencies:
-    "@storybook/channel-postmessage": 7.0.2
-    "@storybook/channels": 7.0.2
-    "@storybook/client-logger": 7.0.2
-    "@storybook/core-events": 7.0.2
-    "@storybook/csf": ^0.1.0
-    "@storybook/global": ^5.0.0
-    "@storybook/types": 7.0.2
-    "@types/qs": ^6.9.5
-    dequal: ^2.0.2
-    lodash: ^4.17.21
-    memoizerific: ^1.11.3
-    qs: ^6.10.0
-    synchronous-promise: ^2.0.15
-    ts-dedent: ^2.0.0
-    util-deprecate: ^1.0.2
-  checksum: 350811420c996c9616b59615fe2fe7785ec6590301ed3a6a54b07ca4b2bb45614f47b4cacf037c72ed1d7dd04a8647d0e99a4e2e0f23f91a0dc5d1e8f3486ee2
-  languageName: node
-  linkType: hard
-
 "@storybook/preview-api@npm:7.3.1":
   version: 7.3.1
   resolution: "@storybook/preview-api@npm:7.3.1"
@@ -5733,7 +5660,7 @@ __metadata:
     "@storybook/core-common": ^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0
     "@storybook/csf": ^0.1.1
     "@storybook/csf-tools": ^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0
-    "@storybook/jest": ^0.1.0
+    "@storybook/jest": ^0.2.2
     "@storybook/preview-api": ^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0
     "@storybook/react": ^7.3.0
     "@storybook/react-vite": ^7.3.0
@@ -5810,18 +5737,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/types@npm:7.0.2":
-  version: 7.0.2
-  resolution: "@storybook/types@npm:7.0.2"
-  dependencies:
-    "@storybook/channels": 7.0.2
-    "@types/babel__core": ^7.0.0
-    "@types/express": ^4.7.0
-    file-system-cache: ^2.0.0
-  checksum: 329e271af5621619a8d17fff222e4170b62ca4b451bcb48b5a899d63bb8df211c5d3d8dafa2266ac3c9801bf64c4ac1aed73950a2f21da82333b19c448ea32e0
-  languageName: node
-  linkType: hard
-
 "@storybook/types@npm:7.0.22":
   version: 7.0.22
   resolution: "@storybook/types@npm:7.0.22"
@@ -5983,20 +5898,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/jest-dom@npm:^5.16.2":
-  version: 5.16.5
-  resolution: "@testing-library/jest-dom@npm:5.16.5"
+"@testing-library/jest-dom@npm:^6.1.2":
+  version: 6.1.2
+  resolution: "@testing-library/jest-dom@npm:6.1.2"
   dependencies:
-    "@adobe/css-tools": ^4.0.1
+    "@adobe/css-tools": ^4.3.0
     "@babel/runtime": ^7.9.2
-    "@types/testing-library__jest-dom": ^5.9.1
     aria-query: ^5.0.0
     chalk: ^3.0.0
     css.escape: ^1.5.1
     dom-accessibility-api: ^0.5.6
     lodash: ^4.17.15
     redent: ^3.0.0
-  checksum: 94911f901a8031f3e489d04ac057cb5373621230f5d92bed80e514e24b069fb58a3166d1dd86963e55f078a1bd999da595e2ab96ed95f452d477e272937d792a
+  peerDependencies:
+    "@jest/globals": ">= 28"
+    "@types/jest": ">= 28"
+    jest: ">= 28"
+    vitest: ">= 0.32"
+  peerDependenciesMeta:
+    "@jest/globals":
+      optional: true
+    "@types/jest":
+      optional: true
+    jest:
+      optional: true
+    vitest:
+      optional: true
+  checksum: de6b7f98d1b42887192eb70fd917b2b98d92aab22a86801718de75e0ca4964589335efeb650b0f7b9859609446b20d2bd81bfc5755f1655885d5664d1c093a70
   languageName: node
   linkType: hard
 
@@ -6267,7 +6195,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:*, @types/jest@npm:>=26.0.0":
+"@types/jest@npm:28.1.3":
+  version: 28.1.3
+  resolution: "@types/jest@npm:28.1.3"
+  dependencies:
+    jest-matcher-utils: ^28.0.0
+    pretty-format: ^28.0.0
+  checksum: 28141f2d5b3bafd063362de9790cb8f219488d9b0ad47524a84bef1142a4f0d9d35be0c56988d9f922205225cc83c986acd4be424bd8653b38dc27ab672455e2
+  languageName: node
+  linkType: hard
+
+"@types/jest@npm:>=26.0.0":
   version: 29.5.0
   resolution: "@types/jest@npm:29.5.0"
   dependencies:
@@ -6451,15 +6389,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/testing-library__jest-dom@npm:^5.9.1":
-  version: 5.14.5
-  resolution: "@types/testing-library__jest-dom@npm:5.14.5"
-  dependencies:
-    "@types/jest": "*"
-  checksum: dcb05416758fe88c1f4f3aa97b4699fcb46a5ed8f53c6b81721e66155452a48caf12ecb97dfdfd4130678e65efd66b9fca0ac434b3d63affec84842a84a6bf38
-  languageName: node
-  linkType: hard
-
 "@types/unist@npm:^2.0.0":
   version: 2.0.6
   resolution: "@types/unist@npm:2.0.6"
@@ -11139,7 +11068,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:^28.1.3":
+"jest-matcher-utils@npm:^28.0.0, jest-matcher-utils@npm:^28.1.3":
   version: 28.1.3
   resolution: "jest-matcher-utils@npm:28.1.3"
   dependencies:
@@ -13309,7 +13238,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^28.1.3":
+"pretty-format@npm:^28.0.0, pretty-format@npm:^28.1.3":
   version: 28.1.3
   resolution: "pretty-format@npm:28.1.3"
   dependencies: