From 5cd63514421df4ded00245f198f8aae448aaf910 Mon Sep 17 00:00:00 2001 From: Christopher Tino Date: Mon, 26 Aug 2019 10:42:57 -0400 Subject: [PATCH 1/2] GH-1817 adds anti-ad-block circumvention --- CHANGELOG.md | 1 + README.md | 4 +--- app/content-scripts/content_script_bundle.js | 3 +++ package.json | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d831dab6..f7dadf1b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ + Fix error message on Forgot Password panel (#440) + Update Intro Hub copy for Firefox (#436) + Change Rewards opt-in setting for Firefox (#437) ++ Adds Cliqz anti-ad-blocker circumvention rules + Updated translations ### GHOSTERY 8.4.1 (August 6, 2019) diff --git a/README.md b/README.md index b3b969270..51ba0e5ec 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,10 @@ Ghostery helps you browse smarter by giving you control over ads and tracking technologies to speed up page loads, eliminate clutter, and protect your data. This is the unified code repository for the Ghostery browser extensions in Chrome, Firefox, Opera and Edge. ## Downloads -**Firefox** – [Download](https://addons.mozilla.org/en-US/firefox/addon/ghostery/) +**Firefox / Cliqz** – [Download](https://addons.mozilla.org/en-US/firefox/addon/ghostery/) **Chrome** – [Download](https://chrome.google.com/webstore/detail/ghostery-%E2%80%93-privacy-ad-blo/mlomiejdfkolichcflejclcbmpeaniij) -**Cliqz** – [Download](https://s3.amazonaws.com/cdncliqz/update/browser/firefox%40ghostery.com/latest.xpi) - **Opera** – [Download](https://addons.opera.com/en/extensions/details/ghostery/) **Edge** – [Download](https://www.microsoft.com/en-us/store/p/ghostery/9nblggh52ngz) diff --git a/app/content-scripts/content_script_bundle.js b/app/content-scripts/content_script_bundle.js index 229c21245..e0e668fc0 100644 --- a/app/content-scripts/content_script_bundle.js +++ b/app/content-scripts/content_script_bundle.js @@ -18,3 +18,6 @@ */ import 'browser-core/build/core/content'; +import injectCircumvention from '@cliqz/adblocker-circumvention'; + +injectCircumvention(window); diff --git a/package.json b/package.json index 883ff4673..21b96ae2b 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ }, "homepage": "https://github.com/ghostery/ghostery-extension#readme", "dependencies": { + "@cliqz/adblocker-circumvention": "^0.12.1", "@cliqz/url-parser": "^1.0.2", "base64-js": "^1.2.1", "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.37.7/browser-core-7.37.7.tgz", From d092d2d8b8db1d56a38615216e9b0bf03d17bba0 Mon Sep 17 00:00:00 2001 From: Christopher Tino Date: Mon, 26 Aug 2019 14:20:14 -0400 Subject: [PATCH 2/2] update yarn.lock --- yarn.lock | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 3381749cd..e4cd616c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -385,6 +385,13 @@ resolved "https://registry.yarnpkg.com/@cliqz-oss/dexie/-/dexie-2.0.4.tgz#0e710504e2b9198baa9b046abd3a82731b94d56e" integrity sha512-HxMbBQfdy0CehThTFierXbRPI+PHDEucUUriCCzViAKbCWWQIlL6uZcyDaaPRMPWy45v78lezPB4457kfjS72g== +"@cliqz/adblocker-circumvention@^0.12.1": + version "0.12.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-circumvention/-/adblocker-circumvention-0.12.1.tgz#34983dfea8ff161b5ef5e8a20f11441717a49aae" + integrity sha512-gYe1YbKpbabX/hEVvyKMEtQm4CxD1Vk6JfV+vl/g5cVFL+x2QsDm74j0O0Rpogoa+3cOc+75rVspTtxXz3X0kg== + dependencies: + "@cliqz/adblocker" "^0.12.1" + "@cliqz/adblocker@^0.11.0": version "0.11.0" resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-0.11.0.tgz#7677ec56ce9e8b6602b92c1f9a905b71d5c24084" @@ -395,6 +402,15 @@ tslib "^1.9.3" tsmaz "^1.2.1" +"@cliqz/adblocker@^0.12.1": + version "0.12.1" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-0.12.1.tgz#5d5ca327578d7ac4f4901afa9a6de7702c6b7e3b" + integrity sha512-MvIKlFb3R6Ystk0ot4iGJl/h3vKJWYpqL/tQuGQI9UCDUBvfm2kXbhaVCLZAKg4vwOKSdAuHjafOg951eO0Rzw== + dependencies: + tldts-experimental "^5.3.0" + tslib "^1.10.0" + tsmaz "^1.2.2" + "@cliqz/url-parser@^1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@cliqz/url-parser/-/url-parser-1.0.2.tgz#0c42d73dbe354efad572d9ef39c0aa5d7f6151ea" @@ -7895,6 +7911,18 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.2: resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.2.tgz#1dfae771ee1a04396bdfde27a3adcebc6b648b28" integrity sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q== +tldts-core@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.3.2.tgz#3823653310c2dc6e51d00998098a72a3cc203ea9" + integrity sha512-bGI7MvrFXnbNhSkKEKAjiRo+eoIuIsuzF/hOtpI7HLMLWamIGtrLuNv2nlBOdN/h6iB6B32B4MxmwPWTZ70TaQ== + +tldts-experimental@^5.3.0: + version "5.3.2" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.3.2.tgz#2b3ed4178345ebdc4f0aed6595ab6f2ef11c63ee" + integrity sha512-TJKbNzsOwzYQcOC3C18/0wot7WpJHw2R3MYHKzn4q69l5fgDO5Gu+/wqUGXFB5ps7ezKk8QTqwlqKOa+gqJbNg== + dependencies: + tldts-core "^5.3.2" + tldts@^5.0.3: version "5.2.0" resolved "https://registry.yarnpkg.com/tldts/-/tldts-5.2.0.tgz#7556a71dd2db6fc790bed3b93ff8b521132d6e94" @@ -8019,7 +8047,7 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" -tslib@^1.9.0, tslib@^1.9.3: +tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.3: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== @@ -8029,6 +8057,11 @@ tsmaz@^1.2.1: resolved "https://registry.yarnpkg.com/tsmaz/-/tsmaz-1.2.1.tgz#6da2d42ac41c64f7f90ff48d9562d67feb74acf2" integrity sha512-RobtKrzsPLP3CXb5TfN+wkuLIaeYsPmJg2LfohUUi4iHwf8RkMEUF5GX9zMw+YzirNK5JKjDNxoY2y/HBvG40w== +tsmaz@^1.2.2: + version "1.3.0" + resolved "https://registry.yarnpkg.com/tsmaz/-/tsmaz-1.3.0.tgz#389196d6ac36b641079892e729b9160f4a1dd382" + integrity sha512-vcU8dokp/QecvbTldQIE9Y4MD+ObU8VOpkwKCvhwhLv+yVdLMyjq7vTuc/haLLclRFRtMRj2z+qR7IjN+fnpiQ== + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"