Merge tag 'v1.12.0'

Author: ljharb

.gitignore

@@ -6,3 +6,6 @@ node_modules
 npm-shrinkwrap.json
 package-lock.json
 yarn.lock
+
+# symlinked file used in tests
+test/resolver/symlinked/_/node_modules/package

package.json

@@ -1,7 +1,7 @@
 {
   "name": "resolve",
   "description": "resolve like require.resolve() on behalf of files asynchronously and synchronously",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/browserify/resolve.git"

test/symlinks.js

@@ -8,6 +8,9 @@ var packageDir = path.join(__dirname, 'resolver', 'symlinked', '_', 'node_module
 try {
     fs.unlinkSync(symlinkDir);
 } catch (err) {}
+try {
+    fs.unlinkSync(packageDir);
+} catch (err) {}
 try {
     fs.symlinkSync('./_/symlink_target', symlinkDir, 'dir');
     fs.symlinkSync('../../package', packageDir, 'dir');
@@ -17,6 +20,12 @@ try {
         fs.symlinkSync(path.join(__dirname, 'resolver', 'symlinked', '_', 'symlink_target') + '\\', symlinkDir, 'junction');
     }
 }
+try {
+    fs.symlinkSync('../../package', packageDir, 'dir');
+} catch (err) {
+    // if fails then it is probably on Windows and lets try to create a junction
+    fs.symlinkSync(path.join(__dirname, '..', '..', 'package') + '\\', packageDir, 'junction');
+}
 
 test('symlink', function (t) {
     t.plan(2);