Merge branch 'master' into aarav_edit

1 files changed, 4 insertions, 5 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;