in dev mode, concatenate scripts instead of minifying

faster reboot & restores sanity to those trying to debug browser
specific issues on IE and FF. not that you have much sanity to begin
with if it's an IE bug...
This commit is contained in:
psychobunny
2014-11-11 13:30:16 -05:00
parent 11c83079f2
commit 02b6a7893a
2 changed files with 37 additions and 11 deletions

View File

@@ -29,6 +29,27 @@ Minifier.js.minify = function (scripts, relativePath, minify, callback) {
options.prefix = 1;
}
if (minify) {
minifyScripts(scripts, options, callback);
} else {
concatenateScripts(scripts, options, callback);
}
};
process.on('message', function(payload) {
switch(payload.action) {
case 'js':
Minifier.js.minify(payload.scripts, payload.relativePath, payload.minify, function(data) {
process.send({
type: 'end',
data: data
});
});
break;
}
});
function minifyScripts(scripts, options, callback) {
try {
var minified = uglifyjs.minify(scripts, options),
hasher = crypto.createHash('md5'),
@@ -52,17 +73,22 @@ Minifier.js.minify = function (scripts, relativePath, minify, callback) {
payload: err
});
}
};
}
process.on('message', function(payload) {
switch(payload.action) {
case 'js':
Minifier.js.minify(payload.scripts, payload.relativePath, payload.minify, function(data) {
function concatenateScripts(scripts, options, callback) {
async.map(scripts, fs.readFile, function(err, scripts) {
if (err) {
process.send({
type: 'end',
data: data
type: 'error',
payload: err
});
}
scripts = scripts.join(require('os').EOL);
callback({
js: scripts,
map: ''
});
break;
}
});
});
}

View File

@@ -181,7 +181,7 @@ module.exports = function(Meta) {
minifier.send({
action: 'js',
relativePath: nconf.get('url') + '/',
minify: minify,
minify: global.env !== 'development',
scripts: Meta.js.scripts.all
});
});