Merge pull request #62 from HarlemSquirrel/manifest-v3-fixes

Manifest V3 fixes
keeweb · Aug 4, 2024 · da945a5 · da945a5
2 parents b56b5b7 + df8b0ac
commit da945a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/manifest.json b/manifest.json
@@ -10,9 +10,8 @@
     "128": "icons/icon128.png"
   },
   "background": {
-    "scripts": [
-      "js/background.js"
-    ]
+    "scripts": ["js/background.js"],
+    "service_worker": "js/background.js"
   },
   "permissions": [
     "activeTab",

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "start": "npm run eslint && npm run build-chrome && npm run build-firefox && npm run build-edge && npm run build-safari",
     "build-chrome": "cross-env KW_BROWSER=chrome webpack --mode=production",
-    "build-firefox": "cross-env KW_BROWSER=firefox webpack --mode=production",
+    "build-firefox": "cross-env KW_BROWSER=firefox webpack --mode=production && npx web-ext build -o -s dist/firefox",
     "build-edge": "cross-env KW_BROWSER=edge webpack --mode=production",
     "build-safari": "cross-env KW_BROWSER=safari webpack --mode=production",
     "watch-chrome": "cross-env KW_BROWSER=chrome webpack --mode=development --watch",

diff --git a/src/background/backend.ts b/src/background/backend.ts
@@ -183,7 +183,7 @@ class Backend extends TypedEmitter<BackendEvents> {
 
     private request(request: KeeWebConnectRequest): Promise<KeeWebConnectResponse> {
         return new Promise((resolve, reject) => {
-            const timeout = window.setTimeout(() => {
+            const timeout = self.setTimeout(() => {
                 this._currentRequest = undefined;
                 const errStr = chrome.i18n.getMessage('errorRequestTimeout');
                 reject(new Error(errStr));