Skip to content

Commit f0891e1

Browse files
committed
minor #6932 Bump trix from 2.1.12 to 2.1.15 (dependabot[bot])
This PR was merged into the 4.x branch. Discussion ---------- Bump trix from 2.1.12 to 2.1.15 Bumps [trix](https://github.com/basecamp/trix) from 2.1.12 to 2.1.15. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/basecamp/trix/releases">trix's releases</a>.</em></p> <blockquote> <h2>v2.1.15</h2> <p><strong>Full Changelog</strong>: <a href="https://github.com/basecamp/trix/compare/v2.1.14...v2.1.15">https://github.com/basecamp/trix/compare/v2.1.14...v2.1.15</a></p> <p>Fixes <a href="https://github.com/basecamp/trix/security/advisories/GHSA-mcrw-746g-9q8h">https://github.com/basecamp/trix/security/advisories/GHSA-mcrw-746g-9q8h</a></p> <h2>v2.1.14</h2> <h2>What's Changed</h2> <ul> <li>Bump dompurify to 3.2.5 to resolve security issue by <a href="https://github.com/jakeonrails"><code>@​jakeonrails</code></a> in <a href="https://redirect.github.com/basecamp/trix/pull/1232">basecamp/trix#1232</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/jakeonrails"><code>@​jakeonrails</code></a> made their first contribution in <a href="https://redirect.github.com/basecamp/trix/pull/1232">basecamp/trix#1232</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/basecamp/trix/compare/v2.1.13...v2.1.14">https://github.com/basecamp/trix/compare/v2.1.13...v2.1.14</a></p> <h2>v2.1.13</h2> <h2>What's Changed</h2> <ul> <li>Add test coverage for CSP-<code>&lt;style&gt;</code> integration by <a href="https://github.com/seanpdoyle"><code>@​seanpdoyle</code></a> in <a href="https://redirect.github.com/basecamp/trix/pull/1199">basecamp/trix#1199</a></li> <li>Correct a weird sentence in README.md by <a href="https://github.com/Uaitt"><code>@​Uaitt</code></a> in <a href="https://redirect.github.com/basecamp/trix/pull/1220">basecamp/trix#1220</a></li> <li>Make Trix compatible with morphing by <a href="https://github.com/jorgemanrubia"><code>@​jorgemanrubia</code></a> in <a href="https://redirect.github.com/basecamp/trix/pull/1227">basecamp/trix#1227</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/Uaitt"><code>@​Uaitt</code></a> made their first contribution in <a href="https://redirect.github.com/basecamp/trix/pull/1220">basecamp/trix#1220</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/basecamp/trix/compare/v2.1.12...v2.1.13">https://github.com/basecamp/trix/compare/v2.1.12...v2.1.13</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/basecamp/trix/commit/5f8d56dca618d6f51d9b86f5983c3490dd6588ea"><code>5f8d56d</code></a> v2.1.15</li> <li><a href="https://github.com/basecamp/trix/commit/75226089646841b0f774d8b152e5ec27d2d9e191"><code>7522608</code></a> Merge commit from fork</li> <li><a href="https://github.com/basecamp/trix/commit/5f61df05e66196b9f72d2d5308a1dc2fca33a29b"><code>5f61df0</code></a> Use SAFE_FOR_XML for pasted content</li> <li><a href="https://github.com/basecamp/trix/commit/2d72f93ed52ff0159f65f86bd8f5e0f64e66b486"><code>2d72f93</code></a> v2.1.14</li> <li><a href="https://github.com/basecamp/trix/commit/09ecead6dd0af626fbc0ef5f1dcb19a5f4d2cb55"><code>09ecead</code></a> Merge pull request <a href="https://redirect.github.com/basecamp/trix/issues/1232">#1232</a> from jakeonrails/jakeonrails/update-dompurify-to-3.2...</li> <li><a href="https://github.com/basecamp/trix/commit/447c001ab353c3482c1a3af1a3b1b342c09e9898"><code>447c001</code></a> Bump dompurify to 3.2.5 to resolve security issue</li> <li><a href="https://github.com/basecamp/trix/commit/1e214a7443b4378e76b5944e08d655b39c1a730d"><code>1e214a7</code></a> v2.1.13</li> <li><a href="https://github.com/basecamp/trix/commit/ca6de49255c09e9a97d9576fe1f9756365fdddae"><code>ca6de49</code></a> Merge pull request <a href="https://redirect.github.com/basecamp/trix/issues/1227">#1227</a> from basecamp/morphing</li> <li><a href="https://github.com/basecamp/trix/commit/23299417aa98c63fa3a401437e39c259d0f2aaa0"><code>2329941</code></a> Remove iOS latest since it's failing on Solano</li> <li><a href="https://github.com/basecamp/trix/commit/a8b0f73ef7a797e052acda4d848d89802f1362f1"><code>a8b0f73</code></a> Make Trix compatible with morphing</li> <li>Additional commits viewable in <a href="https://github.com/basecamp/trix/compare/v2.1.12...v2.1.15">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=trix&package-manager=npm_and_yarn&previous-version=2.1.12&new-version=2.1.15)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/EasyCorp/EasyAdminBundle/network/alerts). </details> Commits ------- 8d8d8f0 Bump trix from 2.1.12 to 2.1.15
2 parents daa2fea + 8d8d8f0 commit f0891e1

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"regenerator-runtime": "^0.14.0",
1717
"slugify": "^1.4.0",
1818
"tom-select": "^2.0.1",
19-
"trix": "^2.1.12",
19+
"trix": "^2.1.15",
2020
"webpack": "^5.0.0",
2121
"webpack-cli": "^5.1.4"
2222
},

yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,10 +1618,10 @@ domhandler@^5.0.2, domhandler@^5.0.3:
16181618
dependencies:
16191619
domelementtype "^2.3.0"
16201620

1621-
dompurify@^3.2.3:
1622-
version "3.2.4"
1623-
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.4.tgz#af5a5a11407524431456cf18836c55d13441cd8e"
1624-
integrity sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==
1621+
dompurify@^3.2.5:
1622+
version "3.2.5"
1623+
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.5.tgz#11b108656a5fb72b24d916df17a1421663d7129c"
1624+
integrity sha512-mLPd29uoRe9HpvwP2TxClGQBzGXeEC/we/q+bFlmPPmj2p2Ugl3r6ATu/UU1v77DXNcehiBg9zsr1dREyA/dJQ==
16251625
optionalDependencies:
16261626
"@types/trusted-types" "^2.0.7"
16271627

@@ -2744,12 +2744,12 @@ tom-select@^2.0.1:
27442744
"@orchidjs/sifter" "^1.1.0"
27452745
"@orchidjs/unicode-variants" "^1.1.2"
27462746

2747-
trix@^2.1.12:
2748-
version "2.1.12"
2749-
resolved "https://registry.yarnpkg.com/trix/-/trix-2.1.12.tgz#102306c3a90afcc5b66815ce8d631ee43048a477"
2750-
integrity sha512-0hQvJdy257XuzRdCzSQ/QvcqyTp+8ixMxVLWxSbWvEzD2kgKFlcrMjgWZbtVkJENaod+jm2sBTOWAZVNWK+DMA==
2747+
trix@^2.1.15:
2748+
version "2.1.15"
2749+
resolved "https://registry.yarnpkg.com/trix/-/trix-2.1.15.tgz#fabad796ea779a8ae96522402fbc214cbfc4015f"
2750+
integrity sha512-LoaXWczdTUV8+3Box92B9b1iaDVbxD14dYemZRxi3PwY+AuDm97BUJV2aHLBUFPuDABhxp0wzcbf0CxHCVmXiw==
27512751
dependencies:
2752-
dompurify "^3.2.3"
2752+
dompurify "^3.2.5"
27532753

27542754
undici-types@~6.20.0:
27552755
version "6.20.0"

0 commit comments

Comments
 (0)