wip: mv3

scriptscat · Jun 21, 2024 · 11c95f1 · 11c95f1
1 parent 389e6d2
commit 11c95f1
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 280 deletions.
diff --git a/docs/images/脚本猫通信架构.drawio b/docs/images/脚本猫通信架构.drawio
diff --git a/docs/images/脚本猫通信架构.drawio.png b/docs/images/脚本猫通信架构.drawio.png
diff --git a/docs/runtime.md b/docs/runtime.md
diff --git a/docs/架构设计.md b/docs/架构设计.md
diff --git a/docs/通信机制.md b/docs/通信机制.md
diff --git a/jest.config.js b/jest.config.js
@@ -12,7 +12,7 @@ module.exports = {
     "\\.[jt]s$": "babel-jest",
     "\\.m[jt]s$": "babel-jest",
   },
-  transformIgnorePatterns: ["node_modules/(?!(uuid|dexi|yaml))"],
+  transformIgnorePatterns: ["node_modules/(?!(uuid|dexie|yaml))"],
   setupFiles: ["./pkg/chrome-extension-mock/index.ts"],
   moduleDirectories: ["node_modules", "src"],
   watch: false,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scriptcat",
-  "version": "0.16.3",
+  "version": "0.17.0-beta",
   "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!",
   "author": "CodFrm",
   "license": "GPLv3",

diff --git a/pkg/chrome-extension-mock/README.md b/pkg/chrome-extension-mock/README.md
@@ -1,3 +1,3 @@
-# mock一个chrome扩展环境
-> 只针对自己的项目做了一些简单的封装，如果有需要可以自己修改
+# mock 一个 chrome 扩展环境
 
+> 只针对自己的项目做了一些简单的封装，如果有需要可以自己修改
diff --git a/pkg/rpc/README.md b/pkg/rpc/README.md
@@ -0,0 +1,2 @@
+# RPC调用
+
diff --git a/src/manifest.json b/src/manifest.json
@@ -1,7 +1,7 @@
 {
-  "manifest_version": 2,
+  "manifest_version": 3,
   "name": "__MSG_scriptcat__",
-  "version": "0.16.3",
+  "version": "0.17.0.1010",
   "author": "CodFrm",
   "description": "__MSG_scriptcat_description__",
   "options_ui": {
@@ -12,16 +12,20 @@
   "icons": {
     "128": "assets/logo.png"
   },
-  "browser_action": {
+  "action": {
     "default_popup": "src/popup.html"
   },
   "background": {
-    "page": "src/background.html"
+    "service_worker": "src/service_worker.js"
   },
   "content_scripts": [
     {
-      "matches": ["<all_urls>"],
-      "js": ["src/content.js"],
+      "matches": [
+        "<all_urls>"
+      ],
+      "js": [
+        "src/content.js"
+      ],
       "run_at": "document_start",
       "all_frames": true
     }
@@ -30,16 +34,21 @@
     "tabs",
     "cookies",
     "storage",
+    "activeTab",
+    "scripting",
+    "offscreen",
     "downloads",
-    "webRequest",
-    "background",
-    "<all_urls>",
     "contextMenus",
     "notifications",
     "clipboardWrite",
-    "webRequestBlocking"
+    "declarativeNetRequest"
+  ],
+  "host_permissions": [
+    "<all_urls>"
   ],
   "sandbox": {
-    "pages": ["src/sandbox.html"]
+    "pages": [
+      "src/sandbox.html"
+    ]
   }
-}
+}
diff --git a/src/background.ts → src/service_worker.ts b/src/background.ts → src/service_worker.ts
diff --git a/tests/mocks/fileMock.js b/tests/mocks/fileMock.js
@@ -1 +1 @@
-module.exports = 'test-file-stub';
+module.exports = "test-file-stub";
diff --git a/webpack.config.ts b/webpack.config.ts
@@ -21,11 +21,11 @@ const config: Configuration = {
   entry: {
     options: `${src}/pages/options/main.tsx`,
     install: `${src}/pages/install/main.tsx`,
-    background: `${src}/background.ts`,
     sandbox: `${src}/sandbox.ts`,
     popup: `${src}/pages/popup/main.tsx`,
     confirm: `${src}/pages/confirm/main.tsx`,
     import: `${src}/pages/import/main.tsx`,
+    service_worker: `${src}/service_worker.ts`,
   },
   output: {
     path: `${dist}/ext/src`,
@@ -73,17 +73,6 @@ const config: Configuration = {
       },
       chunks: ["popup"],
     }),
-    new HtmlWebpackPlugin({
-      filename: `${dist}/ext/src/background.html`,
-      template: `${template}/background.html`,
-      inject: "head",
-      title: "ScriptCat",
-      minify: {
-        removeComments: true,
-      },
-      chunks: ["background"],
-      scriptLoading: "blocking",
-    }),
     new HtmlWebpackPlugin({
       filename: `${dist}/ext/src/confirm.html`,
       template: `${template}/confirm.html`,