Fixed #1 - Fixed the whatsnew-** script for loading release notes into builds

Added test to ensure that release notes are parsed properly
Updated to latest dependencies to fix security vulnerability
Updated GH Actions Workflow to run test before updating tag
Updated README.md to reflect proper whatsnew documentation.

node_modules/resolve/.editorconfig

@@ -1,20 +0,0 @@
-root = true
-
-[*]
-indent_style = tab
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-max_line_length = 150
-
-[CHANGELOG.md]
-indent_style = space
-indent_size = 2
-
-[*.json]
-max_line_length = off
-
-[Makefile]
-max_line_length = off

node_modules/resolve/.travis.yml

@@ -1,308 +1,8 @@
+version: ~> 1.0
 language: node_js
 os:
  - linux
-node_js:
-  - "12.7"
-  - "11.15"
-  - "10.16"
-  - "9.11"
-  - "8.16"
-  - "7.10"
-  - "6.17"
-  - "5.12"
-  - "4.9"
-  - "iojs-v3.3"
-  - "iojs-v2.5"
-  - "iojs-v1.8"
-  - "0.12"
-  - "0.10"
-  - "0.8"
-  - "0.6"
-before_install:
-  - 'case "${TRAVIS_NODE_VERSION}" in 0.*) export NPM_CONFIG_STRICT_SSL=false ;; esac'
-  - 'nvm install-latest-npm'
-install:
-  - 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ] || [ "${TRAVIS_NODE_VERSION}" = "0.9" ]; then nvm install --latest-npm 0.8 && npm install && nvm use "${TRAVIS_NODE_VERSION}"; else npm install; fi;'
-script:
-  - 'if [ -n "${PRETEST-}" ]; then npm run pretest ; fi'
-  - 'if [ -n "${POSTTEST-}" ]; then npm run posttest ; fi'
-  - 'if [ -n "${COVERAGE-}" ]; then npm run coverage ; fi'
-  - 'if [ -n "${TEST-}" ]; then npm run tests-only ; fi'
-sudo: false
-env:
-  - TEST=true
-matrix:
-  fast_finish: true
-  include:
-    - node_js: "lts/*"
-      env: PRETEST=true
-    - node_js: "lts/*"
-      env: POSTTEST=true
-    - node_js: "12.6"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "12.5"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "12.4"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "12.3"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "12.2"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "12.1"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "12.0"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.14"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.13"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.12"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.11"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.10"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.9"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.8"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.7"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.6"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.5"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.4"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.3"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.2"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.1"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "11.0"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.15"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.14"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.13"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.12"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.11"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.10"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.9"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.8"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.7"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.6"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.5"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "10.4"
-      env: TEST=true ALLOW_FAILURE=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"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "9.5"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "9.4"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "9.3"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "9.2"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "9.1"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "9.0"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.15"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.14"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.13"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.12"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.11"
-      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"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.7"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.6"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.5"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.4"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.3"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.2"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.1"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "8.0"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "7.9"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "7.8"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "7.7"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "7.6"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "7.5"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "7.4"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "7.3"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "7.2"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "7.1"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "7.0"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.16"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.15"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.14"
-      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"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.10"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.9"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.8"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.7"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.6"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.5"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.4"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.3"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.2"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.1"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "6.0"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "5.11"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "5.10"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "5.9"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "5.8"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "5.7"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "5.6"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "5.5"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "5.4"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "5.3"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "5.2"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "5.1"
-      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"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "4.5"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "4.4"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "4.3"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "4.2"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "4.1"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "4.0"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v3.2"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v3.1"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v3.0"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v2.4"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v2.3"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v2.2"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v2.1"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v2.0"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v1.7"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v1.6"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v1.5"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v1.4"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v1.3"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v1.2"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v1.1"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "iojs-v1.0"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "0.11"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "0.9"
-      env: TEST=true ALLOW_FAILURE=true
-    - node_js: "0.4"
-      env: TEST=true ALLOW_FAILURE=true
-  allow_failures:
-    - os: osx
-    - env: TEST=true ALLOW_FAILURE=true
-    - node_js: "0.6"
+import:
+ - ljharb/travis-ci:node/all.yml
+ - ljharb/travis-ci:node/pretest.yml
+ - ljharb/travis-ci:node/posttest.yml

