Fix: no-unpublished-* had been handling files of package.json wit…

…h wrong way (fixes #23)
mysticatea · Feb 1, 2016 · e9ef104 · e9ef104
1 parent 0bb7ab6
commit e9ef104
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/lib/util/get-npmignore.js b/lib/util/get-npmignore.js
@@ -21,7 +21,7 @@ var getPackageJson = require("./get-package-json");
 //------------------------------------------------------------------------------
 
 var cache = new Cache();
-var TAIL_SLASH = /\/+$/;
+var SLASH_AT_BEGIN_END = /(?:^\/+|\/+$)/g;
 var PARENT_RELATIVE_PATH = /^\.\./;
 var NEVER_IGNORED = /^(?:readme\.[^\.]*|(?:licen[cs]e|changes|changelog|history)(?:\.[^\.]*)?)$/i;
 
@@ -107,8 +107,9 @@ function parseWhiteList(files) {
         var file = files[i];
 
         if (typeof file === "string") {
+            file = "/" + file.replace(SLASH_AT_BEGIN_END, "");
             ignore.addPattern("!" + file);
-            ignore.addPattern("!" + file.replace(TAIL_SLASH, "") + "/**");
+            ignore.addPattern("!" + file + "/**");
         }
     }
 

diff --git a/tests/fixtures/no-unpublished/3/src/pub/a.js b/tests/fixtures/no-unpublished/3/src/pub/a.js
diff --git a/tests/lib/rules/no-unpublished-import.js b/tests/lib/rules/no-unpublished-import.js
@@ -124,6 +124,12 @@ ruleTester.run("no-unpublished-import", rule, {
             ecmaFeatures: {modules: true},
             parserOptions: {sourceType: "module"}
         },
+        {
+            filename: fixture("3/src/pub/test.js"),
+            code: "import bbb from 'bbb';",
+            ecmaFeatures: {modules: true},
+            parserOptions: {sourceType: "module"}
+        },
 
         // `convertPath` option.
         {
@@ -246,6 +252,13 @@ ruleTester.run("no-unpublished-import", rule, {
             ecmaFeatures: {modules: true},
             parserOptions: {sourceType: "module"}
         },
+        {
+            filename: fixture("3/pub/test.js"),
+            code: "import a from '../src/pub/a.js';",
+            ecmaFeatures: {modules: true},
+            parserOptions: {sourceType: "module"},
+            errors: ["\"../src/pub/a.js\" is not published."]
+        },
 
         {
             filename: fixture("1/test.js"),

diff --git a/tests/lib/rules/no-unpublished-require.js b/tests/lib/rules/no-unpublished-require.js
@@ -109,6 +109,11 @@ ruleTester.run("no-unpublished-require", rule, {
             code: "require('../package.json');",
             env: {node: true}
         },
+        {
+            filename: fixture("3/src/pub/test.js"),
+            code: "require('bbb');",
+            env: {node: true}
+        },
 
         // `convertPath` option.
         {
@@ -250,6 +255,12 @@ ruleTester.run("no-unpublished-require", rule, {
             env: {node: true},
             errors: ["\"../test\" is not published."]
         },
+        {
+            filename: fixture("3/pub/test.js"),
+            code: "require('../src/pub/a.js');",
+            env: {node: true},
+            errors: ["\"../src/pub/a.js\" is not published."]
+        },
 
         {
             filename: fixture("1/test.js"),