3.1.0

closes #89 closes #80 closes #78 - Updated hosts list - Added rules to .adblock file - Removed partner.ads script - Cosmetic and script tests set to 1 point each - Improved hosts test with fake 404 page
d3ward · Feb 10, 2024 · 400ca55 · 400ca55
1 parent 66bf61b
commit 400ca55
Show file tree

Hide file tree

Showing 20 changed files with 324 additions and 378 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,29 +11,20 @@ jobs:
       name: Deploying to gh-pages
       runs-on: ubuntu-latest
       steps:
-        - name: Setup Node.js for use with actions
-          uses: actions/setup-node@v3
-          with:
-            version:  16.x
-          env:
-            ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
         - name: Checkout branch
-          uses: actions/checkout@v2
-          env:
-           ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
+          uses: actions/checkout@v4
 
         - name: Clean install dependencies
           run: npm install
-          env:
-            ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
 
         - name: Build app
           run: npm run build
-          env:
-            ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
+
+        - name: Purge
+          run: npm run purge
 
         - name: deploy
-          uses: peaceiris/actions-gh-pages@v3
+          uses: peaceiris/actions-gh-pages@v3.9.3
           with:
            github_token: ${{ secrets.GITHUB_TOKEN }}
            publish_dir: ./dist

diff --git a/config/purgecss.js → config/purgecss.mjs b/config/purgecss.js → config/purgecss.mjs
@@ -1,8 +1,9 @@
-const { PurgeCSS } = require('purgecss')
-const path = require('path')
-const config = require('./config')
-const fs = require('fs')
-const chalk = require('chalk')
+import { PurgeCSS } from 'purgecss'
+import path from 'path'
+import config from './config.js' // Make sure the config file is also compatible with ESM
+import fs from 'fs'
+import chalk from 'chalk'
+
 const pages = config.pages
 const options = pages.map((page) => {
 	const css = path.join(config.build, `css/${page}.css`)

diff --git a/package.json b/package.json
@@ -6,6 +6,7 @@
     "dev": "webpack serve --config config/webpack.dev.js",
     "build": "webpack --config config/webpack.prod.js",
     "build-list": "node src/script/build_list.js",
+    "purge": "node config/purgecss.mjs",
     "format": "prettier --write '**/*.{js,ts}'",
     "lint": "eslint  'src/**/*.{js,ts}' && echo 'Linting complete!'",
     "lint-fix": "eslint  'src/**/*.{js,ts}' --fix"

diff --git a/src/adblock.ejs b/src/adblock.ejs
@@ -300,25 +300,19 @@
 								</svg>
 								&nbsp; Ad Scripts Loading
 							</h5>
-							<div class="grid">
-								<div class="col-4">
+							<div class="row keep-width">
+								<div class="col-6">
 									<div id="sfa_1" class="test_block _aos">
 										ads.js
 										<script src="./js/widget/ads.js"></script>
 									</div>
 								</div>
-								<div class="col-4">
+								<div class="col-6">
 									<div id="sfa_2" class="test_block _aos">
 										pagead.js
 										<script src="./js/pagead.js"></script>
 									</div>
 								</div>
-								<div class="col-4">
-									<div id="sfa_3" class="test_block _aos">
-										partner.ads.js
-										<script src="./js/partner.ads.js"></script>
-									</div>
-								</div>
 							</div>
 						</div>
 						<hr>

diff --git a/src/assets/preview_toolz.png b/src/assets/preview_toolz.png
diff --git a/src/assets/toolz/icon_filled.svg b/src/assets/toolz/icon_filled.svg
diff --git a/src/d3host.adblock b/src/d3host.adblock
@@ -7,8 +7,8 @@
 
 ! This list cover all the tests on https://d3ward.github.io/toolz/adblock
 ! Type : Stable
-! Entries : 137
-! Updated On: 12/3/2023
+! Entries : 136
+! Updated On: 10/2/2024
 ! Created by: d3ward
 
 !============ Ads =============
@@ -48,7 +48,6 @@
 !========= Analytics ==========
 
 ! --- Google Analytics
-||app-measurement.com^
 ||analytics.google.com^
 ||click.googleanalytics.com^
 ||google-analytics.com^
@@ -65,6 +64,9 @@
 
 ! --- MouseFlow
 ||mouseflow.com^
+||cdn.mouseflow.com^
+||o2.mouseflow.com^
+||gtm.mouseflow.com^
 ||api.mouseflow.com^
 ||tools.mouseflow.com^
 ||cdn-test.mouseflow.com^
@@ -185,7 +187,6 @@
 ||data.mistat.rus.xiaomi.com^
 ||sdkconfig.ad.xiaomi.com^
 ||sdkconfig.ad.intl.xiaomi.com^
-||globalapi.ad.xiaomi.com^
 ||tracking.rus.miui.com^
 
 ! --- Oppo
@@ -215,12 +216,14 @@
 
 ! --- Apple
 ||advertising.apple.com^
-||tr.iadsdk.apple.com^
 ||iadsdk.apple.com^
 ||metrics.icloud.com^
-||metrics.apple.com^
 ||metrics.mzstatic.com^
 ||api-adservices.apple.com^
 ||books-analytics-events.apple.com^
 ||weather-analytics-events.apple.com^
 ||notes-analytics-events.apple.com^
+
+*$3p,domain=d3ward.github.io
+@@*$redirect-rule,domain=d3ward.github.io
+d3ward.github.io##.textads
diff --git a/src/d3host.txt b/src/d3host.txt
@@ -7,8 +7,8 @@
 
 # This list cover all the tests on https://d3ward.github.io/toolz/adblock
 # Type : Stable
-# Entries : 137
-# Updated On: 12/3/2023
+# Entries : 136
+# Updated On: 10/2/2024
 # Created by: d3ward
 
 #============ Ads =============
@@ -48,7 +48,6 @@
 #========= Analytics ==========
 
 # --- Google Analytics
-0.0.0.0 app-measurement.com
 0.0.0.0 analytics.google.com
 0.0.0.0 click.googleanalytics.com
 0.0.0.0 google-analytics.com
@@ -65,6 +64,9 @@
 
 # --- MouseFlow
 0.0.0.0 mouseflow.com
+0.0.0.0 cdn.mouseflow.com
+0.0.0.0 o2.mouseflow.com
+0.0.0.0 gtm.mouseflow.com
 0.0.0.0 api.mouseflow.com
 0.0.0.0 tools.mouseflow.com
 0.0.0.0 cdn-test.mouseflow.com
@@ -185,7 +187,6 @@
 0.0.0.0 data.mistat.rus.xiaomi.com
 0.0.0.0 sdkconfig.ad.xiaomi.com
 0.0.0.0 sdkconfig.ad.intl.xiaomi.com
-0.0.0.0 globalapi.ad.xiaomi.com
 0.0.0.0 tracking.rus.miui.com
 
 # --- Oppo
@@ -215,10 +216,8 @@
 
 # --- Apple
 0.0.0.0 advertising.apple.com
-0.0.0.0 tr.iadsdk.apple.com
 0.0.0.0 iadsdk.apple.com
 0.0.0.0 metrics.icloud.com
-0.0.0.0 metrics.apple.com
 0.0.0.0 metrics.mzstatic.com
 0.0.0.0 api-adservices.apple.com
 0.0.0.0 books-analytics-events.apple.com

diff --git a/src/data/adblock_data.json b/src/data/adblock_data.json
@@ -34,7 +34,6 @@
 	},
 	"Analytics": {
 		"Google Analytics": [
-			"app-measurement.com",
 			"analytics.google.com",
 			"click.googleanalytics.com",
 			"google-analytics.com",
@@ -170,7 +169,6 @@
 			"data.mistat.rus.xiaomi.com",
 			"sdkconfig.ad.xiaomi.com",
 			"sdkconfig.ad.intl.xiaomi.com",
-			"globalapi.ad.xiaomi.com",
 			"tracking.rus.miui.com"
 		],
 		"Oppo": [
@@ -200,10 +198,8 @@
 		],
 		"Apple": [
 			"advertising.apple.com",
-			"tr.iadsdk.apple.com",
 			"iadsdk.apple.com",
 			"metrics.icloud.com",
-			"metrics.apple.com",
 			"metrics.mzstatic.com",
 			"api-adservices.apple.com",
 			"books-analytics-events.apple.com",