All CommonJS and AMD modules to be transpiled

Gruntfile.js

@@ -102,6 +102,7 @@ module.exports = function (grunt) {
 					"src/extension-pretty-name.js",
 					"src/extension-tree-shaking.js",
 					"src/extension-mjs.js",
+					"src/extension-forward-metadata.js",
 					"src/trace/trace.js",
 					"src/json/json.js",
 					"src/cache-bust/cache-bust.js",
@@ -134,6 +135,7 @@ module.exports = function (grunt) {
 					"src/extension-pretty-name.js",
 					"src/extension-tree-shaking.js",
 					"src/extension-mjs.js",
+					"src/extension-forward-metadata.js",
 					"src/trace/trace.js",
 					"src/json/json.js",
 					"src/cache-bust/cache-bust.js",
@@ -163,6 +165,7 @@ module.exports = function (grunt) {
 					"src/extension-pretty-name.js",
 					"src/extension-tree-shaking.js",
 					"src/extension-mjs.js",
+					"src/extension-forward-metadata.js",
 					"src/trace/trace.js",
 					"src/json/json.js",
 					"src/cache-bust/cache-bust.js",

main.js

@@ -692,10 +692,11 @@ addStealExtension(function addMetaDeps(loader) {
 	}
 
 	loader.transpile = function (load) {
+		// TODO this needs to change
 		prependDeps(this, load, createImport);
 		var result = superTranspile.apply(this, arguments);
 		return result;
-	}
+	};
 
 	loader._determineFormat = function (load) {
 		if(load.metadata.format === 'cjs') {
@@ -1356,6 +1357,31 @@ addStealExtension(function addMJS(loader){
 	};
 });
 
+// This extension allows you to define metadata that should appear on
+// Any subdependencies. For example we can add the { foo: true } bool
+// to a module's metadata, and it will be forwarded to any subdependency.
+addStealExtension(function forwardMetadata(loader){
+	loader._forwardedMetadata = {};
+	loader.setForwardedMetadata = function(prop) {
+		loader._forwardedMetadata[prop] = true;
+	};
+
+	loader.forwardMetadata = function(load, parentName) {
+		  if(parentName) {
+			  var parentLoad = this.getModuleLoad(parentName);
+
+			  if(parentLoad) {
+				  // TODO use Object.assign instead?
+				  for(var p in this._forwardedMetadata) {
+					  if(p in parentLoad.metadata) {
+						  load.metadata[p] = parentLoad.metadata[p];
+					  }
+				  }
+			  }
+		  }
+	};
+});
+
 addStealExtension(function applyTraceExtension(loader) {
 	loader._traceData = {
 		loads: {},
@@ -1735,6 +1761,7 @@ addStealExtension(function addCacheBust(loader) {
 	System.ext = Object.create(null);
 	System.logLevel = 0;
 	System.forceES5 = true;
+	System.transpileAllFormats = true;
 	var cssBundlesNameGlob = "bundles/*.css",
 		jsBundlesNameGlob = "bundles/*";
 	setIfNotPresent(System.paths,cssBundlesNameGlob, "dist/bundles/*css");
@@ -1988,9 +2015,11 @@ addStealExtension(function addCacheBust(loader) {
 				this.paths["@@babel-code-frame"] = dirname+"/ext/babel-code-frame.js";
 				setIfNotPresent(this.meta,"traceur",{"exports":"traceur"});
 				setIfNotPresent(this.meta, "@@babel-code-frame", {"format":"global","exports":"BabelCodeFrame"});
+				setIfNotPresent(this.meta, "babel", {"shouldTranspile": false});
 
 				// steal-clone is contextual so it can override modules using relative paths
 				this.setContextual('steal-clone', 'steal-clone');
+				this.setForwardedMetadata("shouldTranspile");
 
 				if(isNode) {
 					if(this.configMain === "@config" && last(parts) === "steal") {

src/config.js

@@ -40,6 +40,7 @@
 	System.ext = Object.create(null);
 	System.logLevel = 0;
 	System.forceES5 = true;
+	System.transpileAllFormats = true;
 	var cssBundlesNameGlob = "bundles/*.css",
 		jsBundlesNameGlob = "bundles/*";
 	setIfNotPresent(System.paths,cssBundlesNameGlob, "dist/bundles/*css");
@@ -293,9 +294,11 @@
 				this.paths["@@babel-code-frame"] = dirname+"/ext/babel-code-frame.js";
 				setIfNotPresent(this.meta,"traceur",{"exports":"traceur"});
 				setIfNotPresent(this.meta, "@@babel-code-frame", {"format":"global","exports":"BabelCodeFrame"});
+				setIfNotPresent(this.meta, "babel", {"shouldTranspile": false});
 
 				// steal-clone is contextual so it can override modules using relative paths
 				this.setContextual('steal-clone', 'steal-clone');
+				this.setForwardedMetadata("shouldTranspile");
 
 				if(isNode) {
 					if(this.configMain === "@config" && last(parts) === "steal") {

src/extension-forward-metadata.js

@@ -0,0 +1,24 @@
+// This extension allows you to define metadata that should appear on
+// Any subdependencies. For example we can add the { foo: true } bool
+// to a module's metadata, and it will be forwarded to any subdependency.
+addStealExtension(function forwardMetadata(loader){
+	loader._forwardedMetadata = {};
+	loader.setForwardedMetadata = function(prop) {
+		loader._forwardedMetadata[prop] = true;
+	};
+
+	loader.forwardMetadata = function(load, parentName) {
+		  if(parentName) {
+			  var parentLoad = this.getModuleLoad(parentName);
+
+			  if(parentLoad) {
+				  // TODO use Object.assign instead?
+				  for(var p in this._forwardedMetadata) {
+					  if(p in parentLoad.metadata) {
+						  load.metadata[p] = parentLoad.metadata[p];
+					  }
+				  }
+			  }
+		  }
+	};
+});

src/extension-no-main.js

@@ -17,7 +17,8 @@ addStealExtension(function addNoMainWarn(loader) {
 		"package.json!npm": true,
 		"npm": true,
 		"@empty": true,
-		"@dev": true
+		"@dev": true,
+		"babel": true
 	};
 
 	var loaderImport = loader.import;

src/loader/lib/loader.js

@@ -212,6 +212,8 @@ function logloads(loads) {
       load = createLoad(name);
       loader.loads.push(load);
 
+	  loader.loaderObj.forwardMetadata(load, refererName);
+
       proceedToLocate(loader, load);
 
       return load;
@@ -245,6 +247,10 @@ function logloads(loads) {
     );
   }
 
+  function transpilableFormat(format) {
+	  return format === "cjs" || format === "amd";
+  }
+
   var anonCnt = 0;
 
   // 15.2.4.5
@@ -300,9 +306,20 @@ function logloads(loads) {
           });
         }
         else if (typeof instantiateResult == 'object') {
-          load.depsList = instantiateResult.deps || [];
-          load.execute = instantiateResult.execute;
-          load.isDeclarative = false;
+			function addToLoad() {
+				load.depsList = instantiateResult.deps || [];
+				load.execute = instantiateResult.execute;
+				load.isDeclarative = false;
+			}
+
+			if(!loader.loaderObj.transpileAllFormats ||
+				load.metadata.shouldTranspile === false ||
+				!transpilableFormat(load.metadata.format)) {
+				return addToLoad();
+			}
+
+			return loader.loaderObj.transpile(load).then(addToLoad);
+
         }
         else
           throw TypeError('Invalid instantiate return value');

src/loader/lib/transpiler.js

@@ -97,7 +97,8 @@
 		}
 		catch(e) {
 			// traceur throws an error array
-			throw e[0];
+			var error = e[0] || e.errors[0];
+			throw error;
 		}
 	}
 
@@ -217,7 +218,12 @@
 					var npmPluginNameOrPath = getNpmPluginNameOrPath(name);
 
 					// import the plugin!
-					promises.push(this["import"](npmPluginNameOrPath, { name: parent })
+					promises.push(this["import"](npmPluginNameOrPath, {
+						name: parent,
+						metadata: {
+							shouldTranspile: false
+						}
+					})
 						.then(function(mod) {
 							var exported = mod.__esModule ? mod["default"] : mod;
 
@@ -298,7 +304,7 @@
 	function getBabelPresets(current, loader) {
 		var presets = current || [];
 		var forceES5 = loader.forceES5 !== false;
-		var defaultPresets = forceES5 
+		var defaultPresets = forceES5
 			? [babelES2015Preset, "react", "stage-0"]
 			: ["react"];
 
@@ -438,7 +444,12 @@
 					var npmPresetNameOrPath = getNpmPresetNameOrPath(name);
 
 					// import the preset!
-					promises.push(this["import"](npmPresetNameOrPath, { name: parent })
+					promises.push(this["import"](npmPresetNameOrPath, {
+						name: parent,
+						metadata: {
+							shouldTranspile: false
+						}
+					})
 						.then(function(mod) {
 							var exported = mod.__esModule ? mod["default"] : mod;
 

src/loader/loader-with-promises.js

@@ -1522,6 +1522,8 @@ function logloads(loads) {
       load = createLoad(name);
       loader.loads.push(load);
 
+	  loader.loaderObj.forwardMetadata(load, refererName);
+
       proceedToLocate(loader, load);
 
       return load;
@@ -1555,6 +1557,10 @@ function logloads(loads) {
     );
   }
 
+  function transpilableFormat(format) {
+	  return format === "cjs" || format === "amd";
+  }
+
   var anonCnt = 0;
 
   // 15.2.4.5
@@ -1610,9 +1616,20 @@ function logloads(loads) {
           });
         }
         else if (typeof instantiateResult == 'object') {
-          load.depsList = instantiateResult.deps || [];
-          load.execute = instantiateResult.execute;
-          load.isDeclarative = false;
+			function addToLoad() {
+				load.depsList = instantiateResult.deps || [];
+				load.execute = instantiateResult.execute;
+				load.isDeclarative = false;
+			}
+
+			if(!loader.loaderObj.transpileAllFormats ||
+				load.metadata.shouldTranspile === false ||
+				!transpilableFormat(load.metadata.format)) {
+				return addToLoad();
+			}
+
+			return loader.loaderObj.transpile(load).then(addToLoad);
+
         }
         else
           throw TypeError('Invalid instantiate return value');
@@ -2648,7 +2665,8 @@ function logloads(loads) {
 		}
 		catch(e) {
 			// traceur throws an error array
-			throw e[0];
+			var error = e[0] || e.errors[0];
+			throw error;
 		}
 	}
 
@@ -2768,7 +2786,12 @@ function logloads(loads) {
 					var npmPluginNameOrPath = getNpmPluginNameOrPath(name);
 
 					// import the plugin!
-					promises.push(this["import"](npmPluginNameOrPath, { name: parent })
+					promises.push(this["import"](npmPluginNameOrPath, {
+						name: parent,
+						metadata: {
+							shouldTranspile: false
+						}
+					})
 						.then(function(mod) {
 							var exported = mod.__esModule ? mod["default"] : mod;
 
@@ -2849,7 +2872,7 @@ function logloads(loads) {
 	function getBabelPresets(current, loader) {
 		var presets = current || [];
 		var forceES5 = loader.forceES5 !== false;
-		var defaultPresets = forceES5 
+		var defaultPresets = forceES5
 			? [babelES2015Preset, "react", "stage-0"]
 			: ["react"];
 
@@ -2989,7 +3012,12 @@ function logloads(loads) {
 					var npmPresetNameOrPath = getNpmPresetNameOrPath(name);
 
 					// import the preset!
-					promises.push(this["import"](npmPresetNameOrPath, { name: parent })
+					promises.push(this["import"](npmPresetNameOrPath, {
+						name: parent,
+						metadata: {
+							shouldTranspile: false
+						}
+					})
 						.then(function(mod) {
 							var exported = mod.__esModule ? mod["default"] : mod;