closes #19 #20

.travis.yml

@@ -11,8 +11,9 @@ branches:
 
 install:
   - npm i jade
-  - npm i babel@5.8
-  - npm i babel-core@5.8
+  - npm i babel
+  - npm i babel-core
+  - npm i babel-preset-es2015
   - npm i coffee-script
   - npm i livescript
   - npm i typescript-simple

dist/compiler.js

@@ -127,22 +127,20 @@
       typescript: function (js, opts) {
         return _req('typescript')(js, opts).replace(/\r\n?/g, '\n')
       },
-      es6: function (js, opts) {
-        return _req('es6').transform(js, extend({
-          blacklist: ['useStrict', 'strict', 'react'], sourceMaps: false, comments: false
-        }, opts)).code
-      },
       babel: /* istanbul ignore next */ function (js, opts) {
-        js = 'function __parser_babel_wrapper__(){' + js + '}';
-        return _req('babel').transform(js, extend({
-          presets: ['es2015'], ast: false, sourceMaps: false, comments: false
-        }, opts)).code.replace(/"use strict";[\r\n]+/, '').slice(38, -2);
+        js = 'function __parser_babel_wrapper__(){' + js + '}'
+        return _req('babel').transform(js,
+          extend({
+            presets: ['es2015']
+          }, opts)
+        ).code.replace(/["']use strict["'];[\r\n]+/, '').slice(38, -2)
       },
       coffee: function (js, opts) {
         return _req('coffee').compile(js, extend({bare: true}, opts))
       }
     }
 
+    _js.es6 = _js.babel
     _js.javascript   = _js.none
     _js.coffeescript = _js.coffee
 

dist/riot.compiler.js

@@ -56,22 +56,20 @@ var parsers = (function () {
     typescript: function (js, opts) {
       return _req('typescript')(js, opts).replace(/\r\n?/g, '\n')
     },
-    es6: function (js, opts) {
-      return _req('es6').transform(js, extend({
-        blacklist: ['useStrict', 'strict', 'react'], sourceMaps: false, comments: false
-      }, opts)).code
-    },
     babel: /* istanbul ignore next */ function (js, opts) {
-      js = 'function __parser_babel_wrapper__(){' + js + '}';
-      return _req('babel').transform(js, extend({
-        presets: ['es2015'], ast: false, sourceMaps: false, comments: false
-      }, opts)).code.replace(/"use strict";[\r\n]+/, '').slice(38, -2);
+      js = 'function __parser_babel_wrapper__(){' + js + '}'
+      return _req('babel').transform(js,
+        extend({
+          presets: ['es2015']
+        }, opts)
+      ).code.replace(/["']use strict["'];[\r\n]+/, '').slice(38, -2)
     },
     coffee: function (js, opts) {
       return _req('coffee').compile(js, extend({bare: true}, opts))
     }
   }
 
+  _js.es6 = _js.babel
   _js.javascript   = _js.none
   _js.coffeescript = _js.coffee
 

lib/parsers.js

@@ -25,7 +25,7 @@ var parsers = (function () {
     switch (name) {
     case 'es6':
     /* istanbul ignore next */
-      return fn('babel') || fn('babel-core')  // versions 5.8x
+      return fn('babel') || fn('babel-core')
     /* istanbul ignore next */
     case 'babel':
       req = 'babel-core'
@@ -139,22 +139,20 @@ var parsers = (function () {
     typescript: function (js, opts) {
       return _req('typescript')(js, opts).replace(/\r\n?/g, '\n')
     },
-    es6: function (js, opts) {
-      return _req('es6').transform(js, extend({
-        blacklist: ['useStrict', 'strict', 'react'], sourceMaps: false, comments: false
-      }, opts)).code
-    },
     babel: /* istanbul ignore next */ function (js, opts) {
-      js = 'function __parser_babel_wrapper__(){' + js + '}';
-      return _req('babel').transform(js, extend({
-        presets: ['es2015'], ast: false, sourceMaps: false, comments: false
-      }, opts)).code.replace(/"use strict";[\r\n]+/, '').slice(38, -2);
+      js = 'function __parser_babel_wrapper__(){' + js + '}'
+      return _req('babel').transform(js,
+        extend({
+          presets: ['es2015']
+        }, opts)
+      ).code.replace(/["']use strict["'];[\r\n]+/, '').slice(38, -2)
     },
     coffee: function (js, opts) {
       return _req('coffee').compile(js, extend({bare: true}, opts))
     }
   }
 
+  _js.es6 = _js.babel
   _js.javascript   = _js.none
   _js.coffeescript = _js.coffee     // 4 the nostalgics
 

test/specs/parsers/js/test.babelcore.js → test/specs/parsers/js/test.custom.js

@@ -1,5 +1,3 @@
 riot.tag2('babelcore', '<h3>{test}</h3>', '', '', function(opts) {
-
-var type = 'JavaScript';
-this.test = 'This is ' + type;
+var foo
 }, '{ }');

test/specs/parsers/js/test.es6.js

@@ -1,5 +1,4 @@
 riot.tag2('es6', '<h3>{test}</h3>', '', '', function(opts) {
-
-var type = 'JavaScript';
-this.test = 'This is ' + type;
+  var type = 'JavaScript';
+  this.test = 'This is ' + type;
 }, '{ }');

test/specs/parsers/suite.js

@@ -92,10 +92,8 @@ describe('HTML parsers', function () {
 
 describe('JavaScript parsers', function () {
 
-  function _babel(js) {
-    return compiler.parsers._req('babelcore').transform(js, {
-      blacklist: ['useStrict', 'strict', 'react'], sourceMaps: false, comments: false
-      }).code
+  function _custom(js) {
+    return 'var foo'
   }
 
   this.timeout(25000) // first call to babel-core is slooooow!
@@ -147,7 +145,7 @@ describe('JavaScript parsers', function () {
   })
 
   // testParser.es6.tag
-  it('es6 (for babel 5.8.x)', function () {
+  it('es6', function () {
     if (have('es6')) {
       testParser('test', { type: 'es6' })
     }
@@ -160,12 +158,12 @@ describe('JavaScript parsers', function () {
     }
   })
 
-  // test.babel-core.tag
-  it('css.babel-core as custom parser (babel-core 5.8)', function () {
-    if (have('babelcore', 'babel-core')) {
-      compiler.parsers.js.babelcore = _babel
-      testParser('test', { type: 'babelcore' })
-    }
+  // test.random.tag
+  it('custom js parser', function () {
+
+    compiler.parsers.js.custom = _custom
+    testParser('test', { type: 'custom' })
+
   })
 
 })