diff --git a/config/defaults.ts b/config/defaults.ts index 358764e1..2bc234b6 100644 --- a/config/defaults.ts +++ b/config/defaults.ts @@ -1,3 +1,5 @@ +import { blockers } from '../plugins/adblocker/blocker-types'; + export interface WindowSizeConfig { width: number; height: number; @@ -72,7 +74,7 @@ const defaultConfig = { 'adblocker': { enabled: true, cache: true, - blocker: 'With blocklists', + blocker: blockers.InPlayer as string, additionalBlockLists: [], // Additional list of filters, e.g "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/filters.txt" disableDefaultLists: false, }, diff --git a/plugins/adblocker/blocker-types.ts b/plugins/adblocker/blocker-types.ts new file mode 100644 index 00000000..74b7c20b --- /dev/null +++ b/plugins/adblocker/blocker-types.ts @@ -0,0 +1,4 @@ +export const blockers = { + WithBlocklists: 'With blocklists', + InPlayer: 'In player', +} as const; diff --git a/plugins/adblocker/config.ts b/plugins/adblocker/config.ts index e8bad5a5..869aedc6 100644 --- a/plugins/adblocker/config.ts +++ b/plugins/adblocker/config.ts @@ -1,15 +1,12 @@ /* eslint-disable @typescript-eslint/await-thenable */ /* renderer */ +import { blockers } from './blocker-types'; + import { PluginConfig } from '../../config/dynamic'; const config = new PluginConfig('adblocker', { enableFront: true }); -export const blockers = { - WithBlocklists: 'With blocklists', - InPlayer: 'In player', -}; - export const shouldUseBlocklists = async () => await config.get('blocker') !== blockers.InPlayer; export default Object.assign(config, { diff --git a/plugins/adblocker/menu.ts b/plugins/adblocker/menu.ts index 92651424..f2eb1182 100644 --- a/plugins/adblocker/menu.ts +++ b/plugins/adblocker/menu.ts @@ -1,4 +1,6 @@ -import config, { blockers } from './config'; +import config from './config'; + +import { blockers } from './blocker-types'; import { MenuTemplate } from '../../menu'; diff --git a/plugins/adblocker/preload.ts b/plugins/adblocker/preload.ts index bb210b0b..4f17488e 100644 --- a/plugins/adblocker/preload.ts +++ b/plugins/adblocker/preload.ts @@ -1,7 +1,9 @@ -import config, { blockers } from './config'; +import config from './config'; import inject from './inject'; import injectCliqzPreload from './inject-cliqz-preload'; +import { blockers } from './blocker-types'; + export default async () => { if (await config.shouldUseBlocklists()) { // Preload adblocker to inject scripts/styles