diff --git a/lib/cloudcmd.js b/lib/cloudcmd.js index d97d48ac..9527d15d 100644 --- a/lib/cloudcmd.js +++ b/lib/cloudcmd.js @@ -10,13 +10,13 @@ auth = require(DIR_SERVER + 'auth'), config = require(DIR_SERVER + 'config'), edit = require(DIR_SERVER + 'edit'), - minify = require(DIR_SERVER + 'minify'), rest = require(DIR_SERVER + 'rest'), route = require(DIR_SERVER + 'route'), join = require('join-io'), ponse = require('ponse'), - + mollify = require('mollify'), + WIN = process.platform === 'WIN32', terminal = !WIN ? require(DIR_SERVER + 'terminal') : function() {}, @@ -94,7 +94,7 @@ online: isOnline }), - minify({ + mollify({ dir : DIR_ROOT, is : isMinify }), diff --git a/lib/server/minify.js b/lib/server/minify.js deleted file mode 100644 index 6c8a523c..00000000 --- a/lib/server/minify.js +++ /dev/null @@ -1,22 +0,0 @@ -(function() { - 'use strict'; - - var tryRequire = require('./tryRequire'), - minify = tryRequire('minify'); - - module.exports = function(name, params, callback) { - var ret = middle; - - if (minify) - ret = minify(name, params, callback); - else if (callback) - callback(); - - return ret; - }; - - function middle(req, res, next) { - next(); - } - -})(); diff --git a/lib/server/rest/fs/get.js b/lib/server/rest/fs/get.js index a5b7d96e..7663924d 100644 --- a/lib/server/rest/fs/get.js +++ b/lib/server/rest/fs/get.js @@ -9,7 +9,7 @@ hash = require(DIR_SERVER + 'hash'), beautify = require(DIR_SERVER + 'beautify'), - minify = require(DIR_SERVER + 'minify'), + minify = require('minify'), tryRequire = require(DIR_SERVER + 'tryRequire'), tryOptions = {log: true, exit: true}, diff --git a/lib/server/route.js b/lib/server/route.js index a90cff88..eeffaa36 100644 --- a/lib/server/route.js +++ b/lib/server/route.js @@ -16,7 +16,7 @@ ponse = tryRequire('ponse', tryOptions), files = tryRequire('files-io', tryOptions), - minify = require(DIR_SERVER + 'minify'), + minify = require('minify'), config = require(DIR_SERVER + 'config'), Util = require(DIR_LIB + 'util'), diff --git a/package.json b/package.json index 17c9bb2a..030b4c12 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "mellow": "~0.9.7", "minify": "~1.3.0", "minimist": "~1.1.0", + "mollify": "~1.0.0", "pipe-io": "~1.1.1", "ponse": "~1.2.8", "socket.io": "~1.2.0",