Pull request #823: fix linter highlighting in vscode

Merge in ADGUARD-FILTERS/tsurlfilter from fix/linter-highlighting to master

Squashed commit of the following:

commit 43ebe22
Author: Vladimir Zhelvis <[email protected]>
Date:   Wed Mar 27 12:55:45 2024 +0300

    fix linter highlighting in vscode

packages/tsurlfilter/.eslintrc.js

@@ -5,7 +5,7 @@ module.exports = {
     parser: '@typescript-eslint/parser',
     parserOptions: {
         tsconfigRootDir: path.join(__dirname),
-        project: 'tsconfig.eslint.json',
+        project: 'tsconfig.json',
     },
     plugins: [
         'import',

packages/tsurlfilter/package.json

@@ -68,7 +68,7 @@
     "prebuild": "rimraf dist && pnpm build:types",
     "build": "pnpm prebuild && rollup -c rollup.config.ts && pnpm postbuild",
     "postbuild": "node tasks/build-txt",
-    "build:types": "tsc --declaration --emitDeclarationOnly --outdir dist/types",
+    "build:types": "tsc --project tsconfig.build.json --declaration --emitDeclarationOnly --outdir dist/types",
     "docs": "typedoc src --out docs",
     "start": "rollup -c rollup.config.ts -w",
     "test": "jest --coverage",
@@ -107,6 +107,7 @@
     "@swc/jest": "0.2.36",
     "@types/ip6addr": "0.2.3",
     "@types/jest": "29.5.3",
+    "@types/lodash": "^4.17.0",
     "@types/netmask": "1.0.30",
     "@types/node": "18.7.1",
     "@types/punycode": "2.1.0",

packages/tsurlfilter/rollup.config.ts

@@ -24,7 +24,9 @@ const commonConfig = {
         json(),
 
         // Compile TypeScript files
-        typescript(),
+        typescript({
+            tsconfig: 'tsconfig.build.json',
+        }),
 
         // Allow bundling cjs modules (unlike webpack, rollup doesn't understand cjs)
         commonjs({
@@ -135,7 +137,9 @@ const cliConfig = {
         json(),
 
         // Compile TypeScript files
-        typescript(),
+        typescript({
+            tsconfig: 'tsconfig.build.json',
+        }),
 
         // Allow bundling cjs modules (unlike webpack, rollup doesn't understand cjs)
         commonjs({

packages/tsurlfilter/tsconfig.base.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "target": "es5",
+    "module":"es2015",
+    "lib": ["esnext", "dom"],
+    "strict": true,
+    "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "typeRoots": [
+      "./types",
+      "node_modules/@types",
+      "../../node_modules/@types"
+    ]
+  }
+}

packages/tsurlfilter/tsconfig.build.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.base.json",
+  "include": [
+    "src/**/*.ts",
+    "cli/**/*.ts",
+  ],
+}

packages/tsurlfilter/tsconfig.json

@@ -1,24 +1,13 @@
 {
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "target": "es5",
-    "module":"es2015",
-    "lib": ["esnext", "dom"],
-    "strict": true,
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "typeRoots": [
-      "./types",
-      "node_modules/@types",
-      "../../node_modules/@types"
-    ]
-  },
+  "extends": "./tsconfig.base.json",
   "include": [
-    "src",
-    "cli"
+    "src/**/*.ts",
+    "cli/**/*.ts",
+    "test/**/*.ts",
+    ".eslintrc.js",
+    "rollup.config.ts",
+    "jest.config.ts",
+    "tasks/generate-examples.ts"
   ],
   "ts-node": {
     "swc": true,