Skip to content

Commit 788b126

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/rollup/plugin-json-6.1.0
2 parents 7a93d94 + 0cc8f0c commit 788b126

File tree

2 files changed

+107
-14
lines changed

2 files changed

+107
-14
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"prettier": "^3.3.3",
9999
"prettier-plugin-jsdoc": "^1.3.0",
100100
"pretty-bytes": "^5.6.0",
101-
"rollup": "^3.29.5",
101+
"rollup": "^4.22.5",
102102
"rollup-plugin-terser": "^7.0.0",
103103
"rollup-plugin-typescript2": "^0.36.0",
104104
"shx": "^0.3.2",

yarn.lock

Lines changed: 106 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,6 +1442,86 @@
14421442
estree-walker "^2.0.2"
14431443
picomatch "^2.3.1"
14441444

1445+
1446+
version "4.22.5"
1447+
resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.5.tgz#e0f5350845090ca09690fe4a472717f3b8aae225"
1448+
integrity sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==
1449+
1450+
1451+
version "4.22.5"
1452+
resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.5.tgz#08270faef6747e2716d3e978a8bbf479f75fb19a"
1453+
integrity sha512-S4pit5BP6E5R5C8S6tgU/drvgjtYW76FBuG6+ibG3tMvlD1h9LHVF9KmlmaUBQ8Obou7hEyS+0w+IR/VtxwNMQ==
1454+
1455+
1456+
version "4.22.5"
1457+
resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.5.tgz#691671133b350661328d42c8dbdedd56dfb97dfd"
1458+
integrity sha512-250ZGg4ipTL0TGvLlfACkIxS9+KLtIbn7BCZjsZj88zSg2Lvu3Xdw6dhAhfe/FjjXPVNCtcSp+WZjVsD3a/Zlw==
1459+
1460+
1461+
version "4.22.5"
1462+
resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.5.tgz#b2ec52a1615f24b1cd40bc8906ae31af81e8a342"
1463+
integrity sha512-D8brJEFg5D+QxFcW6jYANu+Rr9SlKtTenmsX5hOSzNYVrK5oLAEMTUgKWYJP+wdKyCdeSwnapLsn+OVRFycuQg==
1464+
1465+
1466+
version "4.22.5"
1467+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.5.tgz#217f01f304808920680bd269002df38e25d9205f"
1468+
integrity sha512-PNqXYmdNFyWNg0ma5LdY8wP+eQfdvyaBAojAXgO7/gs0Q/6TQJVXAXe8gwW9URjbS0YAammur0fynYGiWsKlXw==
1469+
1470+
1471+
version "4.22.5"
1472+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.5.tgz#93ac1c5a1e389f4482a2edaeec41fcffee54a930"
1473+
integrity sha512-kSSCZOKz3HqlrEuwKd9TYv7vxPYD77vHSUvM2y0YaTGnFc8AdI5TTQRrM1yIp3tXCKrSL9A7JLoILjtad5t8pQ==
1474+
1475+
1476+
version "4.22.5"
1477+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.5.tgz#a7f146787d6041fecc4ecdf1aa72234661ca94a4"
1478+
integrity sha512-oTXQeJHRbOnwRnRffb6bmqmUugz0glXaPyspp4gbQOPVApdpRrY/j7KP3lr7M8kTfQTyrBUzFjj5EuHAhqH4/w==
1479+
1480+
1481+
version "4.22.5"
1482+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.5.tgz#6a37236189648e678bd564d6e8ca798f42cf42c5"
1483+
integrity sha512-qnOTIIs6tIGFKCHdhYitgC2XQ2X25InIbZFor5wh+mALH84qnFHvc+vmWUpyX97B0hNvwNUL4B+MB8vJvH65Fw==
1484+
1485+
1486+
version "4.22.5"
1487+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.5.tgz#5661420dc463bec31ecb2d17d113de858cfcfe2d"
1488+
integrity sha512-TMYu+DUdNlgBXING13rHSfUc3Ky5nLPbWs4bFnT+R6Vu3OvXkTkixvvBKk8uO4MT5Ab6lC3U7x8S8El2q5o56w==
1489+
1490+
1491+
version "4.22.5"
1492+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.5.tgz#cb00342b7432bdef723aa606281de2f522d6dcf7"
1493+
integrity sha512-PTQq1Kz22ZRvuhr3uURH+U/Q/a0pbxJoICGSprNLAoBEkyD3Sh9qP5I0Asn0y0wejXQBbsVMRZRxlbGFD9OK4A==
1494+
1495+
1496+
version "4.22.5"
1497+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.5.tgz#0708889674dccecccd28e2befccf791e0767fcb7"
1498+
integrity sha512-bR5nCojtpuMss6TDEmf/jnBnzlo+6n1UhgwqUvRoe4VIotC7FG1IKkyJbwsT7JDsF2jxR+NTnuOwiGv0hLyDoQ==
1499+
1500+
1501+
version "4.22.5"
1502+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.5.tgz#a135b040b21582e91cfed2267ccfc7d589e1dbc6"
1503+
integrity sha512-N0jPPhHjGShcB9/XXZQWuWBKZQnC1F36Ce3sDqWpujsGjDz/CQtOL9LgTrJ+rJC8MJeesMWrMWVLKKNR/tMOCA==
1504+
1505+
1506+
version "4.22.5"
1507+
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.5.tgz#88395a81a3ab7ee3dc8dc31a73ff62ed3185f34d"
1508+
integrity sha512-uBa2e28ohzNNwjr6Uxm4XyaA1M/8aTgfF2T7UIlElLaeXkgpmIJ2EitVNQxjO9xLLLy60YqAgKn/AqSpCUkE9g==
1509+
1510+
1511+
version "4.22.5"
1512+
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.5.tgz#12ee49233b1125f2c1da38392f63b1dbb0c31bba"
1513+
integrity sha512-RXT8S1HP8AFN/Kr3tg4fuYrNxZ/pZf1HemC5Tsddc6HzgGnJm0+Lh5rAHJkDuW3StI0ynNXukidROMXYl6ew8w==
1514+
1515+
1516+
version "4.22.5"
1517+
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.5.tgz#0f987b134c6b3123c22842b33ba0c2b6fb78cc3b"
1518+
integrity sha512-ElTYOh50InL8kzyUD6XsnPit7jYCKrphmddKAe1/Ytt74apOxDq5YEcbsiKs0fR3vff3jEneMM+3I7jbqaMyBg==
1519+
1520+
1521+
version "4.22.5"
1522+
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.5.tgz#f2feb149235a5dc1deb5439758f8871255e5a161"
1523+
integrity sha512-+lvL/4mQxSV8MukpkKyyvfwhH266COcWlXE/1qxwN08ajovta3459zrjLghYMgDerlzNwLAcFpvU+WWE5y6nAQ==
1524+
14451525
"@shikijs/[email protected]":
14461526
version "1.18.0"
14471527
resolved "https://registry.yarnpkg.com/@shikijs/core/-/core-1.18.0.tgz#30dde8e53026dada606c4cf7f32d80a3f33d437c"
@@ -1553,15 +1633,10 @@
15531633
dependencies:
15541634
"@types/ms" "*"
15551635

