Merge branch 'master' into fix/AG-31162

AdguardTeam · Jun 14, 2024 · be4e0a8 · be4e0a8
2 parents a80d212 + a2ac480
commit be4e0a8
Show file tree

Hide file tree

Showing 38 changed files with 1,277 additions and 751 deletions.
diff --git a/.markdownlint.json b/.markdownlint.json
@@ -5,8 +5,8 @@
         "line_length": 120
     },
     "no-multiple-blanks": { "maximum": 2 },
-    "no-inline-html": { "allowed_elements": ["a"]},
-    "no-duplicate-header": { "siblings_only": true },
+    "no-inline-html": { "allowed_elements": ["a"] },
+    "no-duplicate-heading": { "siblings_only": true },
     "no-blanks-blockquote": false,
     "no-bare-urls": false,
     "ul-style": { "style": "dash" }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,16 +7,16 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 <!-- TODO: change `@added unknown` tag due to the actual version -->
 <!--       during new scriptlets or redirects releasing -->
 
-## [Unreleased]
+## [v1.11.1] - 2024-06-13
 
 ### Added
 
+- `trusted-dispatch-event` scriptlet [#382]
+- `trusted-replace-outbound-text` scriptlet [#410]
+- ability to click on the element with specified text in `trusted-click-element` scriptlet [#409]
 - ability to click element in closed shadow root in `trusted-click-element` scriptlet [#423]
 - `isRedirectResourceCompatibleWithAdg()` method to check compatibility of redirect resources with AdGuard
   without needing the full rule text [#420]
-- `trusted-replace-outbound-text` scriptlet [#410]
-- ability to click on the element with specified text in `trusted-click-element` scriptlet [#409]
-- `trusted-dispatch-event` scriptlet [#382]
 
 ### Deprecated
 
@@ -26,7 +26,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 
 - `set-attr` value cannot be set to minimum `0` and maximum `32767` possible value [#425]
 
-[Unreleased]: https://github.com/AdguardTeam/Scriptlets/compare/v1.10.25...HEAD
+[v1.11.1]: https://github.com/AdguardTeam/Scriptlets/compare/v1.10.25...v1.11.1
 [#425]: https://github.com/AdguardTeam/Scriptlets/issues/425
 [#423]: https://github.com/AdguardTeam/Scriptlets/issues/423
 [#420]: https://github.com/AdguardTeam/Scriptlets/issues/420

diff --git a/dist/build.txt b/dist/build.txt
@@ -1 +1 @@
-version=1.10.25
+version=1.11.1
diff --git a/dist/redirect-files/amazon-apstag.js b/dist/redirect-files/amazon-apstag.js
@@ -20,19 +20,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/ati-smarttag.js b/dist/redirect-files/ati-smarttag.js
@@ -80,19 +80,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/didomi-loader.js b/dist/redirect-files/didomi-loader.js
@@ -119,19 +119,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/fingerprintjs2.js b/dist/redirect-files/fingerprintjs2.js
@@ -28,19 +28,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/fingerprintjs3.js b/dist/redirect-files/fingerprintjs3.js
@@ -29,19 +29,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/gemius.js b/dist/redirect-files/gemius.js
@@ -18,19 +18,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/google-analytics-ga.js b/dist/redirect-files/google-analytics-ga.js
@@ -80,19 +80,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/google-analytics.js b/dist/redirect-files/google-analytics.js
@@ -91,19 +91,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/google-ima3.js b/dist/redirect-files/google-ima3.js
@@ -604,19 +604,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/googlesyndication-adsbygoogle.js b/dist/redirect-files/googlesyndication-adsbygoogle.js
@@ -60,19 +60,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/googletagservices-gpt.js b/dist/redirect-files/googletagservices-gpt.js
@@ -378,19 +378,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/matomo.js b/dist/redirect-files/matomo.js
@@ -21,19 +21,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/metrika-yandex-tag.js b/dist/redirect-files/metrika-yandex-tag.js
@@ -75,19 +75,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/metrika-yandex-watch.js b/dist/redirect-files/metrika-yandex-watch.js
@@ -59,19 +59,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();

diff --git a/dist/redirect-files/naver-wcslog.js b/dist/redirect-files/naver-wcslog.js
@@ -14,19 +14,11 @@
         try {
             var log = console.log.bind(console);
             var trace = console.trace.bind(console);
-            var prefix = source.ruleText || "";
+            var prefix = "";
             if (source.domainName) {
-                var AG_SCRIPTLET_MARKER = "#%#//";
-                var UBO_SCRIPTLET_MARKER = "##+js";
-                var ruleStartIndex;
-                if (source.ruleText.includes(AG_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(AG_SCRIPTLET_MARKER);
-                } else if (source.ruleText.includes(UBO_SCRIPTLET_MARKER)) {
-                    ruleStartIndex = source.ruleText.indexOf(UBO_SCRIPTLET_MARKER);
-                }
-                var rulePart = source.ruleText.slice(ruleStartIndex);
-                prefix = "".concat(source.domainName).concat(rulePart);
+                prefix += "".concat(source.domainName);
             }
+            prefix += "#%#//scriptlet('".concat(source.name, "', '").concat(source.args.join(", "), "')");
             log("".concat(prefix, " trace start"));
             if (trace) {
                 trace();