Merge branch 'main' into jkt/css-asana

Author: jonathanKingston

.github/scripts/diff-directories.js

@@ -26,7 +26,7 @@ function upperCaseFirstLetter(string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
 }
 
-function displayDiffs(dir1Files, dir2Files, isOpen) {
+function displayDiffs(dir1Files, dir2Files) {
     const rollupGrouping = {};
     /**
      * Rolls up multiple files with the same diff into a single entry
@@ -79,13 +79,13 @@ function displayDiffs(dir1Files, dir2Files, isOpen) {
                 }
             }
             outString += '\n\n' + rollup.string;
-            return renderDetails(title, outString, isOpen);
+            return renderDetails(title, outString);
         })
         .join('\n');
     return outString;
 }
 
-function renderDetails(section, text, isOpen) {
+function renderDetails(section, text) {
     if (section === 'dist') {
         section = 'apple';
     }
@@ -120,5 +120,5 @@ sortFiles(readFilesRecursively(dir1 + sourcesOutput), 'dir1');
 sortFiles(readFilesRecursively(dir2 + sourcesOutput), 'dir2');
 
 // console.log(Object.keys(files))
-const fileOut = displayDiffs(sections.dir1, sections.dir2, true);
+const fileOut = displayDiffs(sections.dir1, sections.dir2);
 console.log(fileOut);

CODEOWNERS

@@ -15,7 +15,6 @@ injected/src/features/autofill-password-import.js @duckduckgo/content-scope-scri
 Sources/ @duckduckgo/content-scope-scripts-owners @duckduckgo/apple-devs
 injected/entry-points/android.js @duckduckgo/content-scope-scripts-owners @duckduckgo/android-devs
 injected/entry-points/extension-mv3.js @duckduckgo/content-scope-scripts-owners @kzar @sammacbeth
-injected/entry-points/chrome.js @duckduckgo/content-scope-scripts-owners @kzar @sammacbeth
 injected/entry-points/windows.js @duckduckgo/content-scope-scripts-owners @duckduckgo/team-windows-development
 
 # Test owners

eslint.config.js

@@ -11,6 +11,7 @@ export default tseslint.config(
             '**/build/',
             '**/docs/',
             'injected/lib',
+            'injected/playwright-report/',
             'Sources/ContentScopeScripts/dist/',
             'injected/integration-test/extension/contentScope.js',
             'injected/integration-test/test-pages/duckplayer/scripts/dist',

injected/docs/favicon.md

@@ -0,0 +1,39 @@
+---
+title: Favicon Monitor
+---
+
+# Favicon Monitor
+
+Reports the presence of favicons on page-load, and optionally when they change.  
+
+## Notifications
+
+### `faviconFound`
+- {@link "Favicon Messages".FaviconFoundNotification}
+- Sent on page load, sends {@link "Favicon Messages".FaviconFound}
+
+**Example**
+
+```json
+{
+  "favicons": [
+    {
+      "href": "favicon.png",
+      "rel": "stylesheet"
+    }
+  ],
+  "documentUrl": "https://example.com"
+}
+```
+
+## Remote Config
+
+## Enabled (default)
+{@includeCode ../integration-test/test-pages/favicon/config/favicon-enabled.json}
+
+### Disable the monitor only.
+
+To only receive the initial payload and nothing more (to mimic the old behavior), 
+you can set `monitor: false` in the remote config, and it will not install the Mutation Observer.
+
+{@includeCode ../integration-test/test-pages/favicon/config/favicon-monitor-disabled.json}

injected/entry-points/android.js

@@ -2,7 +2,7 @@
  * @module Android integration
  */
 import { load, init } from '../src/content-scope-features.js';
-import { processConfig, isGloballyDisabled } from './../src/utils';
+import { processConfig } from './../src/utils';
 import { AndroidMessagingConfig } from '../../messaging/index.js';
 
 function initCode() {
@@ -14,9 +14,6 @@ function initCode() {
     const userPreferences = $USER_PREFERENCES$;
 
     const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences);
-    if (isGloballyDisabled(processedConfig)) {
-        return;
-    }
 
     const configConstruct = processedConfig;
     const messageCallback = configConstruct.messageCallback;

injected/entry-points/apple.js

@@ -2,7 +2,7 @@
  * @module Apple integration
  */
 import { load, init } from '../src/content-scope-features.js';
-import { processConfig, isGloballyDisabled, platformSpecificFeatures } from './../src/utils';
+import { processConfig, platformSpecificFeatures } from './../src/utils';
 import { WebkitMessagingConfig, TestTransportConfig } from '../../messaging/index.js';
 
 function initCode() {
@@ -15,10 +15,6 @@ function initCode() {
 
     const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences, platformSpecificFeatures);
 
-    if (isGloballyDisabled(processedConfig)) {
-        return;
-    }
-
     if (import.meta.injectName === 'apple-isolated') {
         processedConfig.messagingConfig = new WebkitMessagingConfig({
             webkitMessageHandlerNames: ['contentScopeScriptsIsolated'],

injected/entry-points/chrome.js

@@ -26,7 +26,14 @@ function generateConfig() {
             domain: topLevelUrl.hostname,
             isBroken: false,
             allowlisted: false,
-            enabledFeatures: ['fingerprintingCanvas', 'fingerprintingScreenSize', 'navigatorInterface', 'cookie'],
+            enabledFeatures: [
+                'fingerprintingCanvas',
+                'fingerprintingScreenSize',
+                'navigatorInterface',
+                'cookie',
+                'webCompat',
+                'apiManipulation',
+            ],
         },
     };
 }

injected/entry-points/integration.js

@@ -2,7 +2,7 @@
  * @module Windows integration
  */
 import { load, init } from '../src/content-scope-features.js';
-import { processConfig, isGloballyDisabled, platformSpecificFeatures } from './../src/utils';
+import { processConfig, platformSpecificFeatures } from './../src/utils';
 import { WindowsMessagingConfig } from '../../messaging/index.js';
 
 function initCode() {
@@ -14,9 +14,7 @@ function initCode() {
     const userPreferences = $USER_PREFERENCES$;
 
     const processedConfig = processConfig(config, userUnprotectedDomains, userPreferences, platformSpecificFeatures);
-    if (isGloballyDisabled(processedConfig)) {
-        return;
-    }
+
     processedConfig.messagingConfig = new WindowsMessagingConfig({
         methods: {
             // @ts-expect-error - Type 'unknown' is not assignable to type...