Fixes requirejs#393, make relative node requires fully pathed

Author: jrburke

build/jslib/node.js

@@ -121,9 +121,20 @@
         } else {
             def(moduleName, function () {
                 //Get the original name, since relative requires may be
-                //resolved differently in node (issue #202)
-                var originalName = hasProp(context.registry, moduleName) &&
-                            context.registry[moduleName].map.originalName;
+                //resolved differently in node (issue #202). Also, if relative,
+                //make it relative to the URL of the item requesting it
+                //(issue #393)
+                var dirName,
+                    map = hasProp(context.registry, moduleName) &&
+                            context.registry[moduleName].map,
+                    parentMap = map && map.parentMap,
+                    originalName = map && map.originalName;
+
+                if (originalName.charAt(0) === '.' && parentMap) {
+                    dirName = parentMap.url.split('/');
+                    dirName.pop();
+                    originalName = dirName.join('/') + '/' + originalName;
+                }
 
                 try {
                     return (context.config.nodeRequire || req.nodeRequire)(originalName);

tests/alln.sh

@@ -2,4 +2,5 @@ node allNode.js
 node ../r.js all.js
 node node/syncMap/syncMap.js
 node node/pluginLocalId/test.js
-node node/syncRequire/main.js
+node node/syncRequire/main.js
+node node/nodeRelative/main.js

tests/node/nodeRelative/main.js

@@ -0,0 +1,13 @@
+var requirejs = require("../../../r.js");
+
+requirejs.config({
+    baseUrl: __dirname,
+    paths: {
+        lamp: 'other/src/lamp'
+    }
+});
+
+requirejs(['lamp'], function (lamp) {
+    console.log('lamp name ' + (lamp.name === 'lamp' ? 'PASSED' : 'FAILED'));
+    console.log('light name ' + (lamp.light.name === 'light' ? 'PASSED' : 'FAILED'));
+});

tests/node/nodeRelative/other/lib/light.js

@@ -0,0 +1,3 @@
+module.exports = {
+    name: 'light'
+};

tests/node/nodeRelative/other/src/lamp.js

@@ -0,0 +1,7 @@
+//Load a node lib that is relative.
+define(['../lib/light'], function (light) {
+    return {
+        name: 'lamp',
+        light: light
+    };
+});