Merge pull request #3136 from joassouza/fix_minify

Fix minification of JS files
pull/3141/head
Luiza Pagliari 2017-02-08 04:14:44 -02:00 committed by GitHub
commit 203a48b42d
1 changed files with 6 additions and 6 deletions

View File

@ -23,9 +23,9 @@ var ERR = require("async-stacktrace");
var settings = require('./Settings');
var async = require('async');
var fs = require('fs');
var StringDecoder = require('string_decoder').StringDecoder;
var CleanCSS = require('clean-css');
var jsp = require("uglify-js").parser;
var pro = require("uglify-js").uglify;
var uglifyJS = require("uglify-js");
var path = require('path');
var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
var RequireKernel = require('etherpad-require-kernel');
@ -400,10 +400,10 @@ function getFile(filename, callback) {
function compressJS(content)
{
var ast = jsp.parse(content); // parse code and get the initial AST
ast = pro.ast_mangle(ast); // get a new AST with mangled names
ast = pro.ast_squeeze(ast); // get an AST with compression optimizations
return pro.gen_code(ast); // compressed code here
var decoder = new StringDecoder('utf8');
var code = decoder.write(content); // convert from buffer to string
var codeMinified = uglifyJS.minify(code, {fromString: true}).code;
return codeMinified;
}
function compressCSS(filename, content, callback)