v7.47.0

.dependabot/config.yml

@@ -16,3 +16,17 @@ update_configs:
           #
           # But you have been warned...
           dependency_name: "systemjs"
+    default_reviewers:
+      - "remusao"
+      - "private-face"
+      - "luciancor"
+    default_labels:
+      - "chore"
+    automerged_updates:
+      # Here we indicate to dependabot that whenever a dev dependency is
+      # updated, and CI is green, and the version bump is withing version range
+      # specified in package.json, then it should be safe to merge
+      # automatically.
+      - match:
+          dependency_type: "development"
+          update_type: "in_range"

.editorconfig

@@ -14,7 +14,7 @@ insert_final_newline = true
 charset = utf-8
 trim_trailing_whitespace = true
 
-[*.{es,js,json,jsm,jsx,ts,tsx}]
+[*.{es,js,json,jsm,jsx,ts,tsx,yml}]
 indent_style = space
 indent_size = 2
 

CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+## [1.46.0] - 2020-05-12
+
+ * Update visuals on Cliqz Tab
+ * Improve UI in quick search dropdown
+ * Telemetry improvements (generic UI analyses, fix in search sessions)
+
+## [1.45.0] - 2020-04-07
+
+ * Make Cliqz default search for 5% of new desktop browser users
+ * Fix page breakage for auto-consent (cookie pop-up blocker)
+ * Improve UI in various places (like on-boarding, Cliqz Tab)
+ * Clean-up and reduce telemetry by removing legacy code
+ * Using only bundled versions of anti-tracking resources to save bandwidth and storage
+ * On-going work to clean-up and trim-down extension bundle for better performance

CODEOWNERS

@@ -20,6 +20,7 @@
 /configs/common/urls-myoffrz.js @luciancor
 /configs/offers.js @luciancor
 /configs/releases/offers-chip-chrome.js @luciancor
+/configs/releases/offers-chip-edge.js @luciancor
 /configs/releases/offers-chip-firefox.js @luciancor
 /configs/releases/offers-chrome.js @luciancor
 /configs/releases/offers-edge.js @luciancor

Dockerfile.benchmark

@@ -6,15 +6,20 @@ RUN apt-get update --no-install-recommends \
   && apt-get install -y time jq \
   && rm -rf /var/lib/apt/lists/*
 
-RUN mkdir /app
+RUN mkdir -p /app/benchmarks
 RUN chown node:node -R /app
 
 USER node
+WORKDIR /app/
+
+# Install benchmark dependencies
+COPY benchmarks/package.json /app/benchmarks/
+COPY benchmarks/package-lock.json /app/benchmarks/
+RUN cd ./benchmarks && npm ci
+
 COPY package.json /app/
 COPY package-lock.json /app/
 
-WORKDIR /app/
-
 RUN mkdir -p /app/benchmarks && wget -O - https://s3.amazonaws.com/cdncliqz/extension-profiles/session_2018-10-15.jl.gz | gunzip > /app/benchmarks/session.jl
 RUN wget -O - https://cdn.cliqz.com/adblocking/requests_top500.json.gz | gunzip | head -n 100000 > /app/benchmarks/requests.jl
 RUN npm ci

Dockerfile.ci

@@ -20,6 +20,8 @@ RUN apt-get update --no-install-recommends  \
     libdbus-glib-1-2 \
     libfontconfig1 \
     libfreetype6 \
+    libgbm-dev \
+    libgbm1 \
     libgcc1 \
     libgconf-2-4 \
     libgdk-pixbuf2.0-0 \

Jenkinsfile.benchmark

@@ -45,6 +45,7 @@ node('docker && !gpu && us-east-1') {
     withEnv(["CLIQZ_CONFIG_PATH=./configs/${params.CONFIG}"]) {
       stage('fern build') {
         sh 'cp -r /app/node_modules ./'
+        sh 'cp -r /app/benchmarks/node_modules ./benchmarks/'
         sh './fern.js build'
       }
 

Jenkinsfile.multibranch

@@ -84,6 +84,10 @@ if (env.BRANCH_NAME.startsWith('v12.')) {
     matrix['cliqz-geckoview'] = [
         'config': 'cliqz-geckoview.js',
     ]
+    matrix['ghostery-geckoview'] = [
+        'config': 'ghostery-geckoview.js',
+    ]
+
 }
 
 if (env.BRANCH_NAME.startsWith('v13.')) {
@@ -99,6 +103,9 @@ if (env.BRANCH_NAME.startsWith('v14.')) {
     matrix['offers-chip-chrome'] = [
         'config': 'releases/offers-chip-chrome.js',
     ]
+    matrix['offers-chip-edge'] = [
+        'config': 'releases/offers-chip-edge.js',
+    ]
 }
 
 if (isIntegrationBranch) {
@@ -158,6 +165,10 @@ if (isIntegrationBranch) {
         'config': 'cliqz-geckoview.js',
     ]
 
+    matrix['ghostery-geckoview'] = [
+        'config': 'ghostery-geckoview.js',
+    ]
+
     matrix['lumen-ios'] = [
         'config': 'lumen-ios.js',
     ]

VERSION

@@ -1 +1 @@
-v7.45.2
+v7.47.0

amocleaner.js

@@ -15,12 +15,12 @@ const CONFIGS = {
   sparalarm: {
     configs: ['offers.js'],
     'configs/common': [...COMMON_CONFIGS, 'urls-myoffrz.js'],
-    'configs/releases': ['offers-chip-firefox.js', 'offers-chip-chrome.js'],
+    'configs/releases': ['offers-chip-firefox.js', 'offers-chip-chrome.js', 'offers-chip-edge.js'],
   },
   myoffrz: {
     configs: ['offers.js'],
     'configs/common': [...COMMON_CONFIGS, 'urls-myoffrz.js'],
-    'configs/releases': ['offers-chip-firefox.js', 'offers-chip-chrome.js'],
+    'configs/releases': ['offers-firefox.js', 'offers-chrome.js'],
   },
   gt: {
     configs: ['ghostery-tab-base.js', 'ghostery-tab-firefox.js', 'ghostery-tab-chrome.js'],