darkreader 4.9.109 → 4.9.112

package/README.md

@@ -181,7 +181,7 @@ For Dark Reader, the option "Run on sites with restrictions" is not shown becaus
 
 The fact that it is a Recommended extension means that it meets the "highest standards of security, functionality, and user experience". The quarantined domains are only related to extension security. Because Dark Reader is considered secure by Mozilla, that option is not shown, meaning **it will always run even on quarantined domains** (but will still obey the "restricted domains" list if it is not empty).
 
-Regarding quarantined domains specifically, there is this [comment from Firefox's source code:](https://searchfox.org/mozilla-central/source/toolkit/components/extensions/Extension.sys.mjs#2937-2938)
+Regarding quarantined domains specifically, there is this [comment from Firefox's source code](https://searchfox.org/mozilla-central/rev/1838f847aa3bf909c3d34a94a8f0cd7e37fca086/toolkit/components/extensions/Extension.sys.mjs#3470-3471):
 
 ```
 // Privileged extensions and any extensions with a recommendation state are

package/darkreader.js

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.109
+ * Dark Reader v4.9.112
  * https://darkreader.org/
  */
 
@@ -4026,10 +4026,7 @@
                     };
                     const modified = modify();
                     if (unknownVars.size > 0) {
-                        const isFallbackResolved = modified.match(
-                            /^var\(.*?, ((var\(--darkreader-bg--.*\))|(#[0-9A-Fa-f]+)|([a-z]+)|(rgba?\(.+\))|(hsla?\(.+\)))\)$/
-                        );
-                        if (isFallbackResolved) {
+                        if (isFallbackResolved(modified)) {
                             return modified;
                         }
                         return new Promise((resolve) => {
@@ -4428,6 +4425,43 @@
             value.match(/^(((\d{1,3})|(var\([\-_A-Za-z0-9]+\))),?\s*?){3}$/)
         );
     }
+    function isFallbackResolved(modified) {
+        if (modified.startsWith("var(") && modified.endsWith(")")) {
+            const hasNestedBrackets = modified.endsWith("))");
+            const hasDoubleNestedBrackets = modified.endsWith(")))");
+            const lastOpenBracketIndex = hasNestedBrackets
+                ? modified.lastIndexOf("(")
+                : -1;
+            const firstOpenBracketIndex = hasDoubleNestedBrackets
+                ? modified.lastIndexOf("(", lastOpenBracketIndex - 1)
+                : lastOpenBracketIndex;
+            const commaIndex = modified.lastIndexOf(
+                ",",
+                hasNestedBrackets ? firstOpenBracketIndex : modified.length
+            );
+            if (commaIndex < 0 || modified[commaIndex + 1] !== " ") {
+                return false;
+            }
+            const fallback = modified.slice(
+                commaIndex + 2,
+                modified.length - 1
+            );
+            if (hasNestedBrackets) {
+                return (
+                    fallback.startsWith("rgb(") ||
+                    fallback.startsWith("rgba(") ||
+                    fallback.startsWith("hsl(") ||
+                    fallback.startsWith("hsla(") ||
+                    fallback.startsWith("var(--darkreader-bg--") ||
+                    fallback.match(
+                        /^var\(--darkreader-background-[0-9a-z]+, #[0-9a-z]+\)$/
+                    )
+                );
+            }
+            return fallback.match(/^(#[0-9a-f]+)|([a-z]+)$/i);
+        }
+        return false;
+    }
     const textColorProps = [
         "color",
         "caret-color",
@@ -5131,14 +5165,38 @@
         return {render, destroy, commands};
     }
 
-    const hostsBreakingOnStylePosition = ["www.diffusioneshop.com", "zhale.me"];
+    const hostsBreakingOnStylePosition = [
+        "www.berlingske.dk",
+        "www.bloomberg.com",
+        "www.diffusioneshop.com",
+        "www.weekendavisen.dk",
+        "zhale.me"
+    ];
     const mode = hostsBreakingOnStylePosition.includes(location.hostname)
         ? "away"
         : "next";
     function getStyleInjectionMode() {
         return mode;
     }
+    const stylesWaitingForBody = new Set();
+    let bodyObserver;
     function injectStyleAway(styleElement) {
+        if (!document.body) {
+            stylesWaitingForBody.add(styleElement);
+            if (!bodyObserver) {
+                bodyObserver = new MutationObserver(() => {
+                    if (document.body) {
+                        bodyObserver.disconnect();
+                        bodyObserver = null;
+                        stylesWaitingForBody.forEach((el) =>
+                            injectStyleAway(el)
+                        );
+                        stylesWaitingForBody.clear();
+                    }
+                });
+            }
+            return;
+        }
         let container = document.body.querySelector(
             ".darkreader-style-container"
         );
@@ -5148,9 +5206,32 @@
             container.classList.add("darkreader-style-container");
             container.style.display = "none";
             document.body.append(container);
+            containerObserver = new MutationObserver(() => {
+                if (container?.nextElementSibling != null) {
+                    container
+                        .querySelectorAll(".darkreader--sync")
+                        .forEach((el) => {
+                            if (el.sheet.cssRules.length > 0) {
+                                let cssText = "";
+                                for (const rule of el.sheet.cssRules) {
+                                    cssText += rule.cssText;
+                                }
+                                el.textContent = cssText;
+                            }
+                        });
+                    document.body.append(container);
+                }
+            });
+            containerObserver.observe(document.body, {childList: true});
         }
         container.append(styleElement);
     }
+    let containerObserver;
+    function removeStyleContainer() {
+        bodyObserver?.disconnect();
+        containerObserver?.disconnect();
+        document.querySelector(".darkreader-style-container")?.remove();
+    }
 
     const overrides = {
         "background-color": {
@@ -6292,7 +6373,8 @@
                     force,
                     isAsyncCancelled
                 });
-                isOverrideEmpty = syncStyle.sheet.cssRules.length === 0;
+                isOverrideEmpty =
+                    !syncStyle.sheet || syncStyle.sheet.cssRules.length === 0;
                 if (sheetModifier.shouldRebuildStyle()) {
                     addReadyStateCompleteListener(() => update());
                 }
@@ -8084,6 +8166,7 @@
         loadingStyles.clear();
         cleanLoadingLinks();
         forEach(document.querySelectorAll(".darkreader"), removeNode);
+        removeStyleContainer();
         adoptedStyleManagers.forEach((manager) => manager.destroy());
         adoptedStyleManagers.splice(0);
         adoptedStyleFallbacks.forEach((fallback) => fallback.destroy());

package/darkreader.mjs

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.109
+ * Dark Reader v4.9.112
  * https://darkreader.org/
  */
 
@@ -3896,10 +3896,7 @@ class VariablesStore {
                 };
                 const modified = modify();
                 if (unknownVars.size > 0) {
-                    const isFallbackResolved = modified.match(
-                        /^var\(.*?, ((var\(--darkreader-bg--.*\))|(#[0-9A-Fa-f]+)|([a-z]+)|(rgba?\(.+\))|(hsla?\(.+\)))\)$/
-                    );
-                    if (isFallbackResolved) {
+                    if (isFallbackResolved(modified)) {
                         return modified;
                     }
                     return new Promise((resolve) => {
@@ -4290,6 +4287,40 @@ function isConstructedColorVar(value) {
         value.match(/^(((\d{1,3})|(var\([\-_A-Za-z0-9]+\))),?\s*?){3}$/)
     );
 }
+function isFallbackResolved(modified) {
+    if (modified.startsWith("var(") && modified.endsWith(")")) {
+        const hasNestedBrackets = modified.endsWith("))");
+        const hasDoubleNestedBrackets = modified.endsWith(")))");
+        const lastOpenBracketIndex = hasNestedBrackets
+            ? modified.lastIndexOf("(")
+            : -1;
+        const firstOpenBracketIndex = hasDoubleNestedBrackets
+            ? modified.lastIndexOf("(", lastOpenBracketIndex - 1)
+            : lastOpenBracketIndex;
+        const commaIndex = modified.lastIndexOf(
+            ",",
+            hasNestedBrackets ? firstOpenBracketIndex : modified.length
+        );
+        if (commaIndex < 0 || modified[commaIndex + 1] !== " ") {
+            return false;
+        }
+        const fallback = modified.slice(commaIndex + 2, modified.length - 1);
+        if (hasNestedBrackets) {
+            return (
+                fallback.startsWith("rgb(") ||
+                fallback.startsWith("rgba(") ||
+                fallback.startsWith("hsl(") ||
+                fallback.startsWith("hsla(") ||
+                fallback.startsWith("var(--darkreader-bg--") ||
+                fallback.match(
+                    /^var\(--darkreader-background-[0-9a-z]+, #[0-9a-z]+\)$/
+                )
+            );
+        }
+        return fallback.match(/^(#[0-9a-f]+)|([a-z]+)$/i);
+    }
+    return false;
+}
 const textColorProps = [
     "color",
     "caret-color",
@@ -4983,14 +5014,36 @@ function createAdoptedStyleSheetFallback() {
     return {render, destroy, commands};
 }
 
-const hostsBreakingOnStylePosition = ["www.diffusioneshop.com", "zhale.me"];
+const hostsBreakingOnStylePosition = [
+    "www.berlingske.dk",
+    "www.bloomberg.com",
+    "www.diffusioneshop.com",
+    "www.weekendavisen.dk",
+    "zhale.me"
+];
 const mode = hostsBreakingOnStylePosition.includes(location.hostname)
     ? "away"
     : "next";
 function getStyleInjectionMode() {
     return mode;
 }
+const stylesWaitingForBody = new Set();
+let bodyObserver;
 function injectStyleAway(styleElement) {
+    if (!document.body) {
+        stylesWaitingForBody.add(styleElement);
+        if (!bodyObserver) {
+            bodyObserver = new MutationObserver(() => {
+                if (document.body) {
+                    bodyObserver.disconnect();
+                    bodyObserver = null;
+                    stylesWaitingForBody.forEach((el) => injectStyleAway(el));
+                    stylesWaitingForBody.clear();
+                }
+            });
+        }
+        return;
+    }
     let container = document.body.querySelector(".darkreader-style-container");
     if (!container) {
         container = document.createElement("div");
@@ -4998,9 +5051,32 @@ function injectStyleAway(styleElement) {
         container.classList.add("darkreader-style-container");
         container.style.display = "none";
         document.body.append(container);
+        containerObserver = new MutationObserver(() => {
+            if (container?.nextElementSibling != null) {
+                container
+                    .querySelectorAll(".darkreader--sync")
+                    .forEach((el) => {
+                        if (el.sheet.cssRules.length > 0) {
+                            let cssText = "";
+                            for (const rule of el.sheet.cssRules) {
+                                cssText += rule.cssText;
+                            }
+                            el.textContent = cssText;
+                        }
+                    });
+                document.body.append(container);
+            }
+        });
+        containerObserver.observe(document.body, {childList: true});
     }
     container.append(styleElement);
 }
+let containerObserver;
+function removeStyleContainer() {
+    bodyObserver?.disconnect();
+    containerObserver?.disconnect();
+    document.querySelector(".darkreader-style-container")?.remove();
+}
 
 const overrides = {
     "background-color": {
@@ -6096,7 +6172,8 @@ function manageStyle(element, {update, loadingStart, loadingEnd}) {
                 force,
                 isAsyncCancelled
             });
-            isOverrideEmpty = syncStyle.sheet.cssRules.length === 0;
+            isOverrideEmpty =
+                !syncStyle.sheet || syncStyle.sheet.cssRules.length === 0;
             if (sheetModifier.shouldRebuildStyle()) {
                 addReadyStateCompleteListener(() => update());
             }
@@ -7830,6 +7907,7 @@ function removeDynamicTheme() {
     loadingStyles.clear();
     cleanLoadingLinks();
     forEach(document.querySelectorAll(".darkreader"), removeNode);
+    removeStyleContainer();
     adoptedStyleManagers.forEach((manager) => manager.destroy());
     adoptedStyleManagers.splice(0);
     adoptedStyleFallbacks.forEach((fallback) => fallback.destroy());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "darkreader",
-  "version": "4.9.109",
+  "version": "4.9.112",
   "description": "Dark mode for every website",
   "scripts": {
     "api": "node --max-old-space-size=3072 tasks/cli.js build --api",
@@ -26,6 +26,7 @@
     "test:chrome-mv3": "node tasks/cli.js build --debug --test --chrome-mv3 && jest --config=tests/browser/jest.config.chrome-mv3.mjs --runInBand",
     "test:ci": "npm run test:unit",
     "test:coverage": "jest --config=tests/unit/jest.config.mjs --coverage",
+    "test:edge": "node tasks/cli.js build --debug --test --plus && jest --config=tests/browser/jest.config.mjs --runInBand",
     "test:firefox": "node tasks/cli.js build --debug --test --firefox-mv2 && 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",
@@ -65,28 +66,28 @@
     "malevic": "0.20.2"
   },
   "devDependencies": {
-    "@eslint/compat": "1.3.0",
+    "@eslint/compat": "1.4.0",
     "@eslint/eslintrc": "3.3.1",
-    "@eslint/js": "9.29.0",
-    "@rollup/plugin-node-resolve": "16.0.1",
+    "@eslint/js": "9.37.0",
+    "@rollup/plugin-node-resolve": "16.0.3",
     "@rollup/plugin-replace": "6.0.2",
-    "@rollup/plugin-typescript": "12.1.3",
-    "@stylistic/eslint-plugin": "5.0.0",
-    "@types/chrome": "0.0.326",
+    "@rollup/plugin-typescript": "12.1.4",
+    "@stylistic/eslint-plugin": "5.4.0",
+    "@types/chrome": "0.1.24",
     "@types/eslint": "9.6.1",
-    "@types/jasmine": "5.1.8",
+    "@types/jasmine": "5.1.10",
     "@types/jest": "30.0.0",
     "@types/karma": "6.3.9",
     "@types/karma-coverage": "2.0.3",
-    "@types/node": "24.0.3",
+    "@types/node": "24.7.2",
     "@types/ws": "8.18.1",
     "chokidar": "4.0.3",
     "eslint-plugin-compat": "6.0.2",
     "eslint-plugin-import": "2.32.0",
-    "globals": "16.2.0",
-    "globby": "14.1.0",
-    "jasmine-core": "5.8.0",
-    "jest": "30.0.2",
+    "globals": "16.4.0",
+    "globby": "15.0.0",
+    "jasmine-core": "5.12.0",
+    "jest": "30.2.0",
     "jest-extended": "6.0.0",
     "karma": "6.4.4",
     "karma-chrome-launcher": "3.2.0",
@@ -96,20 +97,20 @@
     "karma-rollup-preprocessor": "7.0.8",
     "karma-safari-launcher": "1.0.0",
     "karma-spec-reporter": "0.0.36",
-    "less": "4.3.0",
-    "prettier": "3.6.0",
-    "puppeteer-core": "24.10.2",
-    "rollup": "4.44.0",
+    "less": "4.4.2",
+    "prettier": "3.6.2",
+    "puppeteer-core": "24.24.1",
+    "rollup": "4.52.4",
     "rollup-plugin-istanbul": "5.0.0",
-    "ts-jest": "29.4.0",
+    "ts-jest": "29.4.5",
     "tslib": "2.8.1",
-    "typescript": "5.8.3",
-    "typescript-eslint": "8.35.0",
-    "ws": "8.18.2",
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.46.1",
+    "ws": "8.18.3",
     "yazl": "3.3.1"
   },
   "optionalDependencies": {
-    "@rollup/rollup-linux-x64-gnu": "4.44.0",
-    "@rollup/rollup-win32-x64-msvc": "4.44.0"
+    "@rollup/rollup-linux-x64-gnu": "4.52.4",
+    "@rollup/rollup-win32-x64-msvc": "4.52.4"
   }
 }