electron-incremental-update 0.8.7 → 0.8.8

package/README.md

@@ -75,6 +75,8 @@ initApp({ onStart: console.log })
 make sure the plugin is set in the **last** build task
 
 - for `vite-plugin-electron`, set it to `preload` (the second object in the plugin option array)
+- cert is read from `process.env.UPDATER_CERT` first, then read config
+- privatekey is read from `process.env.UPDATER_PK` first, then read config
 
 ```ts
 // vite.config.ts

package/dist/index.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -37,7 +27,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_node_path2 = require("path");
 var import_node_fs4 = require("fs");
-var import_electron4 = __toESM(require("electron"));
+var import_electron4 = require("electron");
 
 // src/updater/index.ts
 var import_node_fs3 = require("fs");
@@ -438,7 +428,7 @@ function initApp(appOptions) {
   } = hooks || {};
   function handleError(msg) {
     onStartError?.(new Error(msg));
-    import_electron4.default.app.quit();
+    import_electron4.app.quit();
   }
   async function startup(updater) {
     try {
@@ -448,7 +438,7 @@ function initApp(appOptions) {
         await beforeDoUpdate?.(asarPath, updateAsarPath);
         (0, import_node_fs4.renameSync)(updateAsarPath, asarPath);
       }
-      const mainDir = import_electron4.default.app.isPackaged ? asarPath : electronDevDistPath;
+      const mainDir = import_electron4.app.isPackaged ? asarPath : electronDevDistPath;
       const entry = (0, import_node_path2.resolve)(__dirname, mainDir, mainPath);
       await beforeStart?.(entry);
       require(entry)(updater);

package/dist/index.mjs

@@ -18,7 +18,7 @@ import {
 // src/index.ts
 import { resolve } from "node:path";
 import { existsSync as existsSync2, renameSync } from "node:fs";
-import Electron from "electron";
+import { app } from "electron";
 
 // src/updater/index.ts
 import { existsSync } from "node:fs";
@@ -303,7 +303,7 @@ function initApp(appOptions) {
   } = hooks || {};
   function handleError(msg) {
     onStartError?.(new Error(msg));
-    Electron.app.quit();
+    app.quit();
   }
   async function startup(updater) {
     try {
@@ -313,7 +313,7 @@ function initApp(appOptions) {
         await beforeDoUpdate?.(asarPath, updateAsarPath);
         renameSync(updateAsarPath, asarPath);
       }
-      const mainDir = Electron.app.isPackaged ? asarPath : electronDevDistPath;
+      const mainDir = app.isPackaged ? asarPath : electronDevDistPath;
       const entry = resolve(__dirname, mainDir, mainPath);
       await beforeStart?.(entry);
       __require(entry)(updater);

package/dist/vite.js

@@ -189,9 +189,6 @@ async function buildEntry({
   });
 }
 
-// src/build-plugins/option.ts
-var import_ci_info = require("ci-info");
-
 // src/build-plugins/key.ts
 var import_node_fs3 = require("fs");
 var import_node_path = require("path");
@@ -250,8 +247,8 @@ function parseKeys({
   if (!(0, import_node_fs3.existsSync)(privateKeyPath) || !(0, import_node_fs3.existsSync)(certPath)) {
     generateKeyPair(keyLength, parseSubjects(subject), days, privateKeyPath, certPath);
   }
-  const privateKey = (0, import_node_fs3.readFileSync)(privateKeyPath, "utf-8");
-  const cert = (0, import_node_fs3.readFileSync)(certPath, "utf-8");
+  const privateKey = process.env.UPDATER_PK || (0, import_node_fs3.readFileSync)(privateKeyPath, "utf-8");
+  const cert = process.env.UPDATER_CERT || (0, import_node_fs3.readFileSync)(certPath, "utf-8");
   writeCertToMain(entryPath, cert);
   return {
     privateKey,
@@ -312,27 +309,24 @@ function parseOptions(options) {
     entryOutputPath,
     minify
   };
-  let buildVersionOption;
-  if (!import_ci_info.isCI) {
-    const { privateKey, cert } = parseKeys({
-      keyLength,
-      privateKeyPath,
-      certPath,
-      entryPath,
-      subject,
-      days
-    });
-    buildVersionOption = {
-      version,
-      minimumVersion,
-      gzipPath,
-      privateKey,
-      cert,
-      versionPath,
-      generateSignature,
-      generateVersionJson
-    };
-  }
+  const { privateKey, cert } = parseKeys({
+    keyLength,
+    privateKeyPath,
+    certPath,
+    entryPath,
+    subject,
+    days
+  });
+  const buildVersionOption = {
+    version,
+    minimumVersion,
+    gzipPath,
+    privateKey,
+    cert,
+    versionPath,
+    generateSignature,
+    generateVersionJson
+  };
   return { isBuild, buildAsarOption, buildEntryOption, buildVersionOption };
 }
 
@@ -347,16 +341,16 @@ function ElectronUpdater(options) {
     name: `vite-plugin-${id}`,
     enforce: "post",
     async closeBundle() {
-      log.info("build entry start");
+      log.info("build entry start", { timestamp: true });
       await buildEntry(buildEntryOption);
-      log.info(`build entry end, ${entryPath} -> ${entryOutputPath}`);
+      log.info(`build entry end, ${entryPath} -> ${entryOutputPath}`, { timestamp: true });
       if (!isBuild) {
         return;
       }
-      log.info("build asar start");
+      log.info("build asar start", { timestamp: true });
       await buildAsar(buildAsarOption);
-      buildVersionOption && await buildVersion(buildVersionOption);
-      log.info(`build asar end, output to ${asarOutputPath}`);
+      await buildVersion(buildVersionOption);
+      log.info(`build asar end, output to ${asarOutputPath}`, { timestamp: true });
     }
   };
 }

package/dist/vite.mjs

@@ -94,9 +94,6 @@ async function buildEntry({
   });
 }
 
-// src/build-plugins/option.ts
-import { isCI } from "ci-info";
-
 // src/build-plugins/key.ts
 import { existsSync as existsSync2, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
@@ -155,8 +152,8 @@ function parseKeys({
   if (!existsSync2(privateKeyPath) || !existsSync2(certPath)) {
     generateKeyPair(keyLength, parseSubjects(subject), days, privateKeyPath, certPath);
   }
-  const privateKey = readFileSync(privateKeyPath, "utf-8");
-  const cert = readFileSync(certPath, "utf-8");
+  const privateKey = process.env.UPDATER_PK || readFileSync(privateKeyPath, "utf-8");
+  const cert = process.env.UPDATER_CERT || readFileSync(certPath, "utf-8");
   writeCertToMain(entryPath, cert);
   return {
     privateKey,
@@ -217,27 +214,24 @@ function parseOptions(options) {
     entryOutputPath,
     minify
   };
-  let buildVersionOption;
-  if (!isCI) {
-    const { privateKey, cert } = parseKeys({
-      keyLength,
-      privateKeyPath,
-      certPath,
-      entryPath,
-      subject,
-      days
-    });
-    buildVersionOption = {
-      version,
-      minimumVersion,
-      gzipPath,
-      privateKey,
-      cert,
-      versionPath,
-      generateSignature,
-      generateVersionJson
-    };
-  }
+  const { privateKey, cert } = parseKeys({
+    keyLength,
+    privateKeyPath,
+    certPath,
+    entryPath,
+    subject,
+    days
+  });
+  const buildVersionOption = {
+    version,
+    minimumVersion,
+    gzipPath,
+    privateKey,
+    cert,
+    versionPath,
+    generateSignature,
+    generateVersionJson
+  };
   return { isBuild, buildAsarOption, buildEntryOption, buildVersionOption };
 }
 
@@ -252,16 +246,16 @@ function ElectronUpdater(options) {
     name: `vite-plugin-${id}`,
     enforce: "post",
     async closeBundle() {
-      log.info("build entry start");
+      log.info("build entry start", { timestamp: true });
       await buildEntry(buildEntryOption);
-      log.info(`build entry end, ${entryPath} -> ${entryOutputPath}`);
+      log.info(`build entry end, ${entryPath} -> ${entryOutputPath}`, { timestamp: true });
       if (!isBuild) {
         return;
       }
-      log.info("build asar start");
+      log.info("build asar start", { timestamp: true });
       await buildAsar(buildAsarOption);
-      buildVersionOption && await buildVersion(buildVersionOption);
-      log.info(`build asar end, output to ${asarOutputPath}`);
+      await buildVersion(buildVersionOption);
+      log.info(`build asar end, output to ${asarOutputPath}`, { timestamp: true });
     }
   };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "author": "subframe7536",
-  "version": "0.8.7",
+  "version": "0.8.8",
   "description": "electron incremental update tools, powered by vite",
   "scripts": {
     "build": "tsup && node fix-module.js",