Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.0.0 #301

Merged
merged 3 commits into from
Aug 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

*not released*

## 1.0.0

*2019-08-27*

* small improvements [#300](https://github.com/cliqz-oss/adblocker/pull/300)
* minify script injection wrapper to save a few bytes
* rename 'engine' into 'blocker' in examples for consistency
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.14.0"
"version": "1.0.0"
}
4 changes: 2 additions & 2 deletions packages/adblocker-benchmarks/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cliqz/adblocker-benchmarks",
"private": true,
"version": "0.14.0",
"version": "1.0.0",
"description": "Content blockers benchmark",
"author": {
"name": "Cliqz"
Expand All @@ -25,7 +25,7 @@
"adblock-rs": "^0.1.22"
},
"dependencies": {
"@cliqz/adblocker": "^0.14.0",
"@cliqz/adblocker": "^1.0.0",
"jsdom": "^15.1.1",
"sandboxed-module": "^2.0.3"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/adblocker-circumvention/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cliqz/adblocker-circumvention",
"version": "0.14.0",
"version": "1.0.0",
"description": "Cliqz adblocker circumvention for Chrome",
"author": {
"name": "Cliqz"
Expand Down Expand Up @@ -78,6 +78,6 @@
"typescript": "^3.5.3"
},
"dependencies": {
"@cliqz/adblocker-content": "^0.14.0"
"@cliqz/adblocker-content": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/adblocker-content/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cliqz/adblocker-content",
"version": "0.14.0",
"version": "1.0.0",
"description": "Cliqz adblocker library (content-scripts helpers)",
"author": {
"name": "Cliqz"
Expand Down
4 changes: 2 additions & 2 deletions packages/adblocker-electron-example/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cliqz/adblocker-electron-example",
"private": true,
"version": "0.14.0",
"version": "1.0.0",
"description": "Cliqz adblocker Puppeteer wrapper",
"author": {
"name": "Cliqz"
Expand Down Expand Up @@ -59,7 +59,7 @@
}
],
"dependencies": {
"@cliqz/adblocker-electron": "^0.14.0",
"@cliqz/adblocker-electron": "^1.0.0",
"electron": "^6.0.1",
"node-fetch": "^2.6.0",
"ts-node": "^8.3.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/adblocker-electron/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cliqz/adblocker-electron",
"version": "0.14.0",
"version": "1.0.0",
"description": "Cliqz adblocker Electron wrapper",
"author": {
"name": "Cliqz"
Expand Down Expand Up @@ -37,8 +37,8 @@
"electron": "^6.0.1"
},
"dependencies": {
"@cliqz/adblocker": "^0.14.0",
"@cliqz/adblocker-content": "^0.14.0"
"@cliqz/adblocker": "^1.0.0",
"@cliqz/adblocker-content": "^1.0.0"
},
"devDependencies": {
"@types/chrome": "^0.0.88",
Expand Down
4 changes: 2 additions & 2 deletions packages/adblocker-puppeteer-example/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cliqz/adblocker-puppeteer-example",
"private": true,
"version": "0.14.0",
"version": "1.0.0",
"description": "Cliqz adblocker Puppeteer wrapper",
"author": {
"name": "Cliqz"
Expand All @@ -24,7 +24,7 @@
"url": "https://github.com/cliqz-oss/adblocker/issues"
},
"dependencies": {
"@cliqz/adblocker-puppeteer": "^0.14.0",
"@cliqz/adblocker-puppeteer": "^1.0.0",
"node-fetch": "^2.6.0",
"puppeteer": "^1.18.1",
"ts-node": "^8.3.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/adblocker-puppeteer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cliqz/adblocker-puppeteer",
"version": "0.14.0",
"version": "1.0.0",
"description": "Cliqz adblocker Puppeteer wrapper",
"author": {
"name": "Cliqz"
Expand Down Expand Up @@ -37,8 +37,8 @@
"puppeteer": "^1.18.1"
},
"dependencies": {
"@cliqz/adblocker": "^0.14.0",
"@cliqz/adblocker-content": "^0.14.0",
"@cliqz/adblocker": "^1.0.0",
"@cliqz/adblocker-content": "^1.0.0",
"@types/puppeteer": "^1.12.4",
"tldts-experimental": "^5.3.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/adblocker-webextension-cosmetics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cliqz/adblocker-webextension-cosmetics",
"version": "0.14.0",
"version": "1.0.0",
"description": "Enable cosmetics in WebExtension content blocker using Cliqz adblocker",
"author": {
"name": "Cliqz"
Expand Down Expand Up @@ -84,6 +84,6 @@
"typescript": "^3.5.3"
},
"dependencies": {
"@cliqz/adblocker-content": "^0.14.0"
"@cliqz/adblocker-content": "^1.0.0"
}
}
6 changes: 3 additions & 3 deletions packages/adblocker-webextension-example/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cliqz/adblocker-webextension-example",
"private": true,
"version": "0.14.0",
"version": "1.0.0",
"description": "Example of WebExtension adblocker using Cliqz",
"author": {
"name": "Cliqz"
Expand Down Expand Up @@ -29,8 +29,8 @@
"url": "https://github.com/cliqz-oss/adblocker/issues"
},
"dependencies": {
"@cliqz/adblocker-webextension": "^0.14.0",
"@cliqz/adblocker-webextension-cosmetics": "^0.14.0"
"@cliqz/adblocker-webextension": "^1.0.0",
"@cliqz/adblocker-webextension-cosmetics": "^1.0.0"
},
"devDependencies": {
"@types/chrome": "^0.0.88",
Expand Down
6 changes: 3 additions & 3 deletions packages/adblocker-webextension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cliqz/adblocker-webextension",
"version": "0.14.0",
"version": "1.0.0",
"description": "Cliqz adblocker WebExtension wrapper",
"author": {
"name": "Cliqz"
Expand Down Expand Up @@ -50,8 +50,8 @@
"typescript": "^3.5.3"
},
"dependencies": {
"@cliqz/adblocker": "^0.14.0",
"@cliqz/adblocker-content": "^0.14.0",
"@cliqz/adblocker": "^1.0.0",
"@cliqz/adblocker-content": "^1.0.0",
"tldts-experimental": "^5.3.0"
},
"contributors": [
Expand Down
2 changes: 1 addition & 1 deletion packages/adblocker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cliqz/adblocker",
"version": "0.14.0",
"version": "1.0.0",
"description": "Cliqz adblocker library",
"author": {
"name": "Cliqz"
Expand Down
2 changes: 1 addition & 1 deletion packages/adblocker/src/engine/engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import Resources from '../resources';
import CosmeticFilterBucket from './bucket/cosmetic';
import NetworkFilterBucket from './bucket/network';

export const ENGINE_VERSION = 34;
export const ENGINE_VERSION = 35;

// Polyfill for `btoa`
function btoaPolyfill(buffer: string): string {
Expand Down