Skip to content

Commit 4b6c64f

Browse files
shakyShanegithub-actions[bot]
shakyShane
authored and
github-actions[bot]
committed
Release build 4.36.0 [ci release]
1 parent 6061106 commit 4b6c64f

File tree

30 files changed

+5202
-7189
lines changed

30 files changed

+5202
-7189
lines changed

‎Sources/ContentScopeScripts/dist/contentScope.js

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

‎Sources/ContentScopeScripts/dist/contentScopeIsolated.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -994,8 +994,6 @@
994994
* @implements {MessagingTransport}
995995
*/
996996
class WindowsMessagingTransport {
997-
config
998-
999997
/**
1000998
* @param {WindowsMessagingConfig} config
1001999
* @param {import('../index.js').MessagingContext} messagingContext
@@ -1495,11 +1493,6 @@
14951493
* @implements {MessagingTransport}
14961494
*/
14971495
class WebkitMessagingTransport {
1498-
/** @type {WebkitMessagingConfig} */
1499-
config
1500-
/** @internal */
1501-
globals
1502-
15031496
/**
15041497
* @param {WebkitMessagingConfig} config
15051498
* @param {import('../index.js').MessagingContext} messagingContext
@@ -3018,11 +3011,6 @@
30183011
return null
30193012
}
30203013

3021-
// always exclude 'for rent'
3022-
if (url.searchParams.has('pp')) {
3023-
return null
3024-
}
3025-
30263014
let time = null;
30273015

30283016
// ensure youtube video id is good

‎Sources/ContentScopeScripts/dist/pages/duckplayer/index.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@
316316
(() => {
317317
// ../messaging/lib/windows.js
318318
var WindowsMessagingTransport = class {
319-
config;
320319
/**
321320
* @param {WindowsMessagingConfig} config
322321
* @param {import('../index.js').MessagingContext} messagingContext
@@ -589,10 +588,6 @@
589588

590589
// ../messaging/lib/webkit.js
591590
var WebkitMessagingTransport = class {
592-
/** @type {WebkitMessagingConfig} */
593-
config;
594-
/** @internal */
595-
globals;
596591
/**
597592
* @param {WebkitMessagingConfig} config
598593
* @param {import('../index.js').MessagingContext} messagingContext

‎Sources/ContentScopeScripts/dist/pages/duckplayer/js/index.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
(() => {
33
// ../messaging/lib/windows.js
44
var WindowsMessagingTransport = class {
5-
config;
65
/**
76
* @param {WindowsMessagingConfig} config
87
* @param {import('../index.js').MessagingContext} messagingContext
@@ -275,10 +274,6 @@
275274

276275
// ../messaging/lib/webkit.js
277276
var WebkitMessagingTransport = class {
278-
/** @type {WebkitMessagingConfig} */
279-
config;
280-
/** @internal */
281-
globals;
282277
/**
283278
* @param {WebkitMessagingConfig} config
284279
* @param {import('../index.js').MessagingContext} messagingContext

‎build/android/contentScope.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,8 +1321,6 @@
13211321
* @implements {MessagingTransport}
13221322
*/
13231323
class WindowsMessagingTransport {
1324-
config
1325-
13261324
/**
13271325
* @param {WindowsMessagingConfig} config
13281326
* @param {import('../index.js').MessagingContext} messagingContext
@@ -1822,11 +1820,6 @@
18221820
* @implements {MessagingTransport}
18231821
*/
18241822
class WebkitMessagingTransport {
1825-
/** @type {WebkitMessagingConfig} */
1826-
config
1827-
/** @internal */
1828-
globals
1829-
18301823
/**
18311824
* @param {WebkitMessagingConfig} config
18321825
* @param {import('../index.js').MessagingContext} messagingContext

‎build/chrome-mv3/inject.js

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,8 +1334,6 @@
13341334
* @implements {MessagingTransport}
13351335
*/
13361336
class WindowsMessagingTransport {
1337-
config
1338-
13391337
/**
13401338
* @param {WindowsMessagingConfig} config
13411339
* @param {import('../index.js').MessagingContext} messagingContext
@@ -1835,11 +1833,6 @@
18351833
* @implements {MessagingTransport}
18361834
*/
18371835
class WebkitMessagingTransport {
1838-
/** @type {WebkitMessagingConfig} */
1839-
config
1840-
/** @internal */
1841-
globals
1842-
18431836
/**
18441837
* @param {WebkitMessagingConfig} config
18451838
* @param {import('../index.js').MessagingContext} messagingContext
@@ -3081,7 +3074,6 @@
30813074
reason,
30823075
stack: ctx.stack,
30833076
documentUrl: globalThis.document.location.href,
3084-
scriptOrigins: [...ctx.scriptOrigins],
30853077
value: ctx.value
30863078
});
30873079
}
@@ -3171,12 +3163,14 @@
31713163
const loadPolicyThen = loadPolicy.then.bind(loadPolicy);
31723164

31733165
function getCookiePolicy () {
3174-
const stack = getStack();
3175-
const getCookieContext = {
3176-
stack,
3177-
scriptOrigins: [],
3178-
value: 'getter'
3179-
};
3166+
let getCookieContext = null;
3167+
if (cookiePolicy.debug) {
3168+
const stack = getStack();
3169+
getCookieContext = {
3170+
stack,
3171+
value: 'getter'
3172+
};
3173+
}
31803174

31813175
if (shouldBlockTrackingCookie() || shouldBlockNonTrackingCookie()) {
31823176
debugHelper('block', '3p frame', getCookieContext);
@@ -3189,13 +3183,14 @@
31893183
}
31903184

31913185
function setCookiePolicy (value) {
3192-
const stack = getStack();
3193-
const scriptOrigins = getStackTraceOrigins(stack);
3194-
const setCookieContext = {
3195-
stack,
3196-
scriptOrigins,
3197-
value
3198-
};
3186+
let setCookieContext = null;
3187+
if (cookiePolicy.debug) {
3188+
const stack = getStack();
3189+
setCookieContext = {
3190+
stack,
3191+
value
3192+
};
3193+
}
31993194

32003195
if (shouldBlockTrackingCookie() || shouldBlockNonTrackingCookie()) {
32013196
debugHelper('block', '3p frame', setCookieContext);
@@ -3213,7 +3208,8 @@
32133208
// wait for config before doing same-site tests
32143209
loadPolicyThen(() => {
32153210
const { shouldBlock, policy, trackerPolicy } = cookiePolicy;
3216-
3211+
const stack = getStack();
3212+
const scriptOrigins = getStackTraceOrigins(stack);
32173213
const chosenPolicy = isFirstPartyTrackerScript(scriptOrigins) ? trackerPolicy : policy;
32183214
if (!shouldBlock) {
32193215
debugHelper('ignore', 'disabled', setCookieContext);

‎build/chrome/inject.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/contentScope.js

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,8 +1274,6 @@
12741274
* @implements {MessagingTransport}
12751275
*/
12761276
class WindowsMessagingTransport {
1277-
config
1278-
12791277
/**
12801278
* @param {WindowsMessagingConfig} config
12811279
* @param {import('../index.js').MessagingContext} messagingContext
@@ -1775,11 +1773,6 @@
17751773
* @implements {MessagingTransport}
17761774
*/
17771775
class WebkitMessagingTransport {
1778-
/** @type {WebkitMessagingConfig} */
1779-
config
1780-
/** @internal */
1781-
globals
1782-
17831776
/**
17841777
* @param {WebkitMessagingConfig} config
17851778
* @param {import('../index.js').MessagingContext} messagingContext
@@ -10762,7 +10755,6 @@
1076210755
reason,
1076310756
stack: ctx.stack,
1076410757
documentUrl: globalThis.document.location.href,
10765-
scriptOrigins: [...ctx.scriptOrigins],
1076610758
value: ctx.value
1076710759
});
1076810760
}
@@ -10852,12 +10844,14 @@
1085210844
const loadPolicyThen = loadPolicy.then.bind(loadPolicy);
1085310845

1085410846
function getCookiePolicy () {
10855-
const stack = getStack();
10856-
const getCookieContext = {
10857-
stack,
10858-
scriptOrigins: [],
10859-
value: 'getter'
10860-
};
10847+
let getCookieContext = null;
10848+
if (cookiePolicy.debug) {
10849+
const stack = getStack();
10850+
getCookieContext = {
10851+
stack,
10852+
value: 'getter'
10853+
};
10854+
}
1086110855

1086210856
if (shouldBlockTrackingCookie() || shouldBlockNonTrackingCookie()) {
1086310857
debugHelper('block', '3p frame', getCookieContext);
@@ -10870,13 +10864,14 @@
1087010864
}
1087110865

1087210866
function setCookiePolicy (value) {
10873-
const stack = getStack();
10874-
const scriptOrigins = getStackTraceOrigins(stack);
10875-
const setCookieContext = {
10876-
stack,
10877-
scriptOrigins,
10878-
value
10879-
};
10867+
let setCookieContext = null;
10868+
if (cookiePolicy.debug) {
10869+
const stack = getStack();
10870+
setCookieContext = {
10871+
stack,
10872+
value
10873+
};
10874+
}
1088010875

1088110876
if (shouldBlockTrackingCookie() || shouldBlockNonTrackingCookie()) {
1088210877
debugHelper('block', '3p frame', setCookieContext);
@@ -10894,7 +10889,8 @@
1089410889
// wait for config before doing same-site tests
1089510890
loadPolicyThen(() => {
1089610891
const { shouldBlock, policy, trackerPolicy } = cookiePolicy;
10897-
10892+
const stack = getStack();
10893+
const scriptOrigins = getStackTraceOrigins(stack);
1089810894
const chosenPolicy = isFirstPartyTrackerScript(scriptOrigins) ? trackerPolicy : policy;
1089910895
if (!shouldBlock) {
1090010896
debugHelper('ignore', 'disabled', setCookieContext);
@@ -11978,11 +11974,6 @@
1197811974
return null
1197911975
}
1198011976

11981-
// always exclude 'for rent'
11982-
if (url.searchParams.has('pp')) {
11983-
return null
11984-
}
11985-
1198611977
let time = null;
1198711978

1198811979
// ensure youtube video id is good

‎build/firefox/inject.js

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

‎build/integration/contentScope.js

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,8 +1274,6 @@
12741274
* @implements {MessagingTransport}
12751275
*/
12761276
class WindowsMessagingTransport {
1277-
config
1278-
12791277
/**
12801278
* @param {WindowsMessagingConfig} config
12811279
* @param {import('../index.js').MessagingContext} messagingContext
@@ -1775,11 +1773,6 @@
17751773
* @implements {MessagingTransport}
17761774
*/
17771775
class WebkitMessagingTransport {
1778-
/** @type {WebkitMessagingConfig} */
1779-
config
1780-
/** @internal */
1781-
globals
1782-
17831776
/**
17841777
* @param {WebkitMessagingConfig} config
17851778
* @param {import('../index.js').MessagingContext} messagingContext
@@ -10762,7 +10755,6 @@
1076210755
reason,
1076310756
stack: ctx.stack,
1076410757
documentUrl: globalThis.document.location.href,
10765-
scriptOrigins: [...ctx.scriptOrigins],
1076610758
value: ctx.value
1076710759
});
1076810760
}
@@ -10852,12 +10844,14 @@
1085210844
const loadPolicyThen = loadPolicy.then.bind(loadPolicy);
1085310845

1085410846
function getCookiePolicy () {
10855-
const stack = getStack();
10856-
const getCookieContext = {
10857-
stack,
10858-
scriptOrigins: [],
10859-
value: 'getter'
10860-
};
10847+
let getCookieContext = null;
10848+
if (cookiePolicy.debug) {
10849+
const stack = getStack();
10850+
getCookieContext = {
10851+
stack,
10852+
value: 'getter'
10853+
};
10854+
}
1086110855

1086210856
if (shouldBlockTrackingCookie() || shouldBlockNonTrackingCookie()) {
1086310857
debugHelper('block', '3p frame', getCookieContext);
@@ -10870,13 +10864,14 @@
1087010864
}
1087110865

1087210866
function setCookiePolicy (value) {
10873-
const stack = getStack();
10874-
const scriptOrigins = getStackTraceOrigins(stack);
10875-
const setCookieContext = {
10876-
stack,
10877-
scriptOrigins,
10878-
value
10879-
};
10867+
let setCookieContext = null;
10868+
if (cookiePolicy.debug) {
10869+
const stack = getStack();
10870+
setCookieContext = {
10871+
stack,
10872+
value
10873+
};
10874+
}
1088010875

1088110876
if (shouldBlockTrackingCookie() || shouldBlockNonTrackingCookie()) {
1088210877
debugHelper('block', '3p frame', setCookieContext);
@@ -10894,7 +10889,8 @@
1089410889
// wait for config before doing same-site tests
1089510890
loadPolicyThen(() => {
1089610891
const { shouldBlock, policy, trackerPolicy } = cookiePolicy;
10897-
10892+
const stack = getStack();
10893+
const scriptOrigins = getStackTraceOrigins(stack);
1089810894
const chosenPolicy = isFirstPartyTrackerScript(scriptOrigins) ? trackerPolicy : policy;
1089910895
if (!shouldBlock) {
1090010896
debugHelper('ignore', 'disabled', setCookieContext);
@@ -11978,11 +11974,6 @@
1197811974
return null
1197911975
}
1198011976

11981-
// always exclude 'for rent'
11982-
if (url.searchParams.has('pp')) {
11983-
return null
11984-
}
11985-
1198611977
let time = null;
1198711978

1198811979
// ensure youtube video id is good

0 commit comments

Comments
 (0)