deploy: update dist v1.11.1

AdguardTeam · Jun 13, 2024 · a2ac480 · a2ac480
1 parent c3240fc
commit a2ac480
Show file tree

Hide file tree

Showing 33 changed files with 1,267 additions and 741 deletions.
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();

diff --git a/dist/redirect-files/noeval.js b/dist/redirect-files/noeval.js
@@ -12,19 +12,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/pardot-1.0.js b/dist/redirect-files/pardot-1.0.js
@@ -31,19 +31,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();