Merge pull request #11726 from brave/ad-block

Move ad-block and tracking-protection to muon

.npmrc

@@ -1,7 +1,7 @@
 runtime = electron
 target_arch = x64
-brave_electron_version = 4.5.10
+brave_electron_version = 4.5.11
 chromedriver_version = 2.32
-target = v4.5.10
+target = v4.5.11
 disturl=https://brave-laptop-binaries.s3.amazonaws.com/atom-shell/dist/
 build_from_source = true

app/adBlock.js

@@ -14,7 +14,7 @@ const debounce = require('../js/lib/debounce')
 const adblockInstances = new Map()
 const defaultAdblock = new AdBlockClient()
 const defaultSafeBrowsing = new AdBlockClient()
-const regions = require('ad-block/lib/regions')
+const {adBlockLists} = require('ad-block')
 const getSetting = require('../js/settings').getSetting
 const {ADBLOCK_CUSTOM_RULES} = require('../js/constants/settings')
 const customFilterRulesUUID = 'CE61F035-9F0A-4999-9A5A-D4E46AF676F7'
@@ -67,7 +67,7 @@ module.exports.init = () => {
     .initInstance(defaultAdblock, module.exports.adBlockResourceName, false)
     .initInstance(defaultSafeBrowsing, module.exports.safeBrowsingResourceName, true)
   // Initialize the regional adblock files that are enabled
-  regions
+  adBlockLists.regions
     .filter((region) => getSetting(`adblock.${region.uuid}.enabled`))
     .forEach((region) => module.exports.updateAdblockDataFiles(region.uuid, true))
   const customRules = getSetting(ADBLOCK_CUSTOM_RULES)

app/browser/tabs.js

@@ -38,6 +38,7 @@ const bookmarkOrderCache = require('../common/cache/bookmarkOrderCache')
 const ledgerState = require('../common/state/ledgerState')
 const {getWindow} = require('./windows')
 
+let adBlockRegions
 let currentPartitionNumber = 0
 const incrementPartitionNumber = () => ++currentPartitionNumber
 
@@ -250,11 +251,14 @@ const updateAboutDetails = (tabId) => {
     }
     sendAboutDetails(tabId, messages.SETTINGS_UPDATED, appSettings)
   } else if (location === 'about:adblock') {
+    if (!adBlockRegions) {
+      adBlockRegions = require('ad-block').adBlockLists.regions
+    }
     const adblock = appState.get('adblock', Immutable.Map())
     sendAboutDetails(tabId, messages.ADBLOCK_UPDATED, {
       adblock: adblock.toJS(),
       settings: appSettings.toJS(),
-      resources: require('ad-block/lib/regions')
+      resources: adBlockRegions
     })
   } else if (location === 'about:downloads') {
     const downloads = appState.get('downloads', Immutable.Map())

package.json

@@ -85,7 +85,6 @@
   "homepage": "https://www.brave.com/",
   "dependencies": {
     "acorn": "3.2.0",
-    "ad-block": "3.0.5",
     "aphrodite": "1.1.0",
     "async": "^2.0.1",
     "bat-balance": "^1.0.3",
@@ -124,7 +123,6 @@
     "string.prototype.startswith": "^0.2.0",
     "tablesort": "5.0.1",
     "tldjs": "1.6.2",
-    "tracking-protection": "1.1.x",
     "underscore": "1.8.3",
     "url-loader": "~0.6.2",
     "webtorrent-remote": "^2.0.2"