From 1237a979be8798a586a0cab04c39367467b62222 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Sat, 6 Apr 2019 01:32:44 +0200
Subject: [PATCH] Update internal Node.js function call

This updates the call to _resolveLookupPaths. It returns a string
by default since Node.js v8 when called with a third truthy argument.
The backwards compatible return value should change soon, so detect
what return type is used and handle both cases.

Refs: nodejs/node#26983
---
 build/get-nodejs/get-nodejs-debug.js | 4 +++-
 build/get-nodejs/get-nodejs.js       | 4 +++-
 build/yui-nodejs/yui-nodejs-debug.js | 4 +++-
 build/yui-nodejs/yui-nodejs.js       | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/build/get-nodejs/get-nodejs-debug.js b/build/get-nodejs/get-nodejs-debug.js
index 6e476881710..f6d1ef3a4d4 100644
--- a/build/get-nodejs/get-nodejs-debug.js
+++ b/build/get-nodejs/get-nodejs-debug.js
@@ -106,7 +106,9 @@ YUI.add('get', function (Y, NAME) {
         } else {
             try {
                 // Try to resolve paths relative to the module that required yui.
-                url = Module._findPath(url, Module._resolveLookupPaths(url, module.parent.parent)[1]);
+                var path = Module._resolveLookupPaths(url, module.parent.parent, true);
+
+                url = Module._findPath(url, (typeof path === 'string' || path === null) ? path : path[1]);
 
                 if (Y.config.useSync) {
                     //Needs to be in useSync
diff --git a/build/get-nodejs/get-nodejs.js b/build/get-nodejs/get-nodejs.js
index 8e07eed9c34..34e6a5b6f82 100644
--- a/build/get-nodejs/get-nodejs.js
+++ b/build/get-nodejs/get-nodejs.js
@@ -102,7 +102,9 @@ YUI.add('get', function (Y, NAME) {
         } else {
             try {
                 // Try to resolve paths relative to the module that required yui.
-                url = Module._findPath(url, Module._resolveLookupPaths(url, module.parent.parent)[1]);
+                var path = Module._resolveLookupPaths(url, module.parent.parent, true);
+
+                url = Module._findPath(url, (typeof path === 'string' || path === null) ? path : path[1]);
 
                 if (Y.config.useSync) {
                     //Needs to be in useSync
diff --git a/build/yui-nodejs/yui-nodejs-debug.js b/build/yui-nodejs/yui-nodejs-debug.js
index c2aaced1232..5ca56279c80 100644
--- a/build/yui-nodejs/yui-nodejs-debug.js
+++ b/build/yui-nodejs/yui-nodejs-debug.js
@@ -4383,7 +4383,9 @@ YUI.add('get', function (Y, NAME) {
         } else {
             try {
                 // Try to resolve paths relative to the module that required yui.
-                url = Module._findPath(url, Module._resolveLookupPaths(url, module.parent.parent)[1]);
+                var path = Module._resolveLookupPaths(url, module.parent.parent, true);
+
+                url = Module._findPath(url, (typeof path === 'string' || path === null) ? path : path[1]);
 
                 if (Y.config.useSync) {
                     //Needs to be in useSync
diff --git a/build/yui-nodejs/yui-nodejs.js b/build/yui-nodejs/yui-nodejs.js
index ecbd1875100..b3c92d93220 100644
--- a/build/yui-nodejs/yui-nodejs.js
+++ b/build/yui-nodejs/yui-nodejs.js
@@ -4132,7 +4132,9 @@ YUI.add('get', function (Y, NAME) {
         } else {
             try {
                 // Try to resolve paths relative to the module that required yui.
-                url = Module._findPath(url, Module._resolveLookupPaths(url, module.parent.parent)[1]);
+                var path = Module._resolveLookupPaths(url, module.parent.parent, true);
+
+                url = Module._findPath(url, (typeof path === 'string' || path === null) ? path : path[1]);
 
                 if (Y.config.useSync) {
                     //Needs to be in useSync