Merge pull request #75 from wtetsu/manifestv3_release

Manifest V3

__test__/main/core/rule.test.ts

@@ -3,7 +3,7 @@ import rule from "../../../src/main/core/rule";
 import fs from "fs";
 
 beforeAll(() => {
-  define("chrome.extension.getURL", (name) => name);
+  define("chrome.runtime.getURL", (name) => name);
   define("fetch", async (file) => {
     const data = fs.readFileSync(file);
     return {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mouse-dictionary",
-  "version": "1.5.14",
+  "version": "1.6.1",
   "repository": "https://github.com/wtetsu/mouse-dictionary.git",
   "author": "wtetsu",
   "license": "MIT",

platform/manifest-chrome.json

@@ -1,6 +1,6 @@
 {
-  "manifest_version": 2,
   "name": "Mouse Dictionary",
+  "manifest_version": 3,
   "version": "",
   "description": "__MSG_appDesc__",
   "default_locale": "en",
@@ -9,17 +9,16 @@
     "page": "options/options.html",
     "open_in_tab": true
   },
-  "permissions": ["storage", "unlimitedStorage", "activeTab"],
+  "permissions": ["storage", "unlimitedStorage", "activeTab", "scripting"],
   "background": {
-    "scripts": ["background.js"],
-    "persistent": false
+    "service_worker": "background.js"
   },
-  "browser_action": {
+  "action": {
     "default_icon": "icons/icon19.png",
     "default_title": "Mouse Dictionary"
   },
   "commands": {
-    "_execute_browser_action": {
+    "_execute_action": {
       "description": "Activate the extension"
     },
     "scroll_down": {
@@ -34,5 +33,10 @@
     "48": "icons/icon48.png",
     "128": "icons/icon128.png"
   },
-  "web_accessible_resources": ["data/*.json"]
+  "web_accessible_resources": [
+    {
+      "resources": ["data/rule.json", "data/dict*.json"],
+      "matches": ["<all_urls>"]
+    }
+  ]
 }

src/background/background.js

@@ -7,11 +7,20 @@
 import ExpiringQueue from "./queue";
 import uniqueId from "./unique";
 
-chrome.browserAction.onClicked.addListener(() => {
-  chrome.tabs.executeScript({
-    file: "./main.js",
+if (BROWSER === "CHROME") {
+  chrome.action.onClicked.addListener((tab) => {
+    chrome.scripting.executeScript({
+      target: { tabId: tab.id },
+      files: ["main.js"],
+    });
   });
-});
+} else {
+  chrome.browserAction.onClicked.addListener(() => {
+    chrome.tabs.executeScript({
+      file: "./main.js",
+    });
+  });
+}
 
 // cross-extension messaging
 chrome.runtime.onMessageExternal.addListener((message) => {

src/main/lib/utils.js

@@ -5,7 +5,7 @@
  */
 
 const loadJson = async (fname) => {
-  const url = chrome.extension.getURL(fname);
+  const url = chrome.runtime.getURL(fname);
   return fetch(url).then((r) => r.json());
 };
 

src/options/logic/dict.ts

@@ -123,7 +123,7 @@ export const registerDefaultDict = async (fnProgress: ProgressCallback): Promise
 };
 
 const loadJsonFile = async (fname: string): Promise<Record<string, any>> => {
-  const url = chrome.extension.getURL(fname);
+  const url = chrome.runtime.getURL(fname);
   const response = await fetch(url);
   return response.json();
 };