Merge branch 'esmodules'

Author: jgm

.eslintignore

@@ -0,0 +1,2 @@
+dist/
+dingus/

.eslintrc

@@ -0,0 +1,30 @@
+{
+  "env": {
+    "browser": false,
+    "node": true
+  },
+  "parserOptions": {
+    "sourceType": "module"
+  },
+  "rules": {
+    "no-unused-vars": [
+      "error",
+      { "vars": "all", "args": "after-used", "ignoreRestSiblings": false }
+    ],
+    "no-constant-condition": 0,
+    "no-underscore-dangle": 0,
+    "camelcase": 0,
+    "quotes": 0,
+    "no-process-exit": 0,
+    "no-empty": 0,
+    "new-cap": [
+      2,
+      {
+        "newIsCap": true,
+        "capIsNew": true,
+        "newIsCapExceptions": [],
+        "capIsNewExceptions": []
+      }
+    ]
+  }
+}

.github/workflows/ci.yml

@@ -14,14 +14,13 @@ jobs:
           - node: '12.x'
           - node: '11.x'
           - node: '10.x'
-          - node: '9.x'
-          - node: '8.x'
     steps:
       - uses: actions/checkout@v1
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.versions.node }}
       - run: npm install
+      - run: npm run lint
       - run: npm run build --if-present
       - run: npm test

Makefile

@@ -1,39 +1,37 @@
 SPEC=test/spec.txt
 SPECVERSION=$(shell perl -ne 'print $$1 if /^version: *([0-9.]+)/' $(SPEC))
 BENCHINP?=bench/samples/README.md
