Merge branch 'master' into fix/AG-23003-04

AdguardTeam · Jul 19, 2023 · 84a01f5 · 84a01f5
2 parents 7dd79b1 + 8b9101e
commit 84a01f5
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 45 deletions.
diff --git a/packages/agtree/src/index.ts b/packages/agtree/src/index.ts
@@ -5,53 +5,53 @@
 // Parser
 export { RuleParser } from './parser/rule';
 export {
-    Agent,
-    AgentCommentRule,
-    AnyCommentRule,
-    AnyCosmeticRule,
-    AnyExpressionNode,
-    AnyOperator,
-    AnyRule,
-    CommentBase,
+    type Agent,
+    type AgentCommentRule,
+    type AnyCommentRule,
+    type AnyCosmeticRule,
+    type AnyExpressionNode,
+    type AnyOperator,
+    type AnyRule,
+    type CommentBase,
     CommentMarker,
-    CommentRule,
+    type CommentRule,
     CommentRuleType,
-    ConfigCommentRule,
-    CosmeticRule,
+    type ConfigCommentRule,
+    type CosmeticRule,
     CosmeticRuleSeparator,
     CosmeticRuleType,
-    CssInjectionRule,
-    CssInjectionRuleBody,
-    Domain,
-    DomainList,
-    DomainListSeparator,
-    ElementHidingRule,
-    ElementHidingRuleBody,
-    EmptyRule,
-    ExpressionOperatorNode,
-    ExpressionParenthesisNode,
-    ExpressionVariableNode,
-    FilterList,
-    Hint,
-    HintCommentRule,
-    HtmlFilteringRule,
-    HtmlFilteringRuleBody,
-    JsInjectionRule,
-    Location,
-    LocationRange,
-    MetadataCommentRule,
-    Modifier,
-    ModifierList,
-    NetworkRule,
-    Node,
-    Parameter,
-    ParameterList,
-    PreProcessorCommentRule,
-    RuleBase,
+    type CssInjectionRule,
+    type CssInjectionRuleBody,
+    type Domain,
+    type DomainList,
+    type DomainListSeparator,
+    type ElementHidingRule,
+    type ElementHidingRuleBody,
+    type EmptyRule,
+    type ExpressionOperatorNode,
+    type ExpressionParenthesisNode,
+    type ExpressionVariableNode,
+    type FilterList,
+    type Hint,
+    type HintCommentRule,
+    type HtmlFilteringRule,
+    type HtmlFilteringRuleBody,
+    type JsInjectionRule,
+    type Location,
+    type LocationRange,
+    type MetadataCommentRule,
+    type Modifier,
+    type ModifierList,
+    type NetworkRule,
+    type Node,
+    type Parameter,
+    type ParameterList,
+    type PreProcessorCommentRule,
+    type RuleBase,
     RuleCategory,
-    ScriptletInjectionRule,
-    ScriptletInjectionRuleBody,
-    Value,
+    type ScriptletInjectionRule,
+    type ScriptletInjectionRuleBody,
+    type Value,
 } from './parser/common';
 export { AdblockSyntaxError } from './parser/errors/adblock-syntax-error';
 export { AgentCommentRuleParser } from './parser/comment/agent-rule';
@@ -97,11 +97,11 @@ export {
     UBO_SCRIPTLET_MASK,
 } from './utils/constants';
 export { AdblockSyntax } from './utils/adblockers';
-export { CosmeticRuleSeparatorFinderResult, CosmeticRuleSeparatorUtils } from './utils/cosmetic-rule-separator';
+export { type CosmeticRuleSeparatorFinderResult, CosmeticRuleSeparatorUtils } from './utils/cosmetic-rule-separator';
 export { CssTree } from './utils/csstree';
 export { CssTreeNodeType, CssTreeParserContext } from './utils/csstree-constants';
 export { DomainUtils } from './utils/domain';
-export { VariableTable, LogicalExpressionUtils } from './utils/logical-expression';
+export { type VariableTable, LogicalExpressionUtils } from './utils/logical-expression';
 export { shiftLoc, locRange } from './utils/location';
 
 // Constants

diff --git a/packages/agtree/tsconfig.json b/packages/agtree/tsconfig.json
@@ -15,6 +15,7 @@
         "forceConsistentCasingInFileNames": true,
         "strict": true,
         "skipLibCheck": true,
+        "isolatedModules": true,
         "rootDir": "./"
     },
     "include": [
@@ -30,4 +31,4 @@
             "module": "ESNext"
         }
     }
-}
+}