Use a separate manifest.json for Chrome and Firefox

.gitignore

@@ -1,3 +1,5 @@
 .DS_Store
 Thumbs.db
-/archive.zip
+/archive_chrome.zip
+/archive_firefox.zip
+/manifest.json

manifest_firefox.json

@@ -0,0 +1,26 @@
+{
+  "name": "Auto Highlight",
+  "version": "3.5.0",
+  "description": "*Auto Highlight* automatically highlights the important content on article pages.",
+  "options_ui": {
+    "page": "src/options/options.html"
+  },
+  "permissions": ["activeTab", "contextMenus", "scripting", "storage"],
+  "optional_permissions": ["tabs", "clipboardWrite", "<all_urls>"],
+  "background": {
+    "scripts": ["src/matchPattern.js", "src/shared.js", "src/eventPage.js"]
+  },
+  "action": {
+    "default_icon": {
+      "19": "icons/0highlight19x19.png",
+      "38": "icons/0highlight38x38.png"
+    },
+    "default_title": "Toggle highlighting"
+  },
+  "icons": {
+    "16": "icons/16x16.png",
+    "48": "icons/48x48.png",
+    "128": "icons/128x128.png"
+  },
+  "manifest_version": 3
+}

src/eventPage.js

@@ -1,6 +1,10 @@
 // TODO: Use consistent variable naming (camel case or underscores, not both)
 
-importScripts('matchPattern.js', 'shared.js');
+// If we're running as a service worker (Chrome), import dependencies. For
+// Firefox, they've already been loaded as background scripts.
+if (self.WorkerGlobalScope !== undefined) {
+    importScripts('matchPattern.js', 'shared.js');
+}
 
 // *****************************
 // * Utilities and Options

zip.sh

@@ -1,22 +1,31 @@
 #!/usr/bin/env bash
 
-# run this from the package directory
+scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "${scriptdir}"
 
-# easier to see args in an array than a string
-ARGS=()
-ARGS+=("icons/")
-ARGS+=("src/")
-ARGS+=("manifest.json")
+gen_archive() {
+  browser="${1}"
 
-# exclude
-ARGS+=("-x")
-ARGS+=("*.DS_Store")
-ARGS+=("*Thumbs.db")
+  # easier to see args in an array than a string
+  args=()
+  args+=("icons/")
+  args+=("src/")
+  args+=("manifest_${browser}.json")
 
-archive="archive.zip"
+  # exclude
+  args+=("-x")
+  args+=("*.DS_Store")
+  args+=("*Thumbs.db")
 
-if [ -f "${archive}" ]; then
-  rm "${archive}"
-fi
+  archive="archive_${browser}.zip"
 
-zip -r "${archive}" "${ARGS[@]}"
+  if [ -f "${archive}" ]; then
+    rm "${archive}"
+  fi
+
+  zip -r "${archive}" "${args[@]}"
+  printf "@ manifest_${browser}.json\n@=manifest.json\n" | zipnote -w "${archive}"
+}
+
+gen_archive chrome
+gen_archive firefox