Skip to content

Commit eb11d88

Browse files
shakyShanegithub-actions[bot]
shakyShane
authored and
github-actions[bot]
committed
Release build 8.4.0 [ci release]
1 parent 079350d commit eb11d88

File tree

24 files changed

+135
-102
lines changed

24 files changed

+135
-102
lines changed

‎CHANGELOG.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- feat(pir): captcha providers (#1550)
1+
- allow non-protection features to survive protections toggle (#1564)

‎Sources/ContentScopeScripts/dist/contentScope.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5922,12 +5922,15 @@
59225922
trackerLookup: define_import_meta_trackerLookup_default,
59235923
injectName: "apple"
59245924
};
5925-
const featureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
5926-
for (const featureName of featureNames) {
5927-
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
5928-
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
5929-
featureInstance2.callLoad();
5930-
features.push({ featureName, featureInstance: featureInstance2 });
5925+
const bundledFeatureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
5926+
const featuresToLoad = isGloballyDisabled(args) ? platformSpecificFeatures : args.site.enabledFeatures || bundledFeatureNames;
5927+
for (const featureName of bundledFeatureNames) {
5928+
if (featuresToLoad.includes(featureName)) {
5929+
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
5930+
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
5931+
featureInstance2.callLoad();
5932+
features.push({ featureName, featureInstance: featureInstance2 });
5933+
}
59315934
}
59325935
mark.end();
59335936
}
@@ -5972,9 +5975,6 @@
59725975
const userUnprotectedDomains = $USER_UNPROTECTED_DOMAINS$;
59735976
const userPreferences = $USER_PREFERENCES$;
59745977
const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences, platformSpecificFeatures);
5975-
if (isGloballyDisabled(processedConfig)) {
5976-
return;
5977-
}
59785978
if (false) {
59795979
processedConfig.messagingConfig = new WebkitMessagingConfig({
59805980
webkitMessageHandlerNames: ["contentScopeScriptsIsolated"],

‎Sources/ContentScopeScripts/dist/contentScopeIsolated.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11965,12 +11965,15 @@
1196511965
trackerLookup: define_import_meta_trackerLookup_default,
1196611966
injectName: "apple-isolated"
1196711967
};
11968-
const featureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
11969-
for (const featureName of featureNames) {
11970-
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
11971-
const featureInstance = new ContentFeature2(featureName, importConfig, args);
11972-
featureInstance.callLoad();
11973-
features.push({ featureName, featureInstance });
11968+
const bundledFeatureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
11969+
const featuresToLoad = isGloballyDisabled(args) ? platformSpecificFeatures : args.site.enabledFeatures || bundledFeatureNames;
11970+
for (const featureName of bundledFeatureNames) {
11971+
if (featuresToLoad.includes(featureName)) {
11972+
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
11973+
const featureInstance = new ContentFeature2(featureName, importConfig, args);
11974+
featureInstance.callLoad();
11975+
features.push({ featureName, featureInstance });
11976+
}
1197411977
}
1197511978
mark.end();
1197611979
}
@@ -12015,9 +12018,6 @@
1201512018
const userUnprotectedDomains = $USER_UNPROTECTED_DOMAINS$;
1201612019
const userPreferences = $USER_PREFERENCES$;
1201712020
const processedConfig = processConfig(config2, userUnprotectedDomains, userPreferences, platformSpecificFeatures);
12018-
if (isGloballyDisabled(processedConfig)) {
12019-
return;
12020-
}
1202112021
if (true) {
1202212022
processedConfig.messagingConfig = new WebkitMessagingConfig({
1202312023
webkitMessageHandlerNames: ["contentScopeScriptsIsolated"],

‎Sources/ContentScopeScripts/dist/pages/new-tab/dist/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20844,7 +20844,7 @@
2084420844
const { keys } = x2(NormalizedDataContext);
2084520845
const { burning, exiting } = x2(ActivityBurningSignalContext);
2084620846
const busy = useComputed(() => burning.value.length > 0 || exiting.value.length > 0);
20847-
return /* @__PURE__ */ g("ul", { class: Activity_default.activity, "data-busy": busy }, "ts", " ", keys.value.map((id, _index) => {
20847+
return /* @__PURE__ */ g("ul", { class: Activity_default.activity, "data-busy": busy }, keys.value.map((id, _index) => {
2084820848
if (canBurn && !isReducedMotion) return /* @__PURE__ */ g(BurnableItem, { id, key: id, documentVisibility: visibility });
2084920849
return /* @__PURE__ */ g(RemovableItem, { id, key: id, canBurn, documentVisibility: visibility });
2085020850
}));

‎build/android/autofillPasswordImport.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2874,12 +2874,15 @@
28742874
trackerLookup: define_import_meta_trackerLookup_default,
28752875
injectName: "android-autofill-password-import"
28762876
};
2877-
const featureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
2878-
for (const featureName of featureNames) {
2879-
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
2880-
const featureInstance = new ContentFeature2(featureName, importConfig, args);
2881-
featureInstance.callLoad();
2882-
features.push({ featureName, featureInstance });
2877+
const bundledFeatureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
2878+
const featuresToLoad = isGloballyDisabled(args) ? platformSpecificFeatures : args.site.enabledFeatures || bundledFeatureNames;
2879+
for (const featureName of bundledFeatureNames) {
2880+
if (featuresToLoad.includes(featureName)) {
2881+
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
2882+
const featureInstance = new ContentFeature2(featureName, importConfig, args);
2883+
featureInstance.callLoad();
2884+
features.push({ featureName, featureInstance });
2885+
}
28832886
}
28842887
mark.end();
28852888
}
@@ -2924,9 +2927,6 @@
29242927
const userUnprotectedDomains = $USER_UNPROTECTED_DOMAINS$;
29252928
const userPreferences = $USER_PREFERENCES$;
29262929
const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences);
2927-
if (isGloballyDisabled(processedConfig)) {
2928-
return;
2929-
}
29302930
const configConstruct = processedConfig;
29312931
const messageCallback = configConstruct.messageCallback;
29322932
const messageSecret2 = configConstruct.messageSecret;

‎build/android/brokerProtection.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7151,12 +7151,15 @@
71517151
trackerLookup: define_import_meta_trackerLookup_default,
71527152
injectName: "android-broker-protection"
71537153
};
7154-
const featureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
7155-
for (const featureName of featureNames) {
7156-
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
7157-
const featureInstance = new ContentFeature2(featureName, importConfig, args);
7158-
featureInstance.callLoad();
7159-
features.push({ featureName, featureInstance });
7154+
const bundledFeatureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
7155+
const featuresToLoad = isGloballyDisabled(args) ? platformSpecificFeatures : args.site.enabledFeatures || bundledFeatureNames;
7156+
for (const featureName of bundledFeatureNames) {
7157+
if (featuresToLoad.includes(featureName)) {
7158+
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
7159+
const featureInstance = new ContentFeature2(featureName, importConfig, args);
7160+
featureInstance.callLoad();
7161+
features.push({ featureName, featureInstance });
7162+
}
71607163
}
71617164
mark.end();
71627165
}
@@ -7201,9 +7204,6 @@
72017204
const userUnprotectedDomains = $USER_UNPROTECTED_DOMAINS$;
72027205
const userPreferences = $USER_PREFERENCES$;
72037206
const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences);
7204-
if (isGloballyDisabled(processedConfig)) {
7205-
return;
7206-
}
72077207
const configConstruct = processedConfig;
72087208
const messageCallback = configConstruct.messageCallback;
72097209
const messageSecret2 = configConstruct.messageSecret;

‎build/android/contentScope.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7749,12 +7749,15 @@
77497749
trackerLookup: define_import_meta_trackerLookup_default,
77507750
injectName: "android"
77517751
};
7752-
const featureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
7753-
for (const featureName of featureNames) {
7754-
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
7755-
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
7756-
featureInstance2.callLoad();
7757-
features.push({ featureName, featureInstance: featureInstance2 });
7752+
const bundledFeatureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
7753+
const featuresToLoad = isGloballyDisabled(args) ? platformSpecificFeatures : args.site.enabledFeatures || bundledFeatureNames;
7754+
for (const featureName of bundledFeatureNames) {
7755+
if (featuresToLoad.includes(featureName)) {
7756+
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
7757+
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
7758+
featureInstance2.callLoad();
7759+
features.push({ featureName, featureInstance: featureInstance2 });
7760+
}
77587761
}
77597762
mark.end();
77607763
}
@@ -7799,9 +7802,6 @@
77997802
const userUnprotectedDomains = $USER_UNPROTECTED_DOMAINS$;
78007803
const userPreferences = $USER_PREFERENCES$;
78017804
const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences);
7802-
if (isGloballyDisabled(processedConfig)) {
7803-
return;
7804-
}
78057805
const configConstruct = processedConfig;
78067806
const messageCallback = configConstruct.messageCallback;
78077807
const messageSecret2 = configConstruct.messageSecret;

‎build/chrome-mv3/inject.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,6 +1214,9 @@
12141214
});
12151215
return featureSettings;
12161216
}
1217+
function isGloballyDisabled(args) {
1218+
return args.site.allowlisted || args.site.isBroken;
1219+
}
12171220
var platformSpecificFeatures = ["windowsPermissionUsage", "messageBridge"];
12181221
function isPlatformSpecificFeature(featureName) {
12191222
return platformSpecificFeatures.includes(featureName);
@@ -8135,12 +8138,15 @@
81358138
trackerLookup: $TRACKER_LOOKUP$,
81368139
injectName: "chrome-mv3"
81378140
};
8138-
const featureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
8139-
for (const featureName of featureNames) {
8140-
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
8141-
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
8142-
featureInstance2.callLoad();
8143-
features.push({ featureName, featureInstance: featureInstance2 });
8141+
const bundledFeatureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
8142+
const featuresToLoad = isGloballyDisabled(args) ? platformSpecificFeatures : args.site.enabledFeatures || bundledFeatureNames;
8143+
for (const featureName of bundledFeatureNames) {
8144+
if (featuresToLoad.includes(featureName)) {
8145+
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
8146+
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
8147+
featureInstance2.callLoad();
8148+
features.push({ featureName, featureInstance: featureInstance2 });
8149+
}
81448150
}
81458151
mark.end();
81468152
}

