Merge remote-tracking branch 'origin/main' into jkt/adsjs-messaging

Author: jonathanKingston

.github/workflows/dependabot-auto-merge.yml

@@ -0,0 +1,32 @@
+name: Dependabot auto-approve and auto-merge
+on: pull_request
+
+permissions:
+    contents: write
+    pull-requests: write
+
+jobs:
+    dependabot:
+        runs-on: ubuntu-latest
+        if: github.event.pull_request.user.login == 'dependabot[bot]'
+        steps:
+            - name: Dependabot metadata
+              id: metadata
+              uses: dependabot/fetch-metadata@08eff52bf64351f401fb50d4972fa95b9f2c2d1b
+              with:
+                  github-token: '${{ secrets.GITHUB_TOKEN }}'
+
+            - name: Auto-approve and enable auto-merge for npm patch updates (except ignored packages)
+              if: |
+                  steps.metadata.outputs.package-ecosystem == 'npm' &&
+                  steps.metadata.outputs.update-type == 'version-update:semver-patch' &&
+                  !contains(steps.metadata.outputs.dependency-names, '@atlaskit/pragmatic-drag-and-drop') &&
+                  !contains(steps.metadata.outputs.dependency-names, 'preact') &&
+                  !contains(steps.metadata.outputs.dependency-names, '@preact/signals') &&
+                  !contains(steps.metadata.outputs.dependency-names, 'lottie-web')
+              run: |
+                  gh pr review --approve "$PR_URL"
+                  gh pr merge --auto --merge "$PR_URL"
+              env:
+                  PR_URL: ${{ github.event.pull_request.html_url }}
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CODEOWNERS

@@ -21,10 +21,10 @@ injected/integration-test/mocks/broker-protection/ @duckduckgo/content-scope-scr
 injected/integration-test/test-pages/broker-protection/ @duckduckgo/content-scope-scripts-owners @duckduckgo/injected-broker-protection
 
 # Platform owners
-injected/src/features.js @duckduckgo/content-scope-scripts-owners @duckduckgo/apple-devs @duckduckgo/android-devs @duckduckgo/team-windows-development @kzar @sammacbeth
+injected/src/features.js @duckduckgo/content-scope-scripts-owners @duckduckgo/apple-devs @duckduckgo/android-devs @duckduckgo/team-windows-development @duckduckgo/extension-owners
 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/extension-mv3.js @duckduckgo/content-scope-scripts-owners @duckduckgo/extension-owners
 injected/entry-points/windows.js @duckduckgo/content-scope-scripts-owners @duckduckgo/team-windows-development
 
 # Test owners

injected/docs/build-and-troubleshooting.md

@@ -8,7 +8,11 @@ This document provides platform-specific build instructions, troubleshooting ste
 
 - **Check Xcode Version:**
     - [.xcode-version](https://github.com/duckduckgo/apple-browsers/tree/main/.xcode-version)
-- **Set up C-S-S or Autofill as a Local Dependency:**
+- **Set up C-S-S as a Local Dependency:**
+    - Run `npm link` in your C-S-S check out.
+    - Run `npm link @duckduckgo/content-scope-scripts` in your `apple-browsers` project.
+    - Whenever files change run: `npm run build-content-scope-scripts`
+- **Set up Autofill as a Local Dependency:**
     - Drag the folder from Finder into the directory panel in Xcode.
 - **Privacy Config Files:**
     - Both apps bundle a privacy config file: [macos-config.json](https://github.com/duckduckgo/apple-browsers/blob/main/macOS/DuckDuckGo/ContentBlocker/macos-config.json) & [ios-config.json](https://github.com/duckduckgo/apple-browsers/blob/main/iOS/Core/ios-config.json).