Skip to content

feat: integrate upstream uBOL 2026.222.1657 into wm/patches#22

Draft
Copilot wants to merge 3 commits intowm/patchesfrom
copilot/merge-main-into-wm-patches
Draft

feat: integrate upstream uBOL 2026.222.1657 into wm/patches#22
Copilot wants to merge 3 commits intowm/patchesfrom
copilot/merge-main-into-wm-patches

Conversation

Copy link
Copy Markdown

Copilot AI commented Feb 23, 2026 •
edited
Loading

Merges main (upstream uBOL 2026.222.1657) into wm/patches, resolving all conflicts while preserving webmonitoring-specific customizations.

Filter list updates

  • Accepted all 102 upstream chromium ruleset changes (filter list data, new ublock-experimental.* scripting files)

Conflict resolution / patch preservation

chromium/manifest.json — took upstream version (2026.222.1657), re-applied patches:

  • Retained "update_url" (Chrome Web Store auto-update)
  • Kept extended default-enabled rulesets (adguard-mobile, block-lan, annoyances-*, ublock-experimental, ubol-tests, etc.)

chromium/js/background.js — took upstream version (adds loadRulesetConfig import + uncomments call), re-applied patch:

// await loadRulesetConfig();   // intentionally disabled in wm/patches

Version bumps

  • chromium/package.json: 2026.211.2314 → 2026.222.1657
  • CHANGELOG.md: added ### 2026.222.1657 section header
Original prompt

This section details on the original issue you should resolve

<issue_title>Merge main into wm/patches (upstream sync + conflict resolution), ubol release 2026.222.1657</issue_title>
<issue_description> ## Automated Upstream Integration Request

  • Source branch: main
  • Target branch: wm/patches

Current Workflow State

  • main was synced from upstream/main.
  • New upstream commits are ready to be integrated into wm/patches.

Goal

Merge main into wm/patches to bring upstream changes into our patched branch.

Required Work

  1. Merge main into wm/patches.
  2. Resolve any merge conflicts.
  3. Ensure the branch is in a releasable state after conflict resolution.

Please assign this task to Copilot for conflict-resolution and integration support.</issue_description>

Comments on the Issue (you are Copilot in this section)

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

