Merge pull request #8406 from brave/ad-block-3

Use ad-block 3.0 (w/ html filtering parsing)

app/adBlock.js

@@ -87,7 +87,7 @@ const registerAppConfigForResource = (uuid, enabled, version) => {
  * @param uuid - The uuid of the adblock datafile resource
  * @param forAdblock - true if main frame URLs should be blocked
  */
-module.exports.updateAdblockDataFiles = (uuid, enabled, version = 2, shouldCheckMainFrame = false) => {
+module.exports.updateAdblockDataFiles = (uuid, enabled, version = Number(appConfig.adblock.version), shouldCheckMainFrame = false) => {
   registerAppConfigForResource(uuid, enabled, version)
   if (!adblockInstances.has(uuid)) {
     const adBlockClient = new AdBlockClient()

app/dataFile.js

@@ -85,8 +85,9 @@ module.exports.init = (resourceName, startExtension, onInitDone, forceDownload)
   const version = appConfig[resourceName].version
 
   let versionFolder = version
-  if (process.env.NODE_ENV === 'development' && resourceName === appConfig.resourceNames.ADBLOCK) {
-    versionFolder = 'test'
+  const hasStagedDatFile = [appConfig.resourceNames.ADBLOCK, appConfig.resourceNames.SAFE_BROWSING].includes(resourceName)
+  if (process.env.NODE_ENV === 'development' && hasStagedDatFile) {
+    versionFolder = `test/${versionFolder}`
   }
   const url = appConfig[resourceName].url.replace('{version}', versionFolder)
 

js/constants/appConfig.js

@@ -12,6 +12,7 @@ const adHost = process.env.AD_HOST || 'https://oip.brave.com'
 const buildConfig = require('./buildConfig')
 const isProduction = buildConfig.nodeEnv === 'production'
 const {fullscreenOption} = require('../../app/common/constants/settingsEnums')
+const ABPDatVersion = '3'
 
 module.exports = {
   name: 'Brave',
@@ -56,13 +57,13 @@ module.exports = {
   adblock: {
     alternateDataFiles: 'https://s3.amazonaws.com/adblock-data/{version}/{uuid}.dat',
     url: 'https://s3.amazonaws.com/adblock-data/{version}/ABPFilterParserData.dat',
-    version: '2',
+    version: ABPDatVersion,
     msBetweenRechecks: 1000 * 60 * 60 * 2, // 2 hours
     enabled: true
   },
   safeBrowsing: {
     url: 'https://s3.amazonaws.com/adblock-data/{version}/SafeBrowsingData.dat',
-    version: '2',
+    version: ABPDatVersion,
     msBetweenRechecks: 1000 * 60 * 60 * 2, // 2 hours
     enabled: true
   },

package.json

@@ -88,7 +88,7 @@
   "homepage": "https://www.brave.com/",
   "dependencies": {
     "acorn": "3.2.0",
-    "ad-block": "^2.0.0",
+    "ad-block": "^3.0.0",
     "aphrodite": "^1.0.0",
     "async": "^2.0.1",
     "clipboard-copy": "^1.0.0",