Fix trailing comma in functions linting rule for node < 8

.eslintrc.json

@@ -11,6 +11,11 @@
     }
   },
   "rules": {
-    "strict": [2, "global"]
+    "strict": [ 2, "global" ],
+    "comma-dangle": [ 2, {
+      "arrays": "only-multiline",
+      "objects": "only-multiline",
+      "functions": "never"
+    }]
   }
 }

lib/ecstatic.js

@@ -195,8 +195,8 @@ module.exports = function createMiddleware(_dir, _options) {
     file = path.normalize(
       path.join(
         root,
-        path.relative(path.join('/', baseDir), pathname),
-      ),
+        path.relative(path.join('/', baseDir), pathname)
+      )
     );
     gzipped = `${file}.gz`;
 
@@ -260,7 +260,7 @@ module.exports = function createMiddleware(_dir, _options) {
         const start = parseInt(partialstart, 10);
         const end = Math.min(
           total - 1,
-          partialend ? parseInt(partialend, 10) : total - 1,
+          partialend ? parseInt(partialend, 10) : total - 1
         );
         const chunksize = (end - start) + 1;
         let fstream = null;
@@ -372,7 +372,7 @@ module.exports = function createMiddleware(_dir, _options) {
             middleware({
               url: urlJoin(
                 encodeURIComponent(pathname),
-                `/index.${defaultExt}`,
+                `/index.${defaultExt}`
               ),
               headers: req.headers,
             }, res, (autoIndexError) => {
@@ -439,7 +439,7 @@ if (!module.parent) {
     alias: aliases,
     default: defaults,
     boolean: Object.keys(defaults).filter(
-      key => typeof defaults[key] === 'boolean',
+      key => typeof defaults[key] === 'boolean'
     ),
   });
   const envPORT = parseInt(process.env.PORT, 10);

lib/ecstatic/show-dir/index.js

@@ -30,12 +30,13 @@ module.exports = (opts) => {
     const parsed = url.parse(req.url);
     const pathname = decodeURIComponent(parsed.pathname);
     const dir = path.normalize(
-      path.join(root,
+      path.join(
+        root,
         path.relative(
           path.join('/', baseDir),
-          pathname,
-        ),
-      ),
+          pathname
+        )
+      )
     );
 
     fs.stat(dir, (statErr, stat) => {

test/304.js

@@ -22,7 +22,7 @@ test('304_not_modified_strong', (t) => {
       showDir: true,
       weakEtags: false,
       weakCompare: false,
-    }),
+    })
   );
 
   server.listen(port, () => {
@@ -68,7 +68,7 @@ test('304_not_modified_weak', (t) => {
       autoIndex: true,
       showDir: true,
       weakCompare: false,
-    }),
+    })
   );
 
   server.listen(port, () => {
@@ -114,7 +114,7 @@ test('304_not_modified_strong_compare', (t) => {
       showDir: true,
       weakEtags: false,
       weakCompare: false,
-    }),
+    })
   );
 
   server.listen(port, () => {
@@ -181,7 +181,7 @@ test('304_not_modified_weak_compare', (t) => {
       autoIndex: true,
       showDir: true,
       weakEtags: false,
-    }),
+    })
   );
 
   server.listen(port, () => {

test/core-error.js

@@ -26,7 +26,7 @@ test('core', (t) => {
       autoIndex: true,
       showDir: true,
       handleError: false,
-    }),
+    })
   );
 
   server.listen(port, () => {
@@ -49,7 +49,7 @@ test('core', (t) => {
         if (r.type !== undefined) {
           t.equal(
             res.headers['content-type'].split(';')[0], r.type,
-            `content-type for \`${file}\``,
+            `content-type for \`${file}\``
           );
         }
 

test/core.js

@@ -28,7 +28,7 @@ test('core', (t) => {
       showDir: true,
       defaultExt: 'html',
       handleError: true,
-    }),
+    })
   );
 
   server.listen(port, () => {
@@ -51,7 +51,7 @@ test('core', (t) => {
         if (r.type !== undefined) {
           t.equal(
             res.headers['content-type'].split(';')[0], r.type,
-            `content-type for \`${file}\``,
+            `content-type for \`${file}\``
           );
         }
 

test/custom-content-type-file.js

@@ -16,7 +16,7 @@ test('throws when custom contentType .types file does not exist', (t) => {
     setup.bind(null, {
       root: `${__dirname}/public/`,
       mimeTypes: 'this_file_does_not_exist.types',
-    }),
+    })
   );
 });
 

test/express-error.js

@@ -55,7 +55,7 @@ test('express', (t) => {
         if (r.type !== undefined) {
           t.equal(
             res.headers['content-type'].split(';')[0], r.type,
-            `content-type for \`${file}\``,
+            `content-type for \`${file}\``
           );
         }
 

test/express.js

@@ -57,7 +57,7 @@ test('express', (t) => {
         if (r.type !== undefined) {
           t.equal(
             res.headers['content-type'].split(';')[0], r.type,
-            `content-type for \`${file}\``,
+            `content-type for \`${file}\``
           );
         }
 

test/headers.js

@@ -19,7 +19,7 @@ test('headers object', (t) => {
       },
       autoIndex: true,
       defaultExt: 'html',
-    }),
+    })
   );
 
   server.listen(() => {
@@ -47,7 +47,7 @@ test('header string', (t) => {
       header: 'beep: boop', // for command-line --header 'beep: boop'
       autoIndex: true,
       defaultExt: 'html',
-    }),
+    })
   );
 
   server.listen(() => {
@@ -77,7 +77,7 @@ test('header array', (t) => {
       ],
       autoIndex: true,
       defaultExt: 'html',
-    }),
+    })
   );
 
   server.listen(() => {
@@ -106,7 +106,7 @@ test('H array', (t) => {
       ],
       autoIndex: true,
       defaultExt: 'html',
-    }),
+    })
   );
 
   server.listen(() => {

test/showdir-href-encoding.js

@@ -19,7 +19,7 @@ test('url encoding in href', (t) => {
       baseDir,
       showDir: true,
       autoIndex: false,
-    }),
+    })
   );
 
   server.listen(port, () => {

test/showdir-pathname-encoding.js

@@ -34,7 +34,7 @@ test('directory listing with pathname including HTML characters', (t) => {
       baseDir,
       showDir: true,
       autoIndex: false,
-    }),
+    })
   );
 
   server.listen(port, () => {

test/showdir-search-encoding.js

@@ -19,7 +19,7 @@ test('directory listing with query string specified', (t) => {
       baseDir,
       showDir: true,
       autoIndex: false,
-    }),
+    })
   );
 
   server.listen(port, () => {

test/showdir-with-spaces.js

@@ -19,7 +19,7 @@ test('directory listing when directory name contains spaces', (t) => {
       baseDir,
       showDir: true,
       autoIndex: false,
-    }),
+    })
   );
 
   server.listen(port, () => {

test/trailing-slash.js

@@ -12,7 +12,7 @@ test('should not add trailing slash when showDir and autoIndex are off', (t) =>
       root: `${__dirname}/public`,
       autoIndex: false,
       showDir: false,
-    }),
+    })
   );
   t.on('end', () => { server.close(); });
   server.listen(0, () => {