Issue 5760 - Use relative require paths

lib/filterComposer.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * 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}
  */
 exports.isPageReady = page =>
@@ skipping 240 matching lines @@
       {
         sender.page.sendMessage({
           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/04/05 11:14:56]

Nit: Wouldn't this condition fit on one line now?

[Jon Sonesen, 2018/04/05 23:01:20]

Acknowledged.

         navigator.oscpu.startsWith("Linux"))
     {
       // Work around https://bugzil.la/1408446
       browser.windows.update(window.id, {width: window.width + 1});
     }
     return popupPageId;
   });
 });
 
 port.on("composer.getFilters", (message, sender) =>
@@ skipping 22 matching lines @@
   // When tabs start loading we send them a message to ensure that the state
   // of the "block element" tool is reset. This is necessary since Firefox will
   // sometimes cache the state of a tab when the user navigates back / forward,
   // which includes the state of the "block element" tool.
   // Since sending this message will often fail (e.g. for new tabs which have
   // just been opened) we catch and ignore any exception thrown.
   browser.tabs.sendMessage(
     page.id, {type: "composer.content.finished"}
   ).catch(() => {});
 });