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

This reverts commit 6fad0210f8, reversing
changes made to 128f3e15eb.
pull/4092/head
John McLear 2020-06-07 18:46:41 +00:00
parent 564e8fee07
commit 512a51149d
4 changed files with 608 additions and 615 deletions

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');

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)

1215
src/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -62,11 +62,11 @@
"semver": "5.6.0",
"slide": "1.1.6",
"socket.io": "2.1.1",
"terser": "^4.7.0",
"threads": "^1.4.0",
"tiny-worker": "^2.3.0",
"tinycon": "0.0.1",
"ueberdb2": "0.4.9",
"uglify-js": "3.8.1",
"underscore": "1.8.3",
"unorm": "1.4.1"
},