test rejigging, specific compiler options, node main, 6to5 source maps

Author: guybedford

.travis.yml

@@ -14,7 +14,6 @@ before_install:
 script:
   - grunt
   - npm test
-  - npm run test:browsers -- --polyfill
-  - npm run test:browsers -- --saucelabs
-  - npm run test:browsers -- --saucelabs --ie8
-  - npm run test:browsers:perf
+  - npm run test:browser -- --polyfill
+  - npm run test:browser -- --saucelabs
+  - npm run test:browser -- --saucelabs --ie8

karma.conf.js

@@ -21,22 +21,20 @@ var options = extend({
   coverage: false
 }, argv);
 
-if (options.ie8){
+if (options.ie8) {
   console.log('IE8 Mode !\n - polyfill required\n');
   options.polyfill = true;
 }
 
 ////
 
-module.exports = function (config) {
+module.exports = function(config) {
 
   var files = [
     'test/_helper.js',
-    [!options.ie8 ? 'node_modules/traceur/bin/traceur.js' : ''],
+    [!options.ie8 ? (!options['6to5'] ? 'node_modules/traceur/bin/traceur.js' : 'node_modules/6to5/browser.js') : ''],
 
-    'dist/es6-module-loader' +
-    (options.polyfill ? '' : '-sans-promises')
-    + '.src.js',
+    'dist/es6-module-loader-' + (!options['6to5'] ? 'traceur' : '6to5') + (options.polyfill ? '' : '-sp') + '.src.js',
 
     'test/_browser.js',
     'test/browser-script-type-module.js',
@@ -151,7 +149,7 @@ module.exports = function (config) {
 };
 
 function flatten(arr) {
-  return arr.reduce(function (memo, val) {
+  return arr.reduce(function(memo, val) {
     return memo.concat(util.isArray(val) ? flatten(val) : val ? [val] : []);
   }, []);
 }

lib/index-6to5.js

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

lib/index-traceur.js

@@ -0,0 +1,6 @@
+require('../dist/es6-module-loader-traceur.src');
+
+module.exports = {
+  Loader: global.LoaderPolyfill,
+  System: global.System
+};

lib/index.js

@@ -54,9 +54,9 @@
   },
   "main": "lib/index-traceur",
   "scripts": {
-    "test": "npm run test:node && npm run test:browsers",
-    "test:node": "mocha test/_node.js",
-    "test:browsers": "karma start --single-run",
+    "test": "npm run test:node && npm run test:browser",
+    "test:node": "mocha test/_node-traceur.js && mocha test/_node-6to5.js",
+    "test:browser": "karma start --single-run && karma start --single-run --6to5",
     "test:browsers:perf": "karma start karma-benchmark.conf.js --single-run"
   },
   "dependencies": {

package.json

@@ -17,13 +17,12 @@
         throw new TypeError('Include 6to5 for module syntax support');
     }
 
-    var options = this.parseOptions || {};
+    var options = this.to5Options || {};
     options.modules = 'system';
     options.sourceMap = 'inline';
     options.filename = load.address;
     options.code = true;
     options.ast = false;
-    options.runtime = true;
 
     var source = to5.transform(load.source, options).code;
 
@@ -32,7 +31,7 @@
 
     // add "!eval" to end of 6to5 sourceURL
     // I believe this does something?
-    source = 'var __moduleAddress = "' + load.address + '";' + source + '!eval';
+    source = 'var __moduleAddress = "' + load.address + '";' + source + '\n//# sourceURL=' + load.address + '!eval';
 
     __eval(source, __global, load);
   }

src/6to5-loader.js

@@ -899,7 +899,6 @@ function logloads(loads) {
     });
 
     // 26.3.3.13 realm not implemented
-    this.parseOptions = {};
   }
 
   function Module() {}

src/loader.js

@@ -28,7 +28,7 @@
 
     console.assert(load.source, 'Non-empty source');
 
-    var options = this.parseOptions || {};
+    var options = this.traceurOptions || {};
     options.modules = 'instantiate';
     options.script = false;
     options.sourceMaps = 'inline';

src/traceur-loader.js

@@ -4,7 +4,7 @@ global.expect = require('expect.js');
 
 require('./_helper');
 
-require('../lib');
+require('../lib/index-6to5');
 
 require('./system.spec');