Skip to content

Commit 223b8a3

Browse files
author
Atlassian Bamboo
committed
deploy: update dist v1.9.101
1 parent 4d6350d commit 223b8a3

File tree

9 files changed

+160
-13
lines changed

9 files changed

+160
-13
lines changed

‎dist/build.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=1.9.96
1+
version=1.9.101

‎dist/redirect-files/googletagservices-gpt.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@
312312
setCookieOptions: noopThis,
313313
setForceSafeFrame: noopThis,
314314
setLocation: noopThis,
315+
setPrivacySettings: noopThis,
315316
setPublisherProvidedId: noopThis,
316317
setRequestNonPersonalizedAds: noopThis,
317318
setSafeFrameConfig: noopThis,

‎dist/redirects.json‎

Lines changed: 4 additions & 1 deletion
Large diffs are not rendered by default.

‎dist/redirects.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# AdGuard Scriptlets (Redirects Source)
3-
# Version 1.9.96
3+
# Version 1.9.101
44
#
55
- title: 1x1-transparent.gif
66
added: v1.0.4
@@ -127,6 +127,8 @@
127127
```adblock
128128
||example.org/geo/location$xmlhttprequest,redirect=noopjson
129129
```
130+
aliases:
131+
- noop.json
130132
file: noopjson.json
131133
contentType: application/json
132134
content: '{}'
@@ -2507,6 +2509,7 @@
25072509
setCookieOptions: noopThis,
25082510
setForceSafeFrame: noopThis,
25092511
setLocation: noopThis,
2512+
setPrivacySettings: noopThis,
25102513
setPublisherProvidedId: noopThis,
25112514
setRequestNonPersonalizedAds: noopThis,
25122515
setSafeFrameConfig: noopThis,

‎dist/scriptlets.corelibs.json‎

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

‎dist/scriptlets.js‎

Lines changed: 70 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
/**
33
* AdGuard Scriptlets
4-
* Version 1.9.96
4+
* Version 1.9.101
55
*/
66

77
(function () {
@@ -1184,6 +1184,23 @@
11841184
}
11851185
});
11861186

1187+
// In the case if responseType is opaque
1188+
// mock response' body, status & statusText to avoid adb checks
1189+
// https://github.com/AdguardTeam/Scriptlets/issues/364
1190+
if (responseType === 'opaque') {
1191+
Object.defineProperties(response, {
1192+
body: {
1193+
value: null
1194+
},
1195+
status: {
1196+
value: 0
1197+
},
1198+
statusText: {
1199+
value: ''
1200+
}
1201+
});
1202+
}
1203+
11871204
// eslint-disable-next-line consistent-return
11881205
return Promise.resolve(response);
11891206
};
@@ -6402,6 +6419,7 @@
64026419
* defaults to `emptyObj`. Possible values:
64036420
* - `emptyObj` — empty object
64046421
* - `emptyArr` — empty array
6422+
* - `emptyStr` — empty string
64056423
* - `responseType` — optional, string for defining response type,
64066424
* original response type is used if not specified. Possible values:
64076425
* - `default`
@@ -6478,6 +6496,8 @@
64786496
strResponseBody = '{}';
64796497
} else if (responseBody === 'emptyArr') {
64806498
strResponseBody = '[]';
6499+
} else if (responseBody === 'emptyStr') {
6500+
strResponseBody = '';
64816501
} else {
64826502
logMessage(source, "Invalid responseBody parameter: '".concat(responseBody, "'"));
64836503
return;
@@ -10158,7 +10178,8 @@
1015810178
ubo: 'noop.js',
1015910179
abp: 'blank-js'
1016010180
}, {
10161-
adg: 'noopjson'
10181+
adg: 'noopjson',
10182+
ubo: 'noop.json'
1016210183
}, {
1016310184
adg: 'nooptext',
1016410185
ubo: 'noop.txt',
@@ -11999,6 +12020,7 @@
1199912020
setCookieOptions: noopThis,
1200012021
setForceSafeFrame: noopThis,
1200112022
setLocation: noopThis,
12023+
setPrivacySettings: noopThis,
1200212024
setPublisherProvidedId: noopThis,
1200312025
setRequestNonPersonalizedAds: noopThis,
1200412026
setSafeFrameConfig: noopThis,
@@ -16895,6 +16917,7 @@
1689516917
"noop.js": "noopjs.js",
1689616918
"blank-js": "noopjs.js",
1689716919
noopjson: "noopjson.json",
16920+
"noop.json": "noopjson.json",
1689816921
nooptext: "nooptext.js",
1689916922
"noop.txt": "nooptext.js",
1690016923
"blank-text": "nooptext.js",
@@ -17044,6 +17067,8 @@
1704417067
convertAdgRedirectToUbo
1704517068
};
1704617069

