This commit is contained in:
Jonathan Rainville 2018-05-08 09:04:53 -04:00
parent 1fe6f4ee2c
commit af38383e0f
1 changed files with 143 additions and 131 deletions

View File

@ -56,7 +56,7 @@ class Pipeline {
this.buildContracts(contractsJSON);
self.buildWeb3JS(function(err) {
self.buildWeb3JS(function (err) {
if (err) {
return callback(err);
}
@ -82,7 +82,7 @@ class Pipeline {
async.eachOfLimit(self.assetFiles, 1, function (files, targetFile, cb) {
// limit:1 due to issues when downloading required files such as web3.js
async.mapLimit(files, 1,
function(file, fileCb) {
function (file, fileCb) {
file = new File(file); // Re-instantiate a File as through the process, we lose its prototype
self.log("reading " + file.filename);
@ -154,7 +154,7 @@ class Pipeline {
self.runPlugins(file, fileContent, next);
}
], function(err, contentFile) {
], function (err, contentFile) {
if (err) {
process.chdir(realCwd);
self.log(err);
@ -164,7 +164,7 @@ class Pipeline {
fileCb(null, contentFile);
});
} else {
file.content(function(fileContent) {
file.content(function (fileContent) {
self.runPlugins(file, fileContent, fileCb);
});
}
@ -215,10 +215,16 @@ class Pipeline {
runPlugins(file, fileContent, fileCb) {
const self = this;
if (self.pipelinePlugins.length <= 0) {
return fileCb(null, {content: fileContent, filename: file.filename, path: file.path, basedir: file.basedir, modified: true});
return fileCb(null, {
content: fileContent,
filename: file.filename,
path: file.path,
basedir: file.basedir,
modified: true
});
}
async.eachSeries(self.pipelinePlugins,
function(plugin, pluginCB) {
function (plugin, pluginCB) {
if (file.options && file.options.skipPipeline) {
return pluginCB();
}
@ -231,7 +237,13 @@ class Pipeline {
if (err) {
self.log(err.message);
}
return fileCb(null, {content: fileContent, filename: file.filename, path: file.path, basedir: file.basedir, modified: true});
return fileCb(null, {
content: fileContent,
filename: file.filename,
path: file.path,
basedir: file.basedir,
modified: true
});
}
);
}
@ -251,7 +263,7 @@ class Pipeline {
fs.dappPath('node_modules')
]
},
externals: function(context, request, callback) {
externals: function (context, request, callback) {
callback();
}
};