Merge branch 'change-password-backend' into feature/account-settings

pull/85/head
Fabian Jakobs 2015-04-24 11:25:22 +00:00
commit 8fa0c9b074
1 zmienionych plików z 9 dodań i 7 usunięć

Wyświetl plik

@ -199,19 +199,21 @@ dest = "/build/webkitbuilds/app.nw"
var args = ["local","-s", "local"];
*/
module.exports = function(options, cb) {
var dest = convertPath(options.dest);
var dest = options.dest && convertPath(options.dest);
var root = convertPath(options.root);
var args = options.args;
ignore = options.ignore && function(id) {
return options.ignore.test(id);
};
build(root, args, function(err, result) {
var serverSource = fs.readFileSync(root + "/server.js", "utf8");
serverSource = serverSource.replace(/^(#.*|"use strict";?|\s)*/, function(a) {
return a.trim() + "\n\n" + patchTemplate + "\n\n";
});
fs.writeFileSync(dest + "/server.js", serverSource, "utf8");
fs.writeFileSync(dest + "/module-map.json", JSON.stringify(result.moduleMap), "utf8");
if (dest) {
var serverSource = fs.readFileSync(root + "/server.js", "utf8");
serverSource = serverSource.replace(/^(#.*|"use strict";?|\s)*/, function(a) {
return a.trim() + "\n\n" + patchTemplate + "\n\n";
});
fs.writeFileSync(dest + "/server.js", serverSource, "utf8");
fs.writeFileSync(dest + "/module-map.json", JSON.stringify(result.moduleMap), "utf8");
}
cb(null, result);
});