Merge pull request #1 from papandreou/support-dynamic-import

Align with estree/estree#198
Munter · Aug 5, 2019 · 2bf769f · 2bf769f
2 parents 83c058f + f5157e4
commit 2bf769f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/estraverse.js b/estraverse.js
@@ -108,7 +108,7 @@
         GeneratorExpression: 'GeneratorExpression',  // CAUTION: It's deferred to ES7.
         Identifier: 'Identifier',
         IfStatement: 'IfStatement',
-        Import: 'ImportExpression',
+        ImportExpression: 'ImportExpression',
         ImportDeclaration: 'ImportDeclaration',
         ImportDefaultSpecifier: 'ImportDefaultSpecifier',
         ImportNamespaceSpecifier: 'ImportNamespaceSpecifier',
@@ -183,7 +183,7 @@
         GeneratorExpression: ['blocks', 'filter', 'body'],  // CAUTION: It's deferred to ES7.
         Identifier: [],
         IfStatement: ['test', 'consequent', 'alternate'],
-        Import: ['argument'],
+        ImportExpression: ['source'],
         ImportDeclaration: ['specifiers', 'source'],
         ImportDefaultSpecifier: ['local'],
         ImportNamespaceSpecifier: ['local'],

diff --git a/test/es6.js b/test/es6.js
@@ -330,25 +330,18 @@ describe('dynamic import', function() {
         // });
 
         const tree = {
-            type: 'CallExpression',
-            callee: {
-                type: 'Import'
-            },
-            arguments: [
-                {
-                    type: 'Literal',
-                    value: 'rabbit-house'
-                }
-            ]
+            type: 'ImportExpression',
+            source: {
+                type: 'Literal',
+                value: 'rabbit-house'
+            }
         };
 
       checkDump(Dumper.dump(tree), `
-          enter - CallExpression
-          enter - Import
-          leave - Import
+          enter - ImportExpression
           enter - Literal
           leave - Literal
-          leave - CallExpression
+          leave - ImportExpression
       `);
     });
 });