Windows compatibility and spaces -> tabs.

Author: Will Binns-Smith

lib/dependencies/LocalModulesHelpers.js

@@ -2,7 +2,6 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var path = require('path')
 var LocalModule = require("./LocalModule");
 
 var LocalModulesHelpers = exports;
@@ -16,9 +15,9 @@ LocalModulesHelpers.addLocalModule = function(state, name) {
 
 LocalModulesHelpers.getLocalModule = function(state, name, namedModule) {
 	if(!state.localModules) return null;
-	if(namedModule && isRelative(name)) {
+	if(namedModule) {
 		// resolve dependency name relative to the defining named module
-		name = path.join(path.dirname(namedModule), name);
+		name = lookup(namedModule, name);
 	}
 	for(var i = 0; i < state.localModules.length; i++) {
 		if(state.localModules[i].name === name)
@@ -27,6 +26,19 @@ LocalModulesHelpers.getLocalModule = function(state, name, namedModule) {
 	return null;
 };
 
-function isRelative(name) {
-  return name[0] === '.';
+function lookup(parent, mod) {
+	if ('.' != mod.charAt(0)) return mod;
+
+	var path = parent.split('/')
+		, segs = mod.split('/');
+	path.pop();
+
+	for (var i = 0; i < segs.length; i++) {
+		var seg = segs[i];
+		if ('..' == seg) path.pop();
+		else if ('.' != seg) path.push(seg);
+	}
+
+	return path.join('/');
 }
+

test/cases/parsing/local-modules/index.js

@@ -43,16 +43,16 @@ it("should define and require a local module with deps", function() {
 });
 
 it("should define and require a local module that is relative", function () {
-  define("my-dir/my-module3", function(dep) {
-    return 1234;
-  });
-  define("my-dir/my-other-dir/my-module4", function(dep) {
-    return 2345;
-  });
-  define("my-dir/my-other-dir/my-module5", ["./my-module4", "../my-module3"], function(myModule4, myModule3) {
-    myModule3.should.be.eql(1234);
-    myModule4.should.be.eql(2345);
-    return 3456;
-  });
-  require("my-dir/my-other-dir/my-module5").should.be.eql(3456);
+	define("my-dir/my-module3", function() {
+		return 1234;
+	});
+	define("my-dir/my-other-dir/my-module4", function() {
+		return 2345;
+	});
+	define("my-dir/my-other-dir/my-module5", ["./my-module4", "../my-module3"], function(myModule4, myModule3) {
+		myModule3.should.be.eql(1234);
+		myModule4.should.be.eql(2345);
+		return 3456;
+	});
+	require("my-dir/my-other-dir/my-module5").should.be.eql(3456);
 })