electron-version-deployer-cli 0.4.1 → 0.4.4

package/README.md

@@ -153,9 +153,10 @@ export type EVDConfigType = {
   //  额外需要打包的文件夹
   //  这将会在部署时将文件夹里面的内容，一同部署到服务器上
   //  文件会被放在根目录的 basename 文件中，比如
-  // 传入 ['/user/myname/Desktop/test'] 这样一个文件夹，那么最终会被放到根目录的
+  // 传入 ['public/test'] 这样一个文件夹，那么最终会被放到根目录的
   // /test 中
-  // 注意当个文件不能超过 25mb 这是 cloudflare 的限制
+  // 注意:当个文件不能超过 25mb 这是 cloudflare 的限制
+  // 注意：必须使用相对路径，相对路径谁相对于 evd.config.ts 文件
   extraFolders: string[] | (() => Promise<string[]>) | (() => string[]);
   //  netlify 部署设置
   netlify?: {

package/dist/cli.cjs

@@ -19,11 +19,12 @@ const marked = require("marked");
 const jsdom = require("jsdom");
 const DOMPurify = require("dompurify");
 const archiver = require("archiver");
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
 const prompts = require("@inquirer/prompts");
 const electron = require("electron");
 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) {
@@ -172,6 +173,32 @@ function archiveFiles(outputPath, files) {
     archive.finalize();
   });
 }
+function countLineEndings(text) {
+  const crlf = (text.match(/\r\n/g) || []).length;
+  const noCRLF = text.replace(/\r\n/g, "");
+  const lf = (noCRLF.match(/\n/g) || []).length;
+  const cr = (noCRLF.match(/\r/g) || []).length;
+  return { crlf, lf, cr };
+}
+function normalizeToOSEOL(text, opts = {}) {
+  const { stripBOM = true, ensureFinalNewline = false } = opts;
+  if (stripBOM && text.charCodeAt(0) === 65279) {
+    text = text.slice(1);
+  }
+  const target = os.EOL;
+  const before = text;
+  let normalized = text.replace(/\r\n|\r|\n/g, target);
+  if (ensureFinalNewline && normalized.length > 0 && !normalized.endsWith(target)) {
+    normalized += target;
+  }
+  const changed = normalized !== before;
+  return {
+    text: normalized,
+    changed,
+    stats: countLineEndings(before),
+    target: target === "\r\n" ? "crlf" : target === "\r" ? "cr" : "lf"
+  };
+}
 commander.program.command("prepare").description(
   "部署前的准备工作，如获取编译软件获取逻辑代码，生成 changelog 等"
 ).action(async (source, destination) => {
@@ -256,8 +283,14 @@ async function genChangelog(configs) {
   }
   const pkgContent = JSON.parse(node_fs.readFileSync(outputPackageJSONPath, "utf-8"));
   const currentVersion = pkgContent.version;
+  const changelogText = node_fs.readFileSync(r(configs.changelogsPath), "utf-8");
   const changes = await parseChangelog({
-    filePath: r(configs.changelogsPath),
+    //  将 changelog 文件转换为 os.EOL
+    //  https://github.com/ungoldman/changelog-parser/issues/34
+    text: normalizeToOSEOL(changelogText, {
+      stripBOM: true,
+      ensureFinalNewline: true
+    }).text,
     removeMarkdown: false
   });
   const currentChange = changes.versions.find((change) => {
@@ -608,10 +641,10 @@ async function deployExtraFolders(configs) {
     folders = extraFolders;
   }
   for (const folder of folders) {
-    if (!node_fs.existsSync(folder)) {
+    if (!node_fs.existsSync(r(folder))) {
       throw new Error(`未找到文件夹 ${folder}`);
     }
-    const stat = node_fs.statSync(folder);
+    const stat = node_fs.statSync(r(folder));
     if (!stat.isDirectory()) {
       throw new Error(`${folder} 不是一个文件夹`);
     }
@@ -619,7 +652,7 @@ async function deployExtraFolders(configs) {
     if (node_fs.existsSync(destFolder)) {
       node_fs.rmSync(destFolder, { recursive: true });
     }
-    node_fs.cpSync(folder, r(`node_modules/.evd/${node_path.basename(folder)}`), {
+    node_fs.cpSync(r(folder), r(`node_modules/.evd/${node_path.basename(folder)}`), {
       recursive: true
     });
   }
@@ -726,4 +759,4 @@ async function installPrebuilt(configs) {
 }
 commander.program.description(
   "Electron 版本部署 CLI，简化你的 Electron 软件更新，让一切变得简单。"
-).helpOption("-h, --help", "使用帮助").version("0.4.1", "-V, --version", "显示版本号").parse(process.argv);
+).helpOption("-h, --help", "使用帮助").version("0.4.4", "-V, --version", "显示版本号").parse(process.argv);

package/package.json

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