metalsmith
diff --git a/‎lib/helpers.js‎
Lines changed: 38 additions & 0 deletions b/‎lib/helpers.js‎
Lines changed: 38 additions & 0 deletions
diff --git a/‎lib/index.js‎
Lines changed: 1 addition & 15 deletions b/‎lib/index.js‎
Lines changed: 1 addition & 15 deletions
diff --git a/‎test/index.js‎
Lines changed: 16 additions & 10 deletions b/‎test/index.js‎
Lines changed: 16 additions & 10 deletions
@@ -0,0 +1,38 @@
+var fs = require('fs')
+var rmrf = require('rimraf')
+
+/**
+ * Type-checkers
+ */
+function isBoolean(b) {return typeof b === 'boolean'}
+function isNumber(n) {return typeof n === 'number' && !Number.isNaN(n)}
+function isObject(o) {return o !== null && typeof o === 'object'}
+function isString(s) {return typeof s === 'string'}
+
+/**
+ * Recursively remove a directory
+ * @param {string} p 
+ * @param {import('fs').NoParamCallback} [callback]
+ * @returns void
+ */
+function rm(p, callback) {
+  if (Object.prototype.hasOwnProperty.call(fs, 'rm')) {
+    fs.rm(p, {
+      recursive: true,
+      force: true
+    }, callback)
+  } else {
+    // Node 14.14- compat
+    rmrf(p, { glob: { dot: true } }, callback)
+  }
+}
+
+var helpers = {
+  isBoolean,
+  isNumber,
+  isString,
+  isObject,
+  rm
+}
+
+module.exports = helpers
@@ -6,7 +6,7 @@ var matter = require('gray-matter')
 var Mode = require('stat-mode')
 var path = require('path')
 var readdir = require('recursive-readdir')
-var rm = require('rimraf')
+var { rm, isString, isBoolean, isObject, isNumber } = require('./helpers')
 var thunkify = require('thunkify')
 var unyield = require('unyield')
 var utf8 = require('is-utf8')
@@ -17,20 +17,6 @@ var Ware = require('ware')
  */
 
 readdir = thunkify(readdir)
-rm = thunkify(rm)
-
-
-/**
- * Helpers
- */
-
-var isBoolean = function(b) {return typeof b === 'boolean'}
-var isNumber  = function(n) {return typeof n === 'number' && !Number.isNaN(n)}
-var isObject  = function(o) {return o !== null && typeof o === 'object'}
-var isString  = function(s) {return typeof s === 'string'}
-
-
-
 
 /**
  * Export `Metalsmith`.
 
@@ -6,12 +6,17 @@ var Metalsmith = require('..')
 var Mode = require('stat-mode')
 var noop = function(){}
 var path = require('path')
-var rm = require('rimraf').sync
+var rm = require('../lib/helpers').rm
 var fixture = path.resolve.bind(path, __dirname, 'fixtures')
 
 describe('Metalsmith', function(){
   beforeEach(function(){
-    rm('test/tmp')
+    return new Promise((resolve, reject) => {
+      rm('test/tmp', (err) => {
+        if (err) reject(err)
+        else resolve()
+      })
+    })
   })
 
   it('should expose a constructor', function(){
@@ -639,16 +644,17 @@ describe('Metalsmith', function(){
       var cmd =
         'touch test/fixtures/build/build/empty.md' +
         ' test/fixtures/build/build/.dotfile'
-      rm(fixture('build/build'), { glob: { dot: true } })
-      fs.mkdirSync(fixture('build/build'))
-      exec(cmd, function (err) {
-        if (err) return done(err)
-        m.build(function(err){
+      rm(fixture('build/build'), () => {
+        fs.mkdirSync(fixture('build/build'))
+        exec(cmd, function (err) {
           if (err) return done(err)
-          equal(fixture('build/build'), fixture('build/expected'), {
-            filter: function () { return true }
+          m.build(function(err){
+            if (err) return done(err)
+            equal(fixture('build/build'), fixture('build/expected'), {
+              filter: function () { return true }
+            })
+            done()
           })
-          done()
         })
       })
     })