replace includes() with an indexOf() call, add test cases for multipl…

…e import functions
import-js · Apr 10, 2018 · 9be016f · 9be016f
1 parent e6e4e98
commit 9be016f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/rules/dynamic-import-chunkname.js b/src/rules/dynamic-import-chunkname.js
@@ -10,6 +10,7 @@ module.exports = {
       properties: {
         importFunctions: {
           type: 'array',
+          uniqueItems: true,
           items: {
             type: 'string',
           },
@@ -32,7 +33,7 @@ module.exports = {
     return {
       [`CallExpression[callee.type="Import"],CallExpression[callee.name]`](node) {
         const { callee: { name }} = node
-        if (name && !importFunctions.includes(name)) {
+        if (name && importFunctions.indexOf(name) < 0) {
           return
         }
 

diff --git a/tests/src/rules/dynamic-import-chunkname.js b/tests/src/rules/dynamic-import-chunkname.js
@@ -11,6 +11,9 @@ const pickyCommentOptions = [{
   importFunctions: ['dynamicImport'],
   webpackChunknameFormat: pickyCommentFormat,
 }]
+const multipleImportFunctionOptions = [{
+  importFunctions: ['dynamicImport', 'definitelyNotStaticImport'],
+}]
 const parser = 'babel-eslint'
 
 const noLeadingCommentError = 'dynamic imports require a leading comment with the webpack chunkname'
@@ -173,6 +176,28 @@ ruleTester.run('dynamic-import-chunkname', rule, {
         type: 'CallExpression',
       }],
     },
+    {
+      code: `dynamicImport(
+        /* webpackChunkName "someModule" */
+        'someModule'
+      )`,
+      options: multipleImportFunctionOptions,
+      errors: [{
+        message: commentFormatError,
+        type: 'CallExpression',
+      }],
+    },
+    {
+      code: `definitelyNotStaticImport(
+        /* webpackChunkName "someModule" */
+        'someModule'
+      )`,
+      options: multipleImportFunctionOptions,
+      errors: [{
+        message: commentFormatError,
+        type: 'CallExpression',
+      }],
+    },
     {
       code: `dynamicImport(
         // webpackChunkName: "someModule"