Merge remote-tracking branch 'origin/main'

.github/workflows/build.yml

@@ -8,14 +8,9 @@ on:
 permissions: write-all
 
 jobs:
-  build-linux:
+  build-liteloader:
     if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target_platform: [linux]
-        target_arch: [x64, arm64]
     steps:
     - name: Clone Main Repository
       uses: actions/checkout@v4
@@ -30,24 +25,19 @@ jobs:
         node-version: 20.x
     - name: Build NuCat Linux
       run: |
-          npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+          npm i
           npm run build:prod
           cd dist
-          npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+          npm i --omit=dev 
           cd ..
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
+        name: NapCat.LiteLoader
         path: dist
-  build-win32:
+  build-shell:
     if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target_platform: [win32]
-        target_arch: [x64,ia32]
     steps:
         - name: Clone Main Repository
           uses: actions/checkout@v4
@@ -62,13 +52,13 @@ jobs:
               node-version: 20.x
         - name: Build NuCat Linux
           run: |
-                npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-                npm run build:prod
+                npm i
+                npm run build:shell
                 cd dist
-                npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+                npm i --omit=dev
                 cd ..
         - name: Upload Artifact
           uses: actions/upload-artifact@v4
           with:
-              name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
+              name: NapCat.Shell
               path: dist

.github/workflows/release.yml

@@ -30,14 +30,9 @@ jobs:
               ls
               node ./script/checkVersion.cjs
               sh ./checkVersion.sh
-  build-linux:
+  build-Liteloader:
     needs: [check-version]
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target_platform: [linux]
-        target_arch: [x64, arm64]
     steps:
     - name: Clone Main Repository
       uses: actions/checkout@v4
@@ -51,28 +46,21 @@ jobs:
       with:
           node-version: 20.x
 
-    - name: Build NuCat Linux
+    - name: Build NuCat LiteLoader
       run: |
-          export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
-          export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
-          npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-          npm run build:prod
+          npm i
+          npm run build:liteloader
           cd dist
-          npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+          npm i --omit=dev
           cd ..
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
+        name: NapCat.Liteloader
         path: dist
-  build-win32:
+  build-Shell:
     runs-on: ubuntu-latest
     needs: [check-version]
-    strategy:
-      fail-fast: false
-      matrix:
-        target_platform: [win32]
-        target_arch: [x64,ia32]
     steps:
         - name: Clone Main Repository
           uses: actions/checkout@v4
@@ -89,22 +77,20 @@ jobs:
           
         - name: Build NuCat Linux
           run: |
-                export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
-                export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
-                npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+                npm i 
                 npm run build:prod
                 cd dist
-                npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+                npm i --omit=dev
                 cd ..
 
         - name: Upload Artifact
           uses: actions/upload-artifact@v4
           with:
-              name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
+              name: NapCat.Shell
               path: dist
 
   release-napcat:
-    needs: [build-win32,build-linux]
+    needs: [build-Liteloader,build-Shell]
     runs-on: ubuntu-latest
     steps:
     - name: Download All Artifact
@@ -130,10 +116,8 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         body_path: CHANGELOG.md
         files: |
-          NapCat.win32.ia32.zip
-          NapCat.win32.x64.zip
-          NapCat.linux.x64.zip
-          NapCat.linux.arm64.zip
+          NapCat.Liteloader.zip
+          NapCat.Shell.zip
 #          NapCat.darwin.x64.zip
 #          NapCat.darwin.arm64.zip
         draft: true

.github/workflows/test.yml

@@ -1,69 +0,0 @@
-name: "Build Test"
-on:
-  workflow_dispatch:
-
-permissions: write-all
-
-jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target_platform: [linux]
-        target_arch: [x64, arm64]
-    steps:
-    - name: Clone Main Repository
-      uses: actions/checkout@v4
-      with:
-          repository: 'NapNeko/NapCatQQ'
-          submodules: true
-          ref: main
-          token: ${{ secrets.NAPCAT_BUILD }}
-    - name: Use Node.js 20.X
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20.x
-    - name: Build NuCat Linux
-      run: |
-          npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-          npm run build:prod
-          cd dist
-          npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-          cd ..
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
-        path: dist
-  build-win32:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target_platform: [win32]
-        target_arch: [x64,ia32]
-    steps:
-        - name: Clone Main Repository
-          uses: actions/checkout@v4
-          with:
-                repository: 'NapNeko/NapCatQQ'
-                submodules: true
-                ref: main
-                token: ${{ secrets.NAPCAT_BUILD }}
-        - name: Use Node.js 20.X
-          uses: actions/setup-node@v4
-          with:
-              node-version: 20.x
-        - name: Build NuCat Linux
-          run: |
-                npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-                npm run build:prod
-                cd dist
-                npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-                cd ..
-        - name: Upload Artifact
-          uses: actions/upload-artifact@v4
-          with:
-              name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
-              path: dist

vite.config.ts

@@ -8,7 +8,6 @@ import babel from 'vite-plugin-babel';
 //依赖排除
 const external = ['silk-wasm', 'ws', 'express', 'fluent-ffmpeg', 'log4js', 'qrcode-terminal'];
 const nodeModules = [...builtinModules, builtinModules.map(m => `node:${m}`)].flat();
-
 function genCpModule(module: string) {
     return { src: `./node_modules/${module}`, dest: `dist/node_modules/${module}`, flatten: false };
 }