Merge 1a8748f into 4240559

Makefile

@@ -12,7 +12,7 @@ CURR_HEAD   := $(firstword $(shell git show-ref --hash HEAD | cut -b -6) master)
 GITHUB_PROJ := https://github.com/jonschlinkert/${NPM_PACKAGE}
 
 
-demo: lint
+demo:
 	./support/demodata.js > demo/example.json
 	jade demo/index.jade -P --obj demo/example.json
 	stylus -u autoprefixer-stylus demo/assets/index.styl
@@ -22,7 +22,7 @@ lint:
 	eslint --reset ./bin ./lib ./support ./test
 
 test:
-	NODE_ENV=test mocha -R spec
+	NODE_ENV=test mocha -r esm -R spec
 	echo "CommonMark stat:\n"
 	./support/specsplit.js test/fixtures/commonmark/spec.txt
 

package.json

@@ -56,7 +56,7 @@
   },
   "scripts": {
     "test": "make test",
-    "test-ci": "nyc mocha -R spec --bail",
+    "test-ci": "nyc mocha -r esm -R spec --bail",
     "coverage": "yarn add coveralls@2 && nyc report --reporter=text-lcov | coveralls"
   },
   "dependencies": {
@@ -67,6 +67,7 @@
     "ansi": "^0.3.0",
     "benchmark": "^1.0.0",
     "commonmark": "0.12.0",
+    "esm": "^3.2.25",
     "gulp-format-md": "^0.1.10",
     "highlight.js": "^9.7.0",
     "marked": "0.3.2",

support/demodata.js

@@ -1,11 +1,11 @@
-#!/usr/bin/env node
+#!/usr/bin/env node -r esm
 
 // Build demo data for embedding into html
 
 /*eslint no-console:0*/
 
-var fs   = require('fs');
-var path = require('path');
+import fs from 'fs';
+import path from 'path';
 
 console.log(JSON.stringify({
   self: {

support/entities.js

@@ -1,12 +1,11 @@
-#!/usr/bin/env node
+#!/usr/bin/env node -r esm
 
-'use strict';
 //
 // Markdown entities generator (from html5 entities)
 //
 
 /*eslint no-console:0*/
-var http = require('http');
+import http from 'http';
 
 function codeToUni(code) {
   var result = code.toString(16).toUpperCase();

support/specsplit.js

@@ -1,22 +1,18 @@
-#!/usr/bin/env node
+#!/usr/bin/env node -r esm
 /*eslint no-console:0*/
 
 // Fixtures generator from commonmark specs. Split spec to working / not working
 // examples, or show total stat.
 
-'use strict';
-
-
-var fs        = require('fs');
-var util      = require('util');
-var argparse  = require('argparse');
-
-var Remarkable = require('..');
-
+import fs from 'fs';
+import util from 'util';
+import argparse from 'argparse';
+import Remarkable from '../lib/index.js';
+import pkg from '../package.json';
 
 var cli = new argparse.ArgumentParser({
   prog: 'specsplit',
-  version: require('../package.json').version,
+  version: pkg.version,
   addHelp: true
 });
 

test/commonmark.js

@@ -1,11 +1,8 @@
-'use strict';
-
-require('mocha');
-var path = require('path');
-var utils = require('./utils');
-var Remarked = require('../');
+import path from 'path';
+import { addTests } from './utils';
+import Remarkable from '../lib/index';
 
 describe('CommonMark', function () {
-  var md = new Remarked('commonmark');
-  utils.addTests(path.join(__dirname, 'fixtures/commonmark/good.txt'), md);
+  var md = new Remarkable('commonmark');
+  addTests(path.join(__dirname, 'fixtures/commonmark/good.txt'), md);
 });

test/misc.js

@@ -1,23 +1,20 @@
-/*global describe, it*/
-'use strict';
+import assert from 'assert';
+import Remarkable from '../lib/index';
 
-
-var assert     = require('assert');
-var Remarkable = require('../');
-var utils      = require('../').utils;
+const { utils } = Remarkable
 
 
 describe('Utils', function () {
 
   it('fromCodePoint', function () {
-    var fromCodePoint = require('../lib/common/utils').fromCodePoint;
+    var fromCodePoint = utils.fromCodePoint;
 
     assert.strictEqual(fromCodePoint(0x20), ' ');
     assert.strictEqual(fromCodePoint(0x1F601), '😁');
   });
 
   it('isValidEntityCode', function () {
-    var isValidEntityCode = require('../lib/common/utils').isValidEntityCode;
+    var isValidEntityCode = utils.isValidEntityCode;
 
     assert.strictEqual(isValidEntityCode(0x20), true);
     assert.strictEqual(isValidEntityCode(0xD800), false);
@@ -31,7 +28,7 @@ describe('Utils', function () {
   });
 
   it('replaceEntities', function () {
-    var replaceEntities = require('../lib/common/utils').replaceEntities;
+    var replaceEntities = utils.replaceEntities;
 
     assert.strictEqual(replaceEntities('&'), '&');
     assert.strictEqual(replaceEntities(' '), ' ');
@@ -43,7 +40,7 @@ describe('Utils', function () {
   });
 
   it('assign', function () {
-    var assign = require('../lib/common/utils').assign;
+    var assign = utils.assign;
 
     assert.deepEqual(assign({ a: 1 }, null, { b: 2 }), { a: 1, b: 2 });
     assert.throws(function () {

test/remarkable.js

@@ -1,13 +1,6 @@
-/*global describe*/
-'use strict';
-
-
-var path = require('path');
-
-
-var utils = require('./utils');
-var Remarkable = require('../');
-
+import path from 'path';
+import { addTests } from './utils';
+import Remarkable from '../lib/index';
 
 describe('remarkable', function () {
   var md = new Remarkable('full', {
@@ -17,5 +10,5 @@ describe('remarkable', function () {
     linkify: true
   });
 
-  utils.addTests(path.join(__dirname, 'fixtures/remarkable'), md);
+  addTests(path.join(__dirname, 'fixtures/remarkable'), md);
 });

test/ruler.js

@@ -1,9 +1,5 @@
-/*global describe, it*/
-'use strict';
-
-
-var assert = require('assert');
-var Ruler  = require('../lib/ruler');
+import assert from 'assert';
+import Ruler from '../lib/ruler';
 
 describe('Ruler', function () {
 

test/utils.js

@@ -1,13 +1,8 @@
-/*global describe, it*/
-'use strict';
+import fs from 'fs';
+import path from 'path';
+import assert from 'assert';
 
-
-var fs = require('fs');
-var path = require('path');
-var assert = require('assert');
-
-
-function addTests(fPath, markdown, skip) {
+export function addTests(fPath, markdown, skip) {
   var input,
       stat = fs.statSync(fPath);
 
@@ -42,6 +37,3 @@ function addTests(fPath, markdown, skip) {
     });
   }
 }
-
-
-module.exports.addTests = addTests;

yarn.lock

@@ -542,6 +542,11 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+esm@^3.2.25:
+  version "3.2.25"
+  resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
+  integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
+
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"