Add support for ES Module

.gitignore

@@ -1,2 +1,3 @@
 /node_modules
 /package-lock.json
+index.cjs.js

constructor/build.js

@@ -0,0 +1,19 @@
+import path from "path";
+import { rollup } from "rollup";
+
+const PATH_ROOT = path.resolve(__dirname, "../");
+
+let inputOptions = {
+    input: path.resolve(PATH_ROOT, "index.js"),
+    external: ["acorn"]
+}
+
+let outputOptions = {
+    output: {
+        file: path.resolve(PATH_ROOT, "index.cjs.js"),
+        format: "cjs",
+        banner: "// DO NOT edit this file, it's auto generate from 'constructor/build.js', any changes will be overwrite. \n"
+    }
+}
+
+rollup(inputOptions).then(bundle => bundle.write(outputOptions));

index.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const XHTMLEntities = require('./xhtml');
+import * as acorn from "acorn";
+import XHTMLEntities from './xhtml';
 
 const hexNumber = /^[\da-fA-F]+$/;
 const decimalNumber = /^\d+$/;
@@ -70,7 +71,7 @@ function getQualifiedJSXName(object) {
     getQualifiedJSXName(object.property);
 }
 
-module.exports = function(options) {
+function acornJsx(options) {
   options = options || {};
   return function(Parser) {
     return plugin({
@@ -82,16 +83,19 @@ module.exports = function(options) {
 
 // This is `tokTypes` of the peer dep.
 // This can be different instances from the actual `tokTypes` this plugin uses.
-Object.defineProperty(module.exports, "tokTypes", {
+Object.defineProperty(acornJsx, "tokTypes", {
   get: function get_tokTypes() {
-    return getJsxTokens(require("acorn")).tokTypes;
+    return getJsxTokens(acorn).tokTypes;
   },
   configurable: true,
   enumerable: true
 });
 
+
+export default acornJsx;
+
 function plugin(options, Parser) {
-  const acorn = Parser.acorn || require("acorn");
+  const acorn = Parser.acorn || acorn;
   const acornJsx = getJsxTokens(acorn);
   const tt = acorn.tokTypes;
   const tok = acornJsx.tokTypes;

package.json

@@ -3,6 +3,8 @@
   "description": "Modern, fast React.js JSX parser",
   "homepage": "https://github.com/acornjs/acorn-jsx",
   "version": "5.3.1",
+  "main": "index.cjs.js",
+  "module": "index.js",
   "maintainers": [
     {
       "name": "Ingvar Stepanyan",
@@ -16,12 +18,16 @@
   },
   "license": "MIT",
   "scripts": {
-    "test": "node test/run.js"
+    "test": "node -r esm test/run.js",
+    "prepublishOnly": "node -r esm constructor/build.js"
   },
   "peerDependencies": {
     "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "devDependencies": {
-    "acorn": "^8.0.1"
+    "@rollup/plugin-commonjs": "^12.0.0",
+    "acorn": "^8.0.1",
+    "esm": "^3.2.25",
+    "rollup": "^2.12.0"
   }
 }

test/driver.js

@@ -1,16 +1,16 @@
 var tests = [];
 
-exports.test = function(code, ast, options, pluginOptions) {
+export function test(code, ast, options, pluginOptions) {
   tests.push({code, ast, options, pluginOptions});
 };
-exports.testFail = function(code, message, options, pluginOptions) {
+export function testFail(code, message, options, pluginOptions) {
   tests.push({code, error: message, options, pluginOptions});
 };
-exports.testAssert = function(code, assert, options) {
+export function testAssert(code, assert, options) {
   tests.push({code, assert, options});
 };
 
-exports.runTests = function(config, callback) {
+export function runTests(config, callback) {
   var parse = config.parse;
 
   for (var i = 0; i < tests.length; ++i) {

test/run.js

@@ -1,6 +1,8 @@
-var driver = require("./driver.js");
-require("./tests-jsx.js");
-require("./tests-misc.js");
+import * as driver from "./driver.js";
+import "./tests-jsx.js";
+import "./tests-misc.js";
+import * as acorn from "acorn";
+import jsx from "../index.js";
 
 function group(name) {
   if (typeof console === "object" && console.group) {
@@ -18,7 +20,6 @@ function log(title, message) {
   if (typeof console === "object") console.log(title, message);
 }
 
-const acorn = require("acorn"), jsx = require("..")
 const Parser = acorn.Parser.extend(jsx())
 
 var stats, modes = {

test/tests-jsx.js

@@ -20,6 +20,13 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+import { test } from "./driver.js";
+import { testFail } from "./driver.js";
+import acornJsx from "../index.js";
+import { tokTypes as acornTokens } from "acorn";
+
+let jsxTokens = acornJsx.tokTypes;
+
 var fbTestFixture = {
   // Taken and adapted from esprima-fb/fbtest.js.
   'JSX': {
@@ -3725,13 +3732,6 @@ var fbTestFixture = {
   }
 };
 
-if (typeof exports !== "undefined") {
-  var test = require("./driver.js").test;
-  var testFail = require("./driver.js").testFail;
-  var jsxTokens = require("..").tokTypes;
-  var acornTokens = require("acorn").tokTypes;
-}
-
 testFail("var x = <div>one</div><div>two</div>;", "Adjacent JSX elements must be wrapped in an enclosing tag (1:22)");
 
 testFail("<a:b.c />", "Unexpected token (1:4)");

test/tests-misc.js

@@ -1,11 +1,9 @@
 "use strict";
 
-if (typeof exports !== "undefined") {
-  var assert = require("assert");
-  var acorn = require("acorn");
-  var jsx = require("..");
-  var testAssert = require("./driver.js").testAssert;
-}
+import assert from "assert";
+import * as acorn from "acorn";
+import jsx from "../index.js";
+import { testAssert } from "./driver";
 
 testAssert("// the enhanced Parser instance should have a static property 'acornJsx'.", function() {
   const JsxParser = acorn.Parser.extend(jsx());

xhtml.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   quot: '\u0022',
   amp: '&',
   apos: '\u0027',