update dependencies

app/node_modules/resolve/.travis.yml

@@ -2,12 +2,13 @@ language: node_js
 os:
  - linux
 node_js:
-  - "9.8"
-  - "8.10"
+  - "10.4"
+  - "9.11"
+  - "8.11"
   - "7.10"
-  - "6.13"
+  - "6.14"
   - "5.12"
-  - "4.8"
+  - "4.9"
   - "iojs-v3.3"
   - "iojs-v2.5"
   - "iojs-v1.8"
@@ -33,6 +34,20 @@ matrix:
   include:
     - node_js: "lts/*"
       env: PRETEST=true
+    - node_js: "10.3"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "10.2"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "10.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "10.0"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.10"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.9"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "9.8"
+      env: TEST=true ALLOW_FAILURE=true
     - node_js: "9.7"
       env: TEST=true ALLOW_FAILURE=true
     - node_js: "9.6"
@@ -49,6 +64,8 @@ matrix:
       env: TEST=true ALLOW_FAILURE=true
     - node_js: "9.0"
       env: TEST=true ALLOW_FAILURE=true
+    - node_js: "8.10"
+      env: TEST=true ALLOW_FAILURE=true
     - node_js: "8.9"
       env: TEST=true ALLOW_FAILURE=true
     - node_js: "8.8"
@@ -89,6 +106,8 @@ matrix:
       env: TEST=true ALLOW_FAILURE=true
     - node_js: "7.0"
       env: TEST=true ALLOW_FAILURE=true
+    - node_js: "6.13"
+      env: TEST=true ALLOW_FAILURE=true
     - node_js: "6.12"
       env: TEST=true ALLOW_FAILURE=true
     - node_js: "6.11"
@@ -139,6 +158,8 @@ matrix:
       env: TEST=true ALLOW_FAILURE=true
     - node_js: "5.0"
       env: TEST=true ALLOW_FAILURE=true
+    - node_js: "4.8"
+      env: TEST=true ALLOW_FAILURE=true
     - node_js: "4.7"
       env: TEST=true ALLOW_FAILURE=true
     - node_js: "4.6"
@@ -191,8 +212,6 @@ matrix:
       env: TEST=true ALLOW_FAILURE=true
     - node_js: "0.9"
       env: TEST=true ALLOW_FAILURE=true
-    - node_js: "0.6"
-      env: TEST=true ALLOW_FAILURE=true
     - node_js: "0.4"
       env: TEST=true ALLOW_FAILURE=true
   allow_failures:

app/node_modules/resolve/lib/async.js

