fix merge conflicts

CHANGELOG.md

@@ -1,3 +1,10 @@
+### GHOSTERY 8.5.0 ()
+
++ Fixes bug in site-specific tracker white-listing (#522, Fixes #519)
++ Standardize all Ghostery staging and production global URLs (#511)
++ Updated Rewards UI (#521)
++ Update legacy unit tests (#526)
+
 ### GHOSTERY 8.4.9 (April 9, 2019)
 
 + Better handling of semantic version comparison (#524)

_locales/en/messages.json

@@ -2141,18 +2141,18 @@
 			}
 		}
 	},
-  "myoffrz_check_conditions": {
-    "message": "Check the following conditions"
-  },
-  "myoffrz_redeem_code": {
-    "message": "Redeem code"
-  },
-  "myoffrz_voucher_found": {
-    "message": "Voucher found"
-  },
-  "myoffrz_redeeming_voucher": {
-    "message": "Redeeming voucher"
-  },
+	"myoffrz_check_conditions": {
+		"message": "Check the following conditions"
+	},
+	"myoffrz_redeem_code": {
+		"message": "Redeem code"
+	},
+	"myoffrz_voucher_found": {
+		"message": "Voucher found"
+	},
+	"myoffrz_redeeming_voucher": {
+		"message": "Redeeming voucher"
+	},
 	"OFFERS_ENDS": {
 		"message": ""
 	},
@@ -2347,34 +2347,34 @@
 	"settings": {
 		"message": "Settings"
 	},
-  	"try_ghostery_midnight": {
-	  "message": "Try Ghostery Midnight"
+	"try_ghostery_midnight": {
+		"message": "Try Ghostery Midnight"
 	},
-  	"seven_day_free_trial": {
-	  "message": "7 Day Free Trial ($14/mo)"
+	"seven_day_free_trial": {
+		"message": "7 Day Free Trial ($14/mo)"
 	},
-  	"full_coverage_protection_promise": {
-	  "message": "Get full-coverage protection across all browsers & apps on your device"
+	"full_coverage_protection_promise": {
+		"message": "Get full-coverage protection across all browsers & apps on your device"
 	},
-  	"system_wide_tracker_and_ad_blocking": {
-	  "message": "System-wide tracker & ad-blocking"
+	"system_wide_tracker_and_ad_blocking": {
+		"message": "System-wide tracker & ad-blocking"
 	},
-  	"built_in_vpn": {
-	  "message": "Built-in VPN"
+	"built_in_vpn": {
+		"message": "Built-in VPN"
 	},
-  	"custom_whitelist_options": {
-	  "message": "Custom whitelist options"
+	"custom_whitelist_options": {
+		"message": "Custom whitelist options"
 	},
-  	"historical_tracking_insights": {
-	  "message": "Historical tracking insights"
+	"historical_tracking_insights": {
+		"message": "Historical tracking insights"
 	},
-  	"download_for_free": {
-	  "message": "Download for free"
+	"download_for_free": {
+		"message": "Download for free"
 	},
-  	"support_ghostery_for_2_instead": {
-	  "message": "Support Ghostery for $2/mo instead"
+	"support_ghostery_for_2_instead": {
+		"message": "Support Ghostery for $2/mo instead"
 	},
-  	"no_thanks_continue_with_basic": {
-	  "message": "No thanks, continue with basic"
+	"no_thanks_continue_with_basic": {
+		"message": "No thanks, continue with basic"
 	}
 }

manifest.json

@@ -3,10 +3,12 @@
 	"author": "Ghostery",
 	"name": "__MSG_name__",
 	"short_name": "Ghostery",
-	"version": "8.4.9",
-	"version_name": "8.4.9",
+	"version": "8.5.0",
+	"version_name": "8.5.0",
 	"default_locale": "en",
 	"description": "__MSG_short_description__",
+	"debug": true,
+	"log": true,
 	"icons": {
 		"16": "app/images/icon16.png",
 		"48": "app/images/icon48.png",
@@ -99,8 +101,8 @@
 	"web_accessible_resources": [
 		"app/images/*",
 		"dist/css/rewards_styles.css",
-    "cliqz/offers-templates/reminder.html",
-    "cliqz/offers-templates/checkout.html",
-    "cliqz/offers-templates/control-center.html"
+		"cliqz/offers-templates/reminder.html",
+		"cliqz/offers-templates/checkout.html",
+		"cliqz/offers-templates/control-center.html"
 	]
-}
+}

package.json

@@ -16,7 +16,8 @@
     "prebuild.dev": "node ./tools/licenses/fetchLicenses.js",
     "prebuild.prod": "node ./tools/licenses/fetchLicenses.js",
     "prebuild.watch": "node ./tools/licenses/fetchLicenses.js",
-    "test.unit": "cross-env BABEL_ENV=test jest",
+    "test": "cross-env BABEL_ENV=test jest",
+    "test.watch": "cross-env BABEL_ENV=test jest --watch",
     "test.snapshot": "jest --updateSnapshot",
     "lint": "eslint --ext .js,.jsx ./app ./src",
     "lint.fix": "eslint --ext .js,.jsx ./app ./src --fix",
@@ -42,77 +43,73 @@
   },
   "homepage": "https://github.com/ghostery/ghostery-extension#readme",
   "dependencies": {
-    "@cliqz/adblocker-circumvention": "^1.5.0",
-    "@cliqz/url-parser": "^1.1.1",
-    "base64-js": "^1.3.1",
+    "@cliqz/adblocker-circumvention": "^1.12.2",
+    "@cliqz/url-parser": "^1.1.3",
     "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/7.45.0/browser-core-7.45.0.tgz",
     "classnames": "^2.2.5",
-    "d3": "^5.15.0",
-    "foundation-sites": "^6.6.1",
+    "d3": "^5.15.1",
+    "foundation-sites": "^6.6.2",
     "history": "^4.10.1",
     "json-api-normalizer": "^0.4.16",
     "moment": "^2.19.1",
     "prop-types": "^15.6.2",
-    "query-string": "^6.10.1",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
+    "query-string": "^6.11.1",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
     "react-markdown": "^4.3.1",
-    "react-redux": "^7.1.3",
+    "react-redux": "^7.2.0",
     "react-router-dom": "^5.1.2",
-    "react-svg": "^11.0.7",
+    "react-svg": "^11.0.15",
     "redux": "^4.0.5",
     "redux-object": "^0.5.10",
     "redux-thunk": "^2.2.0",
     "rsvp": "^4.8.5",
     "spanan": "^2.0.0",
     "ua-parser-js": "^0.7.21",
-    "underscore": "^1.9.2",
-    "whatwg-fetch": "^3.0.0"
+    "underscore": "^1.10.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.8.3",
+    "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
-    "@babel/plugin-transform-modules-commonjs": "^7.8.3",
-    "@babel/preset-react": "^7.8.3",
-    "@babel/register": "^7.8.3",
-    "babel-eslint": "^10.0.3",
-    "babel-loader": "^8.0.6",
+    "@babel/plugin-proposal-object-rest-spread": "^7.9.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.9.0",
+    "@babel/preset-react": "^7.9.4",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^8.1.0",
     "clean-webpack-plugin": "^3.0.0",
-    "cross-env": "^7.0.0",
+    "cross-env": "^7.0.2",
     "css-loader": "^3.4.2",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^6.8.0",
-    "eslint-config-airbnb": "^18.0.1",
-    "eslint-loader": "^3.0.3",
-    "eslint-plugin-import": "^2.20.1",
+    "eslint-config-airbnb": "^18.1.0",
+    "eslint-loader": "^4.0.0",
+    "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-react": "^7.18.3",
-    "fs-extra": "^8.1.0",
-    "jest": "^25.1.0",
+    "eslint-plugin-react": "^7.19.0",
+    "fs-extra": "^9.0.0",
+    "jest": "^25.2.6",
     "jest-fetch-mock": "^3.0.3",
-    "jest-when": "^2.7.0",
+    "jest-when": "^2.7.1",
     "jsdoc": "^3.6.3",
-    "jsonfile": "^5.0.0",
+    "jsonfile": "^6.0.1",
     "license-checker": "^25.0.1",
     "mini-css-extract-plugin": "^0.9.0",
     "node-sass": "^4.13.1",
     "oboe": "^2.1.5",
     "path": "^0.12.7",
     "react-router": "^5.1.2",
-    "react-test-renderer": "^16.12.0",
+    "react-test-renderer": "^16.13.1",
     "redux-mock-store": "^1.5.4",
     "sass-loader": "^8.0.2",
     "seamless-immutable": "^7.1.3",
-    "sinon": "^8.1.1",
     "sinon-chrome": "^3.0.1",
-    "svg-url-loader": "^3.0.3",
+    "svg-url-loader": "^5.0.0",
     "underscore-template-loader": "^1.0.0",
-    "url-loader": "^3.0.0",
+    "url-loader": "^4.0.0",
     "vendor-copy": "^2.0.0",
-    "webpack": "^4.41.5",
-    "webpack-cli": "^3.3.10",
+    "webpack": "^4.42.1",
+    "webpack-cli": "^3.3.11",
     "webpack-shell-plugin": "^0.5.0"
   }
 }