electron-version-deployer-cli 0.2.0 → 0.2.2

package/dist/cli.cjs

@@ -22,6 +22,8 @@ const archiver = require("archiver");
 const prompts = require("@inquirer/prompts");
 const node_https = require("node:https");
 const node_os = require("node:os");
+const fs = require("fs");
+const path = require("path");
 const download = require("download");
 const pkgPath = pkgUp.sync();
 function r(...paths) {
@@ -278,7 +280,7 @@ async function genChangelog(configs) {
       headerIds: false
     })
   );
-  const allChanges = changes.map((change) => {
+  const allChanges = changes.versions.map((change) => {
     const { date: date2, version: version2, title: title2, body: body2 } = change;
     return {
       date: date2,
@@ -303,7 +305,7 @@ async function genChangelog(configs) {
     "utf-8"
   );
   const changelogTemplate = node_fs.readFileSync(
-    r("public/templates/changelogs.html"),
+    node_path.join(node_path.resolve(__dirname), "templates", "changelogs.html"),
     "utf-8"
   );
   node_fs.writeFileSync(
@@ -363,7 +365,7 @@ function versionToNum(a) {
   let res = c.join("");
   return res;
 }
-const _Netlify = class {
+const _Netlify = class _Netlify {
   static get instance() {
     if (!this._instance) {
       this._instance = new _Netlify();
@@ -420,9 +422,32 @@ const _Netlify = class {
     return `configs.netlify 配置不存在`;
   }
 };
+__publicField(_Netlify, "_instance");
 let Netlify = _Netlify;
-__publicField(Netlify, "_instance");
-const _Cloudflare = class {
+function forceDeleteSync(targetPath) {
+  try {
+    const stats = fs.statSync(targetPath);
+    if (stats.isDirectory()) {
+      fs.chmodSync(targetPath, 511);
+      const files = fs.readdirSync(targetPath);
+      for (const file of files) {
+        forceDeleteSync(path.join(targetPath, file));
+      }
+      fs.rmdirSync(targetPath);
+    } else {
+      fs.chmodSync(targetPath, 438);
+      fs.unlinkSync(targetPath);
+    }
+    console.log(`成功删除: ${targetPath}`);
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      console.log(`${targetPath} 不存在，无需删除`);
+    } else {
+      console.error(`删除 ${targetPath} 时发生错误:`, error);
+    }
+  }
+}
+const _Cloudflare = class _Cloudflare {
   static get instance() {
     if (!this._instance) {
       this._instance = new _Cloudflare();
@@ -470,7 +495,7 @@ const _Cloudflare = class {
       node_path.join(outputFolder, "index.json"),
       JSON.stringify(splitZipsFileName)
     );
-    node_fs.unlinkSync(node_path.join(folderPath, "fullCode.zip"));
+    forceDeleteSync(node_path.join(folderPath, "fullCode.zip"));
   }
   deploy(props) {
     this.splitFileIfNeed(props.folder);
@@ -521,8 +546,8 @@ const _Cloudflare = class {
     return `configs.cloudflare 配置不存在`;
   }
 };
+__publicField(_Cloudflare, "_instance");
 let Cloudflare = _Cloudflare;
-__publicField(Cloudflare, "_instance");
 commander.program.command("deploy").description("执行部署").action(async (source, destination) => {
   const configs = await getConfigs();
   try {
@@ -637,4 +662,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.2.0", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.2.2", "-V, --version", "显示版本号").parse(process.argv);

package/dist/main.js

@@ -7,6 +7,8 @@ const node_https = require("node:https");
 const node_fs = require("node:fs");
 const extract = require("extract-zip");
 const node_process = require("node:process");
+const fs = require("fs");
+const path = require("path");
 function fetchRemoteChangelogJSON(remote_url) {
   return new Promise((res, rej) => {
     node_https.get(`${remote_url}/changelog.json`, (_res) => {
@@ -70,6 +72,29 @@ function compareObjectsIsEqual(obj1, obj2) {
 }
 const CLI_NAME = "electron-version-deployer-cli";
 const installerCodeStr = '//  该文件用于 fork 使用，将会写入到\n//  app.getAppPath() + \'/_evdInstallerTmp.js\' 路径中\n//  从避免 window 上替换时出现的资源占用问题\nconst {\n  existsSync,\n  mkdirSync,\n  readdirSync,\n  statSync,\n  appendFileSync,\n  writeFileSync,\n  readFileSync,\n} = require("fs");\nconst { join, resolve, basename } = require("node:path");\n\ntry {\n  copyFolderRecursiveSync("__unzipPath__", "__appPath__");\n  process.parentPort.postMessage("exitManually");\n  process.exit(0);\n} catch (error) {\n  appendFileSync(\n    resolve(__dirname, "evdInstallerErrors.txt"),\n    `\n        ${new Date().toString()}\\n\n        ${error.toString()}\\n\n        -- stack\\n\n        ${error.stack}\\n\n        ----------------------------------------------------------------\\n\n      `\n  );\n  process.parentPort.postMessage("exitManually");\n  process.exit(0);\n}\n\n// 复制文件夹及其内容的函数\nfunction copyFolderRecursiveSync(source, target) {\n  // 如果目标目录不存在，则创建目标目录\n  if (!existsSync(target)) {\n    mkdirSync(target);\n  }\n\n  // 获取源目录的文件列表\n  const files = readdirSync(source);\n\n  // 遍历文件列表，处理每个文件或子目录\n  files.forEach((file) => {\n    const sourcePath = join(source, file);\n    const targetPath = join(target, file);\n\n    // 如果当前文件是文件夹，则递归复制文件夹\n    if (statSync(sourcePath).isDirectory()) {\n      copyFolderRecursiveSync(sourcePath, targetPath);\n    } else {\n      // 否则，复制文件\n      try {\n        copyFileSync(sourcePath, targetPath);\n      } catch (error) {\n        appendFileSync(\n          resolve(__dirname, "evdInstallerErrors.txt"),\n          `\n        ${new Date().toString()}\\n\n        ${error.toString()}\\n\n        -- stack\\n\n        ${error.stack}\\n\n        ----------------------------------------------------------------\\n\n      `\n        );\n      }\n    }\n  });\n}\n\nfunction copyFileSync(source, target) {\n  let targetFile = target;\n\n  if (existsSync(target)) {\n    if (statSync(target).isDirectory()) {\n      targetFile = join(target, basename(source));\n    }\n  }\n\n  writeFileSync(targetFile, readFileSync(source));\n}\n';
+function forceDeleteSync(targetPath) {
+  try {
+    const stats = fs.statSync(targetPath);
+    if (stats.isDirectory()) {
+      fs.chmodSync(targetPath, 511);
+      const files = fs.readdirSync(targetPath);
+      for (const file of files) {
+        forceDeleteSync(path.join(targetPath, file));
+      }
+      fs.rmdirSync(targetPath);
+    } else {
+      fs.chmodSync(targetPath, 438);
+      fs.unlinkSync(targetPath);
+    }
+    console.log(`成功删除: ${targetPath}`);
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      console.log(`${targetPath} 不存在，无需删除`);
+    } else {
+      console.error(`删除 ${targetPath} 时发生错误:`, error);
+    }
+  }
+}
 const id = `${Date.now()}-${Math.random()}`;
 var EVDEventEnum = /* @__PURE__ */ ((EVDEventEnum2) => {
   EVDEventEnum2["OPEN_LINK"] = "evd-open-link";
@@ -247,7 +272,7 @@ async function installPkg(zipFile) {
             rej(err);
           });
         });
-        node_fs.unlinkSync(tmpFilePath);
+        forceDeleteSync(tmpFilePath);
       }
       mergedStream.end(() => {
         res();

package/dist/templates/changelogs.html

@@ -10,7 +10,10 @@
     <title>Changelogs</title>
   </head>
   <body>
-    <div id="container"></div>
+    <div
+      id="container"
+      style="margin: 0 auto; max-width: 960px; padding-top: 24px"
+    ></div>
   </body>
 
   <script>
@@ -19,7 +22,7 @@
     let html = ``;
     for (const change of changelogs) {
       html += `<div class="item">`;
-      html += `<div class="title">${change.title}</div>`;
+      html += `<div class="title" style="font-weight: bold;font-size: 20px;margin-top: 8px">${change.title}</div>`;
       html += `<div class="changes">${change.changes}</div>`;
       html += `</div>`;
     }

package/dist/templates/newVersionDialog.html

@@ -122,7 +122,7 @@
       <a
         href="#"
         class="see-all-changes"
-        style="text-decoration: underline; font-size: 12px"
+        style="text-decoration: underline; font-size: 14px"
         >（所有版本更新记录）</a
       >
     </div>

package/dist/utils/utils.d.ts

@@ -0,0 +1 @@
+export declare function forceDeleteSync(targetPath: any): void;

package/package.json

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