Merge branch 'master' into greenkeeper/async-3.0.1

.gitignore

@@ -0,0 +1,4 @@
+*.log
+yarn.lock
+package-lock.json
+node_modules

.travis.yml

@@ -12,7 +12,5 @@ env:
 
 language: node_js
 node_js:
-   - '4.2'
-   - '5'
-   - '6'
-   - '7'
+   - '12'
+   - '14'

examples/simple/render.js

@@ -7,7 +7,7 @@ var xclient = x11.createClient(function(err, display) {
     display.client.require('render', function(err, Render) {
         var wid = X.AllocID();
         var white = display.screen[0].white_pixel;
-        varblack = display.screen[0].black_pixel;
+        var black = display.screen[0].black_pixel;
         X.CreateWindow(wid, root, 10, 10, 400, 300, 0, 0, 0, 0, { backgroundPixel: white, eventMask: PointerMotion });
         X.MapWindow(wid);
 

lib/auth.js

@@ -50,7 +50,7 @@ function parseXauth( buf )
     return auth;
 }
 
-var homedir = require('os-homedir');
+var homedir = require('os').homedir();
 var path = require('path');
 
 function readXauthority(cb) {

lib/corereqs.js

@@ -217,25 +217,26 @@ function packValueMask(reqname, values)
     {
         var v = reqValueMask[value];
         if (v) {
-          var valueBit = v.mask;
-          if (!valueBit)
-              throw new Error(reqname + ': incorrect value param ' + value);
-          masksList.push(valueBit);
-          bitmask |= valueBit;
+            var valueBit = v.mask;
+            if (!valueBit)
+                throw new Error(reqname + ': incorrect value param ' + value);
+            masksList.push(valueBit);
+            bitmask |= valueBit;
         }
     }
 
     /* numeric sort */
     masksList.sort(function(a, b) {
-      return a - b;
+        return a - b;
     });
 
     var args = [];
-    for (m in masksList)
+    for (var i=0,length=masksList.length;i<length;i++)
     {
-       var valueName = reqValueMaskName[masksList[m]];
-       format += reqValueMask[valueName].format
-       args.push( values[valueName] );
+        var value = masksList[i];
+        var valueName = reqValueMaskName[value];
+        format += reqValueMask[valueName].format
+        args.push( values[valueName] );
     }
     return [format, bitmask, args]
 }

package.json

@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "async": "^3.0.1",
-    "mocha": "^5.0.0",
+    "mocha": "^7.1.2",
     "sax": "^1.2.4",
     "should": "^13.2.1",
     "sinon": "^6.0.0"
@@ -50,7 +50,5 @@
     "test": "node test-runner.js",
     "prepublish": "npm prune"
   },
-  "dependencies": {
-    "os-homedir": "^1.0.1"
-  }
+  "dependencies": {}
 }