Merge branch 'master' into feature/AG-23564

bamboo-specs/adguard-api-increment.yaml

@@ -28,7 +28,7 @@ Increment:
         scripts:
           - |-
             branch="${bamboo.planRepository.branchName}"
-      
+
             # Throw error if current branch is not "master",
             # because we do not deploy changes from other branches
             if [ $branch != "master" ]

bamboo-specs/tsurlfilter-build.yaml

@@ -38,7 +38,7 @@ Build:
             ls -alt
 
             npx lerna@6 bootstrap --scope @adguard/tsurlfilter --include-dependencies
-            npx lerna@6 run --scope @adguard/tsurlfilter build 
+            npx lerna@6 run --scope @adguard/tsurlfilter build
 
             cd packages/tsurlfilter/
             yarn pack --filename tsurlfilter.tgz

bamboo-specs/tsurlfilter-increment.yaml

@@ -30,7 +30,7 @@ Increment:
             branch="${bamboo.planRepository.branchName}"
 
             # Throw error if current branch is neither "master" nor "v1",
-            # because we do not deploy changes from other branches 
+            # because we do not deploy changes from other branches
             if [ $branch != "master" && $branch != "v1" ]
             then
               echo "increment is not supported on branch ${branch}"

bamboo-specs/tsurlfilter-tests.yaml

@@ -36,8 +36,8 @@ Test:
             ls -alt
 
             npx lerna@6 bootstrap --scope @adguard/tsurlfilter --include-dependencies
-            npx lerna@6 run --scope @adguard/tsurlfilter test:prod 
-            npx lerna@6 run --scope @adguard/tsurlfilter build 
+            npx lerna@6 run --scope @adguard/tsurlfilter test:prod
+            npx lerna@6 run --scope @adguard/tsurlfilter build
 
             # cleanup parent
             rm -rf node_modules

bamboo-specs/tswebextension-tests.yaml

@@ -47,7 +47,7 @@ Test:
 
             # build tsurlfilter first, because it is used in tswebextension tests
             npx lerna@6 run --scope @adguard/tsurlfilter build
-  
+
             npx lerna@6 run --scope @adguard/tswebextension test:prod
             npx lerna@6 run --scope @adguard/tswebextension build
 

packages/agtree/src/compatibility-tables/modifiers/all.yml

@@ -1,28 +1,28 @@
 adg_os_any:
   name: all
   description: $all modifier is made of $document, $popup, and all content-type modifiers combined.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#all-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#all-modifier
   negatable: false
   block_only: true
 
 adg_ext_any:
   name: all
   description: $all modifier is made of $document, $popup, and all content-type modifiers combined.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#all-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#all-modifier
   negatable: false
   block_only: true
 
 adg_cb_ios:
   name: all
   description: The `$all` modifier is made of `$document`, `$popup`, and all content-type modifiers combined.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#all-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#all-modifier
   negatable: false
   block_only: true
 
 adg_cb_safari:
   name: all
   description: The `$all` modifier is made of `$document`, `$popup`, and all content-type modifiers combined.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#all-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#all-modifier
   negatable: false
   block_only: true
 

packages/agtree/src/compatibility-tables/modifiers/app.yml

@@ -3,6 +3,6 @@ adg_os_any:
   description: |-
     The `$app` modifier lets you narrow the rule coverage down to a specific application or a list of applications.
     The modifier's behavior and syntax perfectly match the corresponding basic rules `$app` modifier.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#app-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#app-modifier
   assignable: true
   negatable: false

packages/agtree/src/compatibility-tables/modifiers/badfilter.yml

@@ -3,31 +3,31 @@ adg_os_any:
   description: |-
     The rules with the `$badfilter` modifier disable other basic rules to which they refer. It means that
     the text of the disabled rule should match the text of the `$badfilter` rule (without the `$badfilter` modifier).
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#badfilter-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#badfilter-modifier
   negatable: false
 
 adg_ext_any:
   name: badfilter
   description: |-
     The rules with the `$badfilter` modifier disable other basic rules to which they refer. It means that
     the text of the disabled rule should match the text of the `$badfilter` rule (without the `$badfilter` modifier).
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#badfilter-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#badfilter-modifier
   negatable: false
 
 adg_cb_ios:
   name: badfilter
   description: |-
     The rules with the `$badfilter` modifier disable other basic rules to which they refer. It means that
     the text of the disabled rule should match the text of the `$badfilter` rule (without the `$badfilter` modifier).
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#badfilter-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#badfilter-modifier
   negatable: false
 
 adg_cb_safari:
   name: badfilter
   description: |-
     The rules with the `$badfilter` modifier disable other basic rules to which they refer. It means that
     the text of the disabled rule should match the text of the `$badfilter` rule (without the `$badfilter` modifier).
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#badfilter-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#badfilter-modifier
   negatable: false
 
 ubo_ext_any:

