Merge remote-tracking branch 'upstream/master' into skipnodemodules

Author: Maël Nison

.travis.yml

@@ -2,9 +2,10 @@ language: node_js
 os:
  - linux
 node_js:
-  - "10.7"
+  - "11.2"
+  - "10.13"
   - "9.11"
-  - "8.11"
+  - "8.12"
   - "7.10"
   - "6.14"
   - "5.12"
@@ -34,6 +35,22 @@ matrix:
   include:
     - node_js: "lts/*"
       env: PRETEST=true
+    - node_js: "11.1"
+      env: TEST=true ALLOW_FAILURE=true
+    - node_js: "11.0"
+      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"
@@ -70,6 +87,8 @@ matrix:
       env: TEST=true ALLOW_FAILURE=true
     - node_js: "9.0"
       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"
@@ -223,3 +242,4 @@ matrix:
   allow_failures:
     - os: osx
     - env: TEST=true ALLOW_FAILURE=true
+    - node_js: "0.6"

lib/async.js

@@ -3,6 +3,7 @@ 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 defaultIsFile = function isFile(file, cb) {
     fs.stat(file, function (err, stat) {
@@ -26,8 +27,8 @@ var defaultIsDir = function isDirectory(dir, cb) {
 
 module.exports = function resolve(x, options, callback) {
     var cb = callback;
-    var opts = options || {};
-    if (typeof opts === 'function') {
+    var opts = options;
+    if (typeof options === 'function') {
         cb = opts;
         opts = {};
     }
@@ -38,6 +39,8 @@ module.exports = function resolve(x, options, callback) {
         });
     }
 
+    opts = normalizeOptions(x, opts);
+
     var isFile = opts.isFile || defaultIsFile;
     var isDirectory = opts.isDirectory || defaultIsDir;
     var readFile = opts.readFile || fs.readFile;

lib/normalize-options.js

@@ -0,0 +1,10 @@
+module.exports = function (x, opts) {
+    /**
+     * This file is purposefully a passthrough. It's expected that third-party
+     * environments will override it at runtime in order to inject special logic
+     * into `resolve` (by manipulating the options). One such example is the PnP
+     * code path in Yarn.
+     */
+
+    return opts || {};
+};

lib/sync.js

@@ -3,6 +3,7 @@ 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 defaultIsFile = function isFile(file) {
     try {
@@ -28,7 +29,8 @@ module.exports = function (x, options) {
     if (typeof x !== 'string') {
         throw new TypeError('Path must be a string.');
     }
-    var opts = options || {};
+    var opts = normalizeOptions(x, options);
+
     var isFile = opts.isFile || defaultIsFile;
     var isDirectory = opts.isDirectory || defaultIsDir;
     var readFileSync = opts.readFileSync || fs.readFileSync;

package.json

@@ -22,9 +22,9 @@
   },
   "devDependencies": {
     "@ljharb/eslint-config": "^13.0.0",
-    "eslint": "^5.2.0",
+    "eslint": "^5.9.0",
     "object-keys": "^1.0.12",
-    "safe-publish-latest": "^1.1.1",
+    "safe-publish-latest": "^1.1.2",
     "tap": "0.4.13",
     "tape": "^4.9.1"
   },
@@ -35,6 +35,6 @@
     "url": "http://substack.net"
   },
   "dependencies": {
-    "path-parse": "^1.0.5"
+    "path-parse": "^1.0.6"
   }
 }