darkreader 4.9.44 → 4.9.52

package/README.md

@@ -1,5 +1,5 @@
 <p align="center"><a href="https://darkreader.org" target="_blank" rel="noreferrer noopener"><img width="250" alt="Dark Reader's mascot" src="https://raw.githubusercontent.com/darkreader/darkreader.github.io/master/images/darkreader-mascot.svg"></a></p>
-<p align="center">Dark Reader <strong>analyzes</strong> web pages and aims to <strong>reduce the eyestrain</strong> while browsing the web.</p>
+<p align="center">Dark Reader <strong>analyzes</strong> web pages and aims to <strong>reduce eyestrain</strong> while browsing the web.</p>
 <br/>
 <p align="center"><a rel="noreferrer noopener" href="https://chrome.google.com/webstore/detail/dark-reader/eimadpbcbfnmbkopoojfekhnkhdbieeh/"><img alt="Chrome Web Store" src="https://img.shields.io/badge/Chrome-141e24.svg?&style=for-the-badge&logo=google-chrome&logoColor=white"></a>  <a rel="noreferrer noopener" href="https://addons.mozilla.org/firefox/addon/darkreader/"><img alt="Firefox Add-ons" src="https://img.shields.io/badge/Firefox-141e24.svg?&style=for-the-badge&logo=firefox-browser&logoColor=white"></a>  <a rel="noreferrer noopener" href="https://darkreader.org/safari/"><img alt="Apple App Store" src="https://img.shields.io/badge/Safari-141e24.svg?&style=for-the-badge&logo=safari&logoColor=white"></a>  <a rel="noreferrer noopener" href="https://microsoftedge.microsoft.com/addons/detail/dark-reader/ifoakfbpdcdoeenechcleahebpibofpc/"><img alt="Edge Addons" src="https://img.shields.io/badge/Edge-141e24.svg?&style=for-the-badge&logo=microsoft-edge&logoColor=white"></a>  <a el="noreferrer noopener" href="https://addons.thunderbird.net/thunderbird/addon/darkreader"><img alt="Thunderbird" src="https://img.shields.io/badge/Thunderbird-141e24.svg?&style=for-the-badge&logo=thunderbird&logoColor=white"></a>
 
