rename 6to5 to babel

Author: guybedford

.travis.yml

@@ -6,22 +6,23 @@ node_js:
   - '0.10'
   - '0.11'
   - '0.12'
+  - 'iojs'
 env:
   global:
     - SAUCE_LABS=false PARSER=false OPTIONS=""
   matrix:
     - PARSER="traceur"
-    - PARSER="6to5"
+    - PARSER="babel"
 matrix:
   include:
     - node_js: "0.10"
       env: SAUCE_LABS=true PARSER="traceur"
     - node_js: "0.10"
-      env: SAUCE_LABS=true PARSER="6to5"
+      env: SAUCE_LABS=true PARSER="babel"
 #    - node_js: "0.10"
 #      env: SAUCE_LABS=true PARSER="traceur" OPTIONS="--ie8"
 #    - node_js: "0.10"
-#      env: SAUCE_LABS=true PARSER="6to5" OPTIONS="--ie8"
+#      env: SAUCE_LABS=true PARSER="babel" OPTIONS="--ie8"
 before_install:
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0

karma.conf.js

@@ -35,9 +35,9 @@ module.exports = function(config) {
 
   var files = [
     'test/_helper.js',
-    [options['6to5'] ? 'node_modules/regenerator/runtime.js' : ''],
+    [options['babel'] ? 'node_modules/regenerator/runtime.js' : ''],
 
-    [!options.ie8 ? (!options['6to5'] ? 'node_modules/traceur/bin/traceur.js' : 'node_modules/6to5-core/browser.js') : ''],
+    [!options.ie8 ? (!options['babel'] ? 'node_modules/traceur/bin/traceur.js' : 'node_modules/babel-core/browser.js') : ''],
 
     'dist/es6-module-loader' + (options.polyfill ? '' : '-sans-promises') + '.src.js',
 

lib/index-6to5.js lib/index-babel.js

@@ -1,6 +1,6 @@
 var System = require('../dist/es6-module-loader.src');
 
-System.transpiler = '6to5';
+System.transpiler = 'babel';
 
 module.exports = {
   Loader: global.LoaderPolyfill,

package.json

@@ -56,14 +56,14 @@
   "main": "lib/index-traceur",
   "scripts": {
     "test": "npm run test:node && npm run test:browser",
-    "test:node": "mocha test/_node-traceur.js && mocha test/_node-6to5.js",
-    "test:browser": "npm run test:browser-traceur && npm run test:browser-6to5",
+    "test:node": "mocha test/_node-traceur.js && mocha test/_node-babel.js",
+    "test:browser": "npm run test:browser-traceur && npm run test:browser-babel",
     "test:browser-traceur": "karma start --single-run",
-    "test:browser-6to5": "karma start --single-run --6to5",
+    "test:browser-babel": "karma start --single-run --babel",
     "test:browser:perf": "karma start karma-benchmark.conf.js --single-run"
   },
   "dependencies": {
-    "6to5-core": "~3.5.3",
+    "babel-core": "^4.1.1",
     "traceur": "0.0.82",
     "when": "^3.7.2"
   }

src/transpiler.js

@@ -1,5 +1,5 @@
 /*
- * Traceur and 6to5 transpile hook for Loader
+ * Traceur and Babel transpile hook for Loader
  */
 (function(Loader) {
   // Returns an array of ModuleSpecifiers
@@ -11,17 +11,17 @@
 
   Loader.prototype.transpile = function(load) {
     if (!transpiler) {
-      if (this.transpiler == '6to5') {
-        transpiler = to5Transpile;
-        transpilerModule = isNode ? require('6to5-core') : __global.to5;
+      if (this.transpiler == 'babel') {
+        transpiler = babelTranspile;
+        transpilerModule = isNode ? require('babel-core') : __global.babel;
       }
       else {
         transpiler = traceurTranspile;
         transpilerModule = isNode ? require('traceur') : __global.traceur;
       }
 
       if (!transpilerModule)
-        throw new TypeError('Include Traceur or 6to5 for module syntax support.');
+        throw new TypeError('Include Traceur or Babel for module syntax support.');
     }
 
     return 'var __moduleAddress = "' + load.address + '";' + transpiler.call(this, load);
@@ -53,8 +53,8 @@
     }
   }
 
-  function to5Transpile(load) {
-    var options = this.to5Options || {};
+  function babelTranspile(load) {
+    var options = this.babelOptions || {};
     options.modules = 'system';
     options.sourceMap = 'inline';
     options.filename = load.address;
@@ -65,7 +65,7 @@
 
     var source = transpilerModule.transform(load.source, options).code;
 
-    // add "!eval" to end of 6to5 sourceURL
+    // add "!eval" to end of Babel sourceURL
     // I believe this does something?
     return source + '\n//# sourceURL=' + load.address + '!eval';
   }

test/_node-6to5.js test/_node-babel.js

@@ -6,9 +6,9 @@ require('./_helper');
 
 require('regenerator/runtime');
 
-global.System = require('../lib/index-6to5').System;
+global.System = require('../lib/index-babel').System;
 
-System.parser = '6to5';
+System.parser = 'babel';
 
 require('./system.spec');
 

test/system.spec.js

@@ -1,7 +1,7 @@
 //
 
-if (typeof to5 != 'undefined')
-  System.transpiler = '6to5';
+if (typeof babel != 'undefined')
+  System.transpiler = 'babel';
 
 var ie = typeof window != 'undefined' && window.navigator.userAgent.match(/Trident/);
 

test/test-6to5.html test/test-babel.html

@@ -5,8 +5,8 @@
 
   <script src="test.js"></script>
 
-  <!-- set this to the path to 6to5.js -->
-  <script src="../node_modules/6to5-core/browser.js"></script>
+  <!-- set this to the path to babel.js -->
+  <script src="../node_modules/babel-core/browser.js"></script>
   <script src="../node_modules/regenerator/runtime.js"></script>
 
   <script>
@@ -18,7 +18,7 @@
 
   <script src="../dist/es6-module-loader.src.js"></script>
   <script>
-    System.transpiler = '6to5';
+    System.transpiler = 'babel';
   </script>
 
   <script>

test/test.js

@@ -640,7 +640,7 @@ function runTests() {
 
   if (typeof Worker != 'undefined')
   test('Loading inside of a Web Worker', function(assert) {
-    var worker = new Worker('worker/worker-' + (typeof traceur != 'undefined' ? 'traceur' : '6to5') + '.js');
+    var worker = new Worker('worker/worker-' + (typeof traceur != 'undefined' ? 'traceur' : 'babel') + '.js');
 
     worker.onmessage = function(e) {
       assert(e.data, 'p');

test/worker/worker-6to5.js test/worker/worker-babel.js

@@ -1,9 +1,9 @@
-importScripts("../../node_modules/6to5-core/browser.js",
+importScripts("../../node_modules/babel-core/browser.js",
              "../../node_modules/when/es6-shim/Promise.js",
              "../../dist/es6-module-loader.src.js"
              );
 
-System.transpiler = '6to5';
+System.transpiler = 'babel';
 
 System['import']('es6').then(function(m) {
   postMessage(m.p);