Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve pathnames of exposed modules more efficiently. #1077

Merged
2 commits merged into from
Feb 21, 2015
Merged

Resolve pathnames of exposed modules more efficiently. #1077

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdf78c8
Pass this._expose to mdeps.
jmm Jan 15, 2015
c14da43
Eliminate path resolution and set row.expose.
jmm Jan 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 17 additions & 21 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,28 +151,21 @@ Browserify.prototype.require = function (file, opts) {
row.id = expose || file;
}
if (expose || !row.entry) {
self._pending ++;
resolve(file, { basedir: basedir }, function (err, res) {
if (err) return self.emit('error', err);
self._expose[row.id] = res;
write();
if (-- self._pending === 0) self.emit('_ready');
});
// Make this available to mdeps so that it can assign the value when it
// resolves the pathname.
row.expose = row.id;
}
else write();

function write () {
if (opts.external) return self.external(file, opts);
if (row.entry === undefined) row.entry = false;

if (!row.entry && self._options.exports === undefined) {
self._bpack.hasExports = true;
}

if (row.entry) row.order = self._entryOrder ++;
if (opts.transform === false) row.transform = false;
self.pipeline.write(row);

if (opts.external) return self.external(file, opts);
if (row.entry === undefined) row.entry = false;

if (!row.entry && self._options.exports === undefined) {
self._bpack.hasExports = true;
}

if (row.entry) row.order = self._entryOrder ++;
if (opts.transform === false) row.transform = false;
self.pipeline.write(row);
return self;
};

Expand Down Expand Up @@ -386,7 +379,10 @@ Browserify.prototype._createDeps = function (opts) {
var self = this;
var mopts = copy(opts);
var basedir = defined(opts.basedir, process.cwd());


// Let mdeps populate these values since it will be resolving file paths
// anyway.
mopts.expose = this._expose;
mopts.extensions = [ '.js', '.json' ].concat(mopts.extensions || []);
self._extensions = mopts.extensions;

Expand Down