Skip to content

Commit f1e417f

Browse files
noisysocksgithub-actions[bot]
authored andcommitted
Release build 11.45.0 [ci release]
1 parent 4b71004 commit f1e417f

File tree

18 files changed

+412
-27
lines changed

18 files changed

+412
-27
lines changed

CHANGELOG.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
- [Autofill Import] Navigate to manage page and retry download (#2026)
1+
- Remove blank page collection cache (#2033)
2+
- Add preview conditionalChanges support (#2032)

build/android/adsjsContentScope.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3214,6 +3214,7 @@
32143214
* @property {boolean} [context.top] - true if the condition applies to the top frame
32153215
* @property {string} [injectName] - the inject name to match against (e.g., "apple-isolated")
32163216
* @property {boolean} [internal] - true if the condition applies to internal builds
3217+
* @property {boolean} [preview] - true if the condition applies to preview builds
32173218
*/
32183219
/**
32193220
* Takes multiple conditional blocks and returns true if any apply.
@@ -3241,7 +3242,8 @@
32413242
minSupportedVersion: this._matchMinSupportedVersion,
32423243
maxSupportedVersion: this._matchMaxSupportedVersion,
32433244
injectName: this._matchInjectNameConditional,
3244-
internal: this._matchInternalConditional
3245+
internal: this._matchInternalConditional,
3246+
preview: this._matchPreviewConditional
32453247
};
32463248
for (const key in conditionBlock) {
32473249
if (!conditionChecks[key]) {
@@ -3343,6 +3345,17 @@
33433345
if (isInternal === void 0) return false;
33443346
return Boolean(conditionBlock.internal) === Boolean(isInternal);
33453347
}
3348+
/**
3349+
* Takes a condition block and returns true if the preview state matches the condition.
3350+
* @param {ConditionBlock} conditionBlock
3351+
* @returns {boolean}
3352+
*/
3353+
_matchPreviewConditional(conditionBlock) {
3354+
if (conditionBlock.preview === void 0) return false;
3355+
const isPreview = __privateGet(this, _args)?.platform?.preview;
3356+
if (isPreview === void 0) return false;
3357+
return Boolean(conditionBlock.preview) === Boolean(isPreview);
3358+
}
33463359
/**
33473360
* Takes a condition block and returns true if the platform version satisfies the `minSupportedFeature`
33483361
* @param {ConditionBlock} conditionBlock

build/android/autofillImport.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4797,6 +4797,7 @@
47974797
* @property {boolean} [context.top] - true if the condition applies to the top frame
47984798
* @property {string} [injectName] - the inject name to match against (e.g., "apple-isolated")
47994799
* @property {boolean} [internal] - true if the condition applies to internal builds
4800+
* @property {boolean} [preview] - true if the condition applies to preview builds
48004801
*/
48014802
/**
48024803
* Takes multiple conditional blocks and returns true if any apply.
@@ -4824,7 +4825,8 @@
48244825
minSupportedVersion: this._matchMinSupportedVersion,
48254826
maxSupportedVersion: this._matchMaxSupportedVersion,
48264827
injectName: this._matchInjectNameConditional,
4827-
internal: this._matchInternalConditional
4828+
internal: this._matchInternalConditional,
4829+
preview: this._matchPreviewConditional
48284830
};
48294831
for (const key in conditionBlock) {
48304832
if (!conditionChecks[key]) {
@@ -4926,6 +4928,17 @@
49264928
if (isInternal === void 0) return false;
49274929
return Boolean(conditionBlock.internal) === Boolean(isInternal);
49284930
}
4931+
/**
4932+
* Takes a condition block and returns true if the preview state matches the condition.
4933+
* @param {ConditionBlock} conditionBlock
4934+
* @returns {boolean}
4935+
*/
4936+
_matchPreviewConditional(conditionBlock) {
4937+
if (conditionBlock.preview === void 0) return false;
4938+
const isPreview = __privateGet(this, _args)?.platform?.preview;
4939+
if (isPreview === void 0) return false;
4940+
return Boolean(conditionBlock.preview) === Boolean(isPreview);
4941+
}
49294942
/**
49304943
* Takes a condition block and returns true if the platform version satisfies the `minSupportedFeature`
49314944
* @param {ConditionBlock} conditionBlock

build/android/brokerProtection.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4766,6 +4766,7 @@
47664766
* @property {boolean} [context.top] - true if the condition applies to the top frame
47674767
* @property {string} [injectName] - the inject name to match against (e.g., "apple-isolated")
47684768
* @property {boolean} [internal] - true if the condition applies to internal builds
4769+
* @property {boolean} [preview] - true if the condition applies to preview builds
47694770
*/
47704771
/**
47714772
* Takes multiple conditional blocks and returns true if any apply.
@@ -4793,7 +4794,8 @@
47934794
minSupportedVersion: this._matchMinSupportedVersion,
47944795
maxSupportedVersion: this._matchMaxSupportedVersion,
47954796
injectName: this._matchInjectNameConditional,
4796-
internal: this._matchInternalConditional
4797+
internal: this._matchInternalConditional,
4798+
preview: this._matchPreviewConditional
47974799
};
47984800
for (const key in conditionBlock) {
47994801
if (!conditionChecks[key]) {
@@ -4895,6 +4897,17 @@
48954897
if (isInternal === void 0) return false;
48964898
return Boolean(conditionBlock.internal) === Boolean(isInternal);
48974899
}
4900+
/**
4901+
* Takes a condition block and returns true if the preview state matches the condition.
4902+
* @param {ConditionBlock} conditionBlock
4903+
* @returns {boolean}
4904+
*/
4905+
_matchPreviewConditional(conditionBlock) {
4906+
if (conditionBlock.preview === void 0) return false;
4907+
const isPreview = __privateGet(this, _args)?.platform?.preview;
4908+
if (isPreview === void 0) return false;
4909+
return Boolean(conditionBlock.preview) === Boolean(isPreview);
4910+
}
48984911
/**
48994912
* Takes a condition block and returns true if the platform version satisfies the `minSupportedFeature`
49004913
* @param {ConditionBlock} conditionBlock

build/android/contentScope.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4610,6 +4610,7 @@
46104610
* @property {boolean} [context.top] - true if the condition applies to the top frame
46114611
* @property {string} [injectName] - the inject name to match against (e.g., "apple-isolated")
46124612
* @property {boolean} [internal] - true if the condition applies to internal builds
4613+
* @property {boolean} [preview] - true if the condition applies to preview builds
46134614
*/
46144615
/**
46154616
* Takes multiple conditional blocks and returns true if any apply.
@@ -4637,7 +4638,8 @@
46374638
minSupportedVersion: this._matchMinSupportedVersion,
46384639
maxSupportedVersion: this._matchMaxSupportedVersion,
46394640
injectName: this._matchInjectNameConditional,
4640-
internal: this._matchInternalConditional
4641+
internal: this._matchInternalConditional,
4642+
preview: this._matchPreviewConditional
46414643
};
46424644
for (const key in conditionBlock) {
46434645
if (!conditionChecks[key]) {
@@ -4739,6 +4741,17 @@
47394741
if (isInternal === void 0) return false;
47404742
return Boolean(conditionBlock.internal) === Boolean(isInternal);
47414743
}
4744+
/**
4745+
* Takes a condition block and returns true if the preview state matches the condition.
4746+
* @param {ConditionBlock} conditionBlock
4747+
* @returns {boolean}
4748+
*/
4749+
_matchPreviewConditional(conditionBlock) {
4750+
if (conditionBlock.preview === void 0) return false;
4751+
const isPreview = __privateGet(this, _args)?.platform?.preview;
4752+
if (isPreview === void 0) return false;
4753+
return Boolean(conditionBlock.preview) === Boolean(isPreview);
4754+
}
47424755
/**
47434756
* Takes a condition block and returns true if the platform version satisfies the `minSupportedFeature`
47444757
* @param {ConditionBlock} conditionBlock

build/apple/contentScope.js

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4115,6 +4115,7 @@
41154115
* @property {boolean} [context.top] - true if the condition applies to the top frame
41164116
* @property {string} [injectName] - the inject name to match against (e.g., "apple-isolated")
41174117
* @property {boolean} [internal] - true if the condition applies to internal builds
4118+
* @property {boolean} [preview] - true if the condition applies to preview builds
41184119
*/
41194120
/**
41204121
* Takes multiple conditional blocks and returns true if any apply.
@@ -4142,7 +4143,8 @@
41424143
minSupportedVersion: this._matchMinSupportedVersion,
41434144
maxSupportedVersion: this._matchMaxSupportedVersion,
41444145
injectName: this._matchInjectNameConditional,
4145-
internal: this._matchInternalConditional
4146+
internal: this._matchInternalConditional,
4147+
preview: this._matchPreviewConditional
41464148
};
41474149
for (const key in conditionBlock) {
41484150
if (!conditionChecks[key]) {
@@ -4244,6 +4246,17 @@
42444246
if (isInternal === void 0) return false;
42454247
return Boolean(conditionBlock.internal) === Boolean(isInternal);
42464248
}
4249+
/**
4250+
* Takes a condition block and returns true if the preview state matches the condition.
4251+
* @param {ConditionBlock} conditionBlock
4252+
* @returns {boolean}
4253+
*/
4254+
_matchPreviewConditional(conditionBlock) {
4255+
if (conditionBlock.preview === void 0) return false;
4256+
const isPreview = __privateGet(this, _args)?.platform?.preview;
4257+
if (isPreview === void 0) return false;
4258+
return Boolean(conditionBlock.preview) === Boolean(isPreview);
4259+
}
42474260
/**
42484261
* Takes a condition block and returns true if the platform version satisfies the `minSupportedFeature`
42494262
* @param {ConditionBlock} conditionBlock
@@ -10565,7 +10578,7 @@ ${iframeContent}
1056510578
}
1056610579
startObserving() {
1056710580
this.log.info("Starting observing", this.mutationObserver, __privateGet(this, _cachedContent));
10568-
if (this.mutationObserver && __privateGet(this, _cachedContent) && !this.isObserving) {
10581+
if (this.mutationObserver && __privateGet(this, _cachedContent) && !this.isObserving && document.body) {
1056910582
this.isObserving = true;
1057010583
this.mutationObserver.observe(document.body, {
1057110584
childList: true,
@@ -10621,7 +10634,9 @@ ${iframeContent}
1062110634
if (this.getFeatureSettingEnabled("includeImages", "disabled")) {
1062210635
content.images = this.getImages();
1062310636
}
10624-
this.cachedContent = content;
10637+
if (content.content.length > 0) {
10638+
this.cachedContent = content;
10639+
}
1062510640
return content;
1062610641
}
1062710642
getPageTitle() {

build/apple/contentScopeIsolated.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4804,6 +4804,7 @@
48044804
* @property {boolean} [context.top] - true if the condition applies to the top frame
48054805
* @property {string} [injectName] - the inject name to match against (e.g., "apple-isolated")
48064806
* @property {boolean} [internal] - true if the condition applies to internal builds
4807+
* @property {boolean} [preview] - true if the condition applies to preview builds
48074808
*/
48084809
/**
48094810
* Takes multiple conditional blocks and returns true if any apply.
@@ -4831,7 +4832,8 @@
48314832
minSupportedVersion: this._matchMinSupportedVersion,
48324833
maxSupportedVersion: this._matchMaxSupportedVersion,
48334834
injectName: this._matchInjectNameConditional,
4834-
internal: this._matchInternalConditional
4835+
internal: this._matchInternalConditional,
4836+
preview: this._matchPreviewConditional
48354837
};
48364838
for (const key in conditionBlock) {
48374839
if (!conditionChecks[key]) {
@@ -4933,6 +4935,17 @@
49334935
if (isInternal === void 0) return false;
49344936
return Boolean(conditionBlock.internal) === Boolean(isInternal);
49354937
}
4938+
/**
4939+
* Takes a condition block and returns true if the preview state matches the condition.
4940+
* @param {ConditionBlock} conditionBlock
4941+
* @returns {boolean}
4942+
*/
4943+
_matchPreviewConditional(conditionBlock) {
4944+
if (conditionBlock.preview === void 0) return false;
4945+
const isPreview = __privateGet(this, _args)?.platform?.preview;
4946+
if (isPreview === void 0) return false;
4947+
return Boolean(conditionBlock.preview) === Boolean(isPreview);
4948+
}
49364949
/**
49374950
* Takes a condition block and returns true if the platform version satisfies the `minSupportedFeature`
49384951
* @param {ConditionBlock} conditionBlock

build/chrome-mv3/inject.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4047,6 +4047,7 @@
40474047
* @property {boolean} [context.top] - true if the condition applies to the top frame
40484048
* @property {string} [injectName] - the inject name to match against (e.g., "apple-isolated")
40494049
* @property {boolean} [internal] - true if the condition applies to internal builds
4050+
* @property {boolean} [preview] - true if the condition applies to preview builds
40504051
*/
40514052
/**
40524053
* Takes multiple conditional blocks and returns true if any apply.
@@ -4074,7 +4075,8 @@
40744075
minSupportedVersion: this._matchMinSupportedVersion,
40754076
maxSupportedVersion: this._matchMaxSupportedVersion,
40764077
injectName: this._matchInjectNameConditional,
4077-
internal: this._matchInternalConditional
4078+
internal: this._matchInternalConditional,
4079+
preview: this._matchPreviewConditional
40784080
};
40794081
for (const key in conditionBlock) {
40804082
if (!conditionChecks[key]) {
@@ -4176,6 +4178,17 @@
41764178
if (isInternal === void 0) return false;
41774179
return Boolean(conditionBlock.internal) === Boolean(isInternal);
41784180
}
4181+
/**
4182+
* Takes a condition block and returns true if the preview state matches the condition.
4183+
* @param {ConditionBlock} conditionBlock
4184+
* @returns {boolean}
4185+
*/
4186+
_matchPreviewConditional(conditionBlock) {
4187+
if (conditionBlock.preview === void 0) return false;
4188+
const isPreview = __privateGet(this, _args)?.platform?.preview;
4189+
if (isPreview === void 0) return false;
4190+
return Boolean(conditionBlock.preview) === Boolean(isPreview);
4191+
}
41794192
/**
41804193
* Takes a condition block and returns true if the platform version satisfies the `minSupportedFeature`
41814194
* @param {ConditionBlock} conditionBlock

build/firefox/inject.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4047,6 +4047,7 @@
40474047
* @property {boolean} [context.top] - true if the condition applies to the top frame
40484048
* @property {string} [injectName] - the inject name to match against (e.g., "apple-isolated")
40494049
* @property {boolean} [internal] - true if the condition applies to internal builds
4050+
* @property {boolean} [preview] - true if the condition applies to preview builds
40504051
*/
40514052
/**
40524053
* Takes multiple conditional blocks and returns true if any apply.
@@ -4074,7 +4075,8 @@
40744075
minSupportedVersion: this._matchMinSupportedVersion,
40754076
maxSupportedVersion: this._matchMaxSupportedVersion,
40764077
injectName: this._matchInjectNameConditional,
4077-
internal: this._matchInternalConditional
4078+
internal: this._matchInternalConditional,
4079+
preview: this._matchPreviewConditional
40784080
};
40794081
for (const key in conditionBlock) {
40804082
if (!conditionChecks[key]) {
@@ -4176,6 +4178,17 @@
41764178
if (isInternal === void 0) return false;
41774179
return Boolean(conditionBlock.internal) === Boolean(isInternal);
41784180
}
4181+
/**
4182+
* Takes a condition block and returns true if the preview state matches the condition.
4183+
* @param {ConditionBlock} conditionBlock
4184+
* @returns {boolean}
4185+
*/
4186+
_matchPreviewConditional(conditionBlock) {
4187+
if (conditionBlock.preview === void 0) return false;
4188+
const isPreview = __privateGet(this, _args)?.platform?.preview;
4189+
if (isPreview === void 0) return false;
4190+
return Boolean(conditionBlock.preview) === Boolean(isPreview);
4191+
}
41794192
/**
41804193
* Takes a condition block and returns true if the platform version satisfies the `minSupportedFeature`
41814194
* @param {ConditionBlock} conditionBlock

build/integration/contentScope.js

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6128,6 +6128,7 @@
61286128
* @property {boolean} [context.top] - true if the condition applies to the top frame
61296129
* @property {string} [injectName] - the inject name to match against (e.g., "apple-isolated")
61306130
* @property {boolean} [internal] - true if the condition applies to internal builds
6131+
* @property {boolean} [preview] - true if the condition applies to preview builds
61316132
*/
61326133
/**
61336134
* Takes multiple conditional blocks and returns true if any apply.
@@ -6155,7 +6156,8 @@
61556156
minSupportedVersion: this._matchMinSupportedVersion,
61566157
maxSupportedVersion: this._matchMaxSupportedVersion,
61576158
injectName: this._matchInjectNameConditional,
6158-
internal: this._matchInternalConditional
6159+
internal: this._matchInternalConditional,
6160+
preview: this._matchPreviewConditional
61596161
};
61606162
for (const key in conditionBlock) {
61616163
if (!conditionChecks[key]) {
@@ -6257,6 +6259,17 @@
62576259
if (isInternal === void 0) return false;
62586260
return Boolean(conditionBlock.internal) === Boolean(isInternal);
62596261
}
6262+
/**
6263+
* Takes a condition block and returns true if the preview state matches the condition.
6264+
* @param {ConditionBlock} conditionBlock
6265+
* @returns {boolean}
6266+
*/
6267+
_matchPreviewConditional(conditionBlock) {
6268+
if (conditionBlock.preview === void 0) return false;
6269+
const isPreview = __privateGet(this, _args)?.platform?.preview;
6270+
if (isPreview === void 0) return false;
6271+
return Boolean(conditionBlock.preview) === Boolean(isPreview);
6272+
}
62606273
/**
62616274
* Takes a condition block and returns true if the platform version satisfies the `minSupportedFeature`
62626275
* @param {ConditionBlock} conditionBlock
@@ -22140,7 +22153,7 @@ ${iframeContent}
2214022153
}
2214122154
startObserving() {
2214222155
this.log.info("Starting observing", this.mutationObserver, __privateGet(this, _cachedContent));
22143-
if (this.mutationObserver && __privateGet(this, _cachedContent) && !this.isObserving) {
22156+
if (this.mutationObserver && __privateGet(this, _cachedContent) && !this.isObserving && document.body) {
2214422157
this.isObserving = true;
2214522158
this.mutationObserver.observe(document.body, {
2214622159
childList: true,
@@ -22196,7 +22209,9 @@ ${iframeContent}
2219622209
if (this.getFeatureSettingEnabled("includeImages", "disabled")) {
2219722210
content.images = this.getImages();
2219822211
}
22199-
this.cachedContent = content;
22212+
if (content.content.length > 0) {
22213+
this.cachedContent = content;
22214+
}
2220022215
return content;
2220122216
}
2220222217
getPageTitle() {

0 commit comments

Comments
 (0)