Merge pull request #683 from geek/master

Minor cleanup
hapijs · Mar 11, 2017 · 6980215 · 6980215
2 parents 6986871 + 47ab6d0
commit 6980215
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/lib/coverage.js b/lib/coverage.js
@@ -10,8 +10,8 @@
 const Fs = require('fs');
 const Path = require('path');
 const Espree = require('espree');
-const SourceMapSupport = require('source-map-support');
 const SourceMapConsumer = require('source-map').SourceMapConsumer;
+const SourceMapSupport = require('source-map-support');
 const Transform = require('./transform');
 
 
@@ -345,7 +345,7 @@ internals.instrument = function (filename) {
                     if ((!nodesByLine[i] || !nodesByLine[i].find((type) => type !== 'Line' && type !== 'Block')) && !record.commentedLines[i]) {
                         record.commentedLines[i] = true;
 
-                        // Acorm remove comment delimiters, so start and end lines must never be considered blank if they content is
+                        // Acorn removes comment delimiters, so start and end lines must never be considered blank if they content is
                         if (i === start || i === end || !blank.test(internals.sources[filename][i - 1])) {
                             commented++;
                         }

diff --git a/lib/reporters/html/partials/css.html b/lib/reporters/html/partials/css.html
@@ -339,6 +339,10 @@
         display: inherit;
     }
 
+    #tests table .show {
+        display: table-row;
+    }
+
     [data-tooltip] {
         position: relative;
     }

diff --git a/lib/runner.js b/lib/runner.js
@@ -2,6 +2,7 @@
 
 // Load modules
 
+// 'cluster' loaded below in internals.loadLazyObjects()
 const Domain = require('domain');
 const Items = require('items');
 const Hoek = require('hoek');

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "bossy": "3.x.x",
     "diff": "3.x.x",
-    "eslint": "3.16.x",
+    "eslint": "3.17.x",
     "eslint-config-hapi": "10.x.x",
     "eslint-plugin-hapi": "4.x.x",
     "espree": "3.x.x",
@@ -31,7 +31,7 @@
   "devDependencies": {
     "code": "4.x.x",
     "cpr": "2.0.x",
-    "eslint-plugin-markdown": "1.0.0-beta.3",
+    "eslint-plugin-markdown": "1.0.0-beta.4",
     "lab-event-reporter": "1.x.x",
     "rimraf": "2.6.x"
   },