‎build/firefox/inject.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,6 +1214,9 @@
12141214
});
12151215
return featureSettings;
12161216
}
1217+
function isGloballyDisabled(args) {
1218+
return args.site.allowlisted || args.site.isBroken;
1219+
}
12171220
var platformSpecificFeatures = ["windowsPermissionUsage", "messageBridge"];
12181221
function isPlatformSpecificFeature(featureName) {
12191222
return platformSpecificFeatures.includes(featureName);
@@ -8135,12 +8138,15 @@
81358138
trackerLookup: $TRACKER_LOOKUP$,
81368139
injectName: "firefox"
81378140
};
8138-
const featureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
8139-
for (const featureName of featureNames) {
8140-
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
8141-
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
8142-
featureInstance2.callLoad();
8143-
features.push({ featureName, featureInstance: featureInstance2 });
8141+
const bundledFeatureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
8142+
const featuresToLoad = isGloballyDisabled(args) ? platformSpecificFeatures : args.site.enabledFeatures || bundledFeatureNames;
8143+
for (const featureName of bundledFeatureNames) {
8144+
if (featuresToLoad.includes(featureName)) {
8145+
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
8146+
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
8147+
featureInstance2.callLoad();
8148+
features.push({ featureName, featureInstance: featureInstance2 });
8149+
}
81448150
}
81458151
mark.end();
81468152
}

