resync patches and bump ver

README.MD

@@ -4,7 +4,7 @@ Restarting fresh
 
 A patch driven fork of uBlock Origin.
 
-Upstream commit pin: `ac56aabd7cdf137c5db9e9737112fd6eb96f2511` or `1.22.0`
+Upstream commit pin: `ac7825c789ce8f8b3ffe8cfc34aa121df63c2d27` or `1.22.2`
 
 **Please submit issues to the
 [Nano Core issues tracker](https://github.com/NanoAdblocker/NanoCore/issues).**

patches/90_0_temporary_migration.patch

@@ -1,8 +1,8 @@
 diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
-index e94a033e..c695ca4b 100644
+index a289bfeb..70f326c4 100644
 --- a/src/js/redirect-engine.js
 +++ b/src/js/redirect-engine.js
-@@ -740,6 +740,7 @@ const removeTopCommentBlock = function(text) {
+@@ -728,6 +728,7 @@ const removeTopCommentBlock = function(text) {
  RedirectEngine.prototype.loadBuiltinResources = function() {
      // TODO: remove once usage of uBO 1.20.4 is widespread.
      µBlock.assets.remove('ublock-resources');

patches/integration/10_2_extended_resources.patch

@@ -1,5 +1,5 @@
 diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
-index 4825588a..c9b176fd 100644
+index fc40b388..16580dfb 100644
 --- a/src/js/redirect-engine.js
 +++ b/src/js/redirect-engine.js
 @@ -177,6 +177,9 @@ const typeToMimeMap = new Map([

patches/integration/10_4_extended_options.patch

@@ -1,8 +1,8 @@
 diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
-index c9b176fd..c5afd71c 100644
+index 16580dfb..cdcc195e 100644
 --- a/src/js/redirect-engine.js
 +++ b/src/js/redirect-engine.js
-@@ -554,6 +554,8 @@ RedirectEngine.prototype.supportedTypes = new Map([
+@@ -542,6 +542,8 @@ RedirectEngine.prototype.supportedTypes = new Map([
      [ 'subdocument', 'sub_frame' ],
      [ 'xhr', 'xmlhttprequest' ],
      [ 'xmlhttprequest', 'xmlhttprequest' ],

patches/integration/10_6_lint_filters.patch

@@ -76,10 +76,10 @@ index 58a23b14..d87ea24b 100644
              if ( parsed.exception ) {
                  kind |= 0b01;
 diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
-index c5afd71c..e94a033e 100644
+index cdcc195e..a289bfeb 100644
 --- a/src/js/redirect-engine.js
 +++ b/src/js/redirect-engine.js
-@@ -437,7 +437,13 @@ RedirectEngine.prototype.fromCompiledRule = function(line) {
+@@ -425,7 +425,13 @@ RedirectEngine.prototype.fromCompiledRule = function(line) {
 
  RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
      const matches = this.reFilterParser.exec(line);
@@ -94,7 +94,7 @@ index c5afd71c..e94a033e 100644
 
      const des = matches[1] || '';
 
-@@ -498,14 +504,20 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
+@@ -486,14 +492,20 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
          }
          // One and only one type must be specified.
          if ( this.supportedTypes.has(option) ) {
@@ -117,15 +117,15 @@ index c5afd71c..e94a033e 100644
 
      // Need one single type -- not negated.
      if ( type === undefined ) {
-@@ -514,6 +526,7 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
+@@ -502,6 +514,7 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
          } else if ( redirect === 'noopmp4-1s' ) {
              type = 'media';
          } else {
 +            nano.flintw('nano_r_no_supported_type');
              return;
          }
      }
-@@ -529,12 +542,19 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
+@@ -517,12 +530,19 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
      const out = [];
      for ( const srchn of srchns ) {
          if ( srchn === '' ) { continue; }

term/data.js

@@ -30,12 +30,12 @@ const assert = require("assert");
 
 // ----------------------------------------------------------------------------------------------------------------- //
 
-exports.version = "1.0.0.125";
+exports.version = "1.0.0.126";
 
 exports.based_on = [
     "uBlock Origin",
-    "Version/1.22.0",
-    "Commit/ac56aab",
+    "Version/1.22.2",
+    "Commit/ac7825c",
     "UserCSS/disabled",
 ].join(" ");