Release build 8.13.0 [ci release]

Author: jonathanKingston

CHANGELOG.txt

@@ -1 +1 @@
-- ntp: support default background colors (#1596)
+- Setting of document for tracker analysis (#1613)

Sources/ContentScopeScripts/dist/contentScope.js

@@ -885,6 +885,9 @@
     const style = createStyleElement(css);
     getInjectionElement().appendChild(style);
   }
+  function getGlobal() {
+    return globalObj;
+  }
   function nextRandom(v) {
     return Math.abs(v >> 1 | (v << 62 ^ v << 61) & ~(~0 << 63) << 62);
   }
@@ -2578,7 +2581,7 @@
 
   // src/trackers.js
   init_define_import_meta_trackerLookup();
-  function isTrackerOrigin(trackerLookup, originHostname = document.location.hostname) {
+  function isTrackerOrigin(trackerLookup, originHostname = getGlobal().document.location.hostname) {
     const parts = originHostname.split(".").reverse();
     let node = trackerLookup;
     for (const sub of parts) {

Sources/ContentScopeScripts/dist/contentScopeIsolated.js

@@ -1607,6 +1607,9 @@
   function registerMessageSecret(secret) {
     messageSecret = secret;
   }
+  function getGlobal() {
+    return globalObj;
+  }
   var exemptionLists = {};
   var debug = false;
   function initStringExemptionLists(args) {
@@ -3133,7 +3136,7 @@
 
   // src/trackers.js
   init_define_import_meta_trackerLookup();
-  function isTrackerOrigin(trackerLookup, originHostname = document.location.hostname) {
+  function isTrackerOrigin(trackerLookup, originHostname = getGlobal().document.location.hostname) {
     const parts = originHostname.split(".").reverse();
     let node = trackerLookup;
     for (const sub of parts) {

build/android/autofillPasswordImport.js

@@ -49,6 +49,9 @@
   function registerMessageSecret(secret) {
     messageSecret = secret;
   }
+  function getGlobal() {
+    return globalObj;
+  }
   var exemptionLists = {};
   function shouldExemptUrl(type, url) {
     for (const regex of exemptionLists[type]) {
@@ -1719,7 +1722,7 @@
   };
 
   // src/trackers.js
-  function isTrackerOrigin(trackerLookup, originHostname = document.location.hostname) {
+  function isTrackerOrigin(trackerLookup, originHostname = getGlobal().document.location.hostname) {
     const parts = originHostname.split(".").reverse();
     let node = trackerLookup;
     for (const sub of parts) {

build/android/brokerProtection.js

@@ -1573,6 +1573,9 @@
   function registerMessageSecret(secret) {
     messageSecret = secret;
   }
+  function getGlobal() {
+    return globalObj;
+  }
   var exemptionLists = {};
   var debug = false;
   function initStringExemptionLists(args) {
@@ -3093,7 +3096,7 @@
 
   // src/trackers.js
   init_define_import_meta_trackerLookup();
-  function isTrackerOrigin(trackerLookup, originHostname = document.location.hostname) {
+  function isTrackerOrigin(trackerLookup, originHostname = getGlobal().document.location.hostname) {
     const parts = originHostname.split(".").reverse();
     let node = trackerLookup;
     for (const sub of parts) {

build/android/contentScope.js

@@ -885,6 +885,9 @@
     const style = createStyleElement(css);
     getInjectionElement().appendChild(style);
   }
+  function getGlobal() {
+    return globalObj;
+  }
   function nextRandom(v) {
     return Math.abs(v >> 1 | (v << 62 ^ v << 61) & ~(~0 << 63) << 62);
   }
@@ -3089,7 +3092,7 @@
 
   // src/trackers.js
   init_define_import_meta_trackerLookup();
-  function isTrackerOrigin(trackerLookup, originHostname = document.location.hostname) {
+  function isTrackerOrigin(trackerLookup, originHostname = getGlobal().document.location.hostname) {
     const parts = originHostname.split(".").reverse();
     let node = trackerLookup;
     for (const sub of parts) {

build/chrome-mv3/inject.js

@@ -855,6 +855,9 @@
     const style = createStyleElement(css);
     getInjectionElement().appendChild(style);
   }
+  function getGlobal() {
+    return globalObj;
+  }
   function nextRandom(v) {
     return Math.abs(v >> 1 | (v << 62 ^ v << 61) & ~(~0 << 63) << 62);
   }
@@ -2549,7 +2552,7 @@
   };
 
   // src/trackers.js
-  function isTrackerOrigin(trackerLookup2, originHostname = document.location.hostname) {
+  function isTrackerOrigin(trackerLookup2, originHostname = getGlobal().document.location.hostname) {
     const parts = originHostname.split(".").reverse();
     let node = trackerLookup2;
     for (const sub of parts) {

build/firefox/inject.js

@@ -855,6 +855,9 @@
     const style = createStyleElement(css);
     getInjectionElement().appendChild(style);
   }
+  function getGlobal() {
+    return globalObj;
+  }
   function nextRandom(v) {
     return Math.abs(v >> 1 | (v << 62 ^ v << 61) & ~(~0 << 63) << 62);
   }
@@ -2549,7 +2552,7 @@
   };
 
   // src/trackers.js
-  function isTrackerOrigin(trackerLookup2, originHostname = document.location.hostname) {
+  function isTrackerOrigin(trackerLookup2, originHostname = getGlobal().document.location.hostname) {
     const parts = originHostname.split(".").reverse();
     let node = trackerLookup2;
     for (const sub of parts) {

build/integration/contentScope.js

@@ -2367,6 +2367,9 @@
     const style = createStyleElement(css);
     getInjectionElement().appendChild(style);
   }
+  function getGlobal() {
+    return globalObj;
+  }
   function nextRandom(v) {
     return Math.abs(v >> 1 | (v << 62 ^ v << 61) & ~(~0 << 63) << 62);
   }
@@ -4586,7 +4589,7 @@
 
   // src/trackers.js
   init_define_import_meta_trackerLookup();
-  function isTrackerOrigin(trackerLookup2, originHostname = document.location.hostname) {
+  function isTrackerOrigin(trackerLookup2, originHostname = getGlobal().document.location.hostname) {
     const parts = originHostname.split(".").reverse();
     let node = trackerLookup2;
     for (const sub of parts) {

build/windows/contentScope.js

@@ -2367,6 +2367,9 @@
     const style = createStyleElement(css);
     getInjectionElement().appendChild(style);
   }
+  function getGlobal() {
+    return globalObj;
+  }
   function nextRandom(v) {
     return Math.abs(v >> 1 | (v << 62 ^ v << 61) & ~(~0 << 63) << 62);
   }
@@ -4119,7 +4122,7 @@
 
   // src/trackers.js
   init_define_import_meta_trackerLookup();
-  function isTrackerOrigin(trackerLookup2, originHostname = document.location.hostname) {
+  function isTrackerOrigin(trackerLookup2, originHostname = getGlobal().document.location.hostname) {
     const parts = originHostname.split(".").reverse();
     let node = trackerLookup2;
     for (const sub of parts) {

injected/src/trackers.js

@@ -1,9 +1,14 @@
+import { getGlobal } from './utils.js';
+
 /**
  * Check if the current document origin is on the tracker list, using the provided lookup trie.
  * @param {object} trackerLookup Trie lookup of tracker domains
  * @returns {boolean} True iff the origin is a tracker.
+ *
+ * Note: getGlobal() is used in testing to get the global object,
+ * it's a work around for ESM modules are essentially singletons preventing overriding of global variables.
  */
-export function isTrackerOrigin(trackerLookup, originHostname = document.location.hostname) {
+export function isTrackerOrigin(trackerLookup, originHostname = getGlobal().document.location.hostname) {
     const parts = originHostname.split('.').reverse();
     let node = trackerLookup;
     for (const sub of parts) {

injected/src/utils.js

@@ -49,6 +49,14 @@ export function setGlobal(globalObjIn) {
     Error = globalObj.Error;
 }
 
+/**
+ * Used for testing to allow other files to override the globals used within this file.
+ * @returns {globalThis} the global object
+ */
+export function getGlobal() {
+    return globalObj;
+}
+
 // linear feedback shift register to find a random approximation
 export function nextRandom(v) {
     return Math.abs((v >> 1) | (((v << 62) ^ (v << 61)) & (~(~0 << 63) << 62)));