Merge pull request #2531 from mneunomne/merge1.57.0

Merge1.57.0
dhowe · May 3, 2024 · 5b649ad · 5b649ad
2 parents bf3b13f + 5db4de5
commit 5b649ad
Show file tree

Hide file tree

Showing 242 changed files with 5,877 additions and 3,992 deletions.
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -0,0 +1,26 @@
+env:
+  browser: true
+  es2022: true
+extends: eslint:recommended
+parserOptions:
+  sourceType: module
+rules:
+    eqeqeq:
+      - warn
+      - always
+    indent:
+      - error
+      - 4
+      - ignoredNodes:
+        - Program > IfStatement > BlockStatement
+        - Program > ExpressionStatement > CallExpression > ArrowFunctionExpression > BlockStatement
+        - CallExpression > MemberExpression
+        - ArrayExpression > Literal
+    no-control-regex: off
+    no-empty: off
+    sort-imports: warn
+    strict: warn
+globals:
+    browser: readonly
+    chrome: readonly
+    vAPI: readonly
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,7 +22,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Clone uAssets

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,43 @@
 ## Fixes / changes
 
+- [Do not block large media resources when loaded as top-level document](https://github.com/gorhill/uBlock/commit/3919a16bb8)
+- [Properly manage cache storage regarding managed user filters](https://github.com/gorhill/uBlock/commit/90ab1a76ab)
+- [Improve `[trusted-]set-cookie` scriptlets](https://github.com/gorhill/uBlock/commit/11a48561e0)
+- [Fixed Belgian and Nepali flags for Windows Chromium users](https://github.com/gorhill/uBlock/commit/499c80bd8a) (by @DandelionSprout)
+- [Mind that `tabs.sendMessage` can throw](https://github.com/gorhill/uBlock/commit/3f7374c1f1)
+- [Improve `set-cookie` scriptlet](https://github.com/gorhill/uBlock/commit/9146134874)
+- [Append wildcard character only when filter starts & ends with `/`](https://github.com/gorhill/uBlock/commit/1cb190e102)
+- [Fix failure to create popup logger window sometimes](https://github.com/gorhill/uBlock/commit/c8762945d9)
+- [Improve json-prune-related scriptlets](https://github.com/gorhill/uBlock/commit/e7a0f8c781)
+- [Support maximizing editor to viewport size](https://github.com/gorhill/uBlock/commit/664dd95700)
+- [Add advanced setting to force popup panel orientation](https://github.com/gorhill/uBlock/commit/0d77ccded7)
+- [Add checkboxes to "My filters" pane](https://github.com/gorhill/uBlock/commit/46ea5519c1)
+- [Assume UTF-8 when no encoding can be looked up](https://github.com/gorhill/uBlock/commit/63acdcbdeb)
+- [Fix issue with "My filters" pane on mobile](https://github.com/gorhill/uBlock/commit/24d94e559d)
+- [Support aborting "Pick" mode in element picker](https://github.com/gorhill/uBlock/commit/a557f62112)
+- [Remove sections with no lists in "Filter lists" pane](https://github.com/gorhill/uBlock/commit/0f4e50db07)
+- [Add "Social widgets", "Cookie notices" sections in "Filter lists" pane](https://github.com/gorhill/uBlock/commit/21a76e32a1)
+- [No longer disable generic cosmetic filters by default on mobile](https://github.com/gorhill/uBlock/commit/7a768e7b1a)
+- [Improve `spoof-css` scriptlet](https://github.com/gorhill/uBlock/commit/603239970d)
+- [Make asset updater compatible with non-persistent background page](https://github.com/gorhill/uBlock/commit/96704f2fda)
+- [Move dragbar to the top of element picker dialog](https://github.com/gorhill/uBlock/commit/953c978d59)
+    - [Move "Quit" button to top bar in element picker](https://github.com/gorhill/uBlock/commit/6266c4718d)
+- [Add advanced setting `requestStatsDisabled`](https://github.com/gorhill/uBlock/commit/e02ea69c86)
+- [First lookup matching stock lists when importing URLs](https://github.com/gorhill/uBlock/commit/2b16a10b82)
+- [Reset filter lists in worker when creating filters via "Block element"](https://github.com/gorhill/uBlock/commit/b0067b79d5)
+- [Remove trusted-source requirement when using `badfilter`](https://github.com/gorhill/uBlock/commit/3c299b8632)
+- [Redesign cache storage](https://github.com/gorhill/uBlock/commit/086766a924)
+- [Don't match network filter-derived regexes against non-network URIs](https://github.com/gorhill/uBlock/commit/2262a129ec)
+- [Remove obsolete trusted directives](https://github.com/gorhill/uBlock/commit/439a059cca)
+- [Support logging details of calls to `json-prune-fetch-response`](https://github.com/gorhill/uBlock/commit/e527a8f9af)
+- [Escape special whitespace characters in attribute values](https://github.com/gorhill/uBlock/commit/be3e366019)
+
+----------
+
+# 1.56.0
+
+## Fixes / changes
+
 - [Mind that multiple `uritransform` may apply to a single request](https://github.com/gorhill/uBlock/commit/2a5a444482)
 - [Fix incorrect built-in filtering expression in logger](https://github.com/gorhill/uBlock/commit/9bff0c2f94)
 - [Fix improper invalidation of valid `uritransform` exception filters](https://github.com/gorhill/uBlock/commit/21ec5a277c)

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # https://stackoverflow.com/a/6273809
 run_options := $(filter-out $@,$(MAKECMDGOALS))
 
-.PHONY: all clean test lint chromium opera firefox npm dig mv3 mv3-quick \
+.PHONY: all clean cleanassets test lint chromium opera firefox npm dig mv3 mv3-quick \
 	compare maxcost medcost mincost modifiers record wasm
 
 sources := $(wildcard assets/* assets/*/* dist/version src/* src/*/* src/*/*/* src/*/*/*/*)
@@ -73,6 +73,8 @@ dist/build/uAssets:
 clean:
 	rm -rf dist/build tmp/node_modules
 
+cleanassets:
+	rm -rf dist/build/mv3-data dist/build/uAssets
 
 # Not real targets, just convenient for auto-completion at shell prompt
 compare:

diff --git a/assets/assets.dev.json b/assets/assets.dev.json
@@ -155,6 +155,7 @@
 		"group": "ads",
 		"title": "EasyList",
 		"tags": "ads",
+		"preferred": true,
 		"contentURL": [
 			"https://ublockorigin.github.io/uAssets/thirdparties/easylist.txt",
 			"assets/thirdparties/easylist/easylist.txt"
@@ -205,6 +206,7 @@
 		"group": "privacy",
 		"title": "EasyPrivacy",
 		"tags": "privacy",
+		"preferred": true,
 		"contentURL": [
 			"https://ublockorigin.github.io/uAssets/thirdparties/easyprivacy.txt",
 			"assets/thirdparties/easylist/easyprivacy.txt"
@@ -244,21 +246,11 @@
 		],
 		"supportURL": "https://gitlab.com/malware-filter/phishing-filter#phishing-url-blocklist"
 	},
-	"adguard-social": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "AdGuard – Annoyances",
-		"off": true,
-		"title": "AdGuard – Social Media",
-		"tags": "annoyances social",
-		"contentURL": "https://filters.adtidy.org/extension/ublock/filters/4.txt",
-		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
-		"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
-	},
 	"adguard-cookies": {
 		"content": "filters",
 		"group": "annoyances",
-		"parent": "AdGuard – Annoyances|AdGuard/uBO – Cookie Notices",
+		"group2": "cookies",
+		"parent": "AdGuard/uBO – Cookie Notices",
 		"off": true,
 		"title": "AdGuard – Cookie Notices",
 		"tags": "annoyances cookies",
@@ -269,10 +261,51 @@
 	"ublock-cookies-adguard": {
 		"content": "filters",
 		"group": "annoyances",
-		"parent": "AdGuard – Annoyances|AdGuard/uBO – Cookie Notices",
+		"group2": "cookies",
+		"parent": "AdGuard/uBO – Cookie Notices",
+		"off": true,
+		"title": "uBlock filters – Cookie Notices",
+		"tags": "annoyances cookies",
+		"contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt",
+		"cdnURLs": [
+			"https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt",
+			"https://ublockorigin.pages.dev/filters/annoyances-cookies.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances-cookies.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances-cookies.txt"
+		],
+		"supportURL": "https://github.com/uBlockOrigin/uAssets"
+	},
+	"fanboy-cookiemonster": {
+		"content": "filters",
+		"group": "annoyances",
+		"group2": "cookies",
+		"parent": "EasyList/uBO – Cookie Notices",
+		"off": true,
+		"title": "EasyList – Cookie Notices",
+		"tags": "annoyances cookies",
+		"preferred": true,
+		"contentURL": [
+			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt",
+			"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt"
+		],
+		"cdnURLs": [
+			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-cookies.txt",
+			"https://ublockorigin.pages.dev/thirdparties/easylist-cookies.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-cookies.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-cookies.txt",
+			"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt"
+		],
+		"supportURL": "https://github.com/easylist/easylist#fanboy-lists"
+	},
+	"ublock-cookies-easylist": {
+		"content": "filters",
+		"group": "annoyances",
+		"group2": "cookies",
+		"parent": "EasyList/uBO – Cookie Notices",
 		"off": true,
 		"title": "uBlock filters – Cookie Notices",
 		"tags": "annoyances cookies",
+		"preferred": true,
 		"contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt",
 		"cdnURLs": [
 			"https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt",
@@ -282,6 +315,50 @@
 		],
 		"supportURL": "https://github.com/uBlockOrigin/uAssets"
 	},
+	"adguard-social": {
+		"content": "filters",
+		"group": "annoyances",
+		"group2": "social",
+		"parent": null,
+		"off": true,
+		"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://kb.adguard.com/en/general/adguard-ad-filters"
+	},
+	"fanboy-social": {
+		"content": "filters",
+		"group": "annoyances",
+		"group2": "social",
+		"parent": null,
+		"off": true,
+		"title": "EasyList – Social Widgets",
+		"tags": "annoyances social",
+		"preferred": true,
+		"contentURL": [
+			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-social.txt",
+			"https://secure.fanboy.co.nz/fanboy-social_ubo.txt"
+		],
+		"cdnURLs": [
+			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-social.txt",
+			"https://ublockorigin.pages.dev/thirdparties/easylist-social.txt",
+			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-social.txt",
+			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-social.txt",
+			"https://secure.fanboy.co.nz/fanboy-social_ubo.txt"
+		],
+		"supportURL": "https://easylist.to/"
+	},
+	"fanboy-thirdparty_social": {
+		"content": "filters",
+		"group": "annoyances",
+		"group2": "social",
+		"off": true,
+		"title": "Fanboy – Anti-Facebook",
+		"tags": "privacy",
+		"contentURL": "https://secure.fanboy.co.nz/fanboy-antifacebook.txt",
+		"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
+	},
 	"adguard-popup-overlays": {
 		"content": "filters",
 		"group": "annoyances",
@@ -326,22 +403,14 @@
 		"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
 		"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
 	},
-	"fanboy-thirdparty_social": {
-		"content": "filters",
-		"group": "annoyances",
-		"off": true,
-		"title": "Fanboy – Anti-Facebook",
-		"tags": "privacy",
-		"contentURL": "https://secure.fanboy.co.nz/fanboy-antifacebook.txt",
-		"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
-	},
 	"easylist-annoyances": {
 		"content": "filters",
 		"group": "annoyances",
 		"parent": "EasyList – Annoyances",
 		"off": true,
 		"title": "EasyList – Other Annoyances",
 		"tags": "annoyances",
+		"preferred": true,
 		"contentURL": "https://ublockorigin.github.io/uAssets/thirdparties/easylist-annoyances.txt",
 		"cdnURLs": [
 			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-annoyances.txt",
@@ -358,6 +427,7 @@
 		"off": true,
 		"title": "EasyList – Chat Widgets",
 		"tags": "annoyances",
+		"preferred": true,
 		"contentURL": "https://ublockorigin.github.io/uAssets/thirdparties/easylist-chat.txt",
 		"cdnURLs": [
 			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-chat.txt",
@@ -367,49 +437,14 @@
 		],
 		"supportURL": "https://github.com/easylist/easylist#fanboy-lists"
 	},
-	"fanboy-cookiemonster": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "EasyList – Annoyances|EasyList/uBO – Cookie Notices",
-		"off": true,
-		"title": "EasyList – Cookie Notices",
-		"tags": "annoyances cookies",
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt",
-			"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-cookies.txt",
-			"https://ublockorigin.pages.dev/thirdparties/easylist-cookies.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-cookies.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-cookies.txt",
-			"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt"
-		],
-		"supportURL": "https://github.com/easylist/easylist#fanboy-lists"
-	},
-	"ublock-cookies-easylist": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "EasyList – Annoyances|EasyList/uBO – Cookie Notices",
-		"off": true,
-		"title": "uBlock filters – Cookie Notices",
-		"tags": "annoyances cookies",
-		"contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt",
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt",
-			"https://ublockorigin.pages.dev/filters/annoyances-cookies.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances-cookies.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances-cookies.txt"
-		],
-		"supportURL": "https://github.com/uBlockOrigin/uAssets"
-	},
 	"easylist-newsletters": {
 		"content": "filters",
 		"group": "annoyances",
 		"parent": "EasyList – Annoyances",
 		"off": true,
 		"title": "EasyList – Newsletter Notices",
 		"tags": "annoyances",
+		"preferred": true,
 		"contentURL": [
 			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-newsletters.txt"
 		],
@@ -428,6 +463,7 @@
 		"off": true,
 		"title": "EasyList – Notifications",
 		"tags": "annoyances",
+		"preferred": true,
 		"contentURL": [
 			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-notifications.txt"
 		],
@@ -439,26 +475,6 @@
 		],
 		"supportURL": "https://easylist.to/"
 	},
-	"fanboy-social": {
-		"content": "filters",
-		"group": "annoyances",
-		"parent": "EasyList – Annoyances",
-		"off": true,
-		"title": "EasyList – Social Widgets",
-		"tags": "annoyances social",
-		"contentURL": [
-			"https://ublockorigin.github.io/uAssets/thirdparties/easylist-social.txt",
-			"https://secure.fanboy.co.nz/fanboy-social_ubo.txt"
-		],
-		"cdnURLs": [
-			"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-social.txt",
-			"https://ublockorigin.pages.dev/thirdparties/easylist-social.txt",
-			"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-social.txt",
-			"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-social.txt",
-			"https://secure.fanboy.co.nz/fanboy-social_ubo.txt"
-		],
-		"supportURL": "https://easylist.to/"
-	},
 	"ublock-annoyances": {
 		"content": "filters",
 		"group": "annoyances",
@@ -490,6 +506,7 @@
 		"updateAfter": 13,
 		"title": "Peter Lowe’s Ad and tracking server list",
 		"tags": "ads privacy security",
+		"preferred": true,
 		"contentURL": [
 			"https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext",
 			"assets/thirdparties/pgl.yoyo.org/as/serverlist.txt",