webext-schema 4.2.0 → 5.0.1

package/modules/browser.js

@@ -35,14 +35,14 @@ export const createBookmark = async opt => {
     const { bookmarks } = browser;
     node = await bookmarks.create(opt);
   }
-  return node || null;
+  return node ?? null;
 };
 
 /**
  * get bookmark tree node
  *
  * @param {string|Array} id - bookmark ID or array of bookmark IDs
- * @returns {Array} - array of bookmarks.BookmarkTreeNode
+ * @returns {?Array} - array of bookmarks.BookmarkTreeNode
  */
 export const getBookmarkTreeNode = async id => {
   const isGranted = await isPermissionGranted({
@@ -59,7 +59,7 @@ export const getBookmarkTreeNode = async id => {
       res = await bookmarks.getTree();
     }
   }
-  return res || null;
+  return res ?? null;
 };
 
 /* browserSettings */
@@ -77,7 +77,7 @@ export const getCloseTabsByDoubleClickValue = async () => {
     const { browserSettings: { closeTabsByDoubleClick } } = browser;
     userValue = await closeTabsByDoubleClick.get({});
   }
-  return userValue || null;
+  return userValue ?? null;
 };
 
 /**
@@ -135,7 +135,7 @@ export const getNewTabPositionValue = async () => {
     const { browserSettings: { newTabPosition } } = browser;
     res = await newTabPosition.get({});
   }
-  return res || null;
+  return res ?? null;
 };
 
 /* commands */
@@ -185,7 +185,7 @@ export const updateCommand = async (id, value = '') => {
       });
     }
   }
-  return func || null;
+  return func ?? null;
 };
 
 /* contextualIdentities */
@@ -201,13 +201,9 @@ export const getAllContextualIdentities = async () => {
   let arr;
   if (isGranted) {
     const { contextualIdentities } = browser;
-    try {
-      arr = await contextualIdentities.query({});
-    } catch (e) {
-      logErr(e);
-    }
+    arr = await contextualIdentities.query({});
   }
-  return arr || null;
+  return arr ?? null;
 };
 
 /**
@@ -226,13 +222,9 @@ export const getContextualId = async cookieStoreId => {
   let id;
   if (isGranted) {
     const { contextualIdentities } = browser;
-    try {
-      id = await contextualIdentities.get(cookieStoreId);
-    } catch (e) {
-      logErr(e);
-    }
+    id = await contextualIdentities.get(cookieStoreId);
   }
-  return id || null;
+  return id ?? null;
 };
 
 /* management */
