Merge branch 'next' into norbert/cpc

2025-04-07 07:21:17 +08:00 · 2024-06-06 15:39:48 +02:00 · 2024-06-06 15:39:48 +02:00 · 7e678e921d
commit 7e678e921d
parent 59efad1267 194f7139f7
8 changed files with 71 additions and 48 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,10 @@
+## 8.1.6
+
+- CLI: Only log the UpgradeStorybookToSameVersionError but continue the upgrade as normal - [#27217](https://github.com/storybookjs/storybook/pull/27217), thanks @kasperpeulen!
+- Core: Replace ip function with a small helper function to address security concerns - [#27529](https://github.com/storybookjs/storybook/pull/27529), thanks @tony19!
+- Tags: Fix unsafe project-level tags lookup - [#27511](https://github.com/storybookjs/storybook/pull/27511), thanks @shilman!
+- Vite: Fix stats-plugin to normalize file names with posix paths - [#27218](https://github.com/storybookjs/storybook/pull/27218), thanks @AlexAtVista!
+
 ## 8.1.5

 - CSF-Tools: Fix export specifier bug - [#27418](https://github.com/storybookjs/storybook/pull/27418), thanks @valentinpalkovic!
--- a/code/.yarn/patches/@vitest-expect-npm-1.6.0-0e382f8212.patch
+++ b/code/.yarn/patches/@vitest-expect-npm-1.6.0-0e382f8212.patch
@ -1,5 +1,5 @@
 diff --git a/dist/index.js b/dist/index.js
-index 640839e4b9fef0f25d08d055d4350845a8a29791..844f3d5834147848b5fa54276e96e665bcc675f9 100644
+index 13af149aa3c44f52dd5c5a80db3bf5689dfe15ea..1d111032c3fdc104723e19dea49db62be8b79b94 100644
 --- a/dist/index.js
 +++ b/dist/index.js
@@ -6,26 +6,32 @@ import { processError } from '@vitest/utils/error';
--- a/code/core/package.json
+++ b/code/core/package.json
@ -225,13 +225,13 @@
  },
  "dependencies": {
    "@storybook/csf": "^0.1.7",
-    "@testing-library/dom": "^9.3.4",
-    "@testing-library/jest-dom": "^6.4.2",
+    "@testing-library/dom": "^10.1.0",
+    "@testing-library/jest-dom": "^6.4.5",
    "@testing-library/user-event": "^14.5.2",
    "@types/express": "^4.17.21",
    "@types/node": "^18.0.0",
-    "@vitest/expect": "1.3.1",
-    "@vitest/spy": "^1.3.1",
+    "@vitest/expect": "1.6.0",
+    "@vitest/spy": "^1.6.0",
    "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
    "esbuild-register": "^3.5.0",
    "express": "^4.19.2",
--- a/code/package.json
+++ b/code/package.json
@ -82,7 +82,7 @@
    "@playwright/test": "1.36.0",
    "@testing-library/jest-dom/aria-query": "5.1.3",
    "@types/node": "^18.0.0",
-    "@vitest/expect": "patch:@vitest/expect@npm%3A1.3.1#~/.yarn/patches/@vitest-expect-npm-1.3.1-973071a540.patch",
+    "@vitest/expect": "patch:@vitest/expect@npm%3A1.6.0#~/.yarn/patches/@vitest-expect-npm-1.6.0-0e382f8212.patch",
    "esbuild": "^0.20.1",
    "playwright": "1.36.0",
    "playwright-core": "1.36.0",
--- a/code/yarn.lock
+++ b/code/yarn.lock
@ -5825,8 +5825,8 @@ __metadata:
    "@storybook/icons": "npm:^1.2.5"
    "@storybook/test": "workspace:*"
    "@tanstack/react-virtual": "npm:^3.3.0"
-    "@testing-library/dom": "npm:^9.3.4"
-    "@testing-library/jest-dom": "npm:^6.4.2"
+    "@testing-library/dom": "npm:^10.1.0"
+    "@testing-library/jest-dom": "npm:^6.4.5"
    "@testing-library/react": "npm:^11.2.2"
    "@testing-library/user-event": "npm:^14.5.2"
    "@types/doctrine": "npm:^0.0.3"
@ -5846,8 +5846,8 @@ __metadata:
    "@types/react-transition-group": "npm:^4"
    "@types/semver": "npm:^7.3.4"
    "@types/util-deprecate": "npm:^1.0.0"
-    "@vitest/expect": "npm:1.3.1"
-    "@vitest/spy": "npm:^1.3.1"
+    "@vitest/expect": "npm:1.6.0"
+    "@vitest/spy": "npm:^1.6.0"
    "@vitest/utils": "npm:^1.3.1"
    "@yarnpkg/fslib": "npm:2.10.3"
    "@yarnpkg/libzip": "npm:2.3.0"
@ -7016,6 +7016,22 @@ __metadata:
  languageName: node
  linkType: hard

+"@testing-library/dom@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "@testing-library/dom@npm:10.1.0"
+  dependencies:
+    "@babel/code-frame": "npm:^7.10.4"
+    "@babel/runtime": "npm:^7.12.5"
+    "@types/aria-query": "npm:^5.0.1"
+    aria-query: "npm:5.3.0"
+    chalk: "npm:^4.1.0"
+    dom-accessibility-api: "npm:^0.5.9"
+    lz-string: "npm:^1.5.0"
+    pretty-format: "npm:^27.0.2"
+  checksum: 10c0/81f0e0a510d24e458c3af17777960ed678fb4fe464903ef8ec9ed816c9794fc69a673ea94f87b9e054b181383c51814605451dbf4fd9df93d0d8f24b4859990d
+  languageName: node
+  linkType: hard
+
 "@testing-library/dom@npm:^7.28.1, @testing-library/dom@npm:^7.29.4":
  version: 7.31.2
  resolution: "@testing-library/dom@npm:7.31.2"
@ -7032,7 +7048,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@testing-library/dom@npm:^9.0.0, @testing-library/dom@npm:^9.3.1, @testing-library/dom@npm:^9.3.3, @testing-library/dom@npm:^9.3.4":
+"@testing-library/dom@npm:^9.0.0, @testing-library/dom@npm:^9.3.1, @testing-library/dom@npm:^9.3.3":
  version: 9.3.4
  resolution: "@testing-library/dom@npm:9.3.4"
  dependencies:
@ -7078,9 +7094,9 @@ __metadata:
  languageName: node
  linkType: hard

-"@testing-library/jest-dom@npm:^6.4.1, @testing-library/jest-dom@npm:^6.4.2":
-  version: 6.4.2
-  resolution: "@testing-library/jest-dom@npm:6.4.2"
+"@testing-library/jest-dom@npm:^6.4.1, @testing-library/jest-dom@npm:^6.4.5":
+  version: 6.4.5
+  resolution: "@testing-library/jest-dom@npm:6.4.5"
  dependencies:
    "@adobe/css-tools": "npm:^4.3.2"
    "@babel/runtime": "npm:^7.9.2"
@ -7088,7 +7104,7 @@ __metadata:
    chalk: "npm:^3.0.0"
    css.escape: "npm:^1.5.1"
    dom-accessibility-api: "npm:^0.6.3"
-    lodash: "npm:^4.17.15"
+    lodash: "npm:^4.17.21"
    redent: "npm:^3.0.0"
  peerDependencies:
    "@jest/globals": ">= 28"
@ -7107,7 +7123,7 @@ __metadata:
      optional: true
    vitest:
      optional: true
-  checksum: 10c0/e7eba527b34ce30cde94424d2ec685bdfed51daaafb7df9b68b51aec6052e99a50c8bfe654612dacdf857a1eb81d68cf294fc89de558ee3a992bf7a6019fffcc
+  checksum: 10c0/4cfdd44e2abab2b9d399c47cbfe686729bb65160d7df0f9e2329aaaea7702f6e852a9eefb29b468f00c1e5a5274b684f8cac76959d33299dfa909ba007ea191d
  languageName: node
  linkType: hard

@ -8571,25 +8587,25 @@ __metadata:
  languageName: node
  linkType: hard

-"@vitest/expect@npm:1.3.1":
-  version: 1.3.1
-  resolution: "@vitest/expect@npm:1.3.1"
+"@vitest/expect@npm:1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/expect@npm:1.6.0"
  dependencies:
-    "@vitest/spy": "npm:1.3.1"
-    "@vitest/utils": "npm:1.3.1"
+    "@vitest/spy": "npm:1.6.0"
+    "@vitest/utils": "npm:1.6.0"
    chai: "npm:^4.3.10"
-  checksum: 10c0/ea66a1e912d896a481a27631b68089b885af7e8ed62ba8aaa119c37a9beafe6c094fd672775a20e6e23460af66e294f9ca259e6e0562708d1b7724eaaf53c7bb
+  checksum: 10c0/a4351f912a70543e04960f5694f1f1ac95f71a856a46e87bba27d3eb72a08c5d11d35021cbdc6077452a152e7d93723fc804bba76c2cc53c8896b7789caadae3
  languageName: node
  linkType: hard

-"@vitest/expect@patch:@vitest/expect@npm%3A1.3.1#~/.yarn/patches/@vitest-expect-npm-1.3.1-973071a540.patch":
-  version: 1.3.1
-  resolution: "@vitest/expect@patch:@vitest/expect@npm%3A1.3.1#~/.yarn/patches/@vitest-expect-npm-1.3.1-973071a540.patch::version=1.3.1&hash=9dbd39"
+"@vitest/expect@patch:@vitest/expect@npm%3A1.6.0#~/.yarn/patches/@vitest-expect-npm-1.6.0-0e382f8212.patch":
+  version: 1.6.0
+  resolution: "@vitest/expect@patch:@vitest/expect@npm%3A1.6.0#~/.yarn/patches/@vitest-expect-npm-1.6.0-0e382f8212.patch::version=1.6.0&hash=7cb178"
  dependencies:
-    "@vitest/spy": "npm:1.3.1"
-    "@vitest/utils": "npm:1.3.1"
+    "@vitest/spy": "npm:1.6.0"
+    "@vitest/utils": "npm:1.6.0"
    chai: "npm:^4.3.10"
-  checksum: 10c0/f54446b97ffac9d64653ed771b883e4d733dc4f3bb6d4b161a583a8c5ef0461383f3d457174af71baf5b2d3c92e1b75495f0c1d0cca75644ad4a6f0df8f4ec55
+  checksum: 10c0/073cfd09bfe6934408d0041be5a7251c2f80563a655f9387b8cd16a802752b47f1084de921ad6b5c45a48b5447773c52358c1cf68bb7e3b665b44c8cba19d8d3
  languageName: node
  linkType: hard

@ -8624,12 +8640,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@vitest/spy@npm:1.3.1, @vitest/spy@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "@vitest/spy@npm:1.3.1"
+"@vitest/spy@npm:1.6.0, @vitest/spy@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "@vitest/spy@npm:1.6.0"
  dependencies:
    tinyspy: "npm:^2.2.0"
-  checksum: 10c0/efc42f679d2a51fc6583ca3136ccd47581cb27c923ed3cb0500f5dee9aac99b681bfdd400c16ef108f2e0761daa642bc190816a6411931a2aba99ebf8b213dd4
+  checksum: 10c0/df66ea6632b44fb76ef6a65c1abbace13d883703aff37cd6d062add6dcd1b883f19ce733af8e0f7feb185b61600c6eb4042a518e4fb66323d0690ec357f9401c
  languageName: node
  linkType: hard

@ -8645,15 +8661,15 @@ __metadata:
  languageName: node
  linkType: hard

-"@vitest/utils@npm:1.3.1, @vitest/utils@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "@vitest/utils@npm:1.3.1"
+"@vitest/utils@npm:1.6.0, @vitest/utils@npm:^1.3.1":
+  version: 1.6.0
+  resolution: "@vitest/utils@npm:1.6.0"
  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: 10c0/d604c8ad3b1aee30d4dcd889098f591407bfe18547ff96485b1d1ed54eff58219c756a9544a7fbd4e37886863abacd7a89a76334cb3ea7f84c3d496bb757db23
+  checksum: 10c0/8b0d19835866455eb0b02b31c5ca3d8ad45f41a24e4c7e1f064b480f6b2804dc895a70af332f14c11ed89581011b92b179718523f55f5b14787285a0321b1301
  languageName: node
  linkType: hard

@ -9708,6 +9724,15 @@ __metadata:
  languageName: node
  linkType: hard

+"aria-query@npm:5.3.0, aria-query@npm:^5.3.0":
+  version: 5.3.0
+  resolution: "aria-query@npm:5.3.0"
+  dependencies:
+    dequal: "npm:^2.0.3"
+  checksum: 10c0/2bff0d4eba5852a9dd578ecf47eaef0e82cc52569b48469b0aac2db5145db0b17b7a58d9e01237706d1e14b7a1b0ac9b78e9c97027ad97679dd8f91b85da1469
+  languageName: node
+  linkType: hard
+
 "aria-query@npm:^4.2.2":
  version: 4.2.2
  resolution: "aria-query@npm:4.2.2"
@ -9718,15 +9743,6 @@ __metadata:
  languageName: node
  linkType: hard

-"aria-query@npm:^5.3.0":
-  version: 5.3.0
-  resolution: "aria-query@npm:5.3.0"
-  dependencies:
-    dequal: "npm:^2.0.3"
-  checksum: 10c0/2bff0d4eba5852a9dd578ecf47eaef0e82cc52569b48469b0aac2db5145db0b17b7a58d9e01237706d1e14b7a1b0ac9b78e9c97027ad97679dd8f91b85da1469
-  languageName: node
-  linkType: hard
-
 "arr-diff@npm:^4.0.0":
  version: 4.0.0
  resolution: "arr-diff@npm:4.0.0"
--- a/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json
+++ b/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json
@ -91,7 +91,7 @@
    "@storybook/nextjs": "^8.0.0",
    "@storybook/react": "^8.0.0",
    "@storybook/test": "^8.0.0",
-    "@testing-library/jest-dom": "^6.4.2",
+    "@testing-library/jest-dom": "^6.4.5",
    "@testing-library/react": "^14.2.1",
    "@types/react": "^18.2.55",
    "@types/react-dom": "^18.2.19",
--- a/test-storybooks/portable-stories-kitchen-sink/react/package.json
+++ b/test-storybooks/portable-stories-kitchen-sink/react/package.json
@ -93,7 +93,7 @@
    "@storybook/test": "^8.0.0",
    "@swc/core": "^1.4.2",
    "@swc/jest": "^0.2.36",
-    "@testing-library/jest-dom": "^6.4.2",
+    "@testing-library/jest-dom": "^6.4.5",
    "@testing-library/react": "^14.2.1",
    "@types/identity-obj-proxy": "^3",
    "@types/react": "^18.2.55",
--- a/test-storybooks/portable-stories-kitchen-sink/vue3/package.json
+++ b/test-storybooks/portable-stories-kitchen-sink/vue3/package.json
@ -89,7 +89,7 @@
    "@storybook/test": "^8.0.0",
    "@storybook/vue3": "^8.0.0",
    "@storybook/vue3-vite": "^8.0.0",
-    "@testing-library/jest-dom": "^6.4.2",
+    "@testing-library/jest-dom": "^6.4.5",
    "@typescript-eslint/eslint-plugin": "^6.21.0",
    "@typescript-eslint/parser": "^6.21.0",
    "@vitejs/plugin-vue": "^5.0.4",