darkreader 4.9.39 → 4.9.40

package/darkreader.js

@@ -1,5 +1,5 @@
 /**
- * Dark Reader v4.9.39
+ * Dark Reader v4.9.40
  * https://darkreader.org/
  */
 
@@ -7,7 +7,7 @@
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
     typeof define === 'function' && define.amd ? define(['exports'], factory) :
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.DarkReader = {}));
-}(this, (function (exports) { 'use strict';
+})(this, (function (exports) { 'use strict';
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -109,7 +109,7 @@
                 ar[i] = from[i];
             }
         }
-        return to.concat(ar || from);
+        return to.concat(ar || Array.prototype.slice.call(from));
     }
 
     var MessageType = {
@@ -337,7 +337,7 @@
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            sendMessage.apply(void 0, __spreadArray([], __read(args)));
+            sendMessage.apply(void 0, __spreadArray([], __read(args), false));
             nativeSendMessage_1.apply(chrome.runtime, args);
         };
     }
@@ -354,12 +354,18 @@
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            addMessageListener.apply(void 0, __spreadArray([], __read(args)));
+            addMessageListener(args[0]);
             nativeAddListener_1.apply(chrome.runtime.onMessage, args);
         };
     }
     else {
-        chrome.runtime.onMessage.addListener = addMessageListener;
+        chrome.runtime.onMessage.addListener = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return addMessageListener(args[0]);
+        };
     }
 
     var ThemeEngines = {
@@ -397,6 +403,8 @@
         scrollbarColor: isMacOS ? '' : 'auto',
         selectionColor: 'auto',
         styleSystemControls: true,
+        lightColorScheme: 'Default',
+        darkColorScheme: 'Default',
     };
 
     function isArrayLike(items) {
@@ -463,11 +471,11 @@
                 pending = true;
             }
             else {
-                callback.apply(void 0, __spreadArray([], __read(lastArgs)));
+                callback.apply(void 0, __spreadArray([], __read(lastArgs), false));
                 frameId = requestAnimationFrame(function () {
                     frameId = null;
                     if (pending) {
-                        callback.apply(void 0, __spreadArray([], __read(lastArgs)));
+                        callback.apply(void 0, __spreadArray([], __read(lastArgs), false));
                         pending = false;
                     }
                 });
@@ -687,6 +695,7 @@
                 if (n instanceof Element) {
                     if (n.isConnected) {
                         moves.add(n);
+                        additions.delete(n);
                     }
                     else {
                         deletions.add(n);
@@ -694,7 +703,6 @@
                 }
             });
         });
-        moves.forEach(function (n) { return additions.delete(n); });
         var duplicateAdditions = [];
         var duplicateDeletions = [];
         additions.forEach(function (node) {
@@ -805,6 +813,25 @@
         var b = parseURL($base);
         var a = parseURL($relative, b.href);
         return a.href;
+    }
+    function isRelativeHrefOnAbsolutePath(href) {
+        if (href.startsWith('data:')) {
+            return true;
+        }
+        var url = parseURL(href);
+        var base = parseURL(location.href);
+        if (url.protocol !== base.protocol) {
+            return false;
+        }
+        if (url.hostname !== base.hostname) {
+            return false;
+        }
+        if (url.port !== base.port) {
+            return false;
+        }
+        var path = /.*\//.exec(url.pathname)[0];
+        var basePath = /.*\//.exec(base.pathname)[0];
+        return path === basePath;
     }
 
     function iterateCSSRules(rules, iterate, onMediaRuleError) {
@@ -1104,6 +1131,72 @@
             a: 1
         };
     }
