darkreader 4.9.85 → 4.9.86

package/darkreader.js

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.85
+ * Dark Reader v4.9.86
  * 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;
@@ -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) {
@@ -7339,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,
@@ -7365,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(
@@ -7392,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.85",
+  "version": "4.9.86",
   "description": "Dark mode for every website",
   "scripts": {
     "api": "node --max-old-space-size=3072 tasks/cli.js build --api",
@@ -59,16 +59,16 @@
     "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-replace": "5.0.5",
     "@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.12.12",
     "@types/ws": "8.5.10",
-    "@typescript-eslint/eslint-plugin": "7.7.1",
-    "@typescript-eslint/parser": "7.7.1",
+    "@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",
@@ -89,8 +89,8 @@
     "less": "4.2.0",
     "malevic": "0.20.1",
     "prettier": "3.2.5",
-    "puppeteer-core": "22.7.1",
-    "rollup": "4.17.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",