Switch to using rollup builds for CJS support

kriszyp · Sep 7, 2021 · 4f3a59d · 4f3a59d
1 parent 52d6341
commit 4f3a59d
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 18 deletions.
diff --git a/LRFUExpirer.mjs → LRFUExpirer.js b/LRFUExpirer.mjs → LRFUExpirer.js
diff --git a/index.cjs b/index.cjs
diff --git a/main.mjs → index.js b/main.mjs → index.js
@@ -1,5 +1,7 @@
-import { LRFUExpirer, EXPIRED_ENTRY } from './LRFUExpirer.mjs'
-export { LRFUExpirer } from './LRFUExpirer.mjs'
+import { LRFUExpirer, EXPIRED_ENTRY } from './LRFUExpirer.js'
+export { LRFUExpirer } from './LRFUExpirer.js'
+
+let defaultExpirer
 export class WeakLRUCache extends Map  {
 	constructor(options) {
 		super()
@@ -114,6 +116,4 @@ class NoLRUExpirer {
 		// nothing to do here, we don't have a separate cache here
 	}
 }
-const defaultNoLRUExpirer = new NoLRUExpirer()
-
-let defaultExpirer
+const defaultNoLRUExpirer = new NoLRUExpirer()
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "weak-lru-cache",
   "author": "Kris Zyp",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "An LRU cache of weak references",
   "license": "MIT",
   "types": "./index.d.ts",
@@ -17,17 +17,26 @@
     "url": "http://github.com/kriszyp/weak-lru-cache"
   },
   "type": "module",
-  "main": "index.cjs",
-  "module": "main.mjs",
+  "module": "index.js",
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./index.js"
+    },
+    "./index.js": {
+      "require": "./dist/index.cjs",
+      "import": "./index.js"
+    }
+  },
   "scripts": {
+    "build": "rollup -c",
+    "prepare": "rollup -c",
     "test": "./node_modules/.bin/mocha tests/test*.js -u tdd"
   },
-  "dependencies": {
-    "esm": "^3.2.25"
-  },
   "devDependencies": {
     "benchmark": "^2.1.4",
     "chai": "^4",
-    "mocha": "^8"
+    "mocha": "^8",
+    "rollup": "^1.20.3"
   }
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -0,0 +1,11 @@
+export default [
+    {
+        input: "index.js",
+        output: [
+            {
+                file: "dist/index.cjs",
+                format: "cjs"
+            }
+        ]
+    }
+];
diff --git a/tests/test.js b/tests/test.js
@@ -1,9 +1,7 @@
-const { WeakLRUCache } = require('..')
-const chai = require('chai')
+import { WeakLRUCache } from '../index.js'
+import chai from 'chai'
 const assert = chai.assert
 let cache = new WeakLRUCache()
-var inspector = require('inspector')
-//inspector.open(9330, null, true)
 
 suite('WeakLRUCache basic tests', function(){
 	test('add entries', function(){