Skip to content

Moved runtime inclusion to after compilation, due to generator hoisting #11

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

Open
christianalfoni wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Moved runtime inclusion to after compilation, due to generator hoisting #11

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
15 changes: 11 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ module.exports = function(source) {
var map;
var options = {};
var result;
var runtime;

this.cacheable && this.cacheable();

Expand All @@ -38,20 +39,26 @@ module.exports = function(source) {
}
});

// Move runtime option from options to variable
runtime = options.runtime;
delete options.runtime;

// Handle Traceur runtime
if(filename === traceur.RUNTIME_PATH) {
return content;
}
if(options.runtime) {
content = 'require("' + traceur.RUNTIME_PATH + '");' + content;
}

// Parse code through Traceur
try {
delete options.runtime;
var compiler = new traceur.Compiler(options);
result = compiler.compile(content, filename);

// Include runtime after compilation due to generators hoisting the
// runtime usage to the very top
if(runtime) {
result = 'require("' + traceur.RUNTIME_PATH + '");' + result;
}

// Process source map (if available) and return result
if(options.sourceMaps) {
map = JSON.parse(compiler.getSourceMap());
Expand Down