node_modules/resolve/index.js

@@ -1,8 +1,6 @@
-var core = require('./lib/core');
 var async = require('./lib/async');
-async.core = core;
-async.isCore = function isCore(x) { return core[x]; };
+async.core = require('./lib/core');
+async.isCore = require('./lib/is-core');
 async.sync = require('./lib/sync');
 
-exports = async;
 module.exports = async;

node_modules/resolve/lib/async.js

@@ -1,9 +1,9 @@
-var core = require('./core');
 var fs = require('fs');
 var path = require('path');
 var caller = require('./caller.js');
 var nodeModulesPaths = require('./node-modules-paths.js');
 var normalizeOptions = require('./normalize-options.js');
+var isCore = require('./is-core');
 
 var defaultIsFile = function isFile(file, cb) {
     fs.stat(file, function (err, stat) {
@@ -36,6 +36,14 @@ var maybeUnwrapSymlink = function maybeUnwrapSymlink(x, opts, cb) {
     }
 };
 
+var getPackageCandidates = function getPackageCandidates(x, start, opts) {
+    var dirs = nodeModulesPaths(start, opts, x);
+    for (var i = 0; i < dirs.length; i++) {
+        dirs[i] = path.join(dirs[i], x);
+    }
+    return dirs;
+};
+
 module.exports = function resolve(x, options, callback) {
     var cb = callback;
     var opts = options;
@@ -55,6 +63,7 @@ module.exports = function resolve(x, options, callback) {
     var isFile = opts.isFile || defaultIsFile;
     var isDirectory = opts.isDirectory || defaultIsDir;
     var readFile = opts.readFile || fs.readFile;
+    var packageIterator = opts.packageIterator;
 
     var extensions = opts.extensions || ['.js'];
     var basedir = opts.basedir || path.dirname(caller());
@@ -82,9 +91,10 @@ module.exports = function resolve(x, options, callback) {
             if ((/\/$/).test(x) && res === basedir) {
                 loadAsDirectory(res, opts.package, onfile);
             } else loadAsFile(res, opts.package, onfile);
+        } else if (isCore(x)) {
+            return cb(null, x);
         } else loadNodeModules(x, basedir, function (err, n, pkg) {
             if (err) cb(err);
-            else if (core[x]) return cb(null, x);
             else if (n) {
                 return maybeUnwrapSymlink(n, opts, function (err, realN) {
                     if (err) {
@@ -171,19 +181,22 @@ module.exports = function resolve(x, options, callback) {
         }
         if ((/[/\\]node_modules[/\\]*$/).test(dir)) return cb(null);
 
-        var pkgfile = path.join(dir, 'package.json');
-        isFile(pkgfile, function (err, ex) {
-            // on err, ex is false
-            if (!ex) return loadpkg(path.dirname(dir), cb);
+        maybeUnwrapSymlink(dir, opts, function (unwrapErr, pkgdir) {
+            if (unwrapErr) return loadpkg(path.dirname(dir), cb);
+            var pkgfile = path.join(pkgdir, 'package.json');
+            isFile(pkgfile, function (err, ex) {
+                // on err, ex is false
+                if (!ex) return loadpkg(path.dirname(dir), cb);
 
-            readFile(pkgfile, function (err, body) {
-                if (err) cb(err);
-                try { var pkg = JSON.parse(body); } catch (jsonErr) {}
+                readFile(pkgfile, function (err, body) {
+                    if (err) cb(err);
+                    try { var pkg = JSON.parse(body); } catch (jsonErr) {}
 
-                if (pkg && opts.packageFilter) {
-                    pkg = opts.packageFilter(pkg, pkgfile);
-                }
-                cb(null, pkg, dir);
+                    if (pkg && opts.packageFilter) {
+                        pkg = opts.packageFilter(pkg, pkgfile);
+                    }
+                    cb(null, pkg, dir);
+                });
             });
         });
     }
@@ -196,46 +209,49 @@ module.exports = function resolve(x, options, callback) {
             fpkg = opts.package;
         }
 
-        var pkgfile = path.join(x, 'package.json');
-        isFile(pkgfile, function (err, ex) {
-            if (err) return cb(err);
-            if (!ex) return loadAsFile(path.join(x, 'index'), fpkg, cb);
-
-            readFile(pkgfile, function (err, body) {
+        maybeUnwrapSymlink(x, opts, function (unwrapErr, pkgdir) {
+            if (unwrapErr) return cb(unwrapErr);
+            var pkgfile = path.join(pkgdir, 'package.json');
+            isFile(pkgfile, function (err, ex) {
                 if (err) return cb(err);
-                try {
-                    var pkg = JSON.parse(body);
-                } catch (jsonErr) {}
+                if (!ex) return loadAsFile(path.join(x, 'index'), fpkg, cb);
 
-                if (opts.packageFilter) {
-                    pkg = opts.packageFilter(pkg, pkgfile);
-                }
+                readFile(pkgfile, function (err, body) {
+                    if (err) return cb(err);
+                    try {
+                        var pkg = JSON.parse(body);
+                    } catch (jsonErr) {}
 
-                if (pkg.main) {
-                    if (typeof pkg.main !== 'string') {
-                        var mainError = new TypeError('package “' + pkg.name + '” `main` must be a string');
-                        mainError.code = 'INVALID_PACKAGE_MAIN';
-                        return cb(mainError);
+                    if (pkg && opts.packageFilter) {
+                        pkg = opts.packageFilter(pkg, pkgfile);
                     }
-                    if (pkg.main === '.' || pkg.main === './') {
-                        pkg.main = 'index';
-                    }
-                    loadAsFile(path.resolve(x, pkg.main), pkg, function (err, m, pkg) {
-                        if (err) return cb(err);
-                        if (m) return cb(null, m, pkg);
-                        if (!pkg) return loadAsFile(path.join(x, 'index'), pkg, cb);
 
-                        var dir = path.resolve(x, pkg.main);
-                        loadAsDirectory(dir, pkg, function (err, n, pkg) {
+                    if (pkg && pkg.main) {
+                        if (typeof pkg.main !== 'string') {
+                            var mainError = new TypeError('package “' + pkg.name + '” `main` must be a string');
+                            mainError.code = 'INVALID_PACKAGE_MAIN';
+                            return cb(mainError);
+                        }
+                        if (pkg.main === '.' || pkg.main === './') {
+                            pkg.main = 'index';
+                        }
+                        loadAsFile(path.resolve(x, pkg.main), pkg, function (err, m, pkg) {
                             if (err) return cb(err);
-                            if (n) return cb(null, n, pkg);
-                            loadAsFile(path.join(x, 'index'), pkg, cb);
-                        });
-                    });
-                    return;
-                }
+                            if (m) return cb(null, m, pkg);
+                            if (!pkg) return loadAsFile(path.join(x, 'index'), pkg, cb);
 
-                loadAsFile(path.join(x, '/index'), pkg, cb);
+                            var dir = path.resolve(x, pkg.main);
+                            loadAsDirectory(dir, pkg, function (err, n, pkg) {
+                                if (err) return cb(err);
+                                if (n) return cb(null, n, pkg);
+                                loadAsFile(path.join(x, 'index'), pkg, cb);
+                            });
+                        });
+                        return;
+                    }
+
+                    loadAsFile(path.join(x, '/index'), pkg, cb);
+                });
             });
         });
     }
@@ -244,19 +260,18 @@ module.exports = function resolve(x, options, callback) {
         if (dirs.length === 0) return cb(null, undefined);
         var dir = dirs[0];
 
-        isDirectory(dir, isdir);
+        isDirectory(path.dirname(dir), isdir);
 
         function isdir(err, isdir) {
             if (err) return cb(err);
             if (!isdir) return processDirs(cb, dirs.slice(1));
-            var file = path.join(dir, x);
-            loadAsFile(file, opts.package, onfile);
+            loadAsFile(dir, opts.package, onfile);
         }
 
         function onfile(err, m, pkg) {
             if (err) return cb(err);
             if (m) return cb(null, m, pkg);
-            loadAsDirectory(path.join(dir, x), opts.package, ondir);
+            loadAsDirectory(dir, opts.package, ondir);
         }
 
         function ondir(err, n, pkg) {
@@ -266,6 +281,10 @@ module.exports = function resolve(x, options, callback) {
         }
     }
     function loadNodeModules(x, start, cb) {
-        processDirs(cb, nodeModulesPaths(start, opts, x));
+        var thunk = function () { return getPackageCandidates(x, start, opts); };
+        processDirs(
+            cb,
+            packageIterator ? packageIterator(x, start, thunk, opts) : thunk()
+        );
     }
 };

node_modules/resolve/lib/core.json

@@ -69,6 +69,7 @@
     "v8/tools/splaytree": [">= 4.4.0 && < 5", ">= 5.2.0 && < 12"],
     "v8": ">= 1",
     "vm": true,
+    "wasi": ">= 13.4 && < 13.5",
     "worker_threads": ">= 11.7",
     "zlib": true
 }

node_modules/resolve/lib/is-core.js

@@ -0,0 +1,5 @@
+var core = require('./core');
+
+module.exports = function isCore(x) {
+    return Object.prototype.hasOwnProperty.call(core, x);
+};

node_modules/resolve/lib/sync.js

@@ -1,4 +1,4 @@
-var core = require('./core');
+var isCore = require('./is-core');
 var fs = require('fs');
 var path = require('path');
 var caller = require('./caller.js');
@@ -38,7 +38,15 @@ var maybeUnwrapSymlink = function maybeUnwrapSymlink(x, opts) {
     return x;
 };
 
-module.exports = function (x, options) {
+var getPackageCandidates = function getPackageCandidates(x, start, opts) {
+    var dirs = nodeModulesPaths(start, opts, x);
+    for (var i = 0; i < dirs.length; i++) {
+        dirs[i] = path.join(dirs[i], x);
+    }
+    return dirs;
+};
+
+module.exports = function resolveSync(x, options) {
     if (typeof x !== 'string') {
         throw new TypeError('Path must be a string.');
     }
@@ -47,6 +55,7 @@ module.exports = function (x, options) {
     var isFile = opts.isFile || defaultIsFile;
     var readFileSync = opts.readFileSync || fs.readFileSync;
     var isDirectory = opts.isDirectory || defaultIsDir;
+    var packageIterator = opts.packageIterator;
 
     var extensions = opts.extensions || ['.js'];
     var basedir = opts.basedir || path.dirname(caller());
@@ -62,15 +71,13 @@ module.exports = function (x, options) {
         if (x === '..' || x.slice(-1) === '/') res += '/';
         var m = loadAsFileSync(res) || loadAsDirectorySync(res);
         if (m) return maybeUnwrapSymlink(m, opts);
-    } else if (core[x]) {
+    } else if (isCore(x)) {
         return x;
     } else {
         var n = loadNodeModulesSync(x, absoluteStart);
         if (n) return maybeUnwrapSymlink(n, opts);
     }
 
-    if (core[x]) return x;
-
     var err = new Error("Cannot find module '" + x + "' from '" + parent + "'");
     err.code = 'MODULE_NOT_FOUND';
     throw err;
@@ -105,7 +112,7 @@ module.exports = function (x, options) {
         }
         if ((/[/\\]node_modules[/\\]*$/).test(dir)) return;
 
-        var pkgfile = path.join(dir, 'package.json');
+        var pkgfile = path.join(maybeUnwrapSymlink(dir, opts), 'package.json');
 
         if (!isFile(pkgfile)) {
             return loadpkg(path.dirname(dir));
@@ -118,25 +125,27 @@ module.exports = function (x, options) {
         } catch (jsonErr) {}
 
         if (pkg && opts.packageFilter) {
-            pkg = opts.packageFilter(pkg, dir);
+            // v2 will pass pkgfile
+            pkg = opts.packageFilter(pkg, /*pkgfile,*/ dir); // eslint-disable-line spaced-comment
         }
 
         return { pkg: pkg, dir: dir };
     }
 
     function loadAsDirectorySync(x) {
-        var pkgfile = path.join(x, '/package.json');
+        var pkgfile = path.join(maybeUnwrapSymlink(x, opts), '/package.json');
         if (isFile(pkgfile)) {
             try {
                 var body = readFileSync(pkgfile, 'UTF8');
                 var pkg = JSON.parse(body);
             } catch (e) {}
 
-            if (opts.packageFilter) {
-                pkg = opts.packageFilter(pkg, x);
+            if (pkg && opts.packageFilter) {
+                // v2 will pass pkgfile
+                pkg = opts.packageFilter(pkg, /*pkgfile,*/ x); // eslint-disable-line spaced-comment
             }
 
-            if (pkg.main) {
+            if (pkg && pkg.main) {
                 if (typeof pkg.main !== 'string') {
                     var mainError = new TypeError('package “' + pkg.name + '” `main` must be a string');
                     mainError.code = 'INVALID_PACKAGE_MAIN';
@@ -158,13 +167,15 @@ module.exports = function (x, options) {
     }
 
     function loadNodeModulesSync(x, start) {
-        var dirs = nodeModulesPaths(start, opts, x);
+        var thunk = function () { return getPackageCandidates(x, start, opts); };
+        var dirs = packageIterator ? packageIterator(x, start, thunk, opts) : thunk();
+
         for (var i = 0; i < dirs.length; i++) {
             var dir = dirs[i];
-            if (isDirectory(dir)) {
-                var m = loadAsFileSync(path.join(dir, '/', x));
+            if (isDirectory(path.dirname(dir))) {
+                var m = loadAsFileSync(dir);
                 if (m) return m;
-                var n = loadAsDirectorySync(path.join(dir, '/', x));
+                var n = loadAsDirectorySync(dir);
                 if (n) return n;
             }
         }

node_modules/resolve/package.json

@@ -1,35 +1,29 @@
 {
-  "_args": [
-    [
-      "resolve@1.12.0",
-      "/Users/drew.heavner/Documents/Github/upload-google-play"
-    ]
-  ],
-  "_development": true,
-  "_from": "resolve@1.12.0",
-  "_id": "resolve@1.12.0",
+  "_from": "resolve@^1.3.2",
+  "_id": "resolve@1.15.0",
   "_inBundle": false,
-  "_integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+  "_integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
   "_location": "/resolve",
   "_phantomChildren": {},
   "_requested": {
-    "type": "version",
+    "type": "range",
     "registry": true,
-    "raw": "resolve@1.12.0",
+    "raw": "resolve@^1.3.2",
     "name": "resolve",
     "escapedName": "resolve",
-    "rawSpec": "1.12.0",
+    "rawSpec": "^1.3.2",
     "saveSpec": null,
-    "fetchSpec": "1.12.0"
+    "fetchSpec": "^1.3.2"
   },
   "_requiredBy": [
     "/@babel/core",
     "/normalize-package-data",
     "/ts-jest"
   ],
-  "_resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-  "_spec": "1.12.0",
-  "_where": "/Users/drew.heavner/Documents/Github/upload-google-play",
+  "_resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
+  "_shasum": "1b7ca96073ebb52e741ffd799f6b39ea462c67f5",
+  "_spec": "resolve@^1.3.2",
+  "_where": "/Users/drew.heavner/Documents/Github/upload-google-play/node_modules/@babel/core",
   "author": {
     "name": "James Halliday",
     "email": "mail@substack.net",
@@ -38,17 +32,23 @@
   "bugs": {
     "url": "https://github.com/browserify/resolve/issues"
   },
+  "bundleDependencies": false,
   "dependencies": {
     "path-parse": "^1.0.6"
   },
+  "deprecated": false,
   "description": "resolve like require.resolve() on behalf of files asynchronously and synchronously",
   "devDependencies": {
-    "@ljharb/eslint-config": "^13.1.1",
-    "eslint": "^5.16.0",
+    "@ljharb/eslint-config": "^15.1.0",
+    "array.prototype.map": "^1.0.2",
+    "eslint": "^6.8.0",
     "object-keys": "^1.1.1",
-    "safe-publish-latest": "^1.1.2",
+    "safe-publish-latest": "^1.1.4",
     "tap": "0.4.13",
-    "tape": "^4.11.0"
+    "tape": "^5.0.0-next.4"
+  },
+  "funding": {
+    "url": "https://github.com/sponsors/ljharb"
   },
   "homepage": "https://github.com/browserify/resolve#readme",
   "keywords": [
@@ -74,5 +74,5 @@
     "test:multirepo": "cd ./test/resolver/multirepo && npm install && npm test",
     "tests-only": "tape test/*.js"
   },
-  "version": "1.12.0"
+  "version": "1.15.0"
 }

node_modules/resolve/readme.markdown

@@ -5,7 +5,7 @@ algorithm](https://nodejs.org/api/modules.html#modules_all_together)
 such that you can `require.resolve()` on behalf of a file asynchronously and
 synchronously
 
-[![build status](https://secure.travis-ci.org/browserify/node-resolve.png)](http://travis-ci.org/browserify/node-resolve)
+[![build status](https://secure.travis-ci.org/browserify/resolve.png)](http://travis-ci.org/browserify/resolve)
 
 # example
 
@@ -61,9 +61,10 @@ options are:
 
 * opts.isDirectory - function to asynchronously test whether a directory exists
 
-* `opts.packageFilter(pkg, pkgfile)` - transform the parsed package.json contents before looking at the "main" field
+* `opts.packageFilter(pkg, pkgfile, dir)` - transform the parsed package.json contents before looking at the "main" field
   * pkg - package data
   * pkgfile - path to package.json
+  * dir - directory for package.json
 
 * `opts.pathFilter(pkg, path, relativePath)` - transform a path within a package
   * pkg - package data
@@ -79,6 +80,12 @@ options are:
     * getNodeModulesDirs - a thunk (no-argument function) that returns the paths using standard `node_modules` resolution
     * opts - the resolution options
 
+* `opts.packageIterator(request, start, opts)` - return the list of candidate paths where the packages sources may be found (probably don't use this)
+    * request - the import specifier being resolved
+    * start - lookup path
+    * getPackageCandidates - a thunk (no-argument function) that returns the paths using standard `node_modules` resolution
+    * opts - the resolution options
+
 * opts.moduleDirectory - directory (or directories) in which to recursively look for modules. default: `"node_modules"`
 
 * opts.preserveSymlinks - if true, doesn't resolve `basedir` to real path before resolving.
@@ -146,6 +153,18 @@ options are:
 
 * opts.paths - require.paths array to use if nothing is found on the normal `node_modules` recursive walk (probably don't use this)
 
+  For advanced users, `paths` can also be a `opts.paths(request, start, opts)` function
+    * request - the import specifier being resolved
+    * start - lookup path
+    * getNodeModulesDirs - a thunk (no-argument function) that returns the paths using standard `node_modules` resolution
+    * opts - the resolution options
+
+* `opts.packageIterator(request, start, opts)` - return the list of candidate paths where the packages sources may be found (probably don't use this)
+    * request - the import specifier being resolved
+    * start - lookup path
+    * getPackageCandidates - a thunk (no-argument function) that returns the paths using standard `node_modules` resolution
+    * opts - the resolution options
+
 * opts.moduleDirectory - directory (or directories) in which to recursively look for modules. default: `"node_modules"`
 
 * opts.preserveSymlinks - if true, doesn't resolve `basedir` to real path before resolving.

node_modules/resolve/test/core.js

@@ -10,6 +10,9 @@ test('core modules', function (t) {
 
         st.ok(!resolve.isCore('seq'));
         st.ok(!resolve.isCore('../'));
+
+        st.ok(!resolve.isCore('toString'));
+
         st.end();
     });
 

node_modules/resolve/test/filter.js

@@ -9,7 +9,7 @@ test('filter', function (t) {
     resolve('./baz', {
         basedir: dir,
         packageFilter: function (pkg, pkgfile) {
-            pkg.main = 'doom';
+            pkg.main = 'doom'; // eslint-disable-line no-param-reassign
             packageFilterArgs = [pkg, pkgfile];
             return pkg;
         }

node_modules/resolve/test/filter_sync.js

@@ -7,9 +7,10 @@ test('filter', function (t) {
     var packageFilterArgs;
     var res = resolve.sync('./baz', {
         basedir: dir,
-        packageFilter: function (pkg, dir) {
-            pkg.main = 'doom';
-            packageFilterArgs = [pkg, dir];
+        // NOTE: in v2.x, this will be `pkg, pkgfile, dir`, but must remain "broken" here in v1.x for compatibility
+        packageFilter: function (pkg, /*pkgfile,*/ dir) { // eslint-disable-line spaced-comment
+            pkg.main = 'doom'; // eslint-disable-line no-param-reassign
+            packageFilterArgs = 'is 1.x' ? [pkg, dir] : [pkg, pkgfile, dir]; // eslint-disable-line no-constant-condition, no-undef
             return pkg;
         }
     });
@@ -19,8 +20,14 @@ test('filter', function (t) {
     var packageData = packageFilterArgs[0];
     t.equal(packageData.main, 'doom', 'package "main" was altered');
 
-    var packageFile = packageFilterArgs[1];
-    t.equal(packageFile, path.join(dir, 'baz'), 'second packageFilter argument is "dir"');
+    if (!'is 1.x') { // eslint-disable-line no-constant-condition
+        var packageFile = packageFilterArgs[1];
+        t.equal(packageFile, path.join(dir, 'baz', 'package.json'), 'package.json path is correct');
+    }
+
+    var packageDir = packageFilterArgs['is 1.x' ? 1 : 2]; // eslint-disable-line no-constant-condition
+    // eslint-disable-next-line no-constant-condition
+    t.equal(packageDir, path.join(dir, 'baz'), ('is 1.x' ? 'second' : 'third') + ' packageFilter argument is "dir"');
 
     t.end();
 });

node_modules/resolve/test/resolver.js

@@ -256,6 +256,22 @@ test('other path', function (t) {
     });
 });
 
+test('path iterator', function (t) {
+    t.plan(2);
+
+    var resolverDir = path.join(__dirname, 'resolver');
+
+    var exactIterator = function (x, start, getPackageCandidates, opts) {
+        return [path.join(resolverDir, x)];
+    };
+
+    resolve('baz', { packageIterator: exactIterator }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, path.join(resolverDir, 'baz/quux.js'));
+        t.equal(pkg && pkg.name, 'baz');
+    });
+});
+
 test('incorrect main', function (t) {
     t.plan(1);
 
@@ -402,8 +418,8 @@ test('browser field in package.json', function (t) {
             basedir: dir,
             packageFilter: function packageFilter(pkg) {
                 if (pkg.browser) {
-                    pkg.main = pkg.browser;
-                    delete pkg.browser;
+                    pkg.main = pkg.browser; // eslint-disable-line no-param-reassign
+                    delete pkg.browser; // eslint-disable-line no-param-reassign
                 }
                 return pkg;
             }

node_modules/resolve/test/resolver/baz/package.json

@@ -1,3 +1,4 @@
 {
+    "name": "baz",
     "main": "quux.js"
 }

node_modules/resolve/test/resolver_sync.js

@@ -172,6 +172,21 @@ test('other path', function (t) {
     t.end();
 });
 
+test('path iterator', function (t) {
+    var resolverDir = path.join(__dirname, 'resolver');
+
+    var exactIterator = function (x, start, getPackageCandidates, opts) {
+        return [path.join(resolverDir, x)];
+    };
+
+    t.equal(
+        resolve.sync('baz', { packageIterator: exactIterator }),
+        path.join(resolverDir, 'baz/quux.js')
+    );
+
+    t.end();
+});
+
 test('incorrect main', function (t) {
     var resolverDir = path.join(__dirname, 'resolver');
     var dir = path.join(resolverDir, 'incorrect_main');
@@ -318,8 +333,8 @@ test('browser field in package.json', function (t) {
         basedir: dir,
         packageFilter: function packageFilter(pkg) {
             if (pkg.browser) {
-                pkg.main = pkg.browser;
-                delete pkg.browser;
+                pkg.main = pkg.browser; // eslint-disable-line no-param-reassign
+                delete pkg.browser; // eslint-disable-line no-param-reassign
             }
             return pkg;
         }

node_modules/resolve/test/symlinks.js

@@ -1,16 +1,26 @@
 var path = require('path');
 var fs = require('fs');
 var test = require('tape');
+var map = require('array.prototype.map');
 var resolve = require('../');
 
 var symlinkDir = path.join(__dirname, 'resolver', 'symlinked', 'symlink');
 var packageDir = path.join(__dirname, 'resolver', 'symlinked', '_', 'node_modules', 'package');
+var modADir = path.join(__dirname, 'symlinks', 'source', 'node_modules', 'mod-a');
+var symlinkModADir = path.join(__dirname, 'symlinks', 'dest', 'node_modules', 'mod-a');
 try {
     fs.unlinkSync(symlinkDir);
 } catch (err) {}
 try {
     fs.unlinkSync(packageDir);
 } catch (err) {}
+try {
+    fs.unlinkSync(modADir);
+} catch (err) {}
+try {
+    fs.unlinkSync(symlinkModADir);
+} catch (err) {}
+
 try {
     fs.symlinkSync('./_/symlink_target', symlinkDir, 'dir');
 } catch (err) {
@@ -23,6 +33,12 @@ try {
     // if fails then it is probably on Windows and lets try to create a junction
     fs.symlinkSync(path.join(__dirname, '..', '..', 'package') + '\\', packageDir, 'junction');
 }
+try {
+    fs.symlinkSync('../../source/node_modules/mod-a', symlinkModADir, 'dir');
+} catch (err) {
+    // if fails then it is probably on Windows and lets try to create a junction
+    fs.symlinkSync(path.join(__dirname, '..', '..', 'source', 'node_modules', 'mod-a') + '\\', symlinkModADir, 'junction');
+}
 
 test('symlink', function (t) {
     t.plan(2);
@@ -79,6 +95,79 @@ test('async symlink from node_modules to other dir when preserveSymlinks = false
     resolve('package', { basedir: basedir, preserveSymlinks: false }, function (err, result) {
         t.notOk(err, 'no error');
         t.equal(result, path.resolve(__dirname, 'resolver/symlinked/package/bar.js'));
-        t.end();
     });
 });
+
+test('packageFilter', function (t) {
+    function relative(x) {
+        return path.relative(__dirname, x);
+    }
+
+    function testPackageFilter(preserveSymlinks) {
+        return function (st) {
+            st.plan('is 1.x' ? 3 : 5); // eslint-disable-line no-constant-condition
+
+            var destMain = 'symlinks/dest/node_modules/mod-a/index.js';
+            var destPkg = 'symlinks/dest/node_modules/mod-a/package.json';
+            var sourceMain = 'symlinks/source/node_modules/mod-a/index.js';
+            var sourcePkg = 'symlinks/source/node_modules/mod-a/package.json';
+            var destDir = path.join(__dirname, 'symlinks', 'dest');
+
+            /* eslint multiline-comment-style: 0 */
+            /* v2.x will restore these tests
+            var packageFilterPath = [];
+            var actualPath = resolve.sync('mod-a', {
+                basedir: destDir,
+                preserveSymlinks: preserveSymlinks,
+                packageFilter: function (pkg, pkgfile, dir) {
+                    packageFilterPath.push(pkgfile);
+                }
+            });
+            st.equal(
+                relative(actualPath),
+                path.normalize(preserveSymlinks ? destMain : sourceMain),
+                'sync: actual path is correct'
+            );
+            st.deepEqual(
+                map(packageFilterPath, relative),
+                map(preserveSymlinks ? [destPkg, destPkg] : [sourcePkg, sourcePkg], path.normalize),
+                'sync: packageFilter pkgfile arg is correct'
+            );
+            */
+
+            var asyncPackageFilterPath = [];
+            resolve(
+                'mod-a',
+                {
+                    basedir: destDir,
+                    preserveSymlinks: preserveSymlinks,
+                    packageFilter: function (pkg, pkgfile) {
+                        asyncPackageFilterPath.push(pkgfile);
+                    }
+                },
+                function (err, actualPath) {
+                    st.error(err, 'no error');
+                    st.equal(
+                        relative(actualPath),
+                        path.normalize(preserveSymlinks ? destMain : sourceMain),
+                        'async: actual path is correct'
+                    );
+                    st.deepEqual(
+                        map(asyncPackageFilterPath, relative),
+                        map(
+                            preserveSymlinks ? [destPkg, destPkg, destPkg] : [sourcePkg, sourcePkg, sourcePkg],
+                            path.normalize
+                        ),
+                        'async: packageFilter pkgfile arg is correct'
+                    );
+                }
+            );
+        };
+    }
+
+    t.test('preserveSymlinks: false', testPackageFilter(false));
+
+    t.test('preserveSymlinks: true', testPackageFilter(true));
+
+    t.end();
+});