packages/agtree/src/compatibility-tables/modifiers/content.yml

@@ -1,6 +1,6 @@
 adg_os_any:
   name: content
   description: Disables HTML filtering and `$replace` rules on the pages that match the rule.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#content-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#content-modifier
   negatable: false
   exception_only: true

packages/agtree/src/compatibility-tables/modifiers/cookie.yml

@@ -3,7 +3,7 @@ adg_os_any:
   description: |-
     The `$cookie` modifier completely changes rule behavior.
     Instead of blocking a request, this modifier makes us suppress or modify the Cookie and Set-Cookie headers.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#cookie-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#cookie-modifier
   assignable: true
   negatable: false
   value_format: ^([^;=\s]*?)((?:;(maxAge=\d+;?)?|(sameSite=(lax|none|strict);?)?){1,3})(?<!;)$
@@ -13,7 +13,7 @@ adg_ext_any:
   description: |-
     The `$cookie` modifier completely changes rule behavior.
     Instead of blocking a request, this modifier makes us suppress or modify the Cookie and Set-Cookie headers.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#cookie-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#cookie-modifier
   assignable: true
   negatable: false
   value_format: ^([^;=\s]*?)((?:;(maxAge=\d+;?)?|(sameSite=(lax|none|strict);?)?){1,3})(?<!;)$

packages/agtree/src/compatibility-tables/modifiers/csp.yml

@@ -4,7 +4,7 @@ adg_os_any:
     This modifier completely changes the rule behavior.
     If it is applied to a rule, it will not block the matching request.
     The response headers are going to be modified instead.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#csp-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#csp-modifier
   conflicts:
     - domain
     - important
@@ -21,7 +21,7 @@ adg_ext_any:
     This modifier completely changes the rule behavior.
     If it is applied to a rule, it will not block the matching request.
     The response headers are going to be modified instead.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#csp-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#csp-modifier
   conflicts:
     - domain
     - important

packages/agtree/src/compatibility-tables/modifiers/denyallow.yml

@@ -4,7 +4,7 @@ adg_os_any:
     The `$denyallow` modifier allows to avoid creating additional rules
     when it is needed to disable a certain rule for specific domains.
     `$denyallow` matches only target domains and not referrer domains.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#denyallow-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#denyallow-modifier
   conflicts:
     - to
   assignable: true
@@ -17,7 +17,7 @@ adg_ext_any:
     The `$denyallow` modifier allows to avoid creating additional rules
     when it is needed to disable a certain rule for specific domains.
     `$denyallow` matches only target domains and not referrer domains.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#denyallow-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#denyallow-modifier
   conflicts:
     - to
   assignable: true
@@ -30,7 +30,7 @@ adg_cb_ios:
     The `$denyallow` modifier allows to avoid creating additional rules
     when it is needed to disable a certain rule for specific domains.
     `$denyallow` matches only target domains and not referrer domains.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#denyallow-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#denyallow-modifier
   conflicts:
     - to
   assignable: true
@@ -43,7 +43,7 @@ adg_cb_safari:
     The `$denyallow` modifier allows to avoid creating additional rules
     when it is needed to disable a certain rule for specific domains.
     `$denyallow` matches only target domains and not referrer domains.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#denyallow-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#denyallow-modifier
   conflicts:
     - to
   assignable: true

packages/agtree/src/compatibility-tables/modifiers/document.yml

@@ -3,7 +3,7 @@ adg_os_any:
   description: |-
     The rule corresponds to the main frame document requests,
     i.e. HTML documents that are loaded in the browser tab.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#document-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#document-modifier
   # TODO: it shall be negatable as content-type modifier in future
   # so it should be changed later (here and below)
   negatable: false
@@ -13,23 +13,23 @@ adg_ext_any:
   description: |-
     The rule corresponds to the main frame document requests,
     i.e. HTML documents that are loaded in the browser tab.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#document-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#document-modifier
   negatable: false
 
 adg_cb_ios:
   name: document
   description: |-
     The rule corresponds to the main frame document requests,
     i.e. HTML documents that are loaded in the browser tab.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#document-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#document-modifier
   negatable: false
 
 adg_cb_safari:
   name: document
   description: |-
     The rule corresponds to the main frame document requests,
     i.e. HTML documents that are loaded in the browser tab.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#document-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#document-modifier
   negatable: false
 
 abp_ext_any:

packages/agtree/src/compatibility-tables/modifiers/domain.yml

@@ -3,7 +3,7 @@ adg_any:
   aliases:
     - from
   description: The `$domain` modifier limits the rule application area to a list of domains and their subdomains.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#domain-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#domain-modifier
   assignable: true
   negatable: false
   value_format: pipe_separated_domains

packages/agtree/src/compatibility-tables/modifiers/elemhide.yml

@@ -3,7 +3,7 @@ adg_any:
   aliases:
     - ehide
   description: Disables any cosmetic rules on the pages matching the rule.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#elemhide-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#elemhide-modifier
   negatable: false
   exception_only: true
 

