Merge branch 'master' into fix/AG-24422

AdguardTeam · Nov 22, 2023 · 953106b · 953106b
2 parents 9244d6d + 66f6727
commit 953106b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `setPrivacySettings()` method to `googletagservices-gpt` redirect
   [#344](https://github.com/AdguardTeam/Scriptlets/issues/344)
-
+- UBO alias `noop.json` for `noopjson` redirect
 
 ## [v1.9.96] - 2023-11-15
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@adguard/scriptlets",
-    "version": "1.9.96",
+    "version": "1.9.97",
     "description": "AdGuard's JavaScript library of Scriptlets and Redirect resources",
     "scripts": {
         "build": "babel-node -x .js,.ts scripts/build.js",

diff --git a/scripts/compatibility-table.json b/scripts/compatibility-table.json
@@ -413,7 +413,8 @@
             "abp": "blank-js"
         },
         {
-            "adg": "noopjson"
+            "adg": "noopjson",
+            "ubo": "noop.json"
         },
         {
             "adg": "nooptext",

diff --git a/src/helpers/compatibility-redirects.ts b/src/helpers/compatibility-redirects.ts
@@ -120,6 +120,7 @@ const redirects: RedirectCompatibilityMap[] = [
     },
     {
         adg: 'noopjson',
+        ubo: 'noop.json',
     },
     {
         adg: 'nooptext',

diff --git a/src/redirects/static-redirects.yml b/src/redirects/static-redirects.yml
@@ -127,6 +127,8 @@
     ```adblock
     ||example.org/geo/location$xmlhttprequest,redirect=noopjson
     ```
+  aliases:
+    - noop.json
   file: noopjson.json
   contentType: application/json
   content: '{}'

diff --git a/tests/api/index.spec.js b/tests/api/index.spec.js
@@ -738,6 +738,10 @@ describe('Test redirects api methods', () => {
                 actual: 'nobab.js',
                 expected: 'prevent-bab',
             },
+            {
+                actual: 'noop.json',
+                expected: 'noopjson',
+            },
             // Valid uBO redirect name that aren't supported by ADG
             {
                 actual: 'outbrain-widget.js',

diff --git a/wiki/compatibility-table.md b/wiki/compatibility-table.md
@@ -129,7 +129,7 @@
 | [noopcss](../wiki/about-redirects.md#noopcss) | noop.css | blank-css |
 | [noopframe](../wiki/about-redirects.md#noopframe) | noop.html | blank-html |
 | [noopjs](../wiki/about-redirects.md#noopjs) | noop.js | blank-js |
-| [noopjson](../wiki/about-redirects.md#noopjson) |  |  |
+| [noopjson](../wiki/about-redirects.md#noopjson) | noop.json |  |
 | [nooptext](../wiki/about-redirects.md#nooptext) | noop.txt | blank-text |
 | [noopmp3-0.1s](../wiki/about-redirects.md#noopmp3-0.1s) | noop-0.1s.mp3 | blank-mp3 |
 | [noopmp4-1s](../wiki/about-redirects.md#noopmp4-1s) | noop-1s.mp4 | blank-mp4 |