‎build/integration/contentScope.js

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2736,6 +2736,9 @@
27362736
});
27372737
return featureSettings;
27382738
}
2739+
function isGloballyDisabled(args) {
2740+
return args.site.allowlisted || args.site.isBroken;
2741+
}
27392742
var platformSpecificFeatures = ["windowsPermissionUsage", "messageBridge"];
27402743
function isPlatformSpecificFeature(featureName) {
27412744
return platformSpecificFeatures.includes(featureName);
@@ -16673,12 +16676,15 @@
1667316676
trackerLookup: define_import_meta_trackerLookup_default,
1667416677
injectName: "integration"
1667516678
};
16676-
const featureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
16677-
for (const featureName of featureNames) {
16678-
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
16679-
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
16680-
featureInstance2.callLoad();
16681-
features.push({ featureName, featureInstance: featureInstance2 });
16679+
const bundledFeatureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
16680+
const featuresToLoad = isGloballyDisabled(args) ? platformSpecificFeatures : args.site.enabledFeatures || bundledFeatureNames;
16681+
for (const featureName of bundledFeatureNames) {
16682+
if (featuresToLoad.includes(featureName)) {
16683+
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
16684+
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
16685+
featureInstance2.callLoad();
16686+
features.push({ featureName, featureInstance: featureInstance2 });
16687+
}
1668216688
}
1668316689
mark.end();
1668416690
}
@@ -16741,7 +16747,14 @@
1674116747
domain: topLevelUrl.hostname,
1674216748
isBroken: false,
1674316749
allowlisted: false,
16744-
enabledFeatures: ["fingerprintingCanvas", "fingerprintingScreenSize", "navigatorInterface", "cookie"]
16750+
enabledFeatures: [
16751+
"fingerprintingCanvas",
16752+
"fingerprintingScreenSize",
16753+
"navigatorInterface",
16754+
"cookie",
16755+
"webCompat",
16756+
"apiManipulation"
16757+
]
1674516758
}
1674616759
};
1674716760
}

