Merge pull request #1421 from stealjs/load-bundles-false

Adds load-bundles=false
stealjs · Jun 11, 2018 · 3930a58 · 3930a58
2 parents 31d4a94 + 2bdc9b6
commit 3930a58
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 6 deletions.
diff --git a/main.js b/main.js
@@ -1313,7 +1313,7 @@ addStealExtension(function (loader) {
 			return {
 				order: order,
 				set: function(val) {
-					this[prop] = !!val;
+					this[prop] = !!val && val !== "false";
 				}
 			}
 		},

diff --git a/src/config.js b/src/config.js
@@ -72,7 +72,7 @@
 			return {
 				order: order,
 				set: function(val) {
-					this[prop] = !!val;
+					this[prop] = !!val && val !== "false";
 				}
 			}
 		},

diff --git a/steal-sans-promises.js b/steal-sans-promises.js
@@ -6039,7 +6039,7 @@ addStealExtension(function (loader) {
 			return {
 				order: order,
 				set: function(val) {
-					this[prop] = !!val;
+					this[prop] = !!val && val !== "false";
 				}
 			}
 		},

diff --git a/steal-sans-promises.production.js b/steal-sans-promises.production.js
diff --git a/steal.js b/steal.js
@@ -7309,7 +7309,7 @@ addStealExtension(function (loader) {
 			return {
 				order: order,
 				set: function(val) {
-					this[prop] = !!val;
+					this[prop] = !!val && val !== "false";
 				}
 			}
 		},

diff --git a/steal.production.js b/steal.production.js
diff --git a/test/load-bundles/config.js b/test/load-bundles/config.js
@@ -0,0 +1,9 @@
+var loader = require("@loader");
+
+loader.config({
+	meta: {
+		"jquerty": {
+			exports: "jQuerty"
+		}
+	}
+});
diff --git a/test/load-bundles/dev.html b/test/load-bundles/dev.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+</head>
+<body>
+	<script>
+		window.done = window.parent.done;
+		window.assert = window.parent.assert;
+	</script>
+	<script src="../../steal.js"
+			data-config="./config.js"
+			data-main="dev"
+			load-bundles="false"
+			data-env="production"></script>
+</body>
+</html>
diff --git a/test/load-bundles/dev.js b/test/load-bundles/dev.js
@@ -0,0 +1,10 @@
+
+module.exports = {};
+
+if(typeof window !== "undefined" && window.assert) {
+	assert.ok(true, "Dev loaded fine");
+	done();
+	return {};
+} else {
+	console.log("works!");
+}
diff --git a/test/test.js b/test/test.js
@@ -196,6 +196,10 @@ QUnit.test("loadBundles true with a different env loads the bundles", function(a
 	makeIframe("load-bundles/prod.html", assert);
 });
 
+QUnit.test("loadBundles can be disabled", function(assert) {
+	makeIframe("load-bundles/dev.html", assert);
+})
+
 QUnit.test("Using path's * qualifier", function(assert) {
 	writeIframe(
 		makeStealHTML({