Comparing version 0.4.1 to 0.4.2
@@ -68,3 +68,3 @@ // Generated by CoffeeScript 1.3.3 | ||
if (err) { | ||
return console.error("" + timestamp + " - error: " + err); | ||
return console.error("" + timestamp + " - error: " + err); | ||
} else { | ||
@@ -71,0 +71,0 @@ console.info("" + timestamp + " - generated " + output); |
@@ -35,3 +35,3 @@ // Generated by CoffeeScript 1.3.3 | ||
return fs.readFile(resolved_dep.path, 'utf8', function(err, source) { | ||
var depend, options, parser, re, result, seen, timestamp; | ||
var parser, re, result, timestamp; | ||
if (err) { | ||
@@ -55,12 +55,9 @@ cb(err); | ||
while (result = re.exec(source)) { | ||
depend = result[1]; | ||
options = { | ||
bare: result[2] != null | ||
}; | ||
seen = resolved_dep.seen.concat(file.path); | ||
file.deps.push({ | ||
depend: depend, | ||
options: options, | ||
depend: result[1], | ||
options: { | ||
bare: result[2] != null | ||
}, | ||
cwd: file.cwd, | ||
seen: seen | ||
seen: resolved_dep.seen.concat(file.path) | ||
}); | ||
@@ -129,3 +126,3 @@ } | ||
if (err) { | ||
doneResolvingDependencyChain(err); | ||
doneProcessingNode(err); | ||
return; | ||
@@ -144,13 +141,13 @@ } | ||
return async.parallel(funcs, function(err, results) { | ||
files.push(node); | ||
if (err) { | ||
doneResolvingDependencyChain(err); | ||
doneProcessingNode(err); | ||
return; | ||
} | ||
files.push(node); | ||
return doneProcessingNode(); | ||
return doneProcessingNode(null); | ||
}); | ||
}); | ||
}; | ||
return processNode(root, function() { | ||
return doneResolvingDependencyChain(null, files); | ||
return processNode(root, function(err) { | ||
return doneResolvingDependencyChain(err, files); | ||
}); | ||
@@ -157,0 +154,0 @@ }; |
{ | ||
"name": "jspackage", | ||
"description": "build tool which adds client-side import syntax", | ||
"version": "0.4.1", | ||
"version": "0.4.2", | ||
"author": { | ||
@@ -6,0 +6,0 @@ "name": "Andrew Kelley", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
31622
518