transpiler tweaks

Author: guybedford

LICENSE

@@ -1,7 +1,7 @@
 MIT License
 -----------
 
-Copyright (C) 2013-2015 Guy Bedford
+Copyright (C) 2013-2016 Guy Bedford
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

lib/esm.js

@@ -31,7 +31,7 @@
           // do checks for setting transpiler metadata
           loader._loader.loadedTranspiler = loader._loader.loadedTranspiler || false;
           if (loader.pluginLoader)
-            loader.pluginLoader._loader.loadedTranspiler = loader._loader.loadedTranspiler || false;          // builder support
+            loader.pluginLoader._loader.loadedTranspiler = loader._loader.loadedTranspiler || false;
 
           // do transpilation
           return (loader._loader.transpilerPromise || (
@@ -42,6 +42,10 @@
 
             // translate hooks means this is a transpiler plugin instead of a raw implementation
             if (transpiler.translate) {
+              // if transpiler is the same as the plugin loader, then don't run twice
+              if (transpiler == load.metadata.loaderModule)
+                return load.source;
+
               return Promise.resolve(transpiler.translate.call(loader, load))
               .then(function(source) {
                 if (load.metadata.format == 'esm' && !loader.builder && detectRegisterFormat(source))

package.json

@@ -15,7 +15,7 @@
   "devDependencies": {
     "babel-core": "^5.8.22",
     "qunit": "^0.6.2",
-    "traceur": "0.0.91",
+    "traceur": "0.0.95",
     "typescript": "^1.6.2",
     "uglify-js": "~2.4.23"
   },