Skip to content
Open
Changes from all commits
Commits
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
39 changes: 20 additions & 19 deletions src/Bundle.hx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Bundle
* Load async application bundle created with `classRef` as entry point
* Note: excution is synchronous in nodejs; the Promise can be ignored
*/
macro static public function load(classRef:Expr)
macro static public function load(classRef:Expr, sync:Bool = #if nodejs true #else false #end)
{
switch (Context.typeof(classRef))
{
Expand All @@ -25,25 +25,26 @@ class Bundle
#else

var bridge = macro var _ = untyped $i{module} = $p{["$s", module]};
#if nodejs
var jsModule = './$module';
return macro cast {
untyped require($v{jsModule});
$bridge;
js.Promise.resolve($v{module});

if(sync) {
var jsModule = './$module';
return macro cast {
untyped require($v{jsModule});
$bridge;
js.Promise.resolve($v{module});
}
} else {
return macro {
#if debug
Require.hot(function(_) $bridge, $v{module});
#end
@:keep Require.module($v{module})
.then(function(id:String) {
$bridge;
return id;
});
}
}
#else
return macro {
#if debug
Require.hot(function(_) $bridge, $v{module});
#end
@:keep Require.module($v{module})
.then(function(id:String) {
$bridge;
return id;
});
}
#end
#end
default:
Context.fatalError('Module bundling needs to be provided a module class reference', Context.currentPos());
Expand Down