darkreader 4.9.81 → 4.9.83

package/darkreader.js

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.81
+ * Dark Reader v4.9.83
  * https://darkreader.org/
  */
 
@@ -212,6 +212,10 @@
         });
         return dataURL;
     }
+    async function loadAsText(url, mimeType, origin) {
+        const response = await getOKResponse(url, mimeType, origin);
+        return await response.text();
+    }
 
     const throwCORSError = async (url) => {
         return Promise.reject(
@@ -785,6 +789,15 @@
         }
         return matches;
     }
+    function getHashCode(text) {
+        const len = text.length;
+        let hash = 0;
+        for (let i = 0; i < len; i++) {
+            const c = text.charCodeAt(i);
+            hash = ((hash << 5) - hash + c) & 4294967295;
+        }
+        return hash;
+    }
     function escapeRegExpSpecialChars(input) {
         return input.replaceAll(/[\^$.*+?\(\)\[\]{}|\-\\]/g, "\\$&");
     }
@@ -1005,26 +1018,33 @@
             cssText.includes("background-color: ;") &&
             !style.getPropertyValue("background")
         ) {
-            const parentRule = style.parentRule;
-            if (isStyleRule(parentRule)) {
-                const sourceCSSText =
-                    parentRule.parentStyleSheet?.ownerNode?.textContent;
-                if (sourceCSSText) {
-                    let escapedSelector = escapeRegExpSpecialChars(
-                        parentRule.selectorText
-                    );
-                    escapedSelector = escapedSelector.replaceAll(
-                        /\s+/g,
-                        "\\s*"
-                    );
-                    escapedSelector = escapedSelector.replaceAll(/::/g, "::?");
-                    const regexp = new RegExp(
-                        `${escapedSelector}\\s*{[^}]*?background:\\s*([^;}]+)`
-                    );
-                    const match = sourceCSSText.match(regexp);
-                    if (match) {
-                        iterate("background", match[1]);
-                    }
+            handleEmptyShorthand("background", style, iterate);
+        }
+        if (
+            cssText.includes("border-") &&
+            cssText.includes("-color: ;") &&
+            !style.getPropertyValue("border")
+        ) {
+            handleEmptyShorthand("border", style, iterate);
+        }
+    }
+    function handleEmptyShorthand(shorthand, style, iterate) {
+        const parentRule = style.parentRule;
+        if (isStyleRule(parentRule)) {
+            const sourceCSSText =
+                parentRule.parentStyleSheet?.ownerNode?.textContent;
+            if (sourceCSSText) {
+                let escapedSelector = escapeRegExpSpecialChars(
+                    parentRule.selectorText
+                );
+                escapedSelector = escapedSelector.replaceAll(/\s+/g, "\\s*");
+                escapedSelector = escapedSelector.replaceAll(/::/g, "::?");
+                const regexp = new RegExp(
+                    `${escapedSelector}\\s*{[^}]*?${shorthand}:\\s*([^;}]+)`
+                );
+                const match = sourceCSSText.match(regexp);
+                if (match) {
+                    iterate(shorthand, match[1]);
                 }
             }
         }
@@ -1120,7 +1140,7 @@
         if (supportsRules.has(rule)) {
             return true;
         }
-        if (rule.cssText.startsWith("@supports")) {
+        if (rule instanceof CSSSupportsRule) {
             supportsRules.add(rule);
             return true;
         }
@@ -1136,7 +1156,7 @@
         if (layerRules.has(rule)) {
             return true;
         }
-        if (rule.cssText.startsWith("@layer") && rule.cssRules) {
+        if (rule instanceof CSSLayerBlockRule) {
             layerRules.add(rule);
             return true;
         }
@@ -2248,8 +2268,7 @@
                     const analysis = analyzeImage(image);
                     resolve({
                         src: url,
-                        blob,
-                        dataURL,
+                        dataURL: analysis.isLarge ? "" : dataURL,
                         width: image.width,
                         height: image.height,
                         ...analysis
@@ -2502,7 +2521,8 @@
         if (!isBlobURLSupported) {
             return null;
         }
-        let blobURL = dataURLBlobURLs.get(dataURL);
+        const hash = getHashCode(dataURL);
+        let blobURL = dataURLBlobURLs.get(hash);
         if (blobURL) {
             return blobURL;
         }
@@ -2512,7 +2532,7 @@
             blob = await response.blob();
         }
         blobURL = URL.createObjectURL(blob);
-        dataURLBlobURLs.set(dataURL, blobURL);
+        dataURLBlobURLs.set(hash, blobURL);
         return blobURL;
     }
     function cleanImageProcessingCache() {
@@ -2628,7 +2648,29 @@
             property === "stroke" ||
             property === "stop-color"
         ) {
-            modifier = getColorModifier(property, value, rule);
+            if (
+                property.startsWith("border") &&
+                property !== "border-color" &&
+                value === "initial"
+            ) {
+                const borderSideProp = property.substring(
+                    0,
+                    property.length - 6
+                );
+                const borderSideVal =
+                    rule.style.getPropertyValue(borderSideProp);
+                if (
+                    borderSideVal.startsWith("0px") ||
+                    borderSideVal === "none"
+                ) {
+                    property = borderSideProp;
+                    modifier = borderSideVal;
+                } else {
+                    modifier = value;
+                }
+            } else {
+                modifier = getColorModifier(property, value, rule);
+            }
         } else if (
             property === "background-image" ||
             property === "list-style-image"
@@ -2664,11 +2706,12 @@
             );
             lines.push("}");
         }
-        if (isCSSColorSchemePropSupported) {
+        if (isCSSColorSchemePropSupported && theme.mode === 1) {
             lines.push("html {");
-            lines.push(
-                `    color-scheme: ${theme.mode === 1 ? "dark" : "dark light"} !important;`
-            );
+            lines.push(`    color-scheme: dark !important;`);
+            lines.push("}");
+            lines.push("iframe {");
+            lines.push(`    color-scheme: initial;`);
             lines.push("}");
         }
         const bgSelectors = joinSelectors(
@@ -4572,6 +4615,13 @@
     const asyncQueue = createAsyncTasksQueue();
     function createStyleSheetModifier() {
         let renderId = 0;
+        function getStyleRuleHash(rule) {
+            let cssText = rule.cssText;
+            if (isMediaRule(rule.parentRule)) {
+                cssText = `${rule.parentRule.media.mediaText} { ${cssText} }`;
+            }
+            return getHashCode(cssText);
+        }
         const rulesTextCache = new Set();
         const rulesModCache = new Map();
         const varTypeChangeCleaners = new Set();
@@ -4601,23 +4651,17 @@
             iterateCSSRules(
                 rules,
                 (rule) => {
-                    let cssText = rule.cssText;
+                    const hash = getStyleRuleHash(rule);
                     let textDiffersFromPrev = false;
-                    notFoundCacheKeys.delete(cssText);
-                    if (isMediaRule(rule.parentRule)) {
-                        cssText += `;${rule.parentRule.media.mediaText}`;
-                    }
-                    if (isLayerRule(rule.parentRule)) {
-                        cssText += `;${rule.parentRule.name}`;
-                    }
-                    if (!rulesTextCache.has(cssText)) {
-                        rulesTextCache.add(cssText);
+                    notFoundCacheKeys.delete(hash);
+                    if (!rulesTextCache.has(hash)) {
+                        rulesTextCache.add(hash);
                         textDiffersFromPrev = true;
                     }
                     if (textDiffersFromPrev) {
                         rulesChanged = true;
                     } else {
-                        modRules.push(rulesModCache.get(cssText));
+                        modRules.push(rulesModCache.get(hash));
                         return;
                     }
                     if (rule.style.all === "revert") {
@@ -4651,7 +4695,7 @@
                         };
                         modRules.push(modRule);
                     }
-                    rulesModCache.set(cssText, modRule);
+                    rulesModCache.set(hash, modRule);
                 },
                 () => {
                     hasNonLoadedLink = true;
@@ -5509,11 +5553,15 @@
         if (url.startsWith("data:")) {
             return await (await fetch(url)).text();
         }
+        const parsedURL = new URL(url);
+        if (parsedURL.origin === location.origin) {
+            return await loadAsText(url, "text/css", location.origin);
+        }
         return await bgFetch({
             url,
             responseType: "text",
             mimeType: "text/css",
-            origin: window.location.origin
+            origin: location.origin
         });
     }
     async function replaceCSSImports(cssText, basePath, cache = new Map()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "darkreader",
-  "version": "4.9.81",
+  "version": "4.9.83",
   "description": "Dark mode for every website",
   "scripts": {
     "api": "node --max-old-space-size=3072 tasks/cli.js build --api",
@@ -58,16 +58,16 @@
     "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-replace": "5.0.5",
     "@rollup/plugin-typescript": "11.1.6",
-    "@types/chrome": "0.0.263",
-    "@types/eslint": "8.56.6",
+    "@types/chrome": "0.0.266",
+    "@types/eslint": "8.56.7",
     "@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.2",
+    "@types/node": "20.12.6",
     "@types/ws": "8.5.10",
-    "@typescript-eslint/eslint-plugin": "7.4.0",
-    "@typescript-eslint/parser": "7.4.0",
+    "@typescript-eslint/eslint-plugin": "7.6.0",
+    "@typescript-eslint/parser": "7.6.0",
     "chokidar": "3.6.0",
     "eslint": "8.57.0",
     "eslint-plugin-compat": "4.2.0",
@@ -88,12 +88,12 @@
     "less": "4.2.0",
     "malevic": "0.20.1",
     "prettier": "3.2.5",
-    "puppeteer-core": "22.6.1",
-    "rollup": "4.13.2",
+    "puppeteer-core": "22.6.3",
+    "rollup": "4.14.1",
     "rollup-plugin-istanbul": "5.0.0",
     "ts-jest": "29.1.2",
     "tslib": "2.6.2",
-    "typescript": "5.4.3",
+    "typescript": "5.4.4",
     "web-ext": "7.11.0",
     "ws": "8.16.0",
     "yazl": "2.5.1"