rimraf and get-folder-size at @latest

Author: bourgeoa

lib/ldp.mjs

@@ -9,7 +9,7 @@ import debug from './debug.mjs'
 import error from './http-error.mjs'
 import { stringToStream, serialize, overQuota, getContentType, parse } from './utils.mjs'
 import extend from 'extend'
-import rimraf from 'rimraf'
+import { rimraf } from 'rimraf'
 import { exec } from 'child_process'
 import * as ldpContainer from './ldp-container.mjs'
 import { promisify } from 'util'
@@ -543,7 +543,7 @@ class LDP {
 
     // Delete the directory recursively
     try {
-      await promisify(rimraf)(directory)
+      await rimraf(directory)
     } catch (err) {
       throw error(err, 'Failed to delete the container')
     }

lib/utils.mjs

@@ -289,7 +289,7 @@ export async function overQuota (root, serverUri) {
  * so it needs to be rewritten.
  */
 function actualSize (root) {
-  return util.promisify(getSize)(root)
+  return getSize(root)
 }
 
 function _asyncReadfile (filename) {

package-lock.json

@@ -84,7 +84,7 @@
     "extend": "^3.0.2",
     "from2": "^2.3.0",
     "fs-extra": "^11.3.3",
-    "get-folder-size": "^2.0.1",
+    "get-folder-size": "^5.0.0",
     "glob": "^13.0.0",
     "global-tunnel-ng": "^2.7.1",
     "handlebars": "^4.7.8",
@@ -104,7 +104,7 @@
     "owasp-password-strength-test": "^1.3.0",
     "rdflib": "^2.3.2",
     "recursive-readdir": "^2.2.3",
-    "rimraf": "^3.0.2",
+    "rimraf": "^6.1.2",
     "solid-auth-client": "^2.5.6",
     "solid-namespace": "^0.5.4",
     "solid-ws": "^0.4.3",

package.json

@@ -1,5 +1,5 @@
 import fs from 'fs-extra'
-import rimraf from 'rimraf'
+import { rimrafSync } from 'rimraf'
 import path from 'path'
 import { fileURLToPath } from 'url'
 import OIDCProvider from '@solid/oidc-op'
@@ -15,7 +15,7 @@ const __dirname = path.dirname(__filename)
 const TEST_HOSTS = ['nic.localhost', 'tim.localhost', 'nicola.localhost']
 
 export function rm (file) {
-  return rimraf.sync(path.normalize(path.join(__dirname, '../resources/' + file)))
+  return rimrafSync(path.normalize(path.join(__dirname, '../resources/' + file)))
 }
 
 export function cleanDir (dirPath) {

test/index.mjs

@@ -5,7 +5,7 @@ import path from 'path'
 import dns from 'dns'
 import https from 'https'
 import { createRequire } from 'module'
-import rimraf from 'rimraf'
+import { rimrafSync } from 'rimraf'
 import fse from 'fs-extra'
 import Provider from '@solid/oidc-op'
 import supertest from 'supertest'
@@ -34,7 +34,7 @@ export function getTestRoot () {
 }
 
 export function rm (file) {
-  return rimraf.sync(path.join(TEST_ROOT, file))
+  return rimrafSync(path.join(TEST_ROOT, file))
 }
 
 export function cleanDir (dirPath) {

test/utils.mjs

@@ -1,5 +1,5 @@
 import fs from 'fs-extra'
-import rimraf from 'rimraf'
+import { rimrafSync } from 'rimraf'
 import path from 'path'
 import { fileURLToPath } from 'url'
 import OIDCProvider from '@solid/oidc-op'
@@ -14,7 +14,7 @@ const __dirname = path.dirname(__filename)
 const TEST_HOSTS = ['nic.localhost', 'tim.localhost', 'nicola.localhost']
 
 export function rm (file) {
-  return rimraf.sync(path.normalize(path.join(__dirname, '../resources/' + file)))
+  return rimrafSync(path.normalize(path.join(__dirname, '../resources/' + file)))
 }
 
 export function cleanDir (dirPath) {