| Index: lib/csp.js |
| =================================================================== |
| --- a/lib/csp.js |
| +++ b/lib/csp.js |
| @@ -12,23 +12,24 @@ |
| * 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/>. |
| */ |
| "use strict"; |
| -const {defaultMatcher} = require("matcher"); |
| -const {RegExpFilter, WhitelistFilter} = require("filterClasses"); |
| +const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); |
| +const {RegExpFilter, WhitelistFilter} = |
| + require("../adblockpluscore/lib/filterClasses"); |
| const {extractHostFromFrame, getDecodedHostname, |
| - isThirdParty, stringifyURL} = require("url"); |
| -const {checkWhitelisted} = require("whitelisting"); |
| + isThirdParty, stringifyURL} = require("./url"); |
| +const {checkWhitelisted} = require("./whitelisting"); |
| const {FilterNotifier} = require("filterNotifier"); |
| -const devtools = require("devtools"); |
| +const devtools = require("./devtools"); |
| const {typeMap} = RegExpFilter; |
| browser.webRequest.onHeadersReceived.addListener(details => |
| { |
| let url = new URL(details.url); |
| let urlString = stringifyURL(url); |
| let parentFrame = ext.getFrame(details.tabId, details.parentFrameId); |