status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

expose buildDir to webserver in same manner as its done for pipeline

This commit is contained in:
Michael Bradley, Jr 2018-08-31 14:51:18 -05:00
parent 1d9237820a
commit 1d38af1f58
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/core/engine.js
View File

@ -228,6 +228,7 @@ class Engine {
} }
webServerService(_options) { webServerService(_options) {
_options.buildDir = this.config.buildDir;
this.registerModule('webserver', _options); this.registerModule('webserver', _options);
} }

2
lib/modules/webserver/index.js
View File

@ -8,6 +8,7 @@ class WebServer {
this.embark = embark; this.embark = embark;
this.logger = embark.logger; this.logger = embark.logger;
this.events = embark.events; this.events = embark.events;
this.buildDir = options.buildDir;
this.webServerConfig = embark.config.webServerConfig; this.webServerConfig = embark.config.webServerConfig;
if (!this.webServerConfig.enabled) { if (!this.webServerConfig.enabled) {
return; return;
@ -19,6 +20,7 @@ class WebServer {
this.events.emit("status", __("Starting Server")); this.events.emit("status", __("Starting Server"));
this.server = new Server({host: this.host, port: this.port}); this.server = new Server({host: this.host, port: this.port});
buildDir: this.buildDir,
this.testPort(() => { this.testPort(() => {
this.listenToCommands(); this.listenToCommands();
this.registerConsoleCommands(); this.registerConsoleCommands();

4
lib/modules/webserver/server.js
View File

@ -12,7 +12,7 @@ const embark_building_placeholder = require('../code_generator/code_templates/em
class Server { class Server {
constructor(options) { constructor(options) {
this.dist = options.dist || 'dist/'; this.buildDir = options.buildDir;
this.port = options.port || 8000; this.port = options.port || 8000;
this.hostname = dockerHostSwap(options.host) || defaultHost; this.hostname = dockerHostSwap(options.host) || defaultHost;
this.isFirstStart = true; this.isFirstStart = true;
@ -26,7 +26,7 @@ class Server {
":" + this.port).bold.underline.green; ":" + this.port).bold.underline.green;
return callback(null, message); return callback(null, message);
} }
let serve = serveStatic(this.dist, {'index': ['index.html', 'index.htm']}); let serve = serveStatic(this.buildDir, {'index': ['index.html', 'index.htm']});
this.server = http.createServer(function onRequest(req, res) { this.server = http.createServer(function onRequest(req, res) {
serve(req, res, finalhandler(req, res)); serve(req, res, finalhandler(req, res));