@@ -22,12 +22,12 @@ Read more about contributing to Dark Reader in [CONTRIBUTING.md](https://github.
 
 You can install the extension from a file.  
 Install [Node.js LTS](https://nodejs.org/en/). Download the source code (or check out from git).  
-Open terminal in the root folder and run:  
+Open the terminal in the root folder and run:
 
-- `npm install`  
-- `npm run build`  
+- `npm install`
+- `npm run build`
 
-This will generate a `build/release/darkreader-chrome.zip` file that is useable in a Chromium-based browser and also a `build/release/darkreader-firefox.xpi` file that is useable in Firefox.
+This will create a `build/release/darkreader-chrome.zip` file for use in a Chromium-based browser and a `build/release/darkreader-firefox.xpi` file for use in Firefox.
 
 ## Using Dark Reader for a website
 
@@ -90,14 +90,13 @@ const CSS = await collectCSS();
 const isEnabled = isDarkReaderEnabled();
 ```
 
-Be aware, that darkreader will add the `chrome` object onto the `window` object, these are to stub certain functions that
-the code will use. They originate from the webextension-api.
+Be aware that darkreader will add the `chrome` object onto the `window` object. These are to stub certain functions that the code will use. They originate from the webextension-api.
 
 ## Site fixes
 
-Automatically syncing the site fixes to every Dark Reader user was disabled because the GitHub team doesn't allow using GitHub as a CDN. Storing these files and making requests to other resources would be expensive and look suspicious. As such, changes are included with each new Dark Reader release.
+Automatically syncing the site fixes to every Dark Reader user was disabled because the GitHub team does not allow using GitHub as a CDN. The storage of these files would be expensive, and making requests to other resources would look suspicious. Each new release of Dark Reader will include these changes.
 
-However, this can be enabled by the following steps:
+However, this can be enabled using the following steps:
 
 - Click on the Dark Reader icon.
 - Click on the Dev tools button (in the bottom-right corner).
@@ -119,7 +118,7 @@ However, this can be enabled by the following steps:
 <p align="center"><a rel="noreferrer noopener" href="https://opencollective.com/darkreader#backers" target="_blank"><img src="https://opencollective.com/darkreader/backers.svg?width=890&limit=1000"></a></p>
 
 <h2 align="center">Sponsors</h2>
-<p>Does your company use Dark Reader? Ask your manager or the marketing team if your company would be interested in supporting our project. Your support will allow the maintainers to dedicate more time for maintenance and new features for everyone. Also, your company's logo will show on <a rel="noreferrer noopener" href="https://github.com/darkreader/darkreader#sponsors" target="_blank">GitHub</a>. Who doesn't want a little extra exposure? <a rel="noreferrer noopener" href="https://opencollective.com/darkreader" target="_blank">Here's the info</a>.</p>
+<p>Does your company use Dark Reader? Ask your manager or the marketing team if your company would be interested in supporting our project. Your support will allow the maintainers to dedicate more time to maintenance and creating new features for everyone. Also, your company's logo will show on <a rel="noreferrer noopener" href="https://github.com/darkreader/darkreader#sponsors" target="_blank">GitHub</a>. Who doesn't want a little extra exposure? <a rel="noreferrer noopener" href="https://opencollective.com/darkreader" target="_blank">Here's the info</a>.</p>
 
 <h3 align="center"><strong>Thank you to all our wonderful sponsors!</strong></h3>
 <br/>

package/darkreader.js

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.44
+ * Dark Reader v4.9.52
  * https://darkreader.org/
  */
 
@@ -114,14 +114,14 @@
 
     var MessageType = {
         UI_GET_DATA: 'ui-get-data',
-        UI_GET_ACTIVE_TAB_INFO: 'ui-get-active-tab-info',
         UI_SUBSCRIBE_TO_CHANGES: 'ui-subscribe-to-changes',
         UI_UNSUBSCRIBE_FROM_CHANGES: 'ui-unsubscribe-from-changes',
         UI_CHANGE_SETTINGS: 'ui-change-settings',
         UI_SET_THEME: 'ui-set-theme',
         UI_SET_SHORTCUT: 'ui-set-shortcut',
-        UI_TOGGLE_URL: 'ui-toggle-url',
+        UI_TOGGLE_ACTIVE_TAB: 'ui-toggle-active-tab',
         UI_MARK_NEWS_AS_READ: 'ui-mark-news-as-read',
+        UI_MARK_NEWS_AS_DISPLAYED: 'ui-mark-news-as-displayed',
         UI_LOAD_CONFIG: 'ui-load-config',
         UI_APPLY_DEV_DYNAMIC_THEME_FIXES: 'ui-apply-dev-dynamic-theme-fixes',
         UI_RESET_DEV_DYNAMIC_THEME_FIXES: 'ui-reset-dev-dynamic-theme-fixes',
@@ -150,6 +150,8 @@
         CS_FRAME_RESUME: 'cs-frame-resume',
         CS_EXPORT_CSS_RESPONSE: 'cs-export-css-response',
         CS_FETCH: 'cs-fetch',
+        CS_DARK_THEME_DETECTED: 'cs-dark-theme-detected',
+        CS_DARK_THEME_NOT_DETECTED: 'cs-dark-theme-not-detected',
     };
 
     var userAgent = typeof navigator === 'undefined' ? 'some useragent' : navigator.userAgent.toLowerCase();
@@ -191,7 +193,7 @@
         }
         var el = document.createElement('div');
         el.setAttribute('style', 'color-scheme: dark');
-        return el.style.colorScheme === 'dark';
+        return el.style && el.style.colorScheme === 'dark';
     })();
 
     function getOKResponse(url, mimeType, origin) {
@@ -413,6 +415,7 @@
         styleSystemControls: !isCSSColorSchemePropSupported,
         lightColorScheme: 'Default',
         darkColorScheme: 'Default',
+        immediateModify: false,
     };
 
     function isArrayLike(items) {
@@ -637,16 +640,22 @@
             }
         });
         for (var node = (root.shadowRoot ? walker.currentNode : walker.nextNode()); node != null; node = walker.nextNode()) {
+            if (node.classList.contains('surfingkeys_hints_host')) {
+                continue;
+            }
             iterator(node);
             iterateShadowHosts(node.shadowRoot, iterator);
         }
     }
-    function isDOMReady() {
+    var isDOMReady = function () {
         return document.readyState === 'complete' || document.readyState === 'interactive';
+    };
+    function setIsDOMReady(newFunc) {
+        isDOMReady = newFunc;
     }
     var readyStateListeners = new Set();
     function addDOMReadyListener(listener) {
-        readyStateListeners.add(listener);
+        isDOMReady() ? listener() : readyStateListeners.add(listener);
     }
     function removeDOMReadyListener(listener) {
         readyStateListeners.delete(listener);
@@ -656,7 +665,7 @@
     }
     var readyStateCompleteListeners = new Set();
     function addReadyStateCompleteListener(listener) {
-        readyStateCompleteListeners.add(listener);
+        isReadyStateComplete() ? listener() : readyStateCompleteListeners.add(listener);
     }
     function cleanReadyStateCompleteListeners() {
         readyStateCompleteListeners.clear();
@@ -917,9 +926,9 @@
         }
     }
     var cssURLRegex = /url\((('.+?')|(".+?")|([^\)]*?))\)/g;
-    var cssImportRegex = /@import\s*(url\()?(('.+?')|(".+?")|([^\)]*?))\)? ?(screen)?;?/g;
+    var cssImportRegex = /@import\s*(url\()?(('.+?')|(".+?")|([^\)]*?))\)? ?(screen)?;?/gi;
     function getCSSURLValue(cssURL) {
-        return cssURL.replace(/^url\((.*)\)$/, '$1').trim().replace(/^"(.*)"$/, '$1').replace(/^'(.*)'$/, '$1');
+        return cssURL.trim().replace(/^url\((.*)\)$/, '$1').trim().replace(/^"(.*)"$/, '$1').replace(/^'(.*)'$/, '$1').replace(/(?:\\(.))/g, '$1');
     }
     function getCSSBaseBath(url) {
         var cssURL = parseURL(url);
@@ -946,6 +955,159 @@
         return $css.replace(fontFaceRegex, '');
     }
 
+    function evalMath(expression) {
+        var rpnStack = [];
+        var workingStack = [];
+        var lastToken;
+        for (var i = 0, len = expression.length; i < len; i++) {
+            var token = expression[i];
+            if (!token || token === ' ') {
+                continue;
+            }
+            if (operators.has(token)) {
+                var op = operators.get(token);
+                while (workingStack.length) {
+                    var currentOp = operators.get(workingStack[0]);
+                    if (!currentOp) {
+                        break;
+                    }
+                    if (op.lessOrEqualThan(currentOp)) {
+                        rpnStack.push(workingStack.shift());
+                    }
+                    else {
+                        break;
+                    }
+                }
+                workingStack.unshift(token);
+            }
+            else if (!lastToken || operators.has(lastToken)) {
+                rpnStack.push(token);
+            }
+            else {
+                rpnStack[rpnStack.length - 1] += token;
+            }
+            lastToken = token;
+        }
+        rpnStack.push.apply(rpnStack, __spreadArray([], __read(workingStack), false));
+        var stack = [];
+        for (var i = 0, len = rpnStack.length; i < len; i++) {
+            var op = operators.get(rpnStack[i]);
+            if (op) {
+                var args = stack.splice(0, 2);
+                stack.push(op.exec(args[1], args[0]));
+            }
+            else {
+                stack.unshift(parseFloat(rpnStack[i]));
+            }
+        }
+        return stack[0];
+    }
+    var Operator = (function () {
+        function Operator(precedence, method) {
+            this.precendce = precedence;
+            this.execMethod = method;
+        }
+        Operator.prototype.exec = function (left, right) {
+            return this.execMethod(left, right);
+        };
+        Operator.prototype.lessOrEqualThan = function (op) {
+            return this.precendce <= op.precendce;
+        };
+        return Operator;
+    }());
+    var operators = new Map([
+        ['+', new Operator(1, function (left, right) { return left + right; })],
+        ['-', new Operator(1, function (left, right) { return left - right; })],
+        ['*', new Operator(2, function (left, right) { return left * right; })],
+        ['/', new Operator(2, function (left, right) { return left / right; })],
+    ]);
+
+    function getMatches(regex, input, group) {
+        if (group === void 0) { group = 0; }
+        var matches = [];
+        var m;
+        while ((m = regex.exec(input))) {
+            matches.push(m[group]);
+        }
+        return matches;
+    }
+    function formatCSS(text) {
+        function trimLeft(text) {
+            return text.replace(/^\s+/, '');
+        }
+        function getIndent(depth) {
+            if (depth === 0) {
+                return '';
+            }
+            return ' '.repeat(4 * depth);
+        }
+        if (text.length < 50000) {
+            var emptyRuleRegexp = /[^{}]+{\s*}/;
+            while (emptyRuleRegexp.test(text)) {
+                text = text.replace(emptyRuleRegexp, '');
+            }
+        }
+        var css = (text
+            .replace(/\s{2,}/g, ' ')
+            .replace(/\{/g, '{\n')
+            .replace(/\}/g, '\n}\n')
+            .replace(/\;(?![^\(|\"]*(\)|\"))/g, ';\n')
+            .replace(/\,(?![^\(|\"]*(\)|\"))/g, ',\n')
+            .replace(/\n\s*\n/g, '\n')
+            .split('\n'));
+        var depth = 0;
+        var formatted = [];
+        for (var x = 0, len = css.length; x < len; x++) {
+            var line = "".concat(css[x], "\n");
+            if (line.includes('{')) {
+                formatted.push(getIndent(depth++) + trimLeft(line));
+            }
+            else if (line.includes('\}')) {
+                formatted.push(getIndent(--depth) + trimLeft(line));
+            }
+            else {
+                formatted.push(getIndent(depth) + trimLeft(line));
+            }
+        }
+        return formatted.join('').trim();
+    }
+    function getParenthesesRange(input, searchStartIndex) {
+        if (searchStartIndex === void 0) { searchStartIndex = 0; }
+        var length = input.length;
+        var depth = 0;
+        var firstOpenIndex = -1;
+        for (var i = searchStartIndex; i < length; i++) {
+            if (depth === 0) {
+                var openIndex = input.indexOf('(', i);
+                if (openIndex < 0) {
+                    break;
+                }
+                firstOpenIndex = openIndex;
+                depth++;
+                i = openIndex;
+            }
+            else {
+                var closingIndex = input.indexOf(')', i);
+                if (closingIndex < 0) {
+                    break;
+                }
+                var openIndex = input.indexOf('(', i);
+                if (openIndex < 0 || closingIndex < openIndex) {
+                    depth--;
+                    if (depth === 0) {
+                        return { start: firstOpenIndex, end: closingIndex + 1 };
+                    }
+                    i = closingIndex;
+                }
+                else {
+                    depth++;
+                    i = openIndex;
+                }
+            }
+        }
+        return null;
+    }
+
     function hslToRGB(_a) {
         var h = _a.h, s = _a.s, l = _a.l, _b = _a.a, a = _b === void 0 ? 1 : _b;
         if (s === 0) {
@@ -1142,69 +1304,21 @@
             a: 1
         };
     }
-    var isCharDigit = function (char) { return char >= '0' && char <= '9'; };
-    var getAmountOfDigits = function (number) { return Math.floor(Math.log10(number)) + 1; };
     function lowerCalcExpression(color) {
         var searchIndex = 0;
         var replaceBetweenIndices = function (start, end, replacement) {
             color = color.substring(0, start) + replacement + color.substring(end);
         };
-        var getNumber = function () {
-            var resultNumber = 0;
-            for (var i = 1; i < 4; i++) {
-                var char = color[searchIndex + i];
-                if (char === ' ') {
-                    break;
-                }
-                if (isCharDigit(char)) {
-                    resultNumber *= 10;
-                    resultNumber += Number(char);
-                }
-                else {
-                    break;
-                }
-            }
-            var lenDigits = getAmountOfDigits(resultNumber);
-            searchIndex += lenDigits;
-            var possibleType = color[searchIndex + 1];
-            if (possibleType !== '%') {
-                return;
-            }
-            searchIndex++;
-            return resultNumber;
-        };
-        while ((searchIndex = color.indexOf('calc(')) !== 0) {
-            var startIndex = searchIndex;
-            searchIndex += 4;
-            var firstNumber = getNumber();
-            if (!firstNumber) {
-                break;
-            }
-            if (color[searchIndex + 1] !== ' ') {
-                break;
-            }
-            searchIndex++;
-            var operation = color[searchIndex + 1];
-            if (operation !== '+' && operation !== '-') {
-                break;
-            }
-            searchIndex++;
-            if (color[searchIndex + 1] !== ' ') {
-                break;
-            }
-            searchIndex++;
-            var secondNumber = getNumber();
-            if (!secondNumber) {
+        while ((searchIndex = color.indexOf('calc(')) !== -1) {
+            var range = getParenthesesRange(color, searchIndex);
+            if (!range) {
                 break;
             }
-            var replacement = void 0;
-            if (operation === '+') {
-                replacement = "".concat(firstNumber + secondNumber, "%");
-            }
-            else {
-                replacement = "".concat(firstNumber - secondNumber, "%");
-            }
-            replaceBetweenIndices(startIndex, searchIndex + 2, replacement);
+            var slice = color.slice(range.start + 1, range.end - 1);
+            var includesPercentage = slice.includes('%');
+            slice = slice.split('%').join('');
+            var output = Math.round(evalMath(slice));
+            replaceBetweenIndices(range.start - 4, range.end, output + (includesPercentage ? '%' : ''));
         }
         return color;
     }
@@ -1392,6 +1506,9 @@
         var _b = __read(_a, 2), key = _b[0], value = _b[1];
         return [key.toLowerCase(), value];
     }));
+    function getSRGBLightness(r, g, b) {
+        return (0.2126 * r + 0.7152 * g + 0.0722 * b) / 255;
+    }
 
     function scale(x, inLow, inHigh, outLow, outHigh) {
         return (x - inLow) * (outHigh - outLow) / (inHigh - inLow) + outLow;
@@ -1414,92 +1531,6 @@
         return result;
     }
 
-    function getMatches(regex, input, group) {
-        if (group === void 0) { group = 0; }
-        var matches = [];
-        var m;
-        while ((m = regex.exec(input))) {
-            matches.push(m[group]);
-        }
-        return matches;
-    }
-    function formatCSS(text) {
-        function trimLeft(text) {
-            return text.replace(/^\s+/, '');
-        }
-        function getIndent(depth) {
-            if (depth === 0) {
-                return '';
-            }
-            return ' '.repeat(4 * depth);
-        }
-        if (text.length < 50000) {
-            var emptyRuleRegexp = /[^{}]+{\s*}/;
-            while (emptyRuleRegexp.test(text)) {
-                text = text.replace(emptyRuleRegexp, '');
-            }
-        }
-        var css = (text
-            .replace(/\s{2,}/g, ' ')
-            .replace(/\{/g, '{\n')
-            .replace(/\}/g, '\n}\n')
-            .replace(/\;(?![^\(|\"]*(\)|\"))/g, ';\n')
-            .replace(/\,(?![^\(|\"]*(\)|\"))/g, ',\n')
-            .replace(/\n\s*\n/g, '\n')
-            .split('\n'));
-        var depth = 0;
-        var formatted = [];
-        for (var x = 0, len = css.length; x < len; x++) {
-            var line = "".concat(css[x], "\n");
-            if (line.includes('{')) {
-                formatted.push(getIndent(depth++) + trimLeft(line));
-            }
-            else if (line.includes('\}')) {
-                formatted.push(getIndent(--depth) + trimLeft(line));
-            }
-            else {
-                formatted.push(getIndent(depth) + trimLeft(line));
-            }
-        }
-        return formatted.join('').trim();
-    }
-    function getParenthesesRange(input, searchStartIndex) {
-        if (searchStartIndex === void 0) { searchStartIndex = 0; }
-        var length = input.length;
-        var depth = 0;
-        var firstOpenIndex = -1;
-        for (var i = searchStartIndex; i < length; i++) {
-            if (depth === 0) {
-                var openIndex = input.indexOf('(', i);
-                if (openIndex < 0) {
-                    break;
-                }
-                firstOpenIndex = openIndex;
-                depth++;
-                i = openIndex;
-            }
-            else {
-                var closingIndex = input.indexOf(')', i);
-                if (closingIndex < 0) {
-                    break;
-                }
-                var openIndex = input.indexOf('(', i);
-                if (openIndex < 0 || closingIndex < openIndex) {
-                    depth--;
-                    if (depth === 0) {
-                        return { start: firstOpenIndex, end: closingIndex + 1 };
-                    }
-                    i = closingIndex;
-                }
-                else {
-                    depth++;
-                    i = openIndex;
-                }
-            }
-        }
-        return null;
-    }
-
     function createFilterMatrix(config) {
         var m = Matrix.identity();
         if (config.sepia !== 0) {
@@ -1715,6 +1746,9 @@
                 hx = scale(h, 60, 120, 60, 105);
             }
         }
+        if (hx > 40 && hx < 80) {
+            lx *= 0.75;
+        }
         return { h: hx, s: s, l: lx, a: a };
     }
     function modifyBackgroundColor(rgb, theme) {
@@ -2050,15 +2084,15 @@
         for (y = 0; y < height; y++) {
             for (x = 0; x < width; x++) {
                 i = 4 * (y * width + x);
-                r = d[i + 0] / 255;
-                g = d[i + 1] / 255;
-                b = d[i + 2] / 255;
-                a = d[i + 3] / 255;
-                if (a < TRANSPARENT_ALPHA_THRESHOLD) {
+                r = d[i + 0];
+                g = d[i + 1];
+                b = d[i + 2];
+                a = d[i + 3];
+                if (a / 255 < TRANSPARENT_ALPHA_THRESHOLD) {
                     transparentPixelsCount++;
                 }
                 else {
-                    l = 0.2126 * r + 0.7152 * g + 0.0722 * b;
+                    l = getSRGBLightness(r, g, b);
                     if (l < DARK_LIGHTNESS_THRESHOLD) {
                         darkPixelsCount++;
                     }
@@ -2117,11 +2151,13 @@
                 if (index - possibleType.length >= 0) {
                     var possibleGradient = value.substring(index - possibleType.length, index);
                     if (possibleGradient === possibleType) {
-                        if (index - possibleType.length - 1 >= 9) {
-                            if (value[index - possibleType.length - 1] === '-') {
-                                typeGradient = "repeating-".concat(possibleType, "gradient");
-                                return true;
-                            }
+                        if (value.slice(index - possibleType.length - 10, index - possibleType.length - 1) === 'repeating') {
+                            typeGradient = "repeating-".concat(possibleType, "gradient");
+                            return true;
+                        }
+                        if (value.slice(index - possibleType.length - 8, index - possibleType.length - 1) === '-webkit') {
+                            typeGradient = "-webkit-".concat(possibleType, "gradient");
+                            return true;
                         }
                         typeGradient = "".concat(possibleType, "gradient");
                         return true;
@@ -2132,11 +2168,13 @@
                 return "break";
             }
             var _a = getParenthesesRange(value, index + gradientLength), start = _a.start, end = _a.end;
-            var content = value.substring(start + 1, end - 1);
+            var match = value.substring(start + 1, end - 1);
             startIndex = end + 1 + conicGradientLength;
             result.push({
-                type: typeGradient,
-                content: content,
+                typeGradient: typeGradient,
+                match: match,
+                offset: typeGradient.length + 2,
+                index: index - typeGradient.length + gradientLength,
                 hasComma: true,
             });
         };
@@ -2329,7 +2367,7 @@
     function getModifiedFallbackStyle(filter, _a) {
         var strict = _a.strict;
         var lines = [];
-        var isMicrosoft = location.hostname.endsWith('microsoft.com');
+        var isMicrosoft = ['microsoft.com', 'docs.microsoft.com'].includes(location.hostname);
         lines.push("html, body, ".concat(strict ? "body :not(iframe)".concat(isMicrosoft ? ':not(div[style^="position:absolute;top:0;left:-"]' : '') : 'body > :not(iframe)', " {"));
         lines.push("    background-color: ".concat(modifyBackgroundColor({ r: 255, g: 255, b: 255 }, filter), " !important;"));
         lines.push("    border-color: ".concat(modifyBorderColor({ r: 64, g: 64, b: 64 }, filter), " !important;"));
@@ -2424,15 +2462,14 @@
                     return { match: match, index: valueIndex };
                 });
             };
-            var matches_1 = getIndices(urls).map(function (i) { return ({ type: 'url', urlInfo: i }); })
-                .concat(gradients.map(function (i) { return ({ type: 'gradient', gradientInfo: i }); }));
+            var matches_1 = gradients.map(function (i) { return (__assign({ type: 'gradient' }, i)); })
+                .concat(getIndices(urls).map(function (i) { return (__assign({ type: 'url', offset: 0 }, i)); }))
+                .sort(function (a, b) { return a.index > b.index ? 1 : -1; });
             var getGradientModifier_1 = function (gradient) {
-                var type = gradient.type;
-                var content = gradient.content;
-                var hasComma = gradient.hasComma;
+                var typeGradient = gradient.typeGradient, match = gradient.match, hasComma = gradient.hasComma;
                 var partsRegex = /([^\(\),]+(\([^\(\)]*(\([^\(\)]*\)*[^\(\)]*)?\))?[^\(\),]*),?/g;
                 var colorStopRegex = /^(from|color-stop|to)\(([^\(\)]*?,\s*)?(.*?)\)$/;
-                var parts = getMatches(partsRegex, content, 1).map(function (part) {
+                var parts = getMatches(partsRegex, match, 1).map(function (part) {
                     part = part.trim();
                     var rgb = tryParseColor(part);
                     if (rgb) {
@@ -2453,7 +2490,7 @@
                     return function () { return part; };
                 });
                 return function (filter) {
-                    return "".concat(type, "(").concat(parts.map(function (modify) { return modify(filter); }).join(', '), ")").concat(hasComma ? ', ' : '');
+                    return "".concat(typeGradient, "(").concat(parts.map(function (modify) { return modify(filter); }).join(', '), ")").concat(hasComma ? ', ' : '');
                 };
             };
             var getURLModifier_1 = function (urlValue) {
@@ -2548,31 +2585,29 @@
                 return result;
             };
             var modifiers_1 = [];
-            var index_1 = 0;
+            var matchIndex_1 = 0;
             matches_1.forEach(function (_a, i) {
-                var type = _a.type, urlInfo = _a.urlInfo, gradientInfo = _a.gradientInfo;
+                var type = _a.type, match = _a.match, index = _a.index, typeGradient = _a.typeGradient, hasComma = _a.hasComma, offset = _a.offset;
+                var matchStart = index;
+                var prefixStart = matchIndex_1;
+                var matchEnd = matchStart + match.length + offset;
+                matchIndex_1 = matchEnd;
+                prefixStart !== matchStart && modifiers_1.push(function () { return value.substring(prefixStart, matchStart); });
                 if (type === 'url') {
-                    var match = urlInfo.match;
-                    var matchStart_1 = urlInfo.index;
-                    var prefixStart_1 = index_1;
-                    var matchEnd_1 = matchStart_1 + match.length;
-                    index_1 = matchEnd_1;
-                    modifiers_1.push(function () { return value.substring(prefixStart_1, matchStart_1); });
                     modifiers_1.push(getURLModifier_1(match));
-                    if (i === matches_1.length - 1) {
-                        modifiers_1.push(function () { return value.substring(matchEnd_1); });
-                    }
                 }
                 else if (type === 'gradient') {
-                    modifiers_1.push(getGradientModifier_1(gradientInfo));
+                    modifiers_1.push(getGradientModifier_1({ match: match, index: index, typeGradient: typeGradient, hasComma: hasComma, offset: offset }));
+                }
+                if (i === matches_1.length - 1) {
+                    modifiers_1.push(function () { return value.substring(matchEnd); });
                 }
             });
             return function (filter) {
                 var results = modifiers_1.filter(Boolean).map(function (modify) { return modify(filter); });
                 if (results.some(function (r) { return r instanceof Promise; })) {
-                    return Promise.all(results)
-                        .then(function (asyncResults) {
-                        return asyncResults.join('');
+                    return Promise.all(results).then(function (asyncResults) {
+                        return asyncResults.filter(Boolean).join('');
                     });
                 }
                 return results.join('');
@@ -2585,14 +2620,14 @@
     }
     function getShadowModifierWithInfo(value) {
         try {
-            var index_2 = 0;
+            var index_1 = 0;
             var colorMatches_1 = getMatches(/(^|\s)(?!calc)([a-z]+\(.+?\)|#[0-9a-f]+|[a-z]+)(.*?(inset|outset)?($|,))/ig, value, 2);
             var notParsed_1 = 0;
             var modifiers_2 = colorMatches_1.map(function (match, i) {
-                var prefixIndex = index_2;
-                var matchIndex = value.indexOf(match, index_2);
+                var prefixIndex = index_1;
+                var matchIndex = value.indexOf(match, index_1);
                 var matchEnd = matchIndex + match.length;
-                index_2 = matchEnd;
+                index_1 = matchEnd;
                 var rgb = tryParseColor(match);
                 if (!rgb) {
                     notParsed_1++;
@@ -3191,7 +3226,7 @@
             splitted.forEach(function (number) {
                 resultInRGB_1 += "".concat(number.trim(), ", ");
             });
-            resultInRGB_1 = resultInRGB_1.substr(0, resultInRGB_1.length - 2);
+            resultInRGB_1 = resultInRGB_1.substring(0, resultInRGB_1.length - 2);
             resultInRGB_1 += ')';
             return { isRaw: true, color: resultInRGB_1 };
         }
@@ -3877,6 +3912,19 @@
     }
 
     var STYLE_SELECTOR = 'style, link[rel*="stylesheet" i]:not([disabled])';
+    function isFontsGoogleApiStyle(element) {
+        if (!element.href) {
+            return false;
+        }
+        try {
+            var elementURL = new URL(element.href);
+            return elementURL.hostname === 'fonts.googleapis.com';
+        }
+        catch (err) {
+            logInfo("Couldn't construct ".concat(element.href, " as URL"));
+            return false;
+        }
+    }
     function shouldManageStyle(element) {
         return (((element instanceof HTMLStyleElement) ||
             (element instanceof SVGStyleElement) ||
@@ -3884,7 +3932,8 @@
                 element.rel &&
                 element.rel.toLowerCase().includes('stylesheet') &&
                 !element.disabled &&
-                (isFirefox ? !element.href.startsWith('moz-extension://') : true))) &&
+                (isFirefox ? !element.href.startsWith('moz-extension://') : true) &&
+                !isFontsGoogleApiStyle(element))) &&
             !element.classList.contains('darkreader') &&
             element.media.toLowerCase() !== 'print' &&
             !element.classList.contains('stylus'));
@@ -4129,15 +4178,6 @@
             }
             cancelAsyncOperations = false;
             function removeCSSRulesFromSheet(sheet) {
-                try {
-                    if (sheet.replaceSync) {
-                        sheet.replaceSync('');
-                        return;
-                    }
-                }
-                catch (err) {
-                    logWarn('Could not use fastpath for removing rules from stylesheet', err);
-                }
                 for (var i = sheet.cssRules.length - 1; i >= 0; i--) {
                     sheet.deleteRule(i);
                 }
@@ -4759,7 +4799,18 @@
         var removeRuleDescriptor = Object.getOwnPropertyDescriptor(CSSStyleSheet.prototype, 'removeRule');
         var documentStyleSheetsDescriptor = enableStyleSheetsProxy ?
             Object.getOwnPropertyDescriptor(Document.prototype, 'styleSheets') : null;
-        var shouldWrapHTMLElement = location.hostname.endsWith('baidu.com');
+        var shouldWrapHTMLElement = [
+            'baidu.com',
+            'baike.baidu.com',
+            'ditu.baidu.com',
+            'map.baidu.com',
+            'maps.baidu.com',
+            'haokan.baidu.com',
+            'pan.baidu.com',
+            'passport.baidu.com',
+            'tieba.baidu.com',
+            'www.baidu.com'
+        ].includes(location.hostname);
         var getElementsByTagNameDescriptor = shouldWrapHTMLElement ?
             Object.getOwnPropertyDescriptor(Element.prototype, 'getElementsByTagName') : null;
         var cleanUp = function () {
@@ -4814,9 +4865,13 @@
             var _this = this;
             var getCurrentValue = function () {
                 var docSheets = documentStyleSheetsDescriptor.get.call(_this);
-                return Object.setPrototypeOf(__spreadArray([], __read(docSheets), false).filter(function (styleSheet) {
+                var filteredSheets = __spreadArray([], __read(docSheets), false).filter(function (styleSheet) {
                     return !styleSheet.ownerNode.classList.contains('darkreader');
-                }), StyleSheetList.prototype);
+                });
+                filteredSheets.item = function (item) {
+                    return filteredSheets[item];
+                };
+                return Object.setPrototypeOf(filteredSheets, StyleSheetList.prototype);
             };
             var elements = getCurrentValue();
             var styleSheetListBehavior = {
@@ -4841,7 +4896,7 @@
             var elements = getCurrentElementValue();
             var nodeListBehavior = {
                 get: function (_, property) {
-                    return getCurrentElementValue()[Number(property)];
+                    return getCurrentElementValue()[Number(property) || property];
                 }
             };
             elements = new Proxy(elements, nodeListBehavior);
@@ -4917,20 +4972,16 @@
         document.head.insertBefore(textStyle, fallbackStyle.nextSibling);
         setupNodePositionWatcher(textStyle, 'text');
         var invertStyle = createOrUpdateStyle('darkreader--invert');
-        var invertStyleContent = '';
         if (fixes && Array.isArray(fixes.invert) && fixes.invert.length > 0) {
-            invertStyleContent += [
+            invertStyle.textContent = [
                 "".concat(fixes.invert.join(', '), " {"),
                 "    filter: ".concat(getCSSFilterValue(__assign(__assign({}, filter), { contrast: filter.mode === 0 ? filter.contrast : clamp(filter.contrast - 10, 0, 100) })), " !important;"),
                 '}',
-                '',
             ].join('\n');
         }
-        var imageFilter = getCSSFilterValue(__assign(__assign({}, filter), { mode: FilterMode.light }));
-        if (imageFilter) {
-            invertStyleContent += "img { filter: ".concat(imageFilter, " !important;\n");
+        else {
+            invertStyle.textContent = '';
         }
-        invertStyle.textContent = invertStyleContent;
         document.head.insertBefore(invertStyle, textStyle.nextSibling);
         setupNodePositionWatcher(invertStyle, 'invert');
         var inlineStyle = createOrUpdateStyle('darkreader--inline');
@@ -5119,7 +5170,7 @@
             createDynamicStyleOverrides();
             watchForUpdates();
         }
-        if (document.hidden) {
+        if (document.hidden && !filter.immediateModify) {
             watchForDocumentVisibility(runDynamicStyle);
         }
         else {
@@ -5128,13 +5179,18 @@
         changeMetaThemeColorWhenAvailable(filter);
     }
     function handleAdoptedStyleSheets(node) {
-        if (Array.isArray(node.adoptedStyleSheets)) {
-            if (node.adoptedStyleSheets.length > 0) {
-                var newManger = createAdoptedStyleSheetOverride(node);
-                adoptedStyleManagers.push(newManger);
-                newManger.render(filter, ignoredImageAnalysisSelectors);
+        try {
+            if (Array.isArray(node.adoptedStyleSheets)) {
+                if (node.adoptedStyleSheets.length > 0) {
+                    var newManger = createAdoptedStyleSheetOverride(node);
+                    adoptedStyleManagers.push(newManger);
+                    newManger.render(filter, ignoredImageAnalysisSelectors);
+                }
             }
         }
+        catch (err) {
+            logWarn('Error occured in handleAdoptedStyleSheets: ', err);
+        }
     }
     function watchForUpdates() {
         var managedStyles = Array.from(styleManagers.keys());
@@ -5217,6 +5273,11 @@
             ignoredImageAnalysisSelectors = [];
             ignoredInlineSelectors = [];
         }
+        if (filter.immediateModify) {
+            setIsDOMReady(function () {
+                return true;
+            });
+        }
         isIFrame$1 = iframe;
         if (document.head) {
             if (isAnotherDarkReaderInstanceActive()) {

package/package.json

@@ -1,29 +1,33 @@
 {
   "name": "darkreader",
-  "version": "4.9.44",
+  "version": "4.9.52",
   "description": "Dark mode for every website",
   "scripts": {
     "api": "node tasks/build.js --api",
     "benchmark-server": "node tests/benchmark-server/index.js",
     "build": "node tasks/build.js --release",
-    "code-style": "eslint --ignore-pattern \"!.eslintplugin.js\" --cache --fix \"src/**/*.ts\" \"src/**/*.tsx\" \"tasks/**/*.js\" \"tests/[!coverage]**/*.js\" \"tests/**/*.ts\" \".eslintrc.js\" \"index.d.ts\" \".eslintplugin.js\"",
+    "build:all": "node tasks/build.js --debug --release --api",
+    "code-style": "eslint --ignore-pattern '!.eslintplugin.js' --cache --fix -- 'src/**/*.ts' 'src/**/*.tsx' 'tasks/**/*.js' 'tests/[!coverage]**/*.js' 'tests/**/*.ts' '.eslintrc.js' 'index.d.ts' '.eslintplugin.js'",
     "debug": "node tasks/build.js --debug",
     "debug:watch": "node tasks/build.js --debug --watch",
-    "lint": "eslint --ignore-pattern \"!.eslintplugin.js\" \"src/**/*.ts\" \"src/**/*.tsx\" \"tasks/**/*.js\" \"tests/**/*.ts\" \"tests/[!coverage]**/*.js\" \"index.d.ts\" \".eslintplugin.js\"",
+    "lint": "eslint --ignore-pattern '!.eslintplugin.js' -- 'src/**/*.ts' 'src/**/*.tsx' 'tasks/**/*.js' 'tests/**/*.ts' 'tests/[!coverage]**/*.js' 'index.d.ts' '.eslintplugin.js'",
+    "lint:bundle": "(node ./tasks/check-exists.js ./build/debug/chrome || node tasks/build.js --debug --api) && eslint -- 'build/debug/chrome/**/*.js' 'darkreader.js'",
     "prepublishOnly": "npm test && npm run api",
     "release": "npm test && npm run lint && node tasks/build.js --release",
-    "test": "jest --config=tests/jest.config.js",
-    "test:browser": "npm run debug && jest --config=tests/browser/jest.config.js --runInBand",
-    "test:chrome": "npm run debug && jest --config=tests/browser/jest.config.chrome.js --runInBand",
-    "test:ci": "jest --config=tests/jest.config.js --runInBand",
-    "test:config": "jest --config=tests/config/jest.config.js",
-    "test:config:debug": "node --inspect-brk ./node_modules/jest/bin/jest --config=tests/config/jest.config.js --runInBand --no-cache --watch",
-    "test:coverage": "jest --config=tests/jest.config.js --coverage",
-    "test:firefox": "npm run debug && jest --config=tests/browser/jest.config.firefox.js --runInBand",
-    "test:inject": "node tests/inject/run.js",
-    "test:inject:debug": "node tests/inject/run.js --debug",
-    "test:utils": "jest --config=tests/utils/jest.config.js",
-    "test:utils:debug": "node --inspect-brk ./node_modules/jest/bin/jest --config=tests/utils/jest.config.js --runInBand --no-cache --watch"
+    "test": "npm run test:unit",
+    "test:all": "npm run test:unit; npm run test:browser; npm run test:inject; npm run test:project",
+    "test:browser": "npm run debug && npm run test:chrome && npm run test:firefox",
+    "test:chrome": "npm run debug && jest --config=tests/browser/jest.config.js --runInBand",
+    "test:ci": "npm run test:unit",
+    "test:coverage": "jest --config=tests/unit/jest.config.js --coverage",
+    "test:firefox": " npm run debug && jest --config=tests/browser/jest.config.firefox.js --runInBand",
+    "test:inject": "node --max-old-space-size=3072 node_modules/.bin/karma start ./tests/inject/karma.conf.js",
+    "test:inject:debug": "node --max-old-space-size=3072 node_modules/.bin/karma start ./tests/inject/karma.conf.js --debug",
+    "test:project": "jest --config=tests/project/jest.config.js",
+    "test:unit": "jest --config=tests/unit/jest.config.js",
+    "test:unit:debug": "node --inspect-brk ./node_modules/jest/bin/jest --config=tests/unit/jest.config.js --runInBand --no-cache --watch",
+    "test:update-snapshots": "npm run test -- --updateSnapshot && npm run test:project -- --updateSnapshot",
+    "translate-line": "node ./tasks/translate.js --line"
   },
   "main": "darkreader.js",
   "repository": {
@@ -44,20 +48,6 @@
     "accessibility",
     "eye-care"
   ],
-  "browserslist": [
-    "supports es5",
-    "not ie > 0",
-    "not ie_mob > 0",
-    "not op_mini all",
-    "not op_mob < 59",
-    "not android < 50",
-    "not ios_saf < 6",
-    "not safari < 9.3",
-    "not opera < 36",
-    "not chrome < 49",
-    "not firefox < 33",
-    "not edge <= 18"
-  ],
   "homepage": "https://darkreader.org/",
   "funding": {
     "type": "opencollective",
@@ -65,42 +55,48 @@
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "13.1.3",
-    "@rollup/plugin-replace": "3.0.1",
-    "@rollup/plugin-typescript": "8.3.0",
-    "@rollup/pluginutils": "4.1.2",
-    "@types/chrome": "0.0.176",
-    "@types/jasmine": "3.10.3",
-    "@types/jest": "27.4.0",
-    "@types/karma": "6.3.2",
+    "@rollup/plugin-replace": "4.0.0",
+    "@rollup/plugin-typescript": "8.3.1",
+    "@rollup/pluginutils": "4.2.0",
+    "@types/chrome": "0.0.180",
+    "@types/eslint": "8.4.1",
+    "@types/jasmine": "4.0.0",
+    "@types/jest": "27.4.1",
+    "@types/karma": "6.3.3",
+    "@types/karma-coverage": "2.0.1",
+    "@types/node": "17.0.23",
     "@types/offscreencanvas": "2019.6.4",
-    "@types/node": "17.0.9",
-    "@typescript-eslint/eslint-plugin": "5.9.1",
-    "@typescript-eslint/parser": "5.9.1",
-    "chokidar": "3.5.2",
-    "eslint": "8.7.0",
+    "@typescript-eslint/eslint-plugin": "5.16.0",
+    "@typescript-eslint/parser": "5.16.0",
+    "chokidar": "3.5.3",
+    "eslint": "8.11.0",
+    "eslint-plugin-compat": "4.0.2",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-local": "1.0.0",
-    "globby": "11.0.4",
-    "jasmine-core": "4.0.0",
-    "jest": "27.4.7",
-    "karma": "6.3.12",
-    "karma-chrome-launcher": "3.1.0",
-    "karma-coverage": "2.1.0",
+    "get-stream": "6.0.1",
+    "globby": "13.1.1",
+    "jasmine-core": "4.0.1",
+    "jest": "27.5.1",
+    "jest-extended": "2.0.0",
+    "karma": "6.3.17",
+    "karma-chrome-launcher": "3.1.1",
+    "karma-coverage": "2.2.0",
     "karma-firefox-launcher": "2.1.2",
     "karma-jasmine": "4.0.1",
-    "karma-rollup-preprocessor": "7.0.7",
+    "karma-rollup-preprocessor": "7.0.8",
     "karma-safari-launcher": "1.0.0",
+    "karma-spec-reporter": "0.0.33",
     "less": "4.1.2",
-    "malevic": "0.18.6",
-    "prettier": "2.5.1",
-    "puppeteer-core": "13.0.1",
-    "rollup": "2.64.0",
+    "malevic": "0.19.1",
+    "prettier": "2.6.1",
+    "puppeteer-core": "13.5.1",
+    "rollup": "2.70.1",
     "rollup-plugin-istanbul2": "2.0.2",
-    "ts-jest": "27.1.3",
+    "ts-jest": "27.1.4",
     "tslib": "2.3.1",
-    "typescript": "4.5.4",
-    "web-ext": "6.6.0",
-    "ws": "8.4.2",
+    "typescript": "4.6.3",
+    "web-ext": "6.8.0",
+    "ws": "8.5.0",
     "yazl": "2.5.1"
   }
 }