updated packages and fixed some cimplier warnings.

3 files changed, 8 insertions, 10 deletions

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';