[pull] master from monkeytypegame:master

.gitignore

@@ -132,4 +132,4 @@ frontend/static/webfonts-preview
 .turbo
 frontend/.env.sentry-build-plugin
 .claude/worktrees
-1024MiB
+1024MiB

backend/package.json

@@ -45,7 +45,7 @@
     "mjml": "4.15.0",
     "mongodb": "6.3.0",
     "mustache": "4.2.0",
-    "nodemailer": "8.0.4",
+    "nodemailer": "8.0.5",
     "object-hash": "3.0.0",
     "prom-client": "15.1.3",
     "rate-limiter-flexible": "5.0.3",

frontend/src/ts/components/modals/MobileTestConfigModal.tsx

@@ -106,7 +106,9 @@ export function MobileTestConfigModal(): JSXElement {
     if (value === "all") {
       return areUnsortedArraysEqual(getConfig.quoteLength, [0, 1, 2, 3]);
     }
-    if (value === "-2") return false;
+    if (value === "-2") {
+      return areUnsortedArraysEqual(getConfig.quoteLength, [-2]);
+    }
     if (value === "-3") {
       return areUnsortedArraysEqual(getConfig.quoteLength, [-3]);
     }

frontend/src/ts/components/pages/test/TestConfig.tsx

@@ -348,6 +348,7 @@ function Mode2Quote(props: ComponentProps<"div">): JSXElement {
         fa={{
           icon: "fa-search",
         }}
+        active={areUnsortedArraysEqual(getConfig.quoteLength, [-2])}
         onClick={() => {
           showModal("QuoteSearch");
         }}

frontend/src/ts/states/notifications.ts

@@ -115,7 +115,7 @@ export function addNotificationWithLevel(
   message: string,
   level: NotificationLevel,
   options: AddNotificationOptions = {},
-): void {
+): number {
   let details = options.details;
 
   if (options.response !== undefined) {
@@ -174,25 +174,27 @@ export function addNotificationWithLevel(
     }, durationMs + 250);
     autoRemoveTimers.set(notifId, timer);
   }
+
+  return notifId;
 }
 
 export function showNoticeNotification(
   message: string,
   options?: AddNotificationOptions,
-): void {
-  addNotificationWithLevel(message, "notice", options);
+): number {
+  return addNotificationWithLevel(message, "notice", options);
 }
 
 export function showSuccessNotification(
   message: string,
   options?: AddNotificationOptions,
-): void {
-  addNotificationWithLevel(message, "success", options);
+): number {
+  return addNotificationWithLevel(message, "success", options);
 }
 
 export function showErrorNotification(
   message: string,
   options?: AddNotificationOptions,
-): void {
-  addNotificationWithLevel(message, "error", options);
+): number {
+  return addNotificationWithLevel(message, "error", options);
 }

frontend/src/ts/test/test-state.ts

@@ -4,7 +4,8 @@ export let isRepeated = false;
 export let isPaceRepeat = false;
 export let isActive = false;
 export let bailedOut = false;
-export let selectedQuoteId = 1;
+export let selectedQuoteId =
+  parseInt(localStorage.getItem("selectedQuoteId") ?? "1", 10) || 1;
 export let activeWordIndex = 0;
 export let testInitSuccess = true;
 export let isLanguageRightToLeft = false;
@@ -30,6 +31,7 @@ export function setBailedOut(tf: boolean): void {
 
 export function setSelectedQuoteId(id: number): void {
   selectedQuoteId = id;
+  localStorage.setItem("selectedQuoteId", id.toString());
 }
 
 export function setActiveWordIndex(index: number): void {

frontend/src/ts/test/test-timer.ts

@@ -14,6 +14,7 @@ import * as Numbers from "@monkeytype/util/numbers";
 import {
   showNoticeNotification,
   showErrorNotification,
+  removeNotification,
 } from "../states/notifications";
 import * as Caret from "./caret";
 import * as SlowTimer from "../legacy-states/slow-timer";
@@ -52,6 +53,7 @@ type TimerStats = {
 };
 
 let slowTimerCount = 0;
+let slowTimerNotifIds: number[] = [];
 let timer: NodeJS.Timeout | null = null;
 const interval = 1000;
 let expected = 0;
@@ -284,8 +286,10 @@ function checkIfTimerIsSlow(drift: number): void {
         'This could be caused by "efficiency mode" on Microsoft Edge.',
       );
 
-      showErrorNotification(
-        "Stopping the test due to bad performance. This would cause test calculations to be incorrect. If this happens a lot, please report this.",
+      slowTimerNotifIds.push(
+        showErrorNotification(
+          "Stopping the test due to bad performance. This would cause test calculations to be incorrect. If this happens a lot, please report this.",
+        ),
       );
 
       timerEvent.dispatch({ key: "fail", value: "slow timer" });
@@ -296,6 +300,10 @@ function checkIfTimerIsSlow(drift: number): void {
 export async function start(): Promise<void> {
   SlowTimer.clear();
   slowTimerCount = 0;
+  for (const id of slowTimerNotifIds) {
+    removeNotification(id, "clear");
+  }
+  slowTimerNotifIds = [];
   void _startNew();
   // void _startOld();
 }

frontend/src/ts/utils/json-data.ts

@@ -52,7 +52,7 @@ export function memoizeAsync<P, Args extends unknown[], R>(
     const key = getKey ? getKey(...args) : (args[0] as P);
 
     const cached = cache.get(key);
-    if (cached) {
+    if (cached !== undefined) {
       return cached;
     }
 

frontend/static/languages/french_10k.json

@@ -2312,7 +2312,7 @@
     "réduit",
     "ambigu",
     "wagon",
-    "déballe!",
+    "déballe",
     "obèse",
     "adultes",
     "vagabond",
@@ -3957,7 +3957,6 @@
     "discrédit",
     "corrections",
     "travaillait",
-    "assez!",
     "transporte",
     "positif",
     "dixième",
@@ -5476,7 +5475,6 @@
     "absolutisme",
     "frénésie",
     "dorage",
-    "feu!",
     "verrou",
     "outrage",
     "cash",

frontend/vitest.config.ts

@@ -9,8 +9,16 @@ const plugins = [
   solidPlugin({ hot: false }),
 ];
 
+const tanstackSolidNoExternal: (string | RegExp)[] = [
+  "@solidjs/meta",
+  /@tanstack\/solid-.*/,
+];
+
 export const projects: UserWorkspaceConfig[] = [
   {
+    ssr: {
+      noExternal: tanstackSolidNoExternal,
+    },
     test: {
       name: { label: "unit", color: "blue" },
       include: ["__tests__/**/*.spec.ts"],
@@ -26,6 +34,9 @@ export const projects: UserWorkspaceConfig[] = [
     plugins,
   },
   {
+    ssr: {
+      noExternal: tanstackSolidNoExternal,
+    },
     test: {
       name: { label: "jsdom", color: "yellow" },
       include: ["__tests__/**/*.jsdom-spec.ts"],
@@ -36,7 +47,7 @@ export const projects: UserWorkspaceConfig[] = [
   },
   {
     ssr: {
-      noExternal: ["@solidjs/meta"],
+      noExternal: tanstackSolidNoExternal,
     },
     test: {
       name: { label: "jsx", color: "green" },