Merge pull request #999 from stealjs/node-prod

When running in Node, make sure to add Production bundles
stealjs · Jan 11, 2017 · 4eb5d3b · 4eb5d3b
2 parents bc9f817 + bca494a
commit 4eb5d3b
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 7 deletions.
diff --git a/main.js b/main.js
@@ -1159,11 +1159,12 @@ addStealExtension(function (loader) {
 						parts.pop();
 						if(last(parts) === "node_modules") {
 							this.configMain = "package.json!npm";
-							addProductionBundles.call(this);
 							parts.pop();
 						}
 					}
-
+					if(this.isEnv("production") || this.loadBundles) {
+						addProductionBundles.call(this);
+					}
 				} else {
 					// make sure we don't set baseURL if it already set
 					if(!cfg.baseURL && !cfg.config && !cfg.configPath) {

diff --git a/src/config.js b/src/config.js
@@ -295,11 +295,12 @@
 						parts.pop();
 						if(last(parts) === "node_modules") {
 							this.configMain = "package.json!npm";
-							addProductionBundles.call(this);
 							parts.pop();
 						}
 					}
-
+					if(this.isEnv("production") || this.loadBundles) {
+						addProductionBundles.call(this);
+					}
 				} else {
 					// make sure we don't set baseURL if it already set
 					if(!cfg.baseURL && !cfg.config && !cfg.configPath) {

diff --git a/steal.js b/steal.js
@@ -6232,11 +6232,12 @@ addStealExtension(function (loader) {
 						parts.pop();
 						if(last(parts) === "node_modules") {
 							this.configMain = "package.json!npm";
-							addProductionBundles.call(this);
 							parts.pop();
 						}
 					}
-
+					if(this.isEnv("production") || this.loadBundles) {
+						addProductionBundles.call(this);
+					}
 				} else {
 					// make sure we don't set baseURL if it already set
 					if(!cfg.baseURL && !cfg.config && !cfg.configPath) {

diff --git a/steal.production.js b/steal.production.js
diff --git a/test/node-prod/dist/bundles/app/app.js b/test/node-prod/dist/bundles/app/app.js
@@ -0,0 +1,8 @@
+define("stealconfig.js", [], function(){
+
+});
+define("app/app", [], function(){
+	return {
+		hello: "world"
+	};
+});
diff --git a/test/node_test.js b/test/node_test.js
@@ -22,6 +22,18 @@ describe("default configuration", function () {
 			done();
 		},done);
 	});
+
+	it("works in production", function(done){
+		var steal = makeSteal({
+			env: "server-production",
+			config: __dirname + "/node-prod/stealconfig.js",
+			main: "app/app"
+		});
+
+		steal.startup().then(function(main){
+			assert.equal(main.hello, "world");
+		}).then(done, done);
+	});
 });
 
 describe("plugins", function(){