From f5157e4f8c3e9e200239a57accc5bce61daca18d Mon Sep 17 00:00:00 2001 From: Andreas Lind Date: Mon, 5 Aug 2019 23:38:17 +0200 Subject: [PATCH] Align with estree/estree#198 --- estraverse.js | 4 ++-- test/es6.js | 21 +++++++-------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/estraverse.js b/estraverse.js index fa5a9a1..b106d38 100644 --- 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 index 251762f..09509ca 100644 --- 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 `); }); });