Merge branch 'master' of https://github.com/PUGE/assist

back/popup.js

@@ -42,6 +42,7 @@ function getCurrentTabId(callback) {
 // 登录按钮登录
 document.getElementsByClassName('userInfo')[0].onclick = function () {
   if (!userInfo || !userInfo.username || !userInfo.password || !userInfo.session) {
+    // aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     window.open(chrome.extension.getURL('options.html'), "_blank")
   } else {
     chrome.storage.sync.set({userInfo: {}})

manifest.json

@@ -1,21 +1,20 @@
 {
-	"manifest_version": 2,
+	"manifest_version": 3,
 	"name": "脚本助手",
-	"version": "1.1.17",
+	"version": "1.1.18",
 	"description": "脚本助手",
 	"icons": {
 		"16": "./img/16.png",
 		"48": "./img/48.png",
 		"128": "./img/128.png"
 	},
-	"browser_action":  {
+	"action":  {
 		"default_icon": "img/48.png",
 		"default_title": "脚本助手",
 		"default_popup": "popup.html"
 	},
 	"background": {
-		"persistent": true,
-		"scripts": ["background.js"]
+		"service_worker": "background.js"
 	},
 	"content_scripts": [
 		{
@@ -30,15 +29,18 @@
 		"background",
 		"activeTab",
 		"webRequest",
-		"webRequestBlocking",
-		"notifications",
-		"http://*/*",
-  		"https://*/*"
+		"declarativeNetRequest",
+		"notifications"
+	],
+	"optional_host_permissions": [
+		"*://*/*"
+	],
+	"host_permissions": [
+		"*://*/*"
 	],
 	"homepage_url": "https://github.com/PUGE",
 	"options_page": "options.html",
 	"options_ui": {
-		"page": "options.html",
-		"chrome_style": true
+		"page": "options.html"
 	}
 }