packages/agtree/src/compatibility-tables/modifiers/extension.yml

@@ -1,7 +1,7 @@
 adg_os_any:
   name: extension
   description: Disables all userscripts on the pages matching this rule.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#extension-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#extension-modifier
   conflicts:
     - domain
     - specifichide

packages/agtree/src/compatibility-tables/modifiers/first-party.yml

@@ -6,7 +6,7 @@ adg_any:
     - ~third-party
   description: A restriction of first-party requests. Equal to `~third-party`.
   # TODO: change link in docs to first-party modifier when it will be available
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#third-party-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#third-party-modifier
   negatable: false
 
 ubo_any:

packages/agtree/src/compatibility-tables/modifiers/font.yml

@@ -1,6 +1,6 @@
 adg_any:
   name: font
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#font-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#font-modifier
   description: The rule corresponds to requests for fonts, e.g. `.woff` filename extension.
 
 abp_any:

packages/agtree/src/compatibility-tables/modifiers/genericblock.yml

@@ -1,7 +1,7 @@
 adg_os_any:
   name: genericblock
   description: Disables generic basic rules on pages that correspond to exception rule.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#genericblock-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#genericblock-modifier
   conflicts:
     - domain
     - specifichide
@@ -18,7 +18,7 @@ adg_os_any:
 adg_ext_any:
   name: genericblock
   description: Disables generic basic rules on pages that correspond to exception rule.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#genericblock-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#genericblock-modifier
   conflicts:
     - domain
     - specifichide
@@ -33,7 +33,7 @@ adg_ext_any:
 adg_cb_ios:
   name: genericblock
   description: Disables generic basic rules on pages that correspond to exception rule.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#genericblock-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#genericblock-modifier
   conflicts:
     - domain
     - specifichide
@@ -48,7 +48,7 @@ adg_cb_ios:
 adg_cb_safari:
   name: genericblock
   description: Disables generic basic rules on pages that correspond to exception rule.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#genericblock-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#genericblock-modifier
   conflicts:
     - domain
     - specifichide

packages/agtree/src/compatibility-tables/modifiers/generichide.yml

@@ -3,7 +3,7 @@ adg_any:
   aliases:
     - ghide
   description: Disables all generic cosmetic rules.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#generichide-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#generichide-modifier
   conflicts:
     - domain
     - genericblock

packages/agtree/src/compatibility-tables/modifiers/header.yml

@@ -3,7 +3,7 @@ adg_os_any:
   description: |-
     The `$header` modifier allows matching the HTTP response
     having a specific header with (optionally) a specific value.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#header-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#header-modifier
   assignable: true
   value_format: /^[A-z0-9-]+(:.+|)$/
 
@@ -12,7 +12,7 @@ adg_ext_any:
   description: |-
     The `$header` modifier allows matching the HTTP response
     having a specific header with (optionally) a specific value.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#header-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#header-modifier
   assignable: true
   value_format: /^[A-z0-9-]+(:.+|)$/
 

packages/agtree/src/compatibility-tables/modifiers/hls.yml

@@ -3,7 +3,7 @@ adg_os_any:
   description: |-
     The `$hls` rules modify the response of a matching request.
     They are intended as a convenient way to remove segments from HLS playlists (RFC 8216).
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#hls-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#hls-modifier
   version_added: CoreLibs 1.10
   conflicts:
     - domain

packages/agtree/src/compatibility-tables/modifiers/image.yml

@@ -1,7 +1,7 @@
 adg_any:
   name: image
   description: The rule corresponds to images requests.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#image-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#image-modifier
 
 abp_any:
   name: image

packages/agtree/src/compatibility-tables/modifiers/important.yml

@@ -3,7 +3,7 @@ adg_any:
   description: |-
     The `$important` modifier applied to a rule increases its priority
     over any other rule without `$important` modifier. Even over basic exception rules.
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#important-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#important-modifier
   negatable: false
 
 ubo_any:

packages/agtree/src/compatibility-tables/modifiers/inline-font.yml

@@ -6,7 +6,7 @@ adg_os_any:
     ```adblock
     ||example.org^$csp=font-src 'self' 'unsafe-eval' http: https: data: blob: mediastream: filesystem:
     ```
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#inline-font-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#inline-font-modifier
 
 adg_ext_any:
   name: inline-font
@@ -16,7 +16,7 @@ adg_ext_any:
     ```adblock
     ||example.org^$csp=font-src 'self' 'unsafe-eval' http: https: data: blob: mediastream: filesystem:
     ```
-  docs: https://adguard.com/kb/general/ad-filtering/create-own-filters/#inline-font-modifier
+  docs: https://adguard.app/kb/general/ad-filtering/create-own-filters/#inline-font-modifier
 
 ubo_ext_any:
   name: inline-font