feat: Support multi-resolution for Windows Cursors

2024-09-19 07:18:51 -04:00 · 2024-04-26 17:03:53 +05:30 · 2024-04-26 17:03:53 +05:30 · c684a72e96
commit c684a72e96
parent ff9aaa73cc
7 changed files with 575 additions and 177 deletions
--- a/README.md
+++ b/README.md
@ -40,10 +40,14 @@ Open source macOS Cursors for `Windows` and `Linux` with _HiDPI Support_ .

 ### Windows Cursor Size:

-   <kbd>16x16</kbd> - Small
-   <kbd>24x24</kbd> - Regular
-   <kbd>32x32</kbd> - Large
-   <kbd>48x48</kbd> - Extra Large
+| size | Regular (× ²⁄₃) | Large (× ⁴⁄₅) | Extra-Large (× 1) |
+| ---: | --------------: | ------------: | ----------------: |
+|   32 |     21.333 → 22 |     25.6 → 26 |                32 |
+|   48 |              32 |     38.4 → 39 |                48 |
+|   64 |     42.666 → 43 |     51.2 → 52 |                64 |
+|   96 |              64 |     76.8 → 77 |                96 |
+|  128 |     85.333 → 86 |   102.4 → 103 |               128 |
+|  256 |   170.666 → 171 |   204.8 → 205 |               256 |

 ## Colors

