darkreader 4.9.44 → 4.9.46

package/darkreader.js

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.44
+ * Dark Reader v4.9.46
  * https://darkreader.org/
  */
 
@@ -114,13 +114,12 @@
 
     var MessageType = {
         UI_GET_DATA: 'ui-get-data',
-        UI_GET_ACTIVE_TAB_INFO: 'ui-get-active-tab-info',
         UI_SUBSCRIBE_TO_CHANGES: 'ui-subscribe-to-changes',
         UI_UNSUBSCRIBE_FROM_CHANGES: 'ui-unsubscribe-from-changes',
         UI_CHANGE_SETTINGS: 'ui-change-settings',
         UI_SET_THEME: 'ui-set-theme',
         UI_SET_SHORTCUT: 'ui-set-shortcut',
-        UI_TOGGLE_URL: 'ui-toggle-url',
+        UI_TOGGLE_ACTIVE_TAB: 'ui-toggle-active-tab',
         UI_MARK_NEWS_AS_READ: 'ui-mark-news-as-read',
         UI_LOAD_CONFIG: 'ui-load-config',
         UI_APPLY_DEV_DYNAMIC_THEME_FIXES: 'ui-apply-dev-dynamic-theme-fixes',
@@ -150,6 +149,8 @@
         CS_FRAME_RESUME: 'cs-frame-resume',
         CS_EXPORT_CSS_RESPONSE: 'cs-export-css-response',
         CS_FETCH: 'cs-fetch',
+        CS_DARK_THEME_DETECTED: 'cs-dark-theme-detected',
+        CS_DARK_THEME_NOT_DETECTED: 'cs-dark-theme-not-detected',
     };
 
     var userAgent = typeof navigator === 'undefined' ? 'some useragent' : navigator.userAgent.toLowerCase();
@@ -413,6 +414,7 @@
         styleSystemControls: !isCSSColorSchemePropSupported,
         lightColorScheme: 'Default',
         darkColorScheme: 'Default',
+        immediateModify: false,
     };
 
     function isArrayLike(items) {
@@ -637,12 +639,18 @@
             }
         });
         for (var node = (root.shadowRoot ? walker.currentNode : walker.nextNode()); node != null; node = walker.nextNode()) {
+            if (node.classList.contains('surfingkeys_hints_host')) {
+                continue;
+            }
             iterator(node);
             iterateShadowHosts(node.shadowRoot, iterator);
         }
     }
-    function isDOMReady() {
+    var isDOMReady = function () {
         return document.readyState === 'complete' || document.readyState === 'interactive';
+    };
+    function setIsDOMReady(newFunc) {
+        isDOMReady = newFunc;
     }
     var readyStateListeners = new Set();
     function addDOMReadyListener(listener) {
@@ -917,7 +925,7 @@
         }
     }
     var cssURLRegex = /url\((('.+?')|(".+?")|([^\)]*?))\)/g;
-    var cssImportRegex = /@import\s*(url\()?(('.+?')|(".+?")|([^\)]*?))\)? ?(screen)?;?/g;
+    var cssImportRegex = /@import\s*(url\()?(('.+?')|(".+?")|([^\)]*?))\)? ?(screen)?;?/gi;
     function getCSSURLValue(cssURL) {
         return cssURL.replace(/^url\((.*)\)$/, '$1').trim().replace(/^"(.*)"$/, '$1').replace(/^'(.*)'$/, '$1');
     }
@@ -1392,6 +1400,9 @@
         var _b = __read(_a, 2), key = _b[0], value = _b[1];
         return [key.toLowerCase(), value];
     }));
+    function getSRGBLightness(r, g, b) {
+        return (0.2126 * r + 0.7152 * g + 0.0722 * b) / 255;
+    }
 
     function scale(x, inLow, inHigh, outLow, outHigh) {
         return (x - inLow) * (outHigh - outLow) / (inHigh - inLow) + outLow;
@@ -1715,6 +1726,9 @@
                 hx = scale(h, 60, 120, 60, 105);
             }
         }