1556-
"@types/estree@*":
1557-
version "0.0.45"
1558-
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884"
1559-
integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==
1560-
1561-
"@types/estree@^1.0.0":
1562-
version "1.0.0"
1563-
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
1564-
integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
1636+
"@types/estree@*", "@types/[email protected]", "@types/estree@^1.0.0":
1637+
version "1.0.6"
1638+
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
1639+
integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
15651640

15661641
"@types/graceful-fs@^4.1.3":
15671642
version "4.1.9"
@@ -4867,11 +4942,29 @@ rollup-plugin-typescript2@^0.36.0:
48674942
semver "^7.5.4"
48684943
tslib "^2.6.2"
48694944

4870-
rollup@^3.29.5:
4871-
version "3.29.5"
4872-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.5.tgz#8a2e477a758b520fb78daf04bca4c522c1da8a54"
4873-
integrity sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==
4945+
rollup@^4.22.5:
4946+
version "4.22.5"
4947+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.22.5.tgz#d5108cc470249417e50492456253884d19f5d40f"
4948+
integrity sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==
4949+
dependencies:
4950+
"@types/estree" "1.0.6"
48744951
optionalDependencies:
4952+
"@rollup/rollup-android-arm-eabi" "4.22.5"
4953+
"@rollup/rollup-android-arm64" "4.22.5"
4954+
"@rollup/rollup-darwin-arm64" "4.22.5"
4955+
"@rollup/rollup-darwin-x64" "4.22.5"
4956+
"@rollup/rollup-linux-arm-gnueabihf" "4.22.5"
4957+
"@rollup/rollup-linux-arm-musleabihf" "4.22.5"
4958+
"@rollup/rollup-linux-arm64-gnu" "4.22.5"
4959+
"@rollup/rollup-linux-arm64-musl" "4.22.5"
4960+
"@rollup/rollup-linux-powerpc64le-gnu" "4.22.5"
4961+
"@rollup/rollup-linux-riscv64-gnu" "4.22.5"
4962+
"@rollup/rollup-linux-s390x-gnu" "4.22.5"
4963+
"@rollup/rollup-linux-x64-gnu" "4.22.5"
4964+
"@rollup/rollup-linux-x64-musl" "4.22.5"
4965+
"@rollup/rollup-win32-arm64-msvc" "4.22.5"
4966+
"@rollup/rollup-win32-ia32-msvc" "4.22.5"
4967+
"@rollup/rollup-win32-x64-msvc" "4.22.5"
48754968
fsevents "~2.3.2"
48764969

48774970
run-parallel@^1.1.9:

0 commit comments

Comments
 (0)