+    var isCharDigit = function (char) { return char >= '0' && char <= '9'; };
+    var getAmountOfDigits = function (number) { return Math.floor(Math.log10(number)) + 1; };
+    function lowerCalcExpression(color) {
+        var searchIndex = 0;
+        var replaceBetweenIndices = function (start, end, replacement) {
+            color = color.substring(0, start) + replacement + color.substring(end);
+        };
+        var getNumber = function () {
+            var resultNumber = 0;
+            for (var i = 1; i < 4; i++) {
+                var char = color[searchIndex + i];
+                if (char === ' ') {
+                    break;
+                }
+                if (isCharDigit(char)) {
+                    resultNumber *= 10;
+                    resultNumber += Number(char);
+                }
+                else {
+                    break;
+                }
+            }
+            var lenDigits = getAmountOfDigits(resultNumber);
+            searchIndex += lenDigits;
+            var possibleType = color[searchIndex + 1];
+            if (possibleType !== '%') {
+                return;
+            }
+            searchIndex++;
+            return resultNumber;
+        };
+        while ((searchIndex = color.indexOf('calc(')) !== 0) {
+            var startIndex = searchIndex;
+            searchIndex += 4;
+            var firstNumber = getNumber();
+            if (!firstNumber) {
+                break;
+            }
+            if (color[searchIndex + 1] !== ' ') {
+                break;
+            }
+            searchIndex++;
+            var operation = color[searchIndex + 1];
+            if (operation !== '+' && operation !== '-') {
+                break;
+            }
+            searchIndex++;
+            if (color[searchIndex + 1] !== ' ') {
+                break;
+            }
+            searchIndex++;
+            var secondNumber = getNumber();
+            if (!secondNumber) {
+                break;
+            }
+            var replacement = void 0;
+            if (operation === '+') {
+                replacement = firstNumber + secondNumber + "%";
+            }
+            else {
+                replacement = firstNumber - secondNumber + "%";
+            }
+            replaceBetweenIndices(startIndex, searchIndex + 2, replacement);
+        }
+        return color;
+    }
     var knownColors = new Map(Object.entries({
         aliceblue: 0xf0f8ff,
         antiquewhite: 0xfaebd7,
@@ -1840,7 +1933,7 @@
                                 case 3:
                                     error_1 = _a.sent();
                                     reject(error_1);
-                                    return [3, 4];
+                                    return [2];
                                 case 4:
                                     _a.trys.push([4, 6, , 7]);
                                     return [4, urlToImage(dataURL)];
@@ -2161,7 +2254,7 @@
     function getModifiedFallbackStyle(filter, _a) {
         var strict = _a.strict;
         var lines = [];
-        lines.push("html, body, " + (strict ? 'body :not(iframe)' : 'body > :not(iframe)') + " {");
+        lines.push("html, body, " + (strict ? 'body :not(iframe):not(div[style^="position:absolute;top:0;left:-"]' : 'body > :not(iframe)') + " {");
         lines.push("    background-color: " + modifyBackgroundColor({ r: 255, g: 255, b: 255 }, filter) + " !important;");
         lines.push("    border-color: " + modifyBorderColor({ r: 64, g: 64, b: 64 }, filter) + " !important;");
         lines.push("    color: " + modifyForegroundColor({ r: 0, g: 0, b: 0 }, filter) + " !important;");
@@ -2182,6 +2275,9 @@
         if (colorParseCache.has($color)) {
             return colorParseCache.get($color);
         }
+        if ($color.includes('calc(')) {
+            $color = lowerCalcExpression($color);
+        }
         var color = parse($color);
         colorParseCache.set($color, color);
         return color;
@@ -2406,10 +2502,11 @@
             return null;
         }
     }
-    function getShadowModifier(value) {
+    function getShadowModifierWithInfo(value) {
         try {
             var index_2 = 0;
             var colorMatches_1 = getMatches(/(^|\s)(?!calc)([a-z]+\(.+?\)|#[0-9a-f]+|[a-z]+)(.*?(inset|outset)?($|,))/ig, value, 2);
+            var notParsed_1 = 0;
             var modifiers_2 = colorMatches_1.map(function (match, i) {
                 var prefixIndex = index_2;
                 var matchIndex = value.indexOf(match, index_2);
@@ -2417,17 +2514,32 @@
                 index_2 = matchEnd;
                 var rgb = tryParseColor(match);
                 if (!rgb) {
+                    notParsed_1++;
                     return function () { return value.substring(prefixIndex, matchEnd); };
                 }
                 return function (filter) { return "" + value.substring(prefixIndex, matchIndex) + modifyShadowColor(rgb, filter) + (i === colorMatches_1.length - 1 ? value.substring(matchEnd) : ''); };
             });
-            return function (filter) { return modifiers_2.map(function (modify) { return modify(filter); }).join(''); };
+            return function (filter) {
+                var modified = modifiers_2.map(function (modify) { return modify(filter); }).join('');
+                return {
+                    matchesLength: colorMatches_1.length,
+                    unparseableMatchesLength: notParsed_1,
+                    result: modified,
+                };
+            };
         }
         catch (err) {
             logWarn("Unable to parse shadow " + value, err);
             return null;
         }
     }
+    function getShadowModifier(value) {
+        var shadowModifier = getShadowModifierWithInfo(value);
+        if (!shadowModifier) {
+            return null;
+        }
+        return function (theme) { return shadowModifier(theme).result; };
+    }
     function getVariableModifier(variablesStore, prop, value, rule, ignoredImgSelectors, isCancelled) {
         return variablesStore.getModifierForVariable({
             varName: prop,
@@ -2651,8 +2763,11 @@
                             return v;
                         }, function (fallback) { return tryModifyBgColor(fallback, theme); });
                         if (property === 'box-shadow') {
-                            var shadowModifier = getShadowModifier(variableReplaced);
-                            return shadowModifier(theme) || variableReplaced;
+                            var shadowModifier = getShadowModifierWithInfo(variableReplaced);
+                            var modifiedShadow = shadowModifier(theme);
+                            if (modifiedShadow.unparseableMatchesLength !== modifiedShadow.matchesLength) {
+                                return modifiedShadow.result;
+                            }
                         }
                         return variableReplaced;
                     };
@@ -3201,7 +3316,7 @@
         });
         var attrObserver = new MutationObserver(function (mutations) {
             if (timeoutId) {
-                cache.push.apply(cache, __spreadArray([], __read(mutations)));
+                cache.push.apply(cache, __spreadArray([], __read(mutations), false));
                 return;
             }
             attemptCount++;
@@ -3219,7 +3334,7 @@
                         cache = [];
                         handleAttributeMutations(attributeCache);
                     }, RETRY_TIMEOUT);
-                    cache.push.apply(cache, __spreadArray([], __read(mutations)));
+                    cache.push.apply(cache, __spreadArray([], __read(mutations), false));
                     return;
                 }
                 start = now;
@@ -3344,7 +3459,11 @@
             }
             else {
                 var overridenProp = normalizedPropList[property];
-                if (overridenProp && (!element.style.getPropertyValue(overridenProp) && !element.hasAttribute(overridenProp))) {
+                if (overridenProp &&
+                    (!element.style.getPropertyValue(overridenProp) && !element.hasAttribute(overridenProp))) {
+                    if (overridenProp === 'background-color' && element.hasAttribute('bgcolor')) {
+                        return;
+                    }
                     element.style.setProperty(property, '');
                 }
             }
@@ -3573,7 +3692,7 @@
                             return { property: mod.property, value: mod.value, important: important, sourceValue: sourceValue, varKey: varKey };
                         });
                         var index = readyDeclarations.indexOf(oldDecs[0], initialIndex);
