diff --git a/platform/mv3/extension/js/debug.js b/platform/mv3/extension/js/debug.js index 4a0d54d81ca68..0a6ecaffe70ee 100644 --- a/platform/mv3/extension/js/debug.js +++ b/platform/mv3/extension/js/debug.js @@ -20,7 +20,6 @@ */ import { dnr } from './ext.js'; -import { getDynamicRules } from './ext-compat.js'; /******************************************************************************/ @@ -54,7 +53,7 @@ const getRuleset = async rulesetId => { } let rules; if ( rulesetId === dnr.DYNAMIC_RULESET_ID ) { - rules = await getDynamicRules().catch(( ) => undefined); + rules = await dnr.getDynamicRules().catch(( ) => undefined); } else { const response = await fetch(`/rulesets/main/${rulesetId}.json`).catch(( ) => undefined); if ( response === undefined ) { return; } diff --git a/platform/mv3/extension/js/ruleset-manager.js b/platform/mv3/extension/js/ruleset-manager.js index ca8f1239bfe2a..04bfb3b6f241d 100644 --- a/platform/mv3/extension/js/ruleset-manager.js +++ b/platform/mv3/extension/js/ruleset-manager.js @@ -26,11 +26,6 @@ import { runtime, } from './ext.js'; -import { - getDynamicRules, - getSessionRules, -} from './ext-compat.js'; - import { localRead, localRemove, localWrite, sessionRead, sessionRemove, sessionWrite, @@ -368,8 +363,8 @@ async function commitStrictBlockRules() { beforePermanentRules, beforeTemporaryRules, ] = await Promise.all([ - getDynamicRules({ ruleIds: [ STRICTBLOCK_BASE_RULE_ID ] }), - getSessionRules({ ruleIds: [ STRICTBLOCK_BASE_RULE_ID ] }), + dnr.getDynamicRules({ ruleIds: [ STRICTBLOCK_BASE_RULE_ID ] }), + dnr.getSessionRules({ ruleIds: [ STRICTBLOCK_BASE_RULE_ID ] }), ]); if ( beforePermanentRules?.length ) { ubolLog(`Remove 1 DNR dynamic strictblock rule`); @@ -427,11 +422,11 @@ async function updateDynamicRules() { dynamicRuleIds, sessionRuleIds, ] = await Promise.all([ - getDynamicRules().then(rules => + dnr.getDynamicRules().then(rules => rules.map(rule => rule.id) .filter(id => id < TRUSTED_DIRECTIVE_BASE_RULE_ID) ), - getSessionRules().then(rules => rules.map(rule => rule.id)), + dnr.getSessionRules().then(rules => rules.map(rule => rule.id)), updateRegexRules(dynamicRules), updateRemoveparamRules(dynamicRules), updateRedirectRules(dynamicRules), @@ -480,7 +475,7 @@ async function updateDynamicRules() { /******************************************************************************/ async function filteringModesToDNR(modes) { - const trustedRules = await getDynamicRules({ + const trustedRules = await dnr.getDynamicRules({ ruleIds: [ TRUSTED_DIRECTIVE_BASE_RULE_ID+0 ], }); const trustedRule = trustedRules.length !== 0 && trustedRules[0] || undefined; diff --git a/src/js/resources/set-constant.js b/src/js/resources/set-constant.js index 127f27bbbe910..66584fb81d3e6 100644 --- a/src/js/resources/set-constant.js +++ b/src/js/resources/set-constant.js @@ -61,6 +61,7 @@ export function validateConstantFn(trusted, raw, extraArgs = {}) { } else if ( raw.startsWith('{') && raw.endsWith('}') ) { try { value = safe.JSON_parse(raw).value; } catch(ex) { return; } } + return raw; } else { return; }