From 0cbe4cf13dac6abbfc5092c72837b4866b2bc1e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 May 2024 10:08:49 +0000
Subject: [PATCH] Bump the npm_and_yarn group across 1 directory with 2 updates

Bumps the npm_and_yarn group with 2 updates in the / directory: [trix](https://github.com/basecamp/trix) and [follow-redirects](https://github.com/follow-redirects/follow-redirects).


Updates `trix` from 2.0.5 to 2.1.1
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.0.5...v2.1.1)

Updates `follow-redirects` from 1.15.2 to 1.15.6
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.6)

---
updated-dependencies:
- dependency-name: trix
  dependency-type: direct:development
  dependency-group: npm_and_yarn
- dependency-name: follow-redirects
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 actiontext/package.json |  4 ++--
 yarn.lock               | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/actiontext/package.json b/actiontext/package.json
index eb6af4e5a981d..461e834be2008 100644
--- a/actiontext/package.json
+++ b/actiontext/package.json
@@ -25,13 +25,13 @@
     "@rails/activestorage": ">= 7.1.0-alpha"
   },
   "peerDependencies": {
-    "trix": "^2.0.0"
+    "trix": "^2.1.1"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^19.0.1",
     "@rollup/plugin-node-resolve": "^11.0.1",
     "rollup": "^2.35.1",
-    "trix": "^2.0.0"
+    "trix": "^2.1.1"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"
diff --git a/yarn.lock b/yarn.lock
index 7194c4865d5f4..d4f2b96b9b84d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1256,9 +1256,9 @@ flatted@^3.1.0, flatted@^3.2.7:
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
 follow-redirects@^1.0.0:
-  version "1.15.2"
-  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -2848,10 +2848,10 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
-trix@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/trix/-/trix-2.0.5.tgz"
-  integrity sha512-OiCbDf17F7JahEwhyL1MvK9DxAAT1vkaW5sn+zpwfemZAcc4RfQB4ku18/1mKP58LRwBhjcy+6TBho7ciXz52Q==
+trix@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/trix/-/trix-2.1.1.tgz#688f1213601316cf8b92c5e625d2f562c118c780"
+  integrity sha512-IljOMGOlRUPg1i5Pk/+x/Ia65ZY7Gw5JxxKCh/4caxG5ZaKuFJCKdn1+TF0efUYfdg+bqWenB/mAYCHjZu0zpQ==
 
 tsconfig-paths@^3.14.2:
   version "3.14.2"