--- a/build.sh
+++ b/build.sh
@ -21,7 +21,7 @@ get_config_file() {

 with_version() {
  local comment="${1}"
-  echo "$comment ($version)."
+  echo "$comment ($version)"
 }

 if ! type -p ctgen >/dev/null; then
@ -30,8 +30,8 @@ if ! type -p ctgen >/dev/null; then
 fi

 declare -A names
-names["macOS"]=$(with_version "macOS cursors")
-names["macOS-White"]=$(with_version "White macOS cursors")
+names["macOS"]=$(with_version "macOS")
+names["macOS-White"]=$(with_version "White macOS")

 # Cleanup old builds
 rm -rf themes bin
@ -41,7 +41,7 @@ for key in "${!names[@]}"; do
  comment="${names[$key]}"
  cfg=$(get_config_file key)

-  ctgen "$cfg" -p x11 -d "bitmaps/$key" -n "$key" -c "$comment" &
+  ctgen "configs/x.$cfg" -p x11 -d "bitmaps/$key" -n "$key" -c "$comment XCursors" &
  PID=$!
  wait $PID
 done
@ -51,10 +51,9 @@ for key in "${!names[@]}"; do
  comment="${names[$key]}"
  cfg=$(get_config_file key)

-  ctgen "$cfg" -p windows -s 16 -d "bitmaps/$key" -n "$key-Small" -c "$comment" &
-  ctgen "$cfg" -p windows -s 24 -d "bitmaps/$key" -n "$key-Regular" -c "$comment" &
-  ctgen "$cfg" -p windows -s 32 -d "bitmaps/$key" -n "$key-Large" -c "$comment" &
-  ctgen "$cfg" -p windows -s 48 -d "bitmaps/$key" -n "$key-Extra-Large" -c "$comment" &
+  ctgen "configs/win_rg.$cfg" -d "bitmaps/$key" -n "$key-Regular" -c "$comment Regular Windows Cursors" &
+  ctgen "configs/win_lg.$cfg" -d "bitmaps/$key" -n "$key-Large" -c "$comment Large Windows Cursors" &
+  ctgen "configs/win_xl.$cfg" -d "bitmaps/$key" -n "$key-Extra-Large" -c "$comment Extra Large Windows Cursors" &
  PID=$!
  wait $PID
 done
@ -77,7 +76,7 @@ wait $PID

 # Compressing macOS-*-Windows
 for key in "${!names[@]}"; do
-  zip -rv "../bin/${key}-Windows.zip" "${key}-Small-Windows" "${key}-Regular-Windows" "${key}-Large-Windows" "${key}-Extra-Large-Windows" &
+  zip -rv "../bin/${key}-Windows.zip" "${key}-Regular-Windows" "${key}-Large-Windows" "${key}-Extra-Large-Windows" &
  PID=$!
  wait $PID
 done
--- a/configs/win_lg.build.toml
+++ b/configs/win_lg.build.toml
@ -0,0 +1,130 @@
+[theme]
+name = 'macOS-Large'
+comment = 'macOS Large Windows cursors'
+website = 'https://github.com/ful1e5/apple_cursor'
+
+[config]
+bitmaps_dir = ''      # This config will assigned with `ctgen -d <path>`
+out_dir = '../themes'
+platforms = 'windows'
+
+[cursors]
+[cursors.fallback_settings]
+win_sizes = [26, 39, 52, 77, 103, 205]
+x_hotspot = 128
+y_hotspot = 128
+win_delay = 1
+
+[cursors.all-scroll]
+png = 'all-scroll.png'
+win_name = 'Move'
+
+[cursors.bottom_left_corner]
+png = 'bottom_left_corner.png'
+win_name = 'Dng2'
+
+[cursors.bottom_right_corner]
+png = 'bottom_right_corner.png'
+win_name = 'Dng1'
+
+[cursors.cross]
+png = 'cross.png'
+win_name = 'Cross'
+
+[cursors.crossed_circle]
+png = 'crossed_circle.png'
+x_hotspot = 56
+y_hotspot = 17
+win_name = 'Unavailiable'
+
+[cursors.hand1]
+png = 'hand1.png'
+x_hotspot = 134
+y_hotspot = 81
+win_name = 'Pan'
+
+[cursors.hand2]
+png = 'hand2.png'
+x_hotspot = 92
+y_hotspot = 53
+win_name = 'Link'
+
+[cursors.left_ptr]
+png = 'left_ptr.png'
+x_hotspot = 80
+y_hotspot = 38
+win_name = 'Pointer'
+
+[cursors.left_ptr_watch]
+png = 'left_ptr_watch-*.png'
+x_hotspot = 56
+y_hotspot = 17
+win_sizes = 77
+win_name = 'Work'
+
+[cursors.move]
+png = 'move.png'
+x_hotspot = 139
+y_hotspot = 86
+win_name = 'Grabbing'
+
+[cursors.pencil]
+png = 'pencil.png'
+x_hotspot = 37
+y_hotspot = 218
+win_name = 'Handwriting'
+
+[cursors.question_arrow]
+png = 'question_arrow.png'
+x_hotspot = 128
+y_hotspot = 169
+win_name = 'Help'
+
+[cursors.right_ptr]
+png = 'right_ptr.png'
+x_hotspot = 179
+y_hotspot = 40
+win_name = 'Alternate'
+
+[cursors.sb_h_double_arrow]
+png = 'sb_h_double_arrow.png'
+win_name = 'Horz'
+
+[cursors.sb_v_double_arrow]
+png = 'sb_v_double_arrow.png'
+win_name = 'Vert'
+
+[cursors.wait]
+png = 'wait-*.png'
+win_sizes = 77
+win_name = 'Busy'
+
+[cursors.xterm]
+png = 'xterm.png'
+x_hotspot = 129
+y_hotspot = 136
+win_name = 'Text'
+
+[cursors.zoom-in]
+png = 'zoom-in.png'
+x_hotspot = 99
+y_hotspot = 98
+win_name = 'Zoom-in'
+
+[cursors.zoom-out]
+png = 'zoom-out.png'
+x_hotspot = 99
+y_hotspot = 98
+win_name = 'Zoom-out'
+
+[cursors.person]
+png = 'person.png'
+x_hotspot = 56
+y_hotspot = 17
+win_name = 'Person'
+
+[cursors.pin]
+png = 'pin.png'
+x_hotspot = 56
+y_hotspot = 17
+win_name = 'Pin'
--- a/configs/win_rg.build.toml
+++ b/configs/win_rg.build.toml
@ -0,0 +1,130 @@
+[theme]
+name = 'macOS-Regular'
+comment = 'macOS Regular Windows cursors'
+website = 'https://github.com/ful1e5/apple_cursor'
+
+[config]
+bitmaps_dir = ''      # This config will assigned with `ctgen -d <path>`
+out_dir = '../themes'
+platforms = 'windows'
+
+[cursors]
+[cursors.fallback_settings]
+win_sizes = [22, 32, 43, 64, 86, 171]
+x_hotspot = 128
+y_hotspot = 128
+win_delay = 1
+
+[cursors.all-scroll]
+png = 'all-scroll.png'
+win_name = 'Move'
+
+[cursors.bottom_left_corner]
+png = 'bottom_left_corner.png'
+win_name = 'Dng2'
+
+[cursors.bottom_right_corner]
+png = 'bottom_right_corner.png'
+win_name = 'Dng1'
+
+[cursors.cross]
+png = 'cross.png'
+win_name = 'Cross'
+
+[cursors.crossed_circle]
+png = 'crossed_circle.png'
+x_hotspot = 56
+y_hotspot = 17
+win_name = 'Unavailiable'
+
+[cursors.hand1]
+png = 'hand1.png'
+x_hotspot = 134
+y_hotspot = 81
+win_name = 'Pan'
+
+[cursors.hand2]
+png = 'hand2.png'
+x_hotspot = 92
+y_hotspot = 53
+win_name = 'Link'
+
+[cursors.left_ptr]
+png = 'left_ptr.png'
+x_hotspot = 80
+y_hotspot = 38
+win_name = 'Pointer'
+
+[cursors.left_ptr_watch]
+png = 'left_ptr_watch-*.png'
+x_hotspot = 56
+y_hotspot = 17
+win_sizes = 65
+win_name = 'Work'
+
+[cursors.move]
+png = 'move.png'
+x_hotspot = 139
+y_hotspot = 86
+win_name = 'Grabbing'
+
+[cursors.pencil]
+png = 'pencil.png'
+x_hotspot = 37
+y_hotspot = 218
+win_name = 'Handwriting'
+
+[cursors.question_arrow]
+png = 'question_arrow.png'
+x_hotspot = 128
+y_hotspot = 169
+win_name = 'Help'
+
+[cursors.right_ptr]
+png = 'right_ptr.png'
+x_hotspot = 179
+y_hotspot = 40
+win_name = 'Alternate'
+
+[cursors.sb_h_double_arrow]
+png = 'sb_h_double_arrow.png'
+win_name = 'Horz'
+
+[cursors.sb_v_double_arrow]
+png = 'sb_v_double_arrow.png'
+win_name = 'Vert'
+
+[cursors.wait]
+png = 'wait-*.png'
+win_sizes = 65
+win_name = 'Busy'
+
+[cursors.xterm]
+png = 'xterm.png'
+x_hotspot = 129
+y_hotspot = 136
+win_name = 'Text'
+
+[cursors.zoom-in]
+png = 'zoom-in.png'
+x_hotspot = 99
+y_hotspot = 98
+win_name = 'Zoom-in'
+
+[cursors.zoom-out]
+png = 'zoom-out.png'
+x_hotspot = 99
+y_hotspot = 98
+win_name = 'Zoom-out'
+
+[cursors.person]
+png = 'person.png'
+x_hotspot = 56
+y_hotspot = 17
+win_name = 'Person'
+
+[cursors.pin]
+png = 'pin.png'
+x_hotspot = 56
+y_hotspot = 17
+win_name = 'Pin'
--- a/configs/win_xl.build.toml
+++ b/configs/win_xl.build.toml
@ -0,0 +1,130 @@
+[theme]
+name = 'macOS-Extra-Large'
+comment = 'macOS Extra Large Windows cursors'
+website = 'https://github.com/ful1e5/apple_cursor'
+
+[config]
+bitmaps_dir = ''      # This config will assigned with `ctgen -d <path>`
+out_dir = '../themes'
+platforms = 'windows'
+
+[cursors]
+[cursors.fallback_settings]
+win_sizes = [32, 48, 64, 96, 128, 256]
+x_hotspot = 128
+y_hotspot = 128
+win_delay = 1
+
+[cursors.all-scroll]
+png = 'all-scroll.png'
+win_name = 'Move'
+
+[cursors.bottom_left_corner]
+png = 'bottom_left_corner.png'
+win_name = 'Dng2'
+
+[cursors.bottom_right_corner]
+png = 'bottom_right_corner.png'
+win_name = 'Dng1'
+
+[cursors.cross]
+png = 'cross.png'
+win_name = 'Cross'
+
+[cursors.crossed_circle]
+png = 'crossed_circle.png'
+x_hotspot = 56
+y_hotspot = 17
+win_name = 'Unavailiable'
+
+[cursors.hand1]
+png = 'hand1.png'
+x_hotspot = 134
+y_hotspot = 81
+win_name = 'Pan'
+
+[cursors.hand2]
+png = 'hand2.png'
+x_hotspot = 92
+y_hotspot = 53
+win_name = 'Link'
+
+[cursors.left_ptr]
+png = 'left_ptr.png'
+x_hotspot = 80
+y_hotspot = 38
+win_name = 'Pointer'
+
+[cursors.left_ptr_watch]
+png = 'left_ptr_watch-*.png'
+x_hotspot = 56
+y_hotspot = 17
+win_sizes = 64
+win_name = 'Work'
+
+[cursors.move]
+png = 'move.png'
+x_hotspot = 139
+y_hotspot = 86
+win_name = 'Grabbing'
+
+[cursors.pencil]
+png = 'pencil.png'
+x_hotspot = 37
+y_hotspot = 218
+win_name = 'Handwriting'
+
+[cursors.question_arrow]
+png = 'question_arrow.png'
+x_hotspot = 128
+y_hotspot = 169
+win_name = 'Help'
+
+[cursors.right_ptr]
+png = 'right_ptr.png'
+x_hotspot = 179
+y_hotspot = 40
+win_name = 'Alternate'
+
+[cursors.sb_h_double_arrow]
+png = 'sb_h_double_arrow.png'
+win_name = 'Horz'
+
+[cursors.sb_v_double_arrow]
+png = 'sb_v_double_arrow.png'
+win_name = 'Vert'
+
+[cursors.wait]
+png = 'wait-*.png'
+win_sizes = 64
+win_name = 'Busy'
+
+[cursors.xterm]
+png = 'xterm.png'
+x_hotspot = 129
+y_hotspot = 136
+win_name = 'Text'
+
+[cursors.zoom-in]
+png = 'zoom-in.png'
+x_hotspot = 99
+y_hotspot = 98
+win_name = 'Zoom-in'
+
+[cursors.zoom-out]
+png = 'zoom-out.png'
+x_hotspot = 99
+y_hotspot = 98
+win_name = 'Zoom-out'
+
+[cursors.person]
+png = 'person.png'
+x_hotspot = 56
+y_hotspot = 17
+win_name = 'Person'
+
+[cursors.pin]
+png = 'pin.png'
+x_hotspot = 56
+y_hotspot = 17
+win_name = 'Pin'
--- a/configs/x.build.toml
+++ b/configs/x.build.toml
@ -1,32 +1,28 @@
 [theme]
-name = 'Apple Cursor'
-comment = 'Open source macOS Cursors.'
+name = 'macOS'
+comment = 'macOS Xcursors'
 website = 'https://github.com/ful1e5/apple_cursor'

 [config]
 bitmaps_dir = ''   # This config will assigned with `ctgen -d <path>`
-out_dir = 'themes'
-platforms = ['x11', 'windows']
+out_dir = '../themes'
+platforms = 'x11'

 [cursors]
 [cursors.fallback_settings]
 x11_sizes = [16, 20, 22, 24, 28, 32, 40, 48, 56, 64, 72, 80, 88, 96]
-win_sizes = [24]
 x_hotspot = 128
 y_hotspot = 128
 x11_delay = 20
-win_delay = 1

 [cursors.all-scroll]
 png = 'all-scroll.png'
 x11_name = 'all-scroll'
-win_name = 'Move'
 x11_symlinks = ["fleur", "size_all"]

 [cursors.bottom_left_corner]
 png = 'bottom_left_corner.png'
 x11_name = 'bottom_left_corner'
-win_name = 'Dng2'
 x11_symlinks = [
  "fcf1c3c7cd4491d801f1e1c78f100000",
  "sw-resize",
@ -40,7 +36,6 @@ x11_symlinks = [
 [cursors.bottom_right_corner]
 png = 'bottom_right_corner.png'
 x11_name = 'bottom_right_corner'
-win_name = 'Dng1'
 x11_symlinks = [
  "c7088f0f3e6c8088236ef8e1e3e70000",
  "top_left_corner",
@ -84,7 +79,6 @@ x11_symlinks = [
 [cursors.cross]
 png = 'cross.png'
 x11_name = 'cross'
-win_name = 'Cross'
 x11_symlinks = ["cross_reverse", "diamond_cross", "tcross", "color-picker"]

 [cursors.crossed_circle]
@ -92,12 +86,11 @@ png = 'crossed_circle.png'
 x_hotspot = 56
 y_hotspot = 17
 x11_name = 'crossed_circle'
-win_name = 'Unavailiable'
 x11_symlinks = [
  "03b6e0fcb3499374a867c041f52298f0",
  "not-allowed",
  "forbidden",
-  "circle"
+  "circle",
 ]

 [cursors.crosshair]
@ -119,7 +112,6 @@ png = 'hand1.png'
 x_hotspot = 134
 y_hotspot = 81
 x11_name = 'hand1'
-win_name = 'Pan'
 x11_symlinks = ["grab", "openhand"]

 [cursors.hand2]
@ -127,12 +119,11 @@ png = 'hand2.png'
 x_hotspot = 92
 y_hotspot = 53
 x11_name = 'hand2'
-win_name = 'Link'
 x11_symlinks = [
  "9d800788f1b08800ae810202380a0822",
  "e29285e634086352946a0e7090d73106",
  "pointer",
-  "pointing_hand"
+  "pointing_hand",
 ]

 [cursors.left_ptr]
@ -140,7 +131,6 @@ png = 'left_ptr.png'
 x_hotspot = 80
 y_hotspot = 38
 x11_name = 'left_ptr'
-win_name = 'Pointer'
 x11_symlinks = ["arrow", "default", "top_left_arrow"]

 [cursors.left_ptr_watch]
@ -148,7 +138,6 @@ png = 'left_ptr_watch-*.png'
 x_hotspot = 56
 y_hotspot = 17
 x11_name = 'left_ptr_watch'
-win_name = 'Work'
 x11_symlinks = [
  "00000000000000020006000e7e9ffc3f",
  "08e8e1c95fe2fc01f976f1e063a24ccd",
@ -177,7 +166,7 @@ x11_symlinks = [
  "640fb0e74195791501fd1ed57b41487f",
  "a2a266d0498c3104214a47bd64ab0fc8",
  "alias",
-  "dnd-link"
+  "dnd-link",
 ]

 [cursors.ll_angle]
@ -197,7 +186,6 @@ png = 'move.png'
 x_hotspot = 139
 y_hotspot = 86
 x11_name = 'move'
-win_name = 'Grabbing'
 x11_symlinks = [
  "4498f0e0c1937ffe01fd06f973665830",
  "9081237383d90e509aa00f00170e968f",
@ -206,7 +194,7 @@ x11_symlinks = [
  "pointer_move",
  "dnd-move",
  "closedhand",
-  "dnd-none"
+  "dnd-none",
 ]

 [cursors.pencil]
@ -214,7 +202,6 @@ png = 'pencil.png'
 x_hotspot = 37
 y_hotspot = 218
 x11_name = 'pencil'
-win_name = 'Handwriting'
 x11_symlinks = ["draft"]

 [cursors.plus]
@ -227,14 +214,13 @@ png = 'question_arrow.png'
 x_hotspot = 128
 y_hotspot = 169
 x11_name = 'question_arrow'
-win_name = 'Help'
 x11_symlinks = [
  "5c6cd98b3f3ebcb1f9c7f1c204630408",
  "d9ce0ab605698f320427677b458ad60b",
  "help",
  "left_ptr_help",
  "whats_this",
-  "dnd-ask"
+  "dnd-ask",
 ]

 [cursors.right_ptr]
@ -242,7 +228,6 @@ png = 'right_ptr.png'
 x_hotspot = 179
 y_hotspot = 40
 x11_name = 'right_ptr'
-win_name = 'Alternate'
 x11_symlinks = ["draft_large", "draft_small"]

 [cursors.right_tee]
@ -261,7 +246,6 @@ x11_symlinks = ["down-arrow"]
 [cursors.sb_h_double_arrow]
 png = 'sb_h_double_arrow.png'
 x11_name = 'sb_h_double_arrow'
-win_name = 'Horz'
 x11_symlinks = [
  "028006030e0e7ebffc7f7070c0600140",
  "14fef782d02440884392942c1120523",
@ -270,7 +254,7 @@ x11_symlinks = [
  "h_double_arrow",
  "size-hor",
  "size_hor",
-  "split_h"
+  "split_h",
 ]

 [cursors.sb_left_arrow]
@ -297,7 +281,6 @@ x11_symlinks = ["up-arrow"]
 [cursors.sb_v_double_arrow]
 png = 'sb_v_double_arrow.png'
 x11_name = 'sb_v_double_arrow'
-win_name = 'Vert'
 x11_symlinks = [
  "00008160000006810000408080010102",
  "2870a09082c103050810ffdffffe0204",
@ -307,7 +290,7 @@ x11_symlinks = [
  "size-ver",
  "size_ver",
  "split_v",
-  "v_double_arrow"
+  "v_double_arrow",
 ]

 [cursors.top_side]
@ -342,7 +325,6 @@ x11_name = 'vertical-text'
 [cursors.wait]
 png = 'wait-*.png'
 x11_name = 'wait'
-win_name = 'Busy'
 x11_symlinks = ["watch"]

 [cursors.wayland-cursor]
@ -359,7 +341,6 @@ png = 'xterm.png'
 x_hotspot = 129
 y_hotspot = 136
 x11_name = 'xterm'
-win_name = 'Text'
 x11_symlinks = ["ibeam", "text"]

 [cursors.zoom-in]
@ -367,23 +348,9 @@ png = 'zoom-in.png'
 x_hotspot = 99
 y_hotspot = 98
 x11_name = 'zoom-in'
-win_name = 'Zoom-in'

 [cursors.zoom-out]
 png = 'zoom-out.png'
 x_hotspot = 99
 y_hotspot = 98
 x11_name = 'zoom-out'
-win_name = 'Zoom-out'
-
-[cursors.person]
-png = 'person.png'
-x_hotspot = 56
-y_hotspot = 17
-win_name = 'Person'
-
-[cursors.pin]
-png = 'pin.png'
-x_hotspot = 56
-y_hotspot = 17
-win_name = 'Pin'
--- a/yarn.lock
+++ b/yarn.lock
@ -3,26 +3,27 @@


 "@babel/code-frame@^7.0.0":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
+  integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
  dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
+    "@babel/highlight" "^7.24.2"
+    picocolors "^1.0.0"

 "@babel/helper-validator-identifier@^7.22.20":
  version "7.22.20"
  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==

-"@babel/highlight@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+"@babel/highlight@^7.24.2":
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26"
+  integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==
  dependencies:
    "@babel/helper-validator-identifier" "^7.22.20"
    chalk "^2.4.2"
    js-tokens "^4.0.0"
+    picocolors "^1.0.0"

 "@isaacs/cliui@^8.0.2":
  version "8.0.2"
@ -54,83 +55,83 @@
    unbzip2-stream "1.4.3"
    yargs "17.7.2"

-"@resvg/resvg-js-android-arm-eabi@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.0.tgz#fed7723ed5c5f7490762e025ad704bcbceee37b7"
-  integrity sha512-lJnZ/2P5aMocrFMW7HWhVne5gH82I8xH6zsfH75MYr4+/JOaVcGCTEQ06XFohGMdYRP3v05SSPLPvTM/RHjxfA==
+"@resvg/resvg-js-android-arm-eabi@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.2.tgz#e761e0b688127db64879f455178c92468a9aeabe"
+  integrity sha512-FrJibrAk6v29eabIPgcTUMPXiEz8ssrAk7TXxsiZzww9UTQ1Z5KAbFJs+Z0Ez+VZTYgnE5IQJqBcoSiMebtPHA==

-"@resvg/resvg-js-android-arm64@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.0.tgz#e0531a220ec8954e41039b2483cc3706d30d3635"
-  integrity sha512-N527f529bjMwYWShZYfBD60dXA4Fux+D695QsHQ93BDYZSHUoOh1CUGUyICevnTxs7VgEl98XpArmUWBZQVMfQ==
+"@resvg/resvg-js-android-arm64@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.2.tgz#b8cb564d7f6b3f37d9b43129f5dc5fe171e249e4"
+  integrity sha512-VcOKezEhm2VqzXpcIJoITuvUS/fcjIw5NA/w3tjzWyzmvoCdd+QXIqy3FBGulWdClvp4g+IfUemigrkLThSjAQ==

-"@resvg/resvg-js-darwin-arm64@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.0.tgz#38f609cd2bd71ce6a065df7a8b8144479b156969"
-  integrity sha512-MabUKLVayEwlPo0mIqAmMt+qESN8LltCvv5+GLgVga1avpUrkxj/fkU1TKm8kQegutUjbP/B0QuMuUr0uhF8ew==
+"@resvg/resvg-js-darwin-arm64@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.2.tgz#49bd3faeda5c49f53302d970e6e79d006de18e7d"
+  integrity sha512-nmok2LnAd6nLUKI16aEB9ydMC6Lidiiq2m1nEBDR1LaaP7FGs4AJ90qDraxX+CWlVuRlvNjyYJTNv8qFjtL9+A==

-"@resvg/resvg-js-darwin-x64@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.0.tgz#5c3f69d0cd68980e7e5cfcabf0db90e85d289559"
-  integrity sha512-zrFetdnSw/suXjmyxSjfDV7i61hahv6DDG6kM7BYN2yJ3Es5+BZtqYZTcIWogPJedYKmzN1YTMWGd/3f0ubFiA==
+"@resvg/resvg-js-darwin-x64@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.2.tgz#e1344173aa27bfb4d880ab576d1acf1c1648faca"
+  integrity sha512-GInyZLjgWDfsVT6+SHxQVRwNzV0AuA1uqGsOAW+0th56J7Nh6bHHKXHBWzUrihxMetcFDmQMAX1tZ1fZDYSRsw==

-"@resvg/resvg-js-linux-arm-gnueabihf@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.0.tgz#6bcae7d4101e7fea2be0db167eda832cab63e27f"
-  integrity sha512-sH4gxXt7v7dGwjGyzLwn7SFGvwZG6DQqLaZ11MmzbCwd9Zosy1TnmrMJfn6TJ7RHezmQMgBPi18bl55FZ1AT4A==
+"@resvg/resvg-js-linux-arm-gnueabihf@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.2.tgz#34c445eba45efd68f6130b2ab426d76a7424253d"
+  integrity sha512-YIV3u/R9zJbpqTTNwTZM5/ocWetDKGsro0SWp70eGEM9eV2MerWyBRZnQIgzU3YBnSBQ1RcxRZvY/UxwESfZIw==

-"@resvg/resvg-js-linux-arm64-gnu@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.0.tgz#fb71ea6b9a4b30412fa096fdbf9e8427012b3a99"
-  integrity sha512-fCyMncqCJtrlANADIduYF4IfnWQ295UKib7DAxFXQhBsM9PLDTpizr0qemZcCNadcwSVHnAIzL4tliZhCM8P6A==
+"@resvg/resvg-js-linux-arm64-gnu@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.2.tgz#30da47087dd8153182198b94fe9f8d994890dae5"
+  integrity sha512-zc2BlJSim7YR4FZDQ8OUoJg5holYzdiYMeobb9pJuGDidGL9KZUv7SbiD4E8oZogtYY42UZEap7dqkkYuA91pg==

-"@resvg/resvg-js-linux-arm64-musl@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.0.tgz#ec7e85b8b6eea23c0242faa1f1486241f253a190"
-  integrity sha512-ouLjTgBQHQyxLht4FdMPTvuY8xzJigM9EM2Tlu0llWkN1mKyTQrvYWi6TA6XnKdzDJHy7ZLpWpjZi7F5+Pg+Vg==
+"@resvg/resvg-js-linux-arm64-musl@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.2.tgz#5d75b8ff5c83103729c1ca3779987302753c50d4"
+  integrity sha512-3h3dLPWNgSsD4lQBJPb4f+kvdOSJHa5PjTYVsWHxLUzH4IFTJUAnmuWpw4KqyQ3NA5QCyhw4TWgxk3jRkQxEKg==

-"@resvg/resvg-js-linux-x64-gnu@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.0.tgz#2a9b2a14554b0b1825c2ebc52b5fc2d95a831a63"
-  integrity sha512-n3zC8DWsvxC1AwxpKFclIPapDFibs5XdIRoV/mcIlxlh0vseW1F49b97F33BtJQRmlntsqqN6GMMqx8byB7B+Q==
+"@resvg/resvg-js-linux-x64-gnu@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.2.tgz#411abedfaee5edc57cbb7701736cecba522e26f3"
+  integrity sha512-IVUe+ckIerA7xMZ50duAZzwf1U7khQe2E0QpUxu5MBJNao5RqC0zwV/Zm965vw6D3gGFUl7j4m+oJjubBVoftw==

-"@resvg/resvg-js-linux-x64-musl@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.0.tgz#42081a8b06ccfa011aee9cc10b2f0fea3a4563ed"
-  integrity sha512-n4tasK1HOlAxdTEROgYA1aCfsEKk0UOFDNd/AQTTZlTmCbHKXPq+O8npaaKlwXquxlVK8vrkcWbksbiGqbCAcw==
+"@resvg/resvg-js-linux-x64-musl@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.2.tgz#fe4984038f0372f279e3ff570b72934dd7eb2a5c"
+  integrity sha512-UOf83vqTzoYQO9SZ0fPl2ZIFtNIz/Rr/y+7X8XRX1ZnBYsQ/tTb+cj9TE+KHOdmlTFBxhYzVkP2lRByCzqi4jQ==

-"@resvg/resvg-js-win32-arm64-msvc@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.0.tgz#3af0d5f7bd9193ac6be8f226b539be6f7576302d"
-  integrity sha512-X2+EoBJFwDI5LDVb51Sk7ldnVLitMGr9WwU/i21i3fAeAXZb3hM16k67DeTy16OYkT2dk/RfU1tP1wG+rWbz2Q==
+"@resvg/resvg-js-win32-arm64-msvc@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.2.tgz#d3a053cf7ff687087a2106330c0fdaae706254d1"
+  integrity sha512-7C/RSgCa+7vqZ7qAbItfiaAWhyRSoD4l4BQAbVDqRRsRgY+S+hgS3in0Rxr7IorKUpGE69X48q6/nOAuTJQxeQ==

-"@resvg/resvg-js-win32-ia32-msvc@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.0.tgz#64af45bfee41cb2bea0b6dd0bdc94175183f2b56"
-  integrity sha512-L7oevWjQoUgK5W1fCKn0euSVemhDXVhrjtwqpc7MwBKKimYeiOshO1Li1pa8bBt5PESahenhWgdB6lav9O0fEg==
+"@resvg/resvg-js-win32-ia32-msvc@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.2.tgz#7cdda1ce29ef7209e28191d917fa5bef0624a4ad"
+  integrity sha512-har4aPAlvjnLcil40AC77YDIk6loMawuJwFINEM7n0pZviwMkMvjb2W5ZirsNOZY4aDbo5tLx0wNMREp5Brk+w==

-"@resvg/resvg-js-win32-x64-msvc@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.0.tgz#08431a243c15f002d32e5e628857d19852323274"
-  integrity sha512-8lJlghb+Unki5AyKgsnFbRJwkEj9r1NpwyuBG8yEJiG1W9eEGl03R3I7bsVa3haof/3J1NlWf0rzSa1G++A2iw==
+"@resvg/resvg-js-win32-x64-msvc@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.2.tgz#cb0ad04525d65f3def4c8d346157a57976d5b388"
+  integrity sha512-ZXtYhtUr5SSaBrUDq7DiyjOFJqBVL/dOBN7N/qmi/pO0IgiWW/f/ue3nbvu9joWE5aAKDoIzy/CxsY0suwGosQ==

 "@resvg/resvg-js@^2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@resvg/resvg-js/-/resvg-js-2.6.0.tgz#d811100796dda1f37a516c747dab3bbc9b24e5e4"
-  integrity sha512-Tf3YpbBKcQn991KKcw/vg7vZf98v01seSv6CVxZBbRkL/xyjnoYB6KgrFL6zskT1A4dWC/vg77KyNOW+ePaNlA==
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@resvg/resvg-js/-/resvg-js-2.6.2.tgz#3e92a907d88d879256c585347c5b21a7f3bb5b46"
+  integrity sha512-xBaJish5OeGmniDj9cW5PRa/PtmuVU3ziqrbr5xJj901ZDN4TosrVaNZpEiLZAxdfnhAe7uQ7QFWfjPe9d9K2Q==
  optionalDependencies:
-    "@resvg/resvg-js-android-arm-eabi" "2.6.0"
-    "@resvg/resvg-js-android-arm64" "2.6.0"
-    "@resvg/resvg-js-darwin-arm64" "2.6.0"
-    "@resvg/resvg-js-darwin-x64" "2.6.0"
-    "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.0"
-    "@resvg/resvg-js-linux-arm64-gnu" "2.6.0"
-    "@resvg/resvg-js-linux-arm64-musl" "2.6.0"
-    "@resvg/resvg-js-linux-x64-gnu" "2.6.0"
-    "@resvg/resvg-js-linux-x64-musl" "2.6.0"
-    "@resvg/resvg-js-win32-arm64-msvc" "2.6.0"
-    "@resvg/resvg-js-win32-ia32-msvc" "2.6.0"
-    "@resvg/resvg-js-win32-x64-msvc" "2.6.0"
+    "@resvg/resvg-js-android-arm-eabi" "2.6.2"
+    "@resvg/resvg-js-android-arm64" "2.6.2"
+    "@resvg/resvg-js-darwin-arm64" "2.6.2"
+    "@resvg/resvg-js-darwin-x64" "2.6.2"
+    "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.2"
+    "@resvg/resvg-js-linux-arm64-gnu" "2.6.2"
+    "@resvg/resvg-js-linux-arm64-musl" "2.6.2"
+    "@resvg/resvg-js-linux-x64-gnu" "2.6.2"
+    "@resvg/resvg-js-linux-x64-musl" "2.6.2"
+    "@resvg/resvg-js-win32-arm64-msvc" "2.6.2"
+    "@resvg/resvg-js-win32-ia32-msvc" "2.6.2"
+    "@resvg/resvg-js-win32-x64-msvc" "2.6.2"

 "@tootallnate/quickjs-emscripten@^0.23.0":
  version "0.23.0"
@ -138,21 +139,23 @@
  integrity sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==

 "@types/node@*":
-  version "18.8.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.8.3.tgz#ce750ab4017effa51aed6a7230651778d54e327c"
-  integrity sha512-0os9vz6BpGwxGe9LOhgP/ncvYN5Tx1fNcd2TM3rD/aCGBkysb+ZWpXEocG24h6ZzOi13+VB8HndAQFezsSOw1w==
+  version "20.12.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.7.tgz#04080362fa3dd6c5822061aa3124f5c152cff384"
+  integrity sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==
+  dependencies:
+    undici-types "~5.26.4"

 "@types/yauzl@^2.9.1":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599"
-  integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==
+  version "2.10.3"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999"
+  integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==
  dependencies:
    "@types/node" "*"

-agent-base@^7.0.2, agent-base@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
-  integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
+agent-base@^7.0.2, agent-base@^7.1.0, agent-base@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
  dependencies:
    debug "^4.3.4"

@ -208,9 +211,9 @@ balanced-match@^1.0.0:
  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==

 bare-events@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.2.0.tgz#a7a7263c107daf8b85adf0b64f908503454ab26e"
-  integrity sha512-Yyyqff4PIFfSuthCZqLlPISTWHmnQxoPuAvkmgzsJEmG3CesdIv6Xweayl0JkCZJSB2yYIdJyEz97tpxNhgjbg==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.2.2.tgz#a98a41841f98b2efe7ecc5c5468814469b018078"
+  integrity sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==

 base64-js@^1.3.1:
  version "1.5.1"
@ -540,15 +543,15 @@ get-uri@^6.0.1:
    fs-extra "^11.2.0"

 glob@^10.3.4:
-  version "10.3.10"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
-  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
+  version "10.3.12"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b"
+  integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==
  dependencies:
    foreground-child "^3.1.0"
-    jackspeak "^2.3.5"
+    jackspeak "^2.3.6"
    minimatch "^9.0.1"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-    path-scurry "^1.10.1"
+    minipass "^7.0.4"
+    path-scurry "^1.10.2"

 graceful-fs@^4.1.6, graceful-fs@^4.2.0:
  version "4.2.11"
@ -627,7 +630,7 @@ isexe@^2.0.0:
  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==

-jackspeak@^2.3.5:
+jackspeak@^2.3.6:
  version "2.3.6"
  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
@ -680,29 +683,29 @@ log-symbols@^5.1.0:
    chalk "^5.0.0"
    is-unicode-supported "^1.1.0"

+lru-cache@^10.2.0:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.1.tgz#e8d901141f22937968e45a6533d52824070151e4"
+  integrity sha512-tS24spDe/zXhWbNPErCHs/AGOzbKGHT+ybSBqmdLm8WZ1xXLWvH8Qn71QPAlqVhd0qUTWjy+Kl9JmISgDdEjsA==
+
 lru-cache@^7.14.1:
  version "7.18.3"
  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==

-"lru-cache@^9.1.1 || ^10.0.0":
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
-  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
-
 mimic-fn@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==

 minimatch@^9.0.1:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
  dependencies:
    brace-expansion "^2.0.1"

-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4:
  version "7.0.4"
  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
@ -807,12 +810,12 @@ path-key@^3.1.0:
  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==

-path-scurry@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
-  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
+path-scurry@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7"
+  integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==
  dependencies:
-    lru-cache "^9.1.1 || ^10.0.0"
+    lru-cache "^10.2.0"
    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"

 pend@~1.2.0:
@ -820,6 +823,11 @@ pend@~1.2.0:
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==

+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
 pixelmatch@^5.3.0:
  version "5.3.0"
  resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-5.3.0.tgz#5e5321a7abedfb7962d60dbf345deda87cb9560a"
@ -896,9 +904,9 @@ queue-tick@^1.0.1:
  integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==

 readable-stream@^3.4.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
  dependencies:
    inherits "^2.0.3"
    string_decoder "^1.1.1"
@ -955,18 +963,18 @@ smart-buffer@^4.2.0:
  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==

 socks-proxy-agent@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad"
-  integrity sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz#6b2da3d77364fde6292e810b496cb70440b9b89d"
+  integrity sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==
  dependencies:
-    agent-base "^7.0.2"
+    agent-base "^7.1.1"
    debug "^4.3.4"
    socks "^2.7.1"

 socks@^2.7.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.1.tgz#22c7d9dd7882649043cba0eafb49ae144e3457af"
-  integrity sha512-B6w7tkwNid7ToxjZ08rQMT8M9BJAf8DKx8Ft4NivzH0zBUfd6jldGcisJn/RLgxcX3FPNDdNQCUEMMT79b+oCQ==
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.3.tgz#1ebd0f09c52ba95a09750afe3f3f9f724a800cb5"
+  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
  dependencies:
    ip-address "^9.0.5"
    smart-buffer "^4.2.0"
@ -998,7 +1006,16 @@ streamx@^2.15.0:
  optionalDependencies:
    bare-events "^2.2.0"

-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
  version "4.2.3"
  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@ -1032,7 +1049,14 @@ string_decoder@^1.1.1:
  dependencies:
    safe-buffer "~5.2.0"

-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
  version "6.0.1"
  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@ -1094,6 +1118,11 @@ unbzip2-stream@1.4.3:
    buffer "^5.2.1"
    through "^2.3.8"

+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 universalify@^2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
@ -1129,7 +1158,16 @@ which@^2.0.1:
  dependencies:
    isexe "^2.0.0"

-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
  version "7.0.0"
  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==