darkreader 4.9.84 → 4.9.86

package/darkreader.js

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.84
+ * Dark Reader v4.9.86
  * https://darkreader.org/
  */
 
@@ -1041,12 +1041,14 @@
                 escapedSelector = escapedSelector.replaceAll(/\s+/g, "\\s*");
                 escapedSelector = escapedSelector.replaceAll(/::/g, "::?");
                 const regexp = new RegExp(
-                    `${escapedSelector}\\s*{[^}]*?${shorthand}:\\s*([^;}]+)`
+                    `${escapedSelector}\\s*{[^}]*${shorthand}:\\s*([^;}]+)`
                 );
                 const match = sourceCSSText.match(regexp);
                 if (match) {
                     iterate(shorthand, match[1]);
                 }
+            } else if (shorthand === "background") {
+                iterate("background-color", "#ffffff");
             }
         }
     }
@@ -1069,9 +1071,11 @@
     }
     function replaceCSSRelativeURLsWithAbsolute($css, cssBasePath) {
         return $css.replace(cssURLRegex, (match) => {
-            const pathValue = getCSSURLValue(match);
             try {
-                return `url('${getAbsoluteURL(cssBasePath, pathValue)}')`;
+                const url = getCSSURLValue(match);
+                const absoluteURL = getAbsoluteURL(cssBasePath, url);
+                const escapedURL = absoluteURL.replaceAll("'", "\\'");
+                return `url('${escapedURL}')`;
             } catch (err) {
                 return match;
             }
@@ -2105,11 +2109,38 @@
         return modifyBackgroundColor(rgb, theme);
     }
 
+    const excludedSelectors = [
+        "pre",
+        "pre *",
+        "code",
+        '[aria-hidden="true"]',
+        '[class*="fa-"]',
+        ".fa",
+        ".fab",
+        ".fad",
+        ".fal",
+        ".far",
+        ".fas",
+        ".fass",
+        ".fasr",
+        ".fat",
+        ".icofont",
+        '[style*="font-"]',
+        '[class*="icon"]',
+        '[class*="Icon"]',
+        '[class*="symbol"]',
+        '[class*="Symbol"]',
+        ".glyphicon",
+        '[class*="material-symbol"]',
+        '[class*="material-icon"]',
+        "mu",
+        '[class*="mu-"]',
+        ".typcn",
+        '[class*="vjs-"]'
+    ];
     function createTextStyle(config) {
         const lines = [];
-        lines.push(
-            '*:not(pre, pre *, code, .far, .fa, .glyphicon, [class*="vjs-"], .fab, .fa-github, .fas, .material-icons, .icofont, .typcn, mu, [class*="mu-"], .glyphicon, .icon) {'
-        );
+        lines.push(`*:not(${excludedSelectors.join(", ")}) {`);
         if (config.useFont && config.fontFamily) {
             lines.push(`  font-family: ${config.fontFamily} !important;`);
         }
@@ -2186,6 +2217,9 @@
     const resolvers$1 = new Map();
     const rejectors = new Map();
     async function bgFetch(request) {
+        if (window.DarkReader?.Plugins?.fetch) {
+            return window.DarkReader.Plugins.fetch(request);
+        }
         return new Promise((resolve, reject) => {
             const id = generateUID();
             resolvers$1.set(id, resolve);
@@ -3294,7 +3328,7 @@
     class VariablesStore {
         constructor() {
             this.varTypes = new Map();
-            this.rulesQueue = [];
+            this.rulesQueue = new Set();
             this.inlineStyleQueue = [];
             this.definedVars = new Set();
             this.varRefs = new Map();
@@ -3308,7 +3342,7 @@
         }
         clear() {
             this.varTypes.clear();
-            this.rulesQueue.splice(0);
+            this.rulesQueue.clear();
             this.inlineStyleQueue.splice(0);
             this.definedVars.clear();
             this.varRefs.clear();
@@ -3327,14 +3361,14 @@
             );
         }
         addRulesForMatching(rules) {
-            this.rulesQueue.push(rules);
+            this.rulesQueue.add(rules);
         }
         addInlineStyleForMatching(style) {
             this.inlineStyleQueue.push(style);
         }
         matchVariablesAndDependents() {
             if (
-                this.rulesQueue.length === 0 &&
+                this.rulesQueue.size === 0 &&
                 this.inlineStyleQueue.length === 0
             ) {
                 return;
@@ -3520,7 +3554,11 @@
             };
         }
         getModifierForVarDependant(property, sourceValue) {
-            if (sourceValue.match(/^\s*(rgb|hsl)a?\(/)) {
+            const isConstructedColor = sourceValue.match(/^\s*(rgb|hsl)a?\(/);
+            const isSimpleConstructedColor = sourceValue.match(
+                /^rgba?\(var\(--[\-_A-Za-z0-9]+\)(\s*,?\/?\s*0?\.\d+)?\)$/
+            );
+            if (isConstructedColor && !isSimpleConstructedColor) {
                 const isBg = property.startsWith("background");
                 const isText = isTextColorProperty(property);
                 return (theme) => {
@@ -3539,21 +3577,34 @@
                     return modifier(value, theme);
                 };
             }
-            if (property === "background-color") {
+            if (
+                property === "background-color" ||
+                (isSimpleConstructedColor && property === "background")
+            ) {
                 return (theme) => {
+                    const defaultFallback = tryModifyBgColor(
+                        isConstructedColor ? "255, 255, 255" : "#ffffff",
+                        theme
+                    );
                     return replaceCSSVariablesNames(
                         sourceValue,
                         (v) => wrapBgColorVariableName(v),
-                        (fallback) => tryModifyBgColor(fallback, theme)
+                        (fallback) => tryModifyBgColor(fallback, theme),
+                        defaultFallback
                     );
                 };
             }
             if (isTextColorProperty(property)) {
                 return (theme) => {
+                    const defaultFallback = tryModifyTextColor(
+                        isConstructedColor ? "0, 0, 0" : "#000000",
+                        theme
+                    );
                     return replaceCSSVariablesNames(
                         sourceValue,
                         (v) => wrapTextColorVariableName(v),
-                        (fallback) => tryModifyTextColor(fallback, theme)
+                        (fallback) => tryModifyTextColor(fallback, theme),
+                        defaultFallback
                     );
                 };
             }
@@ -3659,7 +3710,7 @@
             this.inlineStyleQueue.forEach((style) => {
                 this.collectVarsFromCSSDeclarations(style);
             });
-            this.rulesQueue.splice(0);
+            this.rulesQueue.clear();
             this.inlineStyleQueue.splice(0);
         }
         collectVarsFromCSSDeclarations(style) {
@@ -3674,7 +3725,7 @@
         }
         shouldProcessRootVariables() {
             return (
-                this.rulesQueue.length > 0 &&
+                this.rulesQueue.size > 0 &&
                 document.documentElement.getAttribute("style")?.includes("--")
             );
         }
@@ -3906,7 +3957,9 @@
             return input;
         }
         const inputLength = input.length;
-        const replacements = matches.map((m) => replacer(m.value));
+        const replacements = matches.map((m) =>
+            replacer(m.value, matches.length)
+        );
         const parts = [];
         parts.push(input.substring(0, matches[0].start));
         for (let i = 0; i < matchesCount; i++) {
@@ -3931,11 +3984,19 @@
         }
         return {name, fallback};
     }
-    function replaceCSSVariablesNames(value, nameReplacer, fallbackReplacer) {
+    function replaceCSSVariablesNames(
+        value,
+        nameReplacer,
+        fallbackReplacer,
+        finalFallback
+    ) {
         const matchReplacer = (match) => {
             const {name, fallback} = getVariableNameAndFallback(match);
             const newName = nameReplacer(name);
             if (!fallback) {
+                if (finalFallback) {
+                    return `var(${newName}, ${finalFallback})`;
+                }
                 return `var(${newName})`;
             }
             let newFallback;
@@ -3979,7 +4040,10 @@
         return value.includes("var(");
     }
     function isConstructedColorVar(value) {
-        return value.match(/^\s*(rgb|hsl)a?\(/);
+        return (
+            value.match(/^\s*(rgb|hsl)a?\(/) ||
+            value.match(/^(((\d{1,3})|(var\([\-_A-Za-z0-9]+\))),?\s*?){3}$/)
+        );
     }
     function isTextColorProperty(property) {
         return (
@@ -4023,10 +4087,11 @@
     function tryModifyBorderColor(color, theme) {
         return handleRawColorValue(color, theme, modifyBorderColor);
     }
-    function insertVarValues(source, varValues, stack = new Set()) {
+    function insertVarValues(source, varValues, fullStack = new Set()) {
         let containsUnresolvedVar = false;
-        const matchReplacer = (match) => {
+        const matchReplacer = (match, count) => {
             const {name, fallback} = getVariableNameAndFallback(match);
+            const stack = count > 1 ? new Set(fullStack) : fullStack;
             if (stack.has(name)) {
                 containsUnresolvedVar = true;
                 return null;
@@ -4308,9 +4373,7 @@
         }
         const shouldAnalyze = Boolean(
             svg &&
-                (svg.role === "img" ||
-                    svg.parentElement?.role === "img" ||
-                    svg.getAttribute("class")?.includes("logo") ||
+                (svg.getAttribute("class")?.includes("logo") ||
                     svg.parentElement?.getAttribute("class")?.includes("logo"))
         );
         svgAnalysisConditionCache.set(svg, shouldAnalyze);
@@ -4435,7 +4498,7 @@
             }
             if (shouldAnalyzeSVGAsImage(svg)) {
                 svgInversionCache.add(svg);
-                const handleSVGRoot = () => {
+                const analyzeSVGAsImage = () => {
                     let svgString = svg.outerHTML;
                     svgString = svgString.replaceAll(
                         '<style class="darkreader darkreader--sync" media="screen"></style>',
@@ -4453,13 +4516,16 @@
                                 "data-darkreader-inline-invert",
                                 ""
                             );
+                        } else {
+                            svg.removeAttribute(
+                                "data-darkreader-inline-invert"
+                            );
                         }
                     });
                 };
-                if (isReadyStateComplete()) {
-                    handleSVGRoot();
-                } else {
-                    addReadyStateCompleteListener(handleSVGRoot);
+                analyzeSVGAsImage();
+                if (!isDOMReady()) {
+                    addDOMReadyListener(analyzeSVGAsImage);
                 }
                 return;
             }
@@ -6036,7 +6102,6 @@
                 const sheet = newSheets[i];
                 if (overrides.has(sheet)) {
                     newSheets.splice(i, 1);
-                    overrides.delete(sheet);
                 }
             }
             if (node.adoptedStyleSheets.length !== newSheets.length) {
@@ -7276,6 +7341,24 @@
         addMetaListener();
         return false;
     }
+    let interceptorAttempts = 2;
+    function interceptOldScript({success, failure}) {
+        if (--interceptorAttempts <= 0) {
+            failure();
+            return;
+        }
+        const oldMeta = document.head.querySelector('meta[name="darkreader"]');
+        if (!oldMeta || oldMeta.content === INSTANCE_ID) {
+            return;
+        }
+        const lock = document.createElement("meta");
+        lock.name = "darkreader-lock";
+        document.head.append(lock);
+        queueMicrotask(() => {
+            lock.remove();
+            success();
+        });
+    }
     function createOrUpdateDynamicThemeInternal(
         themeConfig,
         dynamicThemeFixes,
@@ -7302,20 +7385,32 @@
             });
         }
         isIFrame$1 = iframe;
-        if (document.head) {
-            if (isAnotherDarkReaderInstanceActive()) {
+        const ready = () => {
+            const success = () => {
+                document.documentElement.setAttribute(
+                    "data-darkreader-mode",
+                    "dynamic"
+                );
+                document.documentElement.setAttribute(
+                    "data-darkreader-scheme",
+                    theme.mode ? "dark" : "dimmed"
+                );
+                createThemeAndWatchForUpdates();
+            };
+            const failure = () => {
                 removeDynamicTheme();
-                return;
+            };
+            if (isAnotherDarkReaderInstanceActive()) {
+                interceptOldScript({
+                    success,
+                    failure
+                });
+            } else {
+                success();
             }
-            document.documentElement.setAttribute(
-                "data-darkreader-mode",
-                "dynamic"
-            );
-            document.documentElement.setAttribute(
-                "data-darkreader-scheme",
-                theme.mode ? "dark" : "dimmed"
-            );
-            createThemeAndWatchForUpdates();
+        };
+        if (document.head) {
+            ready();
         } else {
             if (!isFirefox) {
                 const fallbackStyle = createOrUpdateStyle(
@@ -7329,11 +7424,7 @@
             const headObserver = new MutationObserver(() => {
                 if (document.head) {
                     headObserver.disconnect();
-                    if (isAnotherDarkReaderInstanceActive()) {
-                        removeDynamicTheme();
-                        return;
-                    }
-                    createThemeAndWatchForUpdates();
+                    ready();
                 }
             });
             headObserver.observe(document, {childList: true, subtree: true});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "darkreader",
-  "version": "4.9.84",
+  "version": "4.9.86",
   "description": "Dark mode for every website",
   "scripts": {
     "api": "node --max-old-space-size=3072 tasks/cli.js build --api",
@@ -9,6 +9,7 @@
     "code-style": "npm run lint",
     "debug": "node --max-old-space-size=3072 tasks/cli.js build --debug",
     "debug:watch": "node --max-old-space-size=3072 tasks/cli.js build --debug --watch --chrome --firefox",
+    "debug:watch:mv3": "node --max-old-space-size=3072 tasks/cli.js build --debug --watch --chrome-mv3",
     "dependencies:upgrade": "node tasks/dependencies.js",
     "lint": "eslint --ignore-pattern '!.eslint-plugin-local.js' -- 'src/**/*.ts' 'src/**/*.tsx' 'tasks/**/*.js' 'tests/[!coverage]**/*.js' 'tests/**/*.ts' '.eslintrc.js' 'index.d.ts'",
     "lint:bundle": "(node ./tasks/check-exists.js ./build/debug/chrome || node tasks/build.js --debug --api --chrome) && eslint -- 'build/debug/chrome/**/*.js' 'darkreader.js'",
@@ -58,21 +59,21 @@
     "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-replace": "5.0.5",
     "@rollup/plugin-typescript": "11.1.6",
-    "@types/chrome": "0.0.266",
-    "@types/eslint": "8.56.7",
+    "@types/chrome": "0.0.268",
+    "@types/eslint": "8.56.10",
     "@types/jasmine": "5.1.4",
     "@types/jest": "29.5.12",
     "@types/karma": "6.3.8",
     "@types/karma-coverage": "2.0.3",
-    "@types/node": "20.12.6",
+    "@types/node": "20.12.12",
     "@types/ws": "8.5.10",
-    "@typescript-eslint/eslint-plugin": "7.6.0",
-    "@typescript-eslint/parser": "7.6.0",
+    "@typescript-eslint/eslint-plugin": "7.9.0",
+    "@typescript-eslint/parser": "7.9.0",
     "chokidar": "3.6.0",
     "eslint": "8.57.0",
     "eslint-plugin-compat": "4.2.0",
     "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-local": "4.2.1",
+    "eslint-plugin-local": "4.2.2",
     "globby": "14.0.1",
     "jasmine-core": "5.1.2",
     "jest": "29.7.0",
@@ -88,14 +89,14 @@
     "less": "4.2.0",
     "malevic": "0.20.1",
     "prettier": "3.2.5",
-    "puppeteer-core": "22.6.3",
-    "rollup": "4.14.1",
+    "puppeteer-core": "22.8.2",
+    "rollup": "4.17.2",
     "rollup-plugin-istanbul": "5.0.0",
     "ts-jest": "29.1.2",
     "tslib": "2.6.2",
-    "typescript": "5.4.4",
+    "typescript": "5.4.5",
     "web-ext": "7.11.0",
-    "ws": "8.16.0",
+    "ws": "8.17.0",
     "yazl": "2.5.1"
   }
 }