Add back dynamic-import support.

Author: goto-bus-stop

LICENSE.md

@@ -37,3 +37,33 @@ The code in the `lib/import-meta` folder is compiled from code licensed as MIT:
 > LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 > OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 > THE SOFTWARE.
+
+Find the source code at https://github.com/acornjs/acorn-import-meta.
+
+## acorn-dynamic-import
+
+The code in the `lib/dynamic-import` folder is licensed as MIT:
+
+> MIT License
+>
+> Copyright (c) 2016 Jordan Gensler
+>
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in all
+> copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+> SOFTWARE.
+
+Find the source code at https://github.com/kesne/acorn-dynamic-import.

build.js

@@ -18,3 +18,4 @@ function compile (name, output) { // eslint-disable-line no-unused-vars
 }
 
 compile('acorn-import-meta', './lib/import-meta/index.js')
+compile('./lib/dynamic-import/source', './lib/dynamic-import/index.js')

index.js

@@ -3,6 +3,7 @@ var xtend = require('xtend')
 
 var CJSParser = acorn.Parser
 var ESModulesParser = acorn.Parser
+  .extend(require('./lib/dynamic-import'))
   .extend(require('./lib/import-meta'))
 
 function mapOptions (opts) {

lib/dynamic-import/index.js

@@ -0,0 +1,55 @@
+/* Generated by `npm run build`, do not edit! */
+
+/* eslint-disable no-underscore-dangle */
+
+var DynamicImportKey = 'Import';
+
+var ref = require('acorn');
+var tt = ref.tokTypes;
+
+// NOTE: This allows `yield import()` to parse correctly.
+tt._import.startsExpr = true;
+
+function parseDynamicImport() {
+  var node = this.startNode();
+  this.next();
+  if (this.type !== tt.parenL) {
+    this.unexpected();
+  }
+  return this.finishNode(node, DynamicImportKey);
+}
+
+function parenAfter() {
+  return /^(\s|\/\/.*|\/\*[^]*?\*\/)*\(/.test(this.input.slice(this.pos));
+}
+
+function dynamicImport(Parser) {
+  return (function (Parser) {
+    function anonymous () {
+      Parser.apply(this, arguments);
+    }
+
+    if ( Parser ) anonymous.__proto__ = Parser;
+    anonymous.prototype = Object.create( Parser && Parser.prototype );
+    anonymous.prototype.constructor = anonymous;
+
+    anonymous.prototype.parseStatement = function parseStatement (context, topLevel, exports) {
+      if (this.type === tt._import && parenAfter.call(this)) {
+        return this.parseExpressionStatement(this.startNode(), this.parseExpression());
+      }
+      return Parser.prototype.parseStatement.call(this, context, topLevel, exports)
+    };
+
+    anonymous.prototype.parseExprAtom = function parseExprAtom (refDestructuringErrors) {
+      if (this.type === tt._import) {
+        return parseDynamicImport.call(this);
+      }
+      return Parser.prototype.parseExprAtom.call(this, refDestructuringErrors);
+    };
+
+    return anonymous;
+  }(Parser));
+};
+
+module.exports = dynamicImport
+dynamicImport.DynamicImportKey = DynamicImportKey

lib/dynamic-import/source.js

@@ -0,0 +1,42 @@
+/* eslint-disable no-underscore-dangle */
+
+const DynamicImportKey = 'Import';
+
+const { tokTypes: tt } = require('acorn')
+
+// NOTE: This allows `yield import()` to parse correctly.
+tt._import.startsExpr = true;
+
+function parseDynamicImport() {
+  const node = this.startNode();
+  this.next();
+  if (this.type !== tt.parenL) {
+    this.unexpected();
+  }
+  return this.finishNode(node, DynamicImportKey);
+}
+
+function parenAfter() {
+  return /^(\s|\/\/.*|\/\*[^]*?\*\/)*\(/.test(this.input.slice(this.pos));
+}
+
+function dynamicImport(Parser) {
+  return class extends Parser {
+    parseStatement(context, topLevel, exports) {
+      if (this.type === tt._import && parenAfter.call(this)) {
+        return this.parseExpressionStatement(this.startNode(), this.parseExpression());
+      }
+      return super.parseStatement(context, topLevel, exports)
+    }
+
+    parseExprAtom(refDestructuringErrors) {
+      if (this.type === tt._import) {
+        return parseDynamicImport.call(this);
+      }
+      return super.parseExprAtom(refDestructuringErrors);
+    }
+  };
+};
+
+module.exports = dynamicImport
+dynamicImport.DynamicImportKey = DynamicImportKey

package.json

@@ -8,7 +8,6 @@
   },
   "dependencies": {
     "acorn": "^6.0.1",
-    "acorn-dynamic-import": "^3.0.0",
     "acorn-walk": "^6.0.1",
     "xtend": "^4.0.1"
   },

walk.js

@@ -1,9 +1,9 @@
 var xtend = require('xtend')
 var walk = require('acorn-walk')
+var dynamicImportKey = require('./lib/dynamic-import').DynamicImportKey
 
-var base = xtend(walk.base, {
-  Import: function () {}
-})
+var base = xtend(walk.base)
+base[dynamicImportKey] = function () {}
 
 function simple (node, visitors, baseVisitor, state, override) {
   return walk.simple(node, visitors, baseVisitor || base, state, override)