17070+
var version = "1.9.101";
17071+
1704717072
function abortCurrentInlineScript(source, args) {
1704817073
function abortCurrentInlineScript(source, property, search) {
1704917074
var searchRegexp = toRegExp(search);
@@ -20841,6 +20866,19 @@
2084120866
value: responseType
2084220867
}
2084320868
});
20869+
if (responseType === "opaque") {
20870+
Object.defineProperties(response, {
20871+
body: {
20872+
value: null
20873+
},
20874+
status: {
20875+
value: 0
20876+
},
20877+
statusText: {
20878+
value: ""
20879+
}
20880+
});
20881+
}
2084420882
return Promise.resolve(response);
2084520883
}
2084620884
var updatedArgs = args ? [].concat(source).concat(args) : [source];
@@ -21757,6 +21795,8 @@
2175721795
strResponseBody = "{}";
2175821796
} else if (responseBody === "emptyArr") {
2175921797
strResponseBody = "[]";
21798+
} else if (responseBody === "emptyStr") {
21799+
strResponseBody = "";
2176021800
} else {
2176121801
logMessage(source, "Invalid responseBody parameter: '".concat(responseBody, "'"));
2176221802
return;
@@ -21922,6 +21962,19 @@
2192221962
value: responseType
2192321963
}
2192421964
});
21965+
if (responseType === "opaque") {
21966+
Object.defineProperties(response, {
21967+
body: {
21968+
value: null
21969+
},
21970+
status: {
21971+
value: 0
21972+
},
21973+
statusText: {
21974+
value: ""
21975+
}
21976+
});
21977+
}
2192521978
return Promise.resolve(response);
2192621979
}
2192721980
function modifyResponse(origResponse) {
@@ -24788,6 +24841,19 @@
2478824841
value: responseType
2478924842
}
2479024843
});
24844+
if (responseType === "opaque") {
24845+
Object.defineProperties(response, {
24846+
body: {
24847+
value: null
24848+
},
24849+
status: {
24850+
value: 0
24851+
},
24852+
statusText: {
24853+
value: ""
24854+
}
24855+
});
24856+
}
2479124857
return Promise.resolve(response);
2479224858
}
2479324859
function getPropertyInChain(base, chain) {
@@ -28606,7 +28672,8 @@
2860628672
convertAbpToAdg: convertAbpSnippetToAdg,
2860728673
convertScriptletToAdg,
2860828674
convertAdgToUbo: convertAdgScriptletToUbo,
28609-
redirects
28675+
redirects,
28676+
SCRIPTLETS_VERSION: version
2861028677
};
2861128678
}();
2861228679

‎dist/umd/scriptlets.d.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
declare module '@adguard/scriptlets' {
22

3+
/**
4+
* Scriptlets version
5+
*/
6+
const SCRIPTLETS_VERSION: string;
7+
38
/**
49
* Scriptlet properties
510
*/

‎dist/umd/scriptlets.umd.js‎

Lines changed: 70 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
/**
33
* AdGuard Scriptlets
4-
* Version 1.9.96
4+
* Version 1.9.101
55
*/
66

77
(function (factory) {
@@ -1186,6 +1186,23 @@
11861186
}
11871187
});
11881188

