make the compiler respect the NODE_PATH environment variable

marcuswestin · Jan 17, 2013 · 5f1ec2c · 5f1ec2c
1 parent a05fa53
commit 5f1ec2c
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/compiler.js b/compiler.js
@@ -109,8 +109,8 @@ var _minifyRequireStatements = function(code, modules) {
 	return code
 }
 
+var _nodePaths = process.env.NODE_PATH.split(':')
 var _pathnameGroupingRegex = /require\s*\(['"]([\w\/\.-]*)['"]\)/
-
 var _replaceRequireStatements = function(modulePath, code, modules, pathBase) {
 	var requireStatements = util.getRequireStatements(code)
 
@@ -120,8 +120,7 @@ var _replaceRequireStatements = function(modulePath, code, modules, pathBase) {
 	}
 
 	for (var i=0, requireStatement; requireStatement = requireStatements[i]; i++) {
-		var rawModulePath = requireStatement.match(_pathnameGroupingRegex)[1],
+		var subModulePath = util.resolveRequireStatement(requireStatement, modulePath)
-			subModulePath = util.resolve(rawModulePath, pathBase).replace(/\.js$/, '')
 
 		if (!subModulePath) {
 			throw new Error("Require Compiler Error: Cannot find module '"+ rawModulePath +"' (in '"+ modulePath +"')")
@@ -132,7 +131,7 @@ var _replaceRequireStatements = function(modulePath, code, modules, pathBase) {
 		if (!modules[subModulePath]) {
 			modules[subModulePath] = true
 			var newPathBase = path.dirname(subModulePath),
-				newModuleCode = util.getCode(subModulePath + '.js')
+				newModuleCode = util.getCode(subModulePath)
 			_replaceRequireStatements(subModulePath, newModuleCode, modules, newPathBase)
 			modules.push(subModulePath)
 		}