Release build 11.14.0 [ci release]

Author: jonathanKingston

CHANGELOG.txt

@@ -1,4 +1 @@
-- ntp: support empty strings in persistent storage (#1932)
-- ntp: allow visibility menu items to be disabled (#1930)
-- Update dark search icon (#1915)
-- build(deps-dev): bump the eslint group across 1 directory with 2 updates (#1925)
+- Page context follow up work (#1931)

build/apple/contentScope.js

@@ -2028,6 +2028,15 @@
       createCustomEvent("sendMessageProxy" + messageSecret, { detail: JSON.stringify({ messageType, options }) })
     );
   }
+  function isDuckAi() {
+    const tabUrl = getTabUrl();
+    const domains = ["duckduckgo.com", "duck.ai", "duck.co"];
+    if (tabUrl?.hostname && domains.includes(tabUrl?.hostname)) {
+      const url = new URL(tabUrl?.href);
+      return url.searchParams.has("duckai");
+    }
+    return false;
+  }
 
   // src/features.js
   init_define_import_meta_trackerLookup();
@@ -15398,7 +15407,7 @@ ul.messages {
       __publicField(this, "listenForUrlChanges", true);
     }
     init() {
-      if (this.isDuckAi()) {
+      if (isDuckAi()) {
         return;
       }
       this.setupMessageHandlers();
@@ -15409,16 +15418,9 @@ ul.messages {
       window.addEventListener("hashchange", () => {
         this.handleContentCollectionRequest({});
       });
-    }
-    isDuckAi() {
-      if (window?.top?.location?.hostname === "duckduckgo.com") {
-        return true;
-      }
-      if (window.location.hostname === "duckduckgo.com") {
-        const url = new URL(window.location.href);
-        return url.searchParams.has("duckai");
-      }
-      return false;
+      window.addEventListener("pageshow", () => {
+        this.handleContentCollectionRequest({});
+      });
     }
     /**
      * @param {NavigationType} _navigationType
@@ -15477,6 +15479,7 @@ ul.messages {
         }
       }
       const content = {
+        favicon: getFaviconList(),
         title: this.getPageTitle(),
         metaDescription: this.getMetaDescription(),
         content: this.getMainContent(options),

build/apple/contentScopeIsolated.js

@@ -87,7 +87,7 @@ function monitor(changeObservedCallback) {
 /**
  * @returns {import('../types/favicon.js').FaviconAttrs[]}
  */
-function getFaviconList() {
+export function getFaviconList() {
     const selectors = [
         "link[href][rel='favicon']",
         "link[href][rel*='icon']",

build/integration/contentScope.js

@@ -1,4 +1,6 @@
 import ContentFeature from '../content-feature.js';
+import { getFaviconList } from './favicon.js';
+import { isDuckAi } from '../utils.js';
 const MSG_PAGE_CONTEXT_COLLECT = 'collect';
 const MSG_PAGE_CONTEXT_RESPONSE = 'collectionResult';
 const MSG_PAGE_CONTEXT_ERROR = 'collectionError';
@@ -9,7 +11,7 @@ export default class PageContext extends ContentFeature {
     listenForUrlChanges = true;
 
     init() {
-        if (this.isDuckAi()) {
+        if (isDuckAi()) {
             return;
         }
         this.setupMessageHandlers();
@@ -20,17 +22,9 @@ export default class PageContext extends ContentFeature {
         window.addEventListener('hashchange', () => {
             this.handleContentCollectionRequest({});
         });
-    }
-
-    isDuckAi() {
-        if (window?.top?.location?.hostname === 'duckduckgo.com') {
-            return true;
-        }
-        if (window.location.hostname === 'duckduckgo.com') {
-            const url = new URL(window.location.href);
-            return url.searchParams.has('duckai');
-        }
-        return false;
+        window.addEventListener('pageshow', () => {
+            this.handleContentCollectionRequest({});
+        });
     }
 
     /**
@@ -106,6 +100,7 @@ export default class PageContext extends ContentFeature {
         }
 
         const content = {
+            favicon: getFaviconList(),
             title: this.getPageTitle(),
             metaDescription: this.getMetaDescription(),
             content: this.getMainContent(options),

injected/integration-test/extension/contentScope.js

@@ -835,3 +835,13 @@ export function withExponentialBackoff(fn, maxAttempts = 4, delay = 500) {
         tryFn();
     });
 }
+
+export function isDuckAi() {
+    const tabUrl = getTabUrl();
+    const domains = ['duckduckgo.com', 'duck.ai', 'duck.co'];
+    if (tabUrl?.hostname && domains.includes(tabUrl?.hostname)) {
+        const url = new URL(tabUrl?.href);
+        return url.searchParams.has('duckai');
+    }
+    return false;
+}