merge 1.62.0 + pull-assets improvement

dhowe · Jan 8, 2025 · 333edc0 · 333edc0
2 parents 0f7a6a3 + 7f78d19
commit 333edc0
Show file tree

Hide file tree

Showing 167 changed files with 9,349 additions and 3,768 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -50,42 +50,8 @@ jobs:
           draft: true
           prerelease: true
           body_path: release.body.txt
-      - name: Build MV2 packages
-        run: |
-          tools/make-artifacts.sh
-      - name: Upload Chromium package
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/adnauseam-${{ steps.release_info.outputs.VERSION }}.chromium.zip
-          asset_name: adnauseam-${{ steps.release_info.outputs.VERSION }}.chromium.zip
-          asset_content_type: application/octet-stream
-      - name: Upload Firefox package
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/adnauseam-${{ steps.release_info.outputs.VERSION }}.firefox.zip
-          asset_name: adnauseam-${{ steps.release_info.outputs.VERSION }}.firefox.zip
-          asset_content_type: application/octet-stream
-      - name: Upload Edge package
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/adnauseam-${{ steps.release_info.outputs.VERSION }}.edge.zip
-          asset_name: adnauseam-${{ steps.release_info.outputs.VERSION }}.edge.zip
-          asset_content_type: application/octet-stream
-      - name: Upload Opera package
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/adnauseam-${{ steps.release_info.outputs.VERSION }}.opera.crx
-          asset_name: adnauseam-${{ steps.release_info.outputs.VERSION }}.opera.crx
-          asset_content_type: application/octet-stream
+          files: |
+            dist/build/uBlock0_${{ env.VERSION }}.chromium.zip
+            dist/build/uBlock0_${{ env.VERSION }}.firefox.xpi
+            dist/build/uBlock0_${{ env.VERSION }}.thunderbird.xpi
+            dist/build/uBlock0_${{ env.VERSION }}.npm.tgz
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,42 @@
+- [Fix deserialization of ArrayBuffer shared by multiple TypedArrays](https://github.com/gorhill/uBlock/commit/c92a518218)
+- [Improve `trusted-suppress-native-method` scriptlet](https://github.com/gorhill/uBlock/commit/cb6c11ab6f)
+- [Improve `urlskip=` filter option](https://github.com/gorhill/uBlock/commit/a7aa755f18)
+- [Improve `parse-properties-to-match` scriptlet helper](https://github.com/gorhill/uBlock/commit/7494eaf621)
+- [Improve `href-sanitizer` scriptlet](https://github.com/gorhill/uBlock/commit/9bf8d53ebe)
+- [Improve quote usage in filter options and scriptlets](https://github.com/gorhill/uBlock/commit/8ba71f09d7)
+- [Improve `trusted-suppress-native-method` scriptlet](https://github.com/gorhill/uBlock/commit/7ed3470844)
+- [Improve `trusted-replace-argument` scriptlet](https://github.com/gorhill/uBlock/commit/3417fe3d5d)
+- [Block media elements unconditionally when max size is set to 0](https://github.com/gorhill/uBlock/commit/36db7f8327)
+    - Regression from <https://github.com/gorhill/uBlock/commit/73ce4e6bcf>
+- [Visually separate scriptlet parameters in active line](https://github.com/gorhill/uBlock/commit/076e9fa73e)
+- [Mitigate potentially delayed execution of scriptlets in Firefox](https://github.com/gorhill/uBlock/commit/b1a00145bd)
+- [Improve `prevent-setTimeout`/`prevent-setInterval` scriptlets](https://github.com/gorhill/uBlock/commit/3b7fa79a68)
+- [Improve `trusted-replace-argument` scriptlet](https://github.com/gorhill/uBlock/commit/adced29b5b)
+- [Add `-safebase64` directive to `urlskip=` option](https://github.com/gorhill/uBlock/commit/bcc058eba7)
+- [Improve `urlskip=` filter option](https://github.com/gorhill/uBlock/commit/77ed83ff2f)
+- [Improve `spoof-css` scriptlet](https://github.com/gorhill/uBlock/commit/5f5e3d730f)
+- [Improve `trusted-set-attr` scriptlet](https://github.com/gorhill/uBlock/commit/c8174d6032)
+- [Add support for EasyList `{ remove: true }` cosmetic filter syntax](https://github.com/gorhill/uBlock/commit/ff5fc61753)
+- [Keep moving related scriptlets into separate files](https://github.com/gorhill/uBlock/commit/e5a088738d)
+- [Improve `prevent-xhr` scriptlet](https://github.com/gorhill/uBlock/commit/ce4908b341)
+- [Improve `trusted-suppress-native-method` scriptlet](https://github.com/gorhill/uBlock/commit/41616df866)
+- [Improve `set-cookie` scriptlet](https://github.com/gorhill/uBlock/commit/e613282698)
+
+----------
+
+# 1.61.2
+
+## Fixes / changes
+
+- [Better handle unexpected conditions when deserializing](https://github.com/gorhill/uBlock/commit/4c299bfca9)
+- [Fix potential infinite async loop](https://github.com/gorhill/uBlock/commit/335d947c10) (issue found by @Rob--W)
+
+----------
+
+# 1.61.0
+
+## Fixes / changes
+
 - [Improve `prevent-refresh` scriptlet](https://github.com/gorhill/uBlock/commit/8884f259c1)
 - [Improve `googlesyndication_adsbygoogle.js` scriptlet](https://github.com/gorhill/uBlock/commit/f645e8f0d2)
 - [Offer ability to skip redirects in strict-blocked page](https://github.com/gorhill/uBlock/commit/20b54185fa)

diff --git a/Makefile b/Makefile
@@ -1,7 +1,8 @@
 # https://stackoverflow.com/a/6273809
 run_options := $(filter-out $@,$(MAKECMDGOALS))
 
-.PHONY: all clean cleanassets test lint chromium opera firefox npm dig mv3 mv3-quick \
+.PHONY: all clean cleanassets test lint chromium opera firefox npm dig \
+	mv3 mv3-quick mv3-chromium mv3-firefox \
 	compare maxcost medcost mincost modifiers record wasm
 
 sources := $(wildcard assets/* assets/*/* dist/version src/* src/*/* src/*/*/* src/*/*/*/*)
@@ -55,12 +56,16 @@ dig: dist/build/uBlock0.dig
 dig-snfe: dig
 	cd dist/build/uBlock0.dig && npm run snfe $(run_options)
 
-mv3-chromium: tools/make-mv3.sh $(sources) $(platform)
+dist/build/uBOLite.chromium: tools/make-mv3.sh $(sources) $(platform)
 	tools/make-mv3.sh chromium
 
-mv3-firefox: tools/make-mv3.sh $(sources) $(platform)
+mv3-chromium: dist/build/uBOLite.chromium
+
+dist/build/uBOLite.firefox: tools/make-mv3.sh $(sources) $(platform)
 	tools/make-mv3.sh firefox
 
+mv3-firefox: dist/build/uBOLite.firefox
+
 mv3-quick: tools/make-mv3.sh $(sources) $(platform)
 	tools/make-mv3.sh quick
 

diff --git a/assets/assets.dev.json b/assets/assets.dev.json
@@ -136,8 +136,7 @@
 		"title": "AdGuard – Ads",
 		"tags": "ads",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"adguard-mobile": {
 		"content": "filters",
@@ -147,8 +146,7 @@
 		"tags": "ads mobile",
 		"ua": "mobile",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/11.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"easylist": {
 		"content": "filters",
@@ -174,17 +172,15 @@
 		"title": "AdGuard URL Tracking Protection",
 		"tags": "privacy",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/17.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"adguard-spyware": {
 		"content": "filters",
 		"group": "privacy",
 		"off": true,
 		"title": "AdGuard Tracking Protection",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/3.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"block-lan": {
 		"content": "filters",
@@ -255,8 +251,7 @@
 		"title": "AdGuard – Cookie Notices",
 		"tags": "annoyances cookies",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/18.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"ublock-cookies-adguard": {
 		"content": "filters",
@@ -324,8 +319,7 @@
 		"title": "AdGuard – Social Widgets",
 		"tags": "annoyances social",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/4.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"fanboy-social": {
 		"content": "filters",
@@ -367,8 +361,7 @@
 		"title": "AdGuard – Popup Overlays",
 		"tags": "annoyances",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/19.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"adguard-mobile-app-banners": {
 		"content": "filters",
@@ -378,8 +371,7 @@
 		"title": "AdGuard – Mobile App Banners",
 		"tags": "annoyances mobile",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/20.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"adguard-other-annoyances": {
 		"content": "filters",
@@ -389,8 +381,7 @@
 		"title": "AdGuard – Other Annoyances",
 		"tags": "annoyances",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/21.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"adguard-widgets": {
 		"content": "filters",
@@ -400,8 +391,7 @@
 		"title": "AdGuard – Widgets",
 		"tags": "annoyances",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/22.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"easylist-annoyances": {
 		"content": "filters",
@@ -584,8 +574,8 @@
 		"title": "🇪🇪ee: Eesti saitidele kohandatud filter",
 		"tags": "ads estonian",
 		"lang": "et",
-		"contentURL": "https://adblock.ee/list.php",
-		"supportURL": "https://adblock.ee/"
+		"contentURL": "https://adblock.ee/list.txt",
+		"supportURL": "https://adblock.ee"
 	},
 	"FIN-0": {
 		"content": "filters",
@@ -716,8 +706,7 @@
 		"tags": "ads japanese 日本語",
 		"lang": "ja",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/7.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"KOR-1": {
 		"content": "filters",
@@ -772,7 +761,7 @@
 		"lang": "af fy nl",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/8.txt",
 		"cdnURLs": null,
-		"supportURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"NOR-0": {
 		"content": "filters",
@@ -826,10 +815,11 @@
 	"RUS-0": {
 		"content": "filters",
 		"group": "regions",
+		"parent": "🇷🇺ru 🇺🇦ua 🇺🇿uz 🇰🇿kz: RU AdList",
 		"off": true,
 		"title": "🇷🇺ru 🇺🇦ua 🇺🇿uz 🇰🇿kz: RU AdList",
 		"tags": "ads belarusian беларуская kazakh tatar russian русский ukrainian українська uzbek",
-		"lang": "be kk tt ru uk uz",
+		"lang": "be kk tt ru uz",
 		"contentURL": "https://raw.githubusercontent.com/easylist/ruadlist/master/RuAdList-uBO.txt",
 		"cdnURLs": [
 			"https://cdn.jsdelivr.net/gh/dimisa-RUAdList/RUAdListCDN@main/lists/ruadlist.ubo.min.txt",
@@ -839,6 +829,22 @@
 		"supportURL": "https://forums.lanik.us/viewforum.php?f=102",
 		"instructionURL": "https://forums.lanik.us/viewtopic.php?f=102&t=22512"
 	},
+	"RUS-1": {
+		"content": "filters",
+		"group": "regions",
+		"parent": "🇷🇺ru 🇺🇦ua 🇺🇿uz 🇰🇿kz: RU AdList",
+		"off": true,
+		"title": "🇷🇺ru 🇺🇦ua 🇺🇿uz 🇰🇿kz: RU AdList: Counters",
+		"tags": "ads belarusian беларуская kazakh tatar russian русский ukrainian українська uzbek be kk tt ru uk uz",
+		"contentURL": "https://raw.githubusercontent.com/easylist/ruadlist/master/cntblock.txt",
+		"cdnURLs": [
+			"https://cdn.jsdelivr.net/gh/easylist/ruadlist@master/cntblock.txt",
+			"https://cdn.statically.io/gh/easylist/ruadlist/master/cntblock.txt",
+			"https://raw.githubusercontent.com/easylist/ruadlist/master/cntblock.txt"
+		],
+		"supportURL": "https://forums.lanik.us/viewforum.php?f=102",
+		"instructionURL": "https://forums.lanik.us/viewtopic.php?f=102&t=22512"
+	},
 	"spa-0": {
 		"content": "filters",
 		"group": "regions",
@@ -857,8 +863,7 @@
 		"tags": "ads aragonese basque catalan spanish español galician guarani portuguese português",
 		"lang": "an ast ca cak es eu gl gn trs pt quz",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/9.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
 	},
 	"SVN-0": {
 		"content": "filters",
@@ -902,8 +907,17 @@
 		"tags": "ads turkish türkçe",
 		"lang": "tr",
 		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/13.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://adguard.com/kb/general/ad-filtering/adguard-filters/"
+		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters"
+	},
+	"UKR-0": {
+		"content": "filters",
+		"group": "regions",
+		"off": true,
+		"title": "🇺🇦ua: Ukrainian Filters",
+		"tags": "ads ukraine україна",
+		"lang": "uk",
+		"contentURL": "https://raw.githubusercontent.com/ukrainianfilters/lists/main/combined/uBO/uBO.txt",
+		"supportURL": "https://github.com/ukrainianfilters/lists"
 	},
 	"VIE-1": {
 		"content": "filters",