@@ -33,6 +33,7 @@ module.exports = function resolve(x, options, callback) {
 
     var extensions = opts.extensions || ['.js'];
     var basedir = opts.basedir || path.dirname(caller());
+    var parent = opts.filename || basedir;
 
     opts.paths = opts.paths || [];
 
@@ -47,7 +48,7 @@ module.exports = function resolve(x, options, callback) {
         else if (n) cb(null, n, pkg);
         else if (core[x]) return cb(null, x);
         else {
-            var moduleError = new Error("Cannot find module '" + x + "' from '" + basedir + "'");
+            var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
             moduleError.code = 'MODULE_NOT_FOUND';
             cb(moduleError);
         }
@@ -60,7 +61,7 @@ module.exports = function resolve(x, options, callback) {
             if (err) cb(err);
             else if (d) cb(null, d, pkg);
             else {
-                var moduleError = new Error("Cannot find module '" + x + "' from '" + basedir + "'");
+                var moduleError = new Error("Cannot find module '" + x + "' from '" + parent + "'");
                 moduleError.code = 'MODULE_NOT_FOUND';
                 cb(moduleError);
             }

app/node_modules/resolve/lib/core.js

@@ -2,8 +2,8 @@ var current = (process.versions && process.versions.node && process.versions.nod
 
 function specifierIncluded(specifier) {
     var parts = specifier.split(' ');
-    var op = parts[0];
-    var versionParts = parts[1].split('.');
+    var op = parts.length > 1 ? parts[0] : '=';
+    var versionParts = (parts.length > 1 ? parts[1] : parts[0]).split('.');
 
     for (var i = 0; i < 3; ++i) {
         var cur = Number(current[i] || 0);

app/node_modules/resolve/lib/core.json

@@ -15,6 +15,7 @@
     "events": true,
     "freelist": "< 6",
     "fs": true,
+    "fs/promises": ">= 10 && < 10.1",
     "_http_agent": ">= 0.11.1",
     "_http_client": ">= 0.11.1",
     "_http_common": ">= 0.11.1",
@@ -51,12 +52,14 @@
     "sys": true,
     "timers": true,
     "_tls_common": ">= 0.11.13",
-    "_tls_legacy": ">= 0.11.3",
+    "_tls_legacy": ">= 0.11.3 && < 10",
     "_tls_wrap": ">= 0.11.3",
     "tls": true,
+    "trace_events": ">= 10",
     "tty": true,
     "url": true,
     "util": true,
+    "v8/tools/arguments": ">= 10",
     "v8/tools/codemap": [">= 4.4.0 && < 5", ">= 5.2.0"],
     "v8/tools/consarray": [">= 4.4.0 && < 5", ">= 5.2.0"],
     "v8/tools/csvparser": [">= 4.4.0 && < 5", ">= 5.2.0"],

app/node_modules/resolve/lib/sync.js

@@ -24,6 +24,7 @@ module.exports = function (x, options) {
 
     var extensions = opts.extensions || ['.js'];
     var basedir = opts.basedir || path.dirname(caller());
+    var parent = opts.filename || basedir;
 
     opts.paths = opts.paths || [];
 
@@ -39,7 +40,7 @@ module.exports = function (x, options) {
 
     if (core[x]) return x;
 
-    var err = new Error("Cannot find module '" + x + "' from '" + basedir + "'");
+    var err = new Error("Cannot find module '" + x + "' from '" + parent + "'");
     err.code = 'MODULE_NOT_FOUND';
     throw err;
 

app/node_modules/resolve/package.json

@@ -1,33 +1,27 @@
 {
-  "_args": [
-    [
-      "resolve@1.7.1",
-      "/home/s2/Documents/Code/gitlit/app"
-    ]
-  ],
-  "_development": true,
-  "_from": "resolve@1.7.1",
-  "_id": "resolve@1.7.1",
+  "_from": "resolve@^1.1.6",
+  "_id": "resolve@1.8.1",
   "_inBundle": false,
-  "_integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
+  "_integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
   "_location": "/resolve",
   "_phantomChildren": {},
   "_requested": {
-    "type": "version",
+    "type": "range",
     "registry": true,
-    "raw": "resolve@1.7.1",
+    "raw": "resolve@^1.1.6",
     "name": "resolve",
     "escapedName": "resolve",
-    "rawSpec": "1.7.1",
+    "rawSpec": "^1.1.6",
     "saveSpec": null,
-    "fetchSpec": "1.7.1"
+    "fetchSpec": "^1.1.6"
   },
   "_requiredBy": [
     "/electron-packager"
   ],
-  "_resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
-  "_spec": "1.7.1",
-  "_where": "/home/s2/Documents/Code/gitlit/app",
+  "_resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
+  "_shasum": "82f1ec19a423ac1fbd080b0bab06ba36e84a7a26",
+  "_spec": "resolve@^1.1.6",
+  "_where": "E:\\projects\\p\\gitlit\\app\\node_modules\\electron-packager",
   "author": {
     "name": "James Halliday",
     "email": "mail@substack.net",
@@ -36,9 +30,11 @@
   "bugs": {
     "url": "https://github.com/browserify/resolve/issues"
   },
+  "bundleDependencies": false,
   "dependencies": {
     "path-parse": "^1.0.5"
   },
+  "deprecated": false,
   "description": "resolve like require.resolve() on behalf of files asynchronously and synchronously",
   "devDependencies": {
     "@ljharb/eslint-config": "^12.2.1",
@@ -69,5 +65,5 @@
     "test": "npm run --silent tests-only",
     "tests-only": "tape test/*.js"
   },
-  "version": "1.7.1"
+  "version": "1.8.1"
 }

app/node_modules/resolve/readme.markdown

@@ -11,11 +11,11 @@ synchronously
 
 asynchronously resolve:
 
-``` js
+```js
 var resolve = require('resolve');
 resolve('tap', { basedir: __dirname }, function (err, res) {
-    if (err) console.error(err)
-    else console.log(res)
+    if (err) console.error(err);
+    else console.log(res);
 });
 ```
 
@@ -26,7 +26,7 @@ $ node example/async.js
 
 synchronously resolve:
 
-``` js
+```js
 var resolve = require('resolve');
 var res = resolve.sync('tap', { basedir: __dirname });
 console.log(res);
@@ -39,8 +39,8 @@ $ node example/sync.js
 
 # methods
 
-``` js
-var resolve = require('resolve')
+```js
+var resolve = require('resolve');
 ```
 
 ## resolve(id, opts={}, cb)
@@ -80,11 +80,11 @@ This is the way Node resolves dependencies when executed with the [--preserve-sy
 
 default `opts` values:
 
-``` javascript
+```js
 {
     paths: [],
     basedir: __dirname,
-    extensions: [ '.js' ],
+    extensions: ['.js'],
     readFile: fs.readFile,
     isFile: function isFile(file, cb) {
         fs.stat(file, function (err, stat) {
@@ -136,11 +136,11 @@ This is the way Node resolves dependencies when executed with the [--preserve-sy
 
 default `opts` values:
 
-``` javascript
+```js
 {
     paths: [],
     basedir: __dirname,
-    extensions: [ '.js' ],
+    extensions: ['.js'],
     readFileSync: fs.readFileSync,
     isFile: function isFile(file) {
         try {
@@ -154,7 +154,7 @@ default `opts` values:
     moduleDirectory: 'node_modules',
     preserveSymlinks: true
 }
-````
+```
 
 ## resolve.isCore(pkg)
 
@@ -164,7 +164,7 @@ Return whether a package is in core.
 
 With [npm](https://npmjs.org) do:
 
-```
+```sh
 npm install resolve
 ```
 

app/node_modules/resolve/test/resolver.js

@@ -3,7 +3,7 @@ var test = require('tape');
 var resolve = require('../');
 
 test('async foo', function (t) {
-    t.plan(10);
+    t.plan(12);
     var dir = path.join(__dirname, 'resolver');
 
     resolve('./foo', { basedir: dir }, function (err, res, pkg) {
@@ -30,10 +30,20 @@ test('async foo', function (t) {
         t.equal(pkg.main, 'resolver');
     });
 
+    resolve('./foo', { basedir: dir, filename: path.join(dir, 'baz.js') }, function (err, res) {
+        if (err) t.fail(err);
+        t.equal(res, path.join(dir, 'foo.js'));
+    });
+
     resolve('foo', { basedir: dir }, function (err) {
         t.equal(err.message, "Cannot find module 'foo' from '" + path.resolve(dir) + "'");
         t.equal(err.code, 'MODULE_NOT_FOUND');
     });
+
+    // Test that filename is reported as the "from" value when passed.
+    resolve('foo', { basedir: dir, filename: path.join(dir, 'baz.js') }, function (err) {
+        t.equal(err.message, "Cannot find module 'foo' from '" + path.join(dir, 'baz.js') + "'");
+    });
 });
 
 test('bar', function (t) {
@@ -176,7 +186,7 @@ test('normalize', function (t) {
 });
 
 test('cup', function (t) {
-    t.plan(4);
+    t.plan(5);
     var dir = path.join(__dirname, 'resolver');
 
     resolve('./cup', { basedir: dir, extensions: ['.js', '.coffee'] }, function (err, res) {
@@ -193,6 +203,11 @@ test('cup', function (t) {
         t.equal(err.message, "Cannot find module './cup' from '" + path.resolve(dir) + "'");
         t.equal(err.code, 'MODULE_NOT_FOUND');
     });
+
+    // Test that filename is reported as the "from" value when passed.
+    resolve('./cup', { basedir: dir, extensions: ['.js'], filename: path.join(dir, 'cupboard.js') }, function (err, res) {
+        t.equal(err.message, "Cannot find module './cup' from '" + path.join(dir, 'cupboard.js') + "'");
+    });
 });
 
 test('mug', function (t) {

app/node_modules/resolve/test/resolver_sync.js

@@ -15,10 +15,26 @@ test('foo', function (t) {
         path.join(dir, 'foo.js')
     );
 
+    t.equal(
+        resolve.sync('./foo.js', { basedir: dir, filename: path.join(dir, 'bar.js') }),
+        path.join(dir, 'foo.js')
+    );
+
     t.throws(function () {
         resolve.sync('foo', { basedir: dir });
     });
 
+    // Test that filename is reported as the "from" value when passed.
+    t.throws(
+        function () {
+            resolve.sync('foo', { basedir: dir, filename: path.join(dir, 'bar.js') });
+        },
+        {
+            name: 'Error',
+            message: "Cannot find module 'foo' from '" + path.join(dir, 'bar.js') + "'"
+        }
+    );
+
     t.end();
 });
 

app/node_modules/resolve/test/symlinks.js

@@ -41,7 +41,9 @@ test('sync symlink when preserveSymlinks = true', function (t) {
 
 test('sync symlink', function (t) {
     var start = new Date();
-    t.equal(resolve.sync('foo', { basedir: symlinkDir, preserveSymlinks: false }), path.join(__dirname, 'resolver', 'symlinked', '_', 'node_modules', 'foo.js'));
+    t.doesNotThrow(function () {
+        t.equal(resolve.sync('foo', { basedir: symlinkDir, preserveSymlinks: false }), path.join(__dirname, 'resolver', 'symlinked', '_', 'node_modules', 'foo.js'));
+    });
     t.ok(new Date() - start < 50, 'resolve.sync timedout');
     t.end();
 });