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
yui · Apr 5, 2019 · 1237a97 · 1237a97
1 parent 25264e3
commit 1237a97
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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