Use local babelOptions defined by package

stealjs · Jul 19, 2018 · 0f75e27 · 0f75e27
1 parent 17bf502
commit 0f75e27
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 25 deletions.
diff --git a/lib/graph/treeshake.js b/lib/graph/treeshake.js
@@ -132,32 +132,47 @@ function loadFromGraph(getNode) {
 
 function transpile(getNode, data) {
 	let loader = data.loader;
-	let opts = loader.babelOptions || {};
-	let required = ["es2015", {loose: false, modules: false}];
 
-	opts.presets = processBabelPresets({
-		baseURL: loader.baseURL,
-		babelOptions: opts,
-		loaderEnv: loader.getEnv()
-	});
+	function getBabelOptions(node) {
+		let opts = loader.babelOptions || {};
+		var npmPkg = node.load.metadata.npmPackage;
+		if(npmPkg) {
+			var pkgSteal = npmPkg.steal || npmPkg.system;
+			if(pkgSteal && pkgSteal.babelOptions) {
+				opts = pkgSteal.babelOptions;
+			}
+		}
+		return opts;
+	}
 
-	opts.plugins = processBabelPlugins({
-		baseURL: loader.baseURL,
-		babelOptions: opts,
-		loaderEnv: loader.getEnv()
-	});
+	function setBabelOptions(opts) {
+		let required = ["es2015", {loose: false, modules: false}];
 
-	if(opts.presets && opts.presets.length) {
-		opts.presets = [required].concat(opts.presets);
-	} else {
-		opts.presets = [
-			"react",
-			"stage-0",
-			required
-		];
-	}
+		opts.presets = processBabelPresets({
+			baseURL: loader.baseURL,
+			babelOptions: opts,
+			loaderEnv: loader.getEnv()
+		});
 
-	opts.sourceMaps = true;
+		opts.plugins = processBabelPlugins({
+			baseURL: loader.baseURL,
+			babelOptions: opts,
+			loaderEnv: loader.getEnv()
+		});
+
+		if(opts.presets && opts.presets.length) {
+			opts.presets = [required].concat(opts.presets);
+		} else {
+			opts.presets = [
+				"react",
+				"stage-0",
+				required
+			];
+		}
+
+		opts.sourceMaps = true;
+		return opts;
+	}
 
 	return {
 		transform: function(code, id) {
@@ -166,6 +181,8 @@ function transpile(getNode, data) {
 				return code;
 			}
 
+			let opts = setBabelOptions(getBabelOptions(node));
+
 			let result = babel.transform(code, opts);
 
 			for(let depName of node.load.metadata.dependencies) {

diff --git a/test/dev_bundle_forward/dev.html b/test/dev_bundle_forward/dev.html
@@ -8,10 +8,11 @@
 </head>
 <body>
 	<script
-		src="../../node_modules/steal/steal-sans-promises.js"
+		src="../../node_modules/steal/steal.js"
 		base-url="."
 		config-main="package.json!npm"
 		dev-bundle
+		main
 	></script>
 </body>
 </html>
diff --git a/test/dev_bundles_minify/dev.html b/test/dev_bundles_minify/dev.html
@@ -7,10 +7,11 @@
 	<title>Minified development bundles</title>
 </head>
 <body>
-	<script src="../../node_modules/steal/steal-sans-promises.js"
+	<script src="../../node_modules/steal/steal.js"
 		base-url="."
 		config-main="package.json!npm"
 		deps-bundle="dev-bundle"
+		main
 	></script>
 </body>
-</html>
+</html>