chore: resolve merge conflicts with develop

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: JohnMcLear

pnpm-lock.yaml

@@ -262,7 +262,7 @@ class PadUtils {
     }
 
     if (onEscape) {
-      node.on('keydown', (evt) => {
+      node.on('keydown', (evt: JQuery.KeyDownEvent) => {
         if (evt.which === 27) {
           onEscape(evt);
         }
@@ -418,7 +418,7 @@ class PadUtils {
         const errorId = randomString(20);
 
         let msgAlreadyVisible = false;
-        $('.gritter-item .error-msg').each(function () {
+        $('.gritter-item .error-msg').each(function (this: HTMLElement) {
           if ($(this).text() === msg) {
             msgAlreadyVisible = true;
           }

src/static/js/pad_utils.ts

@@ -2,7 +2,8 @@
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig to read more about this file */
     "moduleDetection": "force",
-    "lib": ["ES2023"],
+    "lib": ["ES2023", "DOM"],
+    "types": ["node", "jquery"],
     /* Language and Environment */
     "target": "es6",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     /* Modules */