electron-smallest-updater 0.2.0 → 0.2.1

package/README.md

@@ -72,31 +72,34 @@ import { SmallestUpdater } from 'electron-smallest-updater'
 
 export function initSmallestUpdater(mainWindow: BrowserWindow): SmallestUpdater {
   // 下载进度条
-  const progressBar = new ProgressBar({
-    title: '更新',
-    text: '下载更新',
-    detail: '等待下载',
-    indeterminate: false,
-    closeOnComplete: true,
-    browserWindow: {
-      show: false,
-      modal: true,
-      parent: mainWindow,
-    },
-  })
-  // @ts-expect-error
-  progressBar._window.hide()
-  // @ts-expect-error
-  progressBar._window.setProgressBar(-1)
+  let progressBar: ProgressBar
+  function createProgressBar() {
+    return new Promise<ProgressBar>((resolve) => {
+      const ins = new ProgressBar({
+        title: '更新',
+        text: '下载更新',
+        detail: '等待下载',
+        indeterminate: false,
+        closeOnComplete: false,
+        browserWindow: {
+          modal: true,
+          parent: mainWindow
+        }
+      })
+      ins.on('ready', () => {
+        resolve(ins)
+      })
+    })
+  }
 
   // 创建实例
   const smallestUpdater = new SmallestUpdater({
     logger,
     publish: {
-      url: 'http://localhost:3000/smallest-updates',
+      url: 'http://localhost:3000/smallest-updates'
     },
     autoDownload: false,
-    forceDevUpdateConfig: true,
+    forceDevUpdateConfig: true
   })
 
   // 更新可用
@@ -109,14 +112,11 @@ export function initSmallestUpdater(mainWindow: BrowserWindow): SmallestUpdater
         title: '版本更新',
         message: `发现新版本${version}，是否更新\n\n${releaseNotes}`,
         type: 'info',
-        buttons: ['稍后更新', '立即更新'],
+        buttons: ['稍后更新', '立即更新']
       })
-      .then(({ response }) => {
+      .then(async ({ response }) => {
         if (response === 1) {
-          // @ts-expect-error
-          progressBar._window.show()
-          // @ts-expect-error
-          progressBar._window.setProgressBar(0)
+          progressBar = await createProgressBar()
           smallestUpdater.downloadUpdate() // 手动下载更新
         }
       })
@@ -124,7 +124,7 @@ export function initSmallestUpdater(mainWindow: BrowserWindow): SmallestUpdater
 
   // 更新不可用
   smallestUpdater.on('update-not-available', () => {
-    progressBar.close()
+    console.log('[electron-updater]', '更新不可用')
   })
 
   // 下载进度
@@ -137,12 +137,13 @@ export function initSmallestUpdater(mainWindow: BrowserWindow): SmallestUpdater
   // 下载完成
   smallestUpdater.on('update-downloaded', (info) => {
     console.log('[electron-updater]', '下载完成', info)
+    progressBar.close()
     dialog
       .showMessageBox(mainWindow, {
         title: '下载完成',
         message: `重启可应用新版本`,
         type: 'info',
-        buttons: ['稍后重启', '立即重启'],
+        buttons: ['稍后重启', '立即重启']
       })
       .then(({ response }) => {
         if (response === 1) {

package/dist/builder.js

@@ -33,6 +33,9 @@ function smallestBuilder(context, options) {
         let resourcesPath;
         if (platform === 'darwin') {
             resourcesPath = path_1.default.join(context.appOutDir, `${appInfo.name}.app`, 'Contents', 'Resources');
+            if (!(yield fs_extra_1.default.pathExists(resourcesPath))) {
+                resourcesPath = path_1.default.join(context.appOutDir, `${appInfo.productName}.app`, 'Contents', 'Resources');
+            }
         }
         else {
             resourcesPath = path_1.default.join(context.appOutDir, 'resources');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-smallest-updater",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Electron Resources 按需最小更新、自动构建发布包及信息。",
   "main": "./dist/index.js",
   "types": "./dist",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@bfehub/eslint-config-typescript": "^2.1.0",
-    "@release-it/conventional-changelog": "^8.0.1",
+    "@release-it/conventional-changelog": "^10.0.0",
     "@types/adm-zip": "^0.5.5",
     "@types/fs-extra": "^11.0.4",
     "@types/semver": "^7.5.8",
@@ -46,7 +46,7 @@
     "electron-builder": "^24.9.1",
     "eslint": "^8.56.0",
     "prettier": "^3.2.4",
-    "release-it": "^17.1.1",
+    "release-it": "^19.2.4",
     "typescript": "^5.4.2"
   }
 }