ui: upgrade to webpack5

packages/utils/lib/common.ts

@@ -1,5 +1,3 @@
-import { inspect } from 'util';
-
 declare global {
     interface StringConstructor {
         random: (digit?: number, dict?: string) => string;
@@ -33,24 +31,23 @@ String.random = function random(digit = 32, dict = defaultDict) {
     return str;
 };
 
-String.prototype.format = function formatStr(...args) {
-    let result = this;
-    if (args.length) {
-        if (args.length === 1 && typeof args[0] === 'object') {
-            const t = args[0];
-            for (const key in t) {
-                if (!key.startsWith('_') && t[key] !== undefined) {
-                    if (t._inspect && typeof t[key] === 'object') {
-                        t[key] = inspect(t[key], { colors: process?.stderr?.isTTY });
+if (!String.prototype.format) {
+    String.prototype.format = function formatStr(...args) {
+        let result = this;
+        if (args.length) {
+            if (args.length === 1 && typeof args[0] === 'object') {
+                const t = args[0];
+                for (const key in t) {
+                    if (!key.startsWith('_') && t[key] !== undefined) {
+                        const reg = new RegExp(`(\\{${key}\\})`, 'g');
+                        result = result.replace(reg, t[key]);
                     }
-                    const reg = new RegExp(`(\\{${key}\\})`, 'g');
-                    result = result.replace(reg, t[key]);
                 }
-            }
-        } else return this.formatFromArray(args);
-    }
-    return result;
-};
+            } else return this.formatFromArray(args);
+        }
+        return result;
+    };
+}
 
 String.prototype.formatFromArray = function formatStr(args) {
     let result = this;

packages/utils/lib/utils.ts

@@ -1,6 +1,7 @@
 import os from 'os';
 import path from 'path';
 import { Duplex } from 'stream';
+import { inspect } from 'util';
 import fs from 'fs-extra';
 import type { Moment } from 'moment-timezone';
 import { isMoment } from 'moment-timezone';
@@ -29,6 +30,25 @@ export function folderSize(folderPath: string) {
     return size;
 }
 
+String.prototype.format = function formatStr(...args) {
+    let result = this;
+    if (args.length) {
+        if (args.length === 1 && typeof args[0] === 'object') {
+            const t = args[0];
+            for (const key in t) {
+                if (!key.startsWith('_') && t[key] !== undefined) {
+                    if (t._inspect && typeof t[key] === 'object') {
+                        t[key] = inspect(t[key], { colors: process?.stderr?.isTTY });
+                    }
+                    const reg = new RegExp(`(\\{${key}\\})`, 'g');
+                    result = result.replace(reg, t[key]);
+                }
+            }
+        } else return this.formatFromArray(args);
+    }
+    return result;
+};
+
 export function isClass(obj: any, strict = false) {
     if (typeof obj !== 'function') return false;
     const str = obj.toString();

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hydrooj/utils",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "description": "hydrooj utils",
     "main": "package.json",
     "repository": "https://github.com/hydro-dev/Hydro.git",