electron-incremental-update 2.2.6 → 2.3.1

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
-export { b as aesDecrypt, a as aesEncrypt, j as defaultDownloadAsar, f as defaultDownloadJSON, i as defaultDownloadUpdateJSON, d as defaultSignature, l as defaultUnzipFile, c as defaultVerifySignature, k as defaultZipFile, e as downloadUtil, g as getHeader, h as hashBuffer } from './zip-DUHOPZrB.js';
+export { b as aesDecrypt, a as aesEncrypt, j as defaultDownloadAsar, f as defaultDownloadText, i as defaultDownloadUpdateJSON, d as defaultSignature, l as defaultUnzipFile, c as defaultVerifySignature, k as defaultZipFile, e as downloadUtil, g as getHeader, h as hashBuffer, r as resolveJson } from './zip-CnSv_Njj.js';
 import { BrowserWindow } from 'electron';
-export { U as UpdateInfo, a as UpdateJSON, V as Version, d as defaultIsLowerVersion, c as defaultVersionJsonGenerator, i as isUpdateJSON, p as parseVersion } from './types-1T_tRG8a.js';
+export { U as UpdateInfo, a as UpdateJSON, V as Version, d as defaultIsLowerVersion, c as defaultVersionJsonGenerator, i as isUpdateJSON, p as parseVersion } from './types-CU7GyVez.js';
 import '@subframe7536/type-utils';
 import 'node:url';
 

package/dist/utils.js

@@ -1,3 +1,3 @@
 export { beautifyDevTools, disableHWAccForWin7, getAppVersion, getEntryVersion, getPathFromAppNameAsar, getPathFromEntryAsar, getPathFromMain, getPathFromPreload, getPathFromPublic, handleUnexpectedErrors, importNative, isDev, isLinux, isMac, isWin, loadPage, reloadOnPreloadScriptChanged, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance } from './chunk-QKKPETVJ.js';
-export { aesDecrypt, aesEncrypt, defaultDownloadAsar, defaultDownloadJSON, defaultDownloadUpdateJSON, defaultSignature, defaultUnzipFile, defaultVerifySignature, defaultZipFile, downloadUtil, getHeader, hashBuffer } from './chunk-KLUIYBS4.js';
+export { aesDecrypt, aesEncrypt, defaultDownloadAsar, defaultDownloadText, defaultDownloadUpdateJSON, defaultSignature, defaultUnzipFile, defaultVerifySignature, defaultZipFile, downloadUtil, getHeader, hashBuffer, resolveJson } from './chunk-QPAKJHVM.js';
 export { defaultIsLowerVersion, defaultVersionJsonGenerator, isUpdateJSON, parseVersion } from './chunk-AAAM44NW.js';

package/dist/vite.d.ts

@@ -288,14 +288,14 @@ declare function convertLiteral(code: string, sourcemap?: boolean, offset?: numb
     map?: any;
 };
 
