Merge branch 'master' into fix/AG-40152

.gitignore

@@ -1,7 +1,8 @@
 .DS_Store
 build/
 .idea/
-.vscode/
+.vscode/*
+!.vscode/extensions.json
 .pnpm-store/
 pnpm-debug.log
 node_modules

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+    "recommendations": [
+        "dbaeumer.vscode-eslint",
+        "vitest.explorer"
+    ]
+}

bamboo-specs/auto-build.yaml

@@ -166,7 +166,7 @@ branch-overrides:
 
                   pnpm install ${bamboo.varsPnpm}
 
-                  ./bamboo-specs/scripts/timeout-wrapper.sh 300s pnpm test
+                  ./bamboo-specs/scripts/timeout-wrapper.sh 300s pnpm test:ci
         final-tasks:
           - test-parser:
               type: junit

bamboo-specs/tests.yaml

@@ -184,7 +184,7 @@ Unit tests:
 
             pnpm install ${bamboo.varsPnpm}
 
-            ./bamboo-specs/scripts/timeout-wrapper.sh 300s pnpm test
+            ./bamboo-specs/scripts/timeout-wrapper.sh 300s pnpm test:ci
   final-tasks:
     - test-parser:
         type: junit

package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-extension",
-  "version": "5.1.55",
+  "version": "5.1.57",
   "description": "AdGuard Extension",
   "type": "module",
   "scripts": {
@@ -10,9 +10,10 @@
     "beta": "cross-env BUILD_ENV=beta tsx tools/bundle.ts",
     "release": "cross-env BUILD_ENV=release tsx tools/bundle.ts",
     "adguard-api": "cross-env BUILD_ENV=dev tsx tools/bundle.ts adguard-api",
-    "test:mv2": "cross-env MANIFEST_ENV=2 vitest run",
-    "test:mv3": "cross-env MANIFEST_ENV=3 vitest run",
-    "test": "tsx tools/run-tests.ts",
+    "test": "vitest run",
+    "test:mv2": "vitest run --project mv2",
+    "test:mv3": "vitest run --project mv3",
+    "test:ci": "pnpm run test:mv2 --reporter default --reporter junit --outputFile=./tests-reports/unit-tests-mv2.xml && pnpm run test:mv3 --reporter default --reporter junit --outputFile=./tests-reports/unit-tests-mv3.xml",
     "test:integration": "rimraf tmp && mkdir -p tests-reports && tsx tools/browser-test/index.ts",
     "locales": "tsx tools/locales.js",
     "resources": "tsx tools/resources.ts",
@@ -73,7 +74,6 @@
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "execa": "^9.5.2",
     "fake-indexeddb": "^6.0.0",
     "filesize": "^10.1.2",
     "form-data": "^4.0.0",

tsconfig.json

@@ -2,7 +2,7 @@
     "extends": "./tsconfig.base.json",
     "include": [
         "vitest.setup.ts",
-        "vitest.config.ts",
+        "vitest.workspace.ts",
         "babel.config.js",
         "postcss.config.js",
         "tools/",