-                        readyDeclarations.splice.apply(readyDeclarations, __spreadArray([index, oldDecs.length], __read(readyVarDecs)));
+                        readyDeclarations.splice.apply(readyDeclarations, __spreadArray([index, oldDecs.length], __read(readyVarDecs), false));
                         oldDecs = readyVarDecs;
                         rebuildVarRule(varKey);
                     });
@@ -3709,14 +3828,20 @@
         function containsCSSImport() {
             return element instanceof HTMLStyleElement && element.textContent.trim().match(cssImportRegex);
         }
-        function hasCrossOriginImports(cssRules) {
+        function hasImports(cssRules, checkCrossOrigin) {
             var result = false;
             if (cssRules) {
                 var rule = void 0;
                 cssRulesLoop: for (var i = 0, len = cssRules.length; i < len; i++) {
                     rule = cssRules[i];
                     if (rule.href) {
-                        if (rule.href.startsWith('http') && !rule.href.startsWith(location.origin)) {
+                        if (checkCrossOrigin) {
+                            if (rule.href.startsWith('http') && !rule.href.startsWith(location.origin)) {
+                                result = true;
+                                break cssRulesLoop;
+                            }
+                        }
+                        else {
                             result = true;
                             break cssRulesLoop;
                         }
@@ -3727,15 +3852,26 @@
         }
         function getRulesSync() {
             if (corsCopy) {
+                logInfo('[getRulesSync] Using cors-copy.');
                 return corsCopy.sheet.cssRules;
             }
             if (containsCSSImport()) {
+                logInfo('[getRulesSync] CSSImport detected.');
                 return null;
             }
             var cssRules = safeGetSheetRules();
-            if (hasCrossOriginImports(cssRules)) {
+            if (element instanceof HTMLLinkElement &&
+                !isRelativeHrefOnAbsolutePath(element.href) &&
+                hasImports(cssRules, false)) {
+                logInfo('[getRulesSync] CSSImportRule detected on non-local href.');
                 return null;
             }
+            if (hasImports(cssRules, true)) {
+                logInfo('[getRulesSync] Cross-Origin CSSImportRule detected.');
+                return null;
+            }
+            logInfo('[getRulesSync] Using cssRules.');
+            !cssRules && logWarn('[getRulesSync] cssRules is null, trying again.');
             return cssRules;
         }
         function insertStyle() {
@@ -3768,7 +3904,7 @@
         var loadingLinkId = ++loadingLinkCounter;
         function getRulesAsync() {
             return __awaiter(this, void 0, void 0, function () {
-                var cssText, cssBasePath, _a, cssRules, accessError, err_1, crossOriginImport, fullCSSText, err_2;
+                var cssText, cssBasePath, _a, cssRules, accessError, err_1, fullCSSText, err_2;
                 var _b;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
@@ -3804,9 +3940,13 @@
                             }
                             _c.label = 5;
                         case 5:
-                            crossOriginImport = hasCrossOriginImports(cssRules);
-                            if (cssRules != null && !crossOriginImport) {
-                                return [2, cssRules];
+                            if (cssRules) {
+                                if (isRelativeHrefOnAbsolutePath(element.href)) {
+                                    return [2, cssRules];
+                                }
+                                else if (!hasImports(cssRules, false)) {
+                                    return [2, cssRules];
+                                }
                             }
                             return [4, loadText(element.href)];
                         case 6:
@@ -3880,6 +4020,20 @@
                 return;
             }
             cancelAsyncOperations = false;
+            function removeCSSRulesFromSheet(sheet) {
+                try {
+                    if (sheet.replaceSync) {
+                        sheet.replaceSync('');
+                        return;
+                    }
+                }
+                catch (err) {
+                    logWarn('Could not use fastpath for removing rules from stylesheet', err);
+                }
+                for (var i = sheet.cssRules.length - 1; i >= 0; i--) {
+                    sheet.deleteRule(i);
+                }
+            }
             function prepareOverridesSheet() {
                 if (!syncStyle) {
                     createSyncStyle();
@@ -3890,9 +4044,7 @@
                     syncStyle.textContent = '';
                 }
                 var sheet = syncStyle.sheet;
-                for (var i = sheet.cssRules.length - 1; i >= 0; i--) {
-                    sheet.deleteRule(i);
-                }
+                removeCSSRulesFromSheet(sheet);
                 if (syncStylePositionWatcher) {
                     syncStylePositionWatcher.run();
                 }
@@ -4241,7 +4393,7 @@
             return __generator(this, function (_a) {
                 return [2, new Promise(function (resolve) {
                         if (window.customElements && typeof customElements.whenDefined === 'function') {
-                            customElements.whenDefined(tag).then(resolve);
+                            customElements.whenDefined(tag).then(function () { return resolve(); });
                         }
                         else if (canOptimizeUsingProxy) {
                             resolvers.set(tag, resolve);
@@ -4431,7 +4583,7 @@
     function createAdoptedStyleSheetOverride(node) {
         var cancelAsyncOperations = false;
         function injectSheet(sheet, override) {
-            var newSheets = __spreadArray([], __read(node.adoptedStyleSheets));
+            var newSheets = __spreadArray([], __read(node.adoptedStyleSheets), false);
             var sheetIndex = newSheets.indexOf(sheet);
             var existingIndex = newSheets.indexOf(override);
             if (sheetIndex === existingIndex - 1) {
@@ -4445,7 +4597,7 @@
         }
         function destroy() {
             cancelAsyncOperations = true;
-            var newSheets = __spreadArray([], __read(node.adoptedStyleSheets));
+            var newSheets = __spreadArray([], __read(node.adoptedStyleSheets), false);
             node.adoptedStyleSheets.forEach(function (adoptedStyleSheet) {
                 if (overrideList.has(adoptedStyleSheet)) {
                     var existingIndex = newSheets.indexOf(adoptedStyleSheet);
@@ -4549,7 +4701,7 @@
         }
         function proxyDocumentStyleSheets() {
             var docSheets = documentStyleSheetsDescriptor.get.call(this);
-            var filtered = __spreadArray([], __read(docSheets)).filter(function (styleSheet) {
+            var filtered = __spreadArray([], __read(docSheets), false).filter(function (styleSheet) {
                 return !styleSheet.ownerNode.classList.contains('darkreader');
             });
             return Object.setPrototypeOf(filtered, StyleSheetList.prototype);
@@ -4559,7 +4711,7 @@
             var getCurrentElementValue = function () {
                 var elements = getElementsByTagNameDescriptor.value.call(_this, tagName);
                 if (tagName === 'style') {
-                    elements = Object.setPrototypeOf(__spreadArray([], __read(elements)).filter(function (element) {
+                    elements = Object.setPrototypeOf(__spreadArray([], __read(elements), false).filter(function (element) {
                         return !element.classList.contains('darkreader');
                     }), NodeList.prototype);
                 }
@@ -4568,7 +4720,7 @@
             var elements = getCurrentElementValue();
             var NodeListBehavior = {
                 get: function (_, property) {
-                    return getCurrentElementValue()[property];
+                    return getCurrentElementValue()[Number(property)];
                 }
             };
             elements = new Proxy(elements, NodeListBehavior);
@@ -5158,4 +5310,4 @@
 
     Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "darkreader",
-  "version": "4.9.39",
+  "version": "4.9.40",
   "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 --cache --fix \"src/**/*.ts\" \"src/**/*.tsx\" \"tasks/**/*.js\" \"tests/**/*.js\" \"tests/**/*.ts\" \".eslintrc.js\" \"index.d.ts\"",
+    "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 \"src/**/*.ts\" \"src/**/*.tsx\" \"tasks/**/*.js\" \"tests/**/*.ts\" \"tests/**/*.js\" \"index.d.ts\"",
+    "lint": "eslint --ignore-pattern \"!.eslintplugin.js\" \"src/**/*.ts\" \"src/**/*.tsx\" \"tasks/**/*.js\" \"tests/**/*.ts\" \"tests/[!coverage]**/*.js\" \"index.d.ts\" \".eslintplugin.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",
@@ -64,45 +64,46 @@
     "url": "https://opencollective.com/darkreader"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "13.0.0",
-    "@rollup/plugin-replace": "2.4.2",
-    "@rollup/pluginutils": "4.1.0",
-    "@types/chrome": "0.0.154",
-    "@types/jasmine": "3.7.8",
-    "@types/jest": "26.0.24",
+    "@rollup/plugin-node-resolve": "13.0.6",
+    "@rollup/plugin-replace": "3.0.0",
+    "@rollup/pluginutils": "4.1.1",
+    "@types/chrome": "0.0.162",
+    "@types/jasmine": "3.10.1",
+    "@types/jest": "27.0.2",
     "@types/karma": "6.3.1",
-    "@types/node": "16.0.0",
-    "@typescript-eslint/eslint-plugin": "4.28.2",
-    "@typescript-eslint/parser": "4.28.2",
+    "@types/offscreencanvas": "2019.6.4",
+    "@types/node": "16.11.6",
+    "@typescript-eslint/eslint-plugin": "5.3.0",
+    "@typescript-eslint/parser": "5.3.0",
     "chokidar": "3.5.2",
-    "eslint": "7.30.0",
-    "eslint-plugin-import": "2.24.0",
+    "eslint": "8.1.0",
+    "eslint-plugin-import": "2.25.2",
     "eslint-plugin-local": "1.0.0",
     "fs-extra": "10.0.0",
     "globby": "11.0.4",
-    "jasmine-core": "3.8.0",
-    "jest": "27.0.6",
-    "karma": "6.3.4",
+    "jasmine-core": "3.10.1",
+    "jest": "27.3.1",
+    "karma": "6.3.7",
     "karma-chrome-launcher": "3.1.0",
     "karma-coverage": "2.0.3",
-    "karma-firefox-launcher": "2.1.1",
+    "karma-firefox-launcher": "2.1.2",
     "karma-jasmine": "4.0.1",
     "karma-rollup-preprocessor": "7.0.7",
     "karma-safari-launcher": "1.0.0",
-    "less": "4.1.1",
+    "less": "4.1.2",
     "malevic": "0.18.6",
-    "prettier": "2.3.2",
-    "puppeteer-core": "10.1.0",
-    "rollup": "2.52.8",
+    "prettier": "2.4.1",
+    "puppeteer-core": "10.4.0",
+    "rollup": "2.59.0",
     "rollup-plugin-istanbul2": "2.0.2",
     "rollup-plugin-typescript2": "0.30.0",
-    "ts-jest": "27.0.3",
-    "ts-node": "10.0.0",
-    "tsconfig-paths": "3.10.1",
-    "tslib": "2.3.0",
-    "typescript": "4.3.5",
-    "web-ext": "6.2.0",
-    "ws": "7.5.2",
+    "ts-jest": "27.0.7",
+    "ts-node": "10.4.0",
+    "tsconfig-paths": "3.11.0",
+    "tslib": "2.3.1",
+    "typescript": "4.4.4",
+    "web-ext": "6.5.0",
+    "ws": "8.2.3",
     "yazl": "2.5.1"
   }
 }