Align with estree/estree#198

assetgraph · Aug 11, 2019 · 8379ae3 · 8379ae3
1 parent 286c9af
commit 8379ae3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/lib/assets/JavaScript.js b/lib/assets/JavaScript.js
@@ -421,7 +421,19 @@ class JavaScript extends Text {
           that.strict = true;
         }
 
-        if (node.type === 'CallExpression') {
+        if (
+          node.type === 'ImportExpression' &&
+          node.source.type === 'Literal' &&
+          typeof node.source.value === 'string'
+        ) {
+          if (isImportUrl(node.source.value)) {
+            outgoingRelations.push({
+              type: 'JavaScriptDynamicImport',
+              node,
+              href: node.source.value
+            });
+          }
+        } else if (node.type === 'CallExpression') {
           const parentParentNode = stack[stack.length - 3];
 
           if (
@@ -537,20 +549,6 @@ class JavaScript extends Text {
                 });
               }
             }
-          } else if (
-            node.type === 'CallExpression' &&
-            node.callee.type === 'Import' &&
-            node.arguments[0] &&
-            node.arguments[0].type === 'Literal' &&
-            typeof node.arguments[0].value === 'string'
-          ) {
-            if (isImportUrl(node.arguments[0].value)) {
-              outgoingRelations.push({
-                type: 'JavaScriptDynamicImport',
-                node,
-                href: node.arguments[0].value
-              });
-            }
           }
         } else if (
           node.type === 'NewExpression' &&

diff --git a/lib/relations/JavaScriptDynamicImport.js b/lib/relations/JavaScriptDynamicImport.js
@@ -2,11 +2,11 @@ const Relation = require('./Relation');
 
 class JavaScriptDynamicImport extends Relation {
   get href() {
-    return this.node.arguments[0].value;
+    return this.node.source.value;
   }
 
   set href(href) {
-    this.node.arguments[0].value = href;
+    this.node.source.value = href;
   }
 
   attach(position, adjacentRelation) {