1189+
// In the case if responseType is opaque
1190+
// mock response' body, status & statusText to avoid adb checks
1191+
// https://github.com/AdguardTeam/Scriptlets/issues/364
1192+
if (responseType === 'opaque') {
1193+
Object.defineProperties(response, {
1194+
body: {
1195+
value: null
1196+
},
1197+
status: {
1198+
value: 0
1199+
},
1200+
statusText: {
1201+
value: ''
1202+
}
1203+
});
1204+
}
1205+
11891206
// eslint-disable-next-line consistent-return
11901207
return Promise.resolve(response);
11911208
};
@@ -6404,6 +6421,7 @@
64046421
* defaults to `emptyObj`. Possible values:
64056422
* - `emptyObj` — empty object
64066423
* - `emptyArr` — empty array
6424+
* - `emptyStr` — empty string
64076425
* - `responseType` — optional, string for defining response type,
64086426
* original response type is used if not specified. Possible values:
64096427
* - `default`
@@ -6480,6 +6498,8 @@
64806498
strResponseBody = '{}';
64816499
} else if (responseBody === 'emptyArr') {
64826500
strResponseBody = '[]';
6501+
} else if (responseBody === 'emptyStr') {
6502+
strResponseBody = '';
64836503
} else {
64846504
logMessage(source, "Invalid responseBody parameter: '".concat(responseBody, "'"));
64856505
return;
@@ -10160,7 +10180,8 @@
1016010180
ubo: 'noop.js',
1016110181
abp: 'blank-js'
1016210182
}, {
10163-
adg: 'noopjson'
10183+
adg: 'noopjson',
10184+
ubo: 'noop.json'
1016410185
}, {
1016510186
adg: 'nooptext',
1016610187
ubo: 'noop.txt',
@@ -12001,6 +12022,7 @@
1200112022
setCookieOptions: noopThis,
1200212023
setForceSafeFrame: noopThis,
1200312024
setLocation: noopThis,
12025+
setPrivacySettings: noopThis,
1200412026
setPublisherProvidedId: noopThis,
1200512027
setRequestNonPersonalizedAds: noopThis,
1200612028
setSafeFrameConfig: noopThis,
@@ -16897,6 +16919,7 @@
1689716919
"noop.js": "noopjs.js",
1689816920
"blank-js": "noopjs.js",
1689916921
noopjson: "noopjson.json",
16922+
"noop.json": "noopjson.json",
1690016923
nooptext: "nooptext.js",
1690116924
"noop.txt": "nooptext.js",
1690216925
"blank-text": "nooptext.js",
@@ -17046,6 +17069,8 @@
1704617069
convertAdgRedirectToUbo
1704717070
};
1704817071

17072+
var version = "1.9.101";
17073+
1704917074
function abortCurrentInlineScript(source, args) {
1705017075
function abortCurrentInlineScript(source, property, search) {
1705117076
var searchRegexp = toRegExp(search);
@@ -20843,6 +20868,19 @@
2084320868
value: responseType
2084420869
}
2084520870
});
20871+
if (responseType === "opaque") {
20872+
Object.defineProperties(response, {
20873+
body: {
20874+
value: null
20875+
},
20876+
status: {
20877+
value: 0
20878+
},
20879+
statusText: {
20880+
value: ""
20881+
}
20882+
});
20883+
}
2084620884
return Promise.resolve(response);
2084720885
}
2084820886
var updatedArgs = args ? [].concat(source).concat(args) : [source];
@@ -21759,6 +21797,8 @@
2175921797
strResponseBody = "{}";
2176021798
} else if (responseBody === "emptyArr") {
2176121799
strResponseBody = "[]";
21800+
} else if (responseBody === "emptyStr") {
21801+
strResponseBody = "";
2176221802
} else {
2176321803
logMessage(source, "Invalid responseBody parameter: '".concat(responseBody, "'"));
2176421804
return;
@@ -21924,6 +21964,19 @@
2192421964
value: responseType
2192521965
}
2192621966
});
21967+
if (responseType === "opaque") {
21968+
Object.defineProperties(response, {
21969+
body: {
21970+
value: null
21971+
},
21972+
status: {
21973+
value: 0
21974+
},
21975+
statusText: {
21976+
value: ""
21977+
}
21978+
});
21979+
}
2192721980
return Promise.resolve(response);
2192821981
}
2192921982
function modifyResponse(origResponse) {
@@ -24790,6 +24843,19 @@
2479024843
value: responseType
2479124844
}
2479224845
});
24846+
if (responseType === "opaque") {
24847+
Object.defineProperties(response, {
24848+
body: {
24849+
value: null
24850+
},
24851+
status: {
24852+
value: 0
24853+
},
24854+
statusText: {
24855+
value: ""
24856+
}
24857+
});
24858+
}
2479324859
return Promise.resolve(response);
2479424860
}
2479524861
function getPropertyInChain(base, chain) {
@@ -28608,7 +28674,8 @@
2860828674
convertAbpToAdg: convertAbpSnippetToAdg,
2860928675
convertScriptletToAdg,
2861028676
convertAdgToUbo: convertAdgScriptletToUbo,
28611-
redirects
28677+
redirects,
28678+
SCRIPTLETS_VERSION: version
2861228679
};
2861328680
}();
2861428681

‎wiki/about-scriptlets.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,6 +1162,7 @@ example.org#%#//scriptlet('prevent-fetch'[, propsToMatch[, responseBody[, respon
11621162
defaults to `emptyObj`. Possible values:
11631163
- `emptyObj` — empty object
11641164
- `emptyArr` — empty array
1165+
- `emptyStr` — empty string
11651166
- `responseType` — optional, string for defining response type,
11661167
original response type is used if not specified. Possible values:
11671168
- `default`

0 commit comments

Comments
 (0)