move underscore to its old place and remove unnecessary packages (#4876)

src/node/utils/Minify.js

@@ -146,14 +146,6 @@ const minify = async (req, res) => {
     filename = 'js/vendors/jquery.js';
   }
 
-  // Backward compatibility for plugins that were written when underscore lived at
-  // src/static/js/underscore.js.
-  if (['js/underscore.js', 'plugins/ep_etherpad-lite/static/js/underscore.js']
-      .indexOf(filename) !== -1) {
-    logger.warn(`request for deprecated underscore path: ${filename}`);
-    filename = 'js/vendors/underscore.js';
-  }
-
   /* Handle static files for plugins/libraries:
      paths like "plugins/ep_myplugin/static/js/test.js"
      are rewritten into ROOT_PATH_OF_MYPLUGIN/static/js/test.js,

src/node/utils/tar.json

@@ -72,7 +72,7 @@
   , "vendors/jquery.js"
   , "rjquery.js"
   , "$async.js"
-  , "vendors/underscore.js"
+  , "underscore.js"
   , "$underscore.js"
   , "$underscore/underscore.js"
   , "security.js"
@@ -82,6 +82,4 @@
   , "pluginfw/shared.js"
   , "pluginfw/hooks.js"
   ]
-, "jquery.js": ["jquery.js"]
-, "underscore.js": ["underscore.js"]
 }

src/static/js/AttributeManager.js

@@ -2,7 +2,7 @@
 
 const Changeset = require('./Changeset');
 const ChangesetUtils = require('./ChangesetUtils');
-const _ = require('./vendors/underscore');
+const _ = require('./underscore');
 
 const lineMarkerAttribute = 'lmkr';
 

src/static/js/broadcast.js

@@ -28,7 +28,7 @@ const AttribPool = require('./AttributePool');
 const Changeset = require('./Changeset');
 const linestylefilter = require('./linestylefilter').linestylefilter;
 const colorutils = require('./colorutils').colorutils;
-const _ = require('./vendors/underscore');
+const _ = require('./underscore');
 const hooks = require('./pluginfw/hooks');
 
 // These parameters were global, now they are injected. A reference to the

src/static/js/broadcast_slider.js

@@ -23,7 +23,7 @@
 
 // These parameters were global, now they are injected. A reference to the
 // Timeslider controller would probably be more appropriate.
-const _ = require('./vendors/underscore');
+const _ = require('./underscore');
 const padmodals = require('./pad_modals').padmodals;
 const colorutils = require('./colorutils').colorutils;
 

src/static/js/domline.js

@@ -24,7 +24,7 @@
 
 const Security = require('./security');
 const hooks = require('./pluginfw/hooks');
-const _ = require('./vendors/underscore');
+const _ = require('./underscore');
 const lineAttributeMarker = require('./linestylefilter').lineAttributeMarker;
 const noop = () => {};
 

src/static/js/skiplist.js

@@ -23,7 +23,7 @@
  */
 
 const Ace2Common = require('./ace2_common');
-const _ = require('./vendors/underscore');
+const _ = require('./underscore');
 
 const noop = Ace2Common.noop;
 

src/static/js/undomodule.js

@@ -23,7 +23,7 @@
  */
 
 const Changeset = require('./Changeset');
-const _ = require('./vendors/underscore');
+const _ = require('./underscore');
 
 const undoModule = (() => {
   const stack = (() => {