-type MakeRequired<T, K extends keyof T> = Exclude<T, undefined> & {
+type MakeRequired<T, K extends keyof T> = NonNullable<T> & {
     [P in K]-?: T[P];
 };
 type ReplaceKey<T, Key extends keyof T, NewKey extends string> = Omit<T, Key> & {
     [P in NewKey]: T[Key];
 };
 type MakeRequiredAndReplaceKey<T, K extends keyof T, NewKey extends string> = MakeRequired<ReplaceKey<T, K, NewKey>, NewKey>;
-type StartupFn = Exclude<Exclude<ElectronSimpleOptions['preload'], undefined>['onstart'], undefined>;
+type StartupFn = NonNullable<NonNullable<ElectronSimpleOptions['main']>['onstart']>;
 /**
  * Startup function for debug (see {@link https://github.com/electron-vite/electron-vite-vue/blob/main/vite.config.ts electron-vite-vue template})
  * @example

package/dist/vite.js

@@ -88,8 +88,8 @@ async function buildEntry({
     },
     vite: mergeConfig({
       plugins: [
-        isESM && await import('./esm-4S4XCVEW.js').then((m) => m.esm()),
-        bytecodeOptions && await import('./bytecode-7J2ZQDDO.js').then((m) => m.bytecodePlugin("main", bytecodeOptions))
+        isESM && import('./esm-4S4XCVEW.js').then((m) => m.esm()),
+        bytecodeOptions && import('./bytecode-7J2ZQDDO.js').then((m) => m.bytecodePlugin("main", bytecodeOptions))
       ],
       build: {
         sourcemap,
@@ -222,7 +222,7 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
     overrideViteOptions,
     ignoreDynamicRequires,
     external: (source, importer, isResolved) => {
-      if (source.endsWith(".node")) {
+      if (source.endsWith(".node") || source.startsWith("node:")) {
         return false;
       }
       if (!external) {
@@ -255,6 +255,7 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
   };
   return { buildAsarOption, buildEntryOption, buildVersionOption, postBuild, cert };
 }
+var vite_default = electronWithUpdater;
 var debugStartup = (args) => {
   if (process.env.VSCODE_DEBUG) {
     console.log("[startup] Electron App");
@@ -293,6 +294,9 @@ function parseVersionPath(versionPath) {
   }
   return new URL(versionPath, "file://").pathname.slice(1);
 }
+var ex = startup.exit;
+startup.exit = () => ex().catch(() => {
+});
 async function electronWithUpdater(options) {
   let {
     isBuild,
@@ -349,7 +353,7 @@ async function electronWithUpdater(options) {
     __EIU_SIGNATURE_CERT__: JSON.stringify(cert),
     __EIU_VERSION_PATH__: JSON.stringify(parseVersionPath(normalizePath(buildVersionOption.versionPath)))
   };
-  const _buildEntry = async () => {
+  async function _buildEntry() {
     await buildEntry(
       buildEntryOption,
       isESM,
@@ -357,38 +361,39 @@ async function electronWithUpdater(options) {
       bytecodeOptions
     );
     log.info(`Build entry to '${entryOutputDirPath}'`, { timestamp: true });
-  };
-  const _postBuild = postBuild ? async () => await postBuild({
-    getPathFromEntryOutputDir(...paths) {
-      return path3.join(entryOutputDirPath, ...paths);
-    },
-    copyToEntryOutputDir({ from, to, skipIfExist = true }) {
-      if (!fs2.existsSync(from)) {
-        log.warn(`${from} not found`, { timestamp: true });
-        return;
-      }
-      const target = path3.join(entryOutputDirPath, to ?? path3.basename(from));
-      copyAndSkipIfExist(from, target, skipIfExist);
-    },
-    copyModules({ modules, skipIfExist = true }) {
-      const nodeModulesPath = path3.join(entryOutputDirPath, "node_modules");
-      for (const m of modules) {
-        const { rootPath } = getPackageInfoSync(m) || {};
-        if (!rootPath) {
-          log.warn(`Package '${m}' not found`, { timestamp: true });
-          continue;
+  }
+  async function _postBuild() {
+    return await postBuild?.({
+      getPathFromEntryOutputDir(...paths) {
+        return path3.join(entryOutputDirPath, ...paths);
+      },
+      copyToEntryOutputDir({ from, to, skipIfExist = true }) {
+        if (!fs2.existsSync(from)) {
+          log.warn(`${from} not found`, { timestamp: true });
+          return;
+        }
+        const target = path3.join(entryOutputDirPath, to ?? path3.basename(from));
+        copyAndSkipIfExist(from, target, skipIfExist);
+      },
+      copyModules({ modules, skipIfExist = true }) {
+        const nodeModulesPath = path3.join(entryOutputDirPath, "node_modules");
+        for (const m of modules) {
+          const { rootPath } = getPackageInfoSync(m) || {};
+          if (!rootPath) {
+            log.warn(`Package '${m}' not found`, { timestamp: true });
+            continue;
+          }
+          copyAndSkipIfExist(rootPath, path3.join(nodeModulesPath, m), skipIfExist);
         }
-        copyAndSkipIfExist(rootPath, path3.join(nodeModulesPath, m), skipIfExist);
       }
-    }
-  }) : async () => {
-  };
+    });
+  }
   let isInit = false;
   const rollupOptions = {
     external: (src) => src.startsWith("node:") || Object.keys("dependencies" in pkg ? pkg.dependencies : {}).includes(src) || src === "original-fs",
     treeshake: true
   };
-  const esmShimPlugin = isESM ? (await import('./esm-4S4XCVEW.js')).esm() : void 0;
+  const esmShimPlugin = isESM ? import('./esm-4S4XCVEW.js').then((m) => m.esm()) : void 0;
   const electronPluginOptions = {
     main: {
       entry: _main.files,
@@ -408,7 +413,7 @@ async function electronWithUpdater(options) {
         {
           plugins: [
             !isBuild && useNotBundle ? notBundle() : void 0,
-            bytecodeOptions && await import('./bytecode-7J2ZQDDO.js').then((m) => m.bytecodePlugin("main", bytecodeOptions)),
+            bytecodeOptions && import('./bytecode-7J2ZQDDO.js').then((m) => m.bytecodePlugin("main", bytecodeOptions)),
             esmShimPlugin
           ],
           build: {
@@ -428,7 +433,7 @@ async function electronWithUpdater(options) {
       vite: mergeConfig(
         {
           plugins: [
-            bytecodeOptions && (await import('./bytecode-7J2ZQDDO.js')).bytecodePlugin("preload", bytecodeOptions),
+            bytecodeOptions && import('./bytecode-7J2ZQDDO.js').then((m) => m.bytecodePlugin("preload", bytecodeOptions)),
             esmShimPlugin,
             {
               name: `${id}-build`,
@@ -484,7 +489,7 @@ async function electronWithUpdater(options) {
       apply() {
         return !isBuild;
       },
-      configureServer: (server) => {
+      configureServer(server) {
         server.watcher.add(files).on(
           "change",
           (p) => files.includes(p) && _buildEntry().then(async () => {
@@ -498,6 +503,5 @@ async function electronWithUpdater(options) {
   }
   return [ElectronSimple(electronPluginOptions), extraHmrPlugin];
 }
-var vite_default = electronWithUpdater;
 
 export { debugStartup, vite_default as default, electronWithUpdater, fixWinCharEncoding };

package/dist/{zip-ChpUyjy1.d.cts → zip-Blmn2vzE.d.cts}

@@ -1,4 +1,4 @@
-import { a as UpdateJSON, D as DownloadingInfo } from './types-1T_tRG8a.cjs';
+import { a as UpdateJSON, D as DownloadingInfo } from './types-CU7GyVez.cjs';
 import { Arrayable } from '@subframe7536/type-utils';
 import { IncomingMessage } from 'electron';
 
@@ -31,6 +31,7 @@ declare function defaultVerifySignature(buffer: Buffer, version: string, signatu
 declare function getHeader(headers: Record<string, Arrayable<string>>, key: any): any;
 declare function downloadUtil<T>(url: string, headers: Record<string, any>, onResponse: (req: Electron.ClientRequest, resp: IncomingMessage, resolve: (data: T) => void, reject: (e: any) => void) => void): Promise<T>;
 type ResolveDataFn = (data: string, resolve: (data: any) => void, reject: (e: any) => void) => void;
+declare const resolveJson: ResolveDataFn;
 /**
  * Default function to download json and parse to UpdateJson
  * @param url target url
@@ -38,7 +39,7 @@ type ResolveDataFn = (data: string, resolve: (data: any) => void, reject: (e: an
  * @param signal abort signal
  * @param resolveData on resolve
  */
-declare function defaultDownloadJSON<T>(url: string, headers: Record<string, any>, signal: AbortSignal, resolveData?: ResolveDataFn): Promise<T>;
+declare function defaultDownloadText<T>(url: string, headers: Record<string, any>, signal: AbortSignal, resolveData: ResolveDataFn): Promise<T>;
 /**
  * Default function to download json and parse to UpdateJson
  * @param url target url
@@ -67,4 +68,4 @@ declare function defaultZipFile(buffer: Buffer): Promise<Buffer>;
  */
 declare function defaultUnzipFile(buffer: Buffer): Promise<Buffer>;
 
-export { aesEncrypt as a, aesDecrypt as b, defaultVerifySignature as c, defaultSignature as d, downloadUtil as e, defaultDownloadJSON as f, getHeader as g, hashBuffer as h, defaultDownloadUpdateJSON as i, defaultDownloadAsar as j, defaultZipFile as k, defaultUnzipFile as l };
+export { aesEncrypt as a, aesDecrypt as b, defaultVerifySignature as c, defaultSignature as d, downloadUtil as e, defaultDownloadText as f, getHeader as g, hashBuffer as h, defaultDownloadUpdateJSON as i, defaultDownloadAsar as j, defaultZipFile as k, defaultUnzipFile as l, resolveJson as r };

package/dist/{zip-DUHOPZrB.d.ts → zip-CnSv_Njj.d.ts}

@@ -1,4 +1,4 @@
-import { a as UpdateJSON, D as DownloadingInfo } from './types-1T_tRG8a.js';
+import { a as UpdateJSON, D as DownloadingInfo } from './types-CU7GyVez.js';
 import { Arrayable } from '@subframe7536/type-utils';
 import { IncomingMessage } from 'electron';
 
@@ -31,6 +31,7 @@ declare function defaultVerifySignature(buffer: Buffer, version: string, signatu
 declare function getHeader(headers: Record<string, Arrayable<string>>, key: any): any;
 declare function downloadUtil<T>(url: string, headers: Record<string, any>, onResponse: (req: Electron.ClientRequest, resp: IncomingMessage, resolve: (data: T) => void, reject: (e: any) => void) => void): Promise<T>;
 type ResolveDataFn = (data: string, resolve: (data: any) => void, reject: (e: any) => void) => void;
+declare const resolveJson: ResolveDataFn;
 /**
  * Default function to download json and parse to UpdateJson
  * @param url target url
@@ -38,7 +39,7 @@ type ResolveDataFn = (data: string, resolve: (data: any) => void, reject: (e: an
  * @param signal abort signal
  * @param resolveData on resolve
  */
-declare function defaultDownloadJSON<T>(url: string, headers: Record<string, any>, signal: AbortSignal, resolveData?: ResolveDataFn): Promise<T>;
+declare function defaultDownloadText<T>(url: string, headers: Record<string, any>, signal: AbortSignal, resolveData: ResolveDataFn): Promise<T>;
 /**
  * Default function to download json and parse to UpdateJson
  * @param url target url
@@ -67,4 +68,4 @@ declare function defaultZipFile(buffer: Buffer): Promise<Buffer>;
  */
 declare function defaultUnzipFile(buffer: Buffer): Promise<Buffer>;
 
-export { aesEncrypt as a, aesDecrypt as b, defaultVerifySignature as c, defaultSignature as d, downloadUtil as e, defaultDownloadJSON as f, getHeader as g, hashBuffer as h, defaultDownloadUpdateJSON as i, defaultDownloadAsar as j, defaultZipFile as k, defaultUnzipFile as l };
+export { aesEncrypt as a, aesDecrypt as b, defaultVerifySignature as c, defaultSignature as d, downloadUtil as e, defaultDownloadText as f, getHeader as g, hashBuffer as h, defaultDownloadUpdateJSON as i, defaultDownloadAsar as j, defaultZipFile as k, defaultUnzipFile as l, resolveJson as r };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "type": "module",
-  "version": "2.2.6",
+  "version": "2.3.1",
   "description": "Electron incremental update tools with Vite plugin, support bytecode protection",
   "author": "subframe7536",
   "license": "MIT",
@@ -73,6 +73,7 @@
     "@subframe7536/eslint-config": "^1.2.4",
     "@types/babel__core": "^7.20.5",
     "@types/node": "^22.15.17",
+    "@vitest/eslint-plugin": "^1.1.44",
     "bumpp": "^10.1.0",
     "electron": "36.2.0",
     "esbuild": "^0.25.4",