Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 22:45:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

closed #1328

Browse Source
This commit is contained in:
Julian Lam
2014-04-03 17:27:26 -04:00
parent f3a78c2b6f
commit 7a993eb2ca
4 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
minifier.js
View File

@@ -10,31 +10,31 @@ var uglifyjs = require('uglify-js'),
/* Javascript */ /* Javascript */
Minifier.js.minify = function (scripts, callback) { Minifier.js.minify = function (scripts, callback) {
// winston.info('[meta/js] Minifying client-side libraries...'); try {
var minified = uglifyjs.minify(scripts); var minified = uglifyjs.minify(scripts);
callback(minified.code);
callback(minified.code); } catch(err) {
process.send({
// winston.info('[meta/js] Done.'); action: 'error',
error: err
});
}
}; };
Minifier.js.concatenate = function(scripts, callback) { Minifier.js.concatenate = function(scripts, callback) {
// winston.info('[meta/js] Concatenating client-side libraries into one file...');
async.map(scripts, function(path, next) { async.map(scripts, function(path, next) {
fs.readFile(path, { encoding: 'utf-8' }, next); fs.readFile(path, { encoding: 'utf-8' }, next);
}, function(err, contents) { }, function(err, contents) {
if (err) { if (err) {
// winston.error('[meta/js] Could not minify javascript! Error: ' + err.message); process.send({
console.log('ERROR'); action: 'error',
process.exit(); error: err
});
} else {
callback(contents.reduce(function(output, src) {
return output.length ? output + ';\n' + src : src;
}, ''));
} }
callback(contents.reduce(function(output, src) {
return output.length ? output + ';\n' + src : src;
}, ''));
// winston.info('[meta/js] Done.');
}); });
}; };

25
src/meta.js
View File

@@ -7,6 +7,7 @@ var fs = require('fs'),
nconf = require('nconf'), nconf = require('nconf'),
_ = require('underscore'), _ = require('underscore'),
less = require('less'), less = require('less'),
fork = require('child_process').fork,
utils = require('./../public/src/utils'), utils = require('./../public/src/utils'),
translator = require('./../public/src/translator'), translator = require('./../public/src/translator'),
@@ -292,6 +293,30 @@ var fs = require('fs'),
Meta.js.prepared = true; Meta.js.prepared = true;
callback(); callback();
}); });
},
minify: function(minify) {
// Prepare js for minification/concatenation
var minifier = fork('minifier.js');
minifier.on('message', function(payload) {
if (payload.action !== 'error') {
winston.info('[meta/js] Compilation complete');
Meta.js.cache = payload.data;
minifier.kill();
} else {
winston.error('[meta/js] Could not compile client-side scripts!');
winston.error('[meta/js] ' + payload.error.message);
minifier.kill();
process.exit();
}
});
this.prepare(function() {
minifier.send({
action: minify ? 'js.minify' : 'js.concatenate',
scripts: Meta.js.scripts
});
});
} }
}; };

24
src/webserver.js
View File

@@ -7,7 +7,6 @@ var path = require('path'),
server, server,
winston = require('winston'), winston = require('winston'),
async = require('async'), async = require('async'),
fork = require('child_process').fork,
emailer = require('./emailer'), emailer = require('./emailer'),
db = require('./database'), db = require('./database'),
@@ -90,28 +89,9 @@ if(nconf.get('ssl')) {
winston.info('Using ports 80 and 443 is not recommend; use a proxy instead. See README.md'); winston.info('Using ports 80 and 443 is not recommend; use a proxy instead. See README.md');
} }
// Front-end assets
plugins.ready(function() { plugins.ready(function() {
// Prepare js for minification/concatenation meta.js.minify(app.enabled('minification'));
var minifier = fork('minifier.js');
minifier.on('message', function(payload) {
switch(payload.action) {
case 'js.minify': // Intentional fall-through
case 'js.concatenate':
winston.info('[meta/js] Compilation complete');
meta.js.cache = payload.data;
break;
}
});
meta.js.prepare(function() {
minifier.send({
action: app.enabled('minification') ? 'js.minify' : 'js.concatenate',
scripts: meta.js.scripts
});
});
// Minify CSS
meta.css.minify(); meta.css.minify();
}); });