Merge pull request apache#994 from raphinesse/fix-eslint

Improve ESLint setup and fix linting errors

Author: raphinesse

gulpfile.js

@@ -12,7 +12,7 @@
     "clean": "gulp clean",
     "update-docs": "gulp snapshot",
     "build": "gulp build --prod",
-    "eslint": "eslint tools/lib tools/spec"
+    "eslint": "eslint tools *.js"
   },
   "author": "Apache Software Foundation",
   "license": "Apache-2.0",
@@ -46,13 +46,13 @@
     "babel-plugin-transform-h-jsx": "^1.0.0",
     "babel-preset-react": "^6.24.1",
     "babelify": "^7.3.0",
-    "eslint": "^4.10.0",
-    "eslint-config-semistandard": "^11.0.0",
-    "eslint-config-standard": "^10.2.1",
+    "eslint": "^5.16.0",
+    "eslint-config-semistandard": "^13.0.0",
+    "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-node": "^5.2.1",
-    "eslint-plugin-promise": "^3.6.0",
-    "eslint-plugin-standard": "^3.0.1",
+    "eslint-plugin-node": "^9.0.1",
+    "eslint-plugin-promise": "^4.1.1",
+    "eslint-plugin-standard": "^4.0.0",
     "glob": "^7.0.3",
     "gulp-htmllint": "^0.0.5",
     "simplecrawler": "^0.5.2"

package.json

@@ -27,7 +27,6 @@ var chalk = require('chalk');
 var util = require('./util');
 
 // constants
-var DEFAULT_PREFIX = '';
 var VERBOSE_BY_DEFAULT = false;
 
 // globals
@@ -121,7 +120,7 @@ function augmentToc (originalToc, prefix) {
 function augmentString (srcTocString, prefix) {
     var srcToc = yaml.load(srcTocString);
     var augmentedToc = augmentToc(srcToc, prefix);
-    var augmentedTocString = yaml.dump(augmentedToc, {indent: 4});
+    var augmentedTocString = yaml.dump(augmentedToc, { indent: 4 });
 
     return augmentedTocString;
 }

tools/bin/augment_toc.js

@@ -54,10 +54,7 @@ function getLatestRelease (packageName) {
 }
 
 function packageNameFromRepoName (repoName) {
-    var repoSplit = repoName.split('/');
-    var repoOwner = repoSplit[0];
-    var actualRepoName = repoSplit[1];
-    return actualRepoName;
+    return repoName.split('/')[1];
 }
 
 function getFetchedFileConfig (entry) {
@@ -192,7 +189,7 @@ function downloadEntries (downloadPrefix, entries) {
         var outFile = fs.createWriteStream(outFilePath);
 
         // open an HTTP request for the file
-        var request = https.get(fetchURI, function (response) {
+        https.get(fetchURI, function (response) {
 
             if (response.statusCode !== 200) {
                 console.error('Failed to download ' + fetchURI + ': got ' + response.statusCode);

tools/bin/fetch_docs.js

@@ -56,7 +56,7 @@ function main () {
     }
 
     // create defaults config
-    var config = {'defaults': []};
+    var config = { 'defaults': [] };
 
     // set defaults for each language
     util.listdirsSync(rootDir).forEach(function (langName) {
@@ -114,7 +114,7 @@ function main () {
     });
 
     console.log(util.generatedBy(__filename));
-    console.log(yaml.dump(config, {indent: 4}));
+    console.log(yaml.dump(config, { indent: 4 }));
 }
 
 main();

tools/bin/gen_defaults.js

@@ -92,6 +92,8 @@ function main () {
     // add entries for all Markdown files in the site root
     var allMarkdownFiles = path.join(siteRootPath, '**/*.md');
     glob(allMarkdownFiles, function (error, filePaths) {
+        if (error) throw error;
+
         for (var i = 0; i < filePaths.length; i++) {
             var filePath = filePaths[i];
             var fileURI = pathToURI(filePath, siteRootPath);

tools/bin/gen_pages_dict.js

@@ -56,23 +56,21 @@ function main () {
         var versionNames = util.listdirsSync(langPath);
 
         // get language ID
-        var langName;
-        if (langId in LANGUAGE_MAP) {
-            langName = LANGUAGE_MAP[langId];
-        } else {
+        var langName = LANGUAGE_MAP[langId];
+        if (!langName) {
             console.error("Language identifier '" + langId + "' doesn't have an associated name. Please fix that by changing " + scriptName + '.');
             process.exit(1);
         }
 
         // set the language name and the versions it has
         config[langId] = {
-            'name': LANGUAGE_MAP[langId],
+            'name': langName,
             'versions': versionNames
         };
     });
 
     console.log(util.generatedBy(__filename));
-    console.log(yaml.dump(config, {indent: 4}));
+    console.log(yaml.dump(config, { indent: 4 }));
 }
 
 main();

tools/bin/gen_versions.js

@@ -54,6 +54,7 @@ function main () {
 
             // read the input
             fs.readFile(srcTocPath, function (error, data) {
+                if (error) throw error;
 
                 // augment the ToC
                 var originalTocString = data.toString();
@@ -63,6 +64,7 @@ function main () {
 
                 // write the output
                 fs.writeFile(destTocPath, output, function (error, data) {
+                    if (error) throw error;
                     console.log(srcTocPath + ' -> ' + destTocPath);
                 });
             });