updated packages and fixed some cimplier warnings.

6 files changed, 26 insertions, 41 deletions

diff --git a/package-lock.json b/package-lock.json
index bc1baea46..ccd1ad886 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -146,7 +146,7 @@
                 "i": "^0.3.7",
                 "iink-ts": "^2.0.1",
                 "image-data-uri": "^2.0.1",
-                "image-size": "^1.0.2",
+                "image-size": "^2.0.0",
                 "image-size-stream": "^1.1.0",
                 "install": "^0.13.0",
                 "is-plain-obj": "^4.1.0",
@@ -293,7 +293,7 @@
                 "@types/cookie-session": "^2.0.48",
                 "@types/d3": "^7.4.3",
                 "@types/dom-mediacapture-record": "^1.0.19",
-                "@types/dompurify": "^3.2.0",
+                "@types/dompurify": "^3.0.5",
                 "@types/exif": "^0.6.5",
                 "@types/express": "^5.0.0",
                 "@types/express-session": "^1.17.10",
@@ -14551,14 +14551,13 @@
             "license": "MIT"
         },
         "node_modules/@types/dompurify": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.2.0.tgz",
-            "integrity": "sha512-Fgg31wv9QbLDA0SpTOXO3MaxySc4DKGLi8sna4/Utjo4r3ZRPdCt4UQee8BWr+Q5z21yifghREPJGYaEOEIACg==",
-            "deprecated": "This is a stub types definition. dompurify provides its own type definitions, so you do not need this installed.",
+            "version": "3.0.5",
+            "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz",
+            "integrity": "sha512-1Wg0g3BtQF7sSb27fJQAKck1HECM6zV1EB66j8JH9i3LCjYabJa0FSdiSgsD5K/RbrsR0SiraKacLB+T8ZVYAg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "dompurify": "*"
+                "@types/trusted-types": "*"
             }
         },
         "node_modules/@types/eslint": {
@@ -15388,8 +15387,8 @@
             "version": "2.0.7",
             "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
             "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-            "license": "MIT",
-            "optional": true
+            "devOptional": true,
+            "license": "MIT"
         },
         "node_modules/@types/unist": {
             "version": "3.0.3",
@@ -24004,13 +24003,10 @@
             "license": "MIT"
         },
         "node_modules/image-size": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.0.tgz",
-            "integrity": "sha512-4S8fwbO6w3GeCVN6OPtA9I5IGKkcDMPcKndtUlpJuCwu7JLjtj7JZpwqLuyY2nrmQT3AWsCJLSKPsc2mPBSl3w==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/image-size/-/image-size-2.0.0.tgz",
+            "integrity": "sha512-HP07n1SpdIXGUL4VotUIOQz66MQOq8g7VN+Yj02YTVowqZScQ5i/JYU0+lkNr2pwt5j4hOpk94/UBV1ZCbS2fA==",
             "license": "MIT",
-            "dependencies": {
-                "queue": "6.0.2"
-            },
             "bin": {
                 "image-size": "bin/image-size.js"
             },
@@ -32972,15 +32968,6 @@
                 "node": ">=0.4.x"
             }
         },
-        "node_modules/queue": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
-            "integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
-            "license": "MIT",
-            "dependencies": {
-                "inherits": "~2.0.3"
-            }
-        },
         "node_modules/queue-microtask": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
diff --git a/package.json b/package.json
index 8cd6945ff..6eb2a5c98 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
         "@types/cookie-session": "^2.0.48",
         "@types/d3": "^7.4.3",
         "@types/dom-mediacapture-record": "^1.0.19",
-        "@types/dompurify": "^3.2.0",
+        "@types/dompurify": "^3.0.5",
         "@types/exif": "^0.6.5",
         "@types/express": "^5.0.0",
         "@types/express-session": "^1.17.10",
@@ -230,7 +230,7 @@
         "i": "^0.3.7",
         "iink-ts": "^2.0.1",
         "image-data-uri": "^2.0.1",
-        "image-size": "^1.0.2",
+        "image-size": "^2.0.0",
         "image-size-stream": "^1.1.0",
         "install": "^0.13.0",
         "is-plain-obj": "^4.1.0",
diff --git a/packages/components/src/components/Slider/Slider.tsx b/packages/components/src/components/Slider/Slider.tsx
index f6f53799c..5af945383 100644
--- a/packages/components/src/components/Slider/Slider.tsx
+++ b/packages/components/src/components/Slider/Slider.tsx
@@ -122,11 +122,11 @@ export const Slider = (props: ISliderProps) => {
         setEndNumber?.((lastEndVal = Math.max(number + (minDiff ?? 0), val)));
         setEndNumberLoc((lastEndVal = Math.max(number + (minDiff ?? 0), val)));
     };
