Merge branch 'master' into fix/AG-35667-mv2-002

Author: slavaleleka

packages/adguard-api-mv3/package.json

@@ -36,8 +36,7 @@
   "author": "Adguard Software Ltd.",
   "license": "GPL-3.0-only",
   "dependencies": {
-    "@adguard/logger": "1.1.0",
-    "@adguard/tswebextension": "3.0.0-alpha.0",
+    "@adguard/tswebextension": "workspace:^",
     "zod": "3.22.4"
   },
   "devDependencies": {

packages/adguard-api-mv3/rollup.config.ts

@@ -42,7 +42,6 @@ const backgroundConfig = {
         include: 'src/background/**',
     },
     external: [
-        '@adguard/logger',
         '@adguard/tswebextension/mv3',
         'zod',
     ],

packages/adguard-api-mv3/src/background/main.ts

@@ -19,7 +19,7 @@
 import {
     TsWebExtension,
     type Configuration as TsWebExtensionConfiguration,
-    type MessagesHandlerMV3,
+    type MessageHandler,
     FilterListPreprocessor,
     LF,
 } from '@adguard/tswebextension/mv3';
@@ -66,7 +66,7 @@ export class AdguardApi {
      * for example, message for get computed css for content-script.
      * @returns Message handler.
      */
-    public getMessageHandler(): MessagesHandlerMV3 {
+    public getMessageHandler(): MessageHandler {
         return this.tswebextension.getMessageHandler();
     }
 

packages/adguard-api/src/background/main.ts

@@ -19,7 +19,7 @@
 import {
     type TsWebExtension,
     type ConfigurationMV2 as TsWebExtensionConfiguration,
-    type MessageHandlerMV2,
+    type MessageHandler,
     EventChannel,
     createTsWebExtension,
     BasicFilterValidator,
@@ -129,7 +129,7 @@ export class AdguardApi {
      * for example, message for get computed css for content-script.
      * @returns Message handler.
      */
-    public getMessageHandler(): MessageHandlerMV2 {
+    public getMessageHandler(): MessageHandler {
         return this.tswebextension.getMessageHandler();
     }
 

packages/agtree/CHANGELOG.md

@@ -8,6 +8,13 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 [Keep a Changelog]: https://keepachangelog.com/en/1.0.0/
 [Semantic Versioning]: https://semver.org/spec/v2.0.0.html
 
+## [3.0.0-alpha.3] - 2025-01-30
+
+### Changed
+
+- Better usage of ESM pure imports for `tldts` dependency.
+
+[3.0.0-alpha.3]: https://github.com/AdguardTeam/tsurlfilter/releases/tag/agtree-v3.0.0-alpha.3
 
 ## [3.0.0-alpha.2] - 2024-12-17
 

packages/agtree/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@adguard/agtree",
-    "version": "3.0.0-alpha.2",
+    "version": "3.0.0-alpha.3",
     "description": "Tool set for working with adblock filter lists",
     "keywords": [
         "adblock",

packages/agtree/src/parser/network/host-rule-parser.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */
-import * as tldts from 'tldts';
+import { getHostname, getDomain } from 'tldts';
 import isIp from 'is-ip';
 
 import { StringUtils } from '../../utils/string';
@@ -93,7 +93,7 @@ export class HostRuleParser extends BaseParser {
         if (partsLength === 1) {
             // "Just domain" syntax, e.g. `example.org`
             // In this case, domain should be valid and IP will be set to 0.0.0.0 by default
-            if (tldts.getDomain(parts[0].value) !== parts[0].value) {
+            if (getDomain(parts[0].value) !== parts[0].value) {
                 throw new Error(`Not a valid domain: ${parts[0].value}`);
             }
 
@@ -115,7 +115,7 @@ export class HostRuleParser extends BaseParser {
             }
 
             for (const { value } of hostnames) {
-                if (tldts.getHostname(value) !== value) {
+                if (getHostname(value) !== value) {
                     throw new Error(`Not a valid hostname: ${value}`);
                 }
             }

packages/tsurlfilter/CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## [3.1.0-alpha.8] - 2025-01-30
 
 ### Added
 
@@ -14,20 +14,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- We throw error for empty modifier list in network rules.
-- Updated [@adguard/agtree] to `v3.0.0` which improves the bundle size and performance.
-- Updated [@adguard/scriptlets] to `v2.0.1`
-- Updated [@adguard/extended-css] to `v2.1.0`
+- Drop UMD support, now only ESM builds.
+- Updated [@adguard/agtree] to `v3.0.0-alpha.3` which improves the bundle size
+  and performance.
+- Updated [@adguard/scriptlets] to `v2.1.4` which improves the bundle size and
+  performance.
 
 ### Fixed
 
-- Handling missing children data in the deserializer for certain nodes.
 - URI encoded `$removeparam` value is not removed in MV3 [AdguardBrowserExtension#3014].
 - `$removeparam` fails to match encoded URL params in MV2 [AdguardBrowserExtension#3015].
 - `$popup,third-party` modifiers cause document blocking [AdguardBrowserExtension#3012].
 - `$removeparam` incorrectly removes parameters from encoded URLs [AdguardBrowserExtension#3076].
 - Pattern shortcut extraction from regexp patterns with character classes [AdguardBrowserExtension#2924].
 
+[3.1.0-alpha.8]: https://github.com/AdguardTeam/tsurlfilter/releases/tag/tsurlfilter-v3.1.0-alpha.8
 [AdguardBrowserExtension#3014]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/3014
 [AdguardBrowserExtension#3015]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/3015
 [AdguardBrowserExtension#3012]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/3012

packages/tsurlfilter/package.json

@@ -1,12 +1,13 @@
 {
     "name": "@adguard/tsurlfilter",
-    "version": "3.1.0-alpha.7",
+    "version": "3.1.0-alpha.8",
     "description": "This is a TypeScript library that implements AdGuard's content blocking rules",
     "main": "dist/es/index.js",
     "module": "dist/es/index.js",
     "iife": "dist/tsurlfilter.iife.js",
     "types": "dist/types/src/index.d.ts",
     "type": "module",
+    "sideEffects": false,
     "files": [
         "dist",
         "!dist/build.txt"
@@ -115,14 +116,14 @@
     "dependencies": {
         "@adguard/agtree": "workspace:^",
         "@adguard/css-tokenizer": "workspace:^",
-        "@adguard/scriptlets": "^2.1.3-alpha.1",
+        "@adguard/scriptlets": "^2.1.4",
         "cidr-tools": "^6.4.1",
         "commander": "9.4.1",
         "is-cidr": "4.0.2",
         "is-ip": "3.1.0",
         "lru-cache": "^11.0.2",
         "punycode": "2.3.1",
-        "tldts": "5.6.45",
+        "tldts": "^5.7.112",
         "zod": "3.21.4"
     },
     "devDependencies": {

packages/tsurlfilter/src/modifiers/remove-param-modifier.ts

@@ -1,4 +1,4 @@
-import * as utils from '../utils/url';
+import { cleanUrlParamByRegExp } from '../utils/url';
 import { type IAdvancedModifier } from './advanced-modifier';
 import { SimpleRegex } from '../rules/simple-regex';
 
@@ -95,9 +95,9 @@ export class RemoveParamModifier implements IAdvancedModifier {
         }
 
         if (this.value.startsWith('~')) {
-            return utils.cleanUrlParamByRegExp(url, this.valueRegExp, true);
+            return cleanUrlParamByRegExp(url, this.valueRegExp, true);
         }
 
-        return utils.cleanUrlParamByRegExp(url, this.valueRegExp);
+        return cleanUrlParamByRegExp(url, this.valueRegExp);
     }
 }

packages/tsurlfilter/src/request.ts

@@ -143,6 +143,7 @@ export class Request {
         this.sourceUrl = Request.compactUrl(sourceUrl);
 
         const tldResult = parse(url);
+        // We suppose that request always has a hostname and a domain.
         this.hostname = tldResult.hostname!;
         this.domain = tldResult.domain!;
         this.subdomains = Request.getSubdomains(tldResult);

packages/tsurlfilter/src/rules/cosmetic-rule.ts

@@ -16,7 +16,7 @@ import {
 } from '@adguard/agtree';
 
 import { CosmeticRuleBodyGenerator } from '@adguard/agtree/generator';
-import * as rule from './rule';
+import { type IRule, RULE_INDEX_NONE } from './rule';
 import { DomainModifier } from '../modifiers/domain-modifier';
 import { getRelativeUrl } from '../utils/url';
 import { SimpleRegex } from './simple-regex';
@@ -178,7 +178,7 @@ interface ProcessedModifiers {
  * * `example.org#%#//scriptlet('scriptlet-name')` -- Scriptlet rule
  * * `example.org$$div[id="test"]` -- HTML filtering rule
  */
-export class CosmeticRule implements rule.IRule {
+export class CosmeticRule implements IRule {
     private readonly ruleIndex: number;
 
     private readonly filterListId: number;
@@ -562,7 +562,7 @@ export class CosmeticRule implements rule.IRule {
      *
      * @throws error if it fails to parse the rule.
      */
-    constructor(node: AnyCosmeticRule, filterListId: number, ruleIndex: number = rule.RULE_INDEX_NONE) {
+    constructor(node: AnyCosmeticRule, filterListId: number, ruleIndex: number = RULE_INDEX_NONE) {
         this.ruleIndex = ruleIndex;
         this.filterListId = filterListId;
 

packages/tsurlfilter/src/rules/declarative-converter/network-indexed-rule-with-hash.ts

@@ -1,4 +1,5 @@
-import { type AnyRule, RuleConverter } from '@adguard/agtree';
+import { type AnyRule } from '@adguard/agtree';
+import { RuleConverter } from '@adguard/agtree/converter';
 
 import { getErrorMessage } from '../../common/error';
 import { fastHash } from '../../utils/string-utils';

packages/tsurlfilter/src/rules/declarative-converter/rule-set.ts

@@ -1,5 +1,5 @@
 import { z as zod } from 'zod';
-import { RuleParser } from '@adguard/agtree';
+import { RuleParser } from '@adguard/agtree/parser';
 
 import type { NetworkRule } from '../network-rule';
 import { getErrorMessage } from '../../common/error';

packages/tsurlfilter/src/rules/host-rule.ts

@@ -1,6 +1,5 @@
 import { type HostRule as HostRuleNode } from '@adguard/agtree';
-
-import * as rule from './rule';
+import { type IRule, RULE_INDEX_NONE } from './rule';
 
 /**
  * Implements a host rule.
@@ -20,7 +19,7 @@ import * as rule from './rule';
  * * `::1 localhost ip6-localhost ip6-loopback` -- ipv6 aliases
  * * `example.org` -- "just domain" syntax
  */
-export class HostRule implements rule.IRule {
+export class HostRule implements IRule {
     private readonly ruleIndex: number;
 
     private readonly filterListId: number;
@@ -41,7 +40,7 @@ export class HostRule implements rule.IRule {
      *
      * @throws error if it fails to parse the rule.
      */
-    constructor(node: HostRuleNode, filterListId: number, ruleIndex = rule.RULE_INDEX_NONE) {
+    constructor(node: HostRuleNode, filterListId: number, ruleIndex = RULE_INDEX_NONE) {
         this.ruleIndex = ruleIndex;
         this.filterListId = filterListId;
 

packages/tsurlfilter/src/rules/network-rule.ts

@@ -1,7 +1,7 @@
 import { type ModifierList, type NetworkRule as NetworkRuleNode } from '@adguard/agtree';
 import { RuleGenerator } from '@adguard/agtree/generator';
 
-import * as rule from './rule';
+import { type IRule, RULE_INDEX_NONE } from './rule';
 import { SimpleRegex } from './simple-regex';
 import { type Request } from '../request';
 import { DomainModifier, PIPE_SEPARATOR } from '../modifiers/domain-modifier';
@@ -202,7 +202,7 @@ export enum NetworkRuleGroupOptions {
  * Basic network filtering rule.
  * https://kb.adguard.com/en/general/how-to-create-your-own-ad-filters#basic-rules
  */
-export class NetworkRule implements rule.IRule {
+export class NetworkRule implements IRule {
     private readonly ruleIndex: number;
 
     private readonly filterListId: number;
@@ -1055,7 +1055,7 @@ export class NetworkRule implements rule.IRule {
      *
      * @throws error if it fails to parse the rule.
      */
-    constructor(node: NetworkRuleNode, filterListId: number, ruleIndex = rule.RULE_INDEX_NONE) {
+    constructor(node: NetworkRuleNode, filterListId: number, ruleIndex = RULE_INDEX_NONE) {
         this.ruleIndex = ruleIndex;
         // TODO: Remove this completely
         this.ruleText = RuleGenerator.generate(node);