extract Firefox-specific manifest stuff

+ don't auto-open the side panel on install/upgrade

Author: tophf

src/manifest-mv2-firefox.json

@@ -0,0 +1,22 @@
+{
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}",
+      "strict_min_version": "58.0"
+    }
+  },
+  "options_ui": {
+    "page": "manage.html",
+    "open_in_tab": true
+  },
+  "sidebar_action": {
+    "default_panel": "sidepanel.html",
+    "default_icon": {
+      "16": "icon/16.png",
+      "32": "icon/32.png",
+      "19": "icon/19.png",
+      "38": "icon/38.png"
+    },
+    "open_at_install": false
+  }
+}

src/manifest-mv2.json

@@ -9,20 +9,5 @@
   },
   "commands": {
     "_execute_browser_action": {}
-  },
-  "sidebar_action": {
-    "default_panel": "sidepanel.html",
-    "default_icon": {
-      "16": "icon/16.png",
-      "32": "icon/32.png",
-      "19": "icon/19.png",
-      "38": "icon/38.png"
-    }
-  },
-  "browser_specific_settings": {
-    "gecko": {
-      "id": "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}",
-      "strict_min_version": "58.0"
-    }
   }
 }

src/sidepanel/index.js

@@ -3,4 +3,5 @@ import configDialog from '@/js/dlg/config-dialog';
 import {urlParams} from '@/js/dom';
 import './index.css';
 
-configDialog(+urlParams.get('id')).then(close);
+const id = +urlParams.get('id');
+if (id) configDialog(id).then(close);

tools/util.js

@@ -4,15 +4,17 @@ const fs = require('fs');
 const path = require('path');
 const babel = require('@babel/core');
 
-const MANIFEST = 'manifest.json';
 const ROOT = path.dirname(__dirname.replaceAll('\\', '/')) + '/';
 const SRC = ROOT + 'src/';
 
 const [TARGET, ZIP] = process.env.NODE_ENV?.split(':') || [''];
-const [BUILD, FLAVOR, CHANNEL] = TARGET.split('-');
+const [BUILD, FLAVOR = 'mv2', CHANNEL] = TARGET.split('-');
 const MV3 = FLAVOR === 'mv3';
 const DEV = process.env.npm_lifecycle_event?.startsWith('watch');
 
+const MANIFEST = 'manifest.json';
+const MANIFEST_OVR = `manifest-${FLAVOR}.json`;
+
 /** Nuking comments and whitespace between tags on separate lines as we don't rely on it.
  * The only exception we use is a same-line space e.g. <b>foo</b> <b>bar</b>  */
 const RX_HTML_WS = /^\s+|(?<=[>"',.]|&nbsp;)[ \t]*[\r\n]\s*|\s+(?=>|<\/)|<!--.*?-->|\s+$/gs;
@@ -31,21 +33,14 @@ function escapeToRe(str, flags) {
 }
 
 function getBrowserlist() {
-  const mj = require(SRC + getManifestOvrName());
-  const FF = parseFloat(mj.browser_specific_settings?.gecko.strict_min_version);
-  const CH = parseFloat(mj.minimum_chrome_version);
-  return [
-    FF && 'Firefox >= ' + FF,
-    CH && 'Chrome >= ' + CH,
-  ].filter(Boolean);
-}
-
-function getManifestOvrName(
-  mv3 = /-mv3/.test(process.env.NODE_ENV),
-  asGlob
-) {
-  const s = '-mv' + (mv3 ? 3 : 2);
-  return MANIFEST.replace('.', asGlob ? `?(${s}).` : s + '.');
+  return Object.entries({
+    Chrome: BUILD !== 'firefox' &&
+      require(SRC + MANIFEST_OVR).minimum_chrome_version,
+    Firefox: BUILD !== 'chrome' &&
+      require(SRC + MANIFEST_OVR.replace('.', '-firefox.'))
+        .browser_specific_settings.gecko.strict_min_version,
+  }).map(([name, ver]) => ver && `${name} >= ${parseFloat(ver)}`)
+    .filter(Boolean);
 }
 
 function transBabel(buf, from) {
@@ -97,7 +92,6 @@ module.exports = {
   escapeForRe,
   escapeToRe,
   getBrowserlist,
-  getManifestOvrName,
   nukeHtmlSpaces,
   transBabel,
   transESM2var,

webpack.config.js

@@ -15,8 +15,8 @@ const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer');
 const {RawEnvPlugin} = require('./tools/wp-raw-patch-plugin');
 const patchCodemirror = require('./tools/wp-patch-codemirror');
 const {
-  escapeForRe, getManifestOvrName, transESM2var, transSourceMap,
-  BUILD, CHANNEL, CM_PACKAGE_PATH, DEV, MANIFEST, MV3, ROOT, TARGET, ZIP, nukeHtmlSpaces,
+  escapeForRe, nukeHtmlSpaces, transESM2var, transSourceMap,
+  BUILD, CHANNEL, CM_PACKAGE_PATH, DEV, FLAVOR, MANIFEST, MV3, ROOT, TARGET, ZIP,
 } = require('./tools/util');
 
 global.localStorage = {}; // workaround for node 25 and HtmlWebpackPlugin's `...global`
@@ -354,27 +354,21 @@ function makeContentScript(name) {
 }
 
 function makeManifest(files) {
-  let [base, ovr] = (files[0].sourceFilename.endsWith(MANIFEST) ? files : files.reverse())
+  let [base, ...mods] = (files[0].sourceFilename.endsWith(MANIFEST) ? files : files.reverse())
     .map(file => file.data.toString());
   base = JSON.parse(MV3 ? base.replace('"browser_action"', '"action"') : base);
-  ovr = JSON.parse(ovr);
-  for (const [key, val] of Object.entries(ovr)) {
-    const old = base[key];
-    if (Array.isArray(old)) old.push(...val);
-    else if (old && typeof old === 'object') Object.assign(old, val);
-    else base[key] = val;
+  for (let ovr of mods) {
+    ovr = JSON.parse(ovr);
+    for (const [key, val] of Object.entries(ovr)) {
+      const old = base[key];
+      if (Array.isArray(old)) old.push(...val);
+      else if (old && typeof old === 'object') Object.assign(old, val);
+      else base[key] = val;
+    }
   }
   let ver = base.version;
   if (BUILD === 'firefox') {
     delete base.key;
-    base.options_ui = {
-      /*
-       * Linking to dashboard, not to options, because this is aimed at users who removed the icon
-       * from the toolbar (they rarely use Stylus) so they visit about:addons instead.
-       */
-      page: 'manage.html',
-      open_in_tab: true,
-    };
   }
   if (CHANNEL) {
     base.name += ` (${CHANNEL})`;
@@ -469,7 +463,7 @@ module.exports = [
         patterns: [
           {context: SRC, from: 'icon/**', to: DST},
           {context: SRC + 'content', from: 'install*.js', to: DST + JS},
-          {context: SRC, from: getManifestOvrName(MV3, true), to: MANIFEST,
+          {context: SRC, from: MANIFEST.replace('.', `?(-${FLAVOR}*).`), to: MANIFEST,
             transformAll: makeManifest},
           {context: SRC, from: '_locales/**', to: DST},
           {context: THEME_PATH, from: '*.css', to: DST + CM_PATH},