@@ -248,17 +240,12 @@ export const getEnabledTheme = async () => {
   let res;
   if (isGranted) {
     const { management } = browser;
-    try {
-      const arr = await management.getAll();
-      if (Array.isArray(arr) && arr.length) {
-        res =
-          arr.filter(info => info?.type === 'theme' && info?.enabled && info);
-      }
-    } catch (e) {
-      logErr(e);
+    const arr = await management.getAll();
+    if (Array.isArray(arr) && arr.length) {
+      res = arr.filter(info => info?.type === 'theme' && info?.enabled && info);
     }
   }
-  return res || null;
+  return res ?? null;
 };
 
 /**
@@ -279,13 +266,13 @@ export const getExtensionInfo = async id => {
     const { management } = browser;
     ext = await management.get(id);
   }
-  return ext || null;
+  return ext ?? null;
 };
 
 /**
  * get external extensions
  *
- * @returns {?Array} -array of management.extensionInfo
+ * @returns {?Array|boolean} -array of management.extensionInfo
  */
 export const getExternalExtensions = async () => {
   const isGranted = await isPermissionGranted({
@@ -294,17 +281,12 @@ export const getExternalExtensions = async () => {
   let res;
   if (isGranted) {
     const { management } = browser;
-    try {
-      const arr = await management.getAll();
-      if (Array.isArray(arr) && arr.length) {
-        res =
-          arr.filter(info => info?.type === 'extension' && info);
-      }
-    } catch (e) {
-      logErr(e);
+    const arr = await management.getAll();
+    if (Array.isArray(arr) && arr.length) {
+      res = arr.filter(info => info?.type === 'extension' && info);
     }
   }
-  return res || null;
+  return res ?? null;
 };
 
 /* notifications */
@@ -326,7 +308,7 @@ export const clearNotification = async id => {
     const { notifications } = browser;
     func = notifications.clear(id);
   }
-  return func || null;
+  return func ?? null;
 };
 
 /**
@@ -351,7 +333,7 @@ export const createNotification = async (id, opt) => {
     }
     func = notifications.create(id, opt);
   }
-  return func || null;
+  return func ?? null;
 };
 
 /* permissions */
@@ -487,7 +469,55 @@ export const sendMessage = async (id, msg, opt) => {
       func = runtime.sendMessage(msg, opt);
     }
   }
-  return func || null;
+  return func ?? null;
+};
+
+/* scripting */
+/**
+ * is scripting available
+ *
+ * @returns {boolean} - result
+ */
+export const isScriptingAvailable = async () => {
+  const isGranted = await isPermissionGranted({
+    permissions: ['scripting']
+  });
+  let res;
+  if (isGranted) {
+    const { scripting } = browser;
+    res = typeof scripting?.executeScript === 'function';
+  }
+  return !!res;
+};
+
+/**
+ * execute script to tab
+ *
+ * @param {object} opt - options
+ * @returns {?Array|boolean} - array of InjectionResult object
+ */
+export const executeScriptToTab = async (opt = {}) => {
+  const { args, injectImmediately, files, func, target } = opt;
+  const isGranted = await isScriptingAvailable();
+  let fn;
+  if (isGranted && Number.isInteger(target?.tabId)) {
+    const { scripting } = browser;
+    if (Array.isArray(files) && files.length) {
+      fn = scripting.executeScript({
+        files,
+        target,
+        injectImmediately: !!injectImmediately
+      });
+    } else if (typeof func === 'function') {
+      fn = scripting.executeScript({
+        func,
+        target,
+        args: Array.isArray(args) ? args : null,
+        injectImmediately: !!injectImmediately
+      });
+    }
+  }
+  return fn ?? null;
 };
 
 /* search */
@@ -543,7 +573,7 @@ export const getRecentlyClosedTab = async windowId => {
       }
     }
   }
-  return tab || null;
+  return tab ?? null;
 };
 
 /**
@@ -568,7 +598,7 @@ export const getSessionWindowValue = async (key, windowId) => {
     const { sessions } = browser;
     value = await sessions.getWindowValue(windowId, key);
   }
-  return value || null;
+  return value ?? null;
 };
 
 /**
@@ -589,7 +619,7 @@ export const restoreSession = async sessionId => {
     const { sessions } = browser;
     ses = await sessions.restore(sessionId);
   }
-  return ses || null;
+  return ses ?? null;
 };
 
 /**
@@ -650,7 +680,7 @@ export const getAllStorage = async (area = 'local') => {
     const { storage } = browser;
     data = await storage[area]?.get();
   }
-  return data || null;
+  return data ?? null;
 };
 
 /**
@@ -670,7 +700,7 @@ export const getStorage = async (key, area = 'local') => {
     const { storage } = browser;
     data = await storage[area]?.get(key);
   }
-  return data || null;
+  return data ?? null;
 };
 
 /**
@@ -823,7 +853,7 @@ export const execScriptsToTabInOrder = async (tabId, opts = []) => {
     const { value } = await Promise.allSettled(func).then(a => a.pop());
     res = value;
   }
-  return res || null;
+  return res ?? null;
 };
 
 /**
@@ -948,7 +978,7 @@ export const moveTab = async (tabId, opt) => {
   if (arr && !Array.isArray(arr)) {
     arr = [arr];
   }
-  return arr || null;
+  return arr ?? null;
 };
 
 /**
@@ -1047,7 +1077,7 @@ export const getCurrentTheme = async () => {
     const { theme } = browser;
     currentTheme = await theme.getCurrent();
   }
-  return currentTheme || null;
+  return currentTheme ?? null;
 };
 
 /* windows */

package/package.json

@@ -48,5 +48,5 @@
     "nock": "^13.2.9",
     "npm-run-all": "^4.1.5"
   },
