Comparing version 0.6.0 to 0.6.1
@@ -29,3 +29,3 @@ // Generated by CoffeeScript 1.8.0 | ||
return { | ||
regexp: /^\s*@import\s*(?:\(\w+\)\s*)?['"]([^'"]+)['"]/ | ||
regexp: /^\s*@import\s*(?:\([\w, ]+\)\s*)?(?:(?:url\()?['"]?([^'")]+)['"]?)/ | ||
}; | ||
@@ -45,2 +45,4 @@ case 'scss': | ||
}; | ||
default: | ||
return {}; | ||
} | ||
@@ -159,2 +161,3 @@ }; | ||
return each(deps, function(path, callback) { | ||
var addDeps, files; | ||
if (__indexOf.call(depsList, path) >= 0) { | ||
@@ -164,10 +167,18 @@ return callback(); | ||
if (globDeps && glob.hasMagic(path)) { | ||
return glob(path, function(err, files) { | ||
if (err) { | ||
return callback(); | ||
} | ||
addDeps = function(files) { | ||
return each(files, function(path, callback) { | ||
return addDep(path, depsList, callback); | ||
}, callback); | ||
}); | ||
}; | ||
if (mode === 'Async') { | ||
return glob(path, function(err, files) { | ||
if (err) { | ||
return callback(); | ||
} | ||
return addDeps(files); | ||
}); | ||
} else { | ||
files = glob.sync(path); | ||
return addDeps(files); | ||
} | ||
} else { | ||
@@ -174,0 +185,0 @@ return addDep(path, depsList, callback); |
{ | ||
"name": "progeny", | ||
"version": "0.6.0", | ||
"version": "0.6.1", | ||
"description": "Recursively finds dependencies of style and template source files", | ||
@@ -5,0 +5,0 @@ "author": { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
27264
25
272