fix : tsconfig include electron (electron-vite#134) (electron-vite#135)

RSS1102 · web-flow · commit 1b5b326aa6c2 · 2023-04-11T11:37:51.000+08:00
diff --git a/electron/main/index.ts b/electron/main/index.ts
@@ -55,7 +55,7 @@ async function createWindow() {
     },
   })
 
-  if (process.env.VITE_DEV_SERVER_URL) { // electron-vite-vue#298
+  if (url) { // electron-vite-vue#298
     win.loadURL(url)
     // Open devTool if the app is not packaged
     win.webContents.openDevTools()
diff --git a/electron/main/update.ts b/electron/main/update.ts
@@ -63,7 +63,7 @@ export function update(win: Electron.BrowserWindow) {
 }
 
 function startDownload(
-  callback: (error: Error | null, info: ProgressInfo) => void,
+  callback: (error: Error | null, info: ProgressInfo | null) => void,
   complete: (event: UpdateDownloadedEvent) => void,
 ) {
   autoUpdater.on('download-progress', info => callback(null, info))
diff --git a/tsconfig.json b/tsconfig.json
@@ -22,6 +22,6 @@
       ]
     },
   },
-  "include": ["src"],
+  "include": ["src", "electron"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/tsconfig.node.json b/tsconfig.node.json
@@ -6,5 +6,5 @@
     "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true
   },
-  "include": ["vite.config.ts", "package.json", "electron"]
+  "include": ["vite.config.ts", "package.json"]
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ export function update(win: Electron.BrowserWindow) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`function startDownload(`
`66`		`- callback: (error: Error \| null, info: ProgressInfo) => void,`
	`66`	`+ callback: (error: Error \| null, info: ProgressInfo \| null) => void,`
`67`	`67`	`complete: (event: UpdateDownloadedEvent) => void,`
`68`	`68`	`) {`
`69`	`69`	`autoUpdater.on('download-progress', info => callback(null, info))`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@`
`22`	`22`	`]`
`23`	`23`	`},`
`24`	`24`	`},`
`25`		`- "include": ["src"],`
	`25`	`+ "include": ["src", "electron"],`
`26`	`26`	`"references": [{ "path": "./tsconfig.node.json" }]`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`	`"resolveJsonModule": true,`
`7`	`7`	`"allowSyntheticDefaultImports": true`
`8`	`8`	`},`
`9`		`- "include": ["vite.config.ts", "package.json", "electron"]`
	`9`	`+ "include": ["vite.config.ts", "package.json"]`
`10`	`10`	`}`