-  "version": "4.2.0"
+  "version": "5.0.1"
 }

package/schemas/beta/webext.json

@@ -7000,14 +7000,12 @@
                   "optional": true,
                   "choices": [
                     {
-                      "type": "string",
-                      "format": "relativeUrl"
+                      "type": "string"
                     },
                     {
                       "type": "array",
                       "items": {
-                        "type": "string",
-                        "format": "relativeUrl"
+                        "type": "string"
                       }
                     }
                   ]
@@ -9622,6 +9620,154 @@
       ]
     }
   ],
+  "declarative_net_request.json": [
+    {
+      "namespace": "manifest",
+      "types": [
+        {
+          "$extend": "Permission",
+          "choices": [
+            {
+              "type": "string",
+              "enum": [
+                "declarativeNetRequest"
+              ],
+              "min_manifest_version": 3
+            }
+          ]
+        },
+        {
+          "$extend": "PermissionNoPrompt",
+          "choices": [
+            {
+              "type": "string",
+              "enum": [
+                "declarativeNetRequestFeedback",
+                "declarativeNetRequestWithHostAccess"
+              ],
+              "min_manifest_version": 3
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "namespace": "declarativeNetRequest",
+      "description": "Use the declarativeNetRequest API to block or modify network requests by specifying declarative rules.",
+      "permissions": [
+        "declarativeNetRequest",
+        "declarativeNetRequestWithHostAccess"
+      ],
+      "types": [
+        {
+          "id": "ResourceType",
+          "type": "string",
+          "description": "How the requested resource will be used. Comparable to the webRequest.ResourceType type.",
+          "enum": [
+            "main_frame",
+            "sub_frame",
+            "stylesheet",
+            "script",
+            "image",
+            "object",
+            "object_subrequest",
+            "xmlhttprequest",
+            "xslt",
+            "ping",
+            "beacon",
+            "xml_dtd",
+            "font",
+            "media",
+            "websocket",
+            "csp_report",
+            "imageset",
+            "web_manifest",
+            "speculative",
+            "other"
+          ]
+        },
+        {
+          "id": "MatchedRule",
+          "type": "object",
+          "properties": {
+            "ruleId": {
+              "type": "integer",
+              "description": "A matching rule's ID."
+            },
+            "rulesetId": {
+              "type": "string",
+              "description": "ID of the Ruleset this rule belongs to."
+            }
+          }
+        }
+      ],
+      "functions": [
+        {
+          "name": "testMatchOutcome",
+          "type": "function",
+          "description": "Checks if any of the extension's declarativeNetRequest rules would match a hypothetical request.",
+          "permissions": [
+            "declarativeNetRequestFeedback"
+          ],
+          "async": "callback",
+          "parameters": [
+            {
+              "name": "request",
+              "type": "object",
+              "description": "The details of the request to test.",
+              "properties": {
+                "url": {
+                  "type": "string",
+                  "description": "The URL of the hypothetical request."
+                },
+                "initiator": {
+                  "type": "string",
+                  "description": "The initiator URL (if any) for the hypothetical request.",
+                  "optional": true
+                },
+                "method": {
+                  "type": "string",
+                  "description": "Standard HTTP method of the hypothetical request.",
+                  "optional": true,
+                  "default": "get"
+                },
+                "type": {
+                  "$ref": "ResourceType",
+                  "description": "The resource type of the hypothetical request."
+                },
+                "tabId": {
+                  "type": "integer",
+                  "description": "The ID of the tab in which the hypothetical request takes place. Does not need to correspond to a real tab ID. Default is -1, meaning that the request isn't related to a tab.",
+                  "optional": true,
+                  "default": -1
+                }
+              }
+            },
+            {
+              "name": "callback",
+              "type": "function",
+              "description": "Called with the details of matched rules.",
+              "parameters": [
+                {
+                  "name": "result",
+                  "type": "object",
+                  "properties": {
+                    "matchedRules": {
+                      "type": "array",
+                      "description": "The rules (if any) that match the hypothetical request.",
+                      "items": {
+                        "$ref": "MatchedRule"
+                      }
+                    }
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ],
   "dns.json": [
     {
       "namespace": "manifest",
@@ -11579,7 +11725,6 @@
           "enum": [
             "java",
             "js",
-            "leaf",
             "mainthreadio",
             "fileio",
             "fileioall",
@@ -12880,20 +13025,43 @@
                 {
                   "min_manifest_version": 3,
                   "type": "array",
+                  "postprocess": "webAccessibleMatching",
+                  "minItems": 1,
                   "items": {
                     "type": "object",
                     "properties": {
                       "resources": {
                         "type": "array",
+                        "minItems": 1,
                         "items": {
                           "type": "string"
                         }
                       },
                       "matches": {
+                        "optional": true,
                         "type": "array",
+                        "minItems": 1,
                         "items": {
                           "$ref": "MatchPattern"
                         }
+                      },
+                      "extension_ids": {
+                        "optional": true,
+                        "type": "array",
+                        "minItems": 1,
+                        "items": {
+                          "choices": [
+                            {
+                              "$ref": "ExtensionID"
+                            },
+                            {
+                              "type": "string",
+                              "enum": [
+                                "*"
+                              ]
+                            }
+                          ]
+                        }
                       }
                     }
                   }
@@ -15941,10 +16109,9 @@
             },
             "persistAcrossSessions": {
               "type": "boolean",
-              "enum": [
-                false
-              ],
-              "description": "Specifies if this content script will persist into future sessions. This is currently NOT supported."
+              "optional": true,
+              "default": true,
+              "description": "Specifies if this content script will persist into future sessions. Defaults to true."
             },
             "css": {
               "type": "array",
@@ -16110,10 +16277,7 @@
                   "persistAcrossSessions": {
                     "type": "boolean",
                     "optional": true,
-                    "enum": [
-                      false
-                    ],
-                    "description": "Specifies if this content script will persist into future sessions. This is currently NOT supported."
+                    "description": "Specifies if this content script will persist into future sessions."
                   }
                 }
               }
@@ -17264,9 +17428,8 @@
           ]
         },
         {
-          "name": "checkDeepEq",
+          "name": "assertDeepEq",
           "type": "function",
-          "unsupported": true,
           "allowAmbiguousOptionalArguments": true,
           "parameters": [
             {
@@ -17276,6 +17439,11 @@
             {
               "type": "any",
               "name": "actual"
+            },
+            {
+              "type": "string",
+              "name": "message",
+              "optional": true
             }
           ]
         },

package/schemas/central/webext.json

@@ -9699,9 +9699,297 @@
               "description": "ID of the Ruleset this rule belongs to."
             }
           }
+        },
+        {
+          "id": "Rule",
+          "type": "object",
+          "properties": {
+            "id": {
+              "type": "integer",
+              "description": "An id which uniquely identifies a rule. Mandatory and should be >= 1.",
+              "minimum": 1
+            },
+            "priority": {
+              "type": "integer",
+              "optional": true,
+              "description": "Rule priority. Defaults to 1. When specified, should be >= 1",
+              "minimum": 1,
+              "default": 1
+            },
+            "condition": {
+              "type": "object",
+              "description": "The condition under which this rule is triggered.",
+              "properties": {
+                "urlFilter": {
+                  "type": "string",
+                  "optional": true,
+                  "description": "TODO: link to doc explaining supported pattern. The pattern which is matched against the network request url. Only one of 'urlFilter' or 'regexFilter' can be specified."
+                },
+                "regexFilter": {
+                  "type": "string",
+                  "optional": true,
+                  "description": "Regular expression to match against the network request url. Only one of 'urlFilter' or 'regexFilter' can be specified."
+                },
+                "isUrlFilterCaseSensitive": {
+                  "type": "boolean",
+                  "optional": true,
+                  "description": "Whether 'urlFilter' or 'regexFilter' is case-sensitive. Defaults to true."
+                },
+                "initiatorDomains": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "The rule will only match network requests originating from the list of 'initiatorDomains'. If the list is omitted, the rule is applied to requests from all domains.",
+                  "minItems": 1,
+                  "items": {
+                    "type": "string",
+                    "description": "TODO: describe domain format."
+                  }
+                },
+                "excludedInitiatorDomains": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "The rule will not match network requests originating from the list of 'initiatorDomains'. If the list is empty or omitted, no domains are excluded. This takes precedence over 'initiatorDomains'.",
+                  "items": {
+                    "type": "string",
+                    "description": "TODO: describe domain format."
+                  }
+                },
+                "requestDomains": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "The rule will only match network requests when the domain matches one from the list of 'requestDomains'. If the list is omitted, the rule is applied to requests from all domains.",
+                  "minItems": 1,
+                  "items": {
+                    "type": "string",
+                    "description": "TODO: describe domain format."
+                  }
+                },
+                "excludedRequestDomains": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "The rule will not match network requests when the domains matches one from the list of 'excludedRequestDomains'. If the list is empty or omitted, no domains are excluded. This takes precedence over 'requestDomains'.",
+                  "items": {
+                    "type": "string",
+                    "description": "TODO: describe domain format."
+                  }
+                },
+                "resourceTypes": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "List of resource types which the rule can match. When the rule action is 'allowAllRequests', this must be specified and may only contain 'main_frame' or 'sub_frame'. Cannot be specified if 'excludedResourceTypes' is specified. If neither of them is specified, all resource types except 'main_frame' are matched.",
+                  "minItems": 1,
+                  "items": {
+                    "$ref": "ResourceType"
+                  }
+                },
+                "excludedResourceTypes": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "List of resource types which the rule won't match. Cannot be specified if 'resourceTypes' is specified. If neither of them is specified, all resource types except 'main_frame' are matched.",
+                  "minItems": 1,
+                  "items": {
+                    "$ref": "ResourceType"
+                  }
+                },
+                "requestMethods": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "List of HTTP request methods which the rule can match. Should be a lower-case method such as 'connect', 'delete', 'get', 'head', 'options', 'patch', 'post', 'put'.'",
+                  "minItems": 1,
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "excludedRequestMethods": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "List of request methods which the rule won't match. Cannot be specified if 'requestMethods' is specified. If neither of them is specified, all request methods are matched.",
+                  "minItems": 1,
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "domainType": {
+                  "type": "string",
+                  "optional": true,
+                  "description": "Specifies whether the network request is first-party or third-party to the domain from which it originated. If omitted, all requests are matched.",
+                  "enum": [
+                    "firstParty",
+                    "thirdParty"
+                  ]
+                },
+                "tabIds": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "List of tabIds which the rule should match. An ID of -1 matches requests which don't originate from a tab. Only supported for session-scoped rules.",
+                  "minItems": 1,
+                  "items": {
+                    "type": "integer"
+                  }
+                },
+                "excludedTabIds": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "List of tabIds which the rule should not match. An ID of -1 excludes requests which don't originate from a tab. Only supported for session-scoped rules.",
+                  "items": {
+                    "type": "integer"
+                  }
+                }
+              }
+            },
+            "action": {
+              "type": "object",
+              "description": "The action to take if this rule is matched.",
+              "properties": {
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "block",
+                    "redirect",
+                    "allow",
+                    "upgradeScheme",
+                    "modifyHeaders",
+                    "allowAllRequests"
+                  ]
+                },
+                "redirect": {
+                  "type": "object",
+                  "optional": true,
+                  "description": "Describes how the redirect should be performed. Only valid when type is 'redirect'.",
+                  "properties": {
+                    "extensionPath": {
+                      "type": "string",
+                      "optional": true,
+                      "description": "Path relative to the extension directory. Should start with '/'."
+                    },
+                    "transform": {
+                      "type": "object",
+                      "optional": true,
+                      "description": "TODO: URLTransform - Url transformations to perform."
+                    },
+                    "url": {
+                      "type": "string",
+                      "optional": true,
+                      "description": "The redirect url. Redirects to JavaScript urls are not allowed."
+                    },
+                    "regexSubstitution": {
+                      "type": "string",
+                      "optional": true,
+                      "description": "TODO with regexFilter + Substitution pattern for rules which specify a 'regexFilter'."
+                    }
+                  }
+                },
+                "requestHeaders": {
+                  "type": "object",
+                  "optional": true,
+                  "description": "The request headers to modify for the request. Only valid when type is 'modifyHeaders'.",
+                  "properties": {
+                    "header": {
+                      "type": "string",
+                      "description": "The name of the request header to be modified."
+                    },
+                    "operation": {
+                      "type": "string",
+                      "description": "The operation to be performed on a header. The 'append' operation is not supported for request headers.",
+                      "enum": [
+                        "set",
+                        "remove"
+                      ]
+                    },
+                    "value": {
+                      "type": "string",
+                      "optional": true,
+                      "description": "The new value for the header. Must be specified for the 'set' operation."
+                    }
+                  }
+                },
+                "responseHeaders": {
+                  "type": "object",
+                  "optional": true,
+                  "description": "The response headers to modify for the request. Only valid when type is 'modifyHeaders'.",
+                  "properties": {
+                    "header": {
+                      "type": "string",
+                      "description": "The name of the response header to be modified."
+                    },
+                    "operation": {
+                      "type": "string",
+                      "description": "The operation to be performed on a header.",
+                      "enum": [
+                        "append",
+                        "set",
+                        "remove"
+                      ]
+                    },
+                    "value": {
+                      "type": "string",
+                      "optional": true,
+                      "description": "The new value for the header. Must be specified for the 'append' and 'set' operations."
+                    }
+                  }
+                }
+              }
+            }
+          }
         }
       ],
       "functions": [
+        {
+          "name": "updateSessionRules",
+          "type": "function",
+          "description": "Modifies the current set of session scoped rules for the extension. The rules with IDs listed in options.removeRuleIds are first removed, and then the rules given in options.addRules are added. These rules are not persisted across sessions and are backed in memory.",
+          "async": "callback",
+          "parameters": [
+            {
+              "name": "options",
+              "type": "object",
+              "properties": {
+                "removeRuleIds": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "IDs of the rules to remove. Any invalid IDs will be ignored.",
+                  "items": {
+                    "type": "integer"
+                  }
+                },
+                "addRules": {
+                  "type": "array",
+                  "optional": true,
+                  "description": "Rules to add.",
+                  "items": {
+                    "$ref": "Rule"
+                  }
+                }
+              }
+            },
+            {
+              "name": "callback",
+              "type": "function",
+              "description": "Called when the session rules have been updated",
+              "parameters": []
+            }
+          ]
+        },
+        {
+          "name": "getSessionRules",
+          "type": "function",
+          "description": "Returns the current set of session scoped rules for the extension.",
+          "async": "callback",
+          "parameters": [
+            {
+              "name": "callback",
+              "type": "function",
+              "parameters": [
+                {
+                  "type": "array",
+                  "items": {
+                    "$ref": "Rule"
+                  }
+                }
+              ]
+            }
+          ]
+        },
         {
           "name": "testMatchOutcome",
           "type": "function",
@@ -17428,9 +17716,8 @@
           ]
         },
         {
-          "name": "checkDeepEq",
+          "name": "assertDeepEq",
           "type": "function",
-          "unsupported": true,
           "allowAmbiguousOptionalArguments": true,
           "parameters": [
             {
@@ -17440,6 +17727,11 @@
             {
               "type": "any",
               "name": "actual"
+            },
+            {
+              "type": "string",
+              "name": "message",
+              "optional": true
             }
           ]
         },

package/schemas/release/webext.json

@@ -11587,7 +11587,6 @@
             "screenshots",
             "seqstyle",
             "stackwalk",
-            "jstracer",
             "jsallocations",
             "nostacksampling",
             "preferencereads",
@@ -11601,6 +11600,7 @@
             "markersallthreads",
             "unregisteredthreads",
             "processcpu",
+            "power",
             "responsiveness"
           ]
         },
@@ -12892,7 +12892,7 @@
                       "matches": {
                         "type": "array",
                         "items": {
-                          "$ref": "MatchPatternRestricted"
+                          "$ref": "MatchPattern"
                         }
                       }
                     }
@@ -19320,6 +19320,8 @@
             "fingerprinting_content",
             "cryptomining",
             "cryptomining_content",
+            "emailtracking",
+            "emailtracking_content",
             "tracking",
             "tracking_ad",
             "tracking_analytics",