From 232b38765233769062a5338e9596645f1622fac6 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 17 Nov 2016 11:51:38 -0500
Subject: [PATCH] set up plugins in build step as well

---
 app.js         | 4 +++-
 src/plugins.js | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index d0dbea56e7..f308b56d50 100644
--- a/app.js
+++ b/app.js
@@ -279,6 +279,7 @@ function setup() {
 function build(targets, callback) {
 	var db = require('./src/database');
 	var meta = require('./src/meta');
+	var plugins = require('./src/plugins');
 	var valid = ['js', 'css', 'tpl'];
 	var step = function (target, next) {
 		winston.info('[build] Build step completed in ' + ((Date.now() - startTime) / 1000) + 's');
@@ -297,7 +298,8 @@ function build(targets, callback) {
 
 	async.series([
 		async.apply(db.init),
-		async.apply(meta.themes.setupPaths)
+		async.apply(meta.themes.setupPaths),
+		async.apply(plugins.init, null, null)
 	], function (err) {
 		if (err) {
 			winston.error('[build] Encountered error preparing for build: ' + err.message);
diff --git a/src/plugins.js b/src/plugins.js
index 042561759a..1a20597564 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -48,9 +48,11 @@ var middleware;
 			return callback();
 		}
 
-		app = nbbApp;
-		middleware = nbbMiddleware;
-		hotswap.prepare(nbbApp);
+		if (nbbApp) {
+			app = nbbApp;
+			middleware = nbbMiddleware;
+			hotswap.prepare(nbbApp);
+		}
 
 		if (global.env === 'development') {
 			winston.verbose('[plugins] Initializing plugins system');