Improve dependency parsing (ignore comments, simplify function)

index.js

@@ -5,7 +5,7 @@ function cssDependencies( data, which ) {
 		regexp = new RegExp( "\\/\\/>>\\s*css\\." + which + ":(.*)", "g" );
 
 	data.replace( regexp, function( garbage, input ) {
-		input = input.split( "," ).map( trim ); 
+		input = input.split( "," ).map( trim );
 		result.push.apply( result, input );
 	});
 
@@ -15,15 +15,11 @@ function cssDependencies( data, which ) {
 }
 
 function jsDependencies( data ) {
-	var match,
-		result = [];
-
-	match = data.match( /define\(\[([^\]]*?)\]/ );
-	if ( match !== null ) {
-		result = match[ 1 ].split( "," ).map( trim );
+	var match = data.match( /define\(\[([^\]]*?)\]/ );
+	if ( match === null ) {
+		return [];
 	}
-
-	return result;
+	return match[ 1 ].replace( /\/\/.+/g, "" ).split( "," ).map( trim );
 }
 
 /**

test/fixtures/basic/foo.js

@@ -1,2 +1,6 @@
 //>> css.baz: ./foo.css
-define([ "./bar" ]);
+define([
+
+	// comment
+	"./bar"
+]);

test/fixtures/nested/theme/input.css

@@ -0,0 +1 @@
+input {}

test/fixtures/nested/theme/version.css

@@ -0,0 +1 @@
+body {}

test/fixtures/nested/version.js

@@ -0,0 +1,2 @@
+//>> css.structure: ./theme/version.css
+define("0.2.0");

test/fixtures/nested/widgets/input.js

@@ -0,0 +1,3 @@
+//>> css.structure: ../theme/input.css
+define(["../version"], function(version) {
+});

test/index.js

@@ -49,6 +49,28 @@ describe( "jQuery CSS Builder", function() {
 
 	});
 
+	describe( "Basic - nested+appdir", function() {
+		var css,
+			files = {
+				"fixtures/version.js": fs.readFileSync( __dirname + "/fixtures/nested/version.js" ),
+				"fixtures/widgets/input.js": fs.readFileSync( __dirname + "/fixtures/nested/widgets/input.js" ),
+				"fixtures/theme/version.css": fs.readFileSync( __dirname + "/fixtures/nested/theme/version.css" ),
+				"fixtures/theme/input.css": fs.readFileSync( __dirname + "/fixtures/nested/theme/input.css" )
+			};
+
+		before(function( done ) {
+			jQueryCSSBuilder( files, "structure", { appDir: "fixtures", include: [ "widgets/input" ] }, function( error, _css ) {
+				css = _css;
+				done( error );
+			});
+		});
+
+		it( "should build just fine", function() {
+			expect( css ).to.equal( "input {}\nbody {}\n" );
+		});
+
+	});
+
 	describe( "Two bundles", function() {
 		var cssNorth, cssSouth;
 		var files = {