diff --git a/platform/mv3/make-rulesets.js b/platform/mv3/make-rulesets.js index cd51de3d5..6b446072c 100644 --- a/platform/mv3/make-rulesets.js +++ b/platform/mv3/make-rulesets.js @@ -304,27 +304,27 @@ async function processNetworkFilters(assetDetails, network) { writeFile( `${rulesetDir}/main/${assetDetails.id}.json`, - `${JSON.stringify(plainGood, replacer)}\n` + `${JSON.stringify(plainGood, replacer, 1)}\n` ); if ( regexes.length !== 0 ) { writeFile( `${rulesetDir}/regex/${assetDetails.id}.json`, - `${JSON.stringify(regexes, replacer)}\n` + `${JSON.stringify(regexes, replacer, 1)}\n` ); } if ( removeparamsGood.length !== 0 ) { writeFile( `${rulesetDir}/removeparam/${assetDetails.id}.json`, - `${JSON.stringify(removeparamsGood, replacer)}\n` + `${JSON.stringify(removeparamsGood, replacer, 1)}\n` ); } if ( redirects.length !== 0 ) { writeFile( `${rulesetDir}/redirect/${assetDetails.id}.json`, - `${JSON.stringify(redirects, replacer)}\n` + `${JSON.stringify(redirects, replacer, 1)}\n` ); } diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js index 18036093c..4e7979611 100644 --- a/src/js/static-net-filtering.js +++ b/src/js/static-net-filtering.js @@ -4277,6 +4277,7 @@ FilterContainer.prototype.dnrFromCompiled = function(op, context, ...args) { } // Patch id + const rulesetFinal = []; { let ruleId = 1; for ( const rule of rulesetMap.values() ) { @@ -4285,16 +4286,15 @@ FilterContainer.prototype.dnrFromCompiled = function(op, context, ...args) { } else { rule.id = 0; } + rulesetFinal.push(rule); } for ( const invalid of context.invalid ) { - rulesetMap.set(ruleId++, { - _error: [ invalid ], - }); + rulesetFinal.push({ _error: [ invalid ] }); } } return { - ruleset: Array.from(rulesetMap.values()), + ruleset: rulesetFinal, filterCount: context.filterCount, acceptedFilterCount: context.acceptedFilterCount, rejectedFilterCount: context.rejectedFilterCount,