support async functions in es6 detection

systemjs · Dec 17, 2014 · ca501e8 · ca501e8
1 parent a65443f
commit ca501e8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/lib/extension-core.js b/lib/extension-core.js
@@ -99,7 +99,7 @@ function core(loader) {
 
   // Traceur conveniences
   // good enough ES6 detection regex - format detections not designed to be accurate, but to handle the 99% use case
-  var es6RegEx = /(^\s*|[}\);\n]\s*)(import\s+(['"]|(\*\s+as\s+)?[^"'\(\)\n;]+\s+from\s+['"]|\{)|export\s+\*\s+from\s+["']|export\s+(\{|default|function|class|var|const|let))/;
+  var es6RegEx = /(^\s*|[}\);\n]\s*)(import\s+(['"]|(\*\s+as\s+)?[^"'\(\)\n;]+\s+from\s+['"]|\{)|export\s+\*\s+from\s+["']|export\s+(\{|default|function|class|var|const|let|async\s+function))/;
 
   var traceurRuntimeRegEx = /\$traceurRuntime/;
 

diff --git a/test/test.js b/test/test.js
@@ -22,6 +22,8 @@ function err(e) {
 
 var ie8 = typeof navigator != 'undefined' && navigator.appVersion && navigator.appVersion.indexOf('MSIE 8') != -1;
 
+System.traceurOptions = { asyncFunctions: true };
+
 asyncTest('Error handling', function() {
   System['import']('tests/error-loader').then(err, function(e) {
     ok(true);
@@ -486,6 +488,13 @@ asyncTest('AMD simplified CommonJS wrapping with an aliased require', function()
 if (ie8)
   return;
 
+asyncTest('Async functions', function() {
+  System['import']('tests/async').then(function(m) {
+    ok(true);
+    start();
+  });
+});
+
 asyncTest('Wrapper module support', function() {
   System['import']('tests/wrapper').then(function(m) {
     ok(m['default'] == 'default1', 'Wrapper module not defined.');

diff --git a/test/tests/async.js b/test/tests/async.js
@@ -0,0 +1,5 @@
+// will detect as CommonJS
+if (false) require('asdf');
+
+// should detect as ES6 first
+export async function p() {}
diff --git a/test/tests/wrapper.js b/test/tests/wrapper.js
@@ -1 +1 @@
-export * from './default1';
+export * from './default1';