Issue 5760 - Use relative require paths

lib/csp.js

Index: lib/csp.js
===================================================================
--- a/lib/csp.js
+++ b/lib/csp.js
@@ -19,20 +19,21 @@
 
 // The webRequest API doesn't support WebSocket connection blocking in Microsoft

[kzar, 2018/04/05 11:14:56]

Looks like this needs rebasing (on top of the next branch) again, since this
file has changed now.

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

Acknowledged.

 // Edge and versions of Chrome before 58. Therefore for those we inject CSP
 // headers below as a workaround. See https://crbug.com/129353 and
 // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10297376/
 if (!browser.webRequest.ResourceType ||
     !("WEBSOCKET" in browser.webRequest.ResourceType))
 {
-  const {defaultMatcher} = require("matcher");
-  const {BlockingFilter, RegExpFilter} = require("filterClasses");
-  const {getDecodedHostname} = require("url");
-  const {checkWhitelisted} = require("whitelisting");
+  const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
+  const {BlockingFilter, RegExpFilter} =
+    require("../adblockpluscore/lib/filterClasses");
+  const {getDecodedHostname} = require("./url");
+  const {checkWhitelisted} = require("./whitelisting");
 
   browser.webRequest.onHeadersReceived.addListener(details =>
   {
     let hostname = getDecodedHostname(new URL(details.url));
     let match = defaultMatcher.matchesAny("", RegExpFilter.typeMap.WEBSOCKET,
                                           hostname, false, null, true);
     if (match instanceof BlockingFilter &&
         !checkWhitelisted(new ext.Page({id: details.tabId}),