Sidestep lix-pm/haxeshim#64

back2dos · May 1, 2020 · 013f836 · 013f836
1 parent 9062489
commit 013f836
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/extraParams.hxml b/extraParams.hxml
@@ -0,0 +1 @@
+--macro travix.Macro.setup()
diff --git a/haxe_libraries/travix.hxml b/haxe_libraries/travix.hxml
@@ -2,4 +2,5 @@
 -cp src
 -lib tink_cli
 -lib hx3compat
--D travix
+-D travix
+extraParams.hxml
diff --git a/src/travix/Macro.hx b/src/travix/Macro.hx
@@ -17,10 +17,15 @@ class Macro {
 			File.saveContent(out, '#!/usr/bin/env node\n\n' + File.getContent(out));
 		});
 	}
-	
+
 	public static function loadFile(name:String) {
 		return MacroStringTools.formatString(File.getContent(Context.getPosInfos((macro null).pos).file.directory() + '/$name'), Context.currentPos());
 	}
+
+	static function setup() {
+		if (Context.defined('js') && !Context.defined('nodejs'))
+			Compiler.addGlobalMetadata("js.Boot.HaxeError", '@:expose("HaxeError")');
+	}
 	#end
 }
 
diff --git a/src/travix/commands/JsCommand.hx b/src/travix/commands/JsCommand.hx
@@ -25,7 +25,7 @@ class JsCommand extends Command {
   }
 
   public function buildAndRun(rest:Rest<String>) {
-    build('js', ['-js', 'bin/js/tests.js', '--macro', 'addGlobalMetadata("js.Boot.HaxeError", "@:expose(\'HaxeError\')")'].concat(rest), function () {
+    build('js', ['-js', 'bin/js/tests.js'].concat(rest), function () {
       var index = 'bin/js/run.html';
       if(!index.exists()) index.saveContent(defaultIndexHtml());
       var run = 'bin/js/run.js';