fix import() to work with no-cycle

import-js · Oct 22, 2018 · 27c04de · 27c04de
1 parent 19f7442
commit 27c04de
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/src/rules/no-cycle.js b/src/rules/no-cycle.js
@@ -30,14 +30,10 @@ module.exports = {
     function checkSourceValue(sourceNode, importer) {
       const imported = Exports.get(sourceNode.value, context)
 
-      if (sourceNode.parent && sourceNode.parent.importKind === 'type') {
+      if (importer.importKind === 'type') {
         return // no Flow import resolution
       }
 
-      if (sourceNode._babelType === 'Literal') {
-        return // no Flow import resolution, workaround for ESLint < 5.x
-      }
-
       if (imported == null) {
         return  // no-unresolved territory
       }

diff --git a/tests/src/rules/no-cycle.js b/tests/src/rules/no-cycle.js
@@ -93,16 +93,21 @@ ruleTester.run('no-cycle', rule, {
       code: 'import { bar } from "./depth-three-indirect"',
       errors: [error(`Dependency cycle via ./depth-two:1=>./depth-one:1`)],
     }),
-    // test({
-    //   code: 'import("./depth-three-star")',
-    //   errors: [error(`Dependency cycle via ./depth-two:1=>./depth-one:1`)],
-    //   parser: 'babel-eslint',
-    // }),
-    // test({
-    //   code: 'import("./depth-three-indirect")',
-    //   errors: [error(`Dependency cycle via ./depth-two:1=>./depth-one:1`)],
-    //   parser: 'babel-eslint',
-    // }),
+    test({
+      code: 'import { bar } from "./depth-three-indirect"',
+      errors: [error(`Dependency cycle via ./depth-two:1=>./depth-one:1`)],
+      parser: 'babel-eslint',
+    }),
+    test({
+      code: 'import("./depth-three-star")',
+      errors: [error(`Dependency cycle via ./depth-two:1=>./depth-one:1`)],
+      parser: 'babel-eslint',
+    }),
+    test({
+      code: 'import("./depth-three-indirect")',
+      errors: [error(`Dependency cycle via ./depth-two:1=>./depth-one:1`)],
+      parser: 'babel-eslint',
+    }),
   ],
 })
 // })