Update acorn to v6

Author: goto-bus-stop

index.js

@@ -1,32 +1,32 @@
 var acorn = require('acorn')
 var xtend = require('xtend')
 
+var CJSParser = acorn.Parser
+var ESModulesParser = acorn.Parser
+  .extend(require('./lib/import-meta'))
+
 function mapOptions (opts) {
   if (!opts) opts = {}
-  opts = xtend({
+  return xtend({
     ecmaVersion: 2019,
     allowHashBang: true,
-    allowReturnOutsideFunction: true,
-    plugins: {
-      dynamicImport: opts.sourceType === 'module',
-      importMeta: opts.sourceType === 'module'
-    }
+    allowReturnOutsideFunction: true
   }, opts)
-  opts.plugins = xtend(opts.plugins, {})
-  return opts
+}
+
+function getParser (opts) {
+  if (!opts) opts = {}
+  return opts.sourceType === 'module' ? ESModulesParser : CJSParser
 }
 
 module.exports = exports = xtend(acorn, {
   parse: function parse (src, opts) {
-    return acorn.parse(src, mapOptions(opts))
+    return getParser(opts).parse(src, mapOptions(opts))
   },
   parseExpressionAt: function parseExpressionAt (src, offset, opts) {
-    return acorn.parseExpressionAt(src, offset, mapOptions(opts))
+    return getParser(opts).parseExpressionAt(src, offset, mapOptions(opts))
   },
   tokenizer: function tokenizer (src, opts) {
-    return acorn.tokenizer(src, mapOptions(opts))
+    return getParser(opts).tokenizer(src, mapOptions(opts))
   }
 })
-
-require('acorn-dynamic-import/lib/inject').default(exports)
-require('./lib/import-meta')(exports)

package.json

@@ -7,8 +7,9 @@
     "url": "https://github.com/browserify/acorn-node/issues"
   },
   "dependencies": {
-    "acorn": "^5.7.1",
+    "acorn": "^6.0.1",
     "acorn-dynamic-import": "^3.0.0",
+    "acorn-walk": "^6.0.1",
     "xtend": "^4.0.1"
   },
   "devDependencies": {

walk.js

@@ -1,5 +1,5 @@
 var xtend = require('xtend')
-var walk = require('acorn/dist/walk')
+var walk = require('acorn-walk')
 
 var base = xtend(walk.base, {
   Import: function () {}