From 207bfa89608977f299c8b12075f51a784d285645 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Mon, 17 Nov 2014 11:24:46 -0500
Subject: [PATCH] closed #2419

---
 package.json    |  2 +-
 src/meta/css.js | 35 ++++++++++-------------------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index 86c22e027f..aa571b9861 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/src/meta/css.js b/src/meta/css.js
index 8a20108143..4006b524ae 100644
--- a/src/meta/css.js
+++ b/src/meta/css.js
@@ -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);
 			}
 		});
 	}