Skip to content

Commit

Permalink
add ubo alias noop.json for noopjson redirect
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit faedd29
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Wed Nov 22 16:18:39 2023 +0200

    update wiki/compatibility-table.md

commit f1c0bf8
Author: Slava Leleka <v.leleka@adguard.com>
Date:   Wed Nov 22 16:17:42 2023 +0200

    add ubo alias noop.json for noopjson redirect
  • Loading branch information
slavaleleka committed Nov 22, 2023
1 parent 804a596 commit 2dd3f5f
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 2 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
<!-- TODO: add @added tag to the files with specific version -->
<!-- during new scriptlets or redirects releasing -->

## [Unreleased]

### Added

- UBO alias `noop.json` for `noopjson` redirect

## [v1.9.96] - 2023-11-15

### Added
Expand Down Expand Up @@ -292,6 +298,7 @@ prevent inline `onerror` and match `link` tag [#276](https://github.com/AdguardT
- `metrika-yandex-tag` [#254](https://github.com/AdguardTeam/Scriptlets/issues/254)
- `googlesyndication-adsbygoogle` [#252](https://github.com/AdguardTeam/Scriptlets/issues/252)

[Unreleased]: https://github.com/AdguardTeam/Scriptlets/compare/v1.9.96...HEAD
[v1.9.96]: https://github.com/AdguardTeam/Scriptlets/compare/v1.9.91...v1.9.96
[v1.9.91]: https://github.com/AdguardTeam/Scriptlets/compare/v1.9.83...v1.9.91
[v1.9.83]: https://github.com/AdguardTeam/Scriptlets/compare/v1.9.72...v1.9.83
Expand Down
3 changes: 2 additions & 1 deletion scripts/compatibility-table.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,8 @@
"abp": "blank-js"
},
{
"adg": "noopjson"
"adg": "noopjson",
"ubo": "noop.json"
},
{
"adg": "nooptext",
Expand Down
1 change: 1 addition & 0 deletions src/helpers/compatibility-redirects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ const redirects: RedirectCompatibilityMap[] = [
},
{
adg: 'noopjson',
ubo: 'noop.json',
},
{
adg: 'nooptext',
Expand Down
2 changes: 2 additions & 0 deletions src/redirects/static-redirects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@
```adblock
||example.org/geo/location$xmlhttprequest,redirect=noopjson
```
aliases:
- noop.json
file: noopjson.json
contentType: application/json
content: '{}'
Expand Down
4 changes: 4 additions & 0 deletions tests/api/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion wiki/compatibility-table.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down

0 comments on commit 2dd3f5f

Please sign in to comment.