Merge pull request #94 in ADGUARD-FILTERS/scriptlets from fix/AG-815 …

…to master * commit 'eeb28cf021fa35bd796cdbeab91ec4a997124940': specify decription for 'vmap' redirect specify redirects decsription examples
AdguardTeam · Mar 5, 2020 · 054db54 · 054db54
2 parents e3546f1 + eeb28cf
commit 054db54
Show file tree

Hide file tree

Showing 13 changed files with 66 additions and 56 deletions.
diff --git a/dist/cjs/scriptletsCjs.js b/dist/cjs/scriptletsCjs.js
diff --git a/dist/redirects.yml b/dist/redirects.yml
@@ -78,7 +78,7 @@
   description: |-
     **Example**
     ```
-    ||example.org^$stylesheet,redirect=noopcss
+    ||example.org/style.css$stylesheet,redirect=noopcss
     ```
   aliases:
     - blank-css
@@ -89,7 +89,7 @@
   description: |-
     **Example**
     ```
-    ||example.org^$script,redirect=noopjs
+    ||example.org/advert.js$script,redirect=noopjs
     ```
   aliases:
     - noop.js
@@ -101,7 +101,7 @@
   description: |-
     **Example**
     ```
-    ||example.org^$xmlhttprequest,redirect=nooptext
+    ||example.org/advert.js$xmlhttprequest,redirect=nooptext
     ```
   aliases:
     - noop.txt
@@ -115,7 +115,7 @@
 
     **Example**
     ```
-    ||example.org^$xmlhttprequest,redirect=noopvmap-1.0
+    ||example.org/vmap01.xml$xmlhttprequest,redirect=noopvmap-1.0
     ```
   contentType: text/xml
   content: >-
@@ -128,7 +128,7 @@
 
     **Example**
     ```
-    ||example.org^$xmlhttprequest,redirect=noopvast-2.0
+    ||example.org/vast02.xml^$xmlhttprequest,redirect=noopvast-2.0
     ```
   contentType: text/xml
   content: <VAST version="2.0"></VAST>
@@ -139,7 +139,7 @@
 
     **Example**
     ```
-    ||example.org^$xmlhttprequest,redirect=noopvast-3.0
+    ||example.org/vast03.xml^$xmlhttprequest,redirect=noopvast-3.0
     ```
   contentType: text/xml
   content: <VAST version="3.0"></VAST>
@@ -148,7 +148,7 @@
   description: |-
     **Example**
     ```
-    ||example.org^$media,redirect=noopmp3-0.1s
+    ||example.org/advert.mp3$media,redirect=noopmp3-0.1s
     ```
   aliases:
     - noopmp3-0.1s
@@ -179,7 +179,7 @@
   description: |-
     **Example**
     ```
-    ||example.org^$media,redirect=noopmp4-1s
+    ||example.org/advert.mp4$media,redirect=noopmp4-1s
     ```
   aliases:
     - noop-1s.mp4

