AG-36861 use link to scriptlets on github

AdguardTeam · Nov 12, 2024 · 4d6b0db · 4d6b0db
1 parent 82e7291
commit 4d6b0db
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 25 deletions.
diff --git a/packages/agtree/rollup.config.ts b/packages/agtree/rollup.config.ts
@@ -80,6 +80,7 @@ const main = {
         'src/serializer/index.ts',
         'src/deserializer/index.ts',
         'src/converter/index.ts',
+        'src/utils/index.ts',
     ],
     output: [
         {

diff --git a/packages/agtree/src/parser/index.ts b/packages/agtree/src/parser/index.ts
@@ -2,3 +2,4 @@ export { RuleParser } from './rule-parser';
 export { defaultParserOptions, type ParserOptions } from './options';
 export { CosmeticRuleParser } from './cosmetic/cosmetic-rule-parser';
 export { DomainListParser } from './misc/domain-list-parser';
+export { NetworkRuleParser } from './network/network-rule-parser';
diff --git a/packages/tsurlfilter/package.json b/packages/tsurlfilter/package.json
@@ -95,7 +95,7 @@
   "dependencies": {
     "@adguard/agtree": "workspace:^",
     "@adguard/css-tokenizer": "workspace:^",
-    "@adguard/scriptlets": "file:../../../scriptlets",
+    "@adguard/scriptlets": "https://github.com/AdguardTeam/Scriptlets/raw/747265060c888b6b08fedefb16aefa1e83dbcdf7/tmp-adguard-scriptlets-2.0.0.tgz",
     "cidr-tools": "^6.4.1",
     "commander": "9.4.1",
     "is-cidr": "4.0.2",

diff --git a/packages/tsurlfilter/test/helpers/rule-creator.ts b/packages/tsurlfilter/test/helpers/rule-creator.ts
@@ -1,12 +1,10 @@
+import { type AnyCosmeticRule, type AnyRule, type NetworkRule as NetworkRuleNode } from '@adguard/agtree';
 import {
     defaultParserOptions,
-    type AnyCosmeticRule,
-    type AnyRule,
+    RuleParser,
     CosmeticRuleParser,
     NetworkRuleParser,
-    RuleParser,
-    type NetworkRule as NetworkRuleNode,
-} from '@adguard/agtree';
+} from '@adguard/agtree/parser';
 import { isString } from 'lodash';
 
 import {

diff --git a/packages/tswebextension/package.json b/packages/tswebextension/package.json
@@ -90,7 +90,7 @@
     "@adguard/assistant": "^4.3.70",
     "@adguard/extended-css": "^2.0.56",
     "@adguard/logger": "workspace:^",
-    "@adguard/scriptlets": "^1.12.1",
+    "@adguard/scriptlets": "https://github.com/AdguardTeam/Scriptlets/raw/747265060c888b6b08fedefb16aefa1e83dbcdf7/tmp-adguard-scriptlets-2.0.0.tgz",
     "@adguard/tsurlfilter": "workspace:^",
     "bowser": "2.11.0",
     "chrome-types": "^0.1.307",

diff --git a/packages/tswebextension/test/helpers/rule-creator.ts b/packages/tswebextension/test/helpers/rule-creator.ts
@@ -1,12 +1,13 @@
 import {
-    defaultParserOptions,
     type AnyCosmeticRule,
     type AnyRule,
-    CosmeticRuleParser,
-    NetworkRuleParser,
-    RuleParser,
     type NetworkRule as NetworkRuleNode,
 } from '@adguard/agtree';
+import {
+    defaultParserOptions, CosmeticRuleParser,
+    NetworkRuleParser,
+    RuleParser,
+} from '@adguard/agtree/parser';
 import {
     CosmeticRule,
     type IRule,

diff --git a/packages/tswebextension/test/lib/mv2/background/engine-api-dynamic-rules.test.ts b/packages/tswebextension/test/lib/mv2/background/engine-api-dynamic-rules.test.ts
@@ -1,4 +1,4 @@
-import { defaultParserOptions, type ParserOptions, RuleParser } from '@adguard/agtree';
+import { defaultParserOptions, type ParserOptions, RuleParser } from '@adguard/agtree/parser';
 
 import { extendConfig, type RecursivePartial } from '../../../helpers/config-extend';
 import { getConfigurationMv2Fixture } from './fixtures/configuration';

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml