Merge branch 'FIX-detecting-modules-for-parsing' of https://github.co…

…m/mmig/madge
pahen · Dec 19, 2014 · 1e1663c · 1e1663c
2 parents a23178c + bae87a5
commit 1e1663c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 gen.sh
 config.json
 node_modules
-!test/files/cjs/node_modules
+!test/files/cjs/node_modules
+/.project
+/.settings
diff --git a/lib/parse/amd.js b/lib/parse/amd.js
@@ -45,7 +45,7 @@ AMD.prototype.parseFile = function (filename) {
 
 		this.emit('parseFile', {filename: filename, src: src});
 
-		if (src.indexOf('define(') >= 0 || src.indexOf('require(') >= 0) {
+		if (/define|require\s*\(/m.test(src)) {
 			amdetective(src).map(function (obj) {
 				return typeof(obj) === 'string' ? [obj] : obj.deps;
 			}).filter(function (deps) {

diff --git a/lib/parse/cjs.js b/lib/parse/cjs.js
@@ -72,7 +72,7 @@ CJS.prototype.parseFile = function (filename) {
 
 			this.emit('parseFile', {filename: filename, src: src});
 
-			if (src.indexOf('require(') >= 0) {
+			if (/require\s*\(/m.test(src)) {
 				detective(src).map(function (id) {
 					var depFilename = this.resolve(path.dirname(filename), id);
 					if (depFilename) {