Improved hybrid module, no .default needed

Same trick as in isaacs/node-mkdirp#41

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v4.1
+
+- Improved hybrid module with no need to look at the `.default`
+  dangly bit.  `.default` preserved as a reference to `rimraf`
+  for compatibility with anyone who came to rely on it in v4.0.
+
 # v4.0
 
 - Remove `glob` dependency entirely. This library now only

README.md

@@ -21,9 +21,9 @@ Hybrid module, load either with `import` or `require()`.
 
 ```js
 // default export is the main rimraf function, or use named imports
-import { rimraf } from 'rimraf'
+import rimraf from 'rimraf'
 // or
-const { rimraf } = require('rimraf')
+const rimraf = require('rimraf')
 
 // other strategies exported as well
 import { rimraf, rimrafSync, native, nativeSync } from 'rimraf'

fixup.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-cat >dist/cjs/src/package.json <<!EOF
+cat >dist/cjs/package.json <<!EOF
 {
   "type": "commonjs"
 }
 !EOF
 
-cat >dist/mjs/src/package.json <<!EOF
+cat >dist/mjs/package.json <<!EOF
 {
   "type": "module"
 }

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('./').default
+const rimraf = require('./')
 module.exports = {
   rmdirRecursiveSync: path => rimraf.sync(path),
   rmdirRecursive(path, cb) {

package.json

@@ -1,18 +1,18 @@
 {
   "name": "rimraf",
   "version": "4.0.7",
-  "main": "./dist/cjs/src/index.js",
-  "module": "./dist/mjs/src/index.js",
+  "main": "./dist/cjs/src/index-cjs.js",
+  "module": "./dist/mjs/index.js",
   "bin": "./dist/cjs/src/bin.js",
   "exports": {
     ".": {
       "import": {
-        "default": "./dist/mjs/src/index.js",
-        "types": "./dist/mjs/src/index.d.ts"
+        "default": "./dist/mjs/index.js",
+        "types": "./dist/mjs/index.d.ts"
       },
       "require": {
-        "default": "./dist/cjs/src/index.js",
-        "types": "./dist/cjs/src/index.d.ts"
+        "default": "./dist/cjs/src/index-cjs.js",
+        "types": "./dist/cjs/src/index-cjs.d.ts"
       }
     }
   },
@@ -28,7 +28,7 @@
     "postversion": "npm publish",
     "prepublishOnly": "git push origin --follow-tags",
     "preprepare": "rm -rf dist",
-    "prepare": "tsc -p tsconfig-cjs.json && tsc -p tsconfig-esm.json",
+    "prepare": "tsc -p tsconfig.json && tsc -p tsconfig-esm.json",
     "postprepare": "bash fixup.sh",
     "pretest": "npm run prepare",
     "presnap": "npm run prepare",

src/bin.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { version } from '../package.json'
-import rimraf, { RimrafOptions } from './'
+import rimraf from './index-cjs.js'
+import type { RimrafOptions } from './index.js'
 
 const runHelpForUsage = () =>
   console.error('run `rimraf --help` for usage information')

src/index-cjs.ts

@@ -0,0 +1,3 @@
+import rimraf from './index.js'
+
+export = Object.assign(rimraf, { default: rimraf })

test/index.js

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

tsconfig-esm.json

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

tsconfig-cjs.json → tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "./tsconfig-base.json",
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "dist/cjs"
+    "outDir": "dist/cjs",
+    "moduleResolution": "Node"
   }
 }