Skip to content

Commit 5b649ad

Browse files
dhowedhowe
authored
Merge pull request #2531 from mneunomne/merge1.57.0
Merge1.57.0
2 parents bf3b13f + 5db4de5 commit 5b649ad

File tree

242 files changed

+5877
-3992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+5877
-3992
lines changed

‎.eslintrc.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
env:
2+
browser: true
3+
es2022: true
4+
extends: eslint:recommended
5+
parserOptions:
6+
sourceType: module
7+
rules:
8+
eqeqeq:
9+
- warn
10+
- always
11+
indent:
12+
- error
13+
- 4
14+
- ignoredNodes:
15+
- Program > IfStatement > BlockStatement
16+
- Program > ExpressionStatement > CallExpression > ArrowFunctionExpression > BlockStatement
17+
- CallExpression > MemberExpression
18+
- ArrayExpression > Literal
19+
no-control-regex: off
20+
no-empty: off
21+
sort-imports: warn
22+
strict: warn
23+
globals:
24+
browser: readonly
25+
chrome: readonly
26+
vAPI: readonly

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: startsWith(github.ref, 'refs/tags/')
2323
steps:
2424
- name: Clone repository
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
with:
2727
persist-credentials: false
2828
- name: Clone uAssets

‎CHANGELOG.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,43 @@
11
## Fixes / changes
22

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

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# https://stackoverflow.com/a/6273809
22
run_options := $(filter-out $@,$(MAKECMDGOALS))
33

4-
.PHONY: all clean test lint chromium opera firefox npm dig mv3 mv3-quick \
4+
.PHONY: all clean cleanassets test lint chromium opera firefox npm dig mv3 mv3-quick \
55
compare maxcost medcost mincost modifiers record wasm
66

