Merge pull request #128 from solidSpoon/测试安装包

solidSpoon · web-flow · commit 6c52bf72171f · 2025-08-17T16:59:14.000+08:00
Windows 支持选择安装位置
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,6 +23,11 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
+      - name: Install WiX Toolset (Windows only)
+        if: matrix.os.name == 'windows'
+        run: |
+          choco install wixtoolset
+          echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" >> $GITHUB_PATH
       - run: yarn install --frozen-lockfile
       - name: Publish app
         env:
diff --git a/forge.config.ts b/forge.config.ts
@@ -1,17 +1,22 @@
-import type {ForgeConfig} from '@electron-forge/shared-types';
-import {MakerSquirrel} from '@electron-forge/maker-squirrel';
-import {MakerDeb} from '@electron-forge/maker-deb';
-import {MakerRpm} from '@electron-forge/maker-rpm';
-import {VitePlugin} from '@electron-forge/plugin-vite';
-import {FusesPlugin} from '@electron-forge/plugin-fuses';
-import {FuseV1Options, FuseVersion} from '@electron/fuses';
+import type { ForgeConfig } from '@electron-forge/shared-types';
+import { MakerSquirrel } from '@electron-forge/maker-squirrel';
+import { MakerDeb } from '@electron-forge/maker-deb';
+import { MakerRpm } from '@electron-forge/maker-rpm';
+import { MakerWix } from '@electron-forge/maker-wix';
+import { VitePlugin } from '@electron-forge/plugin-vite';
+import { FusesPlugin } from '@electron-forge/plugin-fuses';
+import { FuseV1Options, FuseVersion } from '@electron/fuses';
 import MakerDMG from '@electron-forge/maker-dmg';
+import packageJson from './package.json';
+import path from 'node:path';
+import fs from 'node:fs/promises';
+
 
 const config: ForgeConfig = {
     packagerConfig: {
         asar: true,
         icon: './assets/icons/icon',
-        extraResource: ["./drizzle", "./lib", "./scripts"],
+        extraResource: ['./drizzle', './lib', './scripts'],
         executableName: 'dash-player',
         name: 'DashPlayer',
     },
@@ -25,46 +30,42 @@ const config: ForgeConfig = {
         }),
         new MakerDMG({
             icon: './assets/icons/icon.icns',
-            format: 'ULFO'
+            format: 'ULFO',
         }),
         new MakerRpm({
             options: {
                 name: 'dash-player',
                 productName: 'DashPlayer',
                 icon: './assets/icons/icon.png',
-            }
+            },
         }),
         new MakerDeb({
             options: {
                 name: 'dash-player',
                 productName: 'DashPlayer',
                 icon: './assets/icons/icon.png',
-            }
-        })],
+            },
+        }),
+        new MakerWix({
+            name: 'DashPlayer',
+            description: 'A video player for English learning',
+            manufacturer: 'solidSpoon',
+            version: packageJson.version,
+            icon: './assets/icons/icon.ico',
+            exe: 'dash-player.exe',
+            ui: {
+                chooseDirectory: true,
+            },
+        }),
+    ],
     plugins: [
         new VitePlugin({
-            // `build` can specify multiple entry builds, which can be Main process, Preload scripts, Worker process, etc.
-            // If you are familiar with Vite configuration, it will look really familiar.
             build: [
-                {
-                    // `entry` is just an alias for `build.lib.entry` in the corresponding file of `config`.
-                    entry: 'src/main.ts',
-                    config: 'vite.main.config.ts',
-                },
-                {
-                    entry: 'src/preload.ts',
-                    config: 'vite.preload.config.ts',
-                },
-            ],
-            renderer: [
-                {
-                    name: 'main_window',
-                    config: 'vite.renderer.config.ts',
-                },
+                { entry: 'src/main.ts', config: 'vite.main.config.ts' },
+                { entry: 'src/preload.ts', config: 'vite.preload.config.ts' },
             ],
+            renderer: [{ name: 'main_window', config: 'vite.renderer.config.ts' }],
         }),
-        // Fuses are used to enable/disable various Electron functionality
-        // at package time, before code signing the application
         new FusesPlugin({
             version: FuseVersion.V1,
             [FuseV1Options.RunAsNode]: false,
@@ -79,14 +80,33 @@ const config: ForgeConfig = {
         {
             name: '@electron-forge/publisher-github',
             config: {
-                repository: {
-                    owner: 'solidSpoon',
-                    name: 'DashPlayer'
-                },
-                prerelease: true
+                repository: { owner: 'solidSpoon', name: 'DashPlayer' },
+                prerelease: true,
+            },
+        },
+    ],
+    hooks: {
+        postMake: async (_forgeConfig, makeResults) => {
+            const version = packageJson.version;
+            for (const result of makeResults) {
+                if (result.platform !== 'win32') continue;
+                for (let i = 0; i < result.artifacts.length; i++) {
+                    const oldPath = result.artifacts[i];
+                    if (!oldPath.toLowerCase().endsWith('.msi')) continue;
+                    const dir = path.dirname(oldPath);
+                    const arch = result.arch; // 'x64' | 'ia32' | 'arm64'
+                    const newPath = path.join(dir, `DashPlayer-${version}-${arch}.msi`);
+                    if (oldPath !== newPath) {
+                        await fs.rename(oldPath, newPath);
+                        // 更新 artifacts，确保 Publisher 上传重命名后的文件
+                        result.artifacts[i] = newPath;
+                        console.log(`Renamed MSI: ${oldPath} -> ${newPath}`);
+                    }
+                }
             }
-        }
-    ]
+            return makeResults;
+        },
+    },
 };
 
 export default config;
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "dash-player",
     "productName": "DashPlayer",
-    "version": "5.1.7",
+    "version": "5.1.8",
     "description": "My Electron application description",
     "main": ".vite/build/main.js",
     "scripts": {
diff --git a/src/fronted/hooks/use-copy-to-clipboard.ts b/src/fronted/hooks/use-copy-to-clipboard.ts
@@ -9,7 +9,7 @@ export interface useCopyToClipboardProps {
 export function useCopyToClipboard({
   timeout = 2000
 }: useCopyToClipboardProps) {
-  const [isCopied, setIsCopied] = React.useState<Boolean>(false)
+  const [isCopied, setIsCopied] = React.useState<boolean>(false)
 
   const copyToClipboard = (value: string) => {
     if (typeof window === 'undefined' || !navigator.clipboard?.writeText) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "dash-player",`
`3`	`3`	`"productName": "DashPlayer",`
`4`		`- "version": "5.1.7",`
	`4`	`+ "version": "5.1.8",`
`5`	`5`	`"description": "My Electron application description",`
`6`	`6`	`"main": ".vite/build/main.js",`
`7`	`7`	`"scripts": {`