Merge pull request #3 from dougludlow/master

Use esm instead of amd, see riot/riot#1715.
HuasoFoundries · Jun 3, 2016 · 40044d7 · 40044d7
2 parents 3a4382e + caec052
commit 40044d7
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/systemjs-riot.js b/systemjs-riot.js
@@ -4,13 +4,14 @@
 import compiler from 'riot-compiler';
 
 export function translate(load) {
-    var options = {
-        //expr: true
-        //type: 'babel'
-    };
-    load.metadata.format = 'amd';
-    var precompiled = compiler.compile(load.source, options);
-    var output = `define(['riot'], function(riot) { ${precompiled} });`;
+    let precompiled = compiler.compile(load.source);
+    let output;
+
+    if (load.metadata.format === 'esm') {
+      output = `import riot from 'riot';\n${precompiled}`;
+    } else {
+      output = `define(['riot'], function(riot) { ${precompiled} });`;
+    }
 
     load.source = output;
     return output;