Merge pull request #2712 from nasa-gcn/dependabot/npm_and_yarn/types/…

…diff-6.0.0 Bump @types/diff from 5.2.1 to 6.0.0
nasa-gcn · Nov 21, 2024 · 25b9562 · 25b9562
2 parents 71eca36 + 72d259a
commit 25b9562
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/app/routes/circulars.moderation.$circularId.$requestor.tsx b/app/routes/circulars.moderation.$circularId.$requestor.tsx
@@ -132,11 +132,6 @@ export default function () {
   )
 }
 
-const methodMap = {
-  words: diffWords,
-  lines: diffLines,
-}
-
 function DiffedContent({
   oldString,
   newString,
@@ -146,10 +141,10 @@ function DiffedContent({
   newString: string
   method?: 'words' | 'lines'
 }) {
-  const diff = methodMap[method && newString ? method : 'lines'](
-    oldString ?? '',
-    newString ?? ''
-  )
+  const diff =
+    method == 'words'
+      ? diffWords(oldString, newString)
+      : diffLines(oldString, newString)
 
   return (
     <div>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -104,7 +104,7 @@
     "@testing-library/react": "^16.0.1",
     "@trivago/prettier-plugin-sort-imports": "^4.2.1",
     "@types/color-convert": "^2.0.4",
-    "@types/diff": "^5.2.1",
+    "@types/diff": "^6.0.0",
     "@types/grecaptcha": "^3.0.6",
     "@types/jest": "^29.5.14",
     "@types/lodash": "^4.17.13",

diff --git a/sandbox-seed.json b/sandbox-seed.json
@@ -5153,7 +5153,8 @@
       "body": "This is an example of a request with a missing createdOn field",
       "requestor": "Example User at Example <[email protected]>",
       "requestorEmail": "[email protected]",
-      "subject": "Optical Observations for GRB 971227"
+      "subject": "Optical Observations for GRB 971227",
+      "submitter": "Example User at Example <[email protected]>"
     }
   ]
 }