electron-incremental-update 2.1.2 → 2.2.0

package/dist/{bytecode-I4PMYUGT.js → bytecode-Z5ZF4YGN.js}

@@ -1,13 +1,15 @@
 import { readableSize } from './chunk-WYQ5DRO7.js';
-import { convertLiteral, bytecodeModuleLoader, convertArrowFunctionAndTemplate, compileToBytecode, useStrict, toRelativePath } from './chunk-AUY7A2FL.js';
-import './chunk-7M7DIMDN.js';
+import { convertLiteral, bytecodeModuleLoaderCode, bytecodeModuleLoader, convertArrowFunctionAndTemplate, compileToBytecode, useStrict, toRelativePath } from './chunk-I2EHKJU4.js';
+import './chunk-CTUEQCKL.js';
 import { bytecodeLog, bytecodeId } from './chunk-5NKEXGI3.js';
-import { bytecodeModuleLoaderCode } from './chunk-7IRGAAL2.js';
 import path from 'node:path';
 import fs from 'node:fs';
 import { createFilter, normalizePath } from 'vite';
 import MagicString from 'magic-string';
 
+function getBytecodeLoaderBlock(chunkFileName) {
+  return `require("${toRelativePath(bytecodeModuleLoader, normalizePath(chunkFileName))}");`;
+}
 function bytecodePlugin(env, options) {
   const {
     enable,
@@ -77,9 +79,6 @@ function bytecodePlugin(env, options) {
       const nonEntryChunks = chunks.filter((chunk) => !chunk.isEntry).map((chunk) => path.basename(chunk.fileName));
       const pattern = nonEntryChunks.map((chunk) => `(${chunk})`).join("|");
       const bytecodeRE = pattern ? new RegExp(`require\\(\\S*(?=(${pattern})\\S*\\))`, "g") : null;
-      const getBytecodeLoaderBlock = (chunkFileName) => {
-        return `require("${toRelativePath(bytecodeModuleLoader, normalizePath(chunkFileName))}");`;
-      };
       await Promise.all(
         bundles.map(async (name) => {
           const chunk = output[name];

package/dist/{chunk-RCRKUKFX.js → chunk-AAAM44NW.js}

@@ -29,17 +29,17 @@ function parseVersion(version) {
   }
   return ret;
 }
+function compareStrings(str1, str2) {
+  if (str1 === "") {
+    return str2 !== "";
+  } else if (str2 === "") {
+    return true;
+  }
+  return str1 < str2;
+}
 function defaultIsLowerVersion(oldVer, newVer) {
   const oldV = parseVersion(oldVer);
   const newV = parseVersion(newVer);
-  function compareStrings(str1, str2) {
-    if (str1 === "") {
-      return str2 !== "";
-    } else if (str2 === "") {
-      return true;
-    }
-    return str1 < str2;
-  }
   for (let key of Object.keys(oldV)) {
     if (key === "stage" && compareStrings(oldV[key], newV[key])) {
       return true;
@@ -49,8 +49,8 @@ function defaultIsLowerVersion(oldVer, newVer) {
   }
   return false;
 }
+var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
 function isUpdateJSON(json) {
-  const is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
   return is(json) && is(json?.beta);
 }
 function defaultVersionJsonGenerator(existingJson, signature, version, minimumVersion) {

package/dist/{chunk-7M7DIMDN.js → chunk-CTUEQCKL.js}

@@ -22,8 +22,8 @@ function parseVersion(version) {
   }
   return ret;
 }
+var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
 function isUpdateJSON(json) {
-  const is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
   return is(json) && is(json?.beta);
 }
 function defaultVersionJsonGenerator(existingJson, signature, version, minimumVersion) {

package/dist/{chunk-AUY7A2FL.js → chunk-I2EHKJU4.js}

@@ -1,6 +1,5 @@
-import { parseVersion } from './chunk-7M7DIMDN.js';
+import { parseVersion } from './chunk-CTUEQCKL.js';
 import { bytecodeLog } from './chunk-5NKEXGI3.js';
-import { bytecodeGeneratorScript } from './chunk-7IRGAAL2.js';
 import path from 'node:path';
 import fs from 'node:fs';
 import cp from 'node:child_process';
@@ -8,6 +7,9 @@ import * as babel from '@babel/core';
 import MagicString from 'magic-string';
 import { getPackageInfoSync } from 'local-pkg';
 
+// src/vite/bytecode/code.ts
+var bytecodeGeneratorScript = "const vm = require('vm')\nconst v8 = require('v8')\nconst wrap = require('module').wrap\nv8.setFlagsFromString('--no-lazy')\nv8.setFlagsFromString('--no-flush-bytecode')\nlet code = ''\nprocess.stdin.setEncoding('utf-8')\nprocess.stdin.on('readable', () => {\n  const data = process.stdin.read()\n  if (data !== null) {\n    code += data\n  }\n})\nprocess.stdin.on('end', () => {\n  try {\n    if (typeof code !== 'string') {\n      throw new Error('javascript code must be string.')\n    }\n    const script = new vm.Script(wrap(code), { produceCachedData: true })\n    const bytecodeBuffer = script.createCachedData()\n    process.stdout.write(bytecodeBuffer)\n  } catch (error) {\n    console.error(error)\n  }\n})\n";
+var bytecodeModuleLoaderCode = '"use strict";\nconst fs = require("fs");\nconst path = require("path");\nconst vm = require("vm");\nconst v8 = require("v8");\nconst Module = require("module");\nv8.setFlagsFromString("--no-lazy");\nv8.setFlagsFromString("--no-flush-bytecode");\nconst FLAG_HASH_OFFSET = 12;\nconst SOURCE_HASH_OFFSET = 8;\nlet dummyBytecode;\nfunction setFlagHashHeader(bytecodeBuffer) {\n  if (!dummyBytecode) {\n    const script = new vm.Script("", {\n      produceCachedData: true\n    });\n    dummyBytecode = script.createCachedData();\n  }\n  dummyBytecode.slice(FLAG_HASH_OFFSET, FLAG_HASH_OFFSET + 4).copy(bytecodeBuffer, FLAG_HASH_OFFSET);\n};\nfunction getSourceHashHeader(bytecodeBuffer) {\n  return bytecodeBuffer.slice(SOURCE_HASH_OFFSET, SOURCE_HASH_OFFSET + 4);\n};\nfunction buffer2Number(buffer) {\n  let ret = 0;\n  ret |= buffer[3] << 24;\n  ret |= buffer[2] << 16;\n  ret |= buffer[1] << 8;\n  ret |= buffer[0];\n  return ret;\n};\nModule._extensions[".jsc"] = Module._extensions[".cjsc"] = function (module, filename) {\n  const bytecodeBuffer = fs.readFileSync(filename);\n  if (!Buffer.isBuffer(bytecodeBuffer)) {\n    throw new Error("BytecodeBuffer must be a buffer object.");\n  }\n  setFlagHashHeader(bytecodeBuffer);\n  const length = buffer2Number(getSourceHashHeader(bytecodeBuffer));\n  let dummyCode = "";\n  if (length > 1) {\n    dummyCode = "\\"" + "\\u200b".repeat(length - 2) + "\\"";\n  }\n  const script = new vm.Script(dummyCode, {\n    filename: filename,\n    lineOffset: 0,\n    displayErrors: true,\n    cachedData: bytecodeBuffer\n  });\n  if (script.cachedDataRejected) {\n    throw new Error("Invalid or incompatible cached data (cachedDataRejected)");\n  }\n  const require = function (id) {\n    return module.require(id);\n  };\n  require.resolve = function (request, options) {\n    return Module._resolveFilename(request, module, false, options);\n  };\n  if (process.mainModule) {\n    require.main = process.mainModule;\n  }\n  require.extensions = Module._extensions;\n  require.cache = Module._cache;\n  const compiledWrapper = script.runInThisContext({\n    filename: filename,\n    lineOffset: 0,\n    columnOffset: 0,\n    displayErrors: true\n  });\n  const dirname = path.dirname(filename);\n  const args = [module.exports, require, module, filename, dirname, process, global];\n  return compiledWrapper.apply(module.exports, args);\n};\n';
 var electronModule = getPackageInfoSync("electron");
 var electronMajorVersion = parseVersion(electronModule.version).major;
 var useStrict = "'use strict';";
@@ -44,9 +46,9 @@ function toRelativePath(filename, importer) {
   const relPath = path.posix.relative(path.dirname(importer), filename);
   return relPath.startsWith(".") ? relPath : `./${relPath}`;
 }
+var logErr = (...args) => bytecodeLog.error(args.join(" "), { timestamp: true });
 function compileToBytecode(code, electronPath = getElectronPath()) {
   let data = Buffer.from([]);
-  const logErr = (...args) => bytecodeLog.error(args.join(" "), { timestamp: true });
   const bytecodePath = getBytecodeCompilerPath();
   return new Promise((resolve, reject) => {
     const proc = cp.spawn(electronPath, [bytecodePath], {
@@ -144,4 +146,4 @@ function convertLiteral(code, sourcemap, offset) {
   };
 }
 
-export { bytecodeModuleLoader, compileToBytecode, convertArrowFunctionAndTemplate, convertLiteral, decodeFn, electronMajorVersion, electronModule, obfuscateString, toRelativePath, useStrict };
+export { bytecodeModuleLoader, bytecodeModuleLoaderCode, compileToBytecode, convertArrowFunctionAndTemplate, convertLiteral, electronMajorVersion, toRelativePath, useStrict };

package/dist/{chunk-2XSFM3E5.js → chunk-JI27JWJN.js}

@@ -1,4 +1,4 @@
-import { __require } from './chunk-RCRKUKFX.js';
+import { __require } from './chunk-AAAM44NW.js';
 import fs from 'node:fs';
 import path from 'node:path';
 import electron from 'electron';

package/dist/{chunk-5CE27A6G.js → esm-5YR6V7VN.js}

@@ -1,4 +1,6 @@
-import { electronMajorVersion } from './chunk-AUY7A2FL.js';
+import { electronMajorVersion } from './chunk-I2EHKJU4.js';
+import './chunk-CTUEQCKL.js';
+import { esmId } from './chunk-5NKEXGI3.js';
 import MagicString from 'magic-string';
 
 // src/vite/esm/constant.ts
@@ -41,4 +43,23 @@ function insertCJSShim(code, sourcemap, insertPosition = 0) {
   };
 }
 
-export { findStaticImports, insertCJSShim };
+// src/vite/esm/index.ts
+function esm() {
+  let sourcemap;
+  return {
+    name: esmId,
+    enforce: "post",
+    configResolved(config) {
+      sourcemap = config.build.sourcemap;
+    },
+    renderChunk(code, _chunk, options) {
+      if (options.format === "es") {
+        const lastESMImport = findStaticImports(code).pop();
+        const pos = lastESMImport ? lastESMImport.end : 0;
+        return insertCJSShim(code, sourcemap, pos);
+      }
+    }
+  };
+}
+
+export { esm };

package/dist/index.cjs

@@ -19,8 +19,8 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/utils/version.ts
+var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
 function isUpdateJSON(json) {
-  const is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
   return is(json) && is(json?.beta);
 }
 var isDev = __EIU_IS_DEV__;
@@ -40,6 +40,9 @@ function restartApp() {
   electron__default.default.app.relaunch();
   electron__default.default.app.quit();
 }
+function getPathFromMain(...paths) {
+  return isDev ? path__default.default.join(electron__default.default.app.getAppPath(), __EIU_ELECTRON_DIST_PATH__, "main", ...paths) : getPathFromAppNameAsar("main", ...paths);
+}
 
 // src/entry/types.ts
 var UpdaterError = class extends Error {
@@ -103,7 +106,7 @@ var Updater = class extends events.EventEmitter {
     }
     this.logger?.debug(`Download from \`${this.provider.name}\``);
     try {
-      const result = format === "json" ? await this.provider.downloadJSON(electron.app.name, __EIU_VERSION_PATH__, this.controller.signal) : await this.provider.downloadAsar(this.info, this.controller.signal, (info) => this.emit("download-progress", info));
+      const result = format === "json" ? await this.provider.downloadJSON(electron__default.default.app.name, __EIU_VERSION_PATH__, this.controller.signal) : await this.provider.downloadAsar(this.info, this.controller.signal, (info) => this.emit("download-progress", info));
       this.logger?.debug(`Download ${format} success${format === "buffer" ? `, file size: ${result.length}` : ""}`);
       return result;
     } catch (e) {
@@ -232,11 +235,7 @@ var defaultOnInstall = (install, _, __, logger) => {
 async function createElectronApp(appOptions = {}) {
   const appNameAsarPath = getPathFromAppNameAsar();
   const {
-    mainPath = path__default.default.join(
-      isDev ? path__default.default.join(electron.app.getAppPath(), __EIU_MAIN_DEV_DIR__) : appNameAsarPath,
-      "main",
-      __EIU_MAIN_FILE__
-    ),
+    mainPath = getPathFromMain(__EIU_MAIN_FILE__),
     updater,
     onInstall = defaultOnInstall,
     beforeStart,
@@ -259,7 +258,7 @@ async function createElectronApp(appOptions = {}) {
   } catch (error) {
     logger?.error("startup error", error);
     onStartError?.(error, logger);
-    electron.app.quit();
+    electron__default.default.app.quit();
   }
 }
 var initApp = createElectronApp;

package/dist/index.js

@@ -1,9 +1,8 @@
-import { isDev, getAppVersion, getEntryVersion, getPathFromAppNameAsar, restartApp } from './chunk-2XSFM3E5.js';
-import { isUpdateJSON, __require } from './chunk-RCRKUKFX.js';
+import { isDev, getAppVersion, getEntryVersion, getPathFromAppNameAsar, restartApp, getPathFromMain } from './chunk-JI27JWJN.js';
+import { isUpdateJSON, __require } from './chunk-AAAM44NW.js';
 import fs2 from 'node:fs';
 import { EventEmitter } from 'node:events';
-import { app } from 'electron';
-import path from 'node:path';
+import electron from 'electron';
 
 // src/entry/types.ts
 var UpdaterError = class extends Error {
@@ -67,7 +66,7 @@ var Updater = class extends EventEmitter {
     }
     this.logger?.debug(`Download from \`${this.provider.name}\``);
     try {
-      const result = format === "json" ? await this.provider.downloadJSON(app.name, __EIU_VERSION_PATH__, this.controller.signal) : await this.provider.downloadAsar(this.info, this.controller.signal, (info) => this.emit("download-progress", info));
+      const result = format === "json" ? await this.provider.downloadJSON(electron.app.name, __EIU_VERSION_PATH__, this.controller.signal) : await this.provider.downloadAsar(this.info, this.controller.signal, (info) => this.emit("download-progress", info));
       this.logger?.debug(`Download ${format} success${format === "buffer" ? `, file size: ${result.length}` : ""}`);
       return result;
     } catch (e) {
@@ -196,11 +195,7 @@ var defaultOnInstall = (install, _, __, logger) => {
 async function createElectronApp(appOptions = {}) {
   const appNameAsarPath = getPathFromAppNameAsar();
   const {
-    mainPath = path.join(
-      isDev ? path.join(app.getAppPath(), __EIU_MAIN_DEV_DIR__) : appNameAsarPath,
-      "main",
-      __EIU_MAIN_FILE__
-    ),
+    mainPath = getPathFromMain(__EIU_MAIN_FILE__),
     updater,
     onInstall = defaultOnInstall,
     beforeStart,
@@ -223,7 +218,7 @@ async function createElectronApp(appOptions = {}) {
   } catch (error) {
     logger?.error("startup error", error);
     onStartError?.(error, logger);
-    app.quit();
+    electron.app.quit();
   }
 }
 var initApp = createElectronApp;

package/dist/provider.cjs

@@ -37,17 +37,17 @@ function parseVersion(version) {
   }
   return ret;
 }
+function compareStrings(str1, str2) {
+  if (str1 === "") {
+    return str2 !== "";
+  } else if (str2 === "") {
+    return true;
+  }
+  return str1 < str2;
+}
 function defaultIsLowerVersion(oldVer, newVer) {
   const oldV = parseVersion(oldVer);
   const newV = parseVersion(newVer);
-  function compareStrings(str1, str2) {
-    if (str1 === "") {
-      return str2 !== "";
-    } else if (str2 === "") {
-      return true;
-    }
-    return str1 < str2;
-  }
   for (let key of Object.keys(oldV)) {
     if (key === "stage" && compareStrings(oldV[key], newV[key])) {
       return true;
@@ -57,8 +57,8 @@ function defaultIsLowerVersion(oldVer, newVer) {
   }
   return false;
 }
+var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
 function isUpdateJSON(json) {
-  const is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
   return is(json) && is(json?.beta);
 }
 

package/dist/provider.js

@@ -1,5 +1,5 @@
 import { defaultVerifySignature, defaultUnzipFile } from './chunk-PUVBFHOK.js';
-import { isUpdateJSON, defaultIsLowerVersion } from './chunk-RCRKUKFX.js';
+import { isUpdateJSON, defaultIsLowerVersion } from './chunk-AAAM44NW.js';
 import { URL } from 'node:url';
 import electron from 'electron';
 

package/dist/utils.cjs

@@ -148,17 +148,17 @@ function parseVersion(version) {
   }
   return ret;
 }
+function compareStrings(str1, str2) {
+  if (str1 === "") {
+    return str2 !== "";
+  } else if (str2 === "") {
+    return true;
+  }
+  return str1 < str2;
+}
 function defaultIsLowerVersion(oldVer, newVer) {
   const oldV = parseVersion(oldVer);
   const newV = parseVersion(newVer);
-  function compareStrings(str1, str2) {
-    if (str1 === "") {
-      return str2 !== "";
-    } else if (str2 === "") {
-      return true;
-    }
-    return str1 < str2;
-  }
   for (let key of Object.keys(oldV)) {
     if (key === "stage" && compareStrings(oldV[key], newV[key])) {
       return true;
@@ -168,8 +168,8 @@ function defaultIsLowerVersion(oldVer, newVer) {
   }
   return false;
 }
+var is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
 function isUpdateJSON(json) {
-  const is = (j) => !!(j && j.minimumVersion && j.signature && j.version);
   return is(json) && is(json?.beta);
 }
 function defaultVersionJsonGenerator(existingJson, signature, version, minimumVersion) {

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, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance } from './chunk-2XSFM3E5.js';
+export { beautifyDevTools, disableHWAccForWin7, getAppVersion, getEntryVersion, getPathFromAppNameAsar, getPathFromEntryAsar, getPathFromMain, getPathFromPreload, getPathFromPublic, handleUnexpectedErrors, importNative, isDev, isLinux, isMac, isWin, loadPage, requireNative, restartApp, setAppUserModelId, setPortableAppDataPath, singleInstance } from './chunk-JI27JWJN.js';
 export { aesDecrypt, aesEncrypt, defaultSignature, defaultUnzipFile, defaultVerifySignature, defaultZipFile, hashBuffer } from './chunk-PUVBFHOK.js';
-export { defaultIsLowerVersion, defaultVersionJsonGenerator, isUpdateJSON, parseVersion } from './chunk-RCRKUKFX.js';
+export { defaultIsLowerVersion, defaultVersionJsonGenerator, isUpdateJSON, parseVersion } from './chunk-AAAM44NW.js';

package/dist/vite.d.ts

@@ -1,7 +1,6 @@
-import { PluginOption } from 'vite';
+import { InlineConfig, PluginOption } from 'vite';
 import { ElectronSimpleOptions } from 'vite-plugin-electron/simple';
 import { Promisable } from '@subframe7536/type-utils';
-import { BuildOptions } from 'esbuild';
 export { isCI } from 'ci-info';
 
 /**
@@ -67,30 +66,20 @@ interface BuildEntryOption {
      */
     nativeModuleEntryMap?: Record<string, string>;
     /**
-     * Custom options for esbuild
-     * ```ts
-     * // default options
-     * const options = {
-     *   entryPoints: {
-     *     entry: appEntryPath,
-     *     ...moduleEntryMap,
-     *   },
-     *   bundle: true,
-     *   platform: 'node',
-     *   outdir: entryOutputDirPath,
-     *   minify,
-     *   sourcemap,
-     *   entryNames: '[dir]/[name]',
-     *   assetNames: '[dir]/[name]',
-     *   external: ['electron', 'original-fs'],
-     *   loader: {
-     *     '.node': 'empty',
-     *   },
-     *   define,
-     * }
-     * ```
+     * Skip process dynamic require
+     *
+     * Useful for `better-sqlite3` and other old packages
+     */
+    ignoreDynamicRequires?: boolean;
+    /**
+     * `external` option in `build.rollupOptions`
+     * @default source => source.endsWith('.node')
+     */
+    external?: (source: string, importer: string | undefined, isResolved: boolean) => boolean | null | undefined | void;
+    /**
+     * Custom options for `vite` build
      */
-    overrideEsbuildOptions?: BuildOptions;
+    overrideViteOptions?: InlineConfig;
     /**
      * Resolve extra files on startup, such as `.node`
      * @remark won't trigger will reload

package/dist/vite.js

@@ -1,17 +1,16 @@
 import { readableSize } from './chunk-WYQ5DRO7.js';
-import { isUpdateJSON, defaultVersionJsonGenerator } from './chunk-7M7DIMDN.js';
-import { log, id, bytecodeLog } from './chunk-5NKEXGI3.js';
+import { isUpdateJSON, defaultVersionJsonGenerator } from './chunk-CTUEQCKL.js';
+import { log, id } from './chunk-5NKEXGI3.js';
 import path3 from 'node:path';
-import fs from 'node:fs';
+import fs2 from 'node:fs';
 import { normalizePath, mergeConfig } from 'vite';
 import ElectronSimple from 'vite-plugin-electron/simple';
-import { startup } from 'vite-plugin-electron';
+import { startup, build } from 'vite-plugin-electron';
 import { notBundle } from 'vite-plugin-electron/plugin';
 import { loadPackageJSON } from 'local-pkg';
 import { isCI } from 'ci-info';
 export { isCI } from 'ci-info';
 import Asar from '@electron/asar';
-import { build } from 'esbuild';
 import zlib from 'node:zlib';
 import crypto from 'node:crypto';
 import { generate } from 'selfsigned';
@@ -24,11 +23,11 @@ async function buildAsar({
   rendererDistPath,
   generateGzipFile
 }) {
-  fs.renameSync(rendererDistPath, path3.join(electronDistPath, "renderer"));
-  fs.writeFileSync(path3.join(electronDistPath, "version"), version);
+  fs2.renameSync(rendererDistPath, path3.join(electronDistPath, "renderer"));
+  fs2.writeFileSync(path3.join(electronDistPath, "version"), version);
   await Asar.createPackage(electronDistPath, asarOutputPath);
-  const buf = await generateGzipFile(fs.readFileSync(asarOutputPath));
-  fs.writeFileSync(gzipPath, buf);
+  const buf = await generateGzipFile(fs2.readFileSync(asarOutputPath));
+  fs2.writeFileSync(gzipPath, buf);
   log.info(`Build update asar to '${gzipPath}' [${readableSize(buf.length)}]`, { timestamp: true });
   return buf;
 }
@@ -51,9 +50,9 @@ async function buildVersion({
     signature: "",
     version
   };
-  if (fs.existsSync(versionPath)) {
+  if (fs2.existsSync(versionPath)) {
     try {
-      const oldVersionJson = JSON.parse(fs.readFileSync(versionPath, "utf-8"));
+      const oldVersionJson = JSON.parse(fs2.readFileSync(versionPath, "utf-8"));
       if (isUpdateJSON(oldVersionJson)) {
         _json = oldVersionJson;
       } else {
@@ -67,7 +66,7 @@ async function buildVersion({
   if (!isUpdateJSON(_json)) {
     throw new Error("Invalid version info");
   }
-  fs.writeFileSync(versionPath, JSON.stringify(_json, null, 2));
+  fs2.writeFileSync(versionPath, JSON.stringify(_json, null, 2));
   log.info(`build version info to '${versionPath}'`, { timestamp: true });
 }
 async function buildEntry({
@@ -76,86 +75,34 @@ async function buildEntry({
   appEntryPath,
   entryOutputDirPath,
   nativeModuleEntryMap,
-  overrideEsbuildOptions
+  ignoreDynamicRequires,
+  external,
+  overrideViteOptions
 }, isESM, define, bytecodeOptions) {
-  const option = mergeConfig(
-    {
-      entryPoints: {
-        entry: appEntryPath,
-        ...nativeModuleEntryMap
-      },
-      bundle: true,
-      metafile: true,
-      platform: "node",
-      outdir: entryOutputDirPath,
-      minify,
-      sourcemap,
-      entryNames: "[dir]/[name]",
-      assetNames: "[dir]/[name]",
-      external: ["electron", "original-fs"],
-      treeShaking: true,
-      loader: {
-        ".node": "empty"
-      },
-      define,
-      format: isESM ? "esm" : "cjs",
-      write: !isESM,
-      plugins: isESM ? [
-        {
-          name: "entry-esm-shim",
-          setup(build2) {
-            build2.onEnd(async ({ outputFiles }) => {
-              const parse = (await import('./utils-KPSYP7HQ.js')).insertCJSShim;
-              fs.mkdirSync(entryOutputDirPath, { recursive: true });
-              outputFiles?.filter((file) => file.path.endsWith(".js")).forEach((file) => {
-                const output = parse(file.text, sourcemap);
-                fs.writeFileSync(file.path, output?.code || file.text, "utf-8");
-                if (sourcemap && output?.map) {
-                  fs.writeFileSync(`${file.path}.map`, output.map.toString(), "utf-8");
-                }
-              });
-            });
-          }
-        }
-      ] : void 0
+  await build({
+    entry: {
+      entry: appEntryPath,
+      ...nativeModuleEntryMap
     },
-    overrideEsbuildOptions ?? {}
-  );
-  const { metafile } = await build(option);
-  if (!bytecodeOptions?.enable) {
-    return;
-  }
-  const filePaths = Object.keys(metafile?.outputs ?? []).filter((filePath) => filePath.endsWith("js"));
-  const {
-    compileToBytecode,
-    convertArrowFunctionAndTemplate,
-    convertLiteral,
-    useStrict
-  } = await import('./utils-JZ4CMTJG.js');
-  const { bytecodeModuleLoaderCode } = await import('./code-P5OANH3Q.js');
-  for (const filePath of filePaths) {
-    let code = fs.readFileSync(filePath, "utf-8");
-    const fileName = path3.basename(filePath);
-    const isEntry = fileName.endsWith("entry.js");
-    let transformedCode = convertLiteral(convertArrowFunctionAndTemplate(code).code).code;
-    if (bytecodeOptions.beforeCompile) {
-      const result = await bytecodeOptions.beforeCompile(transformedCode, filePath);
-      if (result) {
-        transformedCode = result;
-      }
-    }
-    const buffer = await compileToBytecode(transformedCode, bytecodeOptions.electronPath);
-    fs.writeFileSync(
-      filePath,
-      `${isEntry ? bytecodeModuleLoaderCode : useStrict}${isEntry ? "" : "module.exports = "}require("./${fileName}c")`
-    );
-    fs.writeFileSync(`${filePath}c`, buffer);
-    bytecodeLog.info(
-      `${filePath} [${(buffer.byteLength / 1e3).toFixed(2)} kB]`,
-      { timestamp: true }
-    );
-  }
-  bytecodeLog.info(`${filePaths.length} file${filePaths.length > 1 ? "s" : ""} compiled into bytecode`, { timestamp: true });
+    vite: mergeConfig({
+      plugins: [
+        isESM && await import('./esm-5YR6V7VN.js').then((m) => m.esm()),
+        bytecodeOptions && await import('./bytecode-Z5ZF4YGN.js').then((m) => m.bytecodePlugin("main", bytecodeOptions))
+      ],
+      build: {
+        sourcemap,
+        minify,
+        outDir: entryOutputDirPath,
+        commonjsOptions: {
+          ignoreDynamicRequires
+        },
+        rollupOptions: {
+          external
+        }
+      },
+      define
+    }, overrideViteOptions ?? {})
+  });
 }
 async function defaultZipFile(buffer) {
   return new Promise((resolve, reject) => {
@@ -176,20 +123,20 @@ function defaultSignature(buffer, privateKey, cert, version) {
 }
 function generateKeyPair(keyLength, subject, days, privateKeyPath, certPath) {
   const privateKeyDir = path3.dirname(privateKeyPath);
-  if (!fs.existsSync(privateKeyDir)) {
-    fs.mkdirSync(privateKeyDir, { recursive: true });
+  if (!fs2.existsSync(privateKeyDir)) {
+    fs2.mkdirSync(privateKeyDir, { recursive: true });
   }
   const certDir = path3.dirname(certPath);
-  if (!fs.existsSync(certDir)) {
-    fs.mkdirSync(certDir, { recursive: true });
+  if (!fs2.existsSync(certDir)) {
+    fs2.mkdirSync(certDir, { recursive: true });
   }
   const { cert, private: privateKey } = generate(subject, {
     keySize: keyLength,
     algorithm: "sha256",
     days
   });
-  fs.writeFileSync(privateKeyPath, privateKey.replace(/\r\n?/g, "\n"));
-  fs.writeFileSync(certPath, cert.replace(/\r\n?/g, "\n"));
+  fs2.writeFileSync(privateKeyPath, privateKey.replace(/\r\n?/g, "\n"));
+  fs2.writeFileSync(certPath, cert.replace(/\r\n?/g, "\n"));
 }
 function parseKeys({
   keyLength,
@@ -205,15 +152,15 @@ function parseKeys({
     log.info("Use `UPDATER_PK` and `UPDATER_CERT` from environment variables", { timestamp: true });
     return { privateKey, cert };
   }
-  if (!fs.existsSync(keysDir)) {
-    fs.mkdirSync(keysDir);
+  if (!fs2.existsSync(keysDir)) {
+    fs2.mkdirSync(keysDir);
   }
-  if (!fs.existsSync(privateKeyPath) || !fs.existsSync(certPath)) {
+  if (!fs2.existsSync(privateKeyPath) || !fs2.existsSync(certPath)) {
     log.info("No key pair found, generate new key pair", { timestamp: true });
     generateKeyPair(keyLength, parseSubjects(subject), days, privateKeyPath, certPath);
   }
-  privateKey = fs.readFileSync(privateKeyPath, "utf-8");
-  cert = fs.readFileSync(certPath, "utf-8");
+  privateKey = fs2.readFileSync(privateKeyPath, "utf-8");
+  cert = fs2.readFileSync(certPath, "utf-8");
   return { privateKey, cert };
 }
 function parseSubjects(subject) {
@@ -231,7 +178,9 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
       appEntryPath = "electron/entry.ts",
       nativeModuleEntryMap = {},
       postBuild,
-      overrideEsbuildOptions = {}
+      ignoreDynamicRequires = false,
+      external = (source) => source.endsWith(".node"),
+      overrideViteOptions = {}
     } = {},
     paths: {
       asarOutputPath = `release/${pkg.name}.asar`,
@@ -272,7 +221,9 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
     entryOutputDirPath,
     appEntryPath,
     nativeModuleEntryMap,
-    overrideEsbuildOptions
+    overrideViteOptions,
+    ignoreDynamicRequires,
+    external
   };
   const { privateKey, cert } = parseKeys({
     keyLength,
@@ -358,8 +309,8 @@ async function electronWithUpdater(options) {
   } = parseOptions(pkg, sourcemap, minify, updater);
   const { entryOutputDirPath, nativeModuleEntryMap, appEntryPath } = buildEntryOption;
   try {
-    fs.rmSync(buildAsarOption.electronDistPath, { recursive: true, force: true });
-    fs.rmSync(entryOutputDirPath, { recursive: true, force: true });
+    fs2.rmSync(buildAsarOption.electronDistPath, { recursive: true, force: true });
+    fs2.rmSync(entryOutputDirPath, { recursive: true, force: true });
   } catch {
   }
   log.info(`Clear cache files`, { timestamp: true });
@@ -373,7 +324,6 @@ async function electronWithUpdater(options) {
     __EIU_ENTRY_DIST_PATH__: JSON.stringify(normalizePath(buildEntryOption.entryOutputDirPath)),
     __EIU_IS_DEV__: JSON.stringify(!isBuild),
     __EIU_IS_ESM__: JSON.stringify(isESM),
-    __EIU_MAIN_DEV_DIR__: JSON.stringify(normalizePath(buildAsarOption.electronDistPath)),
     __EIU_MAIN_FILE__: JSON.stringify(getMainFileBaseName(_main.files)),
     __EIU_SIGNATURE_CERT__: JSON.stringify(cert),
     __EIU_VERSION_PATH__: JSON.stringify(parseVersionPath(normalizePath(buildVersionOption.versionPath)))
@@ -392,11 +342,11 @@ async function electronWithUpdater(options) {
       return path3.join(entryOutputDirPath, ...paths);
     },
     copyToEntryOutputDir({ from, to, skipIfExist = true }) {
-      if (fs.existsSync(from)) {
+      if (fs2.existsSync(from)) {
         const target = path3.join(entryOutputDirPath, to ?? path3.basename(from));
-        if (!skipIfExist || !fs.existsSync(target)) {
+        if (!skipIfExist || !fs2.existsSync(target)) {
           try {
-            fs.cpSync(from, target);
+            fs2.cpSync(from, target);
           } catch (error) {
             log.warn(`Copy failed: ${error}`, { timestamp: true });
           }
@@ -410,7 +360,7 @@ async function electronWithUpdater(options) {
     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-ZFXJ56BN.js')).esm() : void 0;
+  const esmShimPlugin = isESM ? (await import('./esm-5YR6V7VN.js')).esm() : void 0;
   const electronPluginOptions = {
     main: {
       entry: _main.files,
@@ -430,7 +380,7 @@ async function electronWithUpdater(options) {
         {
           plugins: [
             !isBuild && useNotBundle ? notBundle() : void 0,
-            bytecodeOptions && (await import('./bytecode-I4PMYUGT.js')).bytecodePlugin("main", bytecodeOptions),
+            bytecodeOptions && await import('./bytecode-Z5ZF4YGN.js').then((m) => m.bytecodePlugin("main", bytecodeOptions)),
             esmShimPlugin
           ],
           build: {
@@ -450,7 +400,7 @@ async function electronWithUpdater(options) {
       vite: mergeConfig(
         {
           plugins: [
-            bytecodeOptions && (await import('./bytecode-I4PMYUGT.js')).bytecodePlugin("preload", bytecodeOptions),
+            bytecodeOptions && (await import('./bytecode-Z5ZF4YGN.js')).bytecodePlugin("preload", bytecodeOptions),
             esmShimPlugin,
             {
               name: `${id}-build`,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "type": "module",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "Electron incremental update tools with Vite plugin, support bytecode protection",
   "author": "subframe7536",
   "license": "MIT",
@@ -71,16 +71,16 @@
     "vite-plugin-electron": "^0.28.7"
   },
   "devDependencies": {
-    "@subframe7536/eslint-config": "^0.7.5",
+    "@subframe7536/eslint-config": "^0.8.0",
     "@types/babel__core": "^7.20.5",
-    "@types/node": "^20.14.15",
-    "bumpp": "^9.5.1",
+    "@types/node": "^20.16.3",
+    "bumpp": "^9.5.2",
     "electron": "28.2.10",
-    "eslint": "^9.9.0",
+    "eslint": "^9.9.1",
     "esno": "^4.7.0",
     "tsup": "^8.2.4",
     "typescript": "^5.5.4",
-    "vite": "^5.4.0",
+    "vite": "^5.4.2",
     "vite-plugin-electron": "^0.28.7",
     "vitest": "^2.0.5"
   }

package/dist/chunk-7IRGAAL2.js

@@ -1,5 +0,0 @@
-// src/vite/bytecode/code.ts
-var bytecodeGeneratorScript = "const vm = require('vm')\nconst v8 = require('v8')\nconst wrap = require('module').wrap\nv8.setFlagsFromString('--no-lazy')\nv8.setFlagsFromString('--no-flush-bytecode')\nlet code = ''\nprocess.stdin.setEncoding('utf-8')\nprocess.stdin.on('readable', () => {\n  const data = process.stdin.read()\n  if (data !== null) {\n    code += data\n  }\n})\nprocess.stdin.on('end', () => {\n  try {\n    if (typeof code !== 'string') {\n      throw new Error('javascript code must be string.')\n    }\n    const script = new vm.Script(wrap(code), { produceCachedData: true })\n    const bytecodeBuffer = script.createCachedData()\n    process.stdout.write(bytecodeBuffer)\n  } catch (error) {\n    console.error(error)\n  }\n})\n";
-var bytecodeModuleLoaderCode = '"use strict";\nconst fs = require("fs");\nconst path = require("path");\nconst vm = require("vm");\nconst v8 = require("v8");\nconst Module = require("module");\nv8.setFlagsFromString("--no-lazy");\nv8.setFlagsFromString("--no-flush-bytecode");\nconst FLAG_HASH_OFFSET = 12;\nconst SOURCE_HASH_OFFSET = 8;\nlet dummyBytecode;\nfunction setFlagHashHeader(bytecodeBuffer) {\n  if (!dummyBytecode) {\n    const script = new vm.Script("", {\n      produceCachedData: true\n    });\n    dummyBytecode = script.createCachedData();\n  }\n  dummyBytecode.slice(FLAG_HASH_OFFSET, FLAG_HASH_OFFSET + 4).copy(bytecodeBuffer, FLAG_HASH_OFFSET);\n};\nfunction getSourceHashHeader(bytecodeBuffer) {\n  return bytecodeBuffer.slice(SOURCE_HASH_OFFSET, SOURCE_HASH_OFFSET + 4);\n};\nfunction buffer2Number(buffer) {\n  let ret = 0;\n  ret |= buffer[3] << 24;\n  ret |= buffer[2] << 16;\n  ret |= buffer[1] << 8;\n  ret |= buffer[0];\n  return ret;\n};\nModule._extensions[".jsc"] = Module._extensions[".cjsc"] = function (module, filename) {\n  const bytecodeBuffer = fs.readFileSync(filename);\n  if (!Buffer.isBuffer(bytecodeBuffer)) {\n    throw new Error("BytecodeBuffer must be a buffer object.");\n  }\n  setFlagHashHeader(bytecodeBuffer);\n  const length = buffer2Number(getSourceHashHeader(bytecodeBuffer));\n  let dummyCode = "";\n  if (length > 1) {\n    dummyCode = "\\"" + "\\u200b".repeat(length - 2) + "\\"";\n  }\n  const script = new vm.Script(dummyCode, {\n    filename: filename,\n    lineOffset: 0,\n    displayErrors: true,\n    cachedData: bytecodeBuffer\n  });\n  if (script.cachedDataRejected) {\n    throw new Error("Invalid or incompatible cached data (cachedDataRejected)");\n  }\n  const require = function (id) {\n    return module.require(id);\n  };\n  require.resolve = function (request, options) {\n    return Module._resolveFilename(request, module, false, options);\n  };\n  if (process.mainModule) {\n    require.main = process.mainModule;\n  }\n  require.extensions = Module._extensions;\n  require.cache = Module._cache;\n  const compiledWrapper = script.runInThisContext({\n    filename: filename,\n    lineOffset: 0,\n    columnOffset: 0,\n    displayErrors: true\n  });\n  const dirname = path.dirname(filename);\n  const args = [module.exports, require, module, filename, dirname, process, global];\n  return compiledWrapper.apply(module.exports, args);\n};\n';
-
-export { bytecodeGeneratorScript, bytecodeModuleLoaderCode };

package/dist/code-P5OANH3Q.js

@@ -1 +0,0 @@
-export { bytecodeGeneratorScript, bytecodeModuleLoaderCode } from './chunk-7IRGAAL2.js';

package/dist/esm-ZFXJ56BN.js

@@ -1,26 +0,0 @@
-import { findStaticImports, insertCJSShim } from './chunk-5CE27A6G.js';
-import './chunk-AUY7A2FL.js';
-import './chunk-7M7DIMDN.js';
-import { esmId } from './chunk-5NKEXGI3.js';
-import './chunk-7IRGAAL2.js';
-
-// src/vite/esm/index.ts
-function esm() {
-  let sourcemap;
-  return {
-    name: esmId,
-    enforce: "post",
-    configResolved(config) {
-      sourcemap = config.build.sourcemap;
-    },
-    renderChunk(code, _chunk, options) {
-      if (options.format === "es") {
-        const lastESMImport = findStaticImports(code).pop();
-        const pos = lastESMImport ? lastESMImport.end : 0;
-        return insertCJSShim(code, sourcemap, pos);
-      }
-    }
-  };
-}
-
-export { esm };

package/dist/utils-JZ4CMTJG.js

@@ -1,4 +0,0 @@
-export { bytecodeModuleLoader, compileToBytecode, convertArrowFunctionAndTemplate, convertLiteral, decodeFn, electronMajorVersion, electronModule, obfuscateString, toRelativePath, useStrict } from './chunk-AUY7A2FL.js';
-import './chunk-7M7DIMDN.js';
-import './chunk-5NKEXGI3.js';
-import './chunk-7IRGAAL2.js';

package/dist/utils-KPSYP7HQ.js

@@ -1,5 +0,0 @@
-export { findStaticImports, insertCJSShim } from './chunk-5CE27A6G.js';
-import './chunk-AUY7A2FL.js';
-import './chunk-7M7DIMDN.js';
-import './chunk-5NKEXGI3.js';
-import './chunk-7IRGAAL2.js';