Cure ES Module Madness

Makefile

@@ -27,11 +27,11 @@ test: $(SPEC)
 	npm test
 
 bench:
-	node -r esm bench/bench.js ${BENCHINP}
+	node bench/bench.js ${BENCHINP}
 
 bench-detailed:
 	sudo renice -10 $$$$; \
-	for x in bench/samples/*.md; do echo $$x; node -r esm bench/bench.js $$x; done | \
+	for x in bench/samples/*.md; do echo $$x; node bench/bench.js $$x; done | \
 	awk -f bench/format_benchmarks.awk
 
 npm:

bench/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

bin/commonmark

@@ -1,13 +1,11 @@
-#!/usr/bin/env -S node -r esm
+#!/usr/bin/env node
 "use strict";
 
-import util from "util";
-import fs from "fs";
-import os from "os";
-import * as commonmark from "../lib/index.js";
+var util = require('util');
+var fs = require('fs');
+var commonmark = require('../');
 var version = require('../package.json').version;
-import parseArgs from "minimist";
-
+var parseArgs = require('minimist');
 var args = process.argv.slice(2);
 var argv = parseArgs(args,
   {boolean: ["ast", "xml", "time", "smart",
@@ -77,16 +75,12 @@ if (format === 'html') {
 }
 
 if (files.length === 0) {
-   if (os.platform() === "win32") {
-     inps.push(fs.readFileSync(0, 'utf-8'));
-   } else {
-     inps.push(fs.readFileSync('/dev/tty', 'utf-8'));
-   }
-} else {
-  for (i = 0; i < files.length; i++) {
-    var file = files[i];
-    inps.push(fs.readFileSync(file, 'utf8'));
-  }
+  files = ['/dev/stdin'];
+}
+
+for (i = 0; i < files.length; i++) {
+  var file = files[i];
+  inps.push(fs.readFileSync(file, 'utf8'));
 }
 
 var inp = inps.join('\n');

dist/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

lib/common.js

@@ -1,7 +1,7 @@
 "use strict";
 
 import encode from "mdurl/encode.js";
-import * as entities from "entities";
+import { decodeHTML } from "entities";
 
 var C_BACKSLASH = 92;
 
@@ -58,7 +58,7 @@ var unescapeChar = function(s) {
     if (s.charCodeAt(0) === C_BACKSLASH) {
         return s.charAt(1);
     } else {
-        return entities.decodeHTML(s);
+        return decodeHTML(s);
     }
 };
 

lib/inlines.js

@@ -3,7 +3,7 @@
 import Node from "./node.js";
 import * as common from "./common.js";
 import fromCodePoint from "./from-code-point.js";
-import * as entities from "entities";
+import { decodeHTML } from "entities";
 import "string.prototype.repeat"; // Polyfill for String.prototype.repeat
 
 var normalizeURI = common.normalizeURI;
@@ -756,7 +756,7 @@ var removeBracket = function() {
 var parseEntity = function(block) {
     var m;
     if ((m = this.match(reEntityHere))) {
-        block.appendChild(text(entities.decodeHTML(m)));
+        block.appendChild(text(decodeHTML(m)));
         return true;
     } else {
         return false;

lib/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package.json

@@ -30,14 +30,13 @@
   "scripts": {
     "build": "rollup -c",
     "lint": "eslint .",
-    "test": "node -r esm ./test/test"
+    "test": "node ./test/test"
   },
   "dependencies": {
     "entities": "~2.0",
-    "esm": "^3.2.25",
     "mdurl": "~1.0.1",
-    "string.prototype.repeat": "^0.2.0",
-    "minimist": ">=1.2.2"
+    "minimist": ">=1.2.2",
+    "string.prototype.repeat": "^0.2.0"
   },
   "directories": {
     "lib": "./lib"

test/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}