From 3029da490eda24bda366fef30119b88b8a5f0474 Mon Sep 17 00:00:00 2001
From: dash <1549469775@qq.com>
Date: Thu, 30 Oct 2025 20:16:40 +0800
Subject: [PATCH] Refactor about page structure and update dependencies. Change
about page path to use a directory structure, restore preload dependency in
package.json, and enhance VSCode settings for formatting on save. Remove
obsolete about.html and about.ts files.
---
.vscode/settings.json | 4 +++-
electron.vite.config.ts | 2 +-
package.json | 2 +-
pnpm-lock.yaml | 6 +++---
src/main/index.ts | 6 +++---
src/preload/index.d.ts | 1 -
src/preload/index.ts | 10 ++++++++++
src/renderer/about.html | 32 --------------------------------
src/renderer/about/index.html | 29 +++++++++++++++++++++++++++++
src/renderer/src/about.ts | 8 --------
10 files changed, 50 insertions(+), 50 deletions(-)
delete mode 100644 src/renderer/about.html
create mode 100644 src/renderer/about/index.html
delete mode 100644 src/renderer/src/about.ts
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 20951e4..c84b8c0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,5 +7,7 @@
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
- }
+ },
+ "editor.formatOnSave": true,
+ "editor.formatOnSaveMode": "file"
}
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
index f5ce31b..aff3928 100644
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -26,7 +26,7 @@ export default defineConfig({
rollupOptions: {
input: {
main: resolve(__dirname, "./src/renderer/index.html"),
- about: resolve(__dirname, "./src/renderer/about.html"),
+ about: resolve(__dirname, "./src/renderer/about/index.html"),
},
},
},
diff --git a/package.json b/package.json
index 0c98799..5e75601 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
"build:linux": "npm run build && electron-builder --linux"
},
"dependencies": {
- "@electron-toolkit/preload": "^3.0.2",
"@electron-toolkit/utils": "^4.0.0",
"@trpc/client": "^10.45.2",
"@trpc/server": "^10.45.2",
@@ -32,6 +31,7 @@
"devDependencies": {
"@electron-toolkit/eslint-config-prettier": "3.0.0",
"@electron-toolkit/eslint-config-ts": "^3.1.0",
+ "@electron-toolkit/preload": "^3.0.2",
"@electron-toolkit/tsconfig": "^2.0.0",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.18.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 89e63f1..b145e30 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,9 +8,6 @@ importers:
.:
dependencies:
- '@electron-toolkit/preload':
- specifier: ^3.0.2
- version: 3.0.2(electron@38.4.0)
'@electron-toolkit/utils':
specifier: ^4.0.0
version: 4.0.0(electron@38.4.0)
@@ -36,6 +33,9 @@ importers:
'@electron-toolkit/eslint-config-ts':
specifier: ^3.1.0
version: 3.1.0(eslint@9.38.0)(typescript@5.9.3)
+ '@electron-toolkit/preload':
+ specifier: ^3.0.2
+ version: 3.0.2(electron@38.4.0)
'@electron-toolkit/tsconfig':
specifier: ^2.0.0
version: 2.0.0(@types/node@22.18.12)
diff --git a/src/main/index.ts b/src/main/index.ts
index 9d4fdc4..a721fe4 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -17,7 +17,7 @@ app.whenReady().then(() => {
ipcMain.on('ping', () => {
WindowManager.createWindow("about", {
- url: getFileUrl("about.html"),
+ url: getFileUrl("about/index.html"),
overideWindowOpts: true,
confrimWindowClose: false,
type: "info",
@@ -33,8 +33,8 @@ app.whenReady().then(() => {
icon: icon,
webPreferences: {
preload: getPreloadUrl("index"),
- devTools: false,
- sandbox: false,
+ devTools: true,
+ sandbox: true,
nodeIntegration: false,
contextIsolation: true,
},
diff --git a/src/preload/index.d.ts b/src/preload/index.d.ts
index a153669..9156582 100644
--- a/src/preload/index.d.ts
+++ b/src/preload/index.d.ts
@@ -3,6 +3,5 @@ import { ElectronAPI } from '@electron-toolkit/preload'
declare global {
interface Window {
electron: ElectronAPI
- api: unknown
}
}
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 76dee5a..e961512 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -1 +1,11 @@
import 'trpc/preload';
+import { electronAPI } from "@electron-toolkit/preload"
+import { contextBridge } from 'electron';
+
+
+if (process.contextIsolated) {
+ contextBridge.exposeInMainWorld("electron", electronAPI)
+} else {
+ // @ts-ignore (define in dts)
+ window.electron = electronAPI
+}
\ No newline at end of file
diff --git a/src/renderer/about.html b/src/renderer/about.html
deleted file mode 100644
index ed6607a..0000000
--- a/src/renderer/about.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- 关于
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/renderer/about/index.html b/src/renderer/about/index.html
new file mode 100644
index 0000000..cebc593
--- /dev/null
+++ b/src/renderer/about/index.html
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+ 关于
+
+
+
+
\ No newline at end of file
diff --git a/src/renderer/src/about.ts b/src/renderer/src/about.ts
deleted file mode 100644
index afcc586..0000000
--- a/src/renderer/src/about.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-
-import { client } from 'trpc/renderer'
-
-client.subscribeGreeting.subscribe(undefined, {
- onData: (data) => {
- console.log(data.text);
- }
-})
\ No newline at end of file