💚 修复lint问题

Author: CodFrm

package.json

@@ -7,6 +7,7 @@
   "scripts": {
     "test": "jest --coverage",
     "lint": "eslint --ext .js,.ts,.tsx src/",
+    "lint-fix": "eslint --ext .js,.ts,.tsx src/ --fix",
     "dev": "concurrently \"webpack --mode development --config ./webpack/webpack.dev.ts\" \"webpack --mode development --config ./webpack/webpack.inject.dev.ts\"",
     "build": "webpack --mode production --config ./webpack/webpack.prod.ts && concurrently \"npm run build:linter\" \"npm run build:inject && npm run build:no-split\"",
     "build:linter": "webpack --mode production --config ./webpack/webpack.linter.ts",
@@ -107,4 +108,4 @@
     "webpack-cli": "^5.1.4",
     "webpack-merge": "^5.9.0"
   }
-}
+}

src/pkg/utils/script.ts

@@ -8,7 +8,8 @@ import {
   SCRIPT_TYPE_BACKGROUND,
   SCRIPT_TYPE_CRONTAB,
   SCRIPT_TYPE_NORMAL,
-  ScriptDAO
+  ScriptDAO,
+  type UserConfig,
 } from "@App/app/repo/scripts";
 import {
   Subscribe,
@@ -94,7 +95,6 @@ export async function fetchScriptInfo(
   isUpdate: boolean,
   uuid: string
 ): Promise<ScriptInfo> {
-
   const body = await fetchScriptBody(url);
   const ok = parseMetadata(body);
   if (!ok) {
@@ -165,7 +165,7 @@ export async function prepareScriptByCode(
   }
   const newUUID = uuid || uuidv4();
   const config: UserConfig | undefined = parseUserConfig(code);
-  let script: Script = {
+  const script: Script = {
     id: 0,
     uuid: newUUID,
     name: metadata.name[0],
@@ -196,24 +196,32 @@ export async function prepareScriptByCode(
   }
   if (old) {
     if (
-      (old.type === SCRIPT_TYPE_NORMAL &&
-        script.type !== SCRIPT_TYPE_NORMAL) ||
-      (script.type === SCRIPT_TYPE_NORMAL &&
-        old.type !== SCRIPT_TYPE_NORMAL)
+      (old.type === SCRIPT_TYPE_NORMAL && script.type !== SCRIPT_TYPE_NORMAL) ||
+      (script.type === SCRIPT_TYPE_NORMAL && old.type !== SCRIPT_TYPE_NORMAL)
     ) {
       throw new Error("脚本类型不匹配,普通脚本与后台脚本不能互相转变");
     }
-    const { id, uuid, createtime, lastruntime, error, sort, selfMetadata, subscribeUrl, status } = old;
+    const {
+      id,
+      uuid: oldUUID,
+      createtime,
+      lastruntime,
+      error,
+      sort,
+      selfMetadata,
+      subscribeUrl,
+      status,
+    } = old;
     Object.assign(script, {
       id,
-      uuid,
+      oldUUID,
       createtime,
       lastruntime,
       error,
       sort,
       selfMetadata: selfMetadata || {},
       subscribeUrl,
-      status
+      status,
     });
   } else {
     // 前台脚本默认开启
@@ -223,7 +231,6 @@ export async function prepareScriptByCode(
     script.checktime = Date.now();
   }
   return { script, oldScript: old };
-
 }
 
 // 通过代码解析出脚本信息 (Subscribe)
@@ -246,7 +253,7 @@ export async function prepareSubscribeByCode(
     code,
     author: (metadata.author && metadata.author[0]) || "",
     scripts: {},
-    metadata: metadata,
+    metadata,
     status: SUBSCRIBE_STATUS_ENABLE,
     createtime: Date.now(),
     updatetime: Date.now(),

src/pkg/utils/utils.ts

@@ -166,7 +166,7 @@ export async function getCurrentTab() {
   // `tab` will either be a `tabs.Tab` instance or `undefined`.
   const [tab] = await new Promise<chrome.tabs.Tab[]>((resolve, reject) => {
     chrome.tabs.query({ active: true, lastFocusedWindow: true }, (results) => {
-      const lastError = chrome.runtime.lastError;
+      const {lastError} = chrome.runtime;
       if (lastError) {
         reject(new Error(lastError.message));
         return;
@@ -205,7 +205,7 @@ export async function openInCurrentTab(url: string) {
   delete createProperties.windowId;
   try {
     await chrome.tabs.create(createProperties);
-    return;
+    
   } catch {
     // do nothing
   }