electron-version-deployer-cli 0.0.12 → 0.0.14

package/dist/cli.cjs

@@ -15,6 +15,7 @@ const jsdom = require("jsdom");
 const DOMPurify = require("dompurify");
 const archiver = require("archiver");
 const node_https = require("node:https");
+const node_os = require("node:os");
 const download = require("download");
 const pkgPath = pkgUp.sync();
 function r(...paths) {
@@ -382,7 +383,8 @@ commander.program.command("deploy").description("执行部署").action(async (so
 });
 async function deploy(configs) {
   console.log(logSymbols.info, "开始部署", r());
-  const output = node_child_process.spawn("netlify", [
+  const cmd = node_os.platform() === "win32" ? "netlify.cmd" : "netlify";
+  const output = node_child_process.spawn(cmd, [
     "deploy",
     "--dir",
     r("node_modules/.evd"),
@@ -495,4 +497,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.0.12", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.0.14", "-V, --version", "显示版本号").parse(process.argv);

package/dist/main.js

@@ -7,6 +7,7 @@ const node_https = require("node:https");
 const node_fs = require("node:fs");
 const extract = require("extract-zip");
 const node_child_process = require("node:child_process");
+const node_process = require("node:process");
 function fetchRemoteChangelogJSON(remote_url) {
   return new Promise((res, rej) => {
     node_https.get(`${remote_url}/changelog.json`, (_res) => {
@@ -131,11 +132,12 @@ async function showNewVersionDialog() {
         minWidth: windowWidth,
         minHeight: windowHeight,
         resizable: false,
-        minimizable: true,
+        minimizable: false,
         fullscreenable: false,
         maximizable: false,
         skipTaskbar: true,
-        alwaysOnTop: true,
+        //  windows 11 如果设置为 true 会导致点击后马上消失
+        alwaysOnTop: node_process.platform !== "win32",
         useContentSize: false,
         title: "有可用的更新",
         webPreferences: {
@@ -162,6 +164,16 @@ async function showNewVersionDialog() {
       promptWindow.loadURL(promptUrl);
       promptWindow.once("ready-to-show", () => {
         promptWindow.show();
+        setTimeout(() => {
+          const allWindows = electron.BrowserWindow.getAllWindows();
+          allWindows.forEach((window) => {
+            window.on("closed", () => {
+              if (electron.BrowserWindow.getAllWindows().length == 1) {
+                cleanup(promptWindow);
+              }
+            });
+          });
+        }, 1e3);
       });
       promptWindow.once("close", () => {
         cleanup(promptWindow);
@@ -280,9 +292,12 @@ function cleanup(promptWindow) {
     "evd-get-logo"
     /* GET_LOGO */
   );
-  promptWindow == null ? void 0 : promptWindow.focus();
-  if (promptWindow) {
-    promptWindow.destroy();
+  try {
+    promptWindow == null ? void 0 : promptWindow.focus();
+    if (promptWindow) {
+      promptWindow.destroy();
+    }
+  } catch (e) {
   }
 }
 function getConfigs() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-version-deployer-cli",
   "private": false,
-  "version": "0.0.12",
+  "version": "0.0.14",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.es.js",