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

closed #2419

Browse Source
This commit is contained in:
Julian Lam
2014-11-17 11:24:46 -05:00
parent 0a1fa72bd8
commit 207bfa8960
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -31,7 +31,7 @@
"gm": "1.16.0",
"gravatar": "^1.1.0",
"heapdump": "^0.3.0",
"less": "^1.7.5",
"less": "^2.0.0",
"logrotate-stream": "^0.2.3",
"mkdirp": "~0.5.0",
"morgan": "^1.3.2",

35
src/meta/css.js
View File

@@ -23,7 +23,7 @@ module.exports = function(Meta) {
Meta.css.minify = function(callback) {
if (!cluster.isWorker || process.env.cluster_setup === 'true') {
winston.info('[meta/css] Minifying LESS/CSS');
winston.verbose('[meta/css] Minifying LESS/CSS');
db.getObjectFields('config', ['theme:type', 'theme:id'], function(err, themeData) {
var themeId = (themeData['theme:id'] || 'nodebb-theme-vanilla'),
baseThemePath = path.join(nconf.get('themes_path'), (themeData['theme:type'] && themeData['theme:type'] === 'local' ? themeId : 'nodebb-theme-vanilla')),
@@ -80,6 +80,7 @@ module.exports = function(Meta) {
});
});
} else {
winston.verbose('[meta/css] Cluster worker ' + cluster.worker.id + ' skipping LESS/CSS compilation');
if (typeof callback === 'function') {
callback();
}
@@ -91,7 +92,7 @@ module.exports = function(Meta) {
fs.writeFile(path.join(__dirname, '../../public/' + file), Meta.css[filename], function(err) {
if (!err) {
winston.info('[meta/css] ' + file + ' committed to disk.');
winston.verbose('[meta/css] ' + file + ' committed to disk.');
} else {
winston.error('[meta/css] ' + err.message);
process.exit(0);
@@ -105,7 +106,7 @@ module.exports = function(Meta) {
fs.exists(cachePath, function(exists) {
if (exists) {
if (!cluster.isWorker || process.env.cluster_setup === 'true') {
winston.info('[meta/css] (Experimental) Reading stylesheets from file');
winston.verbose('[meta/css] (Experimental) Reading stylesheets from file');
async.map([cachePath, acpCachePath], fs.readFile, function(err, files) {
Meta.css.cache = files[0];
Meta.css.acpCache = files[1];
@@ -124,11 +125,9 @@ module.exports = function(Meta) {
};
function minify(source, paths, destination, callback) {
var parser = new (less.Parser)({
paths: paths
});
parser.parse(source, function(err, tree) {
less.render(source, {
paths: paths
}, function(err, lessOutput) {
if (err) {
winston.error('[meta/css] Could not minify LESS/CSS: ' + err.message);
if (typeof callback === 'function') {
@@ -137,26 +136,12 @@ module.exports = function(Meta) {
return;
}
var css;
try {
css = tree.toCSS({
cleancss: true
});
} catch (err) {
winston.error('[meta/css] Syntax Error: ' + err.message + ' - ' + path.basename(err.filename) + ' on line ' + err.line);
if (typeof callback === 'function') {
callback(err);
}
return;
}
Meta.css[destination] = css;
Meta.css[destination] = lessOutput.css;
// Calculate css buster
var hasher = crypto.createHash('md5');
hasher.update(css, 'utf-8');
hasher.update(lessOutput.css, 'utf-8');
Meta.css.hash = hasher.digest('hex').slice(0, 8);
// Save the compiled CSS in public/ so things like nginx can serve it
@@ -165,7 +150,7 @@ module.exports = function(Meta) {
}
if (typeof callback === 'function') {
callback(null, css);
callback(null, lessOutput.css);
}
});
}