Chore: Makefile tweaks (#522)

platinumazure · JamesHenry · commit 655359fac817 · 2018-09-29T23:00:47.000-04:00
Simplify Jest calls, reorder some code to avoid lint disabling, and add check for unused disable comments
diff --git a/Makefile.js b/Makefile.js
@@ -26,23 +26,6 @@ const OPEN_SOURCE_LICENSES = [
     /MIT/, /BSD/, /Apache/, /ISC/, /WTF/, /Public Domain/
 ];
 
-//------------------------------------------------------------------------------
-// Data
-//------------------------------------------------------------------------------
-
-const NODE_MODULES = "./node_modules/",
-
-    // Utilities - intentional extra space at the end of each string
-    JEST = `${NODE_MODULES}jest/bin/jest.js`,
-
-    // Files
-    MAKEFILE = "./Makefile.js",
-    /* eslint-disable no-use-before-define */
-    JS_FILES = "parser.js",
-    TEST_FILES = find("tests/lib/").filter(fileType("js")).join(" "),
-    TOOLS_FILES = find("tools/").filter(fileType("js")).join(" ");
-    /* eslint-enable no-use-before-define */
-
 //------------------------------------------------------------------------------
 // Helpers
 //------------------------------------------------------------------------------
@@ -59,6 +42,19 @@ function fileType(extension) {
     };
 }
 
+//------------------------------------------------------------------------------
+// Data
+//------------------------------------------------------------------------------
+
+const JEST = "jest",
+    LINT_OPTIONS = "--report-unused-disable-directives",
+
+    // Files
+    MAKEFILE = "./Makefile.js",
+    JS_FILES = "parser.js",
+    TEST_FILES = find("tests/lib/").filter(fileType("js")).join(" "),
+    TOOLS_FILES = find("tools/").filter(fileType("js")).join(" ");
+
 //------------------------------------------------------------------------------
 // Tasks
 //------------------------------------------------------------------------------
@@ -72,25 +68,25 @@ target.lint = function() {
         lastReturn;
 
     echo("Validating Makefile.js");
-    lastReturn = nodeCLI.exec("eslint", MAKEFILE);
+    lastReturn = nodeCLI.exec("eslint", MAKEFILE, LINT_OPTIONS);
     if (lastReturn.code !== 0) {
         errors++;
     }
 
     echo("Validating JavaScript files");
-    lastReturn = nodeCLI.exec("eslint", JS_FILES);
+    lastReturn = nodeCLI.exec("eslint", JS_FILES, LINT_OPTIONS);
     if (lastReturn.code !== 0) {
         errors++;
     }
 
     echo("Validating JavaScript test files");
-    lastReturn = nodeCLI.exec("eslint", TEST_FILES);
+    lastReturn = nodeCLI.exec("eslint", TEST_FILES, LINT_OPTIONS);
     if (lastReturn.code !== 0) {
         errors++;
     }
 
     echo("Validating JavaScript tools files");
-    lastReturn = nodeCLI.exec("eslint", TOOLS_FILES);
+    lastReturn = nodeCLI.exec("eslint", TOOLS_FILES, LINT_OPTIONS);
     if (lastReturn.code !== 0) {
         errors++;
     }
