darkreader 4.9.85 → 4.9.87

package/README.md

@@ -1,7 +1,7 @@
 <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 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>
+<p align="center"><a rel="noreferrer noopener" href="https://chromewebstore.google.com/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>
 
 <h2 align="center">Dark Reader</h2>
 <br/>

package/darkreader.js

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.85
+ * Dark Reader v4.9.87
  * https://darkreader.org/
  */
 
@@ -2217,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);
@@ -3325,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();
@@ -3339,7 +3342,7 @@
         }
         clear() {
             this.varTypes.clear();
-            this.rulesQueue.splice(0);
+            this.rulesQueue.clear();
             this.inlineStyleQueue.splice(0);
             this.definedVars.clear();
             this.varRefs.clear();
@@ -3358,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;
@@ -3643,7 +3646,7 @@
                     const modified = modify();
                     if (unknownVars.size > 0) {
                         const isFallbackResolved = modified.match(
-                            /^var\(.*?, var\(--darkreader-bg--.*\)\)$/
+                            /^var\(.*?, (var\(--darkreader-bg--.*\))|(#[0-9A-Fa-f]+)|([a-z]+)|(rgba?\(.+\))|(hsla?\(.+\))\)$/
                         );
                         if (isFallbackResolved) {
                             return modified;
@@ -3707,7 +3710,7 @@
             this.inlineStyleQueue.forEach((style) => {
                 this.collectVarsFromCSSDeclarations(style);
             });
-            this.rulesQueue.splice(0);
+            this.rulesQueue.clear();
             this.inlineStyleQueue.splice(0);
         }
         collectVarsFromCSSDeclarations(style) {
@@ -3722,7 +3725,7 @@
         }
         shouldProcessRootVariables() {
             return (
-                this.rulesQueue.length > 0 &&
+                this.rulesQueue.size > 0 &&
                 document.documentElement.getAttribute("style")?.includes("--")
             );
         }
@@ -6099,7 +6102,6 @@
                 const sheet = newSheets[i];
                 if (overrides.has(sheet)) {
                     newSheets.splice(i, 1);
-                    overrides.delete(sheet);
                 }
             }
             if (node.adoptedStyleSheets.length !== newSheets.length) {
@@ -6345,7 +6347,19 @@
             document.addEventListener(type, listener, options);
             cleaners.push(() => document.removeEventListener(type, listener));
         }
+        function disableConflictingPlugins() {
+            const disableWPDarkMode = () => {
+                if (window?.WPDarkMode?.deactivate) {
+                    window.WPDarkMode.deactivate();
+                }
+            };
+            disableWPDarkMode();
+        }
         documentEventListener("__darkreader__cleanUp", cleanUp);
+        documentEventListener(
+            "__darkreader__disableConflictingPlugins",
+            disableConflictingPlugins
+        );
         function overrideProperty(cls, prop, overrides) {
             const proto = cls.prototype;
             const oldDescriptor = Object.getOwnPropertyDescriptor(proto, prop);
@@ -7324,10 +7338,10 @@
         metaElement.content = INSTANCE_ID;
         document.head.appendChild(metaElement);
     }
+    function isDRLocked() {
+        return document.querySelector('meta[name="darkreader-lock"]') != null;
+    }
     function isAnotherDarkReaderInstanceActive() {
-        if (document.querySelector('meta[name="darkreader-lock"]')) {
-            return true;
-        }
         const meta = document.querySelector('meta[name="darkreader"]');
         if (meta) {
             if (meta.content !== INSTANCE_ID) {
@@ -7339,6 +7353,56 @@
         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 disableConflictingPlugins() {
+        if (document.documentElement.hasAttribute("data-wp-dark-mode-preset")) {
+            const disableWPDarkMode = () => {
+                document.dispatchEvent(
+                    new CustomEvent("__darkreader__disableConflictingPlugins")
+                );
+                document.documentElement.classList.remove(
+                    "wp-dark-mode-active"
+                );
+                document.documentElement.removeAttribute(
+                    "data-wp-dark-mode-active"
+                );
+            };
+            disableWPDarkMode();
+            const observer = new MutationObserver(() => {
+                if (
+                    document.documentElement.classList.contains(
+                        "wp-dark-mode-active"
+                    ) ||
+                    document.documentElement.hasAttribute(
+                        "data-wp-dark-mode-active"
+                    )
+                ) {
+                    disableWPDarkMode();
+                }
+            });
+            observer.observe(document.documentElement, {
+                attributes: true,
+                attributeFilter: ["class", "data-wp-dark-mode-active"]
+            });
+        }
+    }
     function createOrUpdateDynamicThemeInternal(
         themeConfig,
         dynamicThemeFixes,
@@ -7365,20 +7429,35 @@
             });
         }
         isIFrame$1 = iframe;
-        if (document.head) {
-            if (isAnotherDarkReaderInstanceActive()) {
+        const ready = () => {
+            const success = () => {
+                disableConflictingPlugins();
+                document.documentElement.setAttribute(
+                    "data-darkreader-mode",
+                    "dynamic"
+                );
+                document.documentElement.setAttribute(
+                    "data-darkreader-scheme",
+                    theme.mode ? "dark" : "dimmed"
+                );
+                createThemeAndWatchForUpdates();
+            };
+            const failure = () => {
                 removeDynamicTheme();
-                return;
+            };
+            if (isDRLocked()) {
+                removeNode(document.querySelector(".darkreader--fallback"));
+            } else 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(
@@ -7392,11 +7471,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.85",
+  "version": "4.9.87",
   "description": "Dark mode for every website",
   "scripts": {
     "api": "node --max-old-space-size=3072 tasks/cli.js build --api",
@@ -57,21 +57,21 @@
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "15.2.3",
-    "@rollup/plugin-replace": "5.0.5",
+    "@rollup/plugin-replace": "5.0.7",
     "@rollup/plugin-typescript": "11.1.6",
-    "@types/chrome": "0.0.267",
+    "@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.7",
+    "@types/node": "20.14.9",
     "@types/ws": "8.5.10",
-    "@typescript-eslint/eslint-plugin": "7.7.1",
-    "@typescript-eslint/parser": "7.7.1",
+    "@typescript-eslint/eslint-plugin": "7.14.1",
+    "@typescript-eslint/parser": "7.14.1",
     "chokidar": "3.6.0",
     "eslint": "8.57.0",
-    "eslint-plugin-compat": "4.2.0",
+    "eslint-plugin-compat": "5.0.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-local": "4.2.2",
     "globby": "14.0.1",
@@ -88,15 +88,15 @@
     "karma-spec-reporter": "0.0.36",
     "less": "4.2.0",
     "malevic": "0.20.1",
-    "prettier": "3.2.5",
-    "puppeteer-core": "22.7.1",
-    "rollup": "4.17.1",
+    "prettier": "3.3.2",
+    "puppeteer-core": "22.12.1",
+    "rollup": "4.18.0",
     "rollup-plugin-istanbul": "5.0.0",
-    "ts-jest": "29.1.2",
-    "tslib": "2.6.2",
-    "typescript": "5.4.5",
-    "web-ext": "7.11.0",
-    "ws": "8.17.0",
+    "ts-jest": "29.1.5",
+    "tslib": "2.6.3",
+    "typescript": "5.5.2",
+    "web-ext": "8.2.0",
+    "ws": "8.17.1",
     "yazl": "2.5.1"
   }
 }