darkreader 4.9.52 → 4.9.53

package/README.md

@@ -16,7 +16,7 @@ If the help page doesn't answer your question, open up a new [discussion](https:
 
 ## How to contribute
 
-Read more about contributing to Dark Reader in [CONTRIBUTING.md](https://github.com/darkreader/darkreader/blob/master/CONTRIBUTING.md).
+Read more about contributing to Dark Reader in [CONTRIBUTING.md](https://github.com/darkreader/darkreader/blob/main/CONTRIBUTING.md).
 
 ## Building for use
 

package/darkreader.js

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.52
+ * Dark Reader v4.9.53
  * https://darkreader.org/
  */
 
@@ -9,7 +9,7 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.DarkReader = {}));
 })(this, (function (exports) { 'use strict';
 
-    /*! *****************************************************************************
+    /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -112,50 +112,57 @@
         return to.concat(ar || Array.prototype.slice.call(from));
     }
 
-    var MessageType = {
-        UI_GET_DATA: 'ui-get-data',
-        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_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',
-        UI_APPLY_DEV_INVERSION_FIXES: 'ui-apply-dev-inversion-fixes',
-        UI_RESET_DEV_INVERSION_FIXES: 'ui-reset-dev-inversion-fixes',
-        UI_APPLY_DEV_STATIC_THEMES: 'ui-apply-dev-static-themes',
-        UI_RESET_DEV_STATIC_THEMES: 'ui-reset-dev-static-themes',
-        UI_SAVE_FILE: 'ui-save-file',
-        UI_REQUEST_EXPORT_CSS: 'ui-request-export-css',
-        BG_CHANGES: 'bg-changes',
-        BG_ADD_CSS_FILTER: 'bg-add-css-filter',
-        BG_ADD_STATIC_THEME: 'bg-add-static-theme',
-        BG_ADD_SVG_FILTER: 'bg-add-svg-filter',
-        BG_ADD_DYNAMIC_THEME: 'bg-add-dynamic-theme',
-        BG_EXPORT_CSS: 'bg-export-css',
-        BG_UNSUPPORTED_SENDER: 'bg-unsupported-sender',
-        BG_CLEAN_UP: 'bg-clean-up',
-        BG_RELOAD: 'bg-reload',
-        BG_FETCH_RESPONSE: 'bg-fetch-response',
-        BG_UI_UPDATE: 'bg-ui-update',
-        BG_CSS_UPDATE: 'bg-css-update',
-        CS_COLOR_SCHEME_CHANGE: 'cs-color-scheme-change',
-        CS_FRAME_CONNECT: 'cs-frame-connect',
-        CS_FRAME_FORGET: 'cs-frame-forget',
-        CS_FRAME_FREEZE: 'cs-frame-freeze',
-        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 MessageType;
+    (function (MessageType) {
+        MessageType["UI_GET_DATA"] = "ui-get-data";
+        MessageType["UI_SUBSCRIBE_TO_CHANGES"] = "ui-subscribe-to-changes";
+        MessageType["UI_UNSUBSCRIBE_FROM_CHANGES"] = "ui-unsubscribe-from-changes";
+        MessageType["UI_CHANGE_SETTINGS"] = "ui-change-settings";
+        MessageType["UI_SET_THEME"] = "ui-set-theme";
+        MessageType["UI_SET_SHORTCUT"] = "ui-set-shortcut";
+        MessageType["UI_TOGGLE_ACTIVE_TAB"] = "ui-toggle-active-tab";
+        MessageType["UI_MARK_NEWS_AS_READ"] = "ui-mark-news-as-read";
+        MessageType["UI_MARK_NEWS_AS_DISPLAYED"] = "ui-mark-news-as-displayed";
+        MessageType["UI_LOAD_CONFIG"] = "ui-load-config";
+        MessageType["UI_APPLY_DEV_DYNAMIC_THEME_FIXES"] = "ui-apply-dev-dynamic-theme-fixes";
+        MessageType["UI_RESET_DEV_DYNAMIC_THEME_FIXES"] = "ui-reset-dev-dynamic-theme-fixes";
+        MessageType["UI_APPLY_DEV_INVERSION_FIXES"] = "ui-apply-dev-inversion-fixes";
+        MessageType["UI_RESET_DEV_INVERSION_FIXES"] = "ui-reset-dev-inversion-fixes";
+        MessageType["UI_APPLY_DEV_STATIC_THEMES"] = "ui-apply-dev-static-themes";
+        MessageType["UI_RESET_DEV_STATIC_THEMES"] = "ui-reset-dev-static-themes";
+        MessageType["UI_SAVE_FILE"] = "ui-save-file";
+        MessageType["UI_REQUEST_EXPORT_CSS"] = "ui-request-export-css";
+        MessageType["UI_COLOR_SCHEME_CHANGE"] = "ui-color-scheme-change";
+        MessageType["BG_CHANGES"] = "bg-changes";
+        MessageType["BG_ADD_CSS_FILTER"] = "bg-add-css-filter";
+        MessageType["BG_ADD_STATIC_THEME"] = "bg-add-static-theme";
+        MessageType["BG_ADD_SVG_FILTER"] = "bg-add-svg-filter";
+        MessageType["BG_ADD_DYNAMIC_THEME"] = "bg-add-dynamic-theme";
+        MessageType["BG_EXPORT_CSS"] = "bg-export-css";
+        MessageType["BG_UNSUPPORTED_SENDER"] = "bg-unsupported-sender";
+        MessageType["BG_CLEAN_UP"] = "bg-clean-up";
+        MessageType["BG_RELOAD"] = "bg-reload";
+        MessageType["BG_FETCH_RESPONSE"] = "bg-fetch-response";
+        MessageType["BG_UI_UPDATE"] = "bg-ui-update";
+        MessageType["BG_CSS_UPDATE"] = "bg-css-update";
+        MessageType["CS_COLOR_SCHEME_CHANGE"] = "cs-color-scheme-change";
+        MessageType["CS_FRAME_CONNECT"] = "cs-frame-connect";
+        MessageType["CS_FRAME_FORGET"] = "cs-frame-forget";
+        MessageType["CS_FRAME_FREEZE"] = "cs-frame-freeze";
+        MessageType["CS_FRAME_RESUME"] = "cs-frame-resume";
+        MessageType["CS_EXPORT_CSS_RESPONSE"] = "cs-export-css-response";
+        MessageType["CS_FETCH"] = "cs-fetch";
+        MessageType["CS_DARK_THEME_DETECTED"] = "cs-dark-theme-detected";
+        MessageType["CS_DARK_THEME_NOT_DETECTED"] = "cs-dark-theme-not-detected";
+    })(MessageType || (MessageType = {}));
 
-    var userAgent = typeof navigator === 'undefined' ? 'some useragent' : navigator.userAgent.toLowerCase();
-    var platform = typeof navigator === 'undefined' ? 'some platform' : navigator.platform.toLowerCase();
+    var isNavigatorDefined = typeof navigator !== 'undefined';
+    var userAgent = isNavigatorDefined ? navigator.userAgentData ?
+        navigator.userAgentData.brands.map(function (brand) { return "".concat(brand.brand.toLowerCase(), " ").concat(brand.version); }).join(' ') : navigator.userAgent.toLowerCase()
+        : 'some useragent';
+    var platform = isNavigatorDefined ? navigator.userAgentData ?
+        navigator.userAgentData.platform.toLowerCase() : navigator.platform.toLowerCase()
+        : 'some platform';
     var isChromium = userAgent.includes('chrome') || userAgent.includes('chromium');
     var isThunderbird = userAgent.includes('thunderbird');
     var isFirefox = userAgent.includes('firefox') || userAgent.includes('librewolf') || isThunderbird;
@@ -166,12 +173,19 @@
     var isSafari = userAgent.includes('safari') && !isChromium;
     var isWindows = platform.startsWith('win');
     var isMacOS = platform.startsWith('mac');
-    userAgent.includes('mobile');
+    (isNavigatorDefined && navigator.userAgentData) ? navigator.userAgentData.mobile : userAgent.includes('mobile');
     var isShadowDomSupported = typeof ShadowRoot === 'function';
     var isMatchMediaChangeEventListenerSupported = (typeof MediaQueryList === 'function' &&
         typeof MediaQueryList.prototype.addEventListener === 'function');
     ((function () {
-        var m = userAgent.match(/chrom[e|ium]\/([^ ]+)/);
+        var m = userAgent.match(/chrom(?:e|ium)(?:\/| )([^ ]+)/);
+        if (m && m[1]) {
+            return m[1];
+        }
+        return '';
+    }))();
+    ((function () {
+        var m = userAgent.match(/(?:firefox|librewolf)(?:\/| )([^ ]+)/);
         if (m && m[1]) {
             return m[1];
         }
@@ -186,7 +200,6 @@
             return false;
         }
     })();
-    globalThis.chrome && globalThis.chrome.runtime && globalThis.chrome.runtime.getManifest && globalThis.chrome.runtime.getManifest().manifest_version === 3;
     var isCSSColorSchemePropSupported = (function () {
         if (typeof document === 'undefined') {
             return false;
@@ -456,16 +469,8 @@
     }
 
     function logInfo() {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
     }
     function logWarn() {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
     }
 
     function throttle(callback) {
@@ -570,7 +575,6 @@
             }
             else if (attempts >= MAX_ATTEMPTS_COUNT) {
                 if (now - start < ATTEMPTS_INTERVAL) {
-                    logWarn("Node position watcher paused: retry in ".concat(RETRY_TIMEOUT, "ms"), node, prevSibling);
                     timeoutId = setTimeout(function () {
                         start = null;
                         attempts = 0;
@@ -584,23 +588,19 @@
             }
             if (mode === 'parent') {
                 if (prevSibling && prevSibling.parentNode !== parent) {
-                    logWarn('Unable to restore node position: sibling parent changed', node, prevSibling, parent);
                     stop();
                     return;
                 }
             }
             if (mode === 'prev-sibling') {
                 if (prevSibling.parentNode == null) {
-                    logWarn('Unable to restore node position: sibling was removed', node, prevSibling, parent);
                     stop();
                     return;
                 }
                 if (prevSibling.parentNode !== parent) {
-                    logWarn('Style was moved to another parent', node, prevSibling, parent);
                     updateParent(prevSibling.parentNode);
                 }
             }
-            logWarn('Restoring node position', node, prevSibling, parent);
             parent.insertBefore(node, prevSibling ? prevSibling.nextSibling : parent.firstChild);
             observer.takeRecords();
             onRestore && onRestore();
@@ -925,7 +925,7 @@
             }
         }
     }
-    var cssURLRegex = /url\((('.+?')|(".+?")|([^\)]*?))\)/g;
+    var cssURLRegex = /url\((('.*?')|(".*?")|([^\)]*?))\)/g;
     var cssImportRegex = /@import\s*(url\()?(('.+?')|(".+?")|([^\)]*?))\)? ?(screen)?;?/gi;
     function getCSSURLValue(cssURL) {
         return cssURL.trim().replace(/^url\((.*)\)$/, '$1').trim().replace(/^"(.*)"$/, '$1').replace(/^'(.*)'$/, '$1').replace(/(?:\\(.))/g, '$1');
@@ -941,7 +941,6 @@
                 return "url(\"".concat(getAbsoluteURL(cssBasePath, pathValue), "\")");
             }
             catch (err) {
-                logWarn('Not able to replace relative URL with Absolute URL, skipping');
                 return match;
             }
         });
@@ -1108,6 +1107,36 @@
         return null;
     }
 
+    var hslaParseCache = new Map();
+    var rgbaParseCache = new Map();
+    function parseColorWithCache($color) {
+        $color = $color.trim();
+        if (rgbaParseCache.has($color)) {
+            return rgbaParseCache.get($color);
+        }
+        if ($color.includes('calc(')) {
+            $color = lowerCalcExpression($color);
+        }
+        var color = parse($color);
+        color && rgbaParseCache.set($color, color);
+        return color;
+    }
+    function parseToHSLWithCache(color) {
+        if (hslaParseCache.has(color)) {
+            return hslaParseCache.get(color);
+        }
+        var rgb = parseColorWithCache(color);
+        if (!rgb) {
+            return null;
+        }
+        var hsl = rgbToHSL(rgb);
+        hslaParseCache.set(color, hsl);
+        return hsl;
+    }
+    function clearColorCache() {
+        hslaParseCache.clear();
+        rgbaParseCache.clear();
+    }
     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) {
@@ -1207,7 +1236,7 @@
         if ($color === 'transparent') {
             return { r: 0, g: 0, b: 0, a: 0 };
         }
-        throw new Error("Unable to parse ".concat($color));
+        return null;
     }
     function getNumbers($color) {
         var numbers = [];
@@ -1284,7 +1313,7 @@
                 return { r: r, g: g, b: b, a: a };
             }
         }
-        throw new Error("Unable to parse ".concat($hex));
+        return null;
     }
     function getColorByName($color) {
         var n = knownColors.get($color);
@@ -1625,19 +1654,8 @@
         return theme[prop];
     }
     var colorModificationCache = new Map();
-    var colorParseCache$1 = new Map();
-    function parseToHSLWithCache(color) {
-        if (colorParseCache$1.has(color)) {
-            return colorParseCache$1.get(color);
-        }
-        var rgb = parse(color);
-        var hsl = rgbToHSL(rgb);
-        colorParseCache$1.set(color, hsl);
-        return hsl;
-    }
     function clearColorModificationCache() {
         colorModificationCache.clear();
-        colorParseCache$1.clear();
     }
     var rgbCacheKeys = ['r', 'g', 'b', 'a'];
     var themeCacheKeys$1 = ['mode', 'brightness', 'contrast', 'grayscale', 'sepia', 'darkSchemeBackgroundColor', 'darkSchemeTextColor', 'lightSchemeBackgroundColor', 'lightSchemeTextColor'];
@@ -2055,7 +2073,6 @@
         }
         var size = naturalWidth * naturalHeight * 4;
         if (size > MAX_IMAGE_SIZE) {
-            logInfo('Skipped large image analyzing(Larger than 5mb in memory)');
             return {
                 isDark: false,
                 isLight: false,
@@ -2205,11 +2222,14 @@
                 return { property: property, value: modifier, important: getPriority(rule.style, property), sourceValue: value };
             }
         }
+        else if (property === 'color-scheme') {
+            return null;
+        }
         else if ((property.includes('color') && property !== '-webkit-print-color-adjust') ||
             property === 'fill' ||
             property === 'stroke' ||
             property === 'stop-color') {
-            var modifier = getColorModifier(property, value);
+            var modifier = getColorModifier(property, value, rule);
             if (modifier) {
                 return { property: property, value: modifier, important: getPriority(rule.style, property), sourceValue: value };
             }
@@ -2288,7 +2308,7 @@
             foregroundColorSelection = modifyForegroundColor({ r: 255, g: 255, b: 255 }, __assign(__assign({}, theme), { grayscale: 0 }));
         }
         else {
-            var rgb = parse(theme.selectionColor);
+            var rgb = parseColorWithCache(theme.selectionColor);
             var hsl = rgbToHSL(rgb);
             backgroundColorSelection = theme.selectionColor;
             if (hsl.l < 0.5) {
@@ -2330,7 +2350,7 @@
             colorCorner = modifyBackgroundColor({ r: 255, g: 255, b: 255 }, theme);
         }
         else {
-            var rgb = parse(theme.scrollbarColor);
+            var rgb = parseColorWithCache(theme.scrollbarColor);
             var hsl_1 = rgbToHSL(rgb);
             var isLight = hsl_1.l > 0.5;
             var lighten = function (lighter) { return (__assign(__assign({}, hsl_1), { l: clamp(hsl_1.l + lighter, 0, 1) })); };
@@ -2383,45 +2403,27 @@
         'none',
         'unset',
     ]);
-    var colorParseCache = new Map();
-    function parseColorWithCache($color) {
-        $color = $color.trim();
-        if (colorParseCache.has($color)) {
-            return colorParseCache.get($color);
-        }
-        if ($color.includes('calc(')) {
-            $color = lowerCalcExpression($color);
-        }
-        var color = parse($color);
-        colorParseCache.set($color, color);
-        return color;
-    }
-    function tryParseColor($color) {
-        try {
-            return parseColorWithCache($color);
-        }
-        catch (err) {
-            return null;
-        }
-    }
-    function getColorModifier(prop, value) {
+    function getColorModifier(prop, value, rule) {
         if (unparsableColors.has(value.toLowerCase())) {
             return value;
         }
-        try {
-            var rgb_1 = parseColorWithCache(value);
-            if (prop.includes('background')) {
-                return function (filter) { return modifyBackgroundColor(rgb_1, filter); };
-            }
-            if (prop.includes('border') || prop.includes('outline')) {
-                return function (filter) { return modifyBorderColor(rgb_1, filter); };
+        var rgb = parseColorWithCache(value);
+        if (!rgb) {
+            return null;
+        }
+        if (prop.includes('background')) {
+            if (rule.style.webkitMaskImage ||
+                rule.style.webkitMask ||
+                rule.style.mask ||
+                rule.style.getPropertyValue('mask-image')) {
+                return function (filter) { return modifyForegroundColor(rgb, filter); };
             }
-            return function (filter) { return modifyForegroundColor(rgb_1, filter); };
+            return function (filter) { return modifyBackgroundColor(rgb, filter); };
         }
-        catch (err) {
-            logWarn('Color parse error', err);
-            return null;
+        if (prop.includes('border') || prop.includes('outline')) {
+            return function (filter) { return modifyBorderColor(rgb, filter); };
         }
+        return function (filter) { return modifyForegroundColor(rgb, filter); };
     }
     var imageDetailsCache = new Map();
     var awaitingForImageLoading = new Map();
@@ -2467,22 +2469,22 @@
                 .sort(function (a, b) { return a.index > b.index ? 1 : -1; });
             var getGradientModifier_1 = function (gradient) {
                 var typeGradient = gradient.typeGradient, match = gradient.match, hasComma = gradient.hasComma;
-                var partsRegex = /([^\(\),]+(\([^\(\)]*(\([^\(\)]*\)*[^\(\)]*)?\))?[^\(\),]*),?/g;
+                var partsRegex = /([^\(\),]+(\([^\(\)]*(\([^\(\)]*\)*[^\(\)]*)?\))?([^\(\), ]|( (?!calc)))*),?/g;
                 var colorStopRegex = /^(from|color-stop|to)\(([^\(\)]*?,\s*)?(.*?)\)$/;
                 var parts = getMatches(partsRegex, match, 1).map(function (part) {
                     part = part.trim();
-                    var rgb = tryParseColor(part);
+                    var rgb = parseColorWithCache(part);
                     if (rgb) {
                         return function (filter) { return modifyGradientColor(rgb, filter); };
                     }
                     var space = part.lastIndexOf(' ');
-                    rgb = tryParseColor(part.substring(0, space));
+                    rgb = parseColorWithCache(part.substring(0, space));
                     if (rgb) {
                         return function (filter) { return "".concat(modifyGradientColor(rgb, filter), " ").concat(part.substring(space + 1)); };
                     }
                     var colorStopMatch = part.match(colorStopRegex);
                     if (colorStopMatch) {
-                        rgb = tryParseColor(colorStopMatch[3]);
+                        rgb = parseColorWithCache(colorStopMatch[3]);
                         if (rgb) {
                             return function (filter) { return "".concat(colorStopMatch[1], "(").concat(colorStopMatch[2] ? "".concat(colorStopMatch[2], ", ") : '').concat(modifyGradientColor(rgb, filter), ")"); };
                         }
@@ -2499,6 +2501,7 @@
                     return null;
                 }
                 var url = getCSSURLValue(urlValue);
+                var isURLEmpty = url.length === 0;
                 var parentStyleSheet = rule.parentStyleSheet;
                 var baseURL = (parentStyleSheet && parentStyleSheet.href) ?
                     getCSSBaseBath(parentStyleSheet.href) :
@@ -2510,6 +2513,9 @@
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
+                                if (isURLEmpty) {
+                                    return [2, "url('')"];
+                                }
                                 if (!imageDetailsCache.has(url)) return [3, 1];
                                 imageDetails = imageDetailsCache.get(url);
                                 return [3, 7];
@@ -2586,13 +2592,28 @@
             };
             var modifiers_1 = [];
             var matchIndex_1 = 0;
+            var prevHasComma_1 = false;
             matches_1.forEach(function (_a, i) {
                 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 (prefixStart !== matchStart) {
+                    if (prevHasComma_1) {
+                        modifiers_1.push(function () {
+                            var betweenValue = value.substring(prefixStart, matchStart);
+                            if (betweenValue[0] === ',') {
+                                betweenValue = betweenValue.substring(1);
+                            }
+                            return betweenValue;
+                        });
+                    }
+                    else {
+                        modifiers_1.push(function () { return value.substring(prefixStart, matchStart); });
+                    }
+                }
+                prevHasComma_1 = hasComma || false;
                 if (type === 'url') {
                     modifiers_1.push(getURLModifier_1(match));
                 }
@@ -2610,11 +2631,14 @@
                         return asyncResults.filter(Boolean).join('');
                     });
                 }
-                return results.join('');
+                var combinedResult = results.join('');
+                if (combinedResult.endsWith(', initial')) {
+                    return combinedResult.slice(0, -9);
+                }
+                return combinedResult;
             };
         }
         catch (err) {
-            logWarn("Unable to parse gradient ".concat(value), err);
             return null;
         }
     }
@@ -2628,7 +2652,7 @@
                 var matchIndex = value.indexOf(match, index_1);
                 var matchEnd = matchIndex + match.length;
                 index_1 = matchEnd;
-                var rgb = tryParseColor(match);
+                var rgb = parseColorWithCache(match);
                 if (!rgb) {
                     notParsed_1++;
                     return function () { return value.substring(prefixIndex, matchEnd); };
@@ -2645,7 +2669,6 @@
             };
         }
         catch (err) {
-            logWarn("Unable to parse shadow ".concat(value), err);
             return null;
         }
     }
@@ -2669,7 +2692,6 @@
         return variablesStore.getModifierForVarDependant(prop, value);
     }
     function cleanModificationCache() {
-        colorParseCache.clear();
         clearColorModificationCache();
         imageDetailsCache.clear();
         cleanImageProcessingCache();
@@ -2956,7 +2978,7 @@
                 return;
             }
             this.definedVars.add(varName);
-            var color = tryParseColor(value);
+            var color = parseColorWithCache(value);
             if (color) {
                 this.unknownColorVars.add(varName);
             }
@@ -3234,11 +3256,11 @@
     }
     function handleRawValue(color, theme, modifyFunction) {
         var _a = parseRawValue(color), isRaw = _a.isRaw, newColor = _a.color;
-        var rgb = tryParseColor(newColor);
+        var rgb = parseColorWithCache(newColor);
         if (rgb) {
             var outputColor = modifyFunction(rgb, theme);
             if (isRaw) {
-                var outputInRGB = tryParseColor(outputColor);
+                var outputInRGB = parseColorWithCache(outputColor);
                 return outputInRGB ? "".concat(outputInRGB.r, ", ").concat(outputInRGB.g, ", ").concat(outputInRGB.b) : outputColor;
             }
             return outputColor;
@@ -3507,7 +3529,7 @@
         function setCustomProp(targetCSSProp, modifierCSSProp, cssVal) {
             var isPropertyVariable = targetCSSProp.startsWith('--');
             var _a = isPropertyVariable ? {} : overrides[targetCSSProp], customProp = _a.customProp, dataAttr = _a.dataAttr;
-            var mod = getModifiableCSSDeclaration(modifierCSSProp, cssVal, {}, variablesStore, ignoreImageSelectors, null);
+            var mod = getModifiableCSSDeclaration(modifierCSSProp, cssVal, { style: element.style }, variablesStore, ignoreImageSelectors, null);
             if (!mod) {
                 return;
             }
@@ -3616,13 +3638,11 @@
     var observer = null;
     function changeMetaThemeColor(meta, theme) {
         srcMetaThemeColor = srcMetaThemeColor || meta.content;
-        try {
-            var color = parse(srcMetaThemeColor);
-            meta.content = modifyBackgroundColor(color, theme);
-        }
-        catch (err) {
-            logWarn(err);
+        var color = parseColorWithCache(srcMetaThemeColor);
+        if (!color) {
+            return;
         }
+        meta.content = modifyBackgroundColor(color, theme);
     }
     function changeMetaThemeColorWhenAvailable(theme) {
         var meta = document.querySelector(metaThemeColorSelector);
@@ -3931,6 +3951,7 @@
             (element instanceof HTMLLinkElement &&
                 element.rel &&
                 element.rel.toLowerCase().includes('stylesheet') &&
+                element.href &&
                 !element.disabled &&
                 (isFirefox ? !element.href.startsWith('moz-extension://') : true) &&
                 !isFontsGoogleApiStyle(element))) &&
@@ -4008,26 +4029,20 @@
         }
         function getRulesSync() {
             if (corsCopy) {
-                logInfo('[getRulesSync] Using cors-copy.');
                 return corsCopy.sheet.cssRules;
             }
             if (containsCSSImport()) {
-                logInfo('[getRulesSync] CSSImport detected.');
                 return null;
             }
             var cssRules = safeGetSheetRules();
             if (element instanceof HTMLLinkElement &&
                 !isRelativeHrefOnAbsolutePath(element.href) &&
                 hasImports(cssRules, false)) {
-                logInfo('[getRulesSync] CSSImportRule detected on non-local href.');
                 return null;
             }
             if (hasImports(cssRules, true)) {
-                logInfo('[getRulesSync] Cross-Origin CSSImportRule detected.');
                 return null;
             }
-            logInfo('[getRulesSync] Using cssRules.');
-            !cssRules && logWarn('[getRulesSync] cssRules is null, trying again.');
             return cssRules;
         }
         function insertStyle() {
@@ -4060,30 +4075,25 @@
         var loadingLinkId = ++loadingLinkCounter;
         function getRulesAsync() {
             return __awaiter(this, void 0, void 0, function () {
-                var cssText, cssBasePath, _a, cssRules, accessError, err_1, fullCSSText, err_2;
+                var cssText, cssBasePath, _a, cssRules, accessError, fullCSSText;
                 var _b;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
                             if (!(element instanceof HTMLLinkElement)) return [3, 7];
                             _a = __read(getRulesOrError(), 2), cssRules = _a[0], accessError = _a[1];
-                            if (accessError) {
-                                logWarn(accessError);
-                            }
                             if (!((!cssRules && !accessError && !isSafari) ||
                                 (isSafari && !element.sheet) ||
                                 isStillLoadingError(accessError))) return [3, 5];
                             _c.label = 1;
                         case 1:
                             _c.trys.push([1, 3, , 4]);
-                            logInfo("Linkelement ".concat(loadingLinkId, " is not loaded yet and thus will be await for"), element);
                             return [4, linkLoading(element, loadingLinkId)];
                         case 2:
                             _c.sent();
                             return [3, 4];
                         case 3:
-                            err_1 = _c.sent();
-                            logWarn(err_1);
+                            _c.sent();
                             wasLoadingError = true;
                             return [3, 4];
                         case 4:
@@ -4091,9 +4101,6 @@
                                 return [2, null];
                             }
                             _b = __read(getRulesOrError(), 2), cssRules = _b[0], accessError = _b[1];
-                            if (accessError) {
-                                logWarn(accessError);
-                            }
                             _c.label = 5;
                         case 5:
                             if (cssRules) {
@@ -4129,8 +4136,7 @@
                             corsCopy = createCORSCopy(element, fullCSSText);
                             return [3, 12];
                         case 11:
-                            err_2 = _c.sent();
-                            logWarn(err_2);
+                            _c.sent();
                             return [3, 12];
                         case 12:
                             if (corsCopy) {
@@ -4147,7 +4153,6 @@
             var rules = getRulesSync();
             if (!rules) {
                 if (options.secondRound) {
-                    logWarn('Detected dead-lock at details(), returning early to prevent it.');
                     return null;
                 }
                 if (isLoadingRules || wasLoadingError) {
@@ -4162,7 +4167,6 @@
                         update();
                     }
                 }).catch(function (err) {
-                    logWarn(err);
                     isLoadingRules = false;
                     loadingEnd();
                 });
@@ -4239,7 +4243,6 @@
         function safeGetSheetRules() {
             var _a = __read(getRulesOrError(), 2), cssRules = _a[0], err = _a[1];
             if (err) {
-                logWarn(err);
                 return null;
             }
             return cssRules;
@@ -4342,10 +4345,8 @@
             }
             moveCount++;
             if (moveCount > maxMoveCount) {
-                logWarn('Style sheet was moved multiple times', element);
                 return;
             }
-            logWarn('Restore style', syncStyle, element);
             insertStyle();
             corsCopyPositionWatcher && corsCopyPositionWatcher.skip();
             syncStylePositionWatcher && syncStylePositionWatcher.skip();
@@ -4374,7 +4375,6 @@
                         };
                         var onLoad = function () {
                             cleanUp();
-                            logInfo("Linkelement ".concat(loadingId, " has been loaded"));
                             resolve();
                         };
                         var onError = function () {
@@ -4415,7 +4415,7 @@
     function replaceCSSImports(cssText, basePath, cache) {
         if (cache === void 0) { cache = new Map(); }
         return __awaiter(this, void 0, void 0, function () {
-            var importMatches, importMatches_1, importMatches_1_1, match, importURL, absoluteURL, importedCSS, err_3, e_1_1;
+            var importMatches, importMatches_1, importMatches_1_1, match, importURL, absoluteURL, importedCSS, e_1_1;
             var e_1, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -4449,8 +4449,7 @@
                         importedCSS = _b.sent();
                         return [3, 7];
                     case 6:
-                        err_3 = _b.sent();
-                        logWarn(err_3);
+                        _b.sent();
                         importedCSS = '';
                         return [3, 7];
                     case 7:
@@ -4674,7 +4673,7 @@
                 onHugeMutations: handleHugeTreeMutations,
             });
             var attrObserver = new MutationObserver(handleAttributeMutations);
-            attrObserver.observe(root, { attributes: true, attributeFilter: ['rel', 'disabled', 'media'], subtree: true });
+            attrObserver.observe(root, { attributes: true, attributeFilter: ['rel', 'disabled', 'media', 'href'], subtree: true });
             observers.push(treeObserver, attrObserver);
             observedRoots.add(root);
         }
@@ -4997,8 +4996,8 @@
         var darkSchemeBackgroundColor = filter.darkSchemeBackgroundColor, darkSchemeTextColor = filter.darkSchemeTextColor, lightSchemeBackgroundColor = filter.lightSchemeBackgroundColor, lightSchemeTextColor = filter.lightSchemeTextColor, mode = filter.mode;
         var schemeBackgroundColor = mode === 0 ? lightSchemeBackgroundColor : darkSchemeBackgroundColor;
         var schemeTextColor = mode === 0 ? lightSchemeTextColor : darkSchemeTextColor;
-        schemeBackgroundColor = modifyBackgroundColor(parse(schemeBackgroundColor), filter);
-        schemeTextColor = modifyForegroundColor(parse(schemeTextColor), filter);
+        schemeBackgroundColor = modifyBackgroundColor(parseColorWithCache(schemeBackgroundColor), filter);
+        schemeTextColor = modifyForegroundColor(parseColorWithCache(schemeTextColor), filter);
         variableStyle.textContent = [
             ":root {",
             "   --darkreader-neutral-background: ".concat(schemeBackgroundColor, ";"),
@@ -5011,10 +5010,13 @@
         setupNodePositionWatcher(variableStyle, 'variables');
         var rootVarsStyle = createOrUpdateStyle('darkreader--root-vars');
         document.head.insertBefore(rootVarsStyle, variableStyle.nextSibling);
-        var proxyScript = createOrUpdateScript('darkreader--proxy');
-        proxyScript.append("(".concat(injectProxy, ")(!").concat(fixes && fixes.disableStyleSheetsProxy, ")"));
-        document.head.insertBefore(proxyScript, rootVarsStyle.nextSibling);
-        proxyScript.remove();
+        var injectProxyArg = !(fixes && fixes.disableStyleSheetsProxy);
+        {
+            var proxyScript = createOrUpdateScript('darkreader--proxy');
+            proxyScript.append("(".concat(injectProxy, ")(").concat(injectProxyArg, ")"));
+            document.head.insertBefore(proxyScript, rootVarsStyle.nextSibling);
+            proxyScript.remove();
+        }
     }
     var shadowRootsWithOverrides = new Set();
     function createShadowStaticStyleOverrides(root) {
@@ -5040,11 +5042,10 @@
     }
     function replaceCSSTemplates($cssText) {
         return $cssText.replace(/\${(.+?)}/g, function (_, $color) {
-            var color = tryParseColor($color);
+            var color = parseColorWithCache($color);
             if (color) {
                 return modifyColor(color, filter);
             }
-            logWarn("Couldn't parse CSSTemplate's color.");
             return $color;
         });
     }
@@ -5091,7 +5092,6 @@
     var loadingStyles = new Set();
     function createManager(element) {
         var loadingStyleId = ++loadingStylesCounter;
-        logInfo("New manager for element, with loadingStyleID ".concat(loadingStyleId), element);
         function loadingStart() {
             if (!isDOMReady() || !didDocumentShowUp) {
                 loadingStyles.add(loadingStyleId);
@@ -5105,7 +5105,6 @@
         function loadingEnd() {
             loadingStyles.delete(loadingStyleId);
             logInfo("Removed loadingStyle ".concat(loadingStyleId, ", now awaiting: ").concat(loadingStyles.size));
-            logInfo("To-do to be loaded", loadingStyles);
             if (loadingStyles.size === 0 && isDOMReady()) {
                 cleanFallbackStyle();
             }
@@ -5143,7 +5142,6 @@
             cleanFallbackStyle();
             return;
         }
-        logWarn("DOM is ready, but still have styles being loaded.", loadingStyles);
     }
     var documentVisibilityListener = null;
     var didDocumentShowUp = !document.hidden;
@@ -5189,7 +5187,6 @@
             }
         }
         catch (err) {
-            logWarn('Error occured in handleAdoptedStyleSheets: ', err);
         }
     }
     function watchForUpdates() {
@@ -5201,7 +5198,6 @@
                 .filter(function (style) { return !styleManagers.has(style); });
             var stylesToRestore = moved
                 .filter(function (style) { return styleManagers.has(style); });
-            logInfo("Styles to be removed:", stylesToRemove);
             stylesToRemove.forEach(function (style) { return removeManager(style); });
             var newManagers = stylesToManage
                 .map(function (style) { return createManager(style); });
@@ -5245,6 +5241,16 @@
         removeDOMReadyListener(onDOMReady);
         cleanReadyStateCompleteListeners();
     }
+    var metaObserver;
+    function addMetaListener() {
+        metaObserver = new MutationObserver(function () {
+            if (document.querySelector('meta[name="darkreader-lock"]')) {
+                metaObserver.disconnect();
+                removeDynamicTheme();
+            }
+        });
+        metaObserver.observe(document.head, { childList: true, subtree: true });
+    }
     function createDarkReaderInstanceMarker() {
         var metaElement = document.createElement('meta');
         metaElement.name = 'darkreader';
@@ -5252,6 +5258,9 @@
         document.head.appendChild(metaElement);
     }
     function isAnotherDarkReaderInstanceActive() {
+        if (document.querySelector('meta[name="darkreader-lock"]')) {
+            return true;
+        }
         var meta = document.querySelector('meta[name="darkreader"]');
         if (meta) {
             if (meta.content !== INSTANCE_ID) {
@@ -5260,6 +5269,7 @@
             return false;
         }
         createDarkReaderInstanceMarker();
+        addMetaListener();
         return false;
     }
     function createOrUpdateDynamicTheme(filterConfig, dynamicThemeFixes, iframe) {
@@ -5340,6 +5350,7 @@
             manager.destroy();
         });
         adoptedStyleManagers.splice(0);
+        metaObserver && metaObserver.disconnect();
     }
     function cleanDynamicThemeCache() {
         variablesStore.clear();
@@ -5348,6 +5359,7 @@
         cancelRendering();
         stopWatchingForUpdates();
         cleanModificationCache();
+        clearColorCache();
     }
 
     var blobRegex = /url\(\"(blob\:.*?)\"\)/g;
@@ -5370,7 +5382,7 @@
             });
         });
     }
-    var banner = "/*\n                        _______\n                       /       \\\n                      .==.    .==.\n                     ((  ))==((  ))\n                    / \"==\"    \"==\"\\\n                   /____|| || ||___\\\n       ________     ____    ________  ___    ___\n       |  ___  \\   /    \\   |  ___  \\ |  |  /  /\n       |  |  \\  \\ /  /\\  \\  |  |  \\  \\|  |_/  /\n       |  |   )  /  /__\\  \\ |  |__/  /|  ___  \\\n       |  |__/  /  ______  \\|  ____  \\|  |  \\  \\\n_______|_______/__/ ____ \\__\\__|___\\__\\__|___\\__\\____\n|  ___  \\ |  ____/ /    \\   |  ___  \\ |  ____|  ___  \\\n|  |  \\  \\|  |___ /  /\\  \\  |  |  \\  \\|  |___|  |  \\  \\\n|  |__/  /|  ____/  /__\\  \\ |  |   )  |  ____|  |__/  /\n|  ____  \\|  |__/  ______  \\|  |__/  /|  |___|  ____  \\\n|__|   \\__\\____/__/      \\__\\_______/ |______|__|   \\__\\\n                https://darkreader.org\n*/\n\n/*! Dark reader generated CSS | Licensed under MIT https://github.com/darkreader/darkreader/blob/master/LICENSE */\n";
+    var banner = "/*\n                        _______\n                       /       \\\n                      .==.    .==.\n                     ((  ))==((  ))\n                    / \"==\"    \"==\"\\\n                   /____|| || ||___\\\n       ________     ____    ________  ___    ___\n       |  ___  \\   /    \\   |  ___  \\ |  |  /  /\n       |  |  \\  \\ /  /\\  \\  |  |  \\  \\|  |_/  /\n       |  |   )  /  /__\\  \\ |  |__/  /|  ___  \\\n       |  |__/  /  ______  \\|  ____  \\|  |  \\  \\\n_______|_______/__/ ____ \\__\\__|___\\__\\__|___\\__\\____\n|  ___  \\ |  ____/ /    \\   |  ___  \\ |  ____|  ___  \\\n|  |  \\  \\|  |___ /  /\\  \\  |  |  \\  \\|  |___|  |  \\  \\\n|  |__/  /|  ____/  /__\\  \\ |  |   )  |  ____|  |__/  /\n|  ____  \\|  |__/  ______  \\|  |__/  /|  |___|  ____  \\\n|__|   \\__\\____/__/      \\__\\_______/ |______|__|   \\__\\\n                https://darkreader.org\n*/\n\n/*! Dark reader generated CSS | Licensed under MIT https://github.com/darkreader/darkreader/blob/main/LICENSE */\n";
     function collectCSS() {
         return __awaiter(this, void 0, void 0, function () {
             function addStaticCSS(selector, comment) {

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "darkreader",
-  "version": "4.9.52",
+  "version": "4.9.53",
   "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",
     "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'",
@@ -17,15 +16,15 @@
     "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:chrome": "npm run debug -- --test --chrome && jest --config=tests/browser/jest.config.mjs --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:coverage": "jest --config=tests/unit/jest.config.mjs --coverage",
+    "test:firefox": " npm run debug -- --test --firefox && jest --config=tests/browser/jest.config.firefox.mjs --runInBand",
+    "test:inject": "node --max-old-space-size=3072 node_modules/.bin/karma start ./tests/inject/karma.conf.cjs",
+    "test:inject:debug": "node --max-old-space-size=3072 node_modules/.bin/karma start ./tests/inject/karma.conf.cjs --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:unit": "jest --config=tests/unit/jest.config.mjs",
+    "test:unit:debug": "node --inspect-brk ./node_modules/jest/bin/jest --config=tests/unit/jest.config.mjs --runInBand --no-cache --watch",
     "test:update-snapshots": "npm run test -- --updateSnapshot && npm run test:project -- --updateSnapshot",
     "translate-line": "node ./tasks/translate.js --line"
   },
@@ -54,49 +53,49 @@
     "url": "https://opencollective.com/darkreader/donate"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "13.1.3",
+    "@rollup/plugin-node-resolve": "13.3.0",
     "@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",
+    "@rollup/plugin-typescript": "8.3.4",
+    "@rollup/pluginutils": "4.2.1",
+    "@types/chrome": "0.0.193",
+    "@types/eslint": "8.4.5",
+    "@types/jasmine": "4.0.3",
+    "@types/jest": "28.1.6",
     "@types/karma": "6.3.3",
     "@types/karma-coverage": "2.0.1",
-    "@types/node": "17.0.23",
-    "@types/offscreencanvas": "2019.6.4",
-    "@typescript-eslint/eslint-plugin": "5.16.0",
-    "@typescript-eslint/parser": "5.16.0",
+    "@types/node": "18.6.4",
+    "@types/offscreencanvas": "2019.7.0",
+    "@typescript-eslint/eslint-plugin": "5.32.0",
+    "@typescript-eslint/parser": "5.32.0",
     "chokidar": "3.5.3",
-    "eslint": "8.11.0",
+    "eslint": "8.21.0",
     "eslint-plugin-compat": "4.0.2",
-    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-import": "2.26.0",
     "eslint-plugin-local": "1.0.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",
+    "globby": "13.1.2",
+    "jasmine-core": "4.3.0",
+    "jest": "28.1.3",
+    "jest-extended": "3.0.2",
+    "karma": "6.4.0",
     "karma-chrome-launcher": "3.1.1",
     "karma-coverage": "2.2.0",
     "karma-firefox-launcher": "2.1.2",
-    "karma-jasmine": "4.0.1",
+    "karma-jasmine": "5.1.0",
     "karma-rollup-preprocessor": "7.0.8",
     "karma-safari-launcher": "1.0.0",
-    "karma-spec-reporter": "0.0.33",
-    "less": "4.1.2",
+    "karma-spec-reporter": "0.0.34",
+    "less": "4.1.3",
     "malevic": "0.19.1",
-    "prettier": "2.6.1",
-    "puppeteer-core": "13.5.1",
-    "rollup": "2.70.1",
+    "prettier": "2.7.1",
+    "puppeteer-core": "16.0.0",
+    "rollup": "2.77.2",
     "rollup-plugin-istanbul2": "2.0.2",
-    "ts-jest": "27.1.4",
-    "tslib": "2.3.1",
-    "typescript": "4.6.3",
-    "web-ext": "6.8.0",
-    "ws": "8.5.0",
+    "ts-jest": "28.0.7",
+    "tslib": "2.4.0",
+    "typescript": "4.7.4",
+    "web-ext": "7.1.1",
+    "ws": "8.8.1",
     "yazl": "2.5.1"
   }
 }