From 6124b11907e4f3c298840e161114305a1da06af8 Mon Sep 17 00:00:00 2001
From: Tim Cowlishaw <tim@timcowlishaw.co.uk>
Date: Wed, 25 Sep 2024 08:26:49 +0200
Subject: [PATCH] update npm version for yarn, yarn install in CI

---
 ci.sh        |  2 +-
 package.json |  6 +++---
 yarn.lock    | 26 +++++++++++++-------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ci.sh b/ci.sh
index 78f930c..70a7d8e 100755
--- a/ci.sh
+++ b/ci.sh
@@ -1,2 +1,2 @@
 #/bin/sh
-rake db:create && yarn install --check-files && rails action_text:install && rake assets:precompile && rake test && rake test:system
+rake db:create && yarn install --check-files && rake test && rake test:system
diff --git a/package.json b/package.json
index 6c946ac..3a4dc8f 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "@babel/plugin-proposal-optional-chaining": "^7.21.0",
     "@hotwired/turbo-rails": "^8.0.3",
     "@rails/actioncable": "~7.0",
-    "@rails/actiontext": "~7.0",
+    "@rails/actiontext": "^7.2.100",
     "@rails/activestorage": "~7.0",
     "@rails/ujs": "~7.0",
     "@rails/webpacker": "~5.4",
@@ -16,7 +16,7 @@
     "chartkick": "^4.0.4",
     "sortablejs": "^1.13.0",
     "stimulus": "^2.0.0",
-    "trix": "^1.2.0",
+    "trix": "^2.1.5",
     "turbolinks": "^5.2.0"
   },
   "version": "0.1.0",
@@ -24,6 +24,6 @@
     "webpack-dev-server": "^3.11.2"
   },
   "engines": {
-    "node": "14.21.3"
+    "node": "18.19.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 117e842..326d3ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1153,17 +1153,17 @@
   resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.8.tgz#f44e7517f2d1570f1eabeea457dbeb17ed3a2d12"
   integrity sha512-GjYQv89ZOOfbFw8VMNUOG33GXzyAA/TCVoD+742Ob4svm1XXUkd+w+ewqUXd+7VHQtV35y1/O78AGIPeJDTy/g==
 
-"@rails/actiontext@~7.0":
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/@rails/actiontext/-/actiontext-7.0.8.tgz#aa9f84f1726cce07ff24af9df376995354755a4c"
-  integrity sha512-AsG3QRX7K04c3mlkGBvTf1QRSxOMf7RXv9ve2jlA5C2AsBNHCOeVMmurTLRIC5Q8Mvd4WCUgC+TaNO+BN59WLw==
+"@rails/actiontext@^7.2.100":
+  version "7.2.100"
+  resolved "https://registry.yarnpkg.com/@rails/actiontext/-/actiontext-7.2.100.tgz#e235c8150d252490902f8b33026bc0a030cce8e4"
+  integrity sha512-46oDEZdkxpbM/7+3GwSHTRyIkH3LRZRC9OE35rMIt0FcRbjXW+2Q7RL1YYjoy7megqnoCUDZglFISJQxJ/HBZg==
   dependencies:
-    "@rails/activestorage" ">= 7.0.0-alpha1"
+    "@rails/activestorage" ">= 7.2.0-alpha"
 
-"@rails/activestorage@>= 7.0.0-alpha1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.1.3.tgz#e83ece6c5fd94b3ddf30a8cf3b8f78cad049e596"
-  integrity sha512-B+RFYAU8vdTPFg0IJcRp2ey0Qw9hpcUOqHHcWqftDJ76ZMBi9+m/UUeMJlNsSd0l9eD+1HLlFSo1X//cY4yiDw==
+"@rails/activestorage@>= 7.2.0-alpha":
+  version "7.2.100"
+  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.2.100.tgz#c1e643d3c35c62c946e6f7c8d812fa567d2ce915"
+  integrity sha512-gohCilm1E10W51Hc9iT960xX9TP11L5TJ4W1ufs9f3h5Ncsw01S/eHgVUfcdfszqw3G+28Z0MFu999+iSpgdTg==
   dependencies:
     spark-md5 "^3.0.1"
 
@@ -7188,10 +7188,10 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-trix@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/trix/-/trix-1.3.1.tgz#ccce8d9e72bf0fe70c8c019ff558c70266f8d857"
-  integrity sha512-BbH6mb6gk+AV4f2as38mP6Ucc1LE3OD6XxkZnAgPIduWXYtvg2mI3cZhIZSLqmMh9OITEpOBCCk88IVmyjU7bA==
+trix@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/trix/-/trix-2.1.5.tgz#512bc811172bea196de4a92fa8308c0914f263f9"
+  integrity sha512-5pC4olCp7BwxTC8Joy1Kv33kDvSOApi9Tqf6c8wygqCgeCx9xPP5cxkZEhvKpMV+kjd9gszingd5fZo834+ktw==
 
 ts-pnp@^1.1.6:
   version "1.2.0"