-JSMODULES=$(wildcard lib/*.js)
 VERSION?=$(SPECVERSION)
-ESLINT=node_modules/.bin/eslint
+JSMODULES=$(wildcard lib/*.js)
 UGLIFYJS=node_modules/.bin/uglifyjs
-BROWSERIFY=node_modules/.bin/browserify
+LICENSETEXT="/* commonmark $(VERSION) https://github.com/commonmark/commonmark.js @license BSD3 */"
 
 .PHONY: dingus dist test bench bench-detailed npm lint clean update-spec
 
 lint:
-	$(ESLINT) -c eslint.json ${JSMODULES} bin/commonmark test/test.js dingus/dingus.js
+	npm run lint
 
 dist: dist/commonmark.js dist/commonmark.min.js
 
 dist/commonmark.js: lib/index.js ${JSMODULES}
-	echo '/* commonmark $(VERSION) https://github.com/CommonMark/commonmark.js @license BSD3 */' > $@
-	$(BROWSERIFY) --standalone commonmark $< >> $@
+	npm run build
+	(echo $(LICENSETEXT) && cat $@) > $@.tmp  && mv $@.tmp $@
 
 dist/commonmark.min.js: dist/commonmark.js
-	$(UGLIFYJS) --version  # version should be at least 2.5.0
-	$(UGLIFYJS) $< --compress keep_fargs=true,pure_getters=true --comments > $@
+	(echo $(LICENSETEXT) && cat $@) > $@.tmp  && mv $@.tmp $@
 
 update-spec:
 	curl 'https://raw.githubusercontent.com/jgm/CommonMark/master/spec.txt' > $(SPEC)
 
 test: $(SPEC)
-	node test/test.js
+	npm test
 
 bench:
-	node bench/bench.js ${BENCHINP}
+	node -r esm bench/bench.js ${BENCHINP}
 
 bench-detailed:
 	sudo renice -10 $$$$; \
-	for x in bench/samples/*.md; do echo $$x; node bench/bench.js $$x; done | \
+	for x in bench/samples/*.md; do echo $$x; node -r esm bench/bench.js $$x; done | \
 	awk -f bench/format_benchmarks.awk
 
 npm:

bench/bench.js

@@ -1,44 +1,50 @@
 "use strict";
 
-var Benchmark = require('benchmark').Benchmark;
-var suite = new Benchmark.Suite();
-var fs = require('fs');
-var commonmark = require('../lib/index.js');
-var Showdown = require('showdown');
-var marked = require('marked');
-var markdownit = require('markdown-it')('commonmark');
+import benchmark from "benchmark";
+import fs from "fs";
+import * as commonmark from "../lib/index.js";
+import Showdown from "showdown";
+import marked from "marked";
+import _markdownit from "markdown-it";
+
+var suite = new benchmark.Suite();
+var markdownit = _markdownit("commonmark");
 
 // disable expensive IDNa links encoding:
 var markdownit_encode = markdownit.utils.lib.mdurl.encode;
-markdownit.normalizeLink = function(url) { return markdownit_encode(url); };
-markdownit.normalizeLinkText = function(str) { return str; };
+markdownit.normalizeLink = function(url) {
+    return markdownit_encode(url);
+};
+markdownit.normalizeLinkText = function(str) {
+    return str;
+};
 
 var showdown = new Showdown.Converter();
 var parser = new commonmark.Parser();
-var parserSmart = new commonmark.Parser({smart: true});
 var renderer = new commonmark.HtmlRenderer();
 
 var benchfile = process.argv[2];
 
-var contents = fs.readFileSync(benchfile, 'utf8');
+var contents = fs.readFileSync(benchfile, "utf8");
 
-suite.add('commonmark.js', function() {
-  renderer.render(parser.parse(contents));
-})
+suite
+    .add("commonmark.js", function() {
+        renderer.render(parser.parse(contents));
+    })
 
-.add('showdown.js', function() {
-  showdown.makeHtml(contents);
-})
+    .add("showdown.js", function() {
+        showdown.makeHtml(contents);
+    })
 
-.add('marked.js', function() {
-  marked(contents);
-})
+    .add("marked.js", function() {
+        marked(contents);
+    })
 
-.add('markdown-it', function() {
-  markdownit.render(contents);
-})
+    .add("markdown-it", function() {
+        markdownit.render(contents);
+    })
 
-.on('cycle', function(event) {
-  console.log(String(event.target));
-})
-.run();
+    .on("cycle", function(event) {
+        console.log(String(event.target));
+    })
+    .run();

bin/commonmark

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

bower.json

@@ -1,25 +1,22 @@
 {
-    "name": "commonmark",
-    "main": "dist/commonmark.js",
-    "homepage": "https://github.com/commonmark/commonmark.js",
-    "description": "CommonMark parsing and rendering library",
-    "license": "BSD-2-Clause",
-    "ignore": [
-        "**/.*",
-        "lib",
-        "bin",
-        "test",
-        "tools",
-        "bench",
-        "dingus",
-        "Makefile",
-        "*.md",
-        "release_checklist.md",
-        "eslint.json",
-        "package.json"
-    ],
-    "keywords": [
-        "markdown",
-        "commonmark"
-    ]
+  "name": "commonmark",
+  "main": "dist/commonmark.js",
+  "homepage": "https://github.com/commonmark/commonmark.js",
+  "description": "CommonMark parsing and rendering library",
+  "license": "BSD-2-Clause",
+  "ignore": [
+    "**/.*",
+    "lib",
+    "bin",
+    "test",
+    "tools",
+    "bench",
+    "dingus",
+    "Makefile",
+    "*.md",
+    "release_checklist.md",
+    ".eslintrc",
+    "package.json"
+  ],
+  "keywords": ["markdown", "commonmark"]
 }

dingus/Makefile

@@ -2,7 +2,6 @@ ALL=commonmark.js
 COMPONENTS=lodash.min.js jquery.min.js jquery.min.map bootstrap.min.js bootstrap.min.css
 LIBFILES=../lib/blocks.js ../lib/common.js ../lib/from-code-point.js ../lib/inlines.js ../lib/index.js ../lib/node.js ../lib/render/xml.js ../lib/render/html.js ../lib/render/renderer.js
 BOWER=../node_modules/.bin/bower
-BROWSERIFY=../node_modules/.bin/browserify
 HTTPSERVER=../node_modules/.bin/http-server
 
 all: $(ALL) components
@@ -34,7 +33,8 @@ clean:
 	rm -r bower_components
 
 commonmark.js: ../lib/index.js $(LIBFILES)
-	$(BROWSERIFY) --standalone commonmark $< -o $@
+	make -C .. dist ;\
+	cp ../dist/commonmark.js commonmark.js
 
 dingus: all
 	echo "Starting dingus server at http://localhost:9000/"; \