Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 12:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

some more cleanup

Browse Source
This commit is contained in:
psychobunny
2016-01-18 14:18:17 -05:00
parent 3cc5e1473f
commit 5e4ef52911
1 changed files with 56 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
src/meta/js.js
View File

@@ -82,7 +82,62 @@ module.exports = function(Meta) {
}
};
Meta.js.prepare = function (callback) {
Meta.js.minify = function(callback) {
if (nconf.get('isPrimary') !== 'true') {
if (typeof callback === 'function') {
callback();
}
return;
}
var forkProcessParams = setupDebugging();
var minifier = Meta.js.minifierProc = fork('minifier.js', [], forkProcessParams);
Meta.js.prepare(function() {
minifier.send({
action: 'js',
minify: global.env !== 'development',
scripts: Meta.js.scripts.all
});
});
minifier.on('message', function(message) {
switch(message.type) {
case 'end':
Meta.js.cache = message.minified;
Meta.js.map = message.sourceMap;
winston.verbose('[meta/js] Minification complete');
minifier.kill();
if (process.send) {
process.send({
action: 'js-propagate',
cache: Meta.js.cache,
map: Meta.js.map
});
}
Meta.js.commitToFile();
if (typeof callback === 'function') {
callback();
}
break;
case 'error':
winston.error('[meta/js] Could not compile client-side scripts! ' + message.payload.message);
minifier.kill();
if (typeof callback === 'function') {
callback(new Error(message.payload.message));
} else {
process.exit(0);
}
break;
}
});
};
Meta.js.prepare = function(callback) {
async.parallel([
async.apply(getPluginScripts), // plugin scripts via filter:scripts.get
function(next) { // client scripts via "scripts" config in plugin.json
@@ -123,68 +178,6 @@ module.exports = function(Meta) {
});
};
Meta.js.minify = function(callback) {
if (nconf.get('isPrimary') === 'true') {
var forkProcessParams = setupDebugging();
var minifier = Meta.js.minifierProc = fork('minifier.js', [], forkProcessParams),
onComplete = function(err) {
if (err) {
winston.error('[meta/js] Minification failed: ' + err.message);
process.exit(0);
}
winston.verbose('[meta/js] Minification complete');
minifier.kill();
if (process.send) {
process.send({
action: 'js-propagate',
cache: Meta.js.cache,
map: Meta.js.map
});
}
Meta.js.commitToFile();
if (typeof callback === 'function') {
callback();
}
};
minifier.on('message', function(message) {
switch(message.type) {
case 'end':
Meta.js.cache = message.minified;
Meta.js.map = message.sourceMap;
onComplete();
break;
case 'error':
winston.error('[meta/js] Could not compile client-side scripts! ' + message.payload.message);
minifier.kill();
if (typeof callback === 'function') {
callback(new Error(message.payload.message));
} else {
process.exit(0);
}
break;
}
});
Meta.js.prepare(function() {
minifier.send({
action: 'js',
minify: global.env !== 'development',
scripts: Meta.js.scripts.all
});
});
} else {
if (typeof callback === 'function') {
callback();
}
}
};
Meta.js.killMinifier = function() {
if (Meta.js.minifierProc) {
Meta.js.minifierProc.kill('SIGTERM');