use single build file

Author: guybedford

.travis.yml

@@ -14,6 +14,9 @@ before_install:
 script:
   - grunt
   - npm test
-  - npm run test:browser -- --polyfill
-  - npm run test:browser -- --saucelabs
-  - npm run test:browser -- --saucelabs --ie8
+  - npm run test:browser-traceur -- --polyfill
+  - npm run test:browser-6to5 -- --polyfill
+  - npm run test:browser-traceur -- --saucelabs
+  - npm run test:browser-6to5 -- --saucelabs
+  - npm run test:browser-traceur -- --saucelabs --ie8
+  - npm run test:browser-6to5 -- --saucelabs --ie8

Gruntfile.js

@@ -20,47 +20,28 @@ module.exports = function (grunt) {
     concat: {
       dist: {
         files: {
-          'dist/<%= pkg.name %>-traceur.src.js': [
+          'dist/<%= pkg.name %>.src.js': [
             'node_modules/when/es6-shim/Promise.js',
             'src/polyfill-wrapper-start.js',
-            'dist/<%= pkg.name %>-traceur.js',
+            'dist/<%= pkg.name %>.js',
             'src/polyfill-wrapper-end.js'
           ],
-          'dist/<%= pkg.name %>-6to5.src.js': [
-            'node_modules/when/es6-shim/Promise.js',
-            'src/polyfill-wrapper-start.js',
-            'dist/<%= pkg.name %>-6to5.js',
-            'src/polyfill-wrapper-end.js'
-          ],
-          'dist/<%= pkg.name %>-traceur-sp.src.js': [
-            'src/polyfill-wrapper-start.js',
-            'dist/<%= pkg.name %>-traceur.js',
-            'src/polyfill-wrapper-end.js'
-          ],
-          'dist/<%= pkg.name %>-6to5-sp.src.js': [
+          'dist/<%= pkg.name %>-sans-promises.src.js': [
             'src/polyfill-wrapper-start.js',
-            'dist/<%= pkg.name %>-6to5.js',
+            'dist/<%= pkg.name %>.js',
             'src/polyfill-wrapper-end.js'
           ]
         }
       }
     },
     esnext: {
-      distTraceur: {
-        src: [
-          'src/loader.js',
-          'src/traceur-loader.js',
-          'src/system.js'
-        ],
-        dest: 'dist/<%= pkg.name %>-traceur.js'
-      },
-      dist6to5: {
+      dist: {
         src: [
           'src/loader.js',
-          'src/6to5-loader.js',
+          'src/parser.js',
           'src/system.js'
         ],
-        dest: 'dist/<%= pkg.name %>-6to5.js'
+        dest: 'dist/<%= pkg.name %>.js'
       }
     },
     'string-replace': {
@@ -89,27 +70,16 @@ module.exports = function (grunt) {
         },
         sourceMap: true
       },
-      distTraceur: {
-        options: {
-          banner: '<%= meta.banner %>\n'
-        },
-        src: 'dist/<%= pkg.name %>-traceur.src.js',
-        dest: 'dist/<%= pkg.name %>-traceur.js'
-      },
-      dist6to5: {
+      dist: {
         options: {
           banner: '<%= meta.banner %>\n'
         },
-        src: 'dist/<%= pkg.name %>-6to5.src.js',
-        dest: 'dist/<%= pkg.name %>-6to5.js'
-      },
-      distTraceurSansPromises: {
-        src: 'dist/<%= pkg.name %>-traceur-sp.src.js',
-        dest: 'dist/<%= pkg.name %>-traceur-sp.js'
+        src: 'dist/<%= pkg.name %>.src.js',
+        dest: 'dist/<%= pkg.name %>.js'
       },
-      dist6to5SansPromises: {
-        src: 'dist/<%= pkg.name %>-6to5-sp.src.js',
-        dest: 'dist/<%= pkg.name %>-6to5-sp.js'
+      distSansPromises: {
+        src: 'dist/<%= pkg.name %>-sans-promises.src.js',
+        dest: 'dist/<%= pkg.name %>-sans-promises.js'
       }
     }
   });

karma.conf.js

@@ -36,7 +36,7 @@ module.exports = function(config) {
 
     [!options.ie8 ? (!options['6to5'] ? 'node_modules/traceur/bin/traceur.js' : 'node_modules/6to5/browser.js') : ''],
 
-    'dist/es6-module-loader-' + (!options['6to5'] ? 'traceur' : '6to5') + (options.polyfill ? '' : '-sp') + '.src.js',
+    'dist/es6-module-loader' + (options.polyfill ? '' : '-sans-promises') + '.src.js',
 
     'test/_browser.js',
     'test/browser-script-type-module.js',

lib/index-6to5.js

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

lib/index-traceur.js

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

package.json

@@ -57,8 +57,10 @@
   "scripts": {
     "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"
+    "test:browser": "npm run test:browser-traceur && npm run test:browser-6to5",
+    "test:browser-traceur": "karma start --single-run",
+    "test:browser-6to5": "karma start --single-run --6to5",
+    "test:browser:perf": "karma start karma-benchmark.conf.js --single-run"
   },
   "dependencies": {
     "6to5": "^2.0.2",

src/6to5-loader.js

@@ -0,0 +1,77 @@
+/*
+ * Traceur and 6to5 Parsing Code for Loader
+ */
+(function(Loader) {
+  // parse function is used to parse a load record
+  // Returns an array of ModuleSpecifiers
+  var parser, parserName, parserOptionsName;
+
+  // use Traceur by default
+  Loader.prototype.parser = 'traceur';
+
+  Loader.prototype.parse = function(load) {
+    if (!parser) {
+      parserName = this.parser == '6to5' ? 'to5' : this.parser;
+
+      // try to pick up parser from global or require
+      if (typeof window == 'undefined' && typeof WorkerGlobalScope == 'undefined')
+        parser = require(this.parser);
+      else
+        parser = __global[parserName]
+      
+      if (!parser)
+        throw new TypeError('Include Traceur or 6to5 for module syntax support');
+
+      parserOptionsName = parserName + 'Options';
+    }
+
+    var source = (this.parser == '6to5' ? to5Parse : traceurParse).call(this, load);
+
+    source = 'var __moduleAddress = "' + load.address + '";' + source;
+
+    __eval(source, __global, load);
+  }
+
+  function traceurParse(load) {
+    var options = this.traceurOptions || {};
+    options.modules = 'instantiate';
+    options.script = false;
+    options.sourceMaps = 'inline';
+    options.filename = load.address;
+
+    var compiler = new parser.Compiler(options);
+    var source = doTraceurCompile(load.source, compiler, options.filename);
+
+    // add "!eval" to end of Traceur sourceURL
+    // I believe this does something?
+    source += '!eval';
+
+    return source;
+  }
+  function doTraceurCompile(source, compiler, filename) {
+    try {
+      return compiler.compile(source, filename);
+    }
+    catch(e) {
+      // traceur throws an error array
+      throw e[0];
+    }
+  }
+
+  function to5Parse(load) {
+    var options = this.to5Options || {};
+    options.modules = 'system';
+    options.sourceMap = 'inline';
+    options.filename = load.address;
+    options.code = true;
+    options.ast = false;
+
+    var source = parser.transform(load.source, options).code;
+
+    // add "!eval" to end of 6to5 sourceURL
+    // I believe this does something?
+    return source + '\n//# sourceURL=' + load.address + '!eval';
+  }
+
+
+})(__global.LoaderPolyfill);

src/parser.js

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