diff --git a/CHANGELOG.md b/CHANGELOG.md index 05022bac2a..7ad9a31fe2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ *not released* +## 1.1.0 + +*2019-09-17* + * feat: allow disabling adblocking in WebExtension context [#328](https://github.com/cliqz-oss/adblocker/pull/328) * feat: allow disabling adblocking in Puppeteer page [#328](https://github.com/cliqz-oss/adblocker/pull/328) * feat: allow disabling adblocking in Electron session [#328](https://github.com/cliqz-oss/adblocker/pull/328) diff --git a/lerna.json b/lerna.json index 2255215729..659410f5e2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { "npmClient": "yarn", "useWorkspaces": true, - "version": "1.0.2" + "version": "1.1.0" } diff --git a/packages/adblocker-benchmarks/package.json b/packages/adblocker-benchmarks/package.json index a9e4f0a7db..521076496b 100644 --- a/packages/adblocker-benchmarks/package.json +++ b/packages/adblocker-benchmarks/package.json @@ -1,7 +1,7 @@ { "name": "@cliqz/adblocker-benchmarks", "private": true, - "version": "1.0.2", + "version": "1.1.0", "description": "Content blockers benchmark", "author": { "name": "Cliqz" @@ -25,7 +25,7 @@ "adblock-rs": "^0.1.22" }, "dependencies": { - "@cliqz/adblocker": "^1.0.2", + "@cliqz/adblocker": "^1.1.0", "jsdom": "^15.1.1", "sandboxed-module": "^2.0.3" }, diff --git a/packages/adblocker-circumvention/package.json b/packages/adblocker-circumvention/package.json index 9a73223e0d..e7cf42b3b1 100644 --- a/packages/adblocker-circumvention/package.json +++ b/packages/adblocker-circumvention/package.json @@ -1,6 +1,6 @@ { "name": "@cliqz/adblocker-circumvention", - "version": "1.0.2", + "version": "1.1.0", "description": "Cliqz adblocker circumvention for Chrome", "author": { "name": "Cliqz" @@ -78,6 +78,6 @@ "typescript": "^3.5.3" }, "dependencies": { - "@cliqz/adblocker-content": "^1.0.2" + "@cliqz/adblocker-content": "^1.1.0" } } diff --git a/packages/adblocker-content/package.json b/packages/adblocker-content/package.json index 3907a809c0..5d1c012238 100644 --- a/packages/adblocker-content/package.json +++ b/packages/adblocker-content/package.json @@ -1,6 +1,6 @@ { "name": "@cliqz/adblocker-content", - "version": "1.0.2", + "version": "1.1.0", "description": "Cliqz adblocker library (content-scripts helpers)", "author": { "name": "Cliqz" diff --git a/packages/adblocker-electron-example/package.json b/packages/adblocker-electron-example/package.json index 5ced477297..d87a678623 100644 --- a/packages/adblocker-electron-example/package.json +++ b/packages/adblocker-electron-example/package.json @@ -1,7 +1,7 @@ { "name": "@cliqz/adblocker-electron-example", "private": true, - "version": "1.0.2", + "version": "1.1.0", "description": "Cliqz adblocker Puppeteer wrapper", "author": { "name": "Cliqz" @@ -59,7 +59,7 @@ } ], "dependencies": { - "@cliqz/adblocker-electron": "^1.0.2", + "@cliqz/adblocker-electron": "^1.1.0", "electron": "^6.0.1", "node-fetch": "^2.6.0", "ts-node": "^8.3.0" diff --git a/packages/adblocker-electron/package.json b/packages/adblocker-electron/package.json index 1a771bea3c..23691d5348 100644 --- a/packages/adblocker-electron/package.json +++ b/packages/adblocker-electron/package.json @@ -1,6 +1,6 @@ { "name": "@cliqz/adblocker-electron", - "version": "1.0.2", + "version": "1.1.0", "description": "Cliqz adblocker Electron wrapper", "author": { "name": "Cliqz" @@ -37,8 +37,8 @@ "electron": "^6.0.1" }, "dependencies": { - "@cliqz/adblocker": "^1.0.2", - "@cliqz/adblocker-content": "^1.0.2" + "@cliqz/adblocker": "^1.1.0", + "@cliqz/adblocker-content": "^1.1.0" }, "devDependencies": { "@types/chrome": "^0.0.88", diff --git a/packages/adblocker-puppeteer-example/package.json b/packages/adblocker-puppeteer-example/package.json index 78481ce395..060d76d52f 100644 --- a/packages/adblocker-puppeteer-example/package.json +++ b/packages/adblocker-puppeteer-example/package.json @@ -1,7 +1,7 @@ { "name": "@cliqz/adblocker-puppeteer-example", "private": true, - "version": "1.0.2", + "version": "1.1.0", "description": "Cliqz adblocker Puppeteer wrapper", "author": { "name": "Cliqz" @@ -24,7 +24,7 @@ "url": "https://github.com/cliqz-oss/adblocker/issues" }, "dependencies": { - "@cliqz/adblocker-puppeteer": "^1.0.2", + "@cliqz/adblocker-puppeteer": "^1.1.0", "node-fetch": "^2.6.0", "puppeteer": "^1.18.1", "ts-node": "^8.3.0" diff --git a/packages/adblocker-puppeteer/package.json b/packages/adblocker-puppeteer/package.json index 77f686f26d..61deb9a64f 100644 --- a/packages/adblocker-puppeteer/package.json +++ b/packages/adblocker-puppeteer/package.json @@ -1,6 +1,6 @@ { "name": "@cliqz/adblocker-puppeteer", - "version": "1.0.2", + "version": "1.1.0", "description": "Cliqz adblocker Puppeteer wrapper", "author": { "name": "Cliqz" @@ -37,8 +37,8 @@ "puppeteer": "^1.18.1" }, "dependencies": { - "@cliqz/adblocker": "^1.0.2", - "@cliqz/adblocker-content": "^1.0.2", + "@cliqz/adblocker": "^1.1.0", + "@cliqz/adblocker-content": "^1.1.0", "@types/puppeteer": "^1.12.4", "tldts-experimental": "^5.3.0" }, diff --git a/packages/adblocker-webextension-cosmetics/package.json b/packages/adblocker-webextension-cosmetics/package.json index a9a86d42bb..0184adbfa7 100644 --- a/packages/adblocker-webextension-cosmetics/package.json +++ b/packages/adblocker-webextension-cosmetics/package.json @@ -1,6 +1,6 @@ { "name": "@cliqz/adblocker-webextension-cosmetics", - "version": "1.0.2", + "version": "1.1.0", "description": "Enable cosmetics in WebExtension content blocker using Cliqz adblocker", "author": { "name": "Cliqz" @@ -84,6 +84,6 @@ "typescript": "^3.5.3" }, "dependencies": { - "@cliqz/adblocker-content": "^1.0.2" + "@cliqz/adblocker-content": "^1.1.0" } } diff --git a/packages/adblocker-webextension-example/package.json b/packages/adblocker-webextension-example/package.json index f0e6f92b3e..b3e63cd56c 100644 --- a/packages/adblocker-webextension-example/package.json +++ b/packages/adblocker-webextension-example/package.json @@ -1,7 +1,7 @@ { "name": "@cliqz/adblocker-webextension-example", "private": true, - "version": "1.0.2", + "version": "1.1.0", "description": "Example of WebExtension adblocker using Cliqz", "author": { "name": "Cliqz" @@ -29,8 +29,8 @@ "url": "https://github.com/cliqz-oss/adblocker/issues" }, "dependencies": { - "@cliqz/adblocker-webextension": "^1.0.2", - "@cliqz/adblocker-webextension-cosmetics": "^1.0.2" + "@cliqz/adblocker-webextension": "^1.1.0", + "@cliqz/adblocker-webextension-cosmetics": "^1.1.0" }, "devDependencies": { "@types/chrome": "^0.0.88", diff --git a/packages/adblocker-webextension/package.json b/packages/adblocker-webextension/package.json index dc1266ff8f..c2d53046f3 100644 --- a/packages/adblocker-webextension/package.json +++ b/packages/adblocker-webextension/package.json @@ -1,6 +1,6 @@ { "name": "@cliqz/adblocker-webextension", - "version": "1.0.2", + "version": "1.1.0", "description": "Cliqz adblocker WebExtension wrapper", "author": { "name": "Cliqz" @@ -50,8 +50,8 @@ "typescript": "^3.5.3" }, "dependencies": { - "@cliqz/adblocker": "^1.0.2", - "@cliqz/adblocker-content": "^1.0.2", + "@cliqz/adblocker": "^1.1.0", + "@cliqz/adblocker-content": "^1.1.0", "tldts-experimental": "^5.3.0" }, "contributors": [ diff --git a/packages/adblocker/package.json b/packages/adblocker/package.json index 6deeef0464..7628613c8f 100644 --- a/packages/adblocker/package.json +++ b/packages/adblocker/package.json @@ -1,6 +1,6 @@ { "name": "@cliqz/adblocker", - "version": "1.0.2", + "version": "1.1.0", "description": "Cliqz adblocker library", "author": { "name": "Cliqz" diff --git a/packages/adblocker/src/engine/engine.ts b/packages/adblocker/src/engine/engine.ts index a02b9f8e04..aaa6cd7be1 100644 --- a/packages/adblocker/src/engine/engine.ts +++ b/packages/adblocker/src/engine/engine.ts @@ -25,7 +25,7 @@ import Resources from '../resources'; import CosmeticFilterBucket from './bucket/cosmetic'; import NetworkFilterBucket from './bucket/network'; -export const ENGINE_VERSION = 36; +export const ENGINE_VERSION = 37; // Polyfill for `btoa` function btoaPolyfill(buffer: string): string {