‎build/integration/pages/new-tab/dist/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20849,7 +20849,7 @@
2084920849
const { keys } = x2(NormalizedDataContext);
2085020850
const { burning, exiting } = x2(ActivityBurningSignalContext);
2085120851
const busy = useComputed(() => burning.value.length > 0 || exiting.value.length > 0);
20852-
return /* @__PURE__ */ g("ul", { class: Activity_default.activity, "data-busy": busy }, "ts", " ", keys.value.map((id, _index) => {
20852+
return /* @__PURE__ */ g("ul", { class: Activity_default.activity, "data-busy": busy }, keys.value.map((id, _index) => {
2085320853
if (canBurn && !isReducedMotion) return /* @__PURE__ */ g(BurnableItem, { id, key: id, documentVisibility: visibility });
2085420854
return /* @__PURE__ */ g(RemovableItem, { id, key: id, canBurn, documentVisibility: visibility });
2085520855
}));

‎build/windows/contentScope.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12384,12 +12384,15 @@
1238412384
trackerLookup: define_import_meta_trackerLookup_default,
1238512385
injectName: "windows"
1238612386
};
12387-
const featureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
12388-
for (const featureName of featureNames) {
12389-
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
12390-
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
12391-
featureInstance2.callLoad();
12392-
features.push({ featureName, featureInstance: featureInstance2 });
12387+
const bundledFeatureNames = typeof importConfig.injectName === "string" ? platformSupport[importConfig.injectName] : [];
12388+
const featuresToLoad = isGloballyDisabled(args) ? platformSpecificFeatures : args.site.enabledFeatures || bundledFeatureNames;
12389+
for (const featureName of bundledFeatureNames) {
12390+
if (featuresToLoad.includes(featureName)) {
12391+
const ContentFeature2 = ddg_platformFeatures_default["ddg_feature_" + featureName];
12392+
const featureInstance2 = new ContentFeature2(featureName, importConfig, args);
12393+
featureInstance2.callLoad();
12394+
features.push({ featureName, featureInstance: featureInstance2 });
12395+
}
1239312396
}
1239412397
mark.end();
1239512398
}
@@ -12434,9 +12437,6 @@
1243412437
const userUnprotectedDomains = $USER_UNPROTECTED_DOMAINS$;
1243512438
const userPreferences = $USER_PREFERENCES$;
1243612439
const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences, platformSpecificFeatures);
12437-
if (isGloballyDisabled(processedConfig)) {
12438-
return;
12439-
}
1244012440
processedConfig.messagingConfig = new WindowsMessagingConfig({
1244112441
methods: {
1244212442
// @ts-expect-error - Type 'unknown' is not assignable to type...

‎build/windows/pages/new-tab/dist/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20844,7 +20844,7 @@
2084420844
const { keys } = x2(NormalizedDataContext);
2084520845
const { burning, exiting } = x2(ActivityBurningSignalContext);
2084620846
const busy = useComputed(() => burning.value.length > 0 || exiting.value.length > 0);
20847-
return /* @__PURE__ */ g("ul", { class: Activity_default.activity, "data-busy": busy }, "ts", " ", keys.value.map((id, _index) => {
20847+
return /* @__PURE__ */ g("ul", { class: Activity_default.activity, "data-busy": busy }, keys.value.map((id, _index) => {
2084820848
if (canBurn && !isReducedMotion) return /* @__PURE__ */ g(BurnableItem, { id, key: id, documentVisibility: visibility });
2084920849
return /* @__PURE__ */ g(RemovableItem, { id, key: id, canBurn, documentVisibility: visibility });
2085020850
}));

‎injected/entry-points/android.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @module Android integration
33
*/
44
import { load, init } from '../src/content-scope-features.js';
5-
import { processConfig, isGloballyDisabled } from './../src/utils';
5+
import { processConfig } from './../src/utils';
66
import { AndroidMessagingConfig } from '../../messaging/index.js';
77

88
function initCode() {
@@ -14,9 +14,6 @@ function initCode() {
1414
const userPreferences = $USER_PREFERENCES$;
1515

1616
const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences);
17-
if (isGloballyDisabled(processedConfig)) {
18-
return;
19-
}
2017

2118
const configConstruct = processedConfig;
2219
const messageCallback = configConstruct.messageCallback;

‎injected/entry-points/apple.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @module Apple integration
33
*/
44
import { load, init } from '../src/content-scope-features.js';
5-
import { processConfig, isGloballyDisabled, platformSpecificFeatures } from './../src/utils';
5+
import { processConfig, platformSpecificFeatures } from './../src/utils';
66
import { WebkitMessagingConfig, TestTransportConfig } from '../../messaging/index.js';
77

88
function initCode() {
@@ -15,10 +15,6 @@ function initCode() {
1515

1616
const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences, platformSpecificFeatures);
1717

18-
if (isGloballyDisabled(processedConfig)) {
19-
return;
20-
}
21-
2218
if (import.meta.injectName === 'apple-isolated') {
2319
processedConfig.messagingConfig = new WebkitMessagingConfig({
2420
webkitMessageHandlerNames: ['contentScopeScriptsIsolated'],

‎injected/entry-points/integration.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ function generateConfig() {
2626
domain: topLevelUrl.hostname,
2727
isBroken: false,
2828
allowlisted: false,
29-
enabledFeatures: ['fingerprintingCanvas', 'fingerprintingScreenSize', 'navigatorInterface', 'cookie'],
29+
enabledFeatures: [
30+
'fingerprintingCanvas',
31+
'fingerprintingScreenSize',
32+
'navigatorInterface',
33+
'cookie',
34+
'webCompat',
35+
'apiManipulation',
36+
],
3037
},
3138
};
3239
}

0 commit comments

Comments
 (0)