From 1ee879a5ad095d23e844c1f849729705ede2c720 Mon Sep 17 00:00:00 2001
From: Soapbox Bot <soapbox+bot@alexgleason.me>
Date: Fri, 20 Oct 2023 00:07:16 +0000
Subject: [PATCH 1/2] Update Node.js to v21

---
 .gitlab-ci.yml | 2 +-
 Dockerfile     | 2 +-
 Dockerfile.dev | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbc2c6b3a8..a70cded640 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: node:20
+image: node:21
 
 variables:
   NODE_ENV: test
diff --git a/Dockerfile b/Dockerfile
index 2765f20537..fa790e7ad5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20 as build
+FROM node:21 as build
 WORKDIR /app
 COPY package.json .
 COPY yarn.lock .
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 1e60569458..bb15e6d86a 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:21
 
 RUN apt-get update &&\
     apt-get install -y inotify-tools &&\

From 8cb9260a1a417f4979d28d15b2bb6974613722c3 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 20 Dec 2023 22:21:14 -0600
Subject: [PATCH 2/2] Upgrade sass, bump nodejs in .tool-versions

---
 .tool-versions | 2 +-
 package.json   | 2 +-
 yarn.lock      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 6de89a83ab..b5ed8dc795 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-nodejs 20.0.0
+nodejs 21.4.0
diff --git a/package.json b/package.json
index 7b5fdcf26e..fd6510038e 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
     "redux-thunk": "^2.2.0",
     "reselect": "^4.0.0",
     "resize-observer-polyfill": "^1.5.1",
-    "sass": "^1.66.1",
+    "sass": "^1.69.5",
     "semver": "^7.3.8",
     "stringz": "^2.0.0",
     "substring-trie": "^1.0.2",
diff --git a/yarn.lock b/yarn.lock
index 4c87200cf9..c05e7d4665 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7850,10 +7850,10 @@ safe-regex-test@^1.0.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass@^1.66.1:
-  version "1.66.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.66.1.tgz#04b51c4671e4650aa393740e66a4e58b44d055b1"
-  integrity sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==
+sass@^1.69.5:
+  version "1.69.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde"
+  integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"