mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-06-25 03:10:10 +02:00
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:
46
minifier.js
46
minifier.js
@@ -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;
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -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
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user