mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 16:36:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Revert "Merge branch 'develop' of github.com:ether/etherpad-lite into develop"

Browse source 
This reverts commit 6fad0210f8, reversing
changes made to 128f3e15eb.
This commit is contained in:
John McLear 2020-06-07 18:46:41 +00:00
parent 564e8fee07
commit 512a51149d
4 changed files with 608 additions and 615 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/utils/Minify.js
View file

@ -23,6 +23,8 @@ 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 path = require('path');
var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
var RequireKernel = require('etherpad-require-kernel');

4
src/node/utils/MinifyWorker.js
View file

@ -3,13 +3,13 @@
*/
var CleanCSS = require('clean-css');
var terser = require("terser");
var uglifyJS = require("uglify-js");
var path = require('path');
var Threads = require('threads')
function compressJS(content)
{
return terser.minify(content);
return uglifyJS.minify(content);
}
function compressCSS(filename, ROOT_DIR)