diff --git a/dist/scriptlets.js b/dist/scriptlets.js
diff --git a/src/redirects/google-analytics-ga.js b/src/redirects/google-analytics-ga.js
@@ -13,7 +13,7 @@ import { noop } from '../helpers/noop';
  *
  * **Example**
  * ```
- * ||example.org/index.js$script,redirect=google-analytics-ga
+ * ||google-analytics.com/ga.js$script,redirect=google-analytics-ga
  * ```
  */
 export function GoogleAnalyticsGa(source) {

diff --git a/src/redirects/google-analytics.js b/src/redirects/google-analytics.js
@@ -12,7 +12,7 @@ import { noop, noopNull } from '../helpers/noop';
  *
  * **Example**
  * ```
- * ||example.org/index.js$script,redirect=google-analytics
+ * ||google-analytics.com/analytics.js$script,redirect=google-analytics
  * ```
  */
 export function GoogleAnalytics(source) {

diff --git a/src/redirects/googlesyndication-adsbygoogle.js b/src/redirects/googlesyndication-adsbygoogle.js
@@ -1,5 +1,6 @@
 import { hit } from '../helpers/hit';
 
+/* eslint-disable max-len */
 /**
  * @redirect googlesyndication-adsbygoogle
  *
@@ -11,9 +12,10 @@ import { hit } from '../helpers/hit';
  *
  * **Example**
  * ```
- * ||example.org/index.js$script,redirect=googlesyndication-adsbygoogle
+ * ||pagead2.googlesyndication.com/pagead/js/adsbygoogle.js$script,redirect=googlesyndication-adsbygoogle
  * ```
  */
+/* eslint-enable max-len */
 export function GoogleSyndicationAdsByGoogle(source) {
     window.adsbygoogle = window.adsbygoogle || {
         length: 0,

diff --git a/src/redirects/googletagmanager-gtm.js b/src/redirects/googletagmanager-gtm.js
@@ -12,7 +12,7 @@ import { noop } from '../helpers/noop';
  *
  * **Example**
  * ```
- * ||example.org/index.js$script,redirect=googletagmanager-gtm
+ * ||googletagmanager.com/gtm.js$script,redirect=googletagmanager-gtm
  * ```
  */
 export function GoogleTagManagerGtm(source) {

diff --git a/src/redirects/googletagservices-gpt.js b/src/redirects/googletagservices-gpt.js
@@ -18,7 +18,7 @@ import {
  *
  * **Example**
  * ```
- * ||example.org/index.js$script,redirect=googletagservices-gpt
+ * ||googletagservices.com/tag/js/gpt.js$script,redirect=googletagservices-gpt
  * ```
  */
 export function GoogleTagServicesGpt(source) {

diff --git a/src/redirects/metrika-yandex-tag.js b/src/redirects/metrika-yandex-tag.js
@@ -10,7 +10,7 @@ import { noop } from '../helpers/noop';
  *
  * **Example**
  * ```
- * ||example.org/index.js$script,redirect=metrika-yandex-tag
+ * ||mc.yandex.ru/metrika/tag.js$script,redirect=metrika-yandex-tag
  * ```
  */
 export function metrikaYandexTag(source) {

diff --git a/src/redirects/metrika-yandex-watch.js b/src/redirects/metrika-yandex-watch.js
@@ -10,7 +10,7 @@ import { noop } from '../helpers/noop';
  *
  * **Example**
  * ```
- * ||example.org/index.js$script,redirect=metrika-yandex-watch
+ * ||mc.yandex.ru/metrika/watch.js$script,redirect=metrika-yandex-watch
  * ```
  */
 export function metrikaYandexWatch(source) {

diff --git a/src/redirects/scorecardresearch-beacon.js b/src/redirects/scorecardresearch-beacon.js
@@ -11,7 +11,7 @@ import { hit } from '../helpers/hit';
  *
  * **Example**
  * ```
- * ||example.org/index.js$script,redirect=scorecardresearch-beacon
+ * ||sb.scorecardresearch.com/beacon.js$script,redirect=scorecardresearch-beacon
  * ```
  */
 export function ScoreCardResearchBeacon(source) {

diff --git a/src/redirects/static-redirects.yml b/src/redirects/static-redirects.yml
@@ -78,7 +78,7 @@
   description: |-
     **Example**
     ```
-    ||example.org^$stylesheet,redirect=noopcss
+    ||example.org/style.css$stylesheet,redirect=noopcss
     ```
   aliases:
     - blank-css
@@ -89,7 +89,7 @@
   description: |-
     **Example**
     ```
-    ||example.org^$script,redirect=noopjs
+    ||example.org/advert.js$script,redirect=noopjs
     ```
   aliases:
     - noop.js
@@ -101,7 +101,7 @@
   description: |-
     **Example**
     ```
-    ||example.org^$xmlhttprequest,redirect=nooptext
+    ||example.org/advert.js$xmlhttprequest,redirect=nooptext
     ```
   aliases:
     - noop.txt
@@ -115,7 +115,7 @@
 
     **Example**
     ```
-    ||example.org^$xmlhttprequest,redirect=noopvmap-1.0
+    ||example.org/vmap01.xml$xmlhttprequest,redirect=noopvmap-1.0
     ```
   contentType: text/xml
   content: <vmap:VMAP xmlns:vmap="http://www.iab.net/videosuite/vmap" version="1.0"></vmap:VMAP>
@@ -126,7 +126,7 @@
 
     **Example**
     ```
-    ||example.org^$xmlhttprequest,redirect=noopvast-2.0
+    ||example.org/vast02.xml^$xmlhttprequest,redirect=noopvast-2.0
     ```
   contentType: text/xml
   content: <VAST version="2.0"></VAST>
@@ -137,7 +137,7 @@
 
     **Example**
     ```
-    ||example.org^$xmlhttprequest,redirect=noopvast-3.0
+    ||example.org/vast03.xml^$xmlhttprequest,redirect=noopvast-3.0
     ```
   contentType: text/xml
   content: <VAST version="3.0"></VAST>
@@ -146,7 +146,7 @@
   description: |-
     **Example**
     ```
-    ||example.org^$media,redirect=noopmp3-0.1s
+    ||example.org/advert.mp3$media,redirect=noopmp3-0.1s
     ```
   aliases:
     - noopmp3-0.1s
@@ -176,7 +176,7 @@
   description: |-
     **Example**
     ```
-    ||example.org^$media,redirect=noopmp4-1s
+    ||example.org/advert.mp4$media,redirect=noopmp4-1s
     ```
   aliases:
     - noop-1s.mp4