@villedemontreal/general-utils 5.17.0 → 5.17.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@villedemontreal/general-utils",
-  "version": "5.17.0",
+  "version": "5.17.2",
   "description": "General utilities library",
   "main": "dist/src/index.js",
   "engines": {
@@ -38,36 +38,35 @@
   "author": "Ville de Montréal",
   "license": "MIT",
   "dependencies": {
-    "@types/app-root-path": "1.2.4",
-    "@types/lodash": "4.14.184",
-    "@types/luxon": "2.3.2",
-    "@types/rimraf": "3.0.2",
+    "@types/app-root-path": "1.2.6",
+    "@types/lodash": "4.14.199",
+    "@types/luxon": "3.3.2",
     "app-root-path": "3.1.0",
     "get-port": "5.1.1",
-    "globby": "13.1.2",
+    "globby": "13.2.2",
     "http-status-codes": "2.2.0",
     "lodash": "4.17.21",
-    "luxon": "2.5.2",
+    "luxon": "3.4.3",
     "moment": "2.29.4",
-    "rimraf": "3.0.2",
+    "rimraf": "5.0.5",
     "tsconfig-extends": "1.0.1"
   },
   "devDependencies": {
-    "@types/chai": "4.3.3",
+    "@types/chai": "4.3.6",
     "@types/fs-extra": "9.0.13",
     "@types/mocha": "9.1.1",
     "@types/node": "16.x",
-    "@types/sinon": "10.0.13",
-    "@types/uuid": "8.3.4",
+    "@types/sinon": "10.0.18",
+    "@types/uuid": "9.0.4",
     "@villedemontreal/lint-config": "1.7.7",
-    "chai": "4.3.6",
+    "chai": "4.3.10",
     "fs-extra": "10.1.0",
     "mocha": "9.2.2",
     "mocha-jenkins-reporter": "0.4.7",
-    "sinon": "13.0.2",
+    "sinon": "16.0.0",
     "source-map-support": "0.5.21",
     "ts-node": "^10.9.1",
-    "typescript": "4.8.2",
-    "uuid": "8.3.2"
+    "typescript": "5.2.2",
+    "uuid": "9.0.1"
   }
 }

package/src/dateUtils.test.ts

@@ -1,6 +1,6 @@
 import { assert } from 'chai';
-import * as _ from 'lodash';
-import * as moment from 'moment';
+import _ from 'lodash';
+import moment from 'moment';
 import { getValueDescription, getValueDescriptionWithType, utils } from '.';
 import { getCartesianProduct } from './collectionUtils';
 import {

package/src/dateUtils.ts

@@ -1,6 +1,6 @@
-import * as _ from 'lodash';
+import _ from 'lodash';
 import { DateTime, Zone } from 'luxon';
-import * as moment from 'moment';
+import moment from 'moment';
 // tslint:disable-next-line:no-duplicate-imports
 import { Moment } from 'moment';
 import { getValueDescription, utils } from '.';

package/src/utils.ts

@@ -1,9 +1,9 @@
 import { spawn, StdioOptions } from 'child_process';
 import * as fs from 'fs';
-import * as getPort from 'get-port';
-import * as _ from 'lodash';
+import getPort from 'get-port';
+import _ from 'lodash';
 import * as pathUtils from 'path';
-import * as rimraf from 'rimraf';
+import { rimraf } from 'rimraf';
 import * as tsconfig from 'tsconfig-extends';
 import { constants } from './config/constants';
 
@@ -202,16 +202,12 @@ export class Utils {
    *
    * You can't delete a root file using this function.
    */
-  public async deleteFile(filePath: string) {
+  public deleteFile(filePath: string) {
     if (!this.isSafeToDelete(filePath)) {
       throw new Error("Unsafe file to delete. A file to delete can't be at the root.");
     }
 
-    return new Promise<void>((resolve, reject) => {
-      rimraf(filePath, () => {
-        resolve();
-      });
-    });
+    return rimraf(filePath);
   }
 
   /**
@@ -225,24 +221,16 @@ export class Utils {
       throw new Error("Unsafe dir to delete. A dir to delete can't be at the root.");
     }
 
-    return new Promise<void>(async (resolve, reject) => {
-      try {
-        rimraf(dirPath, () => {
-          resolve();
-        });
-      } catch (err) {
-        // ==========================================
-        // Try recursively as rimraf may sometimes
-        // fail in infrequent situations...
-        // ==========================================
-        await this.clearDir(dirPath);
-        await new Promise<void>((resolve2, reject2) => {
-          rimraf(dirPath, () => {
-            resolve2();
-          });
-        });
-      }
-    });
+    try {
+      return rimraf(dirPath);
+    } catch (err) {
+      // ==========================================
+      // Try recursively as rimraf may sometimes
+      // fail in infrequent situations...
+      // ==========================================
+      await this.clearDir(dirPath);
+      return rimraf(dirPath);
+    }
   }
 
   /**