report conditional require in a if block

import-js · Aug 4, 2019 · 147b74c · 147b74c
1 parent ebcf17c
commit 147b74c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/rules/no-commonjs.js b/src/rules/no-commonjs.js
@@ -25,6 +25,11 @@ function allowRequire(node, options) {
   return options.allowRequire
 }
 
+function validateScope(scope) {
+  if (scope.variableScope.type === 'module') return true
+  return false
+}
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -87,7 +92,7 @@ module.exports = {
 
       },
       'CallExpression': function (call) {
-        if (context.getScope().type !== 'module') return
+        if (!validateScope(context.getScope())) return
         if (
           call.parent.type !== 'ExpressionStatement'
           && call.parent.type !== 'VariableDeclarator'

diff --git a/tests/src/rules/no-commonjs.js b/tests/src/rules/no-commonjs.js
@@ -56,6 +56,9 @@ ruleTester.run('no-commonjs', require('rules/no-commonjs'), {
     { code: 'module.exports = function () {}', options: [{ allowPrimitiveModules: true }] },
     { code: 'module.exports = "foo"', options: ['allow-primitive-modules'] },
     { code: 'module.exports = "foo"', options: [{ allowPrimitiveModules: true }] },
+
+    { code: 'if (typeof window !== "undefined") require("x")', options: [{ allowRequire: true }] },
+    { code: 'if (typeof window !== "undefined") { require("x") }', options: [{ allowRequire: true }] },
   ],
 
   invalid: [
@@ -65,6 +68,12 @@ ruleTester.run('no-commonjs', require('rules/no-commonjs'), {
       { code: 'var x = require("x")', errors: [ { message: IMPORT_MESSAGE }] },
       { code: 'x = require("x")', errors: [ { message: IMPORT_MESSAGE }] },
       { code: 'require("x")', errors: [ { message: IMPORT_MESSAGE }] },
+      { code: 'if (typeof window !== "undefined") require("x")',
+        errors: [ { message: IMPORT_MESSAGE }],
+      },
+      { code: 'if (typeof window !== "undefined") { require("x") }',
+        errors: [ { message: IMPORT_MESSAGE }],
+      },
     ]),
 
     // exports