electron-incremental-update 0.7.5 → 0.7.6

package/dist/vite.js

@@ -135,7 +135,7 @@ async function buildEntry({
     platform: "node",
     outfile,
     minify,
-    external: ["electron"]
+    external: ["electron", "original-fs"]
   });
 }
 
@@ -146,44 +146,19 @@ var import_ci_info = require("ci-info");
 var import_node_fs2 = require("fs");
 var import_node_path2 = require("path");
 var import_node_os = require("os");
-var import_node_child_process = require("child_process");
+var import_selfsigned = require("selfsigned");
 function generateKeyPair(keyLength, subject, days, privateKeyPath, certPath) {
-  const starter = `try {
-  require('selfsigned')
-} catch (e) {
-  console.error('to generate private key, please run "npm install --dev selfsigned"')
-}
-try {
-  const { existsSync, mkdirSync, writeFileSync } = require('node:fs')
-  const { dirname } = require('node:path')
-  const { generate } = require('selfsigned')
-  const privateKeyPath = '${privateKeyPath.replace(/\\/g, "/")}'
-  const certPath = '${certPath.replace(/\\/g, "/")}'
-  const privateKeyDir = dirname(privateKeyPath)
-  existsSync(privateKeyDir) || mkdirSync(privateKeyDir, { recursive: true })
-  const certDir = dirname(certPath)
-  existsSync(certDir) || mkdirSync(certDir, { recursive: true })
-
-  const { cert, private: privateKey } = generate(${JSON.stringify(subject)}, {
-    keySize: ${keyLength}, algorithm: 'sha256', days: ${days},
-  })
-
-  writeFileSync(privateKeyPath, privateKey.replace(/\\r\\n?/g, '\\n'))
-  writeFileSync(certPath, cert.replace(/\\r\\n?/g, '\\n'))
-} catch (e) {
-  console.error(e)
-  process.exit(-1)
-} finally {
-  process.exit(0)
-}
-`;
-  const fileName = "key-gen.js";
-  (0, import_node_fs2.writeFileSync)(`./${fileName}`, starter);
-  try {
-    (0, import_node_child_process.execSync)(`npx electron ${fileName}`, { stdio: "inherit" });
-  } finally {
-    (0, import_node_fs2.rmSync)(`./${fileName}`);
-  }
+  const privateKeyDir = (0, import_node_path2.dirname)(privateKeyPath);
+  (0, import_node_fs2.existsSync)(privateKeyDir) || (0, import_node_fs2.mkdirSync)(privateKeyDir, { recursive: true });
+  const certDir = (0, import_node_path2.dirname)(certPath);
+  (0, import_node_fs2.existsSync)(certDir) || (0, import_node_fs2.mkdirSync)(certDir, { recursive: true });
+  const { cert, private: privateKey } = (0, import_selfsigned.generate)(subject, {
+    keySize: keyLength,
+    algorithm: "sha256",
+    days
+  });
+  (0, import_node_fs2.writeFileSync)(privateKeyPath, privateKey.replace(/\r\n?/g, "\n"));
+  (0, import_node_fs2.writeFileSync)(certPath, cert.replace(/\r\n?/g, "\n"));
 }
 function writeCertToMain(entryPath, cert) {
   const file = (0, import_node_fs2.readFileSync)(entryPath, "utf-8");
@@ -208,7 +183,7 @@ function writeCertToMain(entryPath, cert) {
     !isMatched && lines.push(r);
     replaced = lines.join(import_node_os.EOL);
   }
-  (0, import_node_fs2.writeFileSync)(entryPath, replaced);
+  (0, import_node_fs2.writeFileSync)(entryPath, replaced.replace(/\r\n?/g, "\n"));
 }
 function parseKeys({
   keyLength,

package/dist/vite.mjs

@@ -67,7 +67,7 @@ async function buildEntry({
     platform: "node",
     outfile,
     minify,
-    external: ["electron"]
+    external: ["electron", "original-fs"]
   });
 }
 
@@ -75,47 +75,22 @@ async function buildEntry({
 import { isCI } from "ci-info";
 
 // src/build-plugins/key.ts
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 import { EOL } from "node:os";
-import { execSync } from "node:child_process";
+import { generate } from "selfsigned";
 function generateKeyPair(keyLength, subject, days, privateKeyPath, certPath) {
-  const starter = `try {
-  require('selfsigned')
-} catch (e) {
-  console.error('to generate private key, please run "npm install --dev selfsigned"')
-}
-try {
-  const { existsSync, mkdirSync, writeFileSync } = require('node:fs')
-  const { dirname } = require('node:path')
-  const { generate } = require('selfsigned')
-  const privateKeyPath = '${privateKeyPath.replace(/\\/g, "/")}'
-  const certPath = '${certPath.replace(/\\/g, "/")}'
-  const privateKeyDir = dirname(privateKeyPath)
-  existsSync(privateKeyDir) || mkdirSync(privateKeyDir, { recursive: true })
-  const certDir = dirname(certPath)
-  existsSync(certDir) || mkdirSync(certDir, { recursive: true })
-
-  const { cert, private: privateKey } = generate(${JSON.stringify(subject)}, {
-    keySize: ${keyLength}, algorithm: 'sha256', days: ${days},
-  })
-
-  writeFileSync(privateKeyPath, privateKey.replace(/\\r\\n?/g, '\\n'))
-  writeFileSync(certPath, cert.replace(/\\r\\n?/g, '\\n'))
-} catch (e) {
-  console.error(e)
-  process.exit(-1)
-} finally {
-  process.exit(0)
-}
-`;
-  const fileName = "key-gen.js";
-  writeFileSync(`./${fileName}`, starter);
-  try {
-    execSync(`npx electron ${fileName}`, { stdio: "inherit" });
-  } finally {
-    rmSync(`./${fileName}`);
-  }
+  const privateKeyDir = dirname(privateKeyPath);
+  existsSync(privateKeyDir) || mkdirSync(privateKeyDir, { recursive: true });
+  const certDir = dirname(certPath);
+  existsSync(certDir) || mkdirSync(certDir, { recursive: true });
+  const { cert, private: privateKey } = generate(subject, {
+    keySize: keyLength,
+    algorithm: "sha256",
+    days
+  });
+  writeFileSync(privateKeyPath, privateKey.replace(/\r\n?/g, "\n"));
+  writeFileSync(certPath, cert.replace(/\r\n?/g, "\n"));
 }
 function writeCertToMain(entryPath, cert) {
   const file = readFileSync(entryPath, "utf-8");
@@ -140,7 +115,7 @@ function writeCertToMain(entryPath, cert) {
     !isMatched && lines.push(r);
     replaced = lines.join(EOL);
   }
-  writeFileSync(entryPath, replaced);
+  writeFileSync(entryPath, replaced.replace(/\r\n?/g, "\n"));
 }
 function parseKeys({
   keyLength,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "author": "subframe7536",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "electron incremental update tools, powered by vite",
   "scripts": {
     "build": "tsup && node fix-module.js",
@@ -56,9 +56,7 @@
     "vitest": "^0.32.2"
   },
   "dependencies": {
-    "ci-info": "^3.8.0"
-  },
-  "peerDependencies": {
+    "ci-info": "^3.8.0",
     "selfsigned": "^2.1.1"
   }
 }