AG-25746: simplify work with constants in mv3 example

Merge in ADGUARD-FILTERS/tsurlfilter from feature/AG-25746 to master Squashed commit of the following: commit 605c937 Author: Dmitriy Seregin <[email protected]> Date: Mon Sep 11 13:46:45 2023 +0300 AG-25746: simplify work with constants in mv3 example
AdguardTeam · Sep 11, 2023 · ede8ce0 · ede8ce0
1 parent 6567b41
commit ede8ce0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 47 deletions.
diff --git a/packages/examples/tswebextension-mv3/extension/src/background/loadDefaultConfig.ts b/packages/examples/tswebextension-mv3/extension/src/background/loadDefaultConfig.ts
@@ -1,46 +1,13 @@
-import { Configuration } from '@adguard/tswebextension/mv3';
+import { type Configuration } from '@adguard/tswebextension/mv3';
+import { DEFAULT_EXTENSION_CONFIG } from '../../../scripts/constants';
 
 /**
  * Return default configuration with loaded filters content
  * @param filtersDir directory with filters in txt format
  * @returns configuration
  */
 export const loadDefaultConfig = (): Configuration => {
-    console.debug('[LOAD DEFAULT CONFIG]: start');
+    console.debug('[LOAD DEFAULT CONFIG]');
 
-    const defaultConfig: Configuration = {
-        staticFiltersIds: [1, 2, 3, 4, 9, 14],
-        customFilters: [],
-        allowlist: [],
-        trustedDomains: [],
-        userrules: [],
-        verbose: false,
-        filtersPath: 'filters',
-        ruleSetsPath: 'filters/declarative',
-        filteringLogEnabled: false,
-        settings: {
-            assistantUrl: '',
-            collectStats: true,
-            allowlistInverted: false,
-            allowlistEnabled: false,
-            documentBlockingPageUrl: chrome.runtime.getURL('pages/document-blocking.html'),
-            stealthModeEnabled: true,
-            filteringEnabled: true,
-            stealth: {
-                blockChromeClientData: true,
-                hideReferrer: true,
-                hideSearchQueries: true,
-                sendDoNotTrack: true,
-                blockWebRTC: true,
-                selfDestructThirdPartyCookies: true,
-                selfDestructThirdPartyCookiesTime: 3600,
-                selfDestructFirstPartyCookies: true,
-                selfDestructFirstPartyCookiesTime: 3600,
-            },
-        },
-    };
-
-    console.debug('[LOAD DEFAULT CONFIG]: end');
-
-    return defaultConfig;
+    return DEFAULT_EXTENSION_CONFIG;
 };
diff --git a/packages/examples/tswebextension-mv3/scripts/browser-test/index.ts b/packages/examples/tswebextension-mv3/scripts/browser-test/index.ts
@@ -1,8 +1,6 @@
 import { chromium } from 'playwright';
 
 import {
-    BUILD_PATH,
-    USER_DATA_PATH,
     DEFAULT_EXTENSION_CONFIG,
     TESTCASES_BASE_URL,
 } from '../constants';
@@ -19,6 +17,7 @@ import { getTestcases, getRuleText } from './requests';
 import { filterCompatibleTestcases } from './testcase';
 import { logTestResult, logTestTimeout } from './logger';
 import { Product } from './product';
+import { BUILD_PATH, USER_DATA_PATH } from '../build/constants';
 
 const TESTS_TIMEOUT_MS = 5 * 1000;
 const TESTS_TIMEOUT_CODE = 'tests_timeout';

diff --git a/packages/examples/tswebextension-mv3/scripts/build/constants.ts b/packages/examples/tswebextension-mv3/scripts/build/constants.ts
@@ -0,0 +1,5 @@
+import path from 'path';
+
+export const BUILD_PATH = path.join(__dirname, '../build');
+
+export const USER_DATA_PATH = path.join(__dirname, '../tmp');
diff --git a/packages/examples/tswebextension-mv3/scripts/constants.ts b/packages/examples/tswebextension-mv3/scripts/constants.ts
@@ -1,18 +1,12 @@
-import path from 'path';
-
 import { Configuration } from '@adguard/tswebextension/mv3';
 
-export const BUILD_PATH = path.join(__dirname, '../build');
-
-export const USER_DATA_PATH = path.join(__dirname, '../tmp');
-
 // TODO: can be used as common for examples/tswebextension-mv2 as well
 export const TESTCASES_BASE_URL = 'https://testcases.agrd.dev';
 
 export const TESTCASES_DATA_PATH = '/data.json';
 
 export const DEFAULT_EXTENSION_CONFIG: Configuration = {
-    staticFiltersIds: [],
+    staticFiltersIds: [1, 2, 3, 4, 9, 14],
     customFilters: [],
     allowlist: [],
     userrules: [],

diff --git a/packages/examples/tswebextension-mv3/scripts/precompile-rules.ts b/packages/examples/tswebextension-mv3/scripts/precompile-rules.ts
@@ -4,13 +4,14 @@ import { getFilterName } from '@adguard/tswebextension/mv3/utils';
 import axios from 'axios';
 import path from 'path';
 import { ensureDir } from 'fs-extra';
+import { DEFAULT_EXTENSION_CONFIG } from './constants';
 
 const COMMON_FILTERS_DIR = './extension/filters';
 const FILTERS_DIR = `${COMMON_FILTERS_DIR}`;
 const DEST_RULE_SETS_DIR = `${COMMON_FILTERS_DIR}/declarative`;
 const RESOURCES_DIR = '/war/redirects';
 
-const ADGUARD_FILTERS_IDS = [1, 2, 3, 4, 9, 14];
+const ADGUARD_FILTERS_IDS = DEFAULT_EXTENSION_CONFIG.staticFiltersIds;
 
 const EXTENSION_FILTERS_SERVER_URL_FORMAT = 'https://filters.adtidy.org/extension/chromium';
 const FILTER_DOWNLOAD_URL_FORMAT = `${EXTENSION_FILTERS_SERVER_URL_FORMAT}/filters/%filter.txt`;