deploy: update dist v1.9.1

AdguardTeam · Mar 7, 2023 · de45d19 · de45d19
1 parent 36fc030
commit de45d19
Show file tree

Hide file tree

Showing 10 changed files with 2,698 additions and 532 deletions.
diff --git a/dist/build.txt b/dist/build.txt
@@ -1 +1 @@
-version=1.8.2
+version=1.9.1
diff --git a/dist/redirect-files/google-analytics-ga.js b/dist/redirect-files/google-analytics-ga.js
@@ -106,10 +106,16 @@
     function noopFunc() {}
     function logMessage(source, message) {
         let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+        let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
         const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
         if (!forced && !verbose) {
             return;
         }
+        const nativeConsole = console.log;
+        if (!convertMessageToString) {
+            nativeConsole("".concat(name, ":"), message);
+            return;
+        }
         let messageStr = "".concat(name, ": ").concat(message);
         if (ruleText) {
             const RULE_MARKER = "#%#//scriptlet";
@@ -119,7 +125,7 @@
                 messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
             }
         }
-        console.log(messageStr);
+        nativeConsole(messageStr);
     }
     const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
     try {

diff --git a/dist/redirect-files/google-ima3.js b/dist/redirect-files/google-ima3.js
@@ -578,10 +578,16 @@
     function noopFunc() {}
     function logMessage(source, message) {
         let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+        let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
         const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
         if (!forced && !verbose) {
             return;
         }
+        const nativeConsole = console.log;
+        if (!convertMessageToString) {
+            nativeConsole("".concat(name, ":"), message);
+            return;
+        }
         let messageStr = "".concat(name, ": ").concat(message);
         if (ruleText) {
             const RULE_MARKER = "#%#//scriptlet";
@@ -591,7 +597,7 @@
                 messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
             }
         }
-        console.log(messageStr);
+        nativeConsole(messageStr);
     }
     const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
     try {

diff --git a/dist/redirect-files/noeval.js b/dist/redirect-files/noeval.js
@@ -37,10 +37,16 @@
     }
     function logMessage(source, message) {
         let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+        let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
         const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
         if (!forced && !verbose) {
             return;
         }
+        const nativeConsole = console.log;
+        if (!convertMessageToString) {
+            nativeConsole("".concat(name, ":"), message);
+            return;
+        }
         let messageStr = "".concat(name, ": ").concat(message);
         if (ruleText) {
             const RULE_MARKER = "#%#//scriptlet";
@@ -50,7 +56,7 @@
                 messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
             }
         }
-        console.log(messageStr);
+        nativeConsole(messageStr);
     }
     const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
     try {

diff --git a/dist/redirects.json b/dist/redirects.json
diff --git a/dist/redirects.yml b/dist/redirects.yml
@@ -1,6 +1,6 @@
 #
 #    AdGuard Scriptlets (Redirects Source)
-#    Version 1.8.2
+#    Version 1.9.1
 #
 - title: 1x1-transparent.gif
   description: |-
@@ -86,6 +86,7 @@
     ||example.org/style.css$stylesheet,redirect=noopcss
     ```
   aliases:
+    - noop.css
     - blank-css
   file: noopcss.css
   contentType: text/css
@@ -1272,10 +1273,16 @@
         function noopFunc() {}
         function logMessage(source, message) {
             let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+            let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
             const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
             if (!forced && !verbose) {
                 return;
             }
+            const nativeConsole = console.log;
+            if (!convertMessageToString) {
+                nativeConsole("".concat(name, ":"), message);
+                return;
+            }
             let messageStr = "".concat(name, ": ").concat(message);
             if (ruleText) {
                 const RULE_MARKER = "#%#//scriptlet";
@@ -1285,7 +1292,7 @@
                     messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
                 }
             }
-            console.log(messageStr);
+            nativeConsole(messageStr);
         }
         const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
         try {
@@ -2022,10 +2029,16 @@
         function noopFunc() {}
         function logMessage(source, message) {
             let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+            let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
             const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
             if (!forced && !verbose) {
                 return;
             }
+            const nativeConsole = console.log;
+            if (!convertMessageToString) {
+                nativeConsole("".concat(name, ":"), message);
+                return;
+            }
             let messageStr = "".concat(name, ": ").concat(message);
             if (ruleText) {
                 const RULE_MARKER = "#%#//scriptlet";
@@ -2035,7 +2048,7 @@
                     messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
                 }
             }
-            console.log(messageStr);
+            nativeConsole(messageStr);
         }
         const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
         try {
@@ -2986,10 +2999,16 @@
         }
         function logMessage(source, message) {
             let forced = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+            let convertMessageToString = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
             const name = source.name, ruleText = source.ruleText, verbose = source.verbose;
             if (!forced && !verbose) {
                 return;
             }
+            const nativeConsole = console.log;
+            if (!convertMessageToString) {
+                nativeConsole("".concat(name, ":"), message);
+                return;
+            }
             let messageStr = "".concat(name, ": ").concat(message);
             if (ruleText) {
                 const RULE_MARKER = "#%#//scriptlet";
@@ -2999,7 +3018,7 @@
                     messageStr += "; cannot apply rule: ".concat(ruleWithoutDomains);
                 }
             }
-            console.log(messageStr);
+            nativeConsole(messageStr);
         }
         const updatedArgs = args ? [].concat(source).concat(args) : [ source ];
         try {

diff --git a/dist/scriptlets.corelibs.json b/dist/scriptlets.corelibs.json