Raymond Hill (gorhill) and others added 2 commits February 22, 2026 16:58
@gorhill
[workflow] Update uBOLite MV3 package files for 2026.222.1657
1e612f1 
Files changed:
M	chromium/log.txt
M	chromium/manifest.json
M	chromium/rulesets/generic-details.json
M	chromium/rulesets/main/adguard-spyware-url.json
M	chromium/rulesets/main/annoyances-cookies.json
M	chromium/rulesets/main/annoyances-widgets.json
M	chromium/rulesets/main/chn-0.json
M	chromium/rulesets/main/deu-0.json
M	chromium/rulesets/main/dpollock-0.json
M	chromium/rulesets/main/easylist.json
M	chromium/rulesets/main/easyprivacy.json
M	chromium/rulesets/main/fra-0.json
M	chromium/rulesets/main/ind-0.json
M	chromium/rulesets/main/irn-0.json
M	chromium/rulesets/main/jpn-1.json
M	chromium/rulesets/main/nld-0.json
M	chromium/rulesets/main/nor-0.json
M	chromium/rulesets/main/pgl.json
M	chromium/rulesets/main/rus-0.json
M	chromium/rulesets/main/rus-1.json
M	chromium/rulesets/main/spa-1.json
M	chromium/rulesets/main/swe-1.json
M	chromium/rulesets/main/tur-0.json
M	chromium/rulesets/main/ublock-badware.json
M	chromium/rulesets/main/ublock-filters.json
M	chromium/rulesets/main/urlhaus-full.json
M	chromium/rulesets/main/vie-1.json
M	chromium/rulesets/regex/chn-0.json
M	chromium/rulesets/regex/ublock-badware.json
M	chromium/rulesets/regex/ublock-filters.json
M	chromium/rulesets/ruleset-details.json
M	chromium/rulesets/scripting/generic/annoyances-cookies.js
M	chromium/rulesets/scripting/generic/annoyances-social.js
M	chromium/rulesets/scripting/generic/easylist.js
M	chromium/rulesets/scripting/generic/fra-0.js
M	chromium/rulesets/scripting/generic/jpn-1.js
M	chromium/rulesets/scripting/generic/spa-1.js
M	chromium/rulesets/scripting/generic/tur-0.js
M	chromium/rulesets/scripting/generic/ublock-badware.js
A	chromium/rulesets/scripting/generic/ublock-experimental.js
M	chromium/rulesets/scripting/generic/ublock-filters.js
M	chromium/rulesets/scripting/generichigh/rus-0.css
M	chromium/rulesets/scripting/procedural/adguard-mobile.json
M	chromium/rulesets/scripting/procedural/annoyances-ai.json
M	chromium/rulesets/scripting/procedural/annoyances-overlays.json
M	chromium/rulesets/scripting/procedural/nor-0.json
M	chromium/rulesets/scripting/procedural/rus-0.json
M	chromium/rulesets/scripting/procedural/rus-1.json
M	chromium/rulesets/scripting/procedural/swe-1.json
M	chromium/rulesets/scripting/procedural/tur-0.json
A	chromium/rulesets/scripting/procedural/ublock-experimental.js
A	chromium/rulesets/scripting/procedural/ublock-experimental.json
M	chromium/rulesets/scripting/procedural/ublock-filters.json
M	chromium/rulesets/scripting/procedural/vie-1.json
M	chromium/rulesets/scripting/scriptlet/isolated/annoyances-cookies.js
M	chromium/rulesets/scripting/scriptlet/isolated/annoyances-overlays.js
M	chromium/rulesets/scripting/scriptlet/isolated/rus-0.js
A	chromium/rulesets/scripting/scriptlet/isolated/ublock-experimental.js
M	chromium/rulesets/scripting/scriptlet/isolated/ublock-filters.js
M	chromium/rulesets/scripting/scriptlet/main/adguard-mobile.js
M	chromium/rulesets/scripting/scriptlet/main/fra-0.js
M	chromium/rulesets/scripting/scriptlet/main/rus-0.js
M	chromium/rulesets/scripting/scriptlet/main/rus-1.js
M	chromium/rulesets/scripting/scriptlet/main/tur-0.js
M	chromium/rulesets/scripting/scriptlet/main/ublock-experimental.js
M	chromium/rulesets/scripting/scriptlet/main/ublock-filters.js
M	chromium/rulesets/scripting/scriptlet/main/vie-1.js
M	chromium/rulesets/scripting/specific/adguard-mobile.json
M	chromium/rulesets/scripting/specific/annoyances-ai.json
M	chromium/rulesets/scripting/specific/annoyances-cookies.json
M	chromium/rulesets/scripting/specific/annoyances-others.json
M	chromium/rulesets/scripting/specific/annoyances-overlays.json
M	chromium/rulesets/scripting/specific/annoyances-social.json
M	chromium/rulesets/scripting/specific/chn-0.json
M	chromium/rulesets/scripting/specific/deu-0.json
M	chromium/rulesets/scripting/specific/easylist.json
M	chromium/rulesets/scripting/specific/fra-0.json
M	chromium/rulesets/scripting/specific/grc-0.json
M	chromium/rulesets/scripting/specific/hun-0.json
M	chromium/rulesets/scripting/specific/ind-0.json
M	chromium/rulesets/scripting/specific/irn-0.json
M	chromium/rulesets/scripting/specific/isr-0.json
M	chromium/rulesets/scripting/specific/jpn-1.json
M	chromium/rulesets/scripting/specific/nld-0.json
M	chromium/rulesets/scripting/specific/pol-0.json
M	chromium/rulesets/scripting/specific/rus-0.json
M	chromium/rulesets/scripting/specific/spa-0.json
M	chromium/rulesets/scripting/specific/spa-1.json
M	chromium/rulesets/scripting/specific/swe-1.json
M	chromium/rulesets/scripting/specific/tur-0.json
A	chromium/rulesets/scripting/specific/ublock-experimental.js
A	chromium/rulesets/scripting/specific/ublock-experimental.json
M	chromium/rulesets/scripting/specific/ublock-filters.json
M	chromium/rulesets/scripting/specific/ukr-0.json
M	chromium/rulesets/scripting/specific/vie-1.json
M	chromium/rulesets/scriptlet-details.json
M	chromium/rulesets/strictblock/chn-0.json
M	chromium/rulesets/strictblock/dpollock-0.json
M	chromium/rulesets/strictblock/easylist.json
M	chromium/rulesets/strictblock/easyprivacy.json
M	chromium/rulesets/strictblock/pgl.json
M	chromium/rulesets/strictblock/ublock-badware.json
M	chromium/rulesets/strictblock/ublock-filters.json
M	chromium/rulesets/strictblock/urlhaus-full.json
M	chromium/rulesets/urlskip/ublock-filters.json
Initial plan
f427237
Merge main into wm/patches: integrate upstream 2026.222.1657
b28da2b 
- Update chromium filter lists to version 2026.222.1657
- Preserve wm/patches customizations:
  * update_url in chromium/manifest.json
  * Extended set of rulesets enabled by default
  * loadRulesetConfig commented out in chromium/js/background.js
- Update chromium/package.json version to 2026.222.1657
- Add ### 2026.222.1657 header in CHANGELOG.md
Copilot AI changed the title [WIP] Merge main into wm/patches with conflict resolution feat: integrate upstream uBOL 2026.222.1657 into wm/patches Feb 23, 2026
Copilot AI requested a review from gaelhelle-vp February 23, 2026 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gaelhelle-vp gaelhelle-vp Awaiting requested review from gaelhelle-vp

Assignees

@gaelhelle-vp gaelhelle-vp

Copilot code review Copilot

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Merge main into wm/patches (upstream sync + conflict resolution), ubol release 2026.222.1657

3 participants

@gaelhelle-vp @gorhill