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,18 +282,17 @@
           type: "composer.content.dialogClosed",
           popupId: popupPageId
         });
         browser.tabs.onRemoved.removeListener(onRemoved);
       }
     };
     browser.tabs.onRemoved.addListener(onRemoved);
 
-    if (require("info").application == "firefox" &&
-        navigator.oscpu.startsWith("Linux"))
+    if (info.application == "firefox" && navigator.oscpu.startsWith("Linux"))
     {
       // Work around https://bugzil.la/1408446
       browser.windows.update(window.id, {width: window.width + 1});
     }
     return popupPageId;
   });
 });