Merge pull request #850 from apoint123/build/optimize-native-build

🔧 build: 优化原生模块构建

Author: imsyy

.prettierignore

@@ -4,5 +4,7 @@ pnpm-lock.yaml
 LICENSE.md
 auto-imports.d.ts
 components.d.ts
+native/**/index.d.ts
 # tsconfig.json
 # tsconfig.*.json
+auto-eslint.mjs

eslint.config.mjs

@@ -1,10 +1,10 @@
-import typescriptEslint from "@typescript-eslint/eslint-plugin";
-import { fileURLToPath } from "node:url";
 import { FlatCompat } from "@eslint/eslintrc";
-import vue from "eslint-plugin-vue";
 import js from "@eslint/js";
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import vue from "eslint-plugin-vue";
 import globals from "globals";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import autoEslint from "./auto-eslint.mjs";
 
 const __filename = fileURLToPath(import.meta.url);
@@ -25,6 +25,7 @@ export default [
       "**/docs",
       "**/auto-imports.d.ts",
       "**/components.d.ts",
+      "native/**/index.d.ts",
     ],
   },
   ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"),

native/external-media-integration/package.json

@@ -10,6 +10,6 @@
   },
   "scripts": {
     "build": "napi build --release --no-const-enum",
-    "build:debug": "napi build"
+    "build:debug": "napi build --no-const-enum"
   }
 }

native/ferrous-opencc-wasm/package.json

@@ -3,7 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "build": "wasm-pack build --target web"
+    "build": "wasm-pack build --target web",
+    "build:debug": "wasm-pack build --target web --dev"
   },
   "devDependencies": {
     "wasm-pack": "^0.13.1"

native/taskbar-lyric/package.json

@@ -6,7 +6,8 @@
     "binaryName": "taskbar-lyric"
   },
   "scripts": {
-    "build": "napi build --release --no-const-enum"
+    "build": "napi build --release --no-const-enum",
+    "build:debug": "napi build --no-const-enum"
   },
   "devDependencies": {
     "@napi-rs/cli": "^3.5.1"

native/tools/package.json

@@ -6,7 +6,8 @@
     "binaryName": "tools"
   },
   "scripts": {
-    "build": "napi build --release --no-const-enum"
+    "build": "napi build --release --no-const-enum",
+    "build:debug": "napi build --no-const-enum"
   },
   "devDependencies": {
     "@napi-rs/cli": "^3"

package.json

@@ -25,7 +25,7 @@
     "typecheck": "pnpm typecheck:node && pnpm typecheck:web",
     "build:native": "tsx scripts/build-native.ts",
     "start": "electron-vite preview",
-    "dev": "pnpm build:native && tsx scripts/dev.ts",
+    "dev": "pnpm build:native -- --dev && tsx scripts/dev.ts",
     "build": "rimraf dist && pnpm build:native && pnpm typecheck && electron-vite build",
     "postinstall": "electron-builder install-app-deps",
     "build:web": "pnpm build",

scripts/build-native.ts

@@ -1,8 +1,13 @@
+import dotenv from "dotenv";
 import { execSync } from "node:child_process";
 import os from "node:os";
-import process from "node:process";
-import dotenv from "dotenv";
 import path from "node:path";
+import process from "node:process";
+
+interface NativeModule {
+  name: string;
+  enabled?: boolean;
+}
 
 const isRustAvailable = () => {
   try {
@@ -32,35 +37,37 @@ if (!isRustAvailable()) {
   process.exit(1);
 }
 
-console.log(`[BuildNative] 当前构建目标: ${process.platform}`);
+const modules: NativeModule[] = [
+  {
+    name: "external-media-integration",
+  },
+  {
+    name: "tools",
+  },
+  {
+    name: "taskbar-lyric",
+    enabled: isWindows,
+  },
+  // 有人抱怨编译 wasm 总是有问题，暂时注释掉
+  // {
+  //   name: "ferrous-opencc-wasm",
+  // },
+];
 
 try {
-  console.log("[BuildNative] 开始构建原生模块...");
-
-  execSync("pnpm --filter external-media-integration build", {
-    stdio: "inherit",
-  });
-
-  console.log("[BuildNative] 构建 tools 原生模块...");
-  execSync("pnpm --filter tools build", {
-    stdio: "inherit",
-  });
+  const args = process.argv.slice(2);
+  const isDev = args.includes("--dev");
+  const buildCommand = isDev ? "build:debug" : "build";
 
-  if (isWindows) {
-    console.log("[BuildNative] 构建任务栏歌词原生模块...");
-    execSync("pnpm --filter taskbar-lyric build", {
+  for (const mod of modules) {
+    if (mod.enabled === false) {
+      continue;
+    }
+    execSync(`pnpm --filter ${mod.name} ${buildCommand}`, {
       stdio: "inherit",
     });
   }
-
-  // 有人抱怨编译 wasm 总是有问题，暂时注释掉
-  // console.log("[BuildNative] 构建 ferrous-opencc-wasm...");
-  // execSync("pnpm --filter ferrous-opencc-wasm build", {
-  //   stdio: "inherit",
-  // });
 } catch (error) {
   console.error("[BuildNative] 模块构建失败", error);
   process.exit(1);
 }
-
-console.log("[BuildNative] 原生模块构建完成");

src/components/Setting/MainSetting.vue

@@ -69,7 +69,12 @@
         class="set-content"
         :content-style="{ overflow: 'hidden', padding: '40px 0' }"
       >
-        <Transition name="fade" mode="out-in" :duration="70" @after-leave="setScrollbar?.scrollTo({ top: 0 })">
+        <Transition
+          name="fade"
+          mode="out-in"
+          :duration="70"
+          @after-leave="setScrollbar?.scrollTo({ top: 0 })"
+        >
           <!-- 常规 -->
           <UniversalSetting
             v-if="activeKey === 'general'"

src/utils/lyric/qrc-parser.ts

@@ -11,7 +11,6 @@ const domParser: QRCParserFn = (xmlStr) => {
   try {
     const parser = new DOMParser();
     const doc = parser.parseFromString(xmlStr, "text/xml");
-
     // 检查解析错误（如未转义的 & 等）
     const parseError = doc.querySelector("parsererror");
     if (parseError) {