Skip to content

Commit ab8fd46

Browse files
authored
Merge branch 'main' into fix/translation_key_class_attribute
2 parents 5b3ffe5 + 8b4e242 commit ab8fd46

File tree

2 files changed

+33
-11
lines changed

2 files changed

+33
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"tailwindcss": "^3.4.17",
8383
"tailwindcss-stimulus-components": "^3.0.4",
8484
"tippy.js": "^6.3.7",
85-
"trix": "^2.1.10",
85+
"trix": "^2.1.12",
8686
"turbo_power": "^0.6.2",
8787
"urijs": "^1.19.11"
8888
},

yarn.lock

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5103,8 +5103,16 @@ stimulus-use@^0.50.0:
51035103
dependencies:
51045104
hotkeys-js ">=3"
51055105

5106-
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0:
5107-
name string-width-cjs
5106+
"string-width-cjs@npm:string-width@^4.2.0":
5107+
version "4.2.3"
5108+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
5109+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
5110+
dependencies:
5111+
emoji-regex "^8.0.0"
5112+
is-fullwidth-code-point "^3.0.0"
5113+
strip-ansi "^6.0.1"
5114+
5115+
string-width@^4.1.0, string-width@^4.2.0:
51085116
version "4.2.3"
51095117
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
51105118
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -5204,8 +5212,14 @@ string.prototype.trimstart@^1.0.8:
52045212
define-properties "^1.2.1"
52055213
es-object-atoms "^1.0.0"
52065214

5207-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
5208-
name strip-ansi-cjs
5215+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
5216+
version "6.0.1"
5217+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
5218+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
5219+
dependencies:
5220+
ansi-regex "^5.0.1"
5221+
5222+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
52095223
version "6.0.1"
52105224
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
52115225
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -5334,10 +5348,10 @@ to-regex-range@^5.0.1:
53345348
dependencies:
53355349
is-number "^7.0.0"
53365350

5337-
trix@^2.1.10:
5338-
version "2.1.10"
5339-
resolved "https://registry.yarnpkg.com/trix/-/trix-2.1.10.tgz#6f048115c2c20206067abbab8a6e7308710c39e0"
5340-
integrity sha512-PrMOKriE76tJbjqiOFpjTiRkOomWBiGPT/YrBw83HJ5SlFAcybYZVjVlkDkOrFZoYI4qCfWUw42BTAjSE9KSYQ==
5351+
trix@^2.1.12:
5352+
version "2.1.12"
5353+
resolved "https://registry.yarnpkg.com/trix/-/trix-2.1.12.tgz#102306c3a90afcc5b66815ce8d631ee43048a477"
5354+
integrity sha512-0hQvJdy257XuzRdCzSQ/QvcqyTp+8ixMxVLWxSbWvEzD2kgKFlcrMjgWZbtVkJENaod+jm2sBTOWAZVNWK+DMA==
53415355
dependencies:
53425356
dompurify "^3.2.3"
53435357

@@ -5605,8 +5619,16 @@ which@^2.0.1:
56055619
dependencies:
56065620
isexe "^2.0.0"
56075621

5608-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
5609-
name wrap-ansi-cjs
5622+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
5623+
version "7.0.0"
5624+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
5625+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
5626+
dependencies:
5627+
ansi-styles "^4.0.0"
5628+
string-width "^4.1.0"
5629+
strip-ansi "^6.0.0"
5630+
5631+
wrap-ansi@^7.0.0:
56105632
version "7.0.0"
56115633
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
56125634
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

0 commit comments

Comments
 (0)