Named export only, no default export

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 5.0
+
+- No default export, only named exports
+
 # 4.4
 
 - Provide Dirent or Stats object as second argument to filter

README.md

@@ -22,12 +22,8 @@ Install with `npm install rimraf`.
 Hybrid module, load either with `import` or `require()`.
 
 ```js
-// default export is the main rimraf function, or use named imports
-import rimraf from 'rimraf'
-// or
-const rimraf = require('rimraf')
-
-// other strategies exported as well
+// 'rimraf' export is the one you probably want, but other
+// strategies exported as well.
 import { rimraf, rimrafSync, native, nativeSync } from 'rimraf'
 // or
 const { rimraf, rimrafSync, native, nativeSync } = require('rimraf')

benchmark/create-fixture.js

@@ -1,7 +1,7 @@
 const { writeFile: writeFile_ } = require('fs')
 const writeFile = async (path, data) => new Promise((res, rej) =>
   writeFile_(path, data, er => er ? rej(er) : res()))
-const mkdirp = require('mkdirp')
+const { mkdirp } = require('mkdirp')
 const { resolve } = require('path')
 
 const create = async (path, start, end, maxDepth, depth = 0) => {

libtap-settings.js

@@ -1,6 +1,6 @@
 // use this module for tap's recursive directory removal, so that
 // the windows tests don't fail with EBUSY.
-const rimraf = require('./')
+const { rimraf } = require('./')
 module.exports = {
   rmdirRecursiveSync: path => rimraf.sync(path),
   rmdirRecursive(path, cb) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "rimraf",
   "version": "4.4.1",
-  "main": "./dist/cjs/src/index-cjs.js",
+  "main": "./dist/cjs/src/index.js",
   "module": "./dist/mjs/index.js",
   "types": "./dist/mjs/index.d.ts",
   "bin": "./dist/cjs/src/bin.js",
@@ -13,7 +13,7 @@
       },
       "require": {
         "types": "./dist/cjs/src/index.d.ts",
-        "default": "./dist/cjs/src/index-cjs.js"
+        "default": "./dist/cjs/src/index.js"
       }
     }
   },
@@ -55,7 +55,7 @@
     "@types/tap": "^15.0.7",
     "c8": "^7.12.0",
     "eslint-config-prettier": "^8.6.0",
-    "mkdirp": "1",
+    "mkdirp": "^3.0.0",
     "prettier": "^2.8.2",
     "tap": "^16.3.4",
     "ts-node": "^10.9.1",
@@ -79,6 +79,6 @@
     "node": ">=14"
   },
   "dependencies": {
-    "glob": "^9.2.0"
+    "glob": "^10.0.0"
   }
 }

src/bin.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { version } from '../package.json'
-import rimraf from './index-cjs.js'
+import { rimraf } from './index.js'
 import type { RimrafAsyncOptions } from './index.js'
 
 const runHelpForUsage = () =>

src/index.ts

@@ -111,27 +111,22 @@ export const rimrafSync = wrapSync((path, opt) =>
 )
 export const sync = rimrafSync
 
-export const rimraf = Object.assign(
-  wrap((path, opt) =>
-    useNative(opt) ? rimrafNative(path, opt) : rimrafManual(path, opt)
-  ),
-  {
-    // this weirdness because it's easier than explicitly declaring
-    rimraf: manual,
-    sync: rimrafSync,
-    rimrafSync: rimrafSync,
-    manual,
-    manualSync,
-    native,
-    nativeSync,
-    posix,
-    posixSync,
-    windows,
-    windowsSync,
-    moveRemove,
-    moveRemoveSync,
-  }
+const rimraf_ = wrap((path, opt) =>
+  useNative(opt) ? rimrafNative(path, opt) : rimrafManual(path, opt)
 )
+export const rimraf = Object.assign(rimraf_, {
+  rimraf: rimraf_,
+  sync: rimrafSync,
+  rimrafSync: rimrafSync,
+  manual,
+  manualSync,
+  native,
+  nativeSync,
+  posix,
+  posixSync,
+  windows,
+  windowsSync,
+  moveRemove,
+  moveRemoveSync,
+})
 rimraf.rimraf = rimraf
-
-export default rimraf

test/bin.js

@@ -1,4 +1,3 @@
-const { basename } = require('path')
 const t = require('tap')
 const { readdirSync } = require('fs')
 
@@ -14,15 +13,22 @@ t.test('basic arg parsing stuff', t => {
   console.error = (...msg) => ERRS.push(msg)
 
   const CALLS = []
-  const rimraf = async (path, opt) => CALLS.push(['rimraf', path, opt])
-  const bin = t.mock('../dist/cjs/src/bin.js', {
-    '../dist/cjs/src/index.js': Object.assign(rimraf, {
+  const rimraf = Object.assign(
+    async (path, opt) => CALLS.push(['rimraf', path, opt]),
+    {
       native: async (path, opt) => CALLS.push(['native', path, opt]),
       manual: async (path, opt) => CALLS.push(['manual', path, opt]),
       posix: async (path, opt) => CALLS.push(['posix', path, opt]),
       windows: async (path, opt) => CALLS.push(['windows', path, opt]),
       moveRemove: async (path, opt) => CALLS.push(['move-remove', path, opt]),
-    }),
+    }
+  )
+
+  const bin = t.mock('../dist/cjs/src/bin.js', {
+    '../dist/cjs/src/index.js': {
+      rimraf,
+      ...rimraf,
+    },
   }).default
 
   t.afterEach(() => {
@@ -264,7 +270,7 @@ t.test('actually delete something with it', async t => {
   const bin = require.resolve('../dist/cjs/src/bin.js')
   const { spawnSync } = require('child_process')
   const res = spawnSync(process.execPath, [bin, path])
-  const { statSync, readdirSync } = require('fs')
+  const { statSync } = require('fs')
   t.throws(() => statSync(path))
   t.equal(res.status, 0)
 })

test/index.js

@@ -10,7 +10,7 @@ t.same(
         types: './dist/mjs/index.d.ts',
       },
       require: {
-        default: './dist/cjs/src/index-cjs.js',
+        default: './dist/cjs/src/index.js',
         types: './dist/cjs/src/index.d.ts',
       },
     },
@@ -73,7 +73,7 @@ t.test('mocky unit tests to select the correct function', t => {
     },
   }
   process.env.__TESTING_RIMRAF_PLATFORM__ = 'posix'
-  const rimraf = t.mock('../', mocks)
+  const { rimraf } = t.mock('../', mocks)
 
   t.afterEach(() => (CALLS.length = 0))
   for (const useNative of [true, false]) {

tsconfig-esm.json

@@ -1,6 +1,6 @@
 {
   "extends": "./tsconfig-base.json",
-  "exclude": ["./test", "./tap-snapshots", "src/index-cjs.ts", "src/bin.ts"],
+  "exclude": ["./test", "./tap-snapshots", "src/bin.ts"],
   "compilerOptions": {
     "module": "esnext",
     "outDir": "dist/mjs"