Issue 5760 - Use relative require paths

lib/filterComposer.js

Index: lib/filterComposer.js
===================================================================
--- a/lib/filterComposer.js
+++ b/lib/filterComposer.js
@@ -14,24 +14,24 @@
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @module filterComposer */
 
 "use strict";
 
-const {defaultMatcher} = require("matcher");
-const {RegExpFilter} = require("filterClasses");
-const {FilterNotifier} = require("filterNotifier");
-const {Prefs} = require("prefs");
-const {extractHostFromFrame, stringifyURL, isThirdParty} = require("url");
-const {getKey, checkWhitelisted} = require("whitelisting");
-const {port} = require("messaging");
-const info = require("info");
+const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
+const {RegExpFilter} = require("../adblockpluscore/lib/filterClasses");
+const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
+const {Prefs} = require("./prefs");
+const {extractHostFromFrame, stringifyURL, isThirdParty} = require("./url");
+const {getKey, checkWhitelisted} = require("./whitelisting");
+const {port} = require("./messaging");
+const info = require("../buildtools/info");
 
 let readyPages = new ext.PageMap();
 
 /**
  * Checks whether the given page is ready to use the filter composer
  *
  * @param {Page} page
  * @return {boolean}
@@ -282,17 +282,17 @@
           type: "composer.content.dialogClosed",
           popupId: popupPageId
         });
         browser.tabs.onRemoved.removeListener(onRemoved);
       }
     };
     browser.tabs.onRemoved.addListener(onRemoved);
 
-    if (require("info").application == "firefox" &&
+    if (info.application == "firefox" &&

[kzar, 2018/03/28 13:50:33]

You tested this code (the block element tool) still works right?

[Jon Sonesen, 2018/03/30 03:09:55]

Oh man, well I had tested it but got the block element issue confused with
another ticket. Which explains why the behavior was different when testing the
other ticket on the current release. My bad, I fixy

[kzar, 2018/04/03 12:08:57]

Doing `info.application` doesn't work then? (Seems kind of surprising.)

         navigator.oscpu.startsWith("Linux"))
     {
       // Work around https://bugzil.la/1408446
       browser.windows.update(window.id, {width: window.width + 1});
     }
     return popupPageId;
   });
 });