From ada598c332d8c990a141d653e2521e794701148a Mon Sep 17 00:00:00 2001
From: jspenguin2017 <jspenguin2017@users.noreply.github.com>
Date: Sun, 28 Jul 2019 11:13:30 -0600
Subject: [PATCH] resync and publish

---
 patches/20_4_log_script_snippet_errors.patch      |  2 +-
 patches/90_0_temporary_migration.patch            |  4 ++--
 patches/integration/10_2_extended_resources.patch |  4 ++--
 patches/integration/10_4_extended_options.patch   |  4 ++--
 patches/integration/10_6_lint_filters.patch       | 10 +++++-----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/patches/20_4_log_script_snippet_errors.patch b/patches/20_4_log_script_snippet_errors.patch
index 33c2bf6..ecaeadc 100644
--- a/patches/20_4_log_script_snippet_errors.patch
+++ b/patches/20_4_log_script_snippet_errors.patch
@@ -1,5 +1,5 @@
 diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
-index 8859b465..fa93503c 100644
+index 2d57147d..625c81b5 100644
 --- a/src/js/scriptlet-filtering.js
 +++ b/src/js/scriptlet-filtering.js
 @@ -224,7 +224,9 @@
diff --git a/patches/90_0_temporary_migration.patch b/patches/90_0_temporary_migration.patch
index 15677ca..f3ff32a 100644
--- a/patches/90_0_temporary_migration.patch
+++ b/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 c5eab189..6c08209c 100644
+index bb480670..2c105e0e 100644
 --- a/src/js/redirect-engine.js
 +++ b/src/js/redirect-engine.js
-@@ -711,6 +711,7 @@ RedirectEngine.prototype.loadBuiltinResources = function() {
+@@ -699,6 +699,7 @@ RedirectEngine.prototype.loadBuiltinResources = function() {
  
      // TODO: remove once usage of uBO 1.20.4 is widespread.
      µBlock.assets.remove('ublock-resources');
diff --git a/patches/integration/10_2_extended_resources.patch b/patches/integration/10_2_extended_resources.patch
index 4bec00d..1365b95 100644
--- a/patches/integration/10_2_extended_resources.patch
+++ b/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 9368c812..024e2812 100644
+index b6c4b6e2..75f8b567 100644
 --- a/src/js/redirect-engine.js
 +++ b/src/js/redirect-engine.js
 @@ -168,6 +168,9 @@ const extToMimeMap = new Map([
@@ -13,7 +13,7 @@ index 9368c812..024e2812 100644
  
  const mimeFromName = function(name) {
 diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
-index b1cd5141..5b5d606f 100644
+index be98e80b..9568af74 100644
 --- a/src/js/scriptlet-filtering.js
 +++ b/src/js/scriptlet-filtering.js
 @@ -223,7 +223,7 @@
diff --git a/patches/integration/10_4_extended_options.patch b/patches/integration/10_4_extended_options.patch
index f0c8eb6..eab6998 100644
--- a/patches/integration/10_4_extended_options.patch
+++ b/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 024e2812..a1323a9b 100644
+index 75f8b567..9b070639 100644
 --- a/src/js/redirect-engine.js
 +++ b/src/js/redirect-engine.js
-@@ -502,6 +502,8 @@ RedirectEngine.prototype.supportedTypes = new Map([
+@@ -490,6 +490,8 @@ RedirectEngine.prototype.supportedTypes = new Map([
      [ 'subdocument', 'sub_frame' ],
      [ 'xhr', 'xmlhttprequest' ],
      [ 'xmlhttprequest', 'xmlhttprequest' ],
diff --git a/patches/integration/10_6_lint_filters.patch b/patches/integration/10_6_lint_filters.patch
index 3cc9a71..7bca402 100644
--- a/patches/integration/10_6_lint_filters.patch
+++ b/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 a1323a9b..c5eab189 100644
+index 9b070639..bb480670 100644
 --- a/src/js/redirect-engine.js
 +++ b/src/js/redirect-engine.js
-@@ -411,7 +411,13 @@ RedirectEngine.prototype.fromCompiledRule = function(line) {
+@@ -399,7 +399,13 @@ RedirectEngine.prototype.fromCompiledRule = function(line) {
  
  RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
      const matches = this.reFilterParser.exec(line);
@@ -94,7 +94,7 @@ index a1323a9b..c5eab189 100644
  
      const des = matches[1] || '';
  
-@@ -456,17 +462,26 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
+@@ -444,17 +450,26 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
          }
          // One and only one type must be specified.
          if ( this.supportedTypes.has(option) ) {
@@ -124,7 +124,7 @@ index a1323a9b..c5eab189 100644
  
      if ( deshn === '' ) {
          deshn = '*';
-@@ -479,10 +494,19 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
+@@ -467,10 +482,19 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
      const out = [];
      for ( const srchn of srchns ) {
          if ( srchn === '' ) { continue; }
@@ -146,7 +146,7 @@ index a1323a9b..c5eab189 100644
  };
  
 diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
-index 5b5d606f..8859b465 100644
+index 9568af74..2d57147d 100644
 --- a/src/js/scriptlet-filtering.js
 +++ b/src/js/scriptlet-filtering.js
 @@ -283,6 +283,8 @@