From c6ebe215d88d384e76b34b426430653722834111 Mon Sep 17 00:00:00 2001
From: Leonabcd123 <156839416+Leonabcd123@users.noreply.github.com>
Date: Sun, 5 Jul 2026 13:01:45 +0200
Subject: [PATCH 1/8] fix(wikipedia): skip empty sections (@Leonabcd123)
 (#8162)

Prevents the `Random word is empty` error, which doesn't provide any
value to the user, as we fetch again until we get valid text.
---
 frontend/src/ts/test/wikipedia.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/ts/test/wikipedia.ts b/frontend/src/ts/test/wikipedia.ts
index af890e5a1c2d..4519d06641eb 100644
--- a/frontend/src/ts/test/wikipedia.ts
+++ b/frontend/src/ts/test/wikipedia.ts
@@ -100,6 +100,12 @@ export async function getSection(
           // Removing whitespace before and after text
           sectionText = sectionText.trim();
 
+          // If this section is empty, fetch another one
+          if (sectionText === "") {
+            res(getSection(language));
+            return;
+          }
+
           const words = sectionText.split(" ");
 
           const section = new JSONData.Section(

From 897769258a4367d2d2cb7c09491df873d62b7c87 Mon Sep 17 00:00:00 2001
From: Christian Fehmer <fehmer@users.noreply.github.com>
Date: Sun, 5 Jul 2026 15:24:19 +0200
Subject: [PATCH 2/8] refactor: solid streak hour offset  modal (@fehmer)
 (#8196)

Co-authored-by: Miodec <jack@monkeytype.com>
---
 frontend/src/html/popups.html                 |  28 +--
 frontend/src/styles/popups.scss               |  38 ----
 frontend/src/ts/components/modals/Modals.tsx  |   2 +
 .../modals/StreakHourOffsetModal.tsx          | 174 ++++++++++++++++++
 .../pages/account-settings/AccountTab.tsx     |   4 +-
 .../ts/components/ui/form/FieldIndicator.tsx  |   6 +-
 .../src/ts/components/ui/form/InputField.tsx  |   6 +-
 frontend/src/ts/modals/streak-hour-offset.ts  | 156 ----------------
 frontend/src/ts/states/modals.ts              |   3 +-
 9 files changed, 190 insertions(+), 227 deletions(-)
 create mode 100644 frontend/src/ts/components/modals/StreakHourOffsetModal.tsx
 delete mode 100644 frontend/src/ts/modals/streak-hour-offset.ts

diff --git a/frontend/src/html/popups.html b/frontend/src/html/popups.html
index 3ee31d09cc30..2f920af7ec60 100644
--- a/frontend/src/html/popups.html
+++ b/frontend/src/html/popups.html
@@ -120,33 +120,7 @@
     <button>Report</button>
   </div>
 </dialog>
-<dialog id="streakHourOffsetModal" class="modalWrapper hidden">
-  <div class="modal">
-    <div class="title">Set streak hour offset</div>
-    <div class="text">
-      Streaks reset at midnight UTC by default. If this is not convenient for
-      you (for example if it means that streaks reset in the middle of the day),
-      you can change the hour offset here.
-      <br />
-      <br />
-      This will not take daylight savings time into consideration!
-      <br />
-      <br />
-      <span class="red">You can only do this once!</span>
-    </div>
-    <div class="group">
-      <button class="decreaseOffset">
-        <i class="fas fa-fw fa-chevron-left"></i>
-      </button>
-      <input type="number" min="-11" max="12" value="0" step="0.5" />
-      <button class="increaseOffset">
-        <i class="fas fa-fw fa-chevron-right"></i>
-      </button>
-    </div>
-    <div class="preview"></div>
-    <button class="submit">set</button>
-  </div>
-</dialog>
+
 <dialog id="editResultTagsModal" class="modalWrapper hidden">
   <div class="modal">
     <div class="title">Edit result tags</div>
diff --git a/frontend/src/styles/popups.scss b/frontend/src/styles/popups.scss
index b205e273e190..f0fa36a4f34c 100644
--- a/frontend/src/styles/popups.scss
+++ b/frontend/src/styles/popups.scss
@@ -302,41 +302,3 @@ body.darkMode {
     }
   }
 }
-
-#streakHourOffsetModal {
-  .modal {
-    max-width: 500px;
-    .red {
-      color: var(--error-color);
-    }
-    .group {
-      display: grid;
-      grid-template-columns: 1fr 1fr 1fr;
-      gap: 0.5rem;
-      justify-items: center;
-      align-items: center;
-      font-size: 2em;
-      button {
-        width: 100%;
-      }
-      input {
-        text-align: center;
-      }
-    }
-    .preview {
-      & > div:first-child {
-        margin-bottom: 1rem;
-      }
-      .row {
-        display: flex;
-        gap: 1rem;
-      }
-      div:first-child {
-        flex-grow: 1;
-      }
-      div:last-child {
-        align-self: center;
-      }
-    }
-  }
-}
diff --git a/frontend/src/ts/components/modals/Modals.tsx b/frontend/src/ts/components/modals/Modals.tsx
index 632e0cc13172..81b34905e493 100644
--- a/frontend/src/ts/components/modals/Modals.tsx
+++ b/frontend/src/ts/components/modals/Modals.tsx
@@ -16,6 +16,7 @@ import { QuoteSearchModal } from "./QuoteSearchModal";
 import { RegisterCaptchaModal } from "./RegisterCaptchaModal";
 import { ShareTestSettings } from "./ShareTestSettings";
 import { SimpleModal } from "./SimpleModal";
+import { StreakHourOffsetModal } from "./StreakHourOffsetModal";
 import { SupportModal } from "./SupportModal";
 import { VersionHistoryModal } from "./VersionHistoryModal";
 
@@ -40,6 +41,7 @@ export function Modals(): JSXElement {
       <EditPresetModal />
       <ViewApeKeyModal />
       <LastSignedOutResultModal />
+      <StreakHourOffsetModal />
     </>
   );
 }
diff --git a/frontend/src/ts/components/modals/StreakHourOffsetModal.tsx b/frontend/src/ts/components/modals/StreakHourOffsetModal.tsx
new file mode 100644
index 000000000000..8bace5e0809d
--- /dev/null
+++ b/frontend/src/ts/components/modals/StreakHourOffsetModal.tsx
@@ -0,0 +1,174 @@
+import { StreakHourOffsetSchema } from "@monkeytype/schemas/users";
+import { createForm } from "@tanstack/solid-form";
+
+import Ape from "../../ape";
+import { Snapshot } from "../../constants/default-snapshot";
+import { getSnapshot, setSnapshot } from "../../db";
+import { hideLoaderBar, showLoaderBar } from "../../states/loader-bar";
+import { hideModal } from "../../states/modals";
+import {
+  showErrorNotification,
+  showNoticeNotification,
+  showSuccessNotification,
+} from "../../states/notifications";
+import { AnimatedModal } from "../common/AnimatedModal";
+import { Button } from "../common/Button";
+import { InputField } from "../ui/form/InputField";
+import { SubmitButton } from "../ui/form/SubmitButton";
+import { allFieldsMandatory, fromSchema } from "../ui/form/utils";
+
+export function StreakHourOffsetModal() {
+  const form = createForm(() => ({
+    defaultValues: {
+      offset: "0.0",
+    },
+    onSubmitInvalid: () => {
+      showNoticeNotification("Please fill in all fields");
+    },
+    validators: {
+      onChange: allFieldsMandatory(),
+    },
+    onSubmit: async ({ value }) => {
+      const { offset } = value;
+      const hourOffset = parseFloat(offset);
+
+      showLoaderBar();
+
+      const response = await Ape.users.setStreakHourOffset({
+        body: { hourOffset },
+      });
+      hideLoaderBar();
+
+      if (response.status !== 200) {
+        showErrorNotification("Failed to set streak hour offset", { response });
+        hideModal("StreakHourOffset");
+        return;
+      }
+      showSuccessNotification("Streak hour offset set");
+      const snap = getSnapshot() as Snapshot;
+
+      snap.streakHourOffset = hourOffset;
+      setSnapshot(snap);
+      hideModal("StreakHourOffset");
+    },
+  }));
+
+  return (
+    <AnimatedModal
+      id="StreakHourOffset"
+      title="Set streak hour offset"
+      modalClass="max-w-lg"
+    >
+      <p>
+        Streaks reset at midnight UTC by default. If this is not convenient for
+        you (for example if it means that streaks reset in the middle of the
+        day), you can change the hour offset here.
+        <br />
+        <br />
+        This will not take daylight savings time into consideration!
+        <br />
+        <br />
+        <span class="text-error">You can only do this once!</span>
+      </p>
+      <form
+        class="flex flex-col justify-center gap-4"
+        onSubmit={(e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          void form.handleSubmit();
+        }}
+      >
+        <div class="grid grid-cols-3 items-center justify-items-center gap-2 text-2xl">
+          <form.Field
+            name="offset"
+            validators={{
+              onChange: ({ value }) => {
+                const val = parseFloat(String(value));
+                if (isNaN(val)) {
+                  return "Must be a number";
+                }
+                return fromSchema(StreakHourOffsetSchema)({
+                  value: val,
+                });
+              },
+            }}
+            children={(field) => (
+              <>
+                <Button
+                  fa={{ icon: "fa-chevron-left" }}
+                  class="w-full"
+                  disabled={clampOffset(field().state.value) <= -11}
+                  onClick={() => {
+                    const current = clampOffset(form.getFieldValue("offset"));
+                    const newVal = (current - 0.5).toFixed(1);
+                    form.setFieldValue("offset", newVal);
+                  }}
+                />
+                <InputField
+                  field={field}
+                  type="number"
+                  class="text-center"
+                  min={-11}
+                  max={12}
+                  step={0.5}
+                  alwaysShowFieldIndicator={true}
+                />
+                <Button
+                  fa={{ icon: "fa-chevron-right" }}
+                  class="w-full"
+                  disabled={clampOffset(field().state.value) >= 12}
+                  onClick={() => {
+                    const current = clampOffset(form.getFieldValue("offset"));
+                    const newVal = (current + 0.5).toFixed(1);
+                    form.setFieldValue("offset", newVal);
+                  }}
+                />
+              </>
+            )}
+          />
+        </div>
+
+        <div class="grid grid-cols-[1fr_auto] gap-2">
+          <div>Current local reset time:</div>
+          <div>{getDate()}</div>
+
+          <div>New local reset time:</div>
+          <form.Field
+            name="offset"
+            children={(field) => <div>{getNewDate(field().state.value)}</div>}
+          />
+        </div>
+
+        <SubmitButton form={form} text="set" skipUnchangedCheck />
+      </form>
+    </AnimatedModal>
+  );
+}
+
+function clampOffset(value: string): number {
+  const num = Number.parseFloat(value);
+  if (isNaN(num)) return 0;
+  return Math.max(-11, Math.min(12, num));
+}
+
+function getNewDate(offset: string): string {
+  const inputValue = Number.parseFloat(offset);
+  if (isNaN(inputValue)) return "-";
+  const newDate = new Date();
+  newDate.setUTCHours(0);
+  newDate.setUTCMinutes(0);
+  newDate.setUTCSeconds(0);
+  newDate.setUTCMilliseconds(0);
+
+  newDate.setHours(newDate.getHours() - -1 * Math.floor(inputValue)); //idk why, but it only works when i subtract (so i have to negate inputValue)
+  newDate.setMinutes(
+    newDate.getMinutes() - -1 * ((((inputValue % 1) + 1) % 1) * 60),
+  );
+  return newDate.toLocaleTimeString();
+}
+
+function getDate(): string {
+  const date = new Date();
+  date.setUTCHours(0, 0, 0, 0);
+  return date.toLocaleTimeString();
+}
diff --git a/frontend/src/ts/components/pages/account-settings/AccountTab.tsx b/frontend/src/ts/components/pages/account-settings/AccountTab.tsx
index 40436b03386b..99e8ee1350a9 100644
--- a/frontend/src/ts/components/pages/account-settings/AccountTab.tsx
+++ b/frontend/src/ts/components/pages/account-settings/AccountTab.tsx
@@ -1,8 +1,8 @@
 import { Show } from "solid-js";
 
 import Ape from "../../../ape";
-import * as StreakHourOffsetModal from "../../../modals/streak-hour-offset";
 import { showLoaderBar } from "../../../states/loader-bar";
+import { showModal } from "../../../states/modals";
 import { showErrorNotification } from "../../../states/notifications";
 import { getSnapshot } from "../../../states/snapshot";
 import { Button } from "../../common/Button";
@@ -126,7 +126,7 @@ function UpdateStreakOffset() {
       </>
       button={{
         text: "update hour offset",
-        onClick: () => StreakHourOffsetModal.show(),
+        onClick: () => showModal("StreakHourOffset"),
       }}
       disabled={getSnapshot()?.streakHourOffset !== undefined}
       disabledDescription=<>
diff --git a/frontend/src/ts/components/ui/form/FieldIndicator.tsx b/frontend/src/ts/components/ui/form/FieldIndicator.tsx
index 0ec357983036..a0d831054b9f 100644
--- a/frontend/src/ts/components/ui/form/FieldIndicator.tsx
+++ b/frontend/src/ts/components/ui/form/FieldIndicator.tsx
@@ -8,6 +8,7 @@ import { LoadingCircle } from "../../common/LoadingCircle";
 
 export type FieldIndicatorProps = {
   field: AnyFieldApi;
+  alwaysShow?: boolean;
 };
 
 export function FieldIndicator(props: FieldIndicatorProps) {
@@ -45,9 +46,10 @@ export function FieldIndicator(props: FieldIndicatorProps) {
         </Match>
         <Match
           when={
-            props.field.state.meta.isTouched &&
             props.field.state.meta.isValid &&
-            !props.field.state.meta.isDefaultValue
+            (props.alwaysShow === true ||
+              (props.field.state.meta.isTouched &&
+                !props.field.state.meta.isDefaultValue))
           }
         >
           <Fa icon="fa-check" class="text-main" fixedWidth />
diff --git a/frontend/src/ts/components/ui/form/InputField.tsx b/frontend/src/ts/components/ui/form/InputField.tsx
index 78c995343edf..cb72a3f5268f 100644
--- a/frontend/src/ts/components/ui/form/InputField.tsx
+++ b/frontend/src/ts/components/ui/form/InputField.tsx
@@ -27,6 +27,7 @@ export function InputField(props: {
   min?: number;
   max?: number;
   step?: string | number;
+  alwaysShowFieldIndicator?: boolean;
 }): JSXElement {
   const [shake, setShake] = createSignal(false);
 
@@ -105,7 +106,10 @@ export function InputField(props: {
         step={props.step?.toString()}
       />
       <Show when={props.field().options.validators}>
-        <FieldIndicator field={props.field()} />
+        <FieldIndicator
+          field={props.field()}
+          alwaysShow={props.alwaysShowFieldIndicator}
+        />
       </Show>
     </div>
   );
diff --git a/frontend/src/ts/modals/streak-hour-offset.ts b/frontend/src/ts/modals/streak-hour-offset.ts
deleted file mode 100644
index 42bde3323f5c..000000000000
--- a/frontend/src/ts/modals/streak-hour-offset.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import Ape from "../ape";
-// import * as DB from "../db";
-import {
-  showNoticeNotification,
-  showErrorNotification,
-  showSuccessNotification,
-} from "../states/notifications";
-
-import { showLoaderBar, hideLoaderBar } from "../states/loader-bar";
-import { getSnapshot, setSnapshot } from "../db";
-import AnimatedModal from "../utils/animated-modal";
-import { Snapshot } from "../constants/default-snapshot";
-
-let state = {
-  offset: 0,
-};
-
-export function show(): void {
-  void modal.show({
-    focusFirstInput: "focusAndSelect",
-    beforeAnimation: async (modalEl) => {
-      if (getSnapshot()?.streakHourOffset !== undefined) {
-        modalEl.qs("input")?.remove();
-        modalEl.qs(".preview")?.remove();
-        modalEl.qsa("button")?.remove();
-        modalEl
-          .qs(".text")
-          ?.setText(
-            `You have already set your streak hour offset to ${
-              getSnapshot()?.streakHourOffset ?? "?"
-            }. You can only set your streak hour offset once.`,
-          );
-      } else {
-        state.offset = 0;
-        updateDisplay();
-        updatePreview();
-      }
-    },
-  });
-}
-
-function updatePreview(): void {
-  const inputValue = state.offset;
-  const preview = modal.getModal().qs(".preview");
-
-  const date = new Date();
-  date.setUTCHours(0, 0, 0, 0);
-
-  const newDate = new Date();
-  newDate.setUTCHours(0);
-  newDate.setUTCMinutes(0);
-  newDate.setUTCSeconds(0);
-  newDate.setUTCMilliseconds(0);
-
-  newDate.setHours(newDate.getHours() - -1 * Math.floor(inputValue)); //idk why, but it only works when i subtract (so i have to negate inputValue)
-  newDate.setMinutes(
-    newDate.getMinutes() - -1 * ((((inputValue % 1) + 1) % 1) * 60),
-  );
-
-  preview?.setHtml(`
-    <div class="row"><div>Current local reset time:</div><div>${date.toLocaleTimeString()}</div></div>
-    <div class="row"><div>New local reset time:</div><div>${newDate.toLocaleTimeString()}</div></div>
-  `);
-}
-
-function updateDisplay(): void {
-  modal
-    .getModal()
-    .qs<HTMLInputElement>("input")
-    ?.setValue(state.offset.toFixed(1));
-}
-
-function hide(): void {
-  void modal.hide();
-}
-
-async function apply(): Promise<void> {
-  const value = state.offset;
-
-  if (isNaN(value)) {
-    showNoticeNotification("Streak hour offset must be a number");
-    return;
-  }
-
-  // Check if value is whole number or ends in .5 (multiply by 2 to check if result is integer)
-  if (value < -11 || value > 12 || (value * 2) % 1 !== 0) {
-    showNoticeNotification(
-      "Streak offset must be between -11 and 12. Times ending in .5 can be used for 30-minute increments.",
-    );
-    return;
-  }
-
-  showLoaderBar();
-
-  const response = await Ape.users.setStreakHourOffset({
-    body: { hourOffset: value },
-  });
-  hideLoaderBar();
-
-  if (response.status !== 200) {
-    showErrorNotification("Failed to set streak hour offset", { response });
-  } else {
-    showSuccessNotification("Streak hour offset set");
-    const snap = getSnapshot() as Snapshot;
-
-    snap.streakHourOffset = value;
-    setSnapshot(snap);
-    hide();
-  }
-}
-
-function setStateToInput(): void {
-  const inputValue = parseFloat(
-    modal.getModal().qs<HTMLInputElement>("input")?.getValue() ?? "0",
-  );
-  if (!isNaN(inputValue)) {
-    state.offset = inputValue;
-    if (state.offset < -11) state.offset = -11;
-    if (state.offset > 12) state.offset = 12;
-  } else {
-    state.offset = 0;
-  }
-}
-
-const modal = new AnimatedModal({
-  dialogId: "streakHourOffsetModal",
-  setup: async (modalEl): Promise<void> => {
-    modalEl.qs("input")?.on("focusout", () => {
-      setStateToInput();
-      updateDisplay();
-      updatePreview();
-    });
-    modalEl.qs("input")?.on("keyup", (e) => {
-      if (e.key === "Enter") {
-        setStateToInput();
-        updateDisplay();
-        updatePreview();
-      }
-    });
-    modalEl.qs(".submit")?.on("click", () => {
-      void apply();
-    });
-    modalEl.qs(".decreaseOffset")?.on("click", () => {
-      state.offset -= 0.5;
-      if (state.offset < -11) state.offset = -11;
-      updateDisplay();
-      updatePreview();
-    });
-    modalEl.qs(".increaseOffset")?.on("click", () => {
-      state.offset += 0.5;
-      if (state.offset > 12) state.offset = 12;
-      updateDisplay();
-      updatePreview();
-    });
-  },
-});
diff --git a/frontend/src/ts/states/modals.ts b/frontend/src/ts/states/modals.ts
index 0cb81f089530..a82240d98129 100644
--- a/frontend/src/ts/states/modals.ts
+++ b/frontend/src/ts/states/modals.ts
@@ -31,7 +31,8 @@ export type ModalId =
   | "EditPresetModal"
   | "EditProfile"
   | "ViewApeKey"
-  | "LastSignedOutResult";
+  | "LastSignedOutResult"
+  | "StreakHourOffset";
 
 export type ModalVisibility = {
   visible: boolean;

From d6e34843b6815fafad55e275309a976960ff1b52 Mon Sep 17 00:00:00 2001
From: Leonabcd123 <156839416+Leonabcd123@users.noreply.github.com>
Date: Sun, 5 Jul 2026 15:44:25 +0200
Subject: [PATCH 3/8] fix(custom-font): make schema used in modal stricter
 (@Leonabcd123) (#8131)

Also adds validation in commandline.
---
 frontend/src/ts/commandline/lists/font-family.ts      | 11 ++++++++---
 .../pages/settings/custom-setting/FontFamily.tsx      |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/src/ts/commandline/lists/font-family.ts b/frontend/src/ts/commandline/lists/font-family.ts
index 37ef6c1628c1..98cf96e981a1 100644
--- a/frontend/src/ts/commandline/lists/font-family.ts
+++ b/frontend/src/ts/commandline/lists/font-family.ts
@@ -1,4 +1,5 @@
-import { Command } from "../types";
+import { FontNameSchema } from "@monkeytype/schemas/fonts";
+import { Command, withValidation } from "../types";
 import { buildCommandForConfigKey } from "../util";
 import FileStorage from "../../utils/file-storage";
 
@@ -6,6 +7,7 @@ import { showNoticeNotification } from "../../states/notifications";
 import { Config } from "../../config/store";
 import { setConfig } from "../../config/setters";
 import { applyFontFamily } from "../../ui";
+
 const fromMeta = buildCommandForConfigKey("fontFamily");
 
 if (fromMeta.subgroup) {
@@ -17,12 +19,15 @@ if (fromMeta.subgroup) {
     subgroup: {
       title: "Custom font...",
       list: [
-        {
+        withValidation({
           id: "customFontName",
           display: "Custom name...",
           icon: "fa-font",
           alias: "custom font name",
           input: true,
+          validation: {
+            schema: FontNameSchema,
+          },
           defaultValue: (): string => {
             return Config.fontFamily.replace(/_/g, " ");
           },
@@ -31,7 +36,7 @@ if (fromMeta.subgroup) {
             const fontName = input.replaceAll(/ /g, "_");
             setConfig("fontFamily", fontName);
           },
-        },
+        }),
         {
           id: "customLocalFont",
           display: "Local font...",
diff --git a/frontend/src/ts/components/pages/settings/custom-setting/FontFamily.tsx b/frontend/src/ts/components/pages/settings/custom-setting/FontFamily.tsx
index f3d789623ee2..122ed1d47a86 100644
--- a/frontend/src/ts/components/pages/settings/custom-setting/FontFamily.tsx
+++ b/frontend/src/ts/components/pages/settings/custom-setting/FontFamily.tsx
@@ -1,4 +1,5 @@
 import { ConfigSchema } from "@monkeytype/schemas/configs";
+import { FontNameSchema } from "@monkeytype/schemas/fonts";
 import { createResource, For, JSXElement, Show } from "solid-js";
 import { z } from "zod";
 
@@ -170,7 +171,7 @@ export function FontFamily(): JSXElement {
                   text: "Make sure you have the font installed on your computer before applying",
                   buttonText: "apply",
                   schema: z.object({
-                    fontName: z.string(),
+                    fontName: FontNameSchema,
                   }),
                   inputs: {
                     fontName: {

From b82187f74d6db10a272a5c06bf341ee6abbd73f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 5 Jul 2026 15:44:57 +0200
Subject: [PATCH 4/8] chore(deps): bump nodemailer from 8.0.11 to 9.0.1 (#8133)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 8.0.11
to 9.0.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/nodemailer/nodemailer/releases">nodemailer's
releases</a>.</em></p>
<blockquote>
<h2>v9.0.1</h2>
<h2><a
href="https://github.com/nodemailer/nodemailer/compare/v9.0.0...v9.0.1">9.0.1</a>
(2026-06-17)</h2>
<h3>Bug Fixes</h3>
<ul>
<li>enforce disableFileAccess/disableUrlAccess for raw message option
(<a
href="https://github.com/nodemailer/nodemailer/commit/a82e060d978f27e5f41369a9a9807b1e3dedc2e2">a82e060</a>)</li>
</ul>
<h2>v9.0.0</h2>
<h2><a
href="https://github.com/nodemailer/nodemailer/compare/v8.0.11...v9.0.0">9.0.0</a>
(2026-06-14)</h2>
<h3>⚠ BREAKING CHANGES</h3>
<ul>
<li>HTTPS requests made while fetching remote content (attachment
href/path URLs, OAuth2 token endpoints, HTTP/HTTPS proxy CONNECT) now
validate the server's TLS certificate by default. Requests to hosts with
self-signed, expired, or hostname-mismatched certificates that
previously succeeded will now fail. Opt back out per request with
tls.rejectUnauthorized=false (transport options, or a per-attachment
<code>tls</code> option).</li>
</ul>
<h3>Bug Fixes</h3>
<ul>
<li>replace deprecated url.parse with a WHATWG URL wrapper (<a
href="https://github.com/nodemailer/nodemailer/commit/0c080fbf3278926f013a5c2ad06f5f6f0e18f5ed">0c080fb</a>)</li>
<li>validate TLS certificates by default when fetching remote content
(<a
href="https://github.com/nodemailer/nodemailer/commit/6a947ac7114a16da1e6a50d9a6f4e17026ce145d">6a947ac</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md">nodemailer's
changelog</a>.</em></p>
<blockquote>
<h2><a
href="https://github.com/nodemailer/nodemailer/compare/v9.0.0...v9.0.1">9.0.1</a>
(2026-06-17)</h2>
<h3>Bug Fixes</h3>
<ul>
<li>enforce disableFileAccess/disableUrlAccess for raw message option
(<a
href="https://github.com/nodemailer/nodemailer/commit/a82e060d978f27e5f41369a9a9807b1e3dedc2e2">a82e060</a>)</li>
</ul>
<h2><a
href="https://github.com/nodemailer/nodemailer/compare/v8.0.11...v9.0.0">9.0.0</a>
(2026-06-14)</h2>
<h3>⚠ BREAKING CHANGES</h3>
<ul>
<li>HTTPS requests made while fetching remote content (attachment
href/path URLs, OAuth2 token endpoints, HTTP/HTTPS proxy CONNECT) now
validate the server's TLS certificate by default. Requests to hosts with
self-signed, expired, or hostname-mismatched certificates that
previously succeeded will now fail. Opt back out per request with
tls.rejectUnauthorized=false (transport options, or a per-attachment
<code>tls</code> option).</li>
</ul>
<h3>Bug Fixes</h3>
<ul>
<li>replace deprecated url.parse with a WHATWG URL wrapper (<a
href="https://github.com/nodemailer/nodemailer/commit/0c080fbf3278926f013a5c2ad06f5f6f0e18f5ed">0c080fb</a>)</li>
<li>validate TLS certificates by default when fetching remote content
(<a
href="https://github.com/nodemailer/nodemailer/commit/6a947ac7114a16da1e6a50d9a6f4e17026ce145d">6a947ac</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/69cf6252cd18227c79b75dd484357ee1e760e56e"><code>69cf625</code></a>
chore(master): release 9.0.1 (<a
href="https://redirect.github.com/nodemailer/nodemailer/issues/1828">#1828</a>)</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/a82e060d978f27e5f41369a9a9807b1e3dedc2e2"><code>a82e060</code></a>
fix: enforce disableFileAccess/disableUrlAccess for raw message
option</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/4e58450eb490e5097a74b2b2cce35a8d9e21856e"><code>4e58450</code></a>
chore: update dev dependencies</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/541f5fd1e26993736feedeac572b425314693f33"><code>541f5fd</code></a>
chore(master): release 9.0.0 (<a
href="https://redirect.github.com/nodemailer/nodemailer/issues/1827">#1827</a>)</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/0c080fbf3278926f013a5c2ad06f5f6f0e18f5ed"><code>0c080fb</code></a>
fix: replace deprecated url.parse with a WHATWG URL wrapper</li>
<li><a
href="https://github.com/nodemailer/nodemailer/commit/6a947ac7114a16da1e6a50d9a6f4e17026ce145d"><code>6a947ac</code></a>
fix!: validate TLS certificates by default when fetching remote
content</li>
<li>See full diff in <a
href="https://github.com/nodemailer/nodemailer/compare/v8.0.11...v9.0.1">compare
view</a></li>
</ul>
</details>
<br />

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 backend/package.json |   2 +-
 pnpm-lock.yaml       | 136 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 111 insertions(+), 27 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 5cd74ebacf64..39996b71c2b0 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -45,7 +45,7 @@
     "mjml": "4.15.0",
     "mongodb": "6.3.0",
     "mustache": "4.2.0",
-    "nodemailer": "8.0.11",
+    "nodemailer": "9.0.1",
     "object-hash": "3.0.0",
     "prom-client": "15.1.3",
     "rate-limiter-flexible": "5.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5e970454ffba..77061031dcda 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -153,8 +153,8 @@ importers:
         specifier: 4.2.0
         version: 4.2.0
       nodemailer:
-        specifier: 8.0.11
-        version: 8.0.11
+        specifier: 9.0.1
+        version: 9.0.1
       object-hash:
         specifier: 3.0.0
         version: 3.0.0
@@ -3233,48 +3233,56 @@ packages:
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@oxfmt/binding-linux-arm64-musl@0.53.0':
     resolution: {integrity: sha512-I6bhOTroqc3ThrwZ89l2k3ivKuELhdPLbAcJhRNyjWvlgwb0vjRgEnVL1XLx5Jud04/ypNRZBykAWrSk6l/D+g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@oxfmt/binding-linux-ppc64-gnu@0.53.0':
     resolution: {integrity: sha512-w0p3JzB/PkkQjXALMJMqP9YfP3yq4w6zGsu5kezQmUnxRkN3b/Theg2l/nDgBsOcczxS3gL6Gam5XNAVrO6QJQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@oxfmt/binding-linux-riscv64-gnu@0.53.0':
     resolution: {integrity: sha512-mzBhF6k1Yq1K/dqDmVe/AAafnlJfEpx7yfUiksyeWXJk5iSzZqBSxcsa02zIytYgQFRZ7h6WPZfwHg/DoOE1Kw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@oxfmt/binding-linux-riscv64-musl@0.53.0':
     resolution: {integrity: sha512-AlFCpnRQhogQFzZXWbO6xB6/Udy745L+eQNmDPGg7G/OeWsYmJc4jZYfUN5pQg0reOPWSED2mOQqKZOJM1U8cA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@oxfmt/binding-linux-s390x-gnu@0.53.0':
     resolution: {integrity: sha512-XD4ulY4f1DWbuuZXAqxhVn+gdPmrhnmojWtFN78ctVoupmS845fGhsUrk1HZXKQI+iymbaiz9vAjPsghHNQ7Ag==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@oxfmt/binding-linux-x64-gnu@0.53.0':
     resolution: {integrity: sha512-xg8KWX0QnxmYWRe60CgHYWXI0ZOtBbqTsXvWiWrcl2XUHJ3fht2QerOk2iWvylzX3zNT2GpvBRxGoR4d3sxPRQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@oxfmt/binding-linux-x64-musl@0.53.0':
     resolution: {integrity: sha512-MWExpYBGvl+pIvVB/gj/CcWlN2al8AizT7rUbtaYaWNoQkhWARM6W3qpgoCr72CYSN9PborzPmM5MIRe2BrNdA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@oxfmt/binding-openharmony-arm64@0.53.0':
     resolution: {integrity: sha512-u4sajgO4nxgmJIgc/y2AqPhkdbOkQH8WugXpA1+pW0ESQhvGZ1oGq61Q4xMbJHJU1hFgtO18QNrcFYDPYH0gwQ==}
@@ -3377,48 +3385,56 @@ packages:
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@oxlint/binding-linux-arm64-musl@1.68.0':
     resolution: {integrity: sha512-qVKtCZNic+OoNnOr/hCQAu22HSQzflI7Fsq/Blzkw02SnLuv163k3kfmrVpZjSBlUHgsRKj6WgQiw30d3SX02Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@oxlint/binding-linux-ppc64-gnu@1.68.0':
     resolution: {integrity: sha512-zExyZ8ZOUuAyQ0y9jpTcyjKUz62YY9JhKPyVxzvjTpXzZ3ujdqiVwfPWDdnA1SsIOrxdtxHn7KErDHLWskFjXg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@oxlint/binding-linux-riscv64-gnu@1.68.0':
     resolution: {integrity: sha512-6C4MPuwewyDavA7sxM14wzgRi5GGL68HPIxRCdVyS75U4MDbpFVYzKO9WNR6KLKTMPq2pcz3THwo1sK2uiqngw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@oxlint/binding-linux-riscv64-musl@1.68.0':
     resolution: {integrity: sha512-bnZooVeHAcvA+dH0EDLgx+7HY/DRi6e0hFszg3P+OBatuUjV6EvfIyNIzWOusmqAVh4L6r21GGTZtiKE4iqM4Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@oxlint/binding-linux-s390x-gnu@1.68.0':
     resolution: {integrity: sha512-dIqnZnJSmHCMOUpUcWQOiV14o3DDPVx1DSsMaSzvdhNjC1tB1iEPZbdiMSCIEYbkgbsYznHXWqFdKL8WUB3F8g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@oxlint/binding-linux-x64-gnu@1.68.0':
     resolution: {integrity: sha512-zc9lEnfV/HreDTY6gdMlZe+irkwHSxQ4/B1pS9GyK7RVaA5LxhoZY/w6/o2vIwLLEYiXQ5ujGxOM1ZazeFAAIA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@oxlint/binding-linux-x64-musl@1.68.0':
     resolution: {integrity: sha512-Dl5QEX0TCo/40Cdh1o1JdPS//+YiWqjC+Hrrya5OQmStZZr4svAFtdlqcpCrU9yq2Mo3vRVyO9B3h0dzD8s36Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@oxlint/binding-openharmony-arm64@1.68.0':
     resolution: {integrity: sha512-/qy6dOvi4S3/LeXq0l5BT5pRKPYA7oj3uKwJOAZOr5HRLL+HK6jdBynvWuXIA2wwfE01RzNYmbBdM7vwYx00sA==}
@@ -3480,36 +3496,42 @@ packages:
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm-musl@2.5.6':
     resolution: {integrity: sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-arm64-glibc@2.5.6':
     resolution: {integrity: sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm64-musl@2.5.6':
     resolution: {integrity: sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-x64-glibc@2.5.6':
     resolution: {integrity: sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-x64-musl@2.5.6':
     resolution: {integrity: sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-win32-arm64@2.5.6':
     resolution: {integrity: sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==}
@@ -3652,36 +3674,42 @@ packages:
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@rolldown/binding-linux-arm64-musl@1.0.0-rc.12':
     resolution: {integrity: sha512-V6/wZztnBqlx5hJQqNWwFdxIKN0m38p8Jas+VoSfgH54HSj9tKTt1dZvG6JRHcjh6D7TvrJPWFGaY9UBVOaWPw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.12':
     resolution: {integrity: sha512-AP3E9BpcUYliZCxa3w5Kwj9OtEVDYK6sVoUzy4vTOJsjPOgdaJZKFmN4oOlX0Wp0RPV2ETfmIra9x1xuayFB7g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.12':
     resolution: {integrity: sha512-nWwpvUSPkoFmZo0kQazZYOrT7J5DGOJ/+QHHzjvNlooDZED8oH82Yg67HvehPPLAg5fUff7TfWFHQS8IV1n3og==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@rolldown/binding-linux-x64-gnu@1.0.0-rc.12':
     resolution: {integrity: sha512-RNrafz5bcwRy+O9e6P8Z/OCAJW/A+qtBczIqVYwTs14pf4iV1/+eKEjdOUta93q2TsT/FI0XYDP3TCky38LMAg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@rolldown/binding-linux-x64-musl@1.0.0-rc.12':
     resolution: {integrity: sha512-Jpw/0iwoKWx3LJ2rc1yjFrj+T7iHZn2JDg1Yny1ma0luviFS4mhAIcd1LFNxK3EYu3DHWCps0ydXQ5i/rrJ2ig==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@rolldown/binding-openharmony-arm64@1.0.0-rc.12':
     resolution: {integrity: sha512-vRugONE4yMfVn0+7lUKdKvN4D5YusEiPilaoO2sgUWpCvrncvWgPMzK00ZFFJuiPgLwgFNP5eSiUlv2tfc+lpA==}
@@ -3822,121 +3850,145 @@ packages:
     resolution: {integrity: sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm-gnueabihf@4.60.1':
     resolution: {integrity: sha512-L+34Qqil+v5uC0zEubW7uByo78WOCIrBvci69E7sFASRl0X7b/MB6Cqd1lky/CtcSVTydWa2WZwFuWexjS5o6g==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm-musleabihf@4.40.0':
     resolution: {integrity: sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm-musleabihf@4.60.1':
     resolution: {integrity: sha512-n83O8rt4v34hgFzlkb1ycniJh7IR5RCIqt6mz1VRJD6pmhRi0CXdmfnLu9dIUS6buzh60IvACM842Ffb3xd6Gg==}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm64-gnu@4.40.0':
     resolution: {integrity: sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-gnu@4.60.1':
     resolution: {integrity: sha512-Nql7sTeAzhTAja3QXeAI48+/+GjBJ+QmAH13snn0AJSNL50JsDqotyudHyMbO2RbJkskbMbFJfIJKWA6R1LCJQ==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-musl@4.40.0':
     resolution: {integrity: sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm64-musl@4.60.1':
     resolution: {integrity: sha512-+pUymDhd0ys9GcKZPPWlFiZ67sTWV5UU6zOJat02M1+PiuSGDziyRuI/pPue3hoUwm2uGfxdL+trT6Z9rxnlMA==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-loong64-gnu@4.60.1':
     resolution: {integrity: sha512-VSvgvQeIcsEvY4bKDHEDWcpW4Yw7BtlKG1GUT4FzBUlEKQK0rWHYBqQt6Fm2taXS+1bXvJT6kICu5ZwqKCnvlQ==}
     cpu: [loong64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-loong64-musl@4.60.1':
     resolution: {integrity: sha512-4LqhUomJqwe641gsPp6xLfhqWMbQV04KtPp7/dIp0nzPxAkNY1AbwL5W0MQpcalLYk07vaW9Kp1PBhdpZYYcEw==}
     cpu: [loong64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-loongarch64-gnu@4.40.0':
     resolution: {integrity: sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==}
     cpu: [loong64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-powerpc64le-gnu@4.40.0':
     resolution: {integrity: sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-ppc64-gnu@4.60.1':
     resolution: {integrity: sha512-tLQQ9aPvkBxOc/EUT6j3pyeMD6Hb8QF2BTBnCQWP/uu1lhc9AIrIjKnLYMEroIz/JvtGYgI9dF3AxHZNaEH0rw==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-ppc64-musl@4.60.1':
     resolution: {integrity: sha512-RMxFhJwc9fSXP6PqmAz4cbv3kAyvD1etJFjTx4ONqFP9DkTkXsAMU4v3Vyc5BgzC+anz7nS/9tp4obsKfqkDHg==}
     cpu: [ppc64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-riscv64-gnu@4.40.0':
     resolution: {integrity: sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-gnu@4.60.1':
     resolution: {integrity: sha512-QKgFl+Yc1eEk6MmOBfRHYF6lTxiiiV3/z/BRrbSiW2I7AFTXoBFvdMEyglohPj//2mZS4hDOqeB0H1ACh3sBbg==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-musl@4.40.0':
     resolution: {integrity: sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-riscv64-musl@4.60.1':
     resolution: {integrity: sha512-RAjXjP/8c6ZtzatZcA1RaQr6O1TRhzC+adn8YZDnChliZHviqIjmvFwHcxi4JKPSDAt6Uhf/7vqcBzQJy0PDJg==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-s390x-gnu@4.40.0':
     resolution: {integrity: sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-s390x-gnu@4.60.1':
     resolution: {integrity: sha512-wcuocpaOlaL1COBYiA89O6yfjlp3RwKDeTIA0hM7OpmhR1Bjo9j31G1uQVpDlTvwxGn2nQs65fBFL5UFd76FcQ==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.40.0':
     resolution: {integrity: sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.60.1':
     resolution: {integrity: sha512-77PpsFQUCOiZR9+LQEFg9GClyfkNXj1MP6wRnzYs0EeWbPcHs02AXu4xuUbM1zhwn3wqaizle3AEYg5aeoohhg==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-musl@4.40.0':
     resolution: {integrity: sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-x64-musl@4.60.1':
     resolution: {integrity: sha512-5cIATbk5vynAjqqmyBjlciMJl1+R/CwX9oLk/EyiFXDWd95KpHdrOJT//rnUl4cUcskrd0jCCw3wpZnhIHdD9w==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-openbsd-x64@4.60.1':
     resolution: {integrity: sha512-cl0w09WsCi17mcmWqqglez9Gk8isgeWvoUZ3WiJFYSR3zjBQc2J5/ihSjpl+VLjPqjQ/1hJRcqBfLjssREQILw==}
@@ -4432,24 +4484,28 @@ packages:
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@tailwindcss/oxide-linux-arm64-musl@4.2.1':
     resolution: {integrity: sha512-WZA0CHRL/SP1TRbA5mp9htsppSEkWuQ4KsSUumYQnyl8ZdT39ntwqmz4IUHGN6p4XdSlYfJwM4rRzZLShHsGAQ==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@tailwindcss/oxide-linux-x64-gnu@4.2.1':
     resolution: {integrity: sha512-qMFzxI2YlBOLW5PhblzuSWlWfwLHaneBE0xHzLrBgNtqN6mWfs+qYbhryGSXQjFYB1Dzf5w+LN5qbUTPhW7Y5g==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@tailwindcss/oxide-linux-x64-musl@4.2.1':
     resolution: {integrity: sha512-5r1X2FKnCMUPlXTWRYpHdPYUY6a1Ar/t7P24OuiEdEOmms5lyqjDRvVY1yy9Rmioh+AunQ0rWiOTPE8F9A3v5g==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@tailwindcss/oxide-wasm32-wasi@4.2.1':
     resolution: {integrity: sha512-MGFB5cVPvshR85MTJkEvqDUnuNoysrsRxd6vnk1Lf2tbiqNlXpHYZqkqOQalydienEWOHHFyyuTSYRsLfxFJ2Q==}
@@ -5541,8 +5597,8 @@ packages:
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
-  baseline-browser-mapping@2.10.37:
-    resolution: {integrity: sha512-girxaJ7WZssDOFhzCGZTDKoTa1gk6A1TbflaYTpykLJ4UU9Fz9kx1aREM8JCuoVHbL8X8T/mJg7w2oYSq72Oig==}
+  baseline-browser-mapping@2.10.38:
+    resolution: {integrity: sha512-31/02mVB4yuQU6adKk5SlY6m+mxDwUq5KZkyYgnLrrKl7TEm1+3PyDtDBz2kOv/wxZz41GHsvV1A/u6RmiyBvw==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
@@ -6620,8 +6676,8 @@ packages:
   electron-to-chromium@1.5.267:
     resolution: {integrity: sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==}
 
-  electron-to-chromium@1.5.372:
-    resolution: {integrity: sha512-M3yhbAlilnwqC8D21t28UCDGHyitShTmmLRU/H+b74P6Ski16Nb9HONYEaVpMj/pwC7BEo5B95FpjODLCWbtfA==}
+  electron-to-chromium@1.5.376:
+    resolution: {integrity: sha512-cUVA7/RvbFTEuw/i3obUwDTRIXojaxkResf+ibByPFxjc6XK3VNtcQXV0NSbAlJ0FMjcJGgftVVB4Qo184EXvA==}
 
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -6693,6 +6749,10 @@ packages:
   error-stack-parser-es@1.0.5:
     resolution: {integrity: sha512-5qucVt2XcuGMcEGgWI7i+yZpmpByQ8J1lHhcL7PwqCwu9FPP3VUXzT4ltHe5i2z9dePwEHcDVOAfSnHsOlCXRA==}
 
+  es-abstract-get@1.0.0:
+    resolution: {integrity: sha512-6PMWXpdhshVvFp+FoWYs1EvG1Nj0tvk0dZM+XcK0xMEM1czRVcP6ohqPWHy6qPagSpC8j4+p89WXlT+xXJs/fg==}
+    engines: {node: '>= 0.4'}
+
   es-abstract@1.24.2:
     resolution: {integrity: sha512-2FpH9Q5i2RRwyEP1AylXe6nYLR5OhaJTZwmlcP0dL/+JCbgg7yyEo/sEK6HeGZRf3dFpWwThaRHVApXSkW3xeg==}
     engines: {node: '>= 0.4'}
@@ -6720,8 +6780,8 @@ packages:
     resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
     engines: {node: '>= 0.4'}
 
-  es-to-primitive@1.3.0:
-    resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
+  es-to-primitive@1.3.1:
+    resolution: {integrity: sha512-CxN9N56HYfd2m/acc/NOFrZQsN9kU4eh+2kk6A707Kz1krH8tKmfrs5RnftB8WNX80T0NS7vSQsDOlg23diR2g==}
     engines: {node: '>= 0.4'}
 
   es6-promise@3.3.1:
@@ -8284,48 +8344,56 @@ packages:
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-arm64-gnu@1.32.0:
     resolution: {integrity: sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-arm64-musl@1.31.1:
     resolution: {integrity: sha512-mVZ7Pg2zIbe3XlNbZJdjs86YViQFoJSpc41CbVmKBPiGmC4YrfeOyz65ms2qpAobVd7WQsbW4PdsSJEMymyIMg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-linux-arm64-musl@1.32.0:
     resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-linux-x64-gnu@1.31.1:
     resolution: {integrity: sha512-xGlFWRMl+0KvUhgySdIaReQdB4FNudfUTARn7q0hh/V67PVGCs3ADFjw+6++kG1RNd0zdGRlEKa+T13/tQjPMA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-x64-gnu@1.32.0:
     resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-x64-musl@1.31.1:
     resolution: {integrity: sha512-eowF8PrKHw9LpoZii5tdZwnBcYDxRw2rRCyvAXLi34iyeYfqCQNA9rmUM0ce62NlPhCvof1+9ivRaTY6pSKDaA==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-linux-x64-musl@1.32.0:
     resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-win32-arm64-msvc@1.31.1:
     resolution: {integrity: sha512-aJReEbSEQzx1uBlQizAOBSjcmr9dCdL3XuC/6HLXAxmtErsj2ICo5yYggg1qOODQMtnjNQv2UHb9NpOuFtYe4w==}
@@ -9025,6 +9093,11 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  nanoid@3.3.13:
+    resolution: {integrity: sha512-sPdqC6ByMVVGvF1ynvvMo0/o+oD1VX7DaHhijt1bFgjvBkHBib4t49GoNDhf2NDta4oeUNlaGbSt5K7qjZ955Q==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
   natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
@@ -9111,16 +9184,16 @@ packages:
   node-releases@2.0.27:
     resolution: {integrity: sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==}
 
-  node-releases@2.0.47:
-    resolution: {integrity: sha512-Uzmd6LXpouKo8EUK68IjH4+E01w/hXyV3R3g/geCJo+rXLNfh1xucB+LOzYEOQPSiUK3h/xZf0cQGcSsmyL2Og==}
+  node-releases@2.0.48:
+    resolution: {integrity: sha512-1uz8041X6LoI6ZSdZacM9lVY28vuzDlSKitnpbSNK0RfKoIJkX29NBPVEFXhnuSuEOA9Ww0xnPJ+ILWbGAv8DA==}
     engines: {node: '>=18'}
 
   node-source-walk@7.0.0:
     resolution: {integrity: sha512-1uiY543L+N7Og4yswvlm5NCKgPKDEXd9AUR9Jh3gen6oOeBsesr6LqhXom1er3eRzSUcVRWXzhv8tSNrIfGHKw==}
     engines: {node: '>=18'}
 
-  nodemailer@8.0.11:
-    resolution: {integrity: sha512-nrO/pDAUKl+wXX+lx16tDLbnm0fW6sK/x8mgohaCpg+CdCEl482bD4tCuAZk2DyliruiNTIZxRCoWkDqJEnAiA==}
+  nodemailer@9.0.1:
+    resolution: {integrity: sha512-Gwv8SQewT616ZM/URn0H54b8PWo/Wum7md3EW2aWy1lO27+WZCX+Xyak3J+NlmHUjDh5ME+uesJUDRbR3Ye8Bw==}
     engines: {node: '>=6.0.0'}
 
   nodemon@3.1.14:
@@ -9956,8 +10029,8 @@ packages:
   regjsgen@0.8.0:
     resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==}
 
-  regjsparser@0.13.1:
-    resolution: {integrity: sha512-dLsljMd9sqwRkby8zhO1gSg3PnJIBFid8f4CQj/sXx+7cKx+E7u0PKhZ+U4wmhx7EfmtvnA318oVaIkAB1lRJw==}
+  regjsparser@0.13.2:
+    resolution: {integrity: sha512-NgRBy2Nx/bE+9F27nVHnqcN5HjyLmecqsqx2PJHu3/IEtADD4WuxuXIVExD5PoSDFVrl78dOonfcOe5O+5nbzQ==}
     hasBin: true
 
   relateurl@0.2.7:
@@ -16860,7 +16933,7 @@ snapshots:
 
   base64-js@1.5.1: {}
 
-  baseline-browser-mapping@2.10.37: {}
+  baseline-browser-mapping@2.10.38: {}
 
   baseline-browser-mapping@2.9.11: {}
 
@@ -17017,10 +17090,10 @@ snapshots:
 
   browserslist@4.28.2:
     dependencies:
-      baseline-browser-mapping: 2.10.37
+      baseline-browser-mapping: 2.10.38
       caniuse-lite: 1.0.30001799
-      electron-to-chromium: 1.5.372
-      node-releases: 2.0.47
+      electron-to-chromium: 1.5.376
+      node-releases: 2.0.48
       update-browserslist-db: 1.2.3(browserslist@4.28.2)
 
   bson@6.8.0: {}
@@ -18010,7 +18083,7 @@ snapshots:
 
   electron-to-chromium@1.5.267: {}
 
-  electron-to-chromium@1.5.372: {}
+  electron-to-chromium@1.5.376: {}
 
   emoji-regex@8.0.0: {}
 
@@ -18066,6 +18139,13 @@ snapshots:
 
   error-stack-parser-es@1.0.5: {}
 
+  es-abstract-get@1.0.0:
+    dependencies:
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.2
+      is-callable: 1.2.7
+      object-inspect: 1.13.4
+
   es-abstract@1.24.2:
     dependencies:
       array-buffer-byte-length: 1.0.2
@@ -18080,7 +18160,7 @@ snapshots:
       es-errors: 1.3.0
       es-object-atoms: 1.1.2
       es-set-tostringtag: 2.1.0
-      es-to-primitive: 1.3.0
+      es-to-primitive: 1.3.1
       function.prototype.name: 1.2.0
       get-intrinsic: 1.3.0
       get-proto: 1.0.1
@@ -18144,8 +18224,10 @@ snapshots:
       has-tostringtag: 1.0.2
       hasown: 2.0.2
 
-  es-to-primitive@1.3.0:
+  es-to-primitive@1.3.1:
     dependencies:
+      es-abstract-get: 1.0.0
+      es-errors: 1.3.0
       is-callable: 1.2.7
       is-date-object: 1.1.0
       is-symbol: 1.1.1
@@ -21026,6 +21108,8 @@ snapshots:
 
   nanoid@3.3.12: {}
 
+  nanoid@3.3.13: {}
+
   natural-compare@1.4.0: {}
 
   nearley@2.20.1:
@@ -21114,13 +21198,13 @@ snapshots:
 
   node-releases@2.0.27: {}
 
-  node-releases@2.0.47: {}
+  node-releases@2.0.48: {}
 
   node-source-walk@7.0.0:
     dependencies:
       '@babel/parser': 7.29.2
 
-  nodemailer@8.0.11: {}
+  nodemailer@9.0.1: {}
 
   nodemon@3.1.14:
     dependencies:
@@ -21652,7 +21736,7 @@ snapshots:
 
   postcss@8.5.15:
     dependencies:
-      nanoid: 3.3.12
+      nanoid: 3.3.13
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
@@ -22066,7 +22150,7 @@ snapshots:
       regenerate: 1.4.2
       regenerate-unicode-properties: 10.2.2
       regjsgen: 0.8.0
-      regjsparser: 0.13.1
+      regjsparser: 0.13.2
       unicode-match-property-ecmascript: 2.0.0
       unicode-match-property-value-ecmascript: 2.2.1
 
@@ -22080,7 +22164,7 @@ snapshots:
 
   regjsgen@0.8.0: {}
 
-  regjsparser@0.13.1:
+  regjsparser@0.13.2:
     dependencies:
       jsesc: 3.1.0
 

From c477efa929d3807bb13bc1efa93e912faf08a14e Mon Sep 17 00:00:00 2001
From: eupn <36292692+eupn@users.noreply.github.com>
Date: Sun, 5 Jul 2026 17:57:14 +0400
Subject: [PATCH 5/8] feat(layout): add `armenian_hm_qwerty` layout (@eupn)
 (#8172)

### Description

This PR adds (Eastern) Armenian keyboard layout as it's on MacOS
("Armenian - HM QWERTY").

<!--
  Please describe the change(s) made in your PR:
  - explain the problem being solved
- for bug fixes without an open issue, include steps to reproduce the
issue
  - summarize the approach taken

  Use your own words. Do not rely on AI-generated descriptions.
They do not demonstrate your understanding of the problem or the
solution.
Writing the description yourself helps you verify the scope of your work
and
helps us better understand your intent, reasoning and level of insight.
-->

### Checks

- [x] Adding a layout?
- [x] Make sure to follow the [layouts
documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/LAYOUTS.md)
  - [x] Add layout to `packages/schemas/src/layouts.ts`
  - [x] Add layout json file to `frontend/static/layouts`
- [x] Check if any open issues are related to this PR; if so, be sure to
tag them below.
- [x] Make sure the PR title follows the Conventional Commits standard.
(https://www.conventionalcommits.org for more info)
- [x] Make sure to include your GitHub username prefixed with @ inside
parentheses at the end of the PR title.

<!-- label(optional scope): pull request title (@your_github_username)
-->
---
 .../static/layouts/armenian_hm_qwerty.json    | 62 +++++++++++++++++++
 packages/schemas/src/layouts.ts               |  1 +
 2 files changed, 63 insertions(+)
 create mode 100644 frontend/static/layouts/armenian_hm_qwerty.json

diff --git a/frontend/static/layouts/armenian_hm_qwerty.json b/frontend/static/layouts/armenian_hm_qwerty.json
new file mode 100644
index 000000000000..eb65ea41866e
--- /dev/null
+++ b/frontend/static/layouts/armenian_hm_qwerty.json
@@ -0,0 +1,62 @@
+{
+  "keymapShowTopRow": false,
+  "type": "ansi",
+  "keys": {
+    "row1": [
+      ["`", "~", "`", "~"],
+      ["1", "!", "՜", "★"],
+      ["2", "@", "™", "€"],
+      ["3", "#", "£", "№"],
+      ["4", "$", "¢"],
+      ["5", "%", "★"],
+      ["6", "^", "§"],
+      ["7", "&", "¶"],
+      ["8", "*", "•", "°"],
+      ["9", "(", "«", "‹"],
+      ["0", ")", "»", "›"],
+      ["-", "_", "–", "—"],
+      ["=", "+", "≠", "±"]
+    ],
+    "row2": [
+      ["ճ", "Ճ", "չ", "Չ"],
+      ["ւ", "Ւ"],
+      ["ե", "Ե", "է", "Է"],
+      ["ր", "Ր", "ռ", "Ռ"],
+      ["տ", "Տ", "թ", "Թ"],
+      ["յ", "Յ", "†", "¥"],
+      ["ւ", "Ւ", "÷", "՚"],
+      ["ի", "Ի", "„", "„"],
+      ["ո", "Ո", "օ", "Օ"],
+      ["պ", "Պ", "փ", "Փ"],
+      ["[", "{", "“", "”"],
+      ["]", "}", "‘", "’"],
+      ["\\", "|", "«", "»"]
+    ],
+    "row3": [
+      ["ա", "Ա", "ը", "Ը"],
+      ["ս", "Ս", "շ", "Շ"],
+      ["դ", "Դ"],
+      ["ֆ", "Ֆ", "ƒ"],
+      ["գ", "Գ", "©", "®"],
+      ["հ", "Հ"],
+      ["ձ", "Ձ", "ջ", "Ջ"],
+      ["կ", "Կ", "ք", "Ք"],
+      ["լ", "Լ", "ղ", "Ղ"],
+      [";", ":", "…", "՟"],
+      ["'", "\"", "՛", "֊"]
+    ],
+    "row4": [
+      ["զ", "Զ", "ժ", "Ժ"],
+      ["խ", "Խ"],
+      ["ծ", "Ծ", "ց", "Ց"],
+      ["վ", "Վ", "և"],
+      ["բ", "Բ"],
+      ["ն", "Ն"],
+      ["մ", "Մ"],
+      [",", "<", "՝", "≤"],
+      [".", ">", "։", "≥"],
+      ["/", "?", "՞", "՞"]
+    ],
+    "row5": [[" "]]
+  }
+}
diff --git a/packages/schemas/src/layouts.ts b/packages/schemas/src/layouts.ts
index ce3cc2cd32d9..5f1c2183812e 100644
--- a/packages/schemas/src/layouts.ts
+++ b/packages/schemas/src/layouts.ts
@@ -241,6 +241,7 @@ export const LayoutNameSchema = z.enum(
     "miligram",
     "nokwts",
     "vylet_v4",
+    "armenian_hm_qwerty",
   ],
   {
     errorMap: customEnumErrorHandler("Must be a supported layout"),

From f02b64ea529199cacf86912f556b2350a566ed6d Mon Sep 17 00:00:00 2001
From: Shamsuddin Panhwar <168548190+Shamsuddin45@users.noreply.github.com>
Date: Sun, 5 Jul 2026 18:57:49 +0500
Subject: [PATCH 6/8] feat(lang): add sindhi  (@Shamsuddin45) (#8165)

### Description

<!--
  Please describe the change(s) made in your PR:
  - explain the problem being solved
- for bug fixes without an open issue, include steps to reproduce the
issue
  - summarize the approach taken

  Use your own words. Do not rely on AI-generated descriptions.
They do not demonstrate your understanding of the problem or the
solution.
Writing the description yourself helps you verify the scope of your work
and
helps us better understand your intent, reasoning and level of insight.
-->

### Checks

- [ ] Adding quotes?
- Make sure to follow the [quotes
documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/QUOTES.md)
- [ ] Make sure to include translations for the quotes in the
description (or another comment) so we can verify their content.
- [ ] Adding a language?
- Make sure to follow the [languages
documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/LANGUAGES.md)
  - [ ] Add language to `packages/schemas/src/languages.ts`
- [ ] Add language to exactly one group in
`frontend/src/ts/constants/languages.ts`
  - [ ] Add language json file to `frontend/static/languages`
- [ ] Adding a theme?
- Make sure to follow the [themes
documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/THEMES.md)
  - [ ] Add theme to `packages/schemas/src/themes.ts`
  - [ ] Add theme to `frontend/src/ts/constants/themes.ts`
  - [ ] (optional) Add theme css file to `frontend/static/themes`
- [ ] Add some screenshots of the theme, especially with different test
settings (colorful, flip colors) to your pull request
- [ ] Adding a layout?
- [ ] Make sure to follow the [layouts
documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/LAYOUTS.md)
  - [ ] Add layout to `packages/schemas/src/layouts.ts`
  - [ ] Add layout json file to `frontend/static/layouts`
- [ ] Adding a font?
- Make sure to follow the [fonts
documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/FONTS.md)
  - [ ] Add font file to `frontend/static/webfonts`
  - [ ] Add font to `packages/schemas/src/fonts.ts`
  - [ ] Add font to `frontend/src/ts/constants/fonts.ts`
- [ ] Check if any open issues are related to this PR; if so, be sure to
tag them below.
- [ ] Make sure the PR title follows the Conventional Commits standard.
(https://www.conventionalcommits.org for more info)
- [ ] Make sure to include your GitHub username prefixed with @ inside
parentheses at the end of the PR title.

<!-- label(optional scope): pull request title (@your_github_username)
-->

<!-- I know I know they seem boring but please do them, they help us and
you will find out it also helps you. -->

Closes #

<!-- The issue(s) your PR resolves if any (delete if that is not the
case) -->
<!-- Please reference any issues and/or PRs related to your pull request
-->

<!-- Pro tip: you can mention an issue, PR, or discussion on GitHub by
referencing its hash number, e.g.:
[#1234](https://github.com/monkeytypegame/monkeytype/pull/1234) -->

<!-- Pro tip: you can press . (dot or period) in the code tab of any
GitHub repo to get access to GitHub's VS Code web editor. Enjoy! :) -->

---------

Co-authored-by: Christian Fehmer <cfe@sexy-developer.com>
---
 frontend/src/ts/constants/languages.ts |   1 +
 frontend/static/languages/sindhi.json  | 523 +++++++++++++++++++++++++
 packages/schemas/src/languages.ts      |   1 +
 3 files changed, 525 insertions(+)
 create mode 100644 frontend/static/languages/sindhi.json

diff --git a/frontend/src/ts/constants/languages.ts b/frontend/src/ts/constants/languages.ts
index 86b4d39ee3b5..5d4239379651 100644
--- a/frontend/src/ts/constants/languages.ts
+++ b/frontend/src/ts/constants/languages.ts
@@ -387,6 +387,7 @@ export const LanguageGroups: Record<string, Language[]> = {
   viossa: ["viossa", "viossa_njutro"],
   kokanu: ["kokanu", "likanu"],
   lao: ["lao"],
+  sindhi: ["sindhi"],
 };
 
 export type LanguageGroupName = keyof typeof LanguageGroups;
diff --git a/frontend/static/languages/sindhi.json b/frontend/static/languages/sindhi.json
new file mode 100644
index 000000000000..9f34d8fdbdee
--- /dev/null
+++ b/frontend/static/languages/sindhi.json
@@ -0,0 +1,523 @@
+{
+  "name": "sindhi",
+  "rightToLeft": true,
+  "joiningScript": true,
+  "orderedByFrequency": false,
+  "bcp47": "sd",
+  "words": [
+    "جي",
+    "۾",
+    "۽",
+    "جو",
+    "ته",
+    "کان",
+    "سان",
+    "آهي",
+    "هن",
+    "مان",
+    "تون",
+    "اسان",
+    "اوهان",
+    "اهي",
+    "هي",
+    "ڪير",
+    "ڇا",
+    "ڪٿي",
+    "ڪيئن",
+    "گهر",
+    "اسڪول",
+    "ڪتاب",
+    "قلم",
+    "ميز",
+    "ڪرسي",
+    "دروازو",
+    "کڙڪي",
+    "شهر",
+    "ڳوٺ",
+    "رستو",
+    "پاڻي",
+    "کير",
+    "ماني",
+    "چانور",
+    "مڇي",
+    "گوشت",
+    "ميوو",
+    "سبزي",
+    "ٻار",
+    "ماءُ",
+    "پيءُ",
+    "ڀاءُ",
+    "ڀيڻ",
+    "دوست",
+    "شاگرد",
+    "ڪم",
+    "ڪاروبار",
+    "وقت",
+    "ڏينهن",
+    "رات",
+    "صبح",
+    "شام",
+    "سج",
+    "چنڊ",
+    "تارو",
+    "آسمان",
+    "زمين",
+    "هوا",
+    "باهه",
+    "وڻ",
+    "گل",
+    "رنگ",
+    "ڳاڙهو",
+    "سائو",
+    "نيرو",
+    "پيلو",
+    "ڪارو",
+    "اڇو",
+    "ننڍو",
+    "وڏو",
+    "سٺو",
+    "خراب",
+    "تيز",
+    "آهستو",
+    "نئون",
+    "پراڻو",
+    "ويجهو",
+    "پري",
+    "اڄ",
+    "سڀاڻي",
+    "ڪالهه",
+    "ها",
+    "نه",
+    "مهرباني",
+    "ڀليڪار",
+    "سلام",
+    "خدا",
+    "علم",
+    "ٻولي",
+    "سنڌ",
+    "سنڌي",
+    "ڪمپيوٽر",
+    "انٽرنيٽ",
+    "فون",
+    "سافٽويئر",
+    "پروگرام",
+    "ڪوڊ",
+    "مارڪيٽ",
+    "دوڪان",
+    "خريد",
+    "وڪرو",
+    "قيمت",
+    "رقم",
+    "پئسا",
+    "بينڪ",
+    "اڪائونٽ",
+    "رسيد",
+    "بل",
+    "ادائگي",
+    "آمدني",
+    "خرچ",
+    "منافعو",
+    "نقصان",
+    "واپار",
+    "ڪارخانو",
+    "ملازم",
+    "مئنيجر",
+    "صارف",
+    "ڪسٽمر",
+    "آرڊر",
+    "سامان",
+    "اسٽاڪ",
+    "پيداوار",
+    "خدمت",
+    "ترقي",
+    "ڪاميابي",
+    "مقصد",
+    "محبت",
+    "خوشي",
+    "غم",
+    "اميد",
+    "خوف",
+    "غصو",
+    "احترام",
+    "ايمان",
+    "صبر",
+    "سڪون",
+    "دوستي",
+    "نفرت",
+    "شفقت",
+    "همدردي",
+    "خواب",
+    "خيال",
+    "سوچ",
+    "ياد",
+    "وسارڻ",
+    "خواهش",
+    "کاڌو",
+    "ناشتو",
+    "منجهند",
+    "راتيانو",
+    "چانهه",
+    "ڪافي",
+    "کنڊ",
+    "لوڻ",
+    "مرچ",
+    "اٽو",
+    "دال",
+    "روٽي",
+    "بسڪٽ",
+    "مٺائي",
+    "ڪيڪ",
+    "انب",
+    "ڪيلا",
+    "صوف",
+    "انگور",
+    "کجور",
+    "نارنگي",
+    "ليمو",
+    "تربوز",
+    "خربوزو",
+    "گاجر",
+    "بصر",
+    "ٽماٽو",
+    "آلو",
+    "ڀينڊي",
+    "ڪدو",
+    "اسپتال",
+    "نرس",
+    "مريض",
+    "دوا",
+    "علاج",
+    "صحت",
+    "بيماري",
+    "بخار",
+    "سردي",
+    "کنگهه",
+    "زخم",
+    "رت",
+    "اک",
+    "ڪن",
+    "نڪ",
+    "وات",
+    "ڏند",
+    "هٿ",
+    "پير",
+    "دل",
+    "دماغ",
+    "وار",
+    "چهرو",
+    "جسم",
+    "ورزش",
+    "هلڻ",
+    "ڊوڙڻ",
+    "ننڊ",
+    "آرام",
+    "ريل",
+    "بس",
+    "گاڏي",
+    "موٽر",
+    "سائيڪل",
+    "موٽرسائيڪل",
+    "هوائي",
+    "جهاز",
+    "ٻيڙي",
+    "اسٽيشن",
+    "روڊ",
+    "پل",
+    "سفر",
+    "مسافر",
+    "ٽڪيٽ",
+    "رفتار",
+    "ٽرئفڪ",
+    "موڙ",
+    "پارڪنگ",
+    "موبائل",
+    "ليپٽاپ",
+    "ڪيبورڊ",
+    "مائوس",
+    "اسڪرين",
+    "پرنٽر",
+    "فائيل",
+    "ڊيٽا",
+    "نيٽورڪ",
+    "ويب",
+    "ايپ",
+    "سائيٽ",
+    "اي ميل",
+    "پاسورڊ",
+    "يوزر",
+    "سرور",
+    "ڊائونلوڊ",
+    "اپلوڊ",
+    "ٽيڪنالاجي",
+    "ڊجيٽل",
+    "مسجد",
+    "نماز",
+    "روزو",
+    "زڪوات",
+    "حج",
+    "قرآن",
+    "دعا",
+    "عبادت",
+    "دين",
+    "رسول",
+    "نبي",
+    "فرشتو",
+    "جنت",
+    "دوزخ",
+    "نيڪي",
+    "گناهه",
+    "ثواب",
+    "اخلاق",
+    "عدل",
+    "سبق",
+    "تعليم",
+    "مدرسو",
+    "يونيورسٽي",
+    "ڪلاس",
+    "امتحان",
+    "نتيجو",
+    "درجو",
+    "مطالعو",
+    "تحقيق",
+    "سوال",
+    "جواب",
+    "مشق",
+    "ڪاغذ",
+    "بورڊ",
+    "نقشو",
+    "مضمون",
+    "ڪهاڻي",
+    "پوليس",
+    "عدالت",
+    "قانون",
+    "وڪيل",
+    "شاهد",
+    "جرم",
+    "سزا",
+    "ثبوت",
+    "حڪومت",
+    "وزير",
+    "صدر",
+    "چونڊ",
+    "ووٹ",
+    "پارٽي",
+    "شهرين",
+    "آئين",
+    "ادارو",
+    "انتظام",
+    "درياءُ",
+    "سمنڊ",
+    "ڍنڍ",
+    "جبل",
+    "ميدان",
+    "ريگستان",
+    "ٻيلو",
+    "مينهن",
+    "طوفان",
+    "بادل",
+    "گرمي",
+    "سيارو",
+    "بهار",
+    "خزان",
+    "موسم",
+    "زلزلو",
+    "ٻوڏ",
+    "پاڇو",
+    "لهر",
+    "ڪنارو",
+    "ڪتو",
+    "ٻلي",
+    "گهوڙو",
+    "ڳئون",
+    "ٻڪر",
+    "اونٺ",
+    "مرغو",
+    "ڪڪڙ",
+    "ڪبوتر",
+    "طوطو",
+    "چٻرو",
+    "شير",
+    "هاٿي",
+    "هرڻ",
+    "ڀنڀورو",
+    "ماکي",
+    "مک",
+    "چونٽي",
+    "سانپ",
+    "نمونو",
+    "مثال",
+    "حقيقت",
+    "تصور",
+    "تجربو",
+    "مشاهدو",
+    "رابطو",
+    "تعلق",
+    "شڪل",
+    "تصوير",
+    "موسيقي",
+    "گيت",
+    "راند",
+    "ٽيم",
+    "مقابلو",
+    "انعام",
+    "ڪپ",
+    "شروع",
+    "آخر",
+    "وچ",
+    "مٿي",
+    "هيٺ",
+    "اڳ",
+    "پٺيان",
+    "ساڄو",
+    "کاٻو",
+    "اندر",
+    "ٻاهر",
+    "سامهون",
+    "پاسي",
+    "ڀرسان",
+    "چوڌاري",
+    "مڪمل",
+    "جزوي",
+    "سڌو",
+    "اونهو",
+    "اوچو",
+    "جلدي",
+    "دير",
+    "اڪثر",
+    "شايد",
+    "ضرور",
+    "هميشه",
+    "ڪڏهن",
+    "گهڻو",
+    "ٿورو",
+    "تمام",
+    "صرف",
+    "ٻيهر",
+    "اڃا",
+    "هاڻي",
+    "پوءِ",
+    "اڳي",
+    "آخرڪار",
+    "واقعي",
+    "ممڪن",
+    "ناممڪن",
+    "ڪاريگر",
+    "هاري",
+    "مزدور",
+    "ڊرائيور",
+    "واپاري",
+    "انجنيئر",
+    "پروگرامر",
+    "ليکڪ",
+    "شاعر",
+    "صحافي",
+    "فنڪار",
+    "اداڪار",
+    "ڳائڻو",
+    "رانديگر",
+    "ڊاڪٽر",
+    "استاد",
+    "سيڪريٽري",
+    "سپاهي",
+    "جج",
+    "کٽ",
+    "ڪٻٽ",
+    "صوفو",
+    "چادر",
+    "تڪيو",
+    "بتي",
+    "پنکو",
+    "فرش",
+    "ڀت",
+    "ڇت",
+    "باٿ روم",
+    "رڌڻي",
+    "ڪمرو",
+    "هال",
+    "بالڪوني",
+    "صحن",
+    "تالو",
+    "چاٻي",
+    "شيشو",
+    "دٻو",
+    "سنوار",
+    "ترتيب",
+    "منصوبو",
+    "تبديلي",
+    "بهتري",
+    "مشڪل",
+    "آسان",
+    "ذميواري",
+    "آزادي",
+    "برابري",
+    "اتحاد",
+    "امن",
+    "جنگ",
+    "طاقت",
+    "ڪمزوري",
+    "ڪوشش",
+    "محنت",
+    "صلاحيت",
+    "مهارت",
+    "لفظ",
+    "جملو",
+    "پيراگراف",
+    "اچار",
+    "لغت",
+    "ترجمو",
+    "گرامر",
+    "حرف",
+    "نالو",
+    "فعل",
+    "صفت",
+    "ضمير",
+    "عدد",
+    "آواز",
+    "لهجو",
+    "ٻول",
+    "رسم",
+    "رواج",
+    "ثقافت",
+    "تاريخ",
+    "جنوري",
+    "فيبروري",
+    "مارچ",
+    "اپريل",
+    "مئي",
+    "جون",
+    "جولاءِ",
+    "آگسٽ",
+    "سيپٽمبر",
+    "آڪٽوبر",
+    "نومبر",
+    "ڊسمبر",
+    "سومر",
+    "اڱارو",
+    "اربع",
+    "خميس",
+    "جمعو",
+    "ڇنڇر",
+    "آچر",
+    "مهينو",
+    "صفر",
+    "هڪ",
+    "ٻه",
+    "ٽي",
+    "چار",
+    "پنج",
+    "ڇهه",
+    "ست",
+    "اٺ",
+    "نو",
+    "ڏهه",
+    "ويهه",
+    "ٽيهه",
+    "چاليهه",
+    "پنجاهه",
+    "سٺ",
+    "ستر",
+    "اسي",
+    "نوي",
+    "سئو"
+  ]
+}
diff --git a/packages/schemas/src/languages.ts b/packages/schemas/src/languages.ts
index 245acb1dbf17..6bdef92a348f 100644
--- a/packages/schemas/src/languages.ts
+++ b/packages/schemas/src/languages.ts
@@ -448,6 +448,7 @@ export const LanguageSchema = z.enum(
     "lao",
     "code_6502_assembly",
     "english_legal",
+    "sindhi",
   ],
   {
     errorMap: customEnumErrorHandler("Must be a supported language"),

From 9eb894572a552be085f11808513dc040461a987a Mon Sep 17 00:00:00 2001
From: Sulakshan Chandra Ghimire <sulucghimire@gmail.com>
Date: Sun, 5 Jul 2026 20:03:12 +0545
Subject: [PATCH 7/8] impr(quotes): add SQL code quotes (@SulakshanCGhimire)
 (#8154)

### Description
Added 40 SQL code quote snippets to introduce SQL as a typing practice
language on Monkeytype. The quotes cover a wide range of SQL concepts
including SELECT, INSERT, UPDATE, DELETE, JOINs, CREATE TABLE, ALTER
TABLE, Window Functions, CTEs, Stored Procedures, and Transactions.

### Checks
- [x] Adding quotes?
- [x] Make sure to follow the [quotes
documentation](https://github.com/monkeytypegame/monkeytype/blob/master/docs/QUOTES.md)
- [x] Make sure to include translations for the quotes in the
description (or another comment) so we can verify their content.

Note: These are SQL code snippets, not natural language quotes, so no
translation is needed. All snippets are standard SQL syntax and
self-explanatory.
---
 frontend/static/quotes/code_sql.json | 251 +++++++++++++++++++++++++++
 1 file changed, 251 insertions(+)
 create mode 100644 frontend/static/quotes/code_sql.json

diff --git a/frontend/static/quotes/code_sql.json b/frontend/static/quotes/code_sql.json
new file mode 100644
index 000000000000..27c6444699d1
--- /dev/null
+++ b/frontend/static/quotes/code_sql.json
@@ -0,0 +1,251 @@
+{
+  "language": "code_sql",
+  "groups": [
+    [0, 100],
+    [101, 300],
+    [301, 600],
+    [601, 9999]
+  ],
+  "quotes": [
+    {
+      "text": "SELECT id, name, email FROM users WHERE active = 1 ORDER BY name ASC;",
+      "source": "SQL SELECT",
+      "length": 69,
+      "id": 1
+    },
+    {
+      "text": "SELECT * FROM products WHERE price > 100 AND stock > 0 ORDER BY price DESC;",
+      "source": "SQL SELECT",
+      "length": 75,
+      "id": 2
+    },
+    {
+      "text": "SELECT department, COUNT(*) AS total FROM employees GROUP BY department;",
+      "source": "SQL GROUP BY",
+      "length": 72,
+      "id": 3
+    },
+    {
+      "text": "SELECT department, AVG(salary) AS avg_salary FROM employees GROUP BY department HAVING AVG(salary) > 50000;",
+      "source": "SQL HAVING",
+      "length": 107,
+      "id": 4
+    },
+    {
+      "text": "SELECT u.name, o.total FROM users u INNER JOIN orders o ON u.id = o.user_id;",
+      "source": "SQL INNER JOIN",
+      "length": 76,
+      "id": 5
+    },
+    {
+      "text": "SELECT u.name, o.total FROM users u LEFT JOIN orders o ON u.id = o.user_id WHERE o.id IS NULL;",
+      "source": "SQL LEFT JOIN",
+      "length": 94,
+      "id": 6
+    },
+    {
+      "text": "SELECT p.name, c.name AS category FROM products p JOIN categories c ON p.category_id = c.id ORDER BY c.name;",
+      "source": "SQL JOIN",
+      "length": 108,
+      "id": 7
+    },
+    {
+      "text": "INSERT INTO users (name, email, created_at) VALUES ('Alice', 'alice@example.com', NOW());",
+      "source": "SQL INSERT",
+      "length": 89,
+      "id": 8
+    },
+    {
+      "text": "INSERT INTO orders (user_id, product_id, quantity, total) VALUES (1, 42, 3, 59.99);",
+      "source": "SQL INSERT",
+      "length": 83,
+      "id": 9
+    },
+    {
+      "text": "INSERT INTO logs (event, message, created_at) SELECT 'login', name, NOW() FROM users WHERE active = 1;",
+      "source": "SQL INSERT SELECT",
+      "length": 102,
+      "id": 10
+    },
+    {
+      "text": "UPDATE users SET email = 'newemail@example.com', updated_at = NOW() WHERE id = 5;",
+      "source": "SQL UPDATE",
+      "length": 81,
+      "id": 11
+    },
+    {
+      "text": "UPDATE products SET stock = stock - 1 WHERE id = 10 AND stock > 0;",
+      "source": "SQL UPDATE",
+      "length": 66,
+      "id": 12
+    },
+    {
+      "text": "UPDATE orders SET status = 'shipped' WHERE created_at < NOW() - INTERVAL 2 DAY AND status = 'pending';",
+      "source": "SQL UPDATE",
+      "length": 102,
+      "id": 13
+    },
+    {
+      "text": "DELETE FROM sessions WHERE expired_at < NOW() - INTERVAL 7 DAY AND user_id IS NOT NULL;",
+      "source": "SQL DELETE",
+      "length": 87,
+      "id": 14
+    },
+    {
+      "text": "DELETE FROM users WHERE id = 7 AND created_at < '2020-01-01' AND active = 0;",
+      "source": "SQL DELETE",
+      "length": 76,
+      "id": 15
+    },
+    {
+      "text": "CREATE TABLE users (id INT PRIMARY KEY AUTO_INCREMENT, name VARCHAR(100) NOT NULL, email VARCHAR(255) UNIQUE NOT NULL, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP);",
+      "source": "SQL CREATE TABLE",
+      "length": 167,
+      "id": 16
+    },
+    {
+      "text": "CREATE TABLE orders (id INT PRIMARY KEY AUTO_INCREMENT, user_id INT NOT NULL, total DECIMAL(10, 2) NOT NULL, status VARCHAR(50) DEFAULT 'pending', FOREIGN KEY (user_id) REFERENCES users(id));",
+      "source": "SQL CREATE TABLE",
+      "length": 191,
+      "id": 17
+    },
+    {
+      "text": "CREATE TABLE products (id INT PRIMARY KEY AUTO_INCREMENT, name VARCHAR(255) NOT NULL, price DECIMAL(10, 2) NOT NULL, stock INT DEFAULT 0, category_id INT, INDEX (category_id));",
+      "source": "SQL CREATE TABLE",
+      "length": 176,
+      "id": 18
+    },
+    {
+      "text": "CREATE INDEX idx_users_email ON users (email) USING BTREE; CREATE INDEX idx_users_name ON users (name);",
+      "source": "SQL CREATE INDEX",
+      "length": 103,
+      "id": 19
+    },
+    {
+      "text": "ALTER TABLE users ADD COLUMN phone VARCHAR(20) AFTER email, ADD COLUMN verified BOOLEAN DEFAULT FALSE;",
+      "source": "SQL ALTER TABLE",
+      "length": 102,
+      "id": 20
+    },
+    {
+      "text": "ALTER TABLE products ADD COLUMN description TEXT, ADD COLUMN image_url VARCHAR(500);",
+      "source": "SQL ALTER TABLE",
+      "length": 84,
+      "id": 21
+    },
+    {
+      "text": "ALTER TABLE orders ADD CONSTRAINT fk_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;",
+      "source": "SQL ALTER TABLE",
+      "length": 103,
+      "id": 22
+    },
+    {
+      "text": "DROP TABLE IF EXISTS temp_logs; DROP TABLE IF EXISTS temp_sessions; DROP TABLE IF EXISTS temp_cache;",
+      "source": "SQL DROP",
+      "length": 100,
+      "id": 23
+    },
+    {
+      "text": "TRUNCATE TABLE sessions; TRUNCATE TABLE rate_limits; ALTER TABLE sessions AUTO_INCREMENT = 1;",
+      "source": "SQL TRUNCATE",
+      "length": 93,
+      "id": 24
+    },
+    {
+      "text": "SELECT name, salary, RANK() OVER (PARTITION BY department ORDER BY salary DESC) AS rank FROM employees;",
+      "source": "SQL Window Function",
+      "length": 103,
+      "id": 25
+    },
+    {
+      "text": "SELECT id, name, SUM(amount) OVER (ORDER BY created_at ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS running_total FROM sales;",
+      "source": "SQL Window Function",
+      "length": 133,
+      "id": 26
+    },
+    {
+      "text": "WITH high_value AS (SELECT user_id FROM orders WHERE total > 500) SELECT u.name FROM users u JOIN high_value h ON u.id = h.user_id;",
+      "source": "SQL CTE",
+      "length": 131,
+      "id": 27
+    },
+    {
+      "text": "WITH RECURSIVE cte AS (SELECT id, name, parent_id FROM categories WHERE parent_id IS NULL UNION ALL SELECT c.id, c.name, c.parent_id FROM categories c JOIN cte ON c.parent_id = cte.id) SELECT * FROM cte;",
+      "source": "SQL Recursive CTE",
+      "length": 203,
+      "id": 28
+    },
+    {
+      "text": "SELECT name, salary, CASE WHEN salary > 80000 THEN 'High' WHEN salary > 50000 THEN 'Mid' ELSE 'Low' END AS salary_band FROM employees;",
+      "source": "SQL CASE",
+      "length": 134,
+      "id": 29
+    },
+    {
+      "text": "SELECT id, COALESCE(phone, email, 'N/A') AS contact FROM users WHERE active = 1 ORDER BY id;",
+      "source": "SQL COALESCE",
+      "length": 92,
+      "id": 30
+    },
+    {
+      "text": "SELECT * FROM users WHERE id IN (SELECT user_id FROM orders WHERE total > 1000);",
+      "source": "SQL Subquery",
+      "length": 80,
+      "id": 31
+    },
+    {
+      "text": "SELECT name FROM products WHERE price > (SELECT AVG(price) FROM products) ORDER BY price ASC;",
+      "source": "SQL Subquery",
+      "length": 93,
+      "id": 32
+    },
+    {
+      "text": "SELECT u.name, COUNT(o.id) AS order_count, SUM(o.total) AS total_spent FROM users u LEFT JOIN orders o ON u.id = o.user_id GROUP BY u.id, u.name ORDER BY total_spent DESC LIMIT 10;",
+      "source": "SQL Complex Query",
+      "length": 180,
+      "id": 33
+    },
+    {
+      "text": "CREATE VIEW active_users AS SELECT id, name, email FROM users WHERE active = 1 AND last_login > NOW() - INTERVAL 30 DAY;",
+      "source": "SQL VIEW",
+      "length": 120,
+      "id": 34
+    },
+    {
+      "text": "CREATE PROCEDURE get_user_orders(IN user_id INT) BEGIN SELECT o.id, o.total, o.status FROM orders o WHERE o.user_id = user_id ORDER BY o.created_at DESC; END;",
+      "source": "SQL Stored Procedure",
+      "length": 158,
+      "id": 35
+    },
+    {
+      "text": "START TRANSACTION; UPDATE accounts SET balance = balance - 500 WHERE id = 1; UPDATE accounts SET balance = balance + 500 WHERE id = 2; COMMIT;",
+      "source": "SQL Transaction",
+      "length": 142,
+      "id": 36
+    },
+    {
+      "text": "SELECT DATE_FORMAT(created_at, '%Y-%m') AS month, SUM(total) AS revenue FROM orders WHERE status = 'completed' GROUP BY month ORDER BY month;",
+      "source": "SQL Date Functions",
+      "length": 141,
+      "id": 37
+    },
+    {
+      "text": "SELECT p.name, ROUND(AVG(r.rating), 2) AS avg_rating, COUNT(r.id) AS review_count FROM products p JOIN reviews r ON p.id = r.product_id GROUP BY p.id HAVING COUNT(r.id) >= 5 ORDER BY avg_rating DESC;",
+      "source": "SQL Complex JOIN",
+      "length": 199,
+      "id": 38
+    },
+    {
+      "text": "EXPLAIN SELECT u.name, COUNT(o.id) FROM users u JOIN orders o ON u.id = o.user_id WHERE o.created_at > '2024-01-01' GROUP BY u.id;",
+      "source": "SQL EXPLAIN",
+      "length": 130,
+      "id": 39
+    },
+    {
+      "text": "SELECT t1.id, t1.value, t2.value AS next_value FROM table1 t1 LEFT JOIN table1 t2 ON t2.id = t1.id + 1 ORDER BY t1.id;",
+      "source": "SQL Self JOIN",
+      "length": 118,
+      "id": 40
+    }
+  ]
+}

From 2b5f26dbc79a6a9b8da7d9668addef297f25b846 Mon Sep 17 00:00:00 2001
From: benhuang3 <59267390+benhuang3@users.noreply.github.com>
Date: Sun, 5 Jul 2026 07:42:58 -0700
Subject: [PATCH 8/8] feat: add regex word filter (@benhuang3) (#8153)

### Description
This PR adds a regex filter to left column of words filter page,
allowing users to filter words using regular expressions along with the
other rules in the words filter tab.
- Like "exclude", box is cleared and expressions ignored when "exact
match" is true.
- Parses string into regex using https://stackoverflow.com/a/874742
- Shows notification on invalid regex expressions and other errors
- Layout may not be suitable, please give suggestions!

### Checks
- [x] Make sure the PR title follows the Conventional Commits standard.
(https://www.conventionalcommits.org for more info)
- [x] Make sure to include your GitHub username prefixed with @ inside
parentheses at the end of the PR title.

<img width="400" height="400" alt="Screenshot 2026-06-23 at 3 33 44 PM"
src="https://github.com/user-attachments/assets/73f36955-94f4-4051-a434-b8b7329c9106"
/>

---------

Co-authored-by: Miodec <jack@monkeytype.com>
---
 .../ts/components/modals/WordFilterModal.tsx  | 159 +++++++++++++-----
 .../src/ts/hooks/createDebouncedSignal.ts     |  20 +++
 2 files changed, 141 insertions(+), 38 deletions(-)
 create mode 100644 frontend/src/ts/hooks/createDebouncedSignal.ts

diff --git a/frontend/src/ts/components/modals/WordFilterModal.tsx b/frontend/src/ts/components/modals/WordFilterModal.tsx
index 01a041682c14..a16dc8cf63b5 100644
--- a/frontend/src/ts/components/modals/WordFilterModal.tsx
+++ b/frontend/src/ts/components/modals/WordFilterModal.tsx
@@ -3,10 +3,17 @@ import type { LayoutObject } from "@monkeytype/schemas/layouts";
 
 import { tryCatch } from "@monkeytype/util/trycatch";
 import { createForm } from "@tanstack/solid-form";
-import { createSignal, JSXElement, Setter } from "solid-js";
+import {
+  createMemo,
+  createResource,
+  createSignal,
+  JSXElement,
+  Setter,
+} from "solid-js";
 
 import { LanguageList } from "../../constants/languages";
 import { LayoutsList } from "../../constants/layouts";
+import { createDebouncedSignal } from "../../hooks/createDebouncedSignal";
 import { hideLoaderBar, showLoaderBar } from "../../states/loader-bar";
 import { hideModal } from "../../states/modals";
 import {
@@ -104,6 +111,74 @@ const presetOptions = Object.entries(presets).map(([id, preset]) => ({
   text: preset.display,
 }));
 
+type FilterFormValues = {
+  include: string;
+  exclude: string;
+  minLength: string;
+  maxLength: string;
+  regex: string;
+  exactMatch: boolean;
+};
+
+type FilterResult = { words: string[] } | { error: string };
+
+function filterWordList(
+  value: FilterFormValues,
+  words: string[],
+): FilterResult {
+  const exactMatchOnly = value.exactMatch;
+
+  // Source - https://stackoverflow.com/a/874742
+  // Retrieved 2026-06-23, License - CC BY-SA 3.0
+  // Separates string into regex expression
+  let reglit = new RegExp("");
+  try {
+    const flags = value.regex.replace(/.*\/([gimy]*)$/, "$1");
+    const pattern = value.regex.replace(new RegExp(`^/(.*?)/${flags}$`), "$1");
+    reglit = new RegExp(pattern, flags);
+  } catch (error) {
+    if (error instanceof SyntaxError) {
+      return { error: "Invaid Regex Expression" };
+    }
+    return { error: String(error) };
+  }
+
+  let filterin = Misc.escapeRegExp(value.include.trim());
+  filterin = filterin.replace(/\s+/gi, "|");
+
+  if (exactMatchOnly && filterin === "") {
+    return { error: "Include field is required for exact match" };
+  }
+  const regincl = exactMatchOnly
+    ? new RegExp(`^[${filterin}]+$`, "i")
+    : new RegExp(filterin, "i");
+
+  let filterout = Misc.escapeRegExp(value.exclude.trim());
+  filterout = filterout.replace(/\s+/gi, "|");
+  const regexcl = new RegExp(filterout, "i");
+
+  const max = value.maxLength === "" ? 999 : parseInt(value.maxLength);
+  const min = value.minLength === "" ? 1 : parseInt(value.minLength);
+
+  const filteredWords: string[] = [];
+  for (const word of words) {
+    const testincl = regincl.test(word);
+    const testexcl =
+      exactMatchOnly || filterout === "" ? false : regexcl.test(word);
+    const testlit = exactMatchOnly ? true : reglit.test(word);
+    if (
+      testincl &&
+      !testexcl &&
+      testlit &&
+      word.length <= max &&
+      word.length >= min
+    ) {
+      filteredWords.push(word);
+    }
+  }
+  return { words: filteredWords };
+}
+
 export function WordFilterModal(props: {
   setChainedData: Setter<CustomTextIncomingData>;
 }): JSXElement {
@@ -120,29 +195,13 @@ export function WordFilterModal(props: {
       exclude: "",
       minLength: "",
       maxLength: "",
+      regex: "",
       exactMatch: false,
     },
     onSubmit: async ({ value }) => {
       setLoading(true);
       showLoaderBar();
       try {
-        const exactMatchOnly = value.exactMatch;
-        let filterin = Misc.escapeRegExp(value.include.trim());
-        filterin = filterin.replace(/\s+/gi, "|");
-
-        if (exactMatchOnly && filterin === "") {
-          showNoticeNotification("Include field is required for exact match");
-          return;
-        }
-
-        const regincl = exactMatchOnly
-          ? new RegExp(`^[${filterin}]+$`, "i")
-          : new RegExp(filterin, "i");
-
-        let filterout = Misc.escapeRegExp(value.exclude.trim());
-        filterout = filterout.replace(/\s+/gi, "|");
-        const regexcl = new RegExp(filterout, "i");
-
         const { data: languageWordList, error } = await tryCatch(
           JSONData.getLanguage(language() as Language),
         );
@@ -152,28 +211,18 @@ export function WordFilterModal(props: {
           return;
         }
 
-        const max = value.maxLength === "" ? 999 : parseInt(value.maxLength);
-        const min = value.minLength === "" ? 1 : parseInt(value.minLength);
-
-        const filteredWords: string[] = [];
-        for (const word of languageWordList.words) {
-          const test1 = regincl.test(word);
-          const test2 = exactMatchOnly ? false : regexcl.test(word);
-          if (
-            ((test1 && !test2) || (test1 && filterout === "")) &&
-            word.length <= max &&
-            word.length >= min
-          ) {
-            filteredWords.push(word);
-          }
+        const result = filterWordList(value, languageWordList.words);
+        if ("error" in result) {
+          showNoticeNotification(result.error);
+          return;
         }
 
-        if (filteredWords.length === 0) {
+        if (result.words.length === 0) {
           showNoticeNotification("No words found");
           return;
         }
         props.setChainedData({
-          splitText: filteredWords,
+          splitText: result.words,
           set: submitAction === "set",
         });
         hideModal("WordFilter");
@@ -186,6 +235,22 @@ export function WordFilterModal(props: {
 
   const isExactMatch = form.useStore((s) => s.values.exactMatch);
 
+  const [languageWords] = createResource(language, async (lang) => {
+    const { data } = await tryCatch(JSONData.getLanguage(lang as Language));
+    return data?.words ?? null;
+  });
+
+  const formValues = form.useStore((s) => s.values);
+
+  // debounce the preview so it doesn't refilter the whole word list on every keystroke
+  const debouncedValues = createDebouncedSignal(formValues, 250);
+
+  const matchResult = createMemo<FilterResult | null>(() => {
+    const words = languageWords();
+    if (words === null || words === undefined) return null;
+    return filterWordList(debouncedValues(), words);
+  });
+
   const applyPreset = async () => {
     const presetToApply = presets[preset()];
     if (presetToApply === undefined) {
@@ -205,6 +270,7 @@ export function WordFilterModal(props: {
     if (presetToApply.exactMatch === true) {
       form.setFieldValue("exactMatch", true);
       form.setFieldValue("exclude", "");
+      form.setFieldValue("regex", "");
     } else {
       form.setFieldValue("exactMatch", false);
       if (presetToApply.getExcludeString !== undefined) {
@@ -239,9 +305,9 @@ export function WordFilterModal(props: {
             />
           </LabeledField>
           <div class="text-xs text-sub">
-            You can manually filter words by length, words or characters
-            (separated by spaces) on the left side. On the right side you can
-            generate filters based on a preset and selected layout.
+            You can manually filter words by length, regular expressions, words,
+            or characters (separated by spaces) on the left side. On the right
+            side you can generate filters based on a preset and selected layout.
           </div>
 
           <div class="grid grid-cols-1 gap-4 md:grid-cols-[1fr_auto_1fr]">
@@ -258,6 +324,15 @@ export function WordFilterModal(props: {
                   </form.Field>
                 </LabeledField>
               </div>
+
+              <LabeledField label="regex">
+                <form.Field name="regex">
+                  {(field) => (
+                    <InputField field={field} disabled={isExactMatch()} />
+                  )}
+                </form.Field>
+              </LabeledField>
+
               <LabeledField label="include">
                 <form.Field name="include">
                   {(field) => <InputField field={field} />}
@@ -268,6 +343,7 @@ export function WordFilterModal(props: {
                     onChange: ({ value }) => {
                       if (value) {
                         form.setFieldValue("exclude", "");
+                        form.setFieldValue("regex", "");
                       }
                       return undefined;
                     },
@@ -321,7 +397,14 @@ export function WordFilterModal(props: {
               />
             </div>
           </div>
-
+          <div class="text-center text-xs text-sub">
+            {(() => {
+              const result = matchResult();
+              if (result === null) return "loading words...";
+              if ("error" in result) return result.error;
+              return `${result.words.length} words found`;
+            })()}
+          </div>
           <div class="text-xs text-sub">
             {
               '"Set" replaces the current custom word list with the filter result, "Add" appends the filter result to the current custom word list.'
diff --git a/frontend/src/ts/hooks/createDebouncedSignal.ts b/frontend/src/ts/hooks/createDebouncedSignal.ts
new file mode 100644
index 000000000000..bf3cb7154cc7
--- /dev/null
+++ b/frontend/src/ts/hooks/createDebouncedSignal.ts
@@ -0,0 +1,20 @@
+import { Accessor, createEffect, createSignal, onCleanup } from "solid-js";
+import { debounce } from "throttle-debounce";
+
+/**
+ * Derives a debounced accessor from a reactive source. The returned accessor
+ * updates at most once per `delay` ms after the source stops changing.
+ */
+export function createDebouncedSignal<T>(
+  source: Accessor<T>,
+  delay: number,
+): Accessor<T> {
+  const [value, setValue] = createSignal(source());
+
+  const update = debounce(delay, (next: T) => setValue(() => next));
+  onCleanup(() => update.cancel());
+
+  createEffect(() => update(source()));
+
+  return value;
+}