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.

1 month ago · 3029da490e
10 changed files with 50 additions and 50 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -7,5 +7,7 @@
  },
  "[json]": {
    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  }
+  },
+  "editor.formatOnSave": true,
+  "editor.formatOnSaveMode": "file"
 }
--- 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"),
        },
      },
    },
--- 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",
--- 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)
--- 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,
        },
--- 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
  }
 }
--- 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
+}
--- a/src/renderer/about/index.html
+++ b/src/renderer/about/index.html
@ -20,13 +20,10 @@
 </head>

 <body>
-  <article>
-    <h1>关于</h1>
-    <ul>
-      <li>MIT开源</li>
-    </ul>
-  </article>
-  <script type="module" src="/src/about.ts"></script>
+  <h1>关于</h1>
+  <ul>
+    <li>MIT开源</li>
+  </ul>
 </body>

 </html>
--- a/src/renderer/src/about.ts
+++ b/src/renderer/src/about.ts
@ -1,8 +0,0 @@
-
-import { client } from 'trpc/renderer'
-
-client.subscribeGreeting.subscribe(undefined, {
-    onData: (data) => {
-        console.log(data.text);
-    }
-})