+        if (hx > 40 && hx < 80) {
+            lx *= 0.75;
+        }
         return { h: hx, s: s, l: lx, a: a };
     }
     function modifyBackgroundColor(rgb, theme) {
@@ -2050,15 +2064,15 @@
         for (y = 0; y < height; y++) {
             for (x = 0; x < width; x++) {
                 i = 4 * (y * width + x);
-                r = d[i + 0] / 255;
-                g = d[i + 1] / 255;
-                b = d[i + 2] / 255;
-                a = d[i + 3] / 255;
-                if (a < TRANSPARENT_ALPHA_THRESHOLD) {
+                r = d[i + 0];
+                g = d[i + 1];
+                b = d[i + 2];
+                a = d[i + 3];
+                if (a / 255 < TRANSPARENT_ALPHA_THRESHOLD) {
                     transparentPixelsCount++;
                 }
                 else {
-                    l = 0.2126 * r + 0.7152 * g + 0.0722 * b;
+                    l = getSRGBLightness(r, g, b);
                     if (l < DARK_LIGHTNESS_THRESHOLD) {
                         darkPixelsCount++;
                     }
@@ -2117,11 +2131,13 @@
                 if (index - possibleType.length >= 0) {
                     var possibleGradient = value.substring(index - possibleType.length, index);
                     if (possibleGradient === possibleType) {
-                        if (index - possibleType.length - 1 >= 9) {
-                            if (value[index - possibleType.length - 1] === '-') {
-                                typeGradient = "repeating-".concat(possibleType, "gradient");
-                                return true;
-                            }
+                        if (value.slice(index - possibleType.length - 10, index - possibleType.length - 1) === 'repeating') {
+                            typeGradient = "repeating-".concat(possibleType, "gradient");
+                            return true;
+                        }
+                        if (value.slice(index - possibleType.length - 8, index - possibleType.length - 1) === '-webkit') {
+                            typeGradient = "-webkit-".concat(possibleType, "gradient");
+                            return true;
                         }
                         typeGradient = "".concat(possibleType, "gradient");
                         return true;
@@ -2572,7 +2588,21 @@
                 if (results.some(function (r) { return r instanceof Promise; })) {
                     return Promise.all(results)
                         .then(function (asyncResults) {
-                        return asyncResults.join('');
+                        var result = '';
+                        var lastWasURL = false;
+                        asyncResults.filter(Boolean).forEach(function (asyncResult) {
+                            if (lastWasURL) {
+                                if (asyncResult) {
+                                    result += ', ';
+                                }
+                                lastWasURL = false;
+                            }
+                            result += asyncResult;
+                            if (asyncResult.startsWith('url(')) {
+                                lastWasURL = true;
+                            }
+                        });
+                        return result;
                     });
                 }
                 return results.join('');
@@ -4814,9 +4844,13 @@
             var _this = this;
             var getCurrentValue = function () {
                 var docSheets = documentStyleSheetsDescriptor.get.call(_this);
-                return Object.setPrototypeOf(__spreadArray([], __read(docSheets), false).filter(function (styleSheet) {
+                var filteredSheets = __spreadArray([], __read(docSheets), false).filter(function (styleSheet) {
                     return !styleSheet.ownerNode.classList.contains('darkreader');
-                }), StyleSheetList.prototype);
+                });
+                filteredSheets.item = function (item) {
+                    return filteredSheets[item];
+                };
+                return Object.setPrototypeOf(filteredSheets, StyleSheetList.prototype);
             };
             var elements = getCurrentValue();
             var styleSheetListBehavior = {
@@ -4841,7 +4875,7 @@
             var elements = getCurrentElementValue();
             var nodeListBehavior = {
                 get: function (_, property) {
-                    return getCurrentElementValue()[Number(property)];
+                    return getCurrentElementValue()[Number(property) || property];
                 }
             };
             elements = new Proxy(elements, nodeListBehavior);
@@ -4917,20 +4951,16 @@
         document.head.insertBefore(textStyle, fallbackStyle.nextSibling);
         setupNodePositionWatcher(textStyle, 'text');
         var invertStyle = createOrUpdateStyle('darkreader--invert');
-        var invertStyleContent = '';
         if (fixes && Array.isArray(fixes.invert) && fixes.invert.length > 0) {
-            invertStyleContent += [
+            invertStyle.textContent = [
                 "".concat(fixes.invert.join(', '), " {"),
                 "    filter: ".concat(getCSSFilterValue(__assign(__assign({}, filter), { contrast: filter.mode === 0 ? filter.contrast : clamp(filter.contrast - 10, 0, 100) })), " !important;"),
                 '}',
-                '',
             ].join('\n');
         }
-        var imageFilter = getCSSFilterValue(__assign(__assign({}, filter), { mode: FilterMode.light }));
-        if (imageFilter) {
-            invertStyleContent += "img { filter: ".concat(imageFilter, " !important;\n");
+        else {
+            invertStyle.textContent = '';
         }
-        invertStyle.textContent = invertStyleContent;
         document.head.insertBefore(invertStyle, textStyle.nextSibling);
         setupNodePositionWatcher(invertStyle, 'invert');
         var inlineStyle = createOrUpdateStyle('darkreader--inline');
@@ -5119,7 +5149,7 @@
             createDynamicStyleOverrides();
             watchForUpdates();
         }
-        if (document.hidden) {
+        if (document.hidden && !filter.immediateModify) {
             watchForDocumentVisibility(runDynamicStyle);
         }
         else {
@@ -5217,6 +5247,11 @@
             ignoredImageAnalysisSelectors = [];
             ignoredInlineSelectors = [];
         }
+        if (filter.immediateModify) {
+            setIsDOMReady(function () {
+                return true;
+            });
+        }
         isIFrame$1 = iframe;
         if (document.head) {
             if (isAnotherDarkReaderInstanceActive()) {

package/package.json

@@ -1,29 +1,32 @@
 {
   "name": "darkreader",
-  "version": "4.9.44",
+  "version": "4.9.46",
   "description": "Dark mode for every website",
   "scripts": {
     "api": "node tasks/build.js --api",
     "benchmark-server": "node tests/benchmark-server/index.js",
     "build": "node tasks/build.js --release",
-    "code-style": "eslint --ignore-pattern \"!.eslintplugin.js\" --cache --fix \"src/**/*.ts\" \"src/**/*.tsx\" \"tasks/**/*.js\" \"tests/[!coverage]**/*.js\" \"tests/**/*.ts\" \".eslintrc.js\" \"index.d.ts\" \".eslintplugin.js\"",
+    "build:all": "node tasks/build.js --debug --release --api",
+    "code-style": "eslint --ignore-pattern '!.eslintplugin.js' --cache --fix -- 'src/**/*.ts' 'src/**/*.tsx' 'tasks/**/*.js' 'tests/[!coverage]**/*.js' 'tests/**/*.ts' '.eslintrc.js' 'index.d.ts' '.eslintplugin.js'",
     "debug": "node tasks/build.js --debug",
     "debug:watch": "node tasks/build.js --debug --watch",
-    "lint": "eslint --ignore-pattern \"!.eslintplugin.js\" \"src/**/*.ts\" \"src/**/*.tsx\" \"tasks/**/*.js\" \"tests/**/*.ts\" \"tests/[!coverage]**/*.js\" \"index.d.ts\" \".eslintplugin.js\"",
+    "lint": "eslint --ignore-pattern '!.eslintplugin.js' -- 'src/**/*.ts' 'src/**/*.tsx' 'tasks/**/*.js' 'tests/**/*.ts' 'tests/[!coverage]**/*.js' 'index.d.ts' '.eslintplugin.js'",
+    "lint:bundle": "(node ./tasks/check-exists.js ./build/debug/chrome || node tasks/build.js --debug --api) && eslint -- 'build/debug/chrome/**/*.js' 'darkreader.js'",
     "prepublishOnly": "npm test && npm run api",
     "release": "npm test && npm run lint && node tasks/build.js --release",
-    "test": "jest --config=tests/jest.config.js",
-    "test:browser": "npm run debug && jest --config=tests/browser/jest.config.js --runInBand",
-    "test:chrome": "npm run debug && jest --config=tests/browser/jest.config.chrome.js --runInBand",
-    "test:ci": "jest --config=tests/jest.config.js --runInBand",
-    "test:config": "jest --config=tests/config/jest.config.js",
-    "test:config:debug": "node --inspect-brk ./node_modules/jest/bin/jest --config=tests/config/jest.config.js --runInBand --no-cache --watch",
-    "test:coverage": "jest --config=tests/jest.config.js --coverage",
-    "test:firefox": "npm run debug && jest --config=tests/browser/jest.config.firefox.js --runInBand",
+    "test": "npm run test:unit",
+    "test:all": "npm run test:unit; npm run test:browser; npm run test:inject; npm run test:project",
+    "test:browser": "npm run debug && npm run test:chrome && npm run test:firefox",
+    "test:chrome": "npm run debug && TEST_BROWSER=chrome jest --config=tests/browser/jest.config.js --runInBand",
+    "test:ci": "npm run test:unit",
+    "test:coverage": "jest --config=tests/unit/jest.config.js --coverage",
+    "test:firefox": "npm run debug && TEST_BROWSER=firefox jest --config=tests/browser/jest.config.js --runInBand",
     "test:inject": "node tests/inject/run.js",
     "test:inject:debug": "node tests/inject/run.js --debug",
-    "test:utils": "jest --config=tests/utils/jest.config.js",
-    "test:utils:debug": "node --inspect-brk ./node_modules/jest/bin/jest --config=tests/utils/jest.config.js --runInBand --no-cache --watch"
+    "test:project": "jest --config=tests/project/jest.config.js",
+    "test:unit": "jest --config=tests/unit/jest.config.js",
+    "test:unit:debug": "node --inspect-brk ./node_modules/jest/bin/jest --config=tests/unit/jest.config.js --runInBand --no-cache --watch",
+    "test:update-snapshots": "npm run test -- --updateSnapshot && npm run test:project -- --updateSnapshot"
   },
   "main": "darkreader.js",
   "repository": {
@@ -44,20 +47,6 @@
     "accessibility",
     "eye-care"
   ],
-  "browserslist": [
-    "supports es5",
-    "not ie > 0",
-    "not ie_mob > 0",
-    "not op_mini all",
-    "not op_mob < 59",
-    "not android < 50",
-    "not ios_saf < 6",
-    "not safari < 9.3",
-    "not opera < 36",
-    "not chrome < 49",
-    "not firefox < 33",
-    "not edge <= 18"
-  ],
   "homepage": "https://darkreader.org/",
   "funding": {
     "type": "opencollective",
@@ -65,42 +54,47 @@
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "13.1.3",
-    "@rollup/plugin-replace": "3.0.1",
-    "@rollup/plugin-typescript": "8.3.0",
+    "@rollup/plugin-replace": "4.0.0",
+    "@rollup/plugin-typescript": "8.3.1",
     "@rollup/pluginutils": "4.1.2",
-    "@types/chrome": "0.0.176",
+    "@types/chrome": "0.0.179",
+    "@types/eslint": "8.4.1",
     "@types/jasmine": "3.10.3",
-    "@types/jest": "27.4.0",
-    "@types/karma": "6.3.2",
+    "@types/jest": "27.4.1",
+    "@types/karma": "6.3.3",
+    "@types/karma-coverage": "2.0.1",
+    "@types/node": "17.0.21",
     "@types/offscreencanvas": "2019.6.4",
-    "@types/node": "17.0.9",
-    "@typescript-eslint/eslint-plugin": "5.9.1",
-    "@typescript-eslint/parser": "5.9.1",
-    "chokidar": "3.5.2",
-    "eslint": "8.7.0",
+    "@typescript-eslint/eslint-plugin": "5.13.0",
+    "@typescript-eslint/parser": "5.13.0",
+    "chokidar": "3.5.3",
+    "eslint": "8.10.0",
+    "eslint-plugin-compat": "4.0.2",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-local": "1.0.0",
-    "globby": "11.0.4",
-    "jasmine-core": "4.0.0",
-    "jest": "27.4.7",
-    "karma": "6.3.12",
+    "get-stream": "6.0.1",
+    "globby": "13.1.1",
+    "jasmine-core": "4.0.1",
+    "jest": "27.5.1",
+    "jest-extended": "2.0.0",
+    "karma": "6.3.17",
     "karma-chrome-launcher": "3.1.0",
-    "karma-coverage": "2.1.0",
+    "karma-coverage": "2.2.0",
     "karma-firefox-launcher": "2.1.2",
     "karma-jasmine": "4.0.1",
-    "karma-rollup-preprocessor": "7.0.7",
+    "karma-rollup-preprocessor": "7.0.8",
     "karma-safari-launcher": "1.0.0",
     "less": "4.1.2",
-    "malevic": "0.18.6",
+    "malevic": "0.19.1",
     "prettier": "2.5.1",
-    "puppeteer-core": "13.0.1",
-    "rollup": "2.64.0",
+    "puppeteer-core": "13.4.1",
+    "rollup": "2.69.0",
     "rollup-plugin-istanbul2": "2.0.2",
     "ts-jest": "27.1.3",
     "tslib": "2.3.1",
-    "typescript": "4.5.4",
-    "web-ext": "6.6.0",
-    "ws": "8.4.2",
+    "typescript": "4.6.2",
+    "web-ext": "6.7.0",
+    "ws": "8.5.0",
     "yazl": "2.5.1"
   }
 }