-    const Slider: (JSX.Element | null)[] = [!multithumb ? null : valSlider('end', endNumberLoc, onendchange, () => setFinalEndNumber?.(lastEndVal)), valSlider('start', valLoc, onchange, () => setFinalNumber?.(lastVal))];
+    const ValSlider: (JSX.Element | null)[] = [!multithumb ? null : valSlider('end', endNumberLoc, onendchange, () => setFinalEndNumber?.(lastEndVal)), valSlider('start', valLoc, onchange, () => setFinalNumber?.(lastVal))];
 
-    const slider: JSX.Element = (
+    const slider = (
         <div
-            className={`slider-wrapper`}
+            className="slider-wrapper"
             onPointerEnter={() => {
                 lastVal = valLoc;
                 lastEndVal = endNumberLoc;
@@ -143,7 +143,7 @@ export const Slider = (props: ISliderProps) => {
                 }}
                 style={{ height: getHeight(+(height || 0), size) }}
                 onPointerDown={onPointerDown}>
-                {Slider}
+                {ValSlider}
                 <div
                     className="selected-range"
                     style={{
@@ -177,7 +177,7 @@ export const Slider = (props: ISliderProps) => {
 
     return formLabel ? (
         <div className={`form-wrapper ${formLabelPlacement}`}>
-            <div className={'formLabel'} style={{ fontSize: getFormLabelSize(size) }}>
+            <div className="formLabel" style={{ fontSize: getFormLabelSize(size) }}>
                 {formLabel}
             </div>
             {slider}
diff --git a/src/client/util/request-image-size.ts b/src/client/util/request-image-size.ts
index c619192ed..32ab23618 100644
--- a/src/client/util/request-image-size.ts
+++ b/src/client/util/request-image-size.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 /**
  * request-image-size: Detect image dimensions via request.
  * Licensed under the MIT license.
@@ -11,12 +10,11 @@
  */
 
 // const imageSize = require('image-size');
-const HttpError = require('standard-http-error');
+import * as HttpError from 'standard-http-error';
 import * as request from 'request';
 import { imageSize } from 'image-size';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
-
-module.exports = function requestImageSize(url: string) {
+export function requestImageSize(url: string): Promise<ISizeCalculationResult> {
     if (!url) {
         return Promise.reject(new Error('You should provide an URI string or a "request" options object.'));
     }
@@ -60,4 +58,5 @@ module.exports = function requestImageSize(url: string) {
 
         req.on('error', reject);
     });
-};
+}
+export default requestImageSize;
diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 2177c5d97..a2747257a 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -23,6 +23,7 @@ import { AcceptableMedia, Upload } from './SharedMediaTypes';
 import { Directory, clientPathToFile, filesDirectory, pathToDirectory, publicDirectory, serverPathToFile } from './SocketData';
 import { resolvedServerUrl } from './server_Initialization';
 import { Worker, isMainThread, parentPort } from 'worker_threads';
+import requestImageSize from '../client/util/request-image-size';
 
 // Create an array to store worker threads
 enum workertasks {
@@ -62,9 +63,6 @@ if (isMainThread) {
     }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const requestImageSize = require('../client/util/request-image-size');
-
 export enum SizeSuffix {
     Small = '_s',
     Medium = '_m',
@@ -349,14 +347,14 @@ export namespace DashUploadUtils {
             imgReadStream.push(null);
             await Promise.all(
                 sizes.map(({ suffix }) => 
-                    new Promise<unknown>(res =>
+                    new Promise<void>(res =>
                         imgReadStream.pipe(createWriteStream(writtenFiles[suffix] = InjectSize(outputPath, suffix))).on('close', res)
                     )
             )); // prettier-ignore
         } else {
             await Promise.all(
                 sizes.map(({ suffix }) => 
-                    new Promise<unknown>(res =>
+                    new Promise<void>(res =>
                         request.get(imgSourcePath).pipe(createWriteStream(writtenFiles[suffix] = InjectSize(outputPath, suffix))).on('close', res)
                     )
             )); // prettier-ignore
diff --git a/src/typings/index.d.ts b/src/typings/index.d.ts
index bee79a38d..dbfabed51 100644
--- a/src/typings/index.d.ts
+++ b/src/typings/index.d.ts
@@ -13,6 +13,7 @@ declare module 'iink-js';
 declare module 'pdfjs-dist/web/pdf_viewer';
 declare module 'react-jsx-parser';
 declare module 'type_decls.d';
+declare module 'standard-http-error';
 
 declare module '@react-pdf/renderer' {
     import * as React from 'react';