77
sources := $(wildcard assets/* assets/*/* dist/version src/* src/*/* src/*/*/* src/*/*/*/*)
@@ -73,6 +73,8 @@ dist/build/uAssets:
7373
clean:
7474
rm -rf dist/build tmp/node_modules
7575

76+
cleanassets:
77+
rm -rf dist/build/mv3-data dist/build/uAssets
7678

7779
# Not real targets, just convenient for auto-completion at shell prompt
7880
compare:

‎assets/assets.dev.json‎

Lines changed: 95 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@
155155
"group": "ads",
156156
"title": "EasyList",
157157
"tags": "ads",
158+
"preferred": true,
158159
"contentURL": [
159160
"https://ublockorigin.github.io/uAssets/thirdparties/easylist.txt",
160161
"assets/thirdparties/easylist/easylist.txt"
@@ -205,6 +206,7 @@
205206
"group": "privacy",
206207
"title": "EasyPrivacy",
207208
"tags": "privacy",
209+
"preferred": true,
208210
"contentURL": [
209211
"https://ublockorigin.github.io/uAssets/thirdparties/easyprivacy.txt",
210212
"assets/thirdparties/easylist/easyprivacy.txt"
@@ -244,21 +246,11 @@
244246
],
245247
"supportURL": "https://gitlab.com/malware-filter/phishing-filter#phishing-url-blocklist"
246248
},
247-
"adguard-social": {
248-
"content": "filters",
249-
"group": "annoyances",
250-
"parent": "AdGuard – Annoyances",
251-
"off": true,
252-
"title": "AdGuard – Social Media",
253-
"tags": "annoyances social",
254-
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/4.txt",
255-
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
256-
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
257-
},
258249
"adguard-cookies": {
259250
"content": "filters",
260251
"group": "annoyances",
261-
"parent": "AdGuard – Annoyances|AdGuard/uBO – Cookie Notices",
252+
"group2": "cookies",
253+
"parent": "AdGuard/uBO – Cookie Notices",
262254
"off": true,
263255
"title": "AdGuard – Cookie Notices",
264256
"tags": "annoyances cookies",
@@ -269,10 +261,51 @@
269261
"ublock-cookies-adguard": {
270262
"content": "filters",
271263
"group": "annoyances",
272-
"parent": "AdGuard – Annoyances|AdGuard/uBO – Cookie Notices",
264+
"group2": "cookies",
265+
"parent": "AdGuard/uBO – Cookie Notices",
266+
"off": true,
267+
"title": "uBlock filters – Cookie Notices",
268+
"tags": "annoyances cookies",
269+
"contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt",
270+
"cdnURLs": [
271+
"https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt",
272+
"https://ublockorigin.pages.dev/filters/annoyances-cookies.txt",
273+
"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances-cookies.txt",
274+
"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances-cookies.txt"
275+
],
276+
"supportURL": "https://github.com/uBlockOrigin/uAssets"
277+
},
278+
"fanboy-cookiemonster": {
279+
"content": "filters",
280+
"group": "annoyances",
281+
"group2": "cookies",
282+
"parent": "EasyList/uBO – Cookie Notices",
283+
"off": true,
284+
"title": "EasyList – Cookie Notices",
285+
"tags": "annoyances cookies",
286+
"preferred": true,
287+
"contentURL": [
288+
"https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt",
289+
"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt"
290+
],
291+
"cdnURLs": [
292+
"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-cookies.txt",
293+
"https://ublockorigin.pages.dev/thirdparties/easylist-cookies.txt",
294+
"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-cookies.txt",
295+
"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-cookies.txt",
296+
"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt"
297+
],
298+
"supportURL": "https://github.com/easylist/easylist#fanboy-lists"
299+
},
300+
"ublock-cookies-easylist": {
301+
"content": "filters",
302+
"group": "annoyances",
303+
"group2": "cookies",
304+
"parent": "EasyList/uBO – Cookie Notices",
273305
"off": true,
274306
"title": "uBlock filters – Cookie Notices",
275307
"tags": "annoyances cookies",
308+
"preferred": true,
276309
"contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt",
277310
"cdnURLs": [
278311
"https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt",
@@ -282,6 +315,50 @@
282315
],
283316
"supportURL": "https://github.com/uBlockOrigin/uAssets"
284317
},
318+
"adguard-social": {
319+
"content": "filters",
320+
"group": "annoyances",
321+
"group2": "social",
322+
"parent": null,
323+
"off": true,
324+
"title": "AdGuard – Social Widgets",
325+
"tags": "annoyances social",
326+
"contentURL": "https://filters.adtidy.org/extension/ublock/filters/4.txt",
327+
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
328+
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
329+
},
330+
"fanboy-social": {
331+
"content": "filters",
332+
"group": "annoyances",
333+
"group2": "social",
334+
"parent": null,
335+
"off": true,
336+
"title": "EasyList – Social Widgets",
337+
"tags": "annoyances social",
338+
"preferred": true,
339+
"contentURL": [
340+
"https://ublockorigin.github.io/uAssets/thirdparties/easylist-social.txt",
341+
"https://secure.fanboy.co.nz/fanboy-social_ubo.txt"
342+
],
343+
"cdnURLs": [
344+
"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-social.txt",
345+
"https://ublockorigin.pages.dev/thirdparties/easylist-social.txt",
346+
"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-social.txt",
347+
"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-social.txt",
348+
"https://secure.fanboy.co.nz/fanboy-social_ubo.txt"
349+
],
350+
"supportURL": "https://easylist.to/"
351+
},
352+
"fanboy-thirdparty_social": {
353+
"content": "filters",
354+
"group": "annoyances",
355+
"group2": "social",
356+
"off": true,
357+
"title": "Fanboy – Anti-Facebook",
358+
"tags": "privacy",
359+
"contentURL": "https://secure.fanboy.co.nz/fanboy-antifacebook.txt",
360+
"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
361+
},
285362
"adguard-popup-overlays": {
286363
"content": "filters",
287364
"group": "annoyances",
@@ -326,22 +403,14 @@
326403
"supportURL": "https://github.com/AdguardTeam/AdguardFilters#adguard-filters",
327404
"instructionURL": "https://kb.adguard.com/en/general/adguard-ad-filters"
328405
},
329-
"fanboy-thirdparty_social": {
330-
"content": "filters",
331-
"group": "annoyances",
332-
"off": true,
333-
"title": "Fanboy – Anti-Facebook",
334-
"tags": "privacy",
335-
"contentURL": "https://secure.fanboy.co.nz/fanboy-antifacebook.txt",
336-
"supportURL": "https://github.com/ryanbr/fanboy-adblock/issues"
337-
},
338406
"easylist-annoyances": {
339407
"content": "filters",
340408
"group": "annoyances",
341409
"parent": "EasyList – Annoyances",
342410
"off": true,
343411
"title": "EasyList – Other Annoyances",
344412
"tags": "annoyances",
413+
"preferred": true,
345414
"contentURL": "https://ublockorigin.github.io/uAssets/thirdparties/easylist-annoyances.txt",
346415
"cdnURLs": [
347416
"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-annoyances.txt",
@@ -358,6 +427,7 @@
358427
"off": true,
359428
"title": "EasyList – Chat Widgets",
360429
"tags": "annoyances",
430+
"preferred": true,
361431
"contentURL": "https://ublockorigin.github.io/uAssets/thirdparties/easylist-chat.txt",
362432
"cdnURLs": [
363433
"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-chat.txt",
@@ -367,49 +437,14 @@
367437
],
368438
"supportURL": "https://github.com/easylist/easylist#fanboy-lists"
369439
},
370-
"fanboy-cookiemonster": {
371-
"content": "filters",
372-
"group": "annoyances",
373-
"parent": "EasyList – Annoyances|EasyList/uBO – Cookie Notices",
374-
"off": true,
375-
"title": "EasyList – Cookie Notices",
376-
"tags": "annoyances cookies",
377-
"contentURL": [
378-
"https://ublockorigin.github.io/uAssets/thirdparties/easylist-cookies.txt",
379-
"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt"
380-
],
381-
"cdnURLs": [
382-
"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-cookies.txt",
383-
"https://ublockorigin.pages.dev/thirdparties/easylist-cookies.txt",
384-
"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-cookies.txt",
385-
"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-cookies.txt",
386-
"https://secure.fanboy.co.nz/fanboy-cookiemonster_ubo.txt"
387-
],
388-
"supportURL": "https://github.com/easylist/easylist#fanboy-lists"
389-
},
390-
"ublock-cookies-easylist": {
391-
"content": "filters",
392-
"group": "annoyances",
393-
"parent": "EasyList – Annoyances|EasyList/uBO – Cookie Notices",
394-
"off": true,
395-
"title": "uBlock filters – Cookie Notices",
396-
"tags": "annoyances cookies",
397-
"contentURL": "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt",
398-
"cdnURLs": [
399-
"https://ublockorigin.github.io/uAssetsCDN/filters/annoyances-cookies.txt",
400-
"https://ublockorigin.pages.dev/filters/annoyances-cookies.txt",
401-
"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/filters/annoyances-cookies.txt",
402-
"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/filters/annoyances-cookies.txt"
403-
],
404-
"supportURL": "https://github.com/uBlockOrigin/uAssets"
405-
},
406440
"easylist-newsletters": {
407441
"content": "filters",
408442
"group": "annoyances",
409443
"parent": "EasyList – Annoyances",
410444
"off": true,
411445
"title": "EasyList – Newsletter Notices",
412446
"tags": "annoyances",
447+
"preferred": true,
413448
"contentURL": [
414449
"https://ublockorigin.github.io/uAssets/thirdparties/easylist-newsletters.txt"
415450
],
@@ -428,6 +463,7 @@
428463
"off": true,
429464
"title": "EasyList – Notifications",
430465
"tags": "annoyances",
466+
"preferred": true,
431467
"contentURL": [
432468
"https://ublockorigin.github.io/uAssets/thirdparties/easylist-notifications.txt"
433469
],
@@ -439,26 +475,6 @@
439475
],
440476
"supportURL": "https://easylist.to/"
441477
},
442-
"fanboy-social": {
443-
"content": "filters",
444-
"group": "annoyances",
445-
"parent": "EasyList – Annoyances",
446-
"off": true,
447-
"title": "EasyList – Social Widgets",
448-
"tags": "annoyances social",
449-
"contentURL": [
450-
"https://ublockorigin.github.io/uAssets/thirdparties/easylist-social.txt",
451-
"https://secure.fanboy.co.nz/fanboy-social_ubo.txt"
452-
],
453-
"cdnURLs": [
454-
"https://ublockorigin.github.io/uAssetsCDN/thirdparties/easylist-social.txt",
455-
"https://ublockorigin.pages.dev/thirdparties/easylist-social.txt",
456-
"https://cdn.jsdelivr.net/gh/uBlockOrigin/uAssetsCDN@main/thirdparties/easylist-social.txt",
457-
"https://cdn.statically.io/gh/uBlockOrigin/uAssetsCDN/main/thirdparties/easylist-social.txt",
458-
"https://secure.fanboy.co.nz/fanboy-social_ubo.txt"
459-
],
460-
"supportURL": "https://easylist.to/"
461-
},
462478
"ublock-annoyances": {
463479
"content": "filters",
464480
"group": "annoyances",
@@ -490,6 +506,7 @@
490506
"updateAfter": 13,
491507
"title": "Peter Lowe’s Ad and tracking server list",
492508
"tags": "ads privacy security",
509+
"preferred": true,
493510
"contentURL": [
494511
"https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext",
495512
"assets/thirdparties/pgl.yoyo.org/as/serverlist.txt",

0 commit comments

Comments
 (0)