Skip to content

Commit 742de25

Browse files
author
James Halliday
committed
fix for undef row.file/basedir
1 parent 0d85dfb commit 742de25

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ var combine = require('stream-combiner2');
1111
var duplexer = require('duplexer2');
1212
var copy = require('shallow-copy');
1313
var xtend = require('xtend');
14+
var defined = require('defined');
1415

1516
var inherits = require('inherits');
1617
var Transform = require('readable-stream').Transform;
@@ -81,7 +82,11 @@ Deps.prototype._transform = function (row, enc, next) {
8182
}
8283

8384
self.pending ++;
84-
if (row.entry !== false) self.entries.push(path.resolve(row.basedir, row.file));
85+
var basedir = defined(row.basedir, self.basedir);
86+
87+
if (row.entry !== false) {
88+
self.entries.push(path.resolve(basedir, row.file || row.id));
89+
}
8590

8691
self.lookupPackage(row.file, function (err, pkg) {
8792
if (err && self.options.ignoreMissing) {

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"JSONStream": "~0.7.1",
1111
"browser-resolve": "^1.7.0",
1212
"concat-stream": "~1.4.5",
13+
"defined": "0.0.0",
1314
"detective": "^4.0.0",
1415
"duplexer2": "0.0.2",
1516
"inherits": "^2.0.1",

test/undef_file.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ test('undef file', function (t) {
2525
t.same(rows.sort(cmp), [
2626
{
2727
id: files.main,
28+
file: files.main,
2829
source: sources.main,
2930
entry: true,
3031
deps: { './foo': files.foo }

0 commit comments

Comments
 (0)