Skip to content

use dependency graph for resolving overall order instead of traces #92

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

Merged
joshwnj merged 1 commit into from
Apr 14, 2016
Merged

use dependency graph for resolving overall order instead of traces #92

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions file-system-loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ var FileSystemLoader = (function () {

this.root = root;
this.sources = {};
this.traces = {};
this.importNr = 0;
this.core = new _indexJs2['default'](plugins);
this.tokensByFile = {};
Expand Down Expand Up @@ -107,7 +106,6 @@ var FileSystemLoader = (function () {
var exportTokens = _ref.exportTokens;

_this.sources[fileRelativePath] = injectableSource;
_this.traces[trace] = fileRelativePath;
_this.tokensByFile[fileRelativePath] = exportTokens;
resolve(exportTokens);
}, reject);
Expand All @@ -117,12 +115,10 @@ var FileSystemLoader = (function () {
}, {
key: 'finalSource',
get: function () {
var traces = this.traces;
var sources = this.sources;
var written = {};

return Object.keys(traces).sort(traceKeySorter).map(function (key) {
var filename = traces[key];
return this.deps.overallOrder().map(function (filename) {
if (written[filename] === true) {
return null;
}
Expand Down