修复合并错误 (#1062)

Author: cyfung1031

.github/workflows/test.yaml

@@ -39,8 +39,8 @@ jobs:
 
       - name: Lint
         run: |
-          pnpm run typecheck
-          pnpm run lint:ci
+          pnpm typecheck
+          pnpm lint:ci
 
       - name: Unit Test
         run: |

package.json

@@ -10,8 +10,8 @@
     "test": "vitest --test-timeout=500 --no-coverage --isolate=false --reporter=verbose",
     "test:ci": "vitest run --test-timeout=500 --no-coverage --isolate=false --reporter=default --reporter.summary=false",
     "coverage": "vitest run --coverage",
-    "typecheck": "tsc --noEmit",
     "coverage:ci": "vitest run --coverage --silent --reporter=default --reporter.default.summary=false",
+    "typecheck": "tsc --noEmit",
     "build": "cross-env NODE_ENV=production rspack build",
     "dev": "cross-env NODE_ENV=development rspack",
     "dev:noMap": "cross-env NODE_ENV=development NO_MAP=true rspack",

src/app/service/offscreen/gm_api.ts

@@ -1,5 +1,6 @@
 import { BgGMXhr } from "@App/pkg/utils/xhr/bg_gm_xhr";
 import type { IGetSender, Group } from "@Packages/message/server";
+import { mightPrepareSetClipboard, setClipboard } from "../service_worker/clipboard";
 
 // nativePageXHR 不需要绑定 Offscreen.GMApi 的 this，外部可以直接引用
 export const nativePageXHR = async (details: GMSend.XHRDetails, sender: IGetSender) => {
@@ -15,37 +16,17 @@ export const nativePageWindowOpen = (details: { url: string }): boolean => {
   return !!window.open(details.url);
 };
 
+export const nativePageSetClipboard = ({ data, mimetype }: { data: string; mimetype: string }) => {
+  setClipboard(data, mimetype);
+};
+
 export default class GMApi {
   constructor(private group: Group) {}
 
-  textarea: HTMLTextAreaElement = document.createElement("textarea");
-
-  clipboardData: { type?: string; data: string } | undefined;
-
-  async setClipboard({ data, type }: { data: string; type: string }) {
-    this.clipboardData = {
-      type,
-      data,
-    };
-    this.textarea.focus();
-    document.execCommand("copy", false, <any>null);
-  }
-
   init() {
-    this.textarea.style.display = "none";
-    document.documentElement.appendChild(this.textarea);
-    document.addEventListener("copy", (e: ClipboardEvent) => {
-      if (!this.clipboardData || !e.clipboardData) {
-        return;
-      }
-      e.preventDefault();
-      const { type, data } = this.clipboardData;
-      e.clipboardData.setData(type || "text/plain", data);
-      this.clipboardData = undefined;
-    });
-
+    mightPrepareSetClipboard();
     this.group.on("xmlHttpRequest", nativePageXHR);
     this.group.on("windowOpen", nativePageWindowOpen);
-    this.group.on("setClipboard", this.setClipboard.bind(this));
+    this.group.on("setClipboard", nativePageSetClipboard);
   }
 }

src/app/service/service_worker/runtime.ts

@@ -663,7 +663,7 @@ export class RuntimeService {
       // 即使注册失败，通过重置 flag 可避免错误地呼叫已取消注册的Script
       runtimeGlobal.messageFlag = this.generateMessageFlag();
       await Promise.allSettled([
-        chrome.userScripts.unregister(),
+        chrome.userScripts?.unregister(),
         chrome.scripting.unregisterContentScripts(),
         this.localStorageDAO.save({ key: "scriptInjectMessageFlag", value: runtimeGlobal.messageFlag }),
       ]);

src/content.ts

@@ -5,7 +5,7 @@ import { CustomEventMessage } from "@Packages/message/custom_event_message";
 import { Server } from "@Packages/message/server";
 import ContentRuntime from "./app/service/content/content";
 import { initEnvInfo, ScriptExecutor } from "./app/service/content/script_executor";
-import { randomMessageFlag } from "./pkg/utils/utils";
+import { randomMessageFlag, getUspMessageFlag } from "./pkg/utils/utils";
 import type { Message } from "@Packages/message/types";
 
 // @ts-ignore

src/pages/components/RuntimeSetting/index.tsx

@@ -57,20 +57,20 @@ const RuntimeSetting: React.FC = () => {
 
   return (
     <Card title={t("runtime")} bordered={false}>
-      <Space direction="vertical" size={20} className={"w-full"}>
-        <div className="flex items-center justify-between min-h-9">
-          <div className="flex items-center gap-2 flex-1">
+      <Space direction="vertical" size={20} className={"tw-w-full"}>
+        <div className="tw-flex tw-items-center tw-justify-between tw-min-h-9">
+          <div className="tw-flex tw-items-center tw-gap-2 tw-flex-1">
             <Switch onChange={setEnableBackground} checked={enableBackground} />
             <span
-              className="min-w-20 font-medium cursor-pointer"
+              className="tw-min-w-20 tw-font-medium tw-cursor-pointer"
               onClick={() => {
                 setEnableBackground(!enableBackground);
               }}
             >
               {t("enable_background.title")}
             </span>
           </div>
-          <span className="text-xs ml-6 flex-shrink-0">{t("enable_background.description")}</span>
+          <span className="tw-text-xs tw-ml-6 tw-flex-shrink-0">{t("enable_background.description")}</span>
         </div>
         <Collapse bordered={false} defaultActiveKey={["storage"]}>
           <CollapseItem header={t("storage_api")} name="storage">

src/pages/options/routes/ScriptList/ScriptTable.tsx

@@ -489,7 +489,7 @@ export const ScriptTable = ({
           filterIcon: <IconSearch />,
           filterDropdown: ({ filterKeys, setFilterKeys, confirm }: any) => {
             return (
-              <div className="arco-table-custom-filter flex flex-row gap-2">
+              <div className="arco-table-custom-filter tw-flex tw-flex-row tw-gap-2">
                 <ScriptSearchField
                   t={t}
                   autoFocus

src/pages/options/routes/ScriptList/components.tsx

@@ -196,7 +196,7 @@ export const ScriptSearchField = ({ t, defaultValue, onChange, onSearch, autoFoc
   return (
     <Space direction="horizontal">
       <Select
-        className="flex-1"
+        className="tw-flex-1"
         triggerProps={{ autoAlignPopupWidth: false, autoAlignPopupMinWidth: true, position: "bl" }}
         size="small"
         value={type}

src/pages/options/routes/SubscribeList.tsx

@@ -123,7 +123,7 @@ function SubscribeList() {
         );
       },
       onFilter: (value, row) => !value || row.name.includes(value),
-      className: "max-w-[240px]",
+      className: "tw-max-w-[240px]",
       render: (col) => {
         return (
           <Tooltip content={col} position="tl">