Templater
/
electron-trpc-demo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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.

main
dash 1 month ago
parent
32fcfa3e86
commit
3029da490e
10 changed files with 50 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .vscode/settings.json
  2. 2
      electron.vite.config.ts
  3. 2
      package.json
  4. 6
      pnpm-lock.yaml
  5. 6
      src/main/index.ts
  6. 1
      src/preload/index.d.ts
  7. 10
      src/preload/index.ts
  8. 11
      src/renderer/about/index.html
  9. 8
      src/renderer/src/about.ts

4
.vscode/settings.json
View File

@ -7,5 +7,7 @@
}, },
"[json]": { "[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
} },
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "file"
} }

2
electron.vite.config.ts
View File

@ -26,7 +26,7 @@ export default defineConfig({
rollupOptions: { rollupOptions: {
input: { input: {
main: resolve(__dirname, "./src/renderer/index.html"), main: resolve(__dirname, "./src/renderer/index.html"),
about: resolve(__dirname, "./src/renderer/about.html"), about: resolve(__dirname, "./src/renderer/about/index.html"),
}, },
}, },
}, },

2
package.json
View File

@ -21,7 +21,6 @@
"build:linux": "npm run build && electron-builder --linux" "build:linux": "npm run build && electron-builder --linux"
}, },
"dependencies": { "dependencies": {
"@electron-toolkit/preload": "^3.0.2",
"@electron-toolkit/utils": "^4.0.0", "@electron-toolkit/utils": "^4.0.0",
"@trpc/client": "^10.45.2", "@trpc/client": "^10.45.2",
"@trpc/server": "^10.45.2", "@trpc/server": "^10.45.2",
@ -32,6 +31,7 @@
"devDependencies": { "devDependencies": {
"@electron-toolkit/eslint-config-prettier": "3.0.0", "@electron-toolkit/eslint-config-prettier": "3.0.0",
"@electron-toolkit/eslint-config-ts": "^3.1.0", "@electron-toolkit/eslint-config-ts": "^3.1.0",
"@electron-toolkit/preload": "^3.0.2",
"@electron-toolkit/tsconfig": "^2.0.0", "@electron-toolkit/tsconfig": "^2.0.0",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/node": "^22.18.6", "@types/node": "^22.18.6",

6
pnpm-lock.yaml
View File

@ -8,9 +8,6 @@ importers:
.: .:
dependencies: dependencies:
'@electron-toolkit/preload':
specifier: ^3.0.2
version: 3.0.2(electron@38.4.0)
'@electron-toolkit/utils': '@electron-toolkit/utils':
specifier: ^4.0.0 specifier: ^4.0.0
version: 4.0.0(electron@38.4.0) version: 4.0.0(electron@38.4.0)
@ -36,6 +33,9 @@ importers:
'@electron-toolkit/eslint-config-ts': '@electron-toolkit/eslint-config-ts':
specifier: ^3.1.0 specifier: ^3.1.0
version: 3.1.0(eslint@9.38.0)(typescript@5.9.3) 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': '@electron-toolkit/tsconfig':
specifier: ^2.0.0 specifier: ^2.0.0
version: 2.0.0(@types/node@22.18.12) version: 2.0.0(@types/node@22.18.12)

6
src/main/index.ts
View File

@ -17,7 +17,7 @@ app.whenReady().then(() => {
ipcMain.on('ping', () => { ipcMain.on('ping', () => {
WindowManager.createWindow("about", { WindowManager.createWindow("about", {
url: getFileUrl("about.html"), url: getFileUrl("about/index.html"),
overideWindowOpts: true, overideWindowOpts: true,
confrimWindowClose: false, confrimWindowClose: false,
type: "info", type: "info",
@ -33,8 +33,8 @@ app.whenReady().then(() => {
icon: icon, icon: icon,
webPreferences: { webPreferences: {
preload: getPreloadUrl("index"), preload: getPreloadUrl("index"),
devTools: false, devTools: true,
sandbox: false, sandbox: true,
nodeIntegration: false, nodeIntegration: false,
contextIsolation: true, contextIsolation: true,
}, },

1
src/preload/index.d.ts
View File

@ -3,6 +3,5 @@ import { ElectronAPI } from '@electron-toolkit/preload'
declare global { declare global {
interface Window { interface Window {
electron: ElectronAPI electron: ElectronAPI
api: unknown
} }
} }

10
src/preload/index.ts
View File

@ -1 +1,11 @@
import 'trpc/preload'; 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
}

11
src/renderer/about.html → src/renderer/about/index.html
View File

@ -20,13 +20,10 @@
</head> </head>
<body> <body>
<article> <h1>关于</h1>
<h1>关于</h1> <ul>
<ul> <li>MIT开源</li>
<li>MIT开源</li> </ul>
</ul>
</article>
<script type="module" src="/src/about.ts"></script>
</body> </body>
</html> </html>

8
src/renderer/src/about.ts
View File

@ -1,8 +0,0 @@
import { client } from 'trpc/renderer'
client.subscribeGreeting.subscribe(undefined, {
onData: (data) => {
console.log(data.text);
}
})
Write Preview
Loading…
Cancel
Save