embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

propagate env

This commit is contained in:
Michael Bradley, Jr 2018-07-19 20:47:11 -05:00 committed by Iuri Matias
parent 4baea520d8
commit 25be46af2c
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/core/engine.js
View File

@ -100,6 +100,7 @@ class Engine {
this.events.emit("status", "Building Assets"); this.events.emit("status", "Building Assets");
const Pipeline = require('../pipeline/pipeline.js'); const Pipeline = require('../pipeline/pipeline.js');
const pipeline = new Pipeline({ const pipeline = new Pipeline({
env: this.env,
buildDir: this.config.buildDir, buildDir: this.config.buildDir,
contractsFiles: this.config.contractsFiles, contractsFiles: this.config.contractsFiles,
assetFiles: this.config.assetFiles, assetFiles: this.config.assetFiles,

4
lib/pipeline/pipeline.js
View File

@ -12,6 +12,7 @@ require("babel-preset-es2017");
class Pipeline { class Pipeline {
constructor(options) { constructor(options) {
this.env = options.env;
this.buildDir = options.buildDir; this.buildDir = options.buildDir;
this.contractsFiles = options.contractsFiles; this.contractsFiles = options.contractsFiles;
this.assetFiles = options.assetFiles; this.assetFiles = options.assetFiles;
@ -103,6 +104,7 @@ class Pipeline {
function runWebpack(next) { function runWebpack(next) {
let built = false; let built = false;
const webpackProcess = new ProcessLauncher({ const webpackProcess = new ProcessLauncher({
env: self.env,
modulePath: utils.joinPath(__dirname, 'webpackProcess.js'), modulePath: utils.joinPath(__dirname, 'webpackProcess.js'),
logger: self.logger, logger: self.logger,
events: self.events, events: self.events,
@ -115,7 +117,7 @@ class Pipeline {
} }
} }
}); });
webpackProcess.send({action: constants.pipeline.init, options: {}}); webpackProcess.send({action: constants.pipeline.init, options: {env: self.env}});
webpackProcess.send({action: constants.pipeline.build, file, importsList}); webpackProcess.send({action: constants.pipeline.build, file, importsList});
webpackProcess.once('result', constants.pipeline.built, (msg) => { webpackProcess.once('result', constants.pipeline.built, (msg) => {

1
lib/process/processLauncher.js
View File

@ -14,6 +14,7 @@ class ProcessLauncher {
* @return {ProcessLauncher} The ProcessLauncher instance * @return {ProcessLauncher} The ProcessLauncher instance
*/ */
constructor(options) { constructor(options) {
this.env = options.env;
this.name = path.basename(options.modulePath); this.name = path.basename(options.modulePath);
this.process = child_process.fork(options.modulePath); this.process = child_process.fork(options.modulePath);
this.logger = options.logger; this.logger = options.logger;

1
lib/process/processWrapper.js
View File

@ -17,6 +17,7 @@ class ProcessWrapper {
*/ */
constructor(_options) { constructor(_options) {
this.interceptLogs(); this.interceptLogs();
this.env = _options ? _options.env : 'development';
this.events = new Events(); this.events = new Events();
this.pingParent(); this.pingParent();