electron-incremental-update 0.8.2 → 0.8.3

package/README.md

@@ -110,7 +110,7 @@ export default defineConfig(({ command }) => {
           // ...
         }
       ]),
-      //...
+      // ...
     ],
     // ...
   }

package/dist/{chunk-WM2PHOMB.mjs → chunk-7R4GHFED.mjs}

@@ -6,15 +6,20 @@ import {
 import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { gunzip, gzip } from "node:zlib";
-import { app } from "electron";
+import Electron from "electron";
+var info = {
+  dev: !Electron.app?.isPackaged,
+  platform: process.platform === "win32" ? "win" : process.platform === "darwin" ? "mac" : "linux",
+  appPath: Electron.app?.getAppPath()
+};
 function getProductAsarPath(name) {
-  return app.isPackaged ? join(dirname(app.getAppPath()), `${name}.asar`) : "dev.asar";
+  return info.dev ? join(dirname(info.appPath), `${name}.asar`) : "dev.asar";
 }
 function getEntryVersion() {
-  return app.getVersion();
+  return Electron.app.getVersion();
 }
 function getProductVersion(name) {
-  return app.isPackaged ? readFileSync(join(getProductAsarPath(name), "version"), "utf-8") : getEntryVersion();
+  return info.dev ? readFileSync(join(getProductAsarPath(name), "version"), "utf-8") : getEntryVersion();
 }
 var NoSuchNativeModuleError = class extends Error {
   moduleName;
@@ -24,7 +29,7 @@ var NoSuchNativeModuleError = class extends Error {
   }
 };
 function requireNative(packageName) {
-  const path = app.isPackaged ? join(app.getAppPath(), "node_modules", packageName) : packageName;
+  const path = info.dev ? join(info.appPath, "node_modules", packageName) : packageName;
   try {
     return __require(path);
   } catch (error) {
@@ -68,15 +73,15 @@ function getGithubReleaseCdnGroup() {
   ];
 }
 function restartApp() {
-  app.relaunch();
-  app.quit();
+  Electron.app.relaunch();
+  Electron.app.quit();
 }
 function waitAppReady(duration = 1e3) {
   return new Promise((resolve, reject) => {
     const timeout = setTimeout(() => {
       reject(new Error("app is not ready"));
     }, duration);
-    app.whenReady().then(() => {
+    Electron.app.whenReady().then(() => {
       clearTimeout(timeout);
       resolve();
     });
@@ -147,6 +152,7 @@ function parseVersion(version) {
 }
 
 export {
+  info,
   getProductAsarPath,
   getEntryVersion,
   getProductVersion,

package/dist/index.js

@@ -1,7 +1,9 @@
 "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)
@@ -15,6 +17,14 @@ 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
@@ -27,7 +37,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_node_path2 = require("path");
 var import_node_fs3 = require("fs");
-var import_electron3 = require("electron");
+var import_electron3 = __toESM(require("electron"));
 
 // src/updater/index.ts
 var import_node_fs2 = require("fs");
@@ -37,22 +47,27 @@ var import_promises = require("fs/promises");
 var import_node_fs = require("fs");
 var import_node_path = require("path");
 var import_node_zlib = require("zlib");
-var import_electron = require("electron");
+var import_electron = __toESM(require("electron"));
+var info = {
+  dev: !import_electron.default.app?.isPackaged,
+  platform: process.platform === "win32" ? "win" : process.platform === "darwin" ? "mac" : "linux",
+  appPath: import_electron.default.app?.getAppPath()
+};
 function getProductAsarPath(name) {
-  return import_electron.app.isPackaged ? (0, import_node_path.join)((0, import_node_path.dirname)(import_electron.app.getAppPath()), `${name}.asar`) : "dev.asar";
+  return info.dev ? (0, import_node_path.join)((0, import_node_path.dirname)(info.appPath), `${name}.asar`) : "dev.asar";
 }
 function getEntryVersion() {
-  return import_electron.app.getVersion();
+  return import_electron.default.app.getVersion();
 }
 function getProductVersion(name) {
-  return import_electron.app.isPackaged ? (0, import_node_fs.readFileSync)((0, import_node_path.join)(getProductAsarPath(name), "version"), "utf-8") : getEntryVersion();
+  return info.dev ? (0, import_node_fs.readFileSync)((0, import_node_path.join)(getProductAsarPath(name), "version"), "utf-8") : getEntryVersion();
 }
 function waitAppReady(duration = 1e3) {
   return new Promise((resolve2, reject) => {
     const timeout = setTimeout(() => {
       reject(new Error("app is not ready"));
     }, duration);
-    import_electron.app.whenReady().then(() => {
+    import_electron.default.app.whenReady().then(() => {
       clearTimeout(timeout);
       resolve2();
     });
@@ -153,11 +168,11 @@ var DownloadError = class extends Error {
 };
 
 // src/updater/defaultFunctions.ts
-var import_electron2 = require("electron");
+var import_electron2 = __toESM(require("electron"));
 var downloadJSONDefault = async (url, headers) => {
   await waitAppReady();
   return new Promise((resolve2, reject) => {
-    const request = import_electron2.net.request({
+    const request = import_electron2.default.net.request({
       url,
       method: "GET",
       redirect: "follow"
@@ -191,7 +206,7 @@ var downloadBufferDefault = async (url, headers, total, onDownloading) => {
   await waitAppReady();
   let current = 0;
   return new Promise((resolve2, reject) => {
-    const request = import_electron2.net.request({
+    const request = import_electron2.default.net.request({
       url,
       method: "GET",
       redirect: "follow"
@@ -406,7 +421,7 @@ function initApp(appOptions) {
   } = hooks || {};
   function handleError(msg) {
     onStartError?.(new Error(msg));
-    import_electron3.app.quit();
+    import_electron3.default.app.quit();
   }
   async function startup(updater) {
     try {
@@ -416,7 +431,7 @@ function initApp(appOptions) {
         await beforeDoUpdate?.(asarPath, updateAsarPath);
         (0, import_node_fs3.renameSync)(updateAsarPath, asarPath);
       }
-      const mainDir = import_electron3.app.isPackaged ? asarPath : electronDevDistPath;
+      const mainDir = import_electron3.default.app.isPackaged ? asarPath : electronDevDistPath;
       const entry = (0, import_node_path2.resolve)(__dirname, mainDir, mainPath);
       await beforeStart?.(entry);
       require(entry)(updater);

package/dist/index.mjs

@@ -8,7 +8,7 @@ import {
   parseVersion,
   unzipFile,
   waitAppReady
-} from "./chunk-WM2PHOMB.mjs";
+} from "./chunk-7R4GHFED.mjs";
 import {
   isUpdateJSON
 } from "./chunk-2JVXVTC5.mjs";
@@ -19,7 +19,7 @@ import {
 // src/index.ts
 import { resolve } from "node:path";
 import { existsSync as existsSync2, renameSync } from "node:fs";
-import { app } from "electron";
+import Electron2 from "electron";
 
 // src/updater/index.ts
 import { existsSync } from "node:fs";
@@ -51,11 +51,11 @@ var DownloadError = class extends Error {
 };
 
 // src/updater/defaultFunctions.ts
-import { net } from "electron";
+import Electron from "electron";
 var downloadJSONDefault = async (url, headers) => {
   await waitAppReady();
   return new Promise((resolve2, reject) => {
-    const request = net.request({
+    const request = Electron.net.request({
       url,
       method: "GET",
       redirect: "follow"
@@ -89,7 +89,7 @@ var downloadBufferDefault = async (url, headers, total, onDownloading) => {
   await waitAppReady();
   let current = 0;
   return new Promise((resolve2, reject) => {
-    const request = net.request({
+    const request = Electron.net.request({
       url,
       method: "GET",
       redirect: "follow"
@@ -304,7 +304,7 @@ function initApp(appOptions) {
   } = hooks || {};
   function handleError(msg) {
     onStartError?.(new Error(msg));
-    app.quit();
+    Electron2.app.quit();
   }
   async function startup(updater) {
     try {
@@ -314,7 +314,7 @@ function initApp(appOptions) {
         await beforeDoUpdate?.(asarPath, updateAsarPath);
         renameSync(updateAsarPath, asarPath);
       }
-      const mainDir = app.isPackaged ? asarPath : electronDevDistPath;
+      const mainDir = Electron2.app.isPackaged ? asarPath : electronDevDistPath;
       const entry = resolve(__dirname, mainDir, mainPath);
       await beforeStart?.(entry);
       __require(entry)(updater);

package/dist/utils.d.mts

@@ -1,3 +1,9 @@
+type Info = {
+    dev: boolean;
+    platform: 'win' | 'mac' | 'linux';
+    appPath: string;
+};
+declare const info: Info;
 /**
  * get the application asar absolute path
  * @param name The name of the application
@@ -63,4 +69,4 @@ interface Version {
 }
 declare function parseVersion(version: string): Version;
 
-export { NoSuchNativeModuleError, Version, getEntryVersion, getGithubFileCdnGroup, getGithubReleaseCdnGroup, getProductAsarPath, getProductVersion, handleUnexpectedErrors, parseGithubCdnURL, parseVersion, requireNative, restartApp, unzipFile, waitAppReady, zipFile };
+export { NoSuchNativeModuleError, Version, getEntryVersion, getGithubFileCdnGroup, getGithubReleaseCdnGroup, getProductAsarPath, getProductVersion, handleUnexpectedErrors, info, parseGithubCdnURL, parseVersion, requireNative, restartApp, unzipFile, waitAppReady, zipFile };

package/dist/utils.d.ts

@@ -1,3 +1,9 @@
+type Info = {
+    dev: boolean;
+    platform: 'win' | 'mac' | 'linux';
+    appPath: string;
+};
+declare const info: Info;
 /**
  * get the application asar absolute path
  * @param name The name of the application
@@ -63,4 +69,4 @@ interface Version {
 }
 declare function parseVersion(version: string): Version;
 
-export { NoSuchNativeModuleError, Version, getEntryVersion, getGithubFileCdnGroup, getGithubReleaseCdnGroup, getProductAsarPath, getProductVersion, handleUnexpectedErrors, parseGithubCdnURL, parseVersion, requireNative, restartApp, unzipFile, waitAppReady, zipFile };
+export { NoSuchNativeModuleError, Version, getEntryVersion, getGithubFileCdnGroup, getGithubReleaseCdnGroup, getProductAsarPath, getProductVersion, handleUnexpectedErrors, info, parseGithubCdnURL, parseVersion, requireNative, restartApp, unzipFile, waitAppReady, zipFile };

package/dist/utils.js

@@ -1,7 +1,9 @@
 "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)
@@ -15,6 +17,14 @@ 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/utils.ts
@@ -27,6 +37,7 @@ __export(utils_exports, {
   getProductAsarPath: () => getProductAsarPath,
   getProductVersion: () => getProductVersion,
   handleUnexpectedErrors: () => handleUnexpectedErrors,
+  info: () => info,
   parseGithubCdnURL: () => parseGithubCdnURL,
   parseVersion: () => parseVersion,
   requireNative: () => requireNative,
@@ -39,15 +50,20 @@ module.exports = __toCommonJS(utils_exports);
 var import_node_fs = require("fs");
 var import_node_path = require("path");
 var import_node_zlib = require("zlib");
-var import_electron = require("electron");
+var import_electron = __toESM(require("electron"));
+var info = {
+  dev: !import_electron.default.app?.isPackaged,
+  platform: process.platform === "win32" ? "win" : process.platform === "darwin" ? "mac" : "linux",
+  appPath: import_electron.default.app?.getAppPath()
+};
 function getProductAsarPath(name) {
-  return import_electron.app.isPackaged ? (0, import_node_path.join)((0, import_node_path.dirname)(import_electron.app.getAppPath()), `${name}.asar`) : "dev.asar";
+  return info.dev ? (0, import_node_path.join)((0, import_node_path.dirname)(info.appPath), `${name}.asar`) : "dev.asar";
 }
 function getEntryVersion() {
-  return import_electron.app.getVersion();
+  return import_electron.default.app.getVersion();
 }
 function getProductVersion(name) {
-  return import_electron.app.isPackaged ? (0, import_node_fs.readFileSync)((0, import_node_path.join)(getProductAsarPath(name), "version"), "utf-8") : getEntryVersion();
+  return info.dev ? (0, import_node_fs.readFileSync)((0, import_node_path.join)(getProductAsarPath(name), "version"), "utf-8") : getEntryVersion();
 }
 var NoSuchNativeModuleError = class extends Error {
   moduleName;
@@ -57,7 +73,7 @@ var NoSuchNativeModuleError = class extends Error {
   }
 };
 function requireNative(packageName) {
-  const path = import_electron.app.isPackaged ? (0, import_node_path.join)(import_electron.app.getAppPath(), "node_modules", packageName) : packageName;
+  const path = info.dev ? (0, import_node_path.join)(info.appPath, "node_modules", packageName) : packageName;
   try {
     return require(path);
   } catch (error) {
@@ -101,15 +117,15 @@ function getGithubReleaseCdnGroup() {
   ];
 }
 function restartApp() {
-  import_electron.app.relaunch();
-  import_electron.app.quit();
+  import_electron.default.app.relaunch();
+  import_electron.default.app.quit();
 }
 function waitAppReady(duration = 1e3) {
   return new Promise((resolve, reject) => {
     const timeout = setTimeout(() => {
       reject(new Error("app is not ready"));
     }, duration);
-    import_electron.app.whenReady().then(() => {
+    import_electron.default.app.whenReady().then(() => {
       clearTimeout(timeout);
       resolve();
     });
@@ -187,6 +203,7 @@ function parseVersion(version) {
   getProductAsarPath,
   getProductVersion,
   handleUnexpectedErrors,
+  info,
   parseGithubCdnURL,
   parseVersion,
   requireNative,

package/dist/utils.mjs

@@ -6,6 +6,7 @@ import {
   getProductAsarPath,
   getProductVersion,
   handleUnexpectedErrors,
+  info,
   parseGithubCdnURL,
   parseVersion,
   requireNative,
@@ -13,7 +14,7 @@ import {
   unzipFile,
   waitAppReady,
   zipFile
-} from "./chunk-WM2PHOMB.mjs";
+} from "./chunk-7R4GHFED.mjs";
 import "./chunk-ZFXKCRJC.mjs";
 export {
   NoSuchNativeModuleError,
@@ -23,6 +24,7 @@ export {
   getProductAsarPath,
   getProductVersion,
   handleUnexpectedErrors,
+  info,
   parseGithubCdnURL,
   parseVersion,
   requireNative,

package/dist/vite.js

@@ -1,7 +1,9 @@
 "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)
@@ -15,6 +17,14 @@ 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/vite.ts
@@ -23,13 +33,13 @@ __export(vite_exports, {
   ElectronUpdater: () => ElectronUpdater
 });
 module.exports = __toCommonJS(vite_exports);
-var import_vite = require("vite");
+var import_vite2 = require("vite");
 
 // src/build-plugins/build.ts
 var import_promises = require("fs/promises");
 var import_node_fs2 = require("fs");
-var import_asar = require("@electron/asar");
-var import_esbuild = require("esbuild");
+var import_asar = __toESM(require("@electron/asar"));
+var import_vite = require("vite");
 
 // src/crypto.ts
 var import_node_crypto = require("crypto");
@@ -52,7 +62,12 @@ var signature = (buffer, privateKey, cert, version) => {
 var import_node_fs = require("fs");
 var import_node_path = require("path");
 var import_node_zlib = require("zlib");
-var import_electron = require("electron");
+var import_electron = __toESM(require("electron"));
+var info = {
+  dev: !import_electron.default.app?.isPackaged,
+  platform: process.platform === "win32" ? "win" : process.platform === "darwin" ? "mac" : "linux",
+  appPath: import_electron.default.app?.getAppPath()
+};
 async function zipFile(filePath, targetFilePath = `${filePath}.gz`) {
   if (!(0, import_node_fs.existsSync)(filePath)) {
     throw new Error(`path to be zipped not exist: ${filePath}`);
@@ -109,7 +124,7 @@ async function buildAsar({
 }) {
   await (0, import_promises.rename)(rendererDistPath, `${electronDistPath}/renderer`);
   await (0, import_promises.writeFile)(`${electronDistPath}/version`, version);
-  await (0, import_asar.createPackage)(electronDistPath, asarOutputPath);
+  await import_asar.default.createPackage(electronDistPath, asarOutputPath);
   await zipFile(asarOutputPath, gzipPath);
 }
 async function buildVersion({
@@ -169,13 +184,21 @@ async function buildEntry({
   entryOutputPath: outfile,
   minify
 }) {
-  await (0, import_esbuild.build)({
-    entryPoints: [entryPath],
-    bundle: true,
-    platform: "node",
-    outfile,
-    minify,
-    external: ["electron", "original-fs"]
+  await (0, import_vite.build)({
+    build: {
+      lib: {
+        entry: entryPath,
+        formats: ["cjs"]
+      },
+      minify,
+      rollupOptions: {
+        treeshake: true,
+        external: ["electron", "original-fs"],
+        output: {
+          file: outfile
+        }
+      }
+    }
   });
 }
 
@@ -330,7 +353,7 @@ function ElectronUpdater(options) {
   const { entryPath, entryOutputPath } = buildEntryOption;
   const { asarOutputPath } = buildAsarOption;
   const id = "electron-incremental-updater";
-  const log = (0, import_vite.createLogger)("info", { prefix: `[${id}]` });
+  const log = (0, import_vite2.createLogger)("info", { prefix: `[${id}]` });
   return {
     name: `vite-plugin-${id}`,
     enforce: "post",

package/dist/vite.mjs

@@ -4,7 +4,7 @@ import {
 import {
   parseVersion,
   zipFile
-} from "./chunk-WM2PHOMB.mjs";
+} from "./chunk-7R4GHFED.mjs";
 import {
   isUpdateJSON
 } from "./chunk-2JVXVTC5.mjs";
@@ -16,8 +16,8 @@ import { createLogger } from "vite";
 // src/build-plugins/build.ts
 import { readFile, rename, writeFile } from "node:fs/promises";
 import { existsSync } from "node:fs";
-import { createPackage } from "@electron/asar";
-import { build } from "esbuild";
+import Asar from "@electron/asar";
+import { build } from "vite";
 async function buildAsar({
   version,
   asarOutputPath,
@@ -27,7 +27,7 @@ async function buildAsar({
 }) {
   await rename(rendererDistPath, `${electronDistPath}/renderer`);
   await writeFile(`${electronDistPath}/version`, version);
-  await createPackage(electronDistPath, asarOutputPath);
+  await Asar.createPackage(electronDistPath, asarOutputPath);
   await zipFile(asarOutputPath, gzipPath);
 }
 async function buildVersion({
@@ -88,12 +88,20 @@ async function buildEntry({
   minify
 }) {
   await build({
-    entryPoints: [entryPath],
-    bundle: true,
-    platform: "node",
-    outfile,
-    minify,
-    external: ["electron", "original-fs"]
+    build: {
+      lib: {
+        entry: entryPath,
+        formats: ["cjs"]
+      },
+      minify,
+      rollupOptions: {
+        treeshake: true,
+        external: ["electron", "original-fs"],
+        output: {
+          file: outfile
+        }
+      }
+    }
   });
 }
 

package/package.json

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