JS dependency updates (#275)

* update all deps

* drop openssl patch

* ignore generated license file

* no return in finally

* change node version

* prettier

* pare back deps

* knip

Author: danvk

.circleci/config.yml

@@ -36,7 +36,7 @@ jobs:
 
   test-js:
     docker:
-      - image: cimg/node:20.14
+      - image: cimg/node:24.7
     steps:
       - checkout
       - run: node --version

.gitignore

@@ -62,7 +62,9 @@ node_modules
 webdiff/static/components
 webdiff/static/js/file_diff.js
 webdiff/static/js/file_diff.js.map
+webdiff/static/js/file_diff.js.LICENSE.txt
 
 wheelhouse
 .vscode
 NOTES.md
+

ts/CodeDiffContainer.tsx

@@ -195,7 +195,7 @@ function FileDiff(props: FileDiffProps) {
       if (contentsAfter && lengthOrZero(contentsAfter) > lengthOrZero(contentsBefore)) {
         byLength = [byLength[1], byLength[0]];
       }
-      language = byLength[0] ? guessLanguageUsingContents(byLength[0]) ?? null : null;
+      language = byLength[0] ? (guessLanguageUsingContents(byLength[0]) ?? null) : null;
     }
     return language;
   }, [contentsAfter, contentsBefore, numLines, path]);

ts/Root.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
-import {useNavigate, useParams} from 'react-router';
-import {useSearchParams} from 'react-router-dom';
+import {useNavigate, useParams, useSearchParams} from 'react-router';
 import {FilePair} from './CodeDiffContainer';
 import {DiffView, PerceptualDiffMode} from './DiffView';
 import {FileSelector, FileSelectorMode} from './FileSelector';
@@ -34,7 +33,7 @@ export function Root() {
     (idx: number) => {
       const search = searchParams.toString();
       const url = `/${idx}` + (search ? `?${search}` : '');
-      navigate(url);
+      void navigate(url);
     },
     [navigate, searchParams],
   );

ts/codediff/DiffRow.tsx

@@ -28,9 +28,7 @@ const makeCodeTd = (type: string, text: string | undefined, html: string | undef
   if (text === undefined) {
     return {text: '', html: '', className: 'empty code'};
   }
-  if (html === undefined) {
-    html = escapeHtml(text);
-  }
+  html ??= escapeHtml(text);
   text = text.replaceAll('\t', '\u00a0\u00a0\u00a0\u00a0');
   html = html.replaceAll('\t', '\u00a0\u00a0\u00a0\u00a0');
   const className = 'code ' + type;

ts/codediff/__tests__/addcharacterdiffs_test.ts

@@ -18,6 +18,7 @@ function textToHtml(text: string) {
 function htmlToText(html: string) {
   const div = document.createElement('div');
   div.innerHTML = html;
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   return div.textContent ?? '';
 }
 

ts/codediff/__tests__/htmlsubstr_test.ts

@@ -4,6 +4,7 @@ import {htmlTextMapper} from '../html-text-mapper';
 function htmlToText(html: string) {
   const div = document.createElement('div');
   div.innerHTML = html;
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   return div.textContent ?? '';
 }
 

ts/codediff/char-diffs.ts

@@ -9,7 +9,7 @@ function strArrayLen(x: string[]) {
 }
 
 function allWhitespace(x: string) {
-  return !!x.match(/^\s*$/);
+  return !!/^\s*$/.exec(x);
 }
 
 /**
@@ -114,10 +114,10 @@ export function splitIntoWords(line: string): string[] {
     WS = 4,
     SYM = 5;
   const charType = function (c: string) {
-    if (c.match(/[a-z]/)) return LC;
-    if (c.match(/[A-Z]/)) return UC;
-    if (c.match(/[0-9]/)) return NUM;
-    if (c.match(/\s/)) return WS;
+    if (/[a-z]/.exec(c)) return LC;
+    if (/[A-Z]/.exec(c)) return UC;
+    if (/[0-9]/.exec(c)) return NUM;
+    if (/\s/.exec(c)) return WS;
     return SYM;
   };
 

ts/codediff/dom-utils.ts

@@ -70,6 +70,7 @@ export function copyOnlyMatching(e: ClipboardEvent, selector: string) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     text = doc.textContent!;
   } else {
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     text = [...nodes].map(n => n.textContent ?? '').join('\n');
   }
 
@@ -84,5 +85,9 @@ interface WebkitElement extends Element {
 /** scrollIntoViewIfNeeded has nicer behavior than the web standard, but is non-standard. */
 export function scrollIntoViewIfNeeded(el: Element) {
   const wkEl = el as WebkitElement;
-  wkEl.scrollIntoViewIfNeeded?.() ?? wkEl.scrollIntoView({block: 'nearest'});
+  if (wkEl.scrollIntoViewIfNeeded) {
+    wkEl.scrollIntoViewIfNeeded();
+  } else {
+    wkEl.scrollIntoView({block: 'nearest'});
+  }
 }

ts/codediff/language.ts

@@ -16,7 +16,7 @@ export function guessLanguageUsingFileName(name: string) {
 
     // Highlighting based purely on file name, e.g. "Makefile".
     m = /(?:.*\/)?([^/]*)$/.exec(name);
-    if (m && m[1] == 'Makefile') {
+    if (m?.[1] == 'Makefile') {
       return 'makefile';
     }
     return null;