declarativeNetRequestFeedback only in DEBUG/DEV

Author: tophf

Diff for: src/.types.d.ts

@@ -8,6 +8,7 @@ declare var __: {
   DEBUGLOG: typeof console.log,
   DEBUGTRACE: typeof console.trace,
   DEBUGWARN: typeof console.warn,
+  DEV: boolean,
   ENTRY: 'offscreen' | 'sw' | 'worker' | string | boolean,
   IS_BG: boolean,
   JS: string,

Diff for: src/js/dnr.js

@@ -25,6 +25,6 @@ function updateDNR(
   return this({addRules, removeRuleIds});
 }
 
-if (__.MV3 && !__.ZIP && __.DEBUG) {
+if (__.MV3 && (__.DEBUG || __.DEV)) {
   DNR.onRuleMatchedDebug?.addListener(console.log.bind(null, 'DNR'));
 }

Diff for: src/manifest-mv3.json

@@ -5,7 +5,6 @@
     "alarms",
     "contextMenus",
     "declarativeNetRequestWithHostAccess",
-    "declarativeNetRequestFeedback",
     "identity",
     "idle",
     "offscreen",

Diff for: tools/build-zip.js

@@ -55,8 +55,6 @@ const TARGETS = [
 function patchManifest(str, target) {
   const [/*BUILD*/, /*FLAVOR*/, CHANNEL] = target.split('-');
   const mj = JSON.parse(str);
-  const i = mj.permissions.indexOf('declarativeNetRequestFeedback');
-  if (i >= 0) mj.permissions.splice(i, 1);
   if (CHANNEL) mj.name += ` (${CHANNEL})`;
   delete mj.key;
   return mj;

Diff for: webpack.config.js

@@ -16,8 +16,7 @@ const WebpackPatchBootstrapPlugin = require('./tools/webpack-patch-bootstrap');
 const {escapeForRe, getManifestOvrName, stripSourceMap, DEV, MANIFEST, ROOT} =
   require('./tools/util');
 
-const GITHUB_ACTIONS = process.env.GITHUB_ACTIONS;
-const NODE_ENV = process.env.NODE_ENV;
+const {DEBUG, GITHUB_ACTIONS, NODE_ENV} = process.env;
 const [TARGET, ZIP] = NODE_ENV?.split(':') || [''];
 const [BUILD, FLAVOR, CHANNEL] = TARGET.split('-');
 const SRC = ROOT + 'src/';
@@ -75,7 +74,7 @@ const VARS = {
   BUILD,
   CLIENT_DATA: 'clientData', // hiding the global from IDE
   CM_PATH,
-  DEBUG: process.env.DEBUG?.split(',').reduce((res, s) => res + DEBUGMASK[s], 1) || 0,
+  DEBUG: DEBUG?.split(',').reduce((res, s) => res + DEBUGMASK[s], 1) || 0,
   DEV,
   ENTRY: false,
   IS_BG: false,
@@ -86,9 +85,9 @@ const VARS = {
   ZIP: !!ZIP,
 };
 const RAW_VARS = {
-  DEBUGLOG: (process.env.DEBUG ? '' : 'null&&') + 'console.log',
-  DEBUGTRACE: (process.env.DEBUG ? '' : 'null&&') + 'console.trace',
-  DEBUGWARN: (process.env.DEBUG ? '' : 'null&&') + 'console.warn',
+  DEBUGLOG: (DEBUG ? '' : 'null&&') + 'console.log',
+  DEBUGTRACE: (DEBUG ? '' : 'null&&') + 'console.trace',
+  DEBUGWARN: (DEBUG ? '' : 'null&&') + 'console.warn',
   KEEP_ALIVE: '1&&',
 };
 const BANNER = '{const global = this, window = global;';
@@ -314,6 +313,9 @@ function makeManifest(files) {
   if (MV3 && CHANNEL === 'beta' && parseInt(ver) === 2) {
     ver = base.version = 3 + ver.slice(1);
   }
+  if (MV3 && (DEBUG || DEV)) {
+    base.permissions.push('declarativeNetRequestFeedback');
+  }
   if (GITHUB_ACTIONS) {
     delete base.key;
     childProcess.execSync(`echo "_VER=${ver}" >> $GITHUB_ENV`);