Misc changes from code review

README.md

@@ -38,9 +38,9 @@ Run the build as described below and then follow the instructions [here](https:/
 
 Internally, we use `web-ext` to bundle a distribution package for the extension for Firefox. You do not need to install `web-ext`. Note that `web-ext` will generate a zip file which can also be used for the Chrome Web Store.
 
-Then generate a build (might need to make the file executable using `chmod +x build.sh`):
+Then pacakge a build (might need to make the file executable using `chmod +x package.sh`):
 ```
-npm run generate
+npm run package
 ```
 
 The script does:

manifests/manifest.CHROME.json → manifests/manifest.chrome.json

@@ -2,9 +2,5 @@
   "background": {
     "service_worker": "build/background.js",
     "type": "module"
-  },
-  "optional_host_permissions": [
-    "http://*/*",
-    "https://*/*"
-  ]
+  }
 }

manifests/manifest.COMMON.json → manifests/manifest.common.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
-  "name": "Linkding",
-  "version": "2.0.0",
+  "name": "linkding extension",
+  "version": "1.7.0",
   "description": "Companion extension for the linkding bookmark service",
   "homepage_url": "https://github.com/sissbruecker/linkding-extension/",
   "icons": {
@@ -18,7 +18,7 @@
       "32": "icons/button_32x32.png",
       "38": "icons/button_38x38.png"
     },
-    "default_title": "Add bookmark",
+    "default_title": "Add bookmark (Alt+Shift+L)",
     "default_popup": "popup/index.html"
   },
   "commands": {
@@ -36,5 +36,9 @@
   "permissions": [
     "tabs",
     "storage"
+  ],
+  "host_permissions": [
+    "https://*/*",
+    "http://*/*"
   ]
 }

manifests/manifest.FIREFOX.json → manifests/manifest.firefox.json

@@ -9,9 +9,5 @@
       "id": "{6bc19aa2-7d91-4791-b5d4-8d84b5f3cdad}",
       "strict_min_version": "109.0"
     }
-  },
-  "optional_permissions": [
-    "http://*/*",
-    "https://*/*"
-  ]
+  }
 }

manifests/merge.js

@@ -0,0 +1,19 @@
+const jq = require("node-jq");
+const fs = require("fs");
+const path = require("path");
+
+const commonManifest = JSON.parse(
+  fs.readFileSync("manifests/manifest.common.json", "utf8")
+);
+const browserManifest = JSON.parse(
+  fs.readFileSync(`manifests/manifest.${process.argv[2]}.json`, "utf8")
+);
+
+jq.run(".[0] * .[1]", [commonManifest, browserManifest], {
+  input: "json",
+}).then((output) => {
+  if (!fs.existsSync(process.argv[3])) {
+    fs.mkdirSync(process.argv[3], { recursive: true });
+  }
+  fs.writeFileSync(path.join(process.argv[3], "manifest.json"), output);
+});