libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3136 from joassouza/fix_minify 

Fix minification of JS files
This commit is contained in:
Luiza Pagliari 2017-02-08 04:14:44 -02:00 committed by GitHub
parent 306e63c3f5 0025613ba6
commit 203